Angular Firebase Course

MyCatOreo · Nov 23, 2018 · 1e71554 · 1e71554
1 parent 98c8f53
commit 1e71554
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/init-db.ts b/init-db.ts
@@ -49,7 +49,7 @@ async function uploadData() {
 
       const courseLessons = findLessonsForCourse(course.id);
 
-      console.log('Adding lessons: ' + courseLessons.length);
+      //console.log(`Adding ${courseLessons.length} lessons to ${course.description}`);
 
       courseLessons.forEach(async lesson => {
 
@@ -77,14 +77,14 @@ function removeId(data:any) {
 
 uploadData()
   .then(() => {
-    console.log("Writing data, exiting in 5 seconds ...\n\n");
+    console.log("Writing data, exiting in 10 seconds ...\n\n");
 
     setTimeout(() => {
 
       console.log("\n\n\nData Upload Completed.\n\n\n");
       process.exit(0);
 
-    }, 5000);
+    }, 10000);
 
   })
   .catch(err => {

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -16,7 +16,7 @@ const routes: Routes = [
         component: AboutComponent
     },
     {
-        path: 'courses/:id',
+        path: 'courses/:courseUrl',
         component: CourseComponent,
         resolve: {
             course: CourseResolver

diff --git a/src/app/courses-card-list/courses-card-list.component.html b/src/app/courses-card-list/courses-card-list.component.html
@@ -16,7 +16,7 @@
 
     <mat-card-actions class="course-actions">
 
-        <button mat-button class="mat-raised-button mat-primary" [routerLink]="['/courses', course.id]">
+        <button mat-button class="mat-raised-button mat-primary" [routerLink]="['/courses', course.url]">
             VIEW COURSE
         </button>
 

diff --git a/src/app/services/course.resolver.ts b/src/app/services/course.resolver.ts
@@ -18,7 +18,7 @@ export class CourseResolver implements Resolve<Course> {
     }
 
     resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Course> {
-        return this.coursesService.findCourseById(route.params['id'])
+        return this.coursesService.findCourseByUrl(route.params['courseUrl'])
           .pipe(
             first()
           );

diff --git a/src/app/services/courses.service.ts b/src/app/services/courses.service.ts
@@ -29,7 +29,7 @@ export class CoursesService {
   }
 
   findCourseByUrl(courseUrl: string): Observable<Course> {
-    return this.db.collection('courses', ref => ref.where("courseUrl", "==", courseUrl) )
+    return this.db.collection('courses', ref => ref.where("url", "==", courseUrl) )
       .snapshotChanges()
       .pipe(
         map(snaps => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ export class CourseResolver implements Resolve<Course> { @@
         }
         resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Course> {
-            return this.coursesService.findCourseById(route.params['id'])
+            return this.coursesService.findCourseByUrl(route.params['courseUrl'])
               .pipe(
                 first()
               );
@@ Expand Down @@