Angular Material Course

G-Developers · Nov 15, 2017 · bab632b · bab632b
1 parent a3dd8d7
commit bab632b
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 82 deletions.
diff --git a/package.json b/package.json
@@ -4,8 +4,7 @@
   "license": "MIT",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --proxy-config ./proxy.json",
-    "server": "./node_modules/.bin/ts-node ./server/server.ts",
+    "start": "ng serve",
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",

diff --git a/proxy.json b/proxy.json
diff --git a/server/read-all-courses.route.ts b/server/read-all-courses.route.ts
diff --git a/server/server.ts b/server/server.ts
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -7,10 +7,7 @@ import {CoursesResolver} from "./services/courses.resolver";
 const routes: Routes = [
     {
         path: "",
-        component: HomeComponent,
-        resolve: {
-            courses: CoursesResolver
-        }
+        component: HomeComponent
 
     },
     {

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -10,8 +10,6 @@ import {MatIconModule} from '@angular/material/icon';
 import {MatCardModule} from '@angular/material/card';
 import { HomeComponent } from './home/home.component';
 import { AboutComponent } from './about/about.component';
-import {HttpClientModule} from "@angular/common/http";
-import {CoursesResolver} from "./services/courses.resolver";
 import {MatTabsModule} from '@angular/material/tabs';
 
 @NgModule({
@@ -23,17 +21,14 @@ import {MatTabsModule} from '@angular/material/tabs';
     imports: [
         BrowserModule,
         BrowserAnimationsModule,
-        HttpClientModule,
         MatMenuModule,
         MatButtonModule,
         MatIconModule,
         MatCardModule,
         MatTabsModule,
         AppRoutingModule
     ],
-    providers: [
-        CoursesResolver
-    ],
+    providers: [],
     bootstrap: [AppComponent]
 })
 export class AppModule {

diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
@@ -3,6 +3,8 @@ import {ActivatedRoute} from "@angular/router";
 import {Course} from "../model/course";
 import {Observable} from "rxjs/Observable";
 import {map, filter} from "rxjs/operators";
+import {COURSES} from "../model/db-data";
+import {of} from "rxjs/observable/of";
 
 @Component({
     selector: 'home',
@@ -21,7 +23,7 @@ export class HomeComponent implements OnInit {
 
     ngOnInit() {
 
-        const courses$ = this.route.data.pipe(map( data => data['courses']));
+        const courses$ = of(Object.values(COURSES));
 
         this.beginnerCourses$ = courses$.pipe(
             map( courses => courses.filter(course => course.category === 'BEGINNER'))

diff --git a/server/db-data.ts → src/app/model/db-data.ts b/server/db-data.ts → src/app/model/db-data.ts
diff --git a/src/app/services/courses.resolver.ts b/src/app/services/courses.resolver.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -13,7 +13,8 @@
     ],
     "lib": [
       "es2017",
-      "dom"
+      "dom",
+      "ES2017.object"
     ]
   }
 }