Merge branch 'recording-2'

Author: jhades

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "rxjs-course",
+  "name": "reactive-angular-course",
   "version": "0.0.0",
   "license": "MIT",
   "scripts": {
@@ -55,4 +55,4 @@
     "tslint": "~5.7.0",
     "typescript": "3.7.5"
   }
-}
+}

package.json

@@ -9,15 +9,19 @@ export function getAllCourses(req: Request, res: Response) {
 
 /*
     console.log("ERROR loading courses!");
-    res.status(500).json({message: 'random error occurred.'});
+    res.status(500).json({message: 'error occurred.'});
     return;
- */
+*/
+
+
 
         setTimeout(() => {
 
              res.status(200).json({payload:Object.values(COURSES)});
 
-        }, 200);
+        }, 1500);
+
+
 }
 
 

server/get-courses.route.ts

@@ -13,7 +13,7 @@ export function loginUser(req: Request, res: Response) {
   const user = authenticate(email, password);
 
   if (user) {
-    res.status(200).json(user);
+    res.status(200).json({email: user.email});
   }
   else {
     res.sendStatus(403);

server/login.route.ts

@@ -5,12 +5,12 @@ import {setTimeout} from 'timers';
 
 export function saveCourse(req: Request, res: Response) {
 
-  /*
+/*
   console.log("ERROR saving course!");
   res.sendStatus(500);
   return;
+*/
 
-  */
 
     const id = req.params["id"],
         changes = req.body;

server/save-course.route.ts

@@ -17,7 +17,14 @@ export function searchLessons(req: Request, res: Response) {
           pageNumber = parseInt(queryParams.pageNumber) || 0,
           pageSize = parseInt(queryParams.pageSize) || 3;
 
-    let lessons = Object.values(LESSONS).filter(lesson => lesson.courseId == courseId).sort((l1, l2) => l1.id - l2.id);
+    let lessons;
+
+    if (courseId) {
+     lessons = Object.values(LESSONS).filter(lesson => lesson.courseId == courseId).sort((l1, l2) => l1.id - l2.id);
+    }
+    else {
+        lessons = Object.values(LESSONS);
+    }
 
     if (filter) {
        lessons = lessons.filter(lesson => lesson.description.trim().toLowerCase().search(filter.toLowerCase()) >= 0);
@@ -36,4 +43,4 @@ export function searchLessons(req: Request, res: Response) {
     },1000);
 
 
-}
+}

server/search-lessons.route.ts

@@ -1,10 +1,18 @@
 
 .course-image {
-    max-width: 300px;
-    border-radius: 4px;
+  max-width: 300px;
+  border-radius: 4px;
 }
 
 
 .about {
-    padding: 40px;
-}
+  padding: 40px;
+  display: flex;
+  flex-direction: column;
+}
+
+
+.about button {
+  max-width: 100px;
+  margin-top: 30px;
+}

src/app/about/about.component.css

@@ -2,11 +2,13 @@
 
 <div class="about">
 
-    <h2>The RxJs In Practice Course</h2>
+    <h2>Reactive Angular Course</h2>
 
     <img class="course-image mat-elevation-z10"
-         src="https://s3-us-west-1.amazonaws.com/angular-university/course-images/rxjs-in-practice-course.png">
+         src="https://angular-university.s3-us-west-1.amazonaws.com/course-images/reactive-angular-course.jpg">
 
 
+    <button mat-raised-button color="primary" (click)="run()">Run</button>
+
 </div>
 

src/app/about/about.component.html

@@ -1,21 +1,21 @@
 import {Component, OnInit, ViewEncapsulation} from '@angular/core';
 import {
-    concat,
-    fromEvent,
-    interval,
-    noop,
-    observable,
-    Observable,
-    of,
-    timer,
-    merge,
-    Subject,
-    BehaviorSubject,
-    AsyncSubject,
-    ReplaySubject
+  concat,
+  fromEvent,
+  interval,
+  noop,
+  observable,
+  Observable,
+  of,
+  timer,
+  merge,
+  Subject,
+  BehaviorSubject,
+  AsyncSubject,
+  ReplaySubject, from
 } from 'rxjs';
 import {delayWhen, filter, map, take, timeout} from 'rxjs/operators';
-import {createHttpObservable} from '../common/util';
+
 
 
 @Component({
@@ -31,6 +31,13 @@ export class AboutComponent implements OnInit {
     }
 
 
+  run() {
+
+
+
+  }
+
+
 }
 
 

src/app/about/about.component.ts

@@ -46,12 +46,6 @@
 
       <div class="filler"></div>
 
-      <ng-container *ngIf="(auth.user$ | async) as user">
-
-        <img class="user-avatar" [src]="user?.pictureUrl">
-
-      </ng-container>
-
     </div>