diff --git a/apps/angular/1-projection/project.json b/apps/angular/1-projection/project.json index 42ed1604f..1b8d55c8d 100644 --- a/apps/angular/1-projection/project.json +++ b/apps/angular/1-projection/project.json @@ -15,12 +15,12 @@ "main": "apps/angular/1-projection/src/main.ts", "polyfills": ["apps/angular/1-projection/src/polyfills.ts"], "tsConfig": "apps/angular/1-projection/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/1-projection/src/favicon.ico", "apps/angular/1-projection/src/assets" ], - "styles": ["apps/angular/1-projection/src/styles.scss"], + "styles": ["apps/angular/1-projection/src/styles.css"], "scripts": [], "allowedCommonJsDependencies": ["seedrandom"] }, diff --git a/apps/angular/1-projection/src/styles.scss b/apps/angular/1-projection/src/styles.css similarity index 100% rename from apps/angular/1-projection/src/styles.scss rename to apps/angular/1-projection/src/styles.css diff --git a/apps/angular/10-utility-wrapper-pipe/project.json b/apps/angular/10-utility-wrapper-pipe/project.json index 37a204043..d4b63f2dc 100644 --- a/apps/angular/10-utility-wrapper-pipe/project.json +++ b/apps/angular/10-utility-wrapper-pipe/project.json @@ -15,12 +15,12 @@ "main": "apps/angular/10-utility-wrapper-pipe/src/main.ts", "polyfills": "apps/angular/10-utility-wrapper-pipe/src/polyfills.ts", "tsConfig": "apps/angular/10-utility-wrapper-pipe/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/10-utility-wrapper-pipe/src/favicon.ico", "apps/angular/10-utility-wrapper-pipe/src/assets" ], - "styles": ["apps/angular/10-utility-wrapper-pipe/src/styles.scss"], + "styles": ["apps/angular/10-utility-wrapper-pipe/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/10-utility-wrapper-pipe/src/styles.scss b/apps/angular/10-utility-wrapper-pipe/src/styles.css similarity index 100% rename from apps/angular/10-utility-wrapper-pipe/src/styles.scss rename to apps/angular/10-utility-wrapper-pipe/src/styles.css diff --git a/apps/angular/13-highly-customizable-css/project.json b/apps/angular/13-highly-customizable-css/project.json index c20d3bb48..6fd3129e0 100644 --- a/apps/angular/13-highly-customizable-css/project.json +++ b/apps/angular/13-highly-customizable-css/project.json @@ -15,12 +15,12 @@ "main": "apps/angular/13-highly-customizable-css/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/angular/13-highly-customizable-css/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/13-highly-customizable-css/src/favicon.ico", "apps/angular/13-highly-customizable-css/src/assets" ], - "styles": ["apps/angular/13-highly-customizable-css/src/styles.scss"], + "styles": ["apps/angular/13-highly-customizable-css/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/13-highly-customizable-css/src/styles.scss b/apps/angular/13-highly-customizable-css/src/styles.css similarity index 100% rename from apps/angular/13-highly-customizable-css/src/styles.scss rename to apps/angular/13-highly-customizable-css/src/styles.css diff --git a/apps/angular/16-master-dependency-injection/project.json b/apps/angular/16-master-dependency-injection/project.json index 4eb6bd95e..6a950abc5 100644 --- a/apps/angular/16-master-dependency-injection/project.json +++ b/apps/angular/16-master-dependency-injection/project.json @@ -15,13 +15,13 @@ "main": "apps/angular/16-master-dependency-injection/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/angular/16-master-dependency-injection/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/16-master-dependency-injection/src/favicon.ico", "apps/angular/16-master-dependency-injection/src/assets" ], "styles": [ - "apps/angular/16-master-dependency-injection/src/styles.scss" + "apps/angular/16-master-dependency-injection/src/styles.css" ], "scripts": [] }, diff --git a/apps/angular/16-master-dependency-injection/src/styles.scss b/apps/angular/16-master-dependency-injection/src/styles.css similarity index 100% rename from apps/angular/16-master-dependency-injection/src/styles.scss rename to apps/angular/16-master-dependency-injection/src/styles.css diff --git a/apps/angular/21-anchor-navigation/project.json b/apps/angular/21-anchor-navigation/project.json index 782bb1ec4..4a71ab318 100644 --- a/apps/angular/21-anchor-navigation/project.json +++ b/apps/angular/21-anchor-navigation/project.json @@ -15,12 +15,12 @@ "main": "apps/angular/21-anchor-navigation/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/angular/21-anchor-navigation/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/21-anchor-navigation/src/favicon.ico", "apps/angular/21-anchor-navigation/src/assets" ], - "styles": ["apps/angular/21-anchor-navigation/src/styles.scss"], + "styles": ["apps/angular/21-anchor-navigation/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/21-anchor-navigation/src/styles.scss b/apps/angular/21-anchor-navigation/src/styles.css similarity index 100% rename from apps/angular/21-anchor-navigation/src/styles.scss rename to apps/angular/21-anchor-navigation/src/styles.css diff --git a/apps/angular/22-router-input/project.json b/apps/angular/22-router-input/project.json index d0cd43a08..c33a95d7e 100644 --- a/apps/angular/22-router-input/project.json +++ b/apps/angular/22-router-input/project.json @@ -19,7 +19,7 @@ "apps/angular/22-router-input/src/favicon.ico", "apps/angular/22-router-input/src/assets" ], - "styles": ["apps/angular/22-router-input/src/styles.scss"], + "styles": ["apps/angular/22-router-input/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/22-router-input/src/styles.scss b/apps/angular/22-router-input/src/styles.css similarity index 100% rename from apps/angular/22-router-input/src/styles.scss rename to apps/angular/22-router-input/src/styles.css diff --git a/apps/angular/31-module-to-standalone/project.json b/apps/angular/31-module-to-standalone/project.json index b02e0a0a8..70e24ad62 100644 --- a/apps/angular/31-module-to-standalone/project.json +++ b/apps/angular/31-module-to-standalone/project.json @@ -19,7 +19,7 @@ "apps/angular/31-module-to-standalone/src/favicon.ico", "apps/angular/31-module-to-standalone/src/assets" ], - "styles": ["apps/angular/31-module-to-standalone/src/styles.scss"], + "styles": ["apps/angular/31-module-to-standalone/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/31-module-to-standalone/src/styles.scss b/apps/angular/31-module-to-standalone/src/styles.css similarity index 100% rename from apps/angular/31-module-to-standalone/src/styles.scss rename to apps/angular/31-module-to-standalone/src/styles.css diff --git a/apps/angular/32-change-detection-bug/project.json b/apps/angular/32-change-detection-bug/project.json index 977b76334..d13ecfd4a 100644 --- a/apps/angular/32-change-detection-bug/project.json +++ b/apps/angular/32-change-detection-bug/project.json @@ -19,7 +19,7 @@ "apps/angular/32-change-detection-bug/src/favicon.ico", "apps/angular/32-change-detection-bug/src/assets" ], - "styles": ["apps/angular/32-change-detection-bug/src/styles.scss"], + "styles": ["apps/angular/32-change-detection-bug/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/32-change-detection-bug/src/app/main-navigation.component.ts b/apps/angular/32-change-detection-bug/src/app/main-navigation.component.ts index 1a3a5e93a..411127672 100644 --- a/apps/angular/32-change-detection-bug/src/app/main-navigation.component.ts +++ b/apps/angular/32-change-detection-bug/src/app/main-navigation.component.ts @@ -21,13 +21,12 @@ interface MenuItem { } `, - styles: [ - ` - a.isSelected { - @apply bg-gray-600 text-white; - } - `, - ], + styles: ` + @reference "tailwindcss"; + a.isSelected { + @apply bg-gray-600 text-white; + } + `, host: { class: 'flex flex-col p-2 gap-2', }, diff --git a/apps/angular/32-change-detection-bug/src/styles.scss b/apps/angular/32-change-detection-bug/src/styles.css similarity index 100% rename from apps/angular/32-change-detection-bug/src/styles.scss rename to apps/angular/32-change-detection-bug/src/styles.css diff --git a/apps/angular/33-decoupling-components/project.json b/apps/angular/33-decoupling-components/project.json index c4140b61b..95ac6150a 100644 --- a/apps/angular/33-decoupling-components/project.json +++ b/apps/angular/33-decoupling-components/project.json @@ -19,7 +19,7 @@ "apps/angular/33-decoupling-components/src/favicon.ico", "apps/angular/33-decoupling-components/src/assets" ], - "styles": ["apps/angular/33-decoupling-components/src/styles.scss"], + "styles": ["apps/angular/33-decoupling-components/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/33-decoupling-components/src/styles.scss b/apps/angular/33-decoupling-components/src/styles.css similarity index 100% rename from apps/angular/33-decoupling-components/src/styles.scss rename to apps/angular/33-decoupling-components/src/styles.css diff --git a/apps/angular/39-injection-token/project.json b/apps/angular/39-injection-token/project.json index 135c0c0f6..855d093b4 100644 --- a/apps/angular/39-injection-token/project.json +++ b/apps/angular/39-injection-token/project.json @@ -19,7 +19,7 @@ "apps/angular/39-injection-token/src/favicon.ico", "apps/angular/39-injection-token/src/assets" ], - "styles": ["apps/angular/39-injection-token/src/styles.scss"], + "styles": ["apps/angular/39-injection-token/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/39-injection-token/src/styles.scss b/apps/angular/39-injection-token/src/styles.css similarity index 100% rename from apps/angular/39-injection-token/src/styles.scss rename to apps/angular/39-injection-token/src/styles.css diff --git a/apps/angular/4-typed-context-outlet/project.json b/apps/angular/4-typed-context-outlet/project.json index 273bca97d..474ffb71c 100644 --- a/apps/angular/4-typed-context-outlet/project.json +++ b/apps/angular/4-typed-context-outlet/project.json @@ -15,12 +15,12 @@ "main": "apps/angular/4-typed-context-outlet/src/main.ts", "polyfills": "apps/angular/4-typed-context-outlet/src/polyfills.ts", "tsConfig": "apps/angular/4-typed-context-outlet/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/4-typed-context-outlet/src/favicon.ico", "apps/angular/4-typed-context-outlet/src/assets" ], - "styles": ["apps/angular/4-typed-context-outlet/src/styles.scss"], + "styles": ["apps/angular/4-typed-context-outlet/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/4-typed-context-outlet/src/styles.scss b/apps/angular/4-typed-context-outlet/src/styles.css similarity index 100% rename from apps/angular/4-typed-context-outlet/src/styles.scss rename to apps/angular/4-typed-context-outlet/src/styles.css diff --git a/apps/angular/44-view-transition/project.json b/apps/angular/44-view-transition/project.json index 4104b5de9..0bd96fd98 100644 --- a/apps/angular/44-view-transition/project.json +++ b/apps/angular/44-view-transition/project.json @@ -15,12 +15,12 @@ "browser": "apps/angular/44-view-transition/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/angular/44-view-transition/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/44-view-transition/src/favicon.ico", "apps/angular/44-view-transition/src/assets" ], - "styles": ["apps/angular/44-view-transition/src/styles.scss"], + "styles": ["apps/angular/44-view-transition/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/44-view-transition/src/styles.scss b/apps/angular/44-view-transition/src/styles.css similarity index 100% rename from apps/angular/44-view-transition/src/styles.scss rename to apps/angular/44-view-transition/src/styles.css diff --git a/apps/angular/45-react-in-angular/project.json b/apps/angular/45-react-in-angular/project.json index 8a3bf02fc..4b5578238 100644 --- a/apps/angular/45-react-in-angular/project.json +++ b/apps/angular/45-react-in-angular/project.json @@ -15,12 +15,12 @@ "browser": "apps/angular/45-react-in-angular/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/angular/45-react-in-angular/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/45-react-in-angular/src/favicon.ico", "apps/angular/45-react-in-angular/src/assets" ], - "styles": ["apps/angular/45-react-in-angular/src/styles.scss"], + "styles": ["apps/angular/45-react-in-angular/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/45-react-in-angular/src/styles.scss b/apps/angular/45-react-in-angular/src/styles.css similarity index 100% rename from apps/angular/45-react-in-angular/src/styles.scss rename to apps/angular/45-react-in-angular/src/styles.css diff --git a/apps/angular/46-simple-animations/project.json b/apps/angular/46-simple-animations/project.json index 34e44c7b3..c6f40c9d6 100644 --- a/apps/angular/46-simple-animations/project.json +++ b/apps/angular/46-simple-animations/project.json @@ -15,12 +15,12 @@ "browser": "apps/angular/46-simple-animations/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/angular/46-simple-animations/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/46-simple-animations/src/favicon.ico", "apps/angular/46-simple-animations/src/assets" ], - "styles": ["apps/angular/46-simple-animations/src/styles.scss"], + "styles": ["apps/angular/46-simple-animations/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/46-simple-animations/src/app/app.component.ts b/apps/angular/46-simple-animations/src/app/app.component.ts index ae63db419..576c9915e 100644 --- a/apps/angular/46-simple-animations/src/app/app.component.ts +++ b/apps/angular/46-simple-animations/src/app/app.component.ts @@ -4,6 +4,8 @@ import { Component } from '@angular/core'; imports: [], selector: 'app-root', styles: ` +@reference "tailwindcss"; + section { @apply flex flex-1 flex-col gap-5; } diff --git a/apps/angular/46-simple-animations/src/styles.scss b/apps/angular/46-simple-animations/src/styles.css similarity index 100% rename from apps/angular/46-simple-animations/src/styles.scss rename to apps/angular/46-simple-animations/src/styles.css diff --git a/apps/angular/5-crud-application/project.json b/apps/angular/5-crud-application/project.json index a31bd62a7..a718f02b6 100644 --- a/apps/angular/5-crud-application/project.json +++ b/apps/angular/5-crud-application/project.json @@ -15,14 +15,14 @@ "main": "apps/angular/5-crud-application/src/main.ts", "polyfills": "apps/angular/5-crud-application/src/polyfills.ts", "tsConfig": "apps/angular/5-crud-application/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/5-crud-application/src/favicon.ico", "apps/angular/5-crud-application/src/assets" ], "styles": [ "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", - "apps/angular/5-crud-application/src/styles.scss" + "apps/angular/5-crud-application/src/styles.css" ], "scripts": [], "allowedCommonJsDependencies": ["seedrandom"] diff --git a/apps/angular/5-crud-application/src/styles.scss b/apps/angular/5-crud-application/src/styles.css similarity index 100% rename from apps/angular/5-crud-application/src/styles.scss rename to apps/angular/5-crud-application/src/styles.css diff --git a/apps/angular/52-lazy-load-component/project.json b/apps/angular/52-lazy-load-component/project.json index 933dd17e5..3c93dbd77 100644 --- a/apps/angular/52-lazy-load-component/project.json +++ b/apps/angular/52-lazy-load-component/project.json @@ -15,12 +15,12 @@ "browser": "apps/angular/52-lazy-load-component/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/angular/52-lazy-load-component/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/52-lazy-load-component/src/favicon.ico", "apps/angular/52-lazy-load-component/src/assets" ], - "styles": ["apps/angular/52-lazy-load-component/src/styles.scss"], + "styles": ["apps/angular/52-lazy-load-component/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/52-lazy-load-component/src/styles.scss b/apps/angular/52-lazy-load-component/src/styles.css similarity index 100% rename from apps/angular/52-lazy-load-component/src/styles.scss rename to apps/angular/52-lazy-load-component/src/styles.css diff --git a/apps/angular/55-back-button-navigation/src/app/app.component.ts b/apps/angular/55-back-button-navigation/src/app/app.component.ts index baffdae25..3cec76af7 100644 --- a/apps/angular/55-back-button-navigation/src/app/app.component.ts +++ b/apps/angular/55-back-button-navigation/src/app/app.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; -import { RouterLink, RouterOutlet } from '@angular/router'; +import { RouterOutlet } from '@angular/router'; @Component({ - imports: [RouterOutlet, RouterLink], + imports: [RouterOutlet], selector: 'app-root', templateUrl: './app.component.html', }) diff --git a/apps/angular/55-back-button-navigation/src/app/app.routes.ts b/apps/angular/55-back-button-navigation/src/app/app.routes.ts index 7deecd57a..aa9619125 100644 --- a/apps/angular/55-back-button-navigation/src/app/app.routes.ts +++ b/apps/angular/55-back-button-navigation/src/app/app.routes.ts @@ -1,4 +1,5 @@ import { Routes } from '@angular/router'; +import { guardNavigationGuard } from './core/guard-navigation.guard'; import { HomeComponent } from './home/home.component'; import { SensitiveActionComponent } from './sensitive-action/sensitive-action.component'; import { SimpleActionComponent } from './simple-action/simple-action.component'; @@ -16,9 +17,11 @@ export const APP_ROUTES: Routes = [ { path: 'simple-action', component: SimpleActionComponent, + canDeactivate: [guardNavigationGuard], }, { path: 'sensitive-action', component: SensitiveActionComponent, + canDeactivate: [guardNavigationGuard], }, ]; diff --git a/apps/angular/55-back-button-navigation/src/app/back-button-navigation-handler.ts b/apps/angular/55-back-button-navigation/src/app/back-button-navigation-handler.ts new file mode 100644 index 000000000..b9f3124cb --- /dev/null +++ b/apps/angular/55-back-button-navigation/src/app/back-button-navigation-handler.ts @@ -0,0 +1,4 @@ +export interface BackButtonNavigationHandler { + canDeactivate(): boolean; + handleBackNavigation(): void; +} diff --git a/apps/angular/55-back-button-navigation/src/app/core/guard-navigation.guard.ts b/apps/angular/55-back-button-navigation/src/app/core/guard-navigation.guard.ts new file mode 100644 index 000000000..d7e343af9 --- /dev/null +++ b/apps/angular/55-back-button-navigation/src/app/core/guard-navigation.guard.ts @@ -0,0 +1,13 @@ +import { CanDeactivateFn } from '@angular/router'; +import { BackButtonNavigationHandler } from '../back-button-navigation-handler'; + +export const guardNavigationGuard: CanDeactivateFn< + BackButtonNavigationHandler +> = (component) => { + if (component.canDeactivate()) { + return true; + } + + component.handleBackNavigation(); + return false; +}; diff --git a/apps/angular/55-back-button-navigation/src/app/dialog/dialog.component.html b/apps/angular/55-back-button-navigation/src/app/dialog/dialog.component.html index ff00ea965..5ee57e92f 100644 --- a/apps/angular/55-back-button-navigation/src/app/dialog/dialog.component.html +++ b/apps/angular/55-back-button-navigation/src/app/dialog/dialog.component.html @@ -1,6 +1,12 @@ -

Delete file

-Would you like to delete cat.jpeg? +

{{ data?.title ?? 'Delete file' }}

+ + {{ data?.content ?? 'Would you like to delete cat.jpeg?' }} + - - + + diff --git a/apps/angular/55-back-button-navigation/src/app/dialog/dialog.component.ts b/apps/angular/55-back-button-navigation/src/app/dialog/dialog.component.ts index 9a9dd0fef..c3f183116 100644 --- a/apps/angular/55-back-button-navigation/src/app/dialog/dialog.component.ts +++ b/apps/angular/55-back-button-navigation/src/app/dialog/dialog.component.ts @@ -1,6 +1,7 @@ import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { + MAT_DIALOG_DATA, MatDialogActions, MatDialogClose, MatDialogContent, @@ -21,5 +22,15 @@ import { changeDetection: ChangeDetectionStrategy.OnPush, }) export class DialogComponent { + readonly data = inject(MAT_DIALOG_DATA, { + optional: true, + }); readonly dialogRef = inject(MatDialogRef); } + +export interface DialogData { + title: string; + content: string; + cancelLabel?: string; + confirmLabel?: string; +} diff --git a/apps/angular/55-back-button-navigation/src/app/sensitive-action/sensitive-action.component.ts b/apps/angular/55-back-button-navigation/src/app/sensitive-action/sensitive-action.component.ts index a97282c33..957f15515 100644 --- a/apps/angular/55-back-button-navigation/src/app/sensitive-action/sensitive-action.component.ts +++ b/apps/angular/55-back-button-navigation/src/app/sensitive-action/sensitive-action.component.ts @@ -1,6 +1,7 @@ import { Component, inject } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; -import { MatDialog } from '@angular/material/dialog'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { BackButtonNavigationHandler } from '../back-button-navigation-handler'; import { DialogComponent } from '../dialog/dialog.component'; @Component({ @@ -8,12 +9,50 @@ import { DialogComponent } from '../dialog/dialog.component'; selector: 'app-sensitive-action', templateUrl: './sensitive-action.component.html', }) -export class SensitiveActionComponent { +export class SensitiveActionComponent implements BackButtonNavigationHandler { readonly #dialog = inject(MatDialog); + #initialDialogRef: MatDialogRef | null = null; + #confirmationDialogRef: MatDialogRef | null = null; openDialog(): void { - this.#dialog.open(DialogComponent, { + this.#initialDialogRef = this.#dialog.open(DialogComponent, { width: '250px', + closeOnNavigation: false, }); + + this.#initialDialogRef.afterClosed().subscribe(() => { + this.#initialDialogRef = null; + this.#confirmationDialogRef?.close(); + this.#confirmationDialogRef = null; + }); + } + + canDeactivate(): boolean { + return !this.#initialDialogRef && !this.#confirmationDialogRef; + } + + handleBackNavigation(): void { + if (this.#confirmationDialogRef) { + this.#confirmationDialogRef.close(); + return; + } + + if (this.#initialDialogRef) { + this.#confirmationDialogRef = this.#dialog.open(DialogComponent, { + width: '250px', + closeOnNavigation: false, + data: { + title: 'Confirm navigation', + content: + 'A sensitive dialog is still open. Press Back again to close this confirmation and stay here.', + cancelLabel: 'Stay', + confirmLabel: 'Ok', + }, + }); + + this.#confirmationDialogRef.afterClosed().subscribe(() => { + this.#confirmationDialogRef = null; + }); + } } } diff --git a/apps/angular/55-back-button-navigation/src/app/simple-action/simple-action.component.ts b/apps/angular/55-back-button-navigation/src/app/simple-action/simple-action.component.ts index fe97e7368..a8cac2ccb 100644 --- a/apps/angular/55-back-button-navigation/src/app/simple-action/simple-action.component.ts +++ b/apps/angular/55-back-button-navigation/src/app/simple-action/simple-action.component.ts @@ -1,6 +1,7 @@ import { Component, inject } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatDialog } from '@angular/material/dialog'; +import { BackButtonNavigationHandler } from '../back-button-navigation-handler'; import { DialogComponent } from '../dialog/dialog.component'; @Component({ @@ -8,12 +9,21 @@ import { DialogComponent } from '../dialog/dialog.component'; selector: 'app-simple-action', templateUrl: './simple-action.component.html', }) -export class SimpleActionComponent { +export class SimpleActionComponent implements BackButtonNavigationHandler { readonly #dialog = inject(MatDialog); openDialog(): void { this.#dialog.open(DialogComponent, { width: '250px', + closeOnNavigation: false, }); } + + canDeactivate(): boolean { + return this.#dialog.openDialogs.length === 0; + } + + handleBackNavigation(): void { + this.#dialog.closeAll(); + } } diff --git a/apps/angular/57-content-projection-default/project.json b/apps/angular/57-content-projection-default/project.json index 0630925f4..f5b785bf5 100644 --- a/apps/angular/57-content-projection-default/project.json +++ b/apps/angular/57-content-projection-default/project.json @@ -15,16 +15,14 @@ "browser": "apps/angular/57-content-projection-default/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/angular/57-content-projection-default/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ { "glob": "**/*", "input": "apps/angular/57-content-projection-default/public" } ], - "styles": [ - "apps/angular/57-content-projection-default/src/styles.scss" - ], + "styles": ["apps/angular/57-content-projection-default/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/57-content-projection-default/src/styles.scss b/apps/angular/57-content-projection-default/src/styles.css similarity index 100% rename from apps/angular/57-content-projection-default/src/styles.scss rename to apps/angular/57-content-projection-default/src/styles.css diff --git a/apps/angular/58-content-projection-condition/project.json b/apps/angular/58-content-projection-condition/project.json index b268984a2..b2209c370 100644 --- a/apps/angular/58-content-projection-condition/project.json +++ b/apps/angular/58-content-projection-condition/project.json @@ -15,7 +15,7 @@ "browser": "apps/angular/58-content-projection-condition/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/angular/58-content-projection-condition/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ { "glob": "**/*", @@ -23,7 +23,7 @@ } ], "styles": [ - "apps/angular/58-content-projection-condition/src/styles.scss" + "apps/angular/58-content-projection-condition/src/styles.css" ], "scripts": [] }, diff --git a/apps/angular/58-content-projection-condition/src/styles.scss b/apps/angular/58-content-projection-condition/src/styles.css similarity index 100% rename from apps/angular/58-content-projection-condition/src/styles.scss rename to apps/angular/58-content-projection-condition/src/styles.css diff --git a/apps/angular/59-content-projection-defer/project.json b/apps/angular/59-content-projection-defer/project.json index efd270b03..b0ed8ed2d 100644 --- a/apps/angular/59-content-projection-defer/project.json +++ b/apps/angular/59-content-projection-defer/project.json @@ -15,14 +15,14 @@ "browser": "apps/angular/59-content-projection-defer/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/angular/59-content-projection-defer/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ { "glob": "**/*", "input": "apps/angular/59-content-projection-defer/public" } ], - "styles": ["apps/angular/59-content-projection-defer/src/styles.scss"], + "styles": ["apps/angular/59-content-projection-defer/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/59-content-projection-defer/src/app/page-2.ts b/apps/angular/59-content-projection-defer/src/app/page-2.ts index 5665466d8..591db401a 100644 --- a/apps/angular/59-content-projection-defer/src/app/page-2.ts +++ b/apps/angular/59-content-projection-defer/src/app/page-2.ts @@ -1,9 +1,5 @@ import { httpResource } from '@angular/common/http'; -import { - ChangeDetectionStrategy, - Component, - ResourceStatus, -} from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ExpandableCard } from './expandable-card'; interface Post { @@ -22,7 +18,7 @@ interface Post {
@if (postResource.isLoading()) { Loading... - } @else if (postResource.status() === ResourceStatus.Error) { + } @else if (postResource.status() === 'error') { Error... } @else { @for (post of postResource.value(); track post.id) { @@ -37,7 +33,6 @@ interface Post { }) export class Page2 { public postResource = httpResource( - 'https://jsonplaceholder.typicode.com/posts', + () => 'https://jsonplaceholder.typicode.com/posts', ); - protected readonly ResourceStatus = ResourceStatus; } diff --git a/apps/angular/59-content-projection-defer/src/styles.scss b/apps/angular/59-content-projection-defer/src/styles.css similarity index 100% rename from apps/angular/59-content-projection-defer/src/styles.scss rename to apps/angular/59-content-projection-defer/src/styles.css diff --git a/apps/angular/6-structural-directive/project.json b/apps/angular/6-structural-directive/project.json index 399418f90..5f7ad710d 100644 --- a/apps/angular/6-structural-directive/project.json +++ b/apps/angular/6-structural-directive/project.json @@ -15,12 +15,12 @@ "main": "apps/angular/6-structural-directive/src/main.ts", "polyfills": "apps/angular/6-structural-directive/src/polyfills.ts", "tsConfig": "apps/angular/6-structural-directive/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/6-structural-directive/src/favicon.ico", "apps/angular/6-structural-directive/src/assets" ], - "styles": ["apps/angular/6-structural-directive/src/styles.scss"], + "styles": ["apps/angular/6-structural-directive/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/6-structural-directive/src/styles.scss b/apps/angular/6-structural-directive/src/styles.css similarity index 100% rename from apps/angular/6-structural-directive/src/styles.scss rename to apps/angular/6-structural-directive/src/styles.css diff --git a/apps/angular/60-async-redirect/project.json b/apps/angular/60-async-redirect/project.json index eebd6d7a2..74de440e5 100644 --- a/apps/angular/60-async-redirect/project.json +++ b/apps/angular/60-async-redirect/project.json @@ -14,14 +14,14 @@ "browser": "apps/angular/60-async-redirect/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/angular/60-async-redirect/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ { "glob": "**/*", "input": "apps/angular/60-async-redirect/public" } ], - "styles": ["apps/angular/60-async-redirect/src/styles.scss"] + "styles": ["apps/angular/60-async-redirect/src/styles.css"] }, "configurations": { "production": { diff --git a/apps/angular/60-async-redirect/src/styles.scss b/apps/angular/60-async-redirect/src/styles.css similarity index 100% rename from apps/angular/60-async-redirect/src/styles.scss rename to apps/angular/60-async-redirect/src/styles.css diff --git a/apps/angular/8-pure-pipe/project.json b/apps/angular/8-pure-pipe/project.json index 26f507b63..b0a657de5 100644 --- a/apps/angular/8-pure-pipe/project.json +++ b/apps/angular/8-pure-pipe/project.json @@ -15,12 +15,12 @@ "main": "apps/angular/8-pure-pipe/src/main.ts", "polyfills": "apps/angular/8-pure-pipe/src/polyfills.ts", "tsConfig": "apps/angular/8-pure-pipe/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/8-pure-pipe/src/favicon.ico", "apps/angular/8-pure-pipe/src/assets" ], - "styles": ["apps/angular/8-pure-pipe/src/styles.scss"], + "styles": ["apps/angular/8-pure-pipe/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/8-pure-pipe/src/styles.scss b/apps/angular/8-pure-pipe/src/styles.css similarity index 100% rename from apps/angular/8-pure-pipe/src/styles.scss rename to apps/angular/8-pure-pipe/src/styles.css diff --git a/apps/angular/9-wrap-function-pipe/project.json b/apps/angular/9-wrap-function-pipe/project.json index ce32ac0c1..d87fca5ca 100644 --- a/apps/angular/9-wrap-function-pipe/project.json +++ b/apps/angular/9-wrap-function-pipe/project.json @@ -15,12 +15,12 @@ "main": "apps/angular/9-wrap-function-pipe/src/main.ts", "polyfills": "apps/angular/9-wrap-function-pipe/src/polyfills.ts", "tsConfig": "apps/angular/9-wrap-function-pipe/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/angular/9-wrap-function-pipe/src/favicon.ico", "apps/angular/9-wrap-function-pipe/src/assets" ], - "styles": ["apps/angular/9-wrap-function-pipe/src/styles.scss"], + "styles": ["apps/angular/9-wrap-function-pipe/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/angular/9-wrap-function-pipe/src/styles.scss b/apps/angular/9-wrap-function-pipe/src/styles.css similarity index 100% rename from apps/angular/9-wrap-function-pipe/src/styles.scss rename to apps/angular/9-wrap-function-pipe/src/styles.css diff --git a/apps/forms/41-control-value-accessor/project.json b/apps/forms/41-control-value-accessor/project.json index e9012bd49..1549fa14c 100644 --- a/apps/forms/41-control-value-accessor/project.json +++ b/apps/forms/41-control-value-accessor/project.json @@ -15,12 +15,12 @@ "browser": "apps/forms/41-control-value-accessor/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/forms/41-control-value-accessor/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/forms/41-control-value-accessor/src/favicon.ico", "apps/forms/41-control-value-accessor/src/assets" ], - "styles": ["apps/forms/41-control-value-accessor/src/styles.scss"], + "styles": ["apps/forms/41-control-value-accessor/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.scss b/apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.css similarity index 100% rename from apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.scss rename to apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.css diff --git a/apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.ts b/apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.ts index 4110d6cf7..fdbafddc2 100644 --- a/apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.ts +++ b/apps/forms/41-control-value-accessor/src/app/feedback-form/feedback-form.component.ts @@ -11,7 +11,7 @@ import { RatingControlComponent } from '../rating-control/rating-control.compone imports: [RatingControlComponent, ReactiveFormsModule], selector: 'app-feedback-form', templateUrl: 'feedback-form.component.html', - styleUrls: ['feedback-form.component.scss'], + styleUrls: ['feedback-form.component.css'], }) export class FeedbackFormComponent { @Output() diff --git a/apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.scss b/apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.css similarity index 100% rename from apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.scss rename to apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.css diff --git a/apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.ts b/apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.ts index 5562d1f99..629f5d084 100644 --- a/apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.ts +++ b/apps/forms/41-control-value-accessor/src/app/rating-control/rating-control.component.ts @@ -3,7 +3,7 @@ import { Component, EventEmitter, Output } from '@angular/core'; @Component({ selector: 'app-rating-control', templateUrl: 'rating-control.component.html', - styleUrls: ['rating-control.component.scss'], + styleUrls: ['rating-control.component.css'], }) export class RatingControlComponent { @Output() diff --git a/apps/forms/41-control-value-accessor/src/styles.scss b/apps/forms/41-control-value-accessor/src/styles.css similarity index 100% rename from apps/forms/41-control-value-accessor/src/styles.scss rename to apps/forms/41-control-value-accessor/src/styles.css diff --git a/apps/forms/48-avoid-losing-form-data/project.json b/apps/forms/48-avoid-losing-form-data/project.json index 5bfe98931..a33e6c329 100644 --- a/apps/forms/48-avoid-losing-form-data/project.json +++ b/apps/forms/48-avoid-losing-form-data/project.json @@ -15,13 +15,13 @@ "browser": "apps/forms/48-avoid-losing-form-data/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/forms/48-avoid-losing-form-data/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/forms/48-avoid-losing-form-data/src/favicon.ico", "apps/forms/48-avoid-losing-form-data/src/assets" ], "styles": [ - "apps/forms/48-avoid-losing-form-data/src/styles.scss", + "apps/forms/48-avoid-losing-form-data/src/styles.css", "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css" ], "scripts": [] diff --git a/apps/forms/48-avoid-losing-form-data/src/styles.scss b/apps/forms/48-avoid-losing-form-data/src/styles.css similarity index 100% rename from apps/forms/48-avoid-losing-form-data/src/styles.scss rename to apps/forms/48-avoid-losing-form-data/src/styles.css diff --git a/apps/forms/61-simplest-signal-form/project.json b/apps/forms/61-simplest-signal-form/project.json index 9778ceecc..7a19eedc4 100644 --- a/apps/forms/61-simplest-signal-form/project.json +++ b/apps/forms/61-simplest-signal-form/project.json @@ -13,14 +13,14 @@ "outputPath": "dist/apps/forms/61-simplest-signal-form", "browser": "apps/forms/61-simplest-signal-form/src/main.ts", "tsConfig": "apps/forms/61-simplest-signal-form/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ { "glob": "**/*", "input": "apps/forms/61-simplest-signal-form/public" } ], - "styles": ["apps/forms/61-simplest-signal-form/src/styles.scss"] + "styles": ["apps/forms/61-simplest-signal-form/src/styles.css"] }, "configurations": { "production": { diff --git a/apps/forms/61-simplest-signal-form/src/styles.scss b/apps/forms/61-simplest-signal-form/src/styles.css similarity index 100% rename from apps/forms/61-simplest-signal-form/src/styles.scss rename to apps/forms/61-simplest-signal-form/src/styles.css diff --git a/apps/forms/62-crossfield-validation-signal-form/project.json b/apps/forms/62-crossfield-validation-signal-form/project.json index e7acff839..26b75e26f 100644 --- a/apps/forms/62-crossfield-validation-signal-form/project.json +++ b/apps/forms/62-crossfield-validation-signal-form/project.json @@ -13,7 +13,7 @@ "outputPath": "dist/apps/forms/62-crossfield-validation-signal-form", "browser": "apps/forms/62-crossfield-validation-signal-form/src/main.ts", "tsConfig": "apps/forms/62-crossfield-validation-signal-form/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ { "glob": "**/*", @@ -21,7 +21,7 @@ } ], "styles": [ - "apps/forms/62-crossfield-validation-signal-form/src/styles.scss" + "apps/forms/62-crossfield-validation-signal-form/src/styles.css" ] }, "configurations": { diff --git a/apps/forms/62-crossfield-validation-signal-form/src/styles.scss b/apps/forms/62-crossfield-validation-signal-form/src/styles.css similarity index 100% rename from apps/forms/62-crossfield-validation-signal-form/src/styles.scss rename to apps/forms/62-crossfield-validation-signal-form/src/styles.css diff --git a/apps/forms/63-child-forms/project.json b/apps/forms/63-child-forms/project.json index c6b17d3c6..9c36c9c8e 100644 --- a/apps/forms/63-child-forms/project.json +++ b/apps/forms/63-child-forms/project.json @@ -13,14 +13,14 @@ "outputPath": "dist/apps/forms/63-child-forms", "browser": "apps/forms/63-child-forms/src/main.ts", "tsConfig": "apps/forms/63-child-forms/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ { "glob": "**/*", "input": "apps/forms/63-child-forms/public" } ], - "styles": ["apps/forms/63-child-forms/src/styles.scss"] + "styles": ["apps/forms/63-child-forms/src/styles.css"] }, "configurations": { "production": { diff --git a/apps/forms/63-child-forms/src/app/app.component.ts b/apps/forms/63-child-forms/src/app/app.component.ts index ff074abff..86ca767fa 100644 --- a/apps/forms/63-child-forms/src/app/app.component.ts +++ b/apps/forms/63-child-forms/src/app/app.component.ts @@ -201,7 +201,7 @@ type CheckoutForm = {
@@ -220,8 +220,10 @@ type CheckoutForm = { `, styles: [ ` + @reference "tailwindcss"; + .input { - @apply w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm shadow-sm outline-none transition focus:border-indigo-500 focus:ring-2 focus:ring-indigo-200; + @apply w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm shadow-sm transition outline-none focus:border-indigo-500 focus:ring-2 focus:ring-indigo-200; } .hint { @apply text-xs text-rose-600; diff --git a/apps/forms/63-child-forms/src/styles.scss b/apps/forms/63-child-forms/src/styles.css similarity index 100% rename from apps/forms/63-child-forms/src/styles.scss rename to apps/forms/63-child-forms/src/styles.css diff --git a/apps/forms/64-form-array/project.json b/apps/forms/64-form-array/project.json index f793baa3d..1eadf45a5 100644 --- a/apps/forms/64-form-array/project.json +++ b/apps/forms/64-form-array/project.json @@ -13,14 +13,14 @@ "outputPath": "dist/apps/forms/64-form-array", "browser": "apps/forms/64-form-array/src/main.ts", "tsConfig": "apps/forms/64-form-array/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ { "glob": "**/*", "input": "apps/forms/64-form-array/public" } ], - "styles": ["apps/forms/64-form-array/src/styles.scss"] + "styles": ["apps/forms/64-form-array/src/styles.css"] }, "configurations": { "production": { @@ -33,7 +33,7 @@ { "type": "anyComponentStyle", "maximumWarning": "4kb", - "maximumError": "8kb" + "maximumError": "9kb" } ], "outputHashing": "all" diff --git a/apps/forms/64-form-array/src/app/app.component.ts b/apps/forms/64-form-array/src/app/app.component.ts index bd9e83ab8..f6133d3df 100644 --- a/apps/forms/64-form-array/src/app/app.component.ts +++ b/apps/forms/64-form-array/src/app/app.component.ts @@ -225,14 +225,16 @@ export const minLengthArray = (min: number) => { `, styles: [ ` + @reference "tailwindcss"; + .input { - @apply w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm shadow-sm outline-none transition focus:border-indigo-500 focus:ring-2 focus:ring-indigo-200; + @apply w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm shadow-sm transition outline-none focus:border-indigo-500 focus:ring-2 focus:ring-indigo-200; } .hint { @apply text-xs text-rose-600; } .btn-primary { - @apply rounded-lg bg-indigo-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-indigo-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 disabled:cursor-not-allowed disabled:bg-slate-300; + @apply rounded-lg bg-indigo-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-indigo-500 focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 focus:outline-none disabled:cursor-not-allowed disabled:bg-slate-300; } .btn-secondary { @apply rounded-lg border border-slate-200 bg-white px-3 py-2 text-sm font-semibold text-slate-700 shadow-sm transition hover:border-indigo-200 hover:text-indigo-600; diff --git a/apps/forms/64-form-array/src/styles.scss b/apps/forms/64-form-array/src/styles.css similarity index 100% rename from apps/forms/64-form-array/src/styles.scss rename to apps/forms/64-form-array/src/styles.css diff --git a/apps/nx/42-static-vs-dynamic-import/project.json b/apps/nx/42-static-vs-dynamic-import/project.json index 68332bbc6..db8cf0776 100644 --- a/apps/nx/42-static-vs-dynamic-import/project.json +++ b/apps/nx/42-static-vs-dynamic-import/project.json @@ -15,13 +15,13 @@ "browser": "apps/nx/42-static-vs-dynamic-import/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/nx/42-static-vs-dynamic-import/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/nx/42-static-vs-dynamic-import/src/favicon.ico", "apps/nx/42-static-vs-dynamic-import/src/assets" ], "styles": [ - "apps/nx/42-static-vs-dynamic-import/src/styles.scss", + "apps/nx/42-static-vs-dynamic-import/src/styles.css", "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css" ], "scripts": [] diff --git a/apps/nx/42-static-vs-dynamic-import/src/styles.scss b/apps/nx/42-static-vs-dynamic-import/src/styles.css similarity index 100% rename from apps/nx/42-static-vs-dynamic-import/src/styles.scss rename to apps/nx/42-static-vs-dynamic-import/src/styles.css diff --git a/apps/performance/12-optimize-change-detection/project.json b/apps/performance/12-optimize-change-detection/project.json index 88812e3cd..216637e7f 100644 --- a/apps/performance/12-optimize-change-detection/project.json +++ b/apps/performance/12-optimize-change-detection/project.json @@ -15,13 +15,13 @@ "main": "apps/performance/12-optimize-change-detection/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/performance/12-optimize-change-detection/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/performance/12-optimize-change-detection/src/favicon.ico", "apps/performance/12-optimize-change-detection/src/assets" ], "styles": [ - "apps/performance/12-optimize-change-detection/src/styles.scss" + "apps/performance/12-optimize-change-detection/src/styles.css" ], "scripts": [] }, diff --git a/apps/performance/12-optimize-change-detection/src/app/app.component.ts b/apps/performance/12-optimize-change-detection/src/app/app.component.ts index b6e8a7c0a..52b7fa855 100644 --- a/apps/performance/12-optimize-change-detection/src/app/app.component.ts +++ b/apps/performance/12-optimize-change-detection/src/app/app.component.ts @@ -34,7 +34,7 @@ export class AppComponent { public displayButton = signal(false); - @HostListener('window:scroll', ['$event']) + @HostListener('window:scroll') onScroll() { const pos = window.scrollY; this.displayButton.set(pos > 50); diff --git a/apps/performance/12-optimize-change-detection/src/styles.scss b/apps/performance/12-optimize-change-detection/src/styles.css similarity index 100% rename from apps/performance/12-optimize-change-detection/src/styles.scss rename to apps/performance/12-optimize-change-detection/src/styles.css diff --git a/apps/performance/34-default-vs-onpush/project.json b/apps/performance/34-default-vs-onpush/project.json index d772d9d2e..f8823c963 100644 --- a/apps/performance/34-default-vs-onpush/project.json +++ b/apps/performance/34-default-vs-onpush/project.json @@ -20,7 +20,7 @@ "apps/performance/34-default-vs-onpush/src/assets" ], "styles": [ - "apps/performance/34-default-vs-onpush/src/styles.scss", + "apps/performance/34-default-vs-onpush/src/styles.css", "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css" ], "scripts": [], diff --git a/apps/performance/34-default-vs-onpush/src/styles.scss b/apps/performance/34-default-vs-onpush/src/styles.css similarity index 100% rename from apps/performance/34-default-vs-onpush/src/styles.scss rename to apps/performance/34-default-vs-onpush/src/styles.css diff --git a/apps/performance/35-memoization/project.json b/apps/performance/35-memoization/project.json index 03f97cb21..5207dfc9d 100644 --- a/apps/performance/35-memoization/project.json +++ b/apps/performance/35-memoization/project.json @@ -20,7 +20,7 @@ "apps/performance/35-memoization/src/assets" ], "styles": [ - "apps/performance/35-memoization/src/styles.scss", + "apps/performance/35-memoization/src/styles.css", "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css" ], "scripts": [], diff --git a/apps/performance/35-memoization/src/styles.scss b/apps/performance/35-memoization/src/styles.css similarity index 100% rename from apps/performance/35-memoization/src/styles.scss rename to apps/performance/35-memoization/src/styles.css diff --git a/apps/performance/36-ngfor-optimization/project.json b/apps/performance/36-ngfor-optimization/project.json index 8a27c862e..4a520002e 100644 --- a/apps/performance/36-ngfor-optimization/project.json +++ b/apps/performance/36-ngfor-optimization/project.json @@ -20,7 +20,7 @@ "apps/performance/36-ngfor-optimization/src/assets" ], "styles": [ - "apps/performance/36-ngfor-optimization/src/styles.scss", + "apps/performance/36-ngfor-optimization/src/styles.css", "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css" ], "scripts": [], diff --git a/apps/performance/36-ngfor-optimization/src/styles.scss b/apps/performance/36-ngfor-optimization/src/styles.css similarity index 100% rename from apps/performance/36-ngfor-optimization/src/styles.scss rename to apps/performance/36-ngfor-optimization/src/styles.css diff --git a/apps/performance/37-optimize-big-list/project.json b/apps/performance/37-optimize-big-list/project.json index 3ecb24d36..6dde7c646 100644 --- a/apps/performance/37-optimize-big-list/project.json +++ b/apps/performance/37-optimize-big-list/project.json @@ -21,7 +21,7 @@ ], "styles": [ "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", - "apps/performance/37-optimize-big-list/src/styles.scss" + "apps/performance/37-optimize-big-list/src/styles.css" ], "scripts": [], "allowedCommonJsDependencies": ["seedrandom"] diff --git a/apps/performance/37-optimize-big-list/src/styles.scss b/apps/performance/37-optimize-big-list/src/styles.css similarity index 100% rename from apps/performance/37-optimize-big-list/src/styles.scss rename to apps/performance/37-optimize-big-list/src/styles.css diff --git a/apps/performance/40-web-workers/project.json b/apps/performance/40-web-workers/project.json index 99cb6756a..a7d616c26 100644 --- a/apps/performance/40-web-workers/project.json +++ b/apps/performance/40-web-workers/project.json @@ -19,7 +19,7 @@ "apps/performance/40-web-workers/src/favicon.ico", "apps/performance/40-web-workers/src/assets" ], - "styles": ["apps/performance/40-web-workers/src/styles.scss"], + "styles": ["apps/performance/40-web-workers/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/performance/40-web-workers/src/styles.scss b/apps/performance/40-web-workers/src/styles.css similarity index 100% rename from apps/performance/40-web-workers/src/styles.scss rename to apps/performance/40-web-workers/src/styles.css diff --git a/apps/rxjs/11-high-order-operator-bug/project.json b/apps/rxjs/11-high-order-operator-bug/project.json index 2ab592032..5a8fc442b 100644 --- a/apps/rxjs/11-high-order-operator-bug/project.json +++ b/apps/rxjs/11-high-order-operator-bug/project.json @@ -15,12 +15,12 @@ "main": "apps/rxjs/11-high-order-operator-bug/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/rxjs/11-high-order-operator-bug/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/rxjs/11-high-order-operator-bug/src/favicon.ico", "apps/rxjs/11-high-order-operator-bug/src/assets" ], - "styles": ["apps/rxjs/11-high-order-operator-bug/src/styles.scss"], + "styles": ["apps/rxjs/11-high-order-operator-bug/src/styles.css"], "scripts": [], "allowedCommonJsDependencies": ["seedrandom"] }, diff --git a/apps/rxjs/11-high-order-operator-bug/src/styles.scss b/apps/rxjs/11-high-order-operator-bug/src/styles.css similarity index 100% rename from apps/rxjs/11-high-order-operator-bug/src/styles.scss rename to apps/rxjs/11-high-order-operator-bug/src/styles.css diff --git a/apps/rxjs/14-race-condition/project.json b/apps/rxjs/14-race-condition/project.json index c5191f620..2bdbb9fa6 100644 --- a/apps/rxjs/14-race-condition/project.json +++ b/apps/rxjs/14-race-condition/project.json @@ -15,12 +15,12 @@ "main": "apps/rxjs/14-race-condition/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/rxjs/14-race-condition/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/rxjs/14-race-condition/src/favicon.ico", "apps/rxjs/14-race-condition/src/assets" ], - "styles": ["apps/rxjs/14-race-condition/src/styles.scss"], + "styles": ["apps/rxjs/14-race-condition/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/rxjs/14-race-condition/src/styles.scss b/apps/rxjs/14-race-condition/src/styles.css similarity index 100% rename from apps/rxjs/14-race-condition/src/styles.scss rename to apps/rxjs/14-race-condition/src/styles.css diff --git a/apps/rxjs/38-catch-error/project.json b/apps/rxjs/38-catch-error/project.json index 9c2ad7cb9..8983e9e24 100644 --- a/apps/rxjs/38-catch-error/project.json +++ b/apps/rxjs/38-catch-error/project.json @@ -19,7 +19,7 @@ "apps/rxjs/38-catch-error/src/favicon.ico", "apps/rxjs/38-catch-error/src/assets" ], - "styles": ["apps/rxjs/38-catch-error/src/styles.scss"], + "styles": ["apps/rxjs/38-catch-error/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/rxjs/38-catch-error/src/styles.scss b/apps/rxjs/38-catch-error/src/styles.css similarity index 100% rename from apps/rxjs/38-catch-error/src/styles.scss rename to apps/rxjs/38-catch-error/src/styles.css diff --git a/apps/rxjs/49-hold-to-save-button/project.json b/apps/rxjs/49-hold-to-save-button/project.json index f4e2e33c4..ca4ba973f 100644 --- a/apps/rxjs/49-hold-to-save-button/project.json +++ b/apps/rxjs/49-hold-to-save-button/project.json @@ -15,12 +15,12 @@ "browser": "apps/rxjs/49-hold-to-save-button/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/rxjs/49-hold-to-save-button/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/rxjs/49-hold-to-save-button/src/favicon.ico", "apps/rxjs/49-hold-to-save-button/src/assets" ], - "styles": ["apps/rxjs/49-hold-to-save-button/src/styles.scss"], + "styles": ["apps/rxjs/49-hold-to-save-button/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/rxjs/49-hold-to-save-button/src/styles.scss b/apps/rxjs/49-hold-to-save-button/src/styles.css similarity index 100% rename from apps/rxjs/49-hold-to-save-button/src/styles.scss rename to apps/rxjs/49-hold-to-save-button/src/styles.css diff --git a/apps/signal/30-interop-rxjs-signal/project.json b/apps/signal/30-interop-rxjs-signal/project.json index b03dd4c15..057fbbef5 100644 --- a/apps/signal/30-interop-rxjs-signal/project.json +++ b/apps/signal/30-interop-rxjs-signal/project.json @@ -20,7 +20,7 @@ "apps/signal/30-interop-rxjs-signal/src/assets" ], "styles": [ - "apps/signal/30-interop-rxjs-signal/src/styles.scss", + "apps/signal/30-interop-rxjs-signal/src/styles.css", "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css" ], "scripts": [] diff --git a/apps/signal/30-interop-rxjs-signal/src/app/list/photos.component.ts b/apps/signal/30-interop-rxjs-signal/src/app/list/photos.component.ts index 7ba115027..9ba76faba 100644 --- a/apps/signal/30-interop-rxjs-signal/src/app/list/photos.component.ts +++ b/apps/signal/30-interop-rxjs-signal/src/app/list/photos.component.ts @@ -39,6 +39,7 @@ import { PhotoStore } from './photos.store'; @let vm = vm$ | async; + @if (vm) {
+ } `, providers: [provideComponentStore(PhotoStore)], host: { diff --git a/apps/signal/30-interop-rxjs-signal/src/styles.scss b/apps/signal/30-interop-rxjs-signal/src/styles.css similarity index 100% rename from apps/signal/30-interop-rxjs-signal/src/styles.scss rename to apps/signal/30-interop-rxjs-signal/src/styles.css diff --git a/apps/signal/43-signal-input/project.json b/apps/signal/43-signal-input/project.json index 0a1832ffb..b6fe94552 100644 --- a/apps/signal/43-signal-input/project.json +++ b/apps/signal/43-signal-input/project.json @@ -15,12 +15,12 @@ "browser": "apps/signal/43-signal-input/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/signal/43-signal-input/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/signal/43-signal-input/src/favicon.ico", "apps/signal/43-signal-input/src/assets" ], - "styles": ["apps/signal/43-signal-input/src/styles.scss"], + "styles": ["apps/signal/43-signal-input/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/signal/43-signal-input/src/styles.scss b/apps/signal/43-signal-input/src/styles.css similarity index 100% rename from apps/signal/43-signal-input/src/styles.scss rename to apps/signal/43-signal-input/src/styles.css diff --git a/apps/signal/50-bug-in-effect/project.json b/apps/signal/50-bug-in-effect/project.json index 7d40e2caa..78ff481fe 100644 --- a/apps/signal/50-bug-in-effect/project.json +++ b/apps/signal/50-bug-in-effect/project.json @@ -15,12 +15,12 @@ "browser": "apps/signal/50-bug-in-effect/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/signal/50-bug-in-effect/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/signal/50-bug-in-effect/src/favicon.ico", "apps/signal/50-bug-in-effect/src/assets" ], - "styles": ["apps/signal/50-bug-in-effect/src/styles.scss"], + "styles": ["apps/signal/50-bug-in-effect/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/signal/50-bug-in-effect/src/styles.scss b/apps/signal/50-bug-in-effect/src/styles.css similarity index 100% rename from apps/signal/50-bug-in-effect/src/styles.scss rename to apps/signal/50-bug-in-effect/src/styles.css diff --git a/apps/signal/51-function-call-effect/project.json b/apps/signal/51-function-call-effect/project.json index 71e6f233d..e16e40c7e 100644 --- a/apps/signal/51-function-call-effect/project.json +++ b/apps/signal/51-function-call-effect/project.json @@ -15,12 +15,12 @@ "browser": "apps/signal/51-function-call-effect/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/signal/51-function-call-effect/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/signal/51-function-call-effect/src/favicon.ico", "apps/signal/51-function-call-effect/src/assets" ], - "styles": ["apps/signal/51-function-call-effect/src/styles.scss"], + "styles": ["apps/signal/51-function-call-effect/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/signal/51-function-call-effect/src/styles.scss b/apps/signal/51-function-call-effect/src/styles.css similarity index 100% rename from apps/signal/51-function-call-effect/src/styles.scss rename to apps/signal/51-function-call-effect/src/styles.css diff --git a/apps/signal/53-big-signal-performance/project.json b/apps/signal/53-big-signal-performance/project.json index 9795c4032..0429623e3 100644 --- a/apps/signal/53-big-signal-performance/project.json +++ b/apps/signal/53-big-signal-performance/project.json @@ -15,12 +15,12 @@ "browser": "apps/signal/53-big-signal-performance/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/signal/53-big-signal-performance/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/signal/53-big-signal-performance/src/favicon.ico", "apps/signal/53-big-signal-performance/src/assets" ], - "styles": ["apps/signal/53-big-signal-performance/src/styles.scss"], + "styles": ["apps/signal/53-big-signal-performance/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/signal/53-big-signal-performance/src/styles.scss b/apps/signal/53-big-signal-performance/src/styles.css similarity index 100% rename from apps/signal/53-big-signal-performance/src/styles.scss rename to apps/signal/53-big-signal-performance/src/styles.css diff --git a/apps/signal/54-pipe-observable-to-signal/project.json b/apps/signal/54-pipe-observable-to-signal/project.json index 1f95f6036..23e8f93e2 100644 --- a/apps/signal/54-pipe-observable-to-signal/project.json +++ b/apps/signal/54-pipe-observable-to-signal/project.json @@ -15,12 +15,12 @@ "browser": "apps/signal/54-pipe-observable-to-signal/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/signal/54-pipe-observable-to-signal/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/signal/54-pipe-observable-to-signal/src/favicon.ico", "apps/signal/54-pipe-observable-to-signal/src/assets" ], - "styles": ["apps/signal/54-pipe-observable-to-signal/src/styles.scss"], + "styles": ["apps/signal/54-pipe-observable-to-signal/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/signal/54-pipe-observable-to-signal/src/styles.scss b/apps/signal/54-pipe-observable-to-signal/src/styles.css similarity index 100% rename from apps/signal/54-pipe-observable-to-signal/src/styles.scss rename to apps/signal/54-pipe-observable-to-signal/src/styles.css diff --git a/apps/signal/56-forms-and-signal/project.json b/apps/signal/56-forms-and-signal/project.json index 596afbb32..328c48f04 100644 --- a/apps/signal/56-forms-and-signal/project.json +++ b/apps/signal/56-forms-and-signal/project.json @@ -15,14 +15,14 @@ "browser": "apps/signal/56-forms-and-signal/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/signal/56-forms-and-signal/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ { "glob": "**/*", "input": "apps/signal/56-forms-and-signal/public" } ], - "styles": ["apps/signal/56-forms-and-signal/src/styles.scss"], + "styles": ["apps/signal/56-forms-and-signal/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/signal/56-forms-and-signal/src/styles.scss b/apps/signal/56-forms-and-signal/src/styles.css similarity index 100% rename from apps/signal/56-forms-and-signal/src/styles.scss rename to apps/signal/56-forms-and-signal/src/styles.css diff --git a/apps/testing/17-router/project.json b/apps/testing/17-router/project.json index dba3c0666..a39126cb1 100644 --- a/apps/testing/17-router/project.json +++ b/apps/testing/17-router/project.json @@ -15,12 +15,12 @@ "main": "apps/testing/17-router/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/testing/17-router/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/testing/17-router/src/favicon.ico", "apps/testing/17-router/src/assets" ], - "styles": ["apps/testing/17-router/src/styles.scss"], + "styles": ["apps/testing/17-router/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/testing/17-router/src/styles.scss b/apps/testing/17-router/src/styles.css similarity index 100% rename from apps/testing/17-router/src/styles.scss rename to apps/testing/17-router/src/styles.css diff --git a/apps/testing/18-nested-components/project.json b/apps/testing/18-nested-components/project.json index aabd0f2db..bf520b1d4 100644 --- a/apps/testing/18-nested-components/project.json +++ b/apps/testing/18-nested-components/project.json @@ -15,12 +15,12 @@ "main": "apps/testing/18-nested-components/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/testing/18-nested-components/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/testing/18-nested-components/src/favicon.ico", "apps/testing/18-nested-components/src/assets" ], - "styles": ["apps/testing/18-nested-components/src/styles.scss"], + "styles": ["apps/testing/18-nested-components/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/testing/18-nested-components/src/app/child.component.ts b/apps/testing/18-nested-components/src/app/child.component.ts index 886485df3..f17887be8 100644 --- a/apps/testing/18-nested-components/src/app/child.component.ts +++ b/apps/testing/18-nested-components/src/app/child.component.ts @@ -54,7 +54,7 @@ export class ErrorComponent {} @Component({ selector: 'app-child', - imports: [], + imports: [ErrorComponent, InputComponent, ResultComponent, ButtonComponent], template: ` diff --git a/apps/testing/18-nested-components/src/styles.scss b/apps/testing/18-nested-components/src/styles.css similarity index 100% rename from apps/testing/18-nested-components/src/styles.scss rename to apps/testing/18-nested-components/src/styles.css diff --git a/apps/testing/19-input-output/project.json b/apps/testing/19-input-output/project.json index ae92fe796..0f8637562 100644 --- a/apps/testing/19-input-output/project.json +++ b/apps/testing/19-input-output/project.json @@ -15,12 +15,12 @@ "main": "apps/testing/19-input-output/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/testing/19-input-output/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/testing/19-input-output/src/favicon.ico", "apps/testing/19-input-output/src/assets" ], - "styles": ["apps/testing/19-input-output/src/styles.scss"], + "styles": ["apps/testing/19-input-output/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/testing/19-input-output/src/styles.scss b/apps/testing/19-input-output/src/styles.css similarity index 100% rename from apps/testing/19-input-output/src/styles.scss rename to apps/testing/19-input-output/src/styles.css diff --git a/apps/testing/20-modal/project.json b/apps/testing/20-modal/project.json index 8892cc51c..b3fa402b4 100644 --- a/apps/testing/20-modal/project.json +++ b/apps/testing/20-modal/project.json @@ -15,13 +15,13 @@ "main": "apps/testing/20-modal/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/testing/20-modal/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/testing/20-modal/src/favicon.ico", "apps/testing/20-modal/src/assets" ], "styles": [ - "apps/testing/20-modal/src/styles.scss", + "apps/testing/20-modal/src/styles.css", "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css" ], "scripts": [] diff --git a/apps/testing/20-modal/src/styles.scss b/apps/testing/20-modal/src/styles.css similarity index 100% rename from apps/testing/20-modal/src/styles.scss rename to apps/testing/20-modal/src/styles.css diff --git a/apps/testing/23-harness/project.json b/apps/testing/23-harness/project.json index 4da50e6a4..261eed8b6 100644 --- a/apps/testing/23-harness/project.json +++ b/apps/testing/23-harness/project.json @@ -19,7 +19,7 @@ "apps/testing/23-harness/src/favicon.ico", "apps/testing/23-harness/src/assets" ], - "styles": ["apps/testing/23-harness/src/styles.scss"], + "styles": ["apps/testing/23-harness/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/testing/23-harness/src/styles.scss b/apps/testing/23-harness/src/styles.css similarity index 100% rename from apps/testing/23-harness/src/styles.scss rename to apps/testing/23-harness/src/styles.css diff --git a/apps/testing/24-harness-creation/project.json b/apps/testing/24-harness-creation/project.json index 60b0ddb8b..b30bfc4d5 100644 --- a/apps/testing/24-harness-creation/project.json +++ b/apps/testing/24-harness-creation/project.json @@ -19,7 +19,7 @@ "apps/testing/24-harness-creation/src/favicon.ico", "apps/testing/24-harness-creation/src/assets" ], - "styles": ["apps/testing/24-harness-creation/src/styles.scss"], + "styles": ["apps/testing/24-harness-creation/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/testing/24-harness-creation/src/styles.scss b/apps/testing/24-harness-creation/src/styles.css similarity index 100% rename from apps/testing/24-harness-creation/src/styles.scss rename to apps/testing/24-harness-creation/src/styles.css diff --git a/apps/testing/28-checkbox/project.json b/apps/testing/28-checkbox/project.json index 2ef8a3cc1..37a68e7df 100644 --- a/apps/testing/28-checkbox/project.json +++ b/apps/testing/28-checkbox/project.json @@ -19,7 +19,7 @@ "apps/testing/28-checkbox/src/favicon.ico", "apps/testing/28-checkbox/src/assets" ], - "styles": ["apps/testing/28-checkbox/src/styles.scss"], + "styles": ["apps/testing/28-checkbox/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/testing/28-checkbox/src/styles.scss b/apps/testing/28-checkbox/src/styles.css similarity index 100% rename from apps/testing/28-checkbox/src/styles.scss rename to apps/testing/28-checkbox/src/styles.css diff --git a/apps/testing/29-real-life-application/project.json b/apps/testing/29-real-life-application/project.json index 25833bf4c..156efd5e0 100644 --- a/apps/testing/29-real-life-application/project.json +++ b/apps/testing/29-real-life-application/project.json @@ -15,13 +15,13 @@ "main": "apps/testing/29-real-life-application/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/testing/29-real-life-application/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/testing/29-real-life-application/src/favicon.ico", "apps/testing/29-real-life-application/src/assets" ], "styles": [ - "apps/testing/29-real-life-application/src/styles.scss", + "apps/testing/29-real-life-application/src/styles.css", "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css" ], "scripts": [] diff --git a/apps/testing/29-real-life-application/src/styles.scss b/apps/testing/29-real-life-application/src/styles.css similarity index 100% rename from apps/testing/29-real-life-application/src/styles.scss rename to apps/testing/29-real-life-application/src/styles.css diff --git a/apps/typescript/15-function-overload/project.json b/apps/typescript/15-function-overload/project.json index b36257d9d..b912caa98 100644 --- a/apps/typescript/15-function-overload/project.json +++ b/apps/typescript/15-function-overload/project.json @@ -15,12 +15,12 @@ "main": "apps/typescript/15-function-overload/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/typescript/15-function-overload/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/typescript/15-function-overload/src/favicon.ico", "apps/typescript/15-function-overload/src/assets" ], - "styles": ["apps/typescript/15-function-overload/src/styles.scss"], + "styles": ["apps/typescript/15-function-overload/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/typescript/15-function-overload/src/styles.scss b/apps/typescript/15-function-overload/src/styles.css similarity index 100% rename from apps/typescript/15-function-overload/src/styles.scss rename to apps/typescript/15-function-overload/src/styles.css diff --git a/apps/typescript/47-enums-vs-union-types/project.json b/apps/typescript/47-enums-vs-union-types/project.json index e5c3283d6..6edd24609 100644 --- a/apps/typescript/47-enums-vs-union-types/project.json +++ b/apps/typescript/47-enums-vs-union-types/project.json @@ -15,12 +15,12 @@ "browser": "apps/typescript/47-enums-vs-union-types/src/main.ts", "polyfills": ["zone.js"], "tsConfig": "apps/typescript/47-enums-vs-union-types/tsconfig.app.json", - "inlineStyleLanguage": "scss", + "inlineStyleLanguage": "css", "assets": [ "apps/typescript/47-enums-vs-union-types/src/favicon.ico", "apps/typescript/47-enums-vs-union-types/src/assets" ], - "styles": ["apps/typescript/47-enums-vs-union-types/src/styles.scss"], + "styles": ["apps/typescript/47-enums-vs-union-types/src/styles.css"], "scripts": [] }, "configurations": { diff --git a/apps/typescript/47-enums-vs-union-types/src/app/app.component.ts b/apps/typescript/47-enums-vs-union-types/src/app/app.component.ts index 05886724f..72b8ba5fa 100644 --- a/apps/typescript/47-enums-vs-union-types/src/app/app.component.ts +++ b/apps/typescript/47-enums-vs-union-types/src/app/app.component.ts @@ -39,6 +39,8 @@ enum Direction {
`, styles: ` + @reference "tailwindcss"; + section { @apply mx-auto my-5 flex w-fit flex-col items-center gap-2; diff --git a/apps/typescript/47-enums-vs-union-types/src/styles.scss b/apps/typescript/47-enums-vs-union-types/src/styles.css similarity index 100% rename from apps/typescript/47-enums-vs-union-types/src/styles.scss rename to apps/typescript/47-enums-vs-union-types/src/styles.css diff --git a/docs/public/.!83390!angular-challenge.ico b/docs/public/.!83390!angular-challenge.ico new file mode 100644 index 000000000..e69de29bb diff --git a/docs/src/content/docs/challenges/forms/48-avoid-losing-form-data.md b/docs/src/content/docs/challenges/forms/48-avoid-losing-form-data.md index 1af6c52c4..b17e60e76 100644 --- a/docs/src/content/docs/challenges/forms/48-avoid-losing-form-data.md +++ b/docs/src/content/docs/challenges/forms/48-avoid-losing-form-data.md @@ -34,7 +34,7 @@ Here's the feature expressed as a user story with a functional expectation:
Tips 🤫 (if you really need it and after careful consideration)
    -
  • Use the Material CDK Dialog or Overlay - don't forget to add @import '@angular/cdk/overlay-prebuilt.css' in styles.scss
    • +
  • Use the Material CDK Dialog or Overlay - don't forget to add @import '@angular/cdk/overlay-prebuilt.css' in styles.css
  • Use the CanDeactivate guard in the new functional approach.
diff --git a/libs/decoupling/core/src/index.ts b/libs/decoupling/core/src/index.ts index e69de29bb..5d71ecd07 100644 --- a/libs/decoupling/core/src/index.ts +++ b/libs/decoupling/core/src/index.ts @@ -0,0 +1 @@ +export const DECOUPLING_CORE = 'DECOUPLING_CORE'; diff --git a/nx.json b/nx.json index bf518c68d..4dfc8e7b0 100644 --- a/nx.json +++ b/nx.json @@ -67,7 +67,7 @@ "@nx/angular:application": { "e2eTestRunner": "none", "linter": "eslint", - "style": "scss", + "style": "css", "unitTestRunner": "none", "inlineStyle": "true", "inlineTemplate": "true", @@ -82,7 +82,7 @@ "buildable": "true" }, "@nx/angular:component": { - "style": "scss", + "style": "css", "changeDetection": "OnPush", "inlineStyle": "true", "inlineTemplate": "true",