Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/series #125

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d67201b
feat(series): add series page
marcjulian Nov 25, 2020
e1d061a
feat(series): map chapter items and sort by weight
marcjulian Nov 26, 2020
b32c41a
feat(tailwind): optin to future changes
marcjulian Nov 26, 2020
a4dd3a5
Merge branch 'master' into feature/series
marcjulian Dec 15, 2020
ee2f90e
feat(series): add series to mobile menu
marcjulian Dec 18, 2020
143b262
Merge branch 'master' into feature/series
marcjulian Dec 18, 2020
1f7ba32
feat(series): update colors and add focus styles to chapter links
marcjulian Dec 18, 2020
20ce8b4
Merge branch 'master' into feature/series
marcjulian Dec 18, 2020
4f5bc14
feat(series): use tags icon as series cover
marcjulian Dec 18, 2020
39e765a
content: add todos to series
marcjulian Dec 18, 2020
546ef58
Merge branch 'master' into feature/series
marcjulian Dec 30, 2020
7e8ff22
fix(series): move chaperts into its own div
marcjulian Dec 30, 2020
7ad643b
series: add coming soon badge
marcjulian Dec 30, 2020
51b8413
refactor(scully): use ScullyRoutesService.getCurrent
marcjulian Dec 30, 2020
758a675
styles(series): move into one div for prose styles
marcjulian Dec 30, 2020
20df75c
refactor(scully): assign pages directly
marcjulian Dec 30, 2020
6a53917
feat(search): include series in search and add badge
marcjulian Dec 31, 2020
9a82931
feat(series): update series chapters and align chips
marcjulian Jan 5, 2021
c7b8a25
style(badge): align middle
marcjulian Jan 5, 2021
e8d342f
refactor(badge): create badge component styles
marcjulian Jan 7, 2021
0cb2f3f
feat(series): generate banner for series
marcjulian Jan 7, 2021
bf438d4
fix(series): lazyImage plugin cannot find banner for series
marcjulian Jan 7, 2021
c45da56
series: update series structure
garygrossgarten Jan 9, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions content/blog/angular-10-with-tailwindcss.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ keywords:
- Utility-First CSS
authors:
- Marc Stammerjohann
series:
- slug: angular-scully-tailwind
chapterSlug: getting-started
weight: 10
github: https://github.com/notiz-dev/angular-tailwindcss
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ tags:
keywords:
- Custom Elements
authors:
- 'Gary Großgarten'
- Gary Großgarten
github: 'https://github.com/notiz-dev/design'
---

Expand Down
8 changes: 6 additions & 2 deletions content/blog/deploy-nestjs-with-prisma-to-heroku.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: 'Deploy NestJS with Prisma to Heroku'
title: Deploy NestJS with Prisma to Heroku
description: 'Deploy a NestJS application with Prisma 2.0 to Heroku and connect to a PostgreSQL database.'
published: true
publishedAt: 2020-03-12T09:11:00.000Z
Expand All @@ -11,7 +11,11 @@ tags:
keywords:
- PostgreSQL
authors:
- 'Marc Stammerjohann'
- Marc Stammerjohann
series:
- slug: nestjs-prisma
chapterSlug: deployment
weight: 10
github: 'https://github.com/notiz-dev/deploy-nestjs-prisma-heroku'
---

Expand Down
4 changes: 4 additions & 0 deletions content/blog/dockerizing-nestjs-with-prisma-and-postgresql.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ keywords:
- PostgreSQL
authors:
- Marc Stammerjohann
series:
- slug: nestjs-prisma
chapterSlug: deployment
weight: 20
github: https://github.com/notiz-dev/nestjs-prisma-docker
---

Expand Down
4 changes: 4 additions & 0 deletions content/blog/firebase-hosting-preview-deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ keywords:
- Tailwind CSS
authors:
- Marc Stammerjohann
series:
- slug: angular-scully-tailwind
chapterSlug: deployment
weight: 20
github: https://github.com/notiz-dev/angular-scully-tailwindcss
---

Expand Down
4 changes: 4 additions & 0 deletions content/blog/graphql-code-first-with-nestjs-7.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ keywords:
- Code-First Approach
authors:
- Marc Stammerjohann
series:
- slug: nestjs-prisma
chapterSlug: getting-started
weight: 30
github: https://github.com/notiz-dev/nest-graphql-code-first
---

