{{course?.description}}
-{{course.longDescription}}
-{{course.longDescription}}
+
+
diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss
new file mode 100644
index 0000000..e75ecff
--- /dev/null
+++ b/src/app/home/home.component.scss
@@ -0,0 +1,5 @@
+
+.courses-panel {
+ max-width: 400px;
+ margin: 0 auto;
+}
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index fa0b89b..5e89aaf 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -3,21 +3,26 @@ import {Course} from "../model/course";
import {Observable} from "rxjs";
import {CoursesService} from "../services/courses.service";
import {map, tap} from 'rxjs/operators';
+import {Title} from "@angular/platform-browser";
@Component({
selector: 'home',
templateUrl: './home.component.html',
- styleUrls: ['./home.component.css']
+ styleUrls: ['./home.component.scss']
})
export class HomeComponent implements OnInit {
courses$: Observable;
- constructor(private coursesService: CoursesService) {
+ constructor(private coursesService: CoursesService,
+ private title: Title) {
}
ngOnInit() {
+
+ this.title.setTitle("Angular University - All Courses");
+
this.courses$ = this.coursesService.findAllCourses()
.pipe(
map(Object.values)
diff --git a/src/app/model/course.ts b/src/app/model/course.ts
index c4976d3..97b0f87 100644
--- a/src/app/model/course.ts
+++ b/src/app/model/course.ts
@@ -1,11 +1,9 @@
-
-
export interface Course {
- id:string;
- description:string;
- iconUrl: string;
- courseListIcon: string;
- longDescription: string;
- category:string;
- lessonsCount:number;
+ id:string;
+ description:string;
+ iconUrl: string;
+ courseListIcon: string;
+ longDescription: string;
+ category:string;
+ lessonsCount:number;
}
diff --git a/src/app/model/lesson.ts b/src/app/model/lesson.ts
index 40a5e6b..22d1f84 100644
--- a/src/app/model/lesson.ts
+++ b/src/app/model/lesson.ts
@@ -1,9 +1,7 @@
-
-
export interface Lesson {
- id: string;
- description: string;
- duration: string;
- seqNo: number;
- courseId: number;
-}
\ No newline at end of file
+ id: string;
+ description: string;
+ duration: string;
+ seqNo: number;
+ courseId: number;
+}
diff --git a/src/app/services/course.resolver.ts b/src/app/services/course.resolver.ts
index 3430e1c..d247188 100644
--- a/src/app/services/course.resolver.ts
+++ b/src/app/services/course.resolver.ts
@@ -5,25 +5,45 @@ import {Observable, of} from 'rxjs';
import {CoursesService} from './courses.service';
import {first, tap} from 'rxjs/operators';
import {isPlatformServer} from '@angular/common';
+import {makeStateKey, TransferState} from "@angular/platform-browser";
@Injectable()
export class CourseResolver implements Resolve {
- constructor(private coursesService: CoursesService) {
+ constructor(
+ private coursesService: CoursesService,
+ private transferState:TransferState,
+ @Inject(PLATFORM_ID) private platformId) {
}
- resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable {
+ resolve(route: ActivatedRouteSnapshot,
+ state: RouterStateSnapshot): Observable {
const courseId = route.params['id'];
- return this.coursesService.findCourseById(courseId)
- .pipe(
- first()
- );
+ const COURSE_KEY = makeStateKey("courseKey-" + courseId);
+ if (this.transferState.hasKey(COURSE_KEY)) {
+ const course = this.transferState.get(COURSE_KEY, null);
+
+ this.transferState.remove(COURSE_KEY);
+
+ return of(course);
+ }
+ else {
+ return this.coursesService.findCourseById(courseId)
+ .pipe(
+ first(),
+ tap(course => {
+ if (isPlatformServer(this.platformId)) {
+ this.transferState.set(COURSE_KEY, course);
+ }
+ })
+ );
+ }
}
-}
\ No newline at end of file
+}
diff --git a/src/assets/.gitkeep b/src/assets/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 7b4f817..30d7bcc 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -13,4 +13,4 @@ export const environment = {
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
-// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
+// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.
diff --git a/src/index.html b/src/index.html
index 655673e..e0718d1 100644
--- a/src/index.html
+++ b/src/index.html
@@ -2,7 +2,8 @@
- Angular Universal In Depth
+ Angular Universal App
+
(id: string): T;
- };
-};
-
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
- platformBrowserDynamicTesting()
+ platformBrowserDynamicTesting(), {
+ teardown: { destroyAfterEach: false }
+}
);
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
diff --git a/tsconfig.app.json b/tsconfig.app.json
index 232c3a5..82d91dc 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
- "extends": "./tsconfig.base.json",
+ "extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/app",
"types": []
diff --git a/tsconfig.base.json b/tsconfig.base.json
deleted file mode 100644
index f69f654..0000000
--- a/tsconfig.base.json
+++ /dev/null
@@ -1,20 +0,0 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
-{
- "compileOnSave": false,
- "compilerOptions": {
- "baseUrl": "./",
- "outDir": "./dist/out-tsc",
- "sourceMap": true,
- "declaration": false,
- "downlevelIteration": true,
- "experimentalDecorators": true,
- "moduleResolution": "node",
- "importHelpers": true,
- "target": "es2015",
- "module": "es2020",
- "lib": [
- "es2018",
- "dom"
- ]
- }
-}
diff --git a/tsconfig.json b/tsconfig.json
index f77be3d..f68cde0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,23 +1,21 @@
-/*
- This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
- It is not intended to be used to perform a compilation.
-
- To learn more about this file see: https://angular.io/config/solution-tsconfig.
-*/
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
- "files": [],
- "references": [
- {
- "path": "./tsconfig.app.json"
- },
- {
- "path": "./tsconfig.spec.json"
- },
- {
- "path": "./e2e/tsconfig.json"
- },
- {
- "path": "./tsconfig.server.json"
- }
-]
+ "compileOnSave": false,
+ "compilerOptions": {
+ "baseUrl": "./",
+ "outDir": "./dist/out-tsc",
+ "sourceMap": true,
+ "declaration": false,
+ "downlevelIteration": true,
+ "experimentalDecorators": true,
+ "moduleResolution": "node",
+ "importHelpers": true,
+ "target": "ES2022",
+ "module": "es2020",
+ "lib": [
+ "es2018",
+ "dom"
+ ],
+ "useDefineForClassFields": false
+ }
}
diff --git a/tsconfig.server.json b/tsconfig.server.json
index c66fb64..e2ebe5a 100644
--- a/tsconfig.server.json
+++ b/tsconfig.server.json
@@ -3,7 +3,6 @@
"extends": "./tsconfig.app.json",
"compilerOptions": {
"outDir": "./out-tsc/server",
- "target": "es2016",
"types": [
"node"
]
@@ -11,8 +10,5 @@
"files": [
"src/main.server.ts",
"server.ts"
- ],
- "angularCompilerOptions": {
- "entryModule": "./src/app/app.server.module#AppServerModule"
- }
+ ]
}
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
index 729a6d6..092345b 100644
--- a/tsconfig.spec.json
+++ b/tsconfig.spec.json
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
- "extends": "./tsconfig.base.json",
+ "extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./out-tsc/spec",
"types": [