Expand Down
6 changes: 5 additions & 1 deletion content/blog/how-to-connect-nestjs-with-prisma.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ tags:
keywords:
- SQLite
authors:
- 'Marc Stammerjohann'
- Marc Stammerjohann
series:
- slug: nestjs-prisma
chapterSlug: getting-started
weight: 10
github: 'https://github.com/notiz-dev/nestjs-prisma'
versions:
nestjs/cli: 7.1.2
Expand Down
4 changes: 4 additions & 0 deletions content/blog/jamstack-angular-scully-tailwind-css.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ keywords:
- Utility-First CSS
authors:
- Marc Stammerjohann
series:
- slug: angular-scully-tailwind
chapterSlug: getting-started
weight: 20
github: https://github.com/notiz-dev/angular-scully-tailwindcss
---

Expand Down
4 changes: 4 additions & 0 deletions content/blog/nestjs-prisma-schematics.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ keywords:
- Schematics
authors:
- Marc Stammerjohann
series:
- slug: nestjs-prisma
chapterSlug: getting-started
weight: 20
github: https://github.com/marcjulian/nestjs-prisma
---

Expand Down
4 changes: 4 additions & 0 deletions content/blog/prisma-dbml-generator.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ keywords:
- Entity-Relationship Diagram
authors:
- Marc Stammerjohann
series:
- slug: nestjs-prisma
chapterSlug: prisma
weight: 10
github: https://github.com/notiz-dev/prisma-dbml-generator
---

Expand Down
2 changes: 1 addition & 1 deletion content/blog/simple-rxjs-keyboard-shortcuts.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ keywords:
- Shortcuts
- Angular
authors:
- 'Gary Großgarten'
- Gary Großgarten
github: https://github.com/garygrossgarten/rxjs-shortcuts
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ tags:
keywords:
- CSS
- Utility-First CSS
series:
- slug: angular-scully-tailwind
chapterSlug: deployment
weight: 10
authors:
- Marc Stammerjohann
github: https://github.com/notiz-dev/angular-scully-tailwindcss
Expand Down
34 changes: 34 additions & 0 deletions content/series/angular-scully-tailwind.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
title: Angular + Scully + Tailwind CSS Series
description: Build Angular Jamstack blog with Scully styled by Tailwind CSS
published: true
slug: angular-scully-tailwind
tags:
- Angular
- Scully
- Tailwind CSS
chapters:
- title: Getting Started
slug: getting-started
- title: Deployment
slug: deployment
---

## What will you build?

- Setting up Angular with Tailwind CSS
- Jamstack with Scully
- Deploy via GitHub Actions to Firebase Hosting
- SEO <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>
- Use and create Scully Plugin <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>
- Analytics <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>
- CMS <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>
- Cross posting to dev.to <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>
- Newsletter <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>
- Shortcodes in Markdown <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>

## Live Demo

You are using right **now** a Scully application styled with Tailwind - [notiz.dev](/) uses the following stack: Angular, Scully, Tailwind CSS and Firebase Hosting.

Try another [Live Demo](https://angular-scully-tailwindcss.web.app) of a Scully blog styled with Tailwind CSS. Find the full [source code](https://github.com/notiz-dev/angular-scully-tailwindcss) on GitHub.
23 changes: 23 additions & 0 deletions content/series/fullstack.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
title: Fullstack
description: Fullstack
published: false
slug: fullstack
tags:
- Angular
- NestJS
- Prisma
chapters:
- {title: 'Getting Started', slug: getting-started}
slugs:
- ___UNPUBLISHED___kjbib7un_h0Iph5ugONgWCrNk1clLVN79u160Y4qp
---

## What will you build?

- Mono Repo Angular + NestJS + Prisma (Build Scripts serving, ...)
- CRUD with NestJS
- Codegen REST and GraphQL
- Authentication
- Deployment/Hosting

31 changes: 31 additions & 0 deletions content/series/nestjs-prisma.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
title: NestJS + Prisma Series
description: Build backend application with NestJS and access databases via Prisma
published: true
slug: nestjs-prisma
tags:
- NestJs
- Prisma
chapters:
- title: Getting Started
slug: getting-started
- title: Prisma
slug: prisma
- title: Deployment
slug: deployment
---

## What is it all about?

- Integrate Prisma with NestJS
- Build GraphQL endpoit with NestJS
- Deployment of NestJS and Prisma to Heroku
- Dockerize NestJS and Prisma application
- Swagger API <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>
- Prisma Migrate, Native Types <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>
- Authentication with PassportJS <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>
- Pagination <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>
- Subscriptions <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>
- Mailing <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>
- Cloud Run <span class="inline align-middle ml-2 bg-primary bg-opacity-10 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold"><span class="text-primary">Coming soon</span></span>
- more to come
11 changes: 11 additions & 0 deletions scully.notiz.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ const sitemapConfig: SitemapConfig = {
priority: '0.9',
sitemapFilename: 'sitemap-links.xml',
},
'/series/:slug': {
changeFreq: 'daily',
priority: '0.9',
sitemapFilename: 'sitemap-series.xml',
},
'/tags/:slug': {
changeFreq: 'daily',
priority: '0.9',
Expand Down Expand Up @@ -84,6 +89,12 @@ export const config: ScullyConfig = {
folder: './content/authors',
},
},
'/series/:slug': {
type: 'contentFolder',
slug: {
folder: './content/series',
},
},
'/tags/:slug': {
type: 'contentFolder',
slug: {
Expand Down
5 changes: 5 additions & 0 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ const routes: Routes = [
loadChildren: () =>
import('./pages/tags/tags.module').then((m) => m.TagsModule),
},
{
path: 'series',
loadChildren: () =>
import('./pages/series/series.module').then((m) => m.SeriesModule),
},
{
path: 'confirm-subscription',
loadChildren: () =>
Expand Down
21 changes: 21 additions & 0 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@
>
Blog
</a>
<a
class="router-link"
[routerLink]="['/series']"
[ngClass]="{
'router-link-active':
(current$ | async)?.route | startswith: '/series/'
}"
routerLinkActive="router-link-active"
>
Series
</a>
<button
class="router-link"
[attr.aria-label]="'Scroll to Newsletter'"
Expand Down Expand Up @@ -105,6 +116,16 @@
>
Blog
</a>
<a
class="router-link"
[routerLink]="['/series']"
[ngClass]="{
'router-link-active': (current$ | async)?.route | startswith: '/series/'
}"
routerLinkActive="router-link-active"
>
Series
</a>
<button
class="router-link"
[attr.aria-label]="'Scroll to Newsletter'"
Expand Down
4 changes: 2 additions & 2 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ import { NizFooterModule } from '@components/footer/footer.module';
MarkdownModule.forRoot({ loader: HttpClient }),
NizTabsModule,
NizTabModule,
NizFooterModule,
NizFooterModule,
NizNavbarModule,
NizToolbarModule,
NizInlineSvgModule,
NewsletterSignupModule,
NizSearchComponentModule,
PipesModule,
NizToastModule,
NizMenuModule
NizMenuModule,
],
providers: [],
bootstrap: [AppComponent],
Expand Down
5 changes: 1 addition & 4 deletions src/app/components/article/article.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Component, OnInit, Input } from '@angular/core';
import { ScullyRoute } from '@scullyio/ng-lib';
import { ContentType } from 'src/app/types/types';


@Component({
selector: 'app-article',
templateUrl: './article.component.html',
Expand All @@ -12,8 +11,6 @@ export class ArticleComponent implements OnInit {
@Input() route: ScullyRoute;
type: ContentType;



ngOnInit(): void {
const type = this.route.route.split('/')[1];
switch (type) {
Expand All @@ -25,4 +22,4 @@ export class ArticleComponent implements OnInit {
break;
}
}
}
}
2 changes: 0 additions & 2 deletions src/app/components/article/article.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { RouterModule } from '@angular/router';
import { NizChipModule, NizInlineSvgModule } from '@notiz/ngx-design';
import { ArticleComponent } from './article.component';
import { PipesModule } from '@pipes/pipes.module';
import { MarkdownModule } from 'ngx-markdown';

@NgModule({
declarations: [ArticleComponent],
Expand All @@ -13,7 +12,6 @@ import { MarkdownModule } from 'ngx-markdown';
RouterModule,
NizChipModule,
PipesModule,
MarkdownModule.forChild(),
NizInlineSvgModule,
],
exports: [ArticleComponent],
Expand Down
6 changes: 6 additions & 0 deletions src/app/components/badge/badge.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<span
class="ml-2 rounded-full px-2 py-0.5 text-xs tracking-wide uppercase font-semibold align-middle"
[ngClass]="[typeStylesBg]"
>
<span [ngClass]="[typeStylesText]"> <ng-content></ng-content> </span>
</span>
Empty file.
25 changes: 25 additions & 0 deletions src/app/components/badge/badge.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { BadgeComponent } from './badge.component';

describe('BadgeComponent', () => {
let component: BadgeComponent;
let fixture: ComponentFixture<BadgeComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ BadgeComponent ]
})
.compileComponents();
});

beforeEach(() => {
fixture = TestBed.createComponent(BadgeComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
Loading