From 222b3172f695d0662a1748a951657ab94c6f5dd6 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Fri, 18 May 2018 23:34:25 -0500
Subject: [PATCH 01/64] add packages for pouchdb

---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index 3f6a754483..75c3f9538c 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,8 @@
     "material-icons": "^0.1.0",
     "mime-types": "^2.1.17",
     "ngx-img": "^10.15.0",
+    "pouchdb": "^6.4.3",
+    "pouchdb-authentication": "^1.1.2",
     "rxjs": "5.5.2",
     "zone.js": "^0.8.18"
   },
@@ -52,6 +54,7 @@
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
+    "@types/pouchdb": "^6.3.2",
     "codelyzer": "~3.2.0",
     "htmlhint-ng2": "0.0.13",
     "jasmine-core": "~2.6.2",

From 36fa27fb33bacb7e2794b1241cfa1ccf9e370eac Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Fri, 18 May 2018 23:39:00 -0500
Subject: [PATCH 02/64] allow synthentic imports for pouch

---
 tsconfig.json | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index fcf1a1f90e..146b8e994d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,14 +7,10 @@
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
     "target": "es5",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2017",
-      "dom"
-    ]
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2017", "dom"]
   },
   "angularCompilerOptions": {
     "preserveWhitespaces": false

From 8fc4905d4c3f590bb59165f0e349590eff34d63d Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 00:33:17 -0500
Subject: [PATCH 03/64] add service for main pouchdb service

---
 src/app/app.module.ts                         | 17 +++--
 src/app/shared/services/index.ts              |  1 +
 src/app/shared/services/pouchDB/index.ts      |  5 ++
 .../services/pouchDB/pouchDB.service.ts       | 68 +++++++++++++++++++
 4 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 src/app/shared/services/index.ts
 create mode 100644 src/app/shared/services/pouchDB/index.ts
 create mode 100644 src/app/shared/services/pouchDB/pouchDB.service.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 75f1b13629..4708ea3835 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -20,6 +20,7 @@ import { environment } from '../environments/environment';
 import { MatIconRegistry } from '@angular/material';
 import { FeedbackService } from './feedback/feedback.service';
 import { ResourcesService } from './resources/resources.service';
+import { SHARED_SERVICES } from './shared/services';
 
 @NgModule({
   imports: [
@@ -33,12 +34,18 @@ import { ResourcesService } from './resources/resources.service';
       ? ServiceWorkerModule.register('/ngsw-worker.js')
       : []
   ],
-  declarations: [
-    AppComponent, PageNotFoundComponent
-  ],
+  declarations: [AppComponent, PageNotFoundComponent],
   providers: [
-    CouchService, AuthService, UserService, ValidatorService, PlanetMessageService, MatIconRegistry, FeedbackService, ResourcesService
+    CouchService,
+    AuthService,
+    UserService,
+    ValidatorService,
+    PlanetMessageService,
+    MatIconRegistry,
+    FeedbackService,
+    ResourcesService,
+    ...SHARED_SERVICES
   ],
-  bootstrap: [ AppComponent ]
+  bootstrap: [AppComponent]
 })
 export class AppModule {}
diff --git a/src/app/shared/services/index.ts b/src/app/shared/services/index.ts
new file mode 100644
index 0000000000..da3c79c58f
--- /dev/null
+++ b/src/app/shared/services/index.ts
@@ -0,0 +1 @@
+export * from './pouchDB';
diff --git a/src/app/shared/services/pouchDB/index.ts b/src/app/shared/services/pouchDB/index.ts
new file mode 100644
index 0000000000..b32e4b342b
--- /dev/null
+++ b/src/app/shared/services/pouchDB/index.ts
@@ -0,0 +1,5 @@
+import { PouchDBService } from './pouchDB.service';
+
+export { PouchDBService } from './pouchDB.service';
+
+export const SHARED_SERVICES = [PouchDBService];
diff --git a/src/app/shared/services/pouchDB/pouchDB.service.ts b/src/app/shared/services/pouchDB/pouchDB.service.ts
new file mode 100644
index 0000000000..8dbdfc2d75
--- /dev/null
+++ b/src/app/shared/services/pouchDB/pouchDB.service.ts
@@ -0,0 +1,68 @@
+import { Injectable } from '@angular/core';
+import PouchDB from 'pouchdb';
+import PouchDBAuth from 'pouchdb-authentication';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/fromEvent';
+import { catchError } from 'rxjs/operators';
+import { environment } from '../../../../environments/environment';
+
+PouchDB.plugin(PouchDBAuth);
+
+type RemoteDatabases = 'courses';
+
+@Injectable()
+export class PouchDBService {
+  private baseUrl = environment.couchAddress;
+  private localDB;
+  private authDB;
+  private remoteDBs = {
+    courses: null
+  };
+  private courses;
+
+  constructor() {
+    this.localDB = new PouchDB('local-pouchdb');
+
+    // test is a placeholder temp database
+    // we need a central remote database
+    // since we will have different levels of authentication (manager, intern)
+    // we will have to create corresponding documents in couchdb and we can sync
+    // we can decide that when the user is being created for the first time?
+    this.authDB = new PouchDB(this.baseUrl + 'courses', {
+      skip_setup: true
+    });
+
+    this.remoteDBs.courses = new PouchDB(this.baseUrl + 'courses');
+
+    this.localDB
+      .sync(this.authDB, { live: true, retry: true })
+      .on('error', console.log.bind(console));
+  }
+
+  replicateRemoteToLocal(key: RemoteDatabases) {
+    return Observable.fromPromise(
+      this.localDB.replicate.from(this.remoteDBs[key])
+    ).pipe(catchError(this.handleError));
+  }
+
+  getLocalPouchDB() {
+    return this.localDB;
+  }
+
+  getAuthDB() {
+    return this.authDB;
+  }
+
+  getRemotePouchDB(key: RemoteDatabases) {
+    return this.remoteDBs[key];
+  }
+
+  updateRemotePouchDB(key: RemoteDatabases, updatedDatabase) {
+    this.remoteDBs[key] = updatedDatabase;
+  }
+
+  private handleError(err) {
+    console.error('An error occurred replicating from the database', err);
+    return Observable.throw(err.message || err);
+  }
+}

From 70e2e99f2d73d602ca7c925f0005c287c95c4aca Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 00:36:32 -0500
Subject: [PATCH 04/64] add service for handling auth

---
 .../shared/services/pouchDB/auth.service.ts   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/app/shared/services/pouchDB/auth.service.ts

diff --git a/src/app/shared/services/pouchDB/auth.service.ts b/src/app/shared/services/pouchDB/auth.service.ts
new file mode 100644
index 0000000000..6fe1389b3a
--- /dev/null
+++ b/src/app/shared/services/pouchDB/auth.service.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/fromPromise';
+import { catchError } from 'rxjs/operators';
+import { environment } from '../../../../environments/environment';
+import { PouchDBService } from './pouchDB.service';
+
+@Injectable()
+export class AuthService {
+  private authDB;
+
+  constructor(private pouchdbService: PouchDBService) {
+    this.authDB = this.pouchdbService.getAuthDB();
+  }
+
+  getSessionInfo() {
+    return Observable.fromPromise(this.authDB.getSession()).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  login(username, password) {
+    return Observable.fromPromise(this.authDB.login(username, password)).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  signupUser(username, password, opts?) {
+    return Observable.fromPromise(
+      this.authDB.signUp(username, password, opts)
+    ).pipe(catchError(this.handleError));
+  }
+
+  private handleError(err) {
+    console.error('An error occurred while signing in the user', err);
+    return Observable.throw(err.message || err);
+  }
+}

From 198cd86b1dbd717fb3e67869eb559418c7ac7b7b Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 00:48:14 -0500
Subject: [PATCH 05/64] use auth service for authenticating user

---
 src/app/login/login-form.component.ts | 171 +++++++++++++++++---------
 1 file changed, 115 insertions(+), 56 deletions(-)

diff --git a/src/app/login/login-form.component.ts b/src/app/login/login-form.component.ts
index ced5d87edf..f3b8c5ec95 100644
--- a/src/app/login/login-form.component.ts
+++ b/src/app/login/login-form.component.ts
@@ -5,32 +5,44 @@ import { UserService } from '../shared/user.service';
 import { switchMap } from 'rxjs/operators';
 import { fromPromise } from 'rxjs/observable/fromPromise';
 import { forkJoin } from 'rxjs/observable/forkJoin';
-import { FormControl, FormGroup, FormBuilder, Validators } from '@angular/forms';
+import {
+  FormControl,
+  FormGroup,
+  FormBuilder,
+  Validators
+} from '@angular/forms';
 import { CustomValidators } from '../validators/custom-validators';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { environment } from '../../environments/environment';
 import { ValidatorService } from '../validators/validator.service';
+import { AuthService } from '../shared/services';
 
 const registerForm = {
   name: [],
-  password: [ '', Validators.compose([
-    Validators.required,
-    CustomValidators.matchPassword('repeatPassword', false)
-    ]) ],
-  repeatPassword: [ '', Validators.compose([
-    Validators.required,
-    CustomValidators.matchPassword('password', true)
-    ]) ]
+  password: [
+    '',
+    Validators.compose([
+      Validators.required,
+      CustomValidators.matchPassword('repeatPassword', false)
+    ])
+  ],
+  repeatPassword: [
+    '',
+    Validators.compose([
+      Validators.required,
+      CustomValidators.matchPassword('password', true)
+    ])
+  ]
 };
 
 const loginForm = {
-  name: [ '', Validators.required ],
-  password: [ '', Validators.required ]
+  name: ['', Validators.required],
+  password: ['', Validators.required]
 };
 
 @Component({
   templateUrl: './login-form.component.html',
-  styleUrls: [ './login.scss' ]
+  styleUrls: ['./login.scss']
 })
 export class LoginFormComponent {
   public userForm: FormGroup;
@@ -41,10 +53,14 @@ export class LoginFormComponent {
     private userService: UserService,
     private formBuilder: FormBuilder,
     private planetMessageService: PlanetMessageService,
-    private validatorService: ValidatorService
+    private validatorService: ValidatorService,
+    private authService: AuthService
   ) {
-    registerForm.name = [ '', [ Validators.required, Validators.pattern(/^[a-z0-9_.-]+$/i) ],
-      ac => this.validatorService.isUnique$('_users', 'name', ac, {}) ];
+    registerForm.name = [
+      '',
+      [Validators.required, Validators.pattern(/^[a-z0-9_.-]+$/i)],
+      ac => this.validatorService.isUnique$('_users', 'name', ac, {})
+    ];
     const formObj = this.createMode ? registerForm : loginForm;
     this.userForm = this.formBuilder.group(formObj);
   }
@@ -68,54 +84,97 @@ export class LoginFormComponent {
 
   welcomeNotification(userId) {
     const data = {
-      'user': userId,
-      'message': 'Welcome ' + userId.replace('org.couchdb.user:', '') + ' to the Planet Learning',
-      'link': '',
-      'type': 'register',
-      'priority': 1,
-      'status': 'unread',
-      'time': Date.now()
+      user: userId,
+      message:
+        'Welcome ' +
+        userId.replace('org.couchdb.user:', '') +
+        ' to the Planet Learning',
+      link: '',
+      type: 'register',
+      priority: 1,
+      status: 'unread',
+      time: Date.now()
     };
-    this.couchService.post('notifications', data)
-      .subscribe();
+    this.couchService.post('notifications', data).subscribe();
   }
 
   reRoute() {
-    return this.router.navigate([ this.returnUrl ]);
+    return this.router.navigate([this.returnUrl]);
   }
 
-  createUser({ name, password }: {name: string, password: string}) {
-    this.couchService.put('_users/org.couchdb.user:' + name,
-      { 'name': name, 'password': password, 'roles': [], 'type': 'user', 'isUserAdmin': false, joinDate: Date.now() })
-    .pipe(switchMap(() => {
-      return this.couchService.put('shelf/org.couchdb.user:' + name, { });
-    })).subscribe((response: any) => {
-      this.planetMessageService.showMessage('User created: ' + response.id.replace('org.couchdb.user:', ''));
-      this.welcomeNotification(response.id);
-      this.login(this.userForm.value, true);
-    }, error => this.planetMessageService.showAlert('An error occurred please try again'));
-  }
+  createUser({ name, password }: { name: string; password: string }) {
+    const opts = {
+      roles: [],
+      type: 'user',
+      isUserAdmin: false,
+      joinDate: Date.now()
+    };
 
-  login({ name, password }: {name: string, password: string}, isCreate: boolean) {
-    this.couchService.post('_session', { 'name': name, 'password': password }, { withCredentials: true })
-      .pipe(switchMap((data) => {
-        // Navigate into app
-        if (isCreate) {
-          return fromPromise(this.router.navigate( [ 'users/update/' + name ]));
-        } else {
-          return fromPromise(this.reRoute());
-        }
-      }), switchMap((routeSuccess) => {
-        // Post new session info to login_activity
-        const obsArr = [ this.userService.newSessionLog() ];
-        // If not in e2e test, also add session to parent domain
-        if (!environment.test && this.userService.getConfig().name === name.toLowerCase()) {
-          obsArr.push(this.couchService.post('_session', { 'name': name.toLowerCase(), 'password': password },
-            { withCredentials: true, domain: this.userService.getConfig().parentDomain }));
-        }
-        return forkJoin(obsArr);
-      })).subscribe((res) => {
+    this.authService
+      .signupUser(name, password, opts)
+      .pipe(
+        switchMap(() => {
+          return this.couchService.put('shelf/org.couchdb.user:' + name, {});
+        })
+      )
+      .subscribe(
+        (response: any) => {
+          this.planetMessageService.showMessage(
+            'User created: ' + response.id.replace('org.couchdb.user:', '')
+          );
+          this.welcomeNotification(response.id);
+          this.login(this.userForm.value, true);
+        },
+        error =>
+          this.planetMessageService.showAlert(
+            'An error occurred please try again'
+          )
+      );
+  }
 
-      }, (error) => this.planetMessageService.showAlert('Username and/or password do not match'));
+  login(
+    { name, password }: { name: string; password: string },
+    isCreate: boolean
+  ) {
+    this.authService
+      .login(name, password)
+      .pipe(
+        switchMap(data => {
+          // Navigate into app
+          if (isCreate) {
+            return fromPromise(this.router.navigate(['users/update/' + name]));
+          } else {
+            return fromPromise(this.reRoute());
+          }
+        }),
+        switchMap(routeSuccess => {
+          // Post new session info to login_activity
+          const obsArr = [this.userService.newSessionLog()];
+          // If not in e2e test, also add session to parent domain
+          if (
+            !environment.test &&
+            this.userService.getConfig().name === name.toLowerCase()
+          ) {
+            obsArr.push(
+              this.couchService.post(
+                '_session',
+                { name: name.toLowerCase(), password: password },
+                {
+                  withCredentials: true,
+                  domain: this.userService.getConfig().parentDomain
+                }
+              )
+            );
+          }
+          return forkJoin(obsArr);
+        })
+      )
+      .subscribe(
+        res => {},
+        error =>
+          this.planetMessageService.showAlert(
+            'Username and/or password do not match'
+          )
+      );
   }
 }

From f1602a385bf197f330f6c39a17b88fb67c1f7326 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 00:48:26 -0500
Subject: [PATCH 06/64] export pouch auth service

---
 src/app/shared/services/pouchDB/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/services/pouchDB/index.ts b/src/app/shared/services/pouchDB/index.ts
index b32e4b342b..f25167bdc2 100644
--- a/src/app/shared/services/pouchDB/index.ts
+++ b/src/app/shared/services/pouchDB/index.ts
@@ -1,5 +1,7 @@
 import { PouchDBService } from './pouchDB.service';
+import { AuthService } from './auth.service';
 
 export { PouchDBService } from './pouchDB.service';
+export { AuthService } from './auth.service';
 
-export const SHARED_SERVICES = [PouchDBService];
+export const SHARED_SERVICES = [PouchDBService, AuthService];

From ffa0e62b94f4e87e39b7fe01d7a95843b6572c6a Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 01:14:29 -0500
Subject: [PATCH 07/64] replace couch service with auth service

---
 src/app/shared/auth-guard.service.ts | 59 ++++++++++++++++++----------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/app/shared/auth-guard.service.ts b/src/app/shared/auth-guard.service.ts
index c7652b9cd0..17e524bd48 100644
--- a/src/app/shared/auth-guard.service.ts
+++ b/src/app/shared/auth-guard.service.ts
@@ -4,49 +4,68 @@ import { UserService } from './user.service';
 import { Observable } from 'rxjs/Observable';
 import { of } from 'rxjs/observable/of';
 import { switchMap, map } from 'rxjs/operators';
+import { AuthService as PouchDBAuthService } from './services';
 
-import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import {
+  Router,
+  CanActivate,
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot
+} from '@angular/router';
 
 @Injectable()
 export class AuthService {
-
-  constructor(private couchService: CouchService, private userService: UserService, private router: Router) {}
+  constructor(
+    private couchService: CouchService,
+    private userService: UserService,
+    private router: Router,
+    private authService: PouchDBAuthService
+  ) {}
 
   private checkUser(url: any): Observable<boolean> {
-    return this.couchService
-      .get('_session', { withCredentials: true })
-      .pipe(switchMap((res: any) => {
+    return this.authService.getSessionInfo().pipe(
+      switchMap(res => {
         if (res.userCtx.name) {
-          // If user already matches one on the user service, do not make additional call to CouchDB
           if (res.userCtx.name === this.userService.get().name) {
             return of(true);
           }
           return this.userService.setUserConfigAndShelf(res.userCtx);
         }
         this.userService.unset();
-        this.router.navigate([ '/login' ], { queryParams: { returnUrl: url }, replaceUrl: true });
+        this.router.navigate(['/login'], {
+          queryParams: { returnUrl: url },
+          replaceUrl: true
+        });
         return of(false);
       }),
-      map((isLoggedIn) => {
+      map(isLoggedIn => {
         return isLoggedIn;
-      }));
+      })
+    );
   }
 
   // For main app (which requires login).  Uses canActivateChild to check on every route
   // change if session has expired
-  canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
+  canActivateChild(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot
+  ): Observable<boolean> {
     return this.checkUser(state.url);
   }
 
   // For login route will redirect to main app if there is an active session
-  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
-    return this.couchService.get('_session', { withCredentials: true }).pipe(map(res => {
-      if (res.userCtx.name) {
-        this.router.navigate([ '' ]);
-        return false;
-      }
-      return true;
-    }));
+  canActivate(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot
+  ): Observable<boolean> {
+    return this.authService.getSessionInfo().pipe(
+      map(res => {
+        if (res.userCtx.name) {
+          this.router.navigate(['']);
+          return false;
+        }
+        return true;
+      })
+    );
   }
-
 }

From 00796506f300dba2aded1b309728428330164c9f Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 01:14:37 -0500
Subject: [PATCH 08/64] add interface for session info return value

---
 src/app/shared/services/pouchDB/auth.service.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/services/pouchDB/auth.service.ts b/src/app/shared/services/pouchDB/auth.service.ts
index 6fe1389b3a..e572716624 100644
--- a/src/app/shared/services/pouchDB/auth.service.ts
+++ b/src/app/shared/services/pouchDB/auth.service.ts
@@ -5,6 +5,12 @@ import { catchError } from 'rxjs/operators';
 import { environment } from '../../../../environments/environment';
 import { PouchDBService } from './pouchDB.service';
 
+interface SessionInfo {
+  userCtx: {
+    name: String;
+    roles: String[];
+  };
+}
 @Injectable()
 export class AuthService {
   private authDB;
@@ -13,7 +19,7 @@ export class AuthService {
     this.authDB = this.pouchdbService.getAuthDB();
   }
 
-  getSessionInfo() {
+  getSessionInfo(): Observable<SessionInfo> {
     return Observable.fromPromise(this.authDB.getSession()).pipe(
       catchError(this.handleError)
     );

From f41d13a573931259d4d5ff5ac28d75065a166cc3 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 01:25:33 -0500
Subject: [PATCH 09/64] create class to handle courses

---
 .../services/pouchDB/courses.service.ts       | 24 +++++++++++++++++++
 src/app/shared/services/pouchDB/index.ts      |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 src/app/shared/services/pouchDB/courses.service.ts

diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
new file mode 100644
index 0000000000..0e2b332ada
--- /dev/null
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/fromPromise';
+import { environment } from '../../../../environments/environment';
+import { PouchDBService } from './pouchDB.service';
+
+@Injectable()
+export class CoursesService {
+  private baseUrl = environment.couchAddress;
+  private coursesDB;
+
+  constructor(private pouchDBService: PouchDBService) {
+    this.coursesDB = this.pouchDBService.getLocalPouchDB();
+  }
+
+  replicateRemoteCoursesToLocal() {
+    return this.pouchDBService.replicateRemoteToLocal('courses');
+  }
+
+  private handleError(err) {
+    console.error('An error occurred while fetching courses', err);
+    return Observable.throw(err.message || err);
+  }
+}
diff --git a/src/app/shared/services/pouchDB/index.ts b/src/app/shared/services/pouchDB/index.ts
index f25167bdc2..ee2d978f89 100644
--- a/src/app/shared/services/pouchDB/index.ts
+++ b/src/app/shared/services/pouchDB/index.ts
@@ -3,5 +3,6 @@ import { AuthService } from './auth.service';
 
 export { PouchDBService } from './pouchDB.service';
 export { AuthService } from './auth.service';
+export { CoursesService } from './courses.service';
 
 export const SHARED_SERVICES = [PouchDBService, AuthService];

From f8671197ee11e9a9ca384c704be36793ad5960e5 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 12:24:04 -0500
Subject: [PATCH 10/64] add pouchdb-find plugin

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 75c3f9538c..9db47b2ad5 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "ngx-img": "^10.15.0",
     "pouchdb": "^6.4.3",
     "pouchdb-authentication": "^1.1.2",
+    "pouchdb-find": "^6.4.3",
     "rxjs": "5.5.2",
     "zone.js": "^0.8.18"
   },

From b212d45a0092348652fc66d665787f425afbdbc3 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 12:24:29 -0500
Subject: [PATCH 11/64] use pouchdb find plugin and create an index for kind
 field and sort docs by createdDate

---
 src/app/shared/services/pouchDB/pouchDB.service.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/app/shared/services/pouchDB/pouchDB.service.ts b/src/app/shared/services/pouchDB/pouchDB.service.ts
index 8dbdfc2d75..e3ecf1b063 100644
--- a/src/app/shared/services/pouchDB/pouchDB.service.ts
+++ b/src/app/shared/services/pouchDB/pouchDB.service.ts
@@ -1,12 +1,14 @@
 import { Injectable } from '@angular/core';
 import PouchDB from 'pouchdb';
 import PouchDBAuth from 'pouchdb-authentication';
+import PouchDBFind from 'pouchdb-find';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/fromEvent';
 import { catchError } from 'rxjs/operators';
 import { environment } from '../../../../environments/environment';
 
 PouchDB.plugin(PouchDBAuth);
+PouchDB.plugin(PouchDBFind);
 
 type RemoteDatabases = 'courses';
 
@@ -23,6 +25,14 @@ export class PouchDBService {
   constructor() {
     this.localDB = new PouchDB('local-pouchdb');
 
+    // indexes the field for faster lookup
+    this.localDB.createIndex({
+      index: {
+        fields: ['kind']
+      },
+      sort: [{ createdAt: 'desc' }]
+    });
+
     // test is a placeholder temp database
     // we need a central remote database
     // since we will have different levels of authentication (manager, intern)

From 9fbdf730bc078da15187590a4999270ed735bb00 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 12:25:07 -0500
Subject: [PATCH 12/64] remove unused fields, rename class variable and add
 method for fetching courses

---
 .../shared/services/pouchDB/courses.service.ts    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
index 0e2b332ada..9bc8444b34 100644
--- a/src/app/shared/services/pouchDB/courses.service.ts
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -6,11 +6,20 @@ import { PouchDBService } from './pouchDB.service';
 
 @Injectable()
 export class CoursesService {
-  private baseUrl = environment.couchAddress;
-  private coursesDB;
+  private localDB;
 
   constructor(private pouchDBService: PouchDBService) {
-    this.coursesDB = this.pouchDBService.getLocalPouchDB();
+    this.localDB = this.pouchDBService.getLocalPouchDB();
+  }
+
+  getCourses() {
+    return Observable.fromPromise(
+      this.localDB.find({
+        selector: {
+          kind: 'Course'
+        }
+      })
+    );
   }
 
   replicateRemoteCoursesToLocal() {

From 0ef4fbd32a2054237723179f028ea099b661d20a Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 12:25:27 -0500
Subject: [PATCH 13/64] add and use courses service

---
 src/app/courses/courses.module.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/courses/courses.module.ts b/src/app/courses/courses.module.ts
index cac34a28a9..5c827b089c 100644
--- a/src/app/courses/courses.module.ts
+++ b/src/app/courses/courses.module.ts
@@ -17,6 +17,7 @@ import { CoursesStepViewComponent } from './step-view-courses/courses-step-view.
 import { CoursesService } from './courses.service';
 import { ResourcesViewerComponent } from '../resources/view-resources/resources-viewer.component';
 import { ExamsViewComponent } from '../exams/exams-view.component';
+import { CoursesService as PouchDBCoursesService } from '../shared/services';
 
 @NgModule({
   imports: [
@@ -40,8 +41,6 @@ import { ExamsViewComponent } from '../exams/exams-view.component';
     ExamsQuestionComponent,
     ExamsViewComponent
   ],
-  providers: [
-    CoursesService
-  ]
+  providers: [CoursesService, PouchDBCoursesService]
 })
 export class CoursesModule {}

From b78cfa69adad574fb675f5b98c3f3652023e2666 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 12:25:44 -0500
Subject: [PATCH 14/64] use pouchdb for fetching courses

---
 src/app/courses/courses.component.ts | 197 ++++++++++++++++++---------
 1 file changed, 136 insertions(+), 61 deletions(-)

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index 82dac2f4c9..e1a17b4ea9 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -1,23 +1,55 @@
-import { Component, OnInit, AfterViewInit, ViewChild, OnDestroy } from '@angular/core';
+import {
+  Component,
+  OnInit,
+  AfterViewInit,
+  ViewChild,
+  OnDestroy
+} from '@angular/core';
 import { CouchService } from '../shared/couchdb.service';
 import { DialogsPromptComponent } from '../shared/dialogs/dialogs-prompt.component';
-import { MatTableDataSource, MatSort, MatPaginator, MatFormField, MatFormFieldControl, MatDialog, PageEvent } from '@angular/material';
+import {
+  MatTableDataSource,
+  MatSort,
+  MatPaginator,
+  MatFormField,
+  MatFormFieldControl,
+  MatDialog,
+  PageEvent
+} from '@angular/material';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { SelectionModel } from '@angular/cdk/collections';
 import { Router, ActivatedRoute, ParamMap } from '@angular/router';
-import { FormBuilder, FormControl, FormGroup, FormArray, Validators } from '@angular/forms';
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  FormArray,
+  Validators
+} from '@angular/forms';
 import { UserService } from '../shared/user.service';
 import { forkJoin } from 'rxjs/observable/forkJoin';
-import { switchMap, catchError, map, takeUntil } from 'rxjs/operators';
+import {
+  switchMap,
+  catchError,
+  map,
+  takeUntil,
+  mergeMap
+} from 'rxjs/operators';
 import { of } from 'rxjs/observable/of';
-import { filterDropdowns, filterSpecificFields, composeFilterFunctions } from '../shared/table-helpers';
+import {
+  filterDropdowns,
+  filterSpecificFields,
+  composeFilterFunctions
+} from '../shared/table-helpers';
 import * as constants from './constants';
 import { Subject } from 'rxjs/Subject';
+import { CoursesService } from '../shared/services';
 
 @Component({
   templateUrl: './courses.component.html',
-  styles: [ `
+  styles: [
+    `
     /* Column Widths */
     .mat-column-select {
       max-width: 44px;
@@ -25,9 +57,9 @@ import { Subject } from 'rxjs/Subject';
     .mat-column-action {
       max-width: 225px;
     }
-  ` ]
+  `
+  ]
 })
-
 export class CoursesComponent implements OnInit, AfterViewInit {
   selection = new SelectionModel(true, []);
   courses = new MatTableDataSource();
@@ -39,15 +71,19 @@ export class CoursesComponent implements OnInit, AfterViewInit {
   courseForm: FormGroup;
   readonly dbName = 'courses';
   parent = this.route.snapshot.data.parent;
-  displayedColumns = this.parent ? [ 'courseTitle', 'action' ] : [ 'select', 'courseTitle', 'action' ];
+  displayedColumns = this.parent
+    ? ['courseTitle', 'action']
+    : ['select', 'courseTitle', 'action'];
   gradeOptions: any = constants.gradeLevels;
   subjectOptions: any = constants.subjectLevels;
   filter = {
-    'gradeLevel': '',
-    'subjectLevel': ''
+    gradeLevel: '',
+    subjectLevel: ''
   };
   private _titleSearch = '';
-  get titleSearch(): string { return this._titleSearch; }
+  get titleSearch(): string {
+    return this._titleSearch;
+  }
   set titleSearch(value: string) {
     // When setting the titleSearch, also set the courses filter
     this.courses.filter = value ? value : this.dropdownsFill();
@@ -63,24 +99,42 @@ export class CoursesComponent implements OnInit, AfterViewInit {
     private planetMessageService: PlanetMessageService,
     private router: Router,
     private route: ActivatedRoute,
-    private userService: UserService
+    private userService: UserService,
+    private coursesService: CoursesService
   ) {
-    this.userService.shelfChange$.pipe(takeUntil(this.onDestroy$))
+    this.userService.shelfChange$
+      .pipe(takeUntil(this.onDestroy$))
       .subscribe(() => {
         this.userShelf = this.userService.getUserShelf();
         this.setupList(this.courses.data, this.userShelf.courseIds);
       });
-   }
+  }
 
   ngOnInit() {
-    this.getCourses().subscribe((courses: any) => {
-      // Sort in descending createdDate order, so the new courses can be shown on the top
-      courses.sort((a, b) => b.createdDate - a.createdDate);
-      this.userShelf = this.userService.getUserShelf();
-      this.setupList(courses, this.userShelf.courseIds);
-    }, (error) => console.log(error));
-    this.courses.filterPredicate = composeFilterFunctions([ filterDropdowns(this.filter), filterSpecificFields([ 'courseTitle' ]) ]);
-    this.courses.sortingDataAccessor = (item, property) => item[property].toLowerCase();
+    this.coursesService
+      .replicateRemoteCoursesToLocal()
+      .pipe(
+        mergeMap(res => {
+          console.log('syncing from courses...');
+          console.log(res);
+          return this.getCourses();
+        })
+      )
+      .subscribe(
+        (courses: any) => {
+          console.log('fetching courses...');
+          console.log(courses);
+          this.userShelf = this.userService.getUserShelf();
+          this.setupList(courses.docs, this.userShelf.courseIds);
+        },
+        error => console.log(error)
+      );
+    this.courses.filterPredicate = composeFilterFunctions([
+      filterDropdowns(this.filter),
+      filterSpecificFields(['courseTitle'])
+    ]);
+    this.courses.sortingDataAccessor = (item, property) =>
+      item[property].toLowerCase();
   }
 
   setupList(courseRes, myCourses) {
@@ -96,11 +150,7 @@ export class CoursesComponent implements OnInit, AfterViewInit {
   }
 
   getCourses() {
-    let opts: any = {};
-    if (this.parent) {
-      opts = { domain: this.userService.getConfig().parentDomain };
-    }
-    return this.couchService.allDocs('courses', opts);
+    return this.coursesService.getCourses();
   }
 
   ngAfterViewInit() {
@@ -118,11 +168,15 @@ export class CoursesComponent implements OnInit, AfterViewInit {
 
   updateCourse(course) {
     const { _id: courseId } = course;
-    this.router.navigate([ '/courses/update/' + course._id ]);
+    this.router.navigate(['/courses/update/' + course._id]);
   }
 
   deleteClick(course) {
-    this.openDeleteDialog(this.deleteCourse(course), 'single', course.courseTitle);
+    this.openDeleteDialog(
+      this.deleteCourse(course),
+      'single',
+      course.courseTitle
+    );
   }
 
   deleteSelected() {
@@ -149,45 +203,61 @@ export class CoursesComponent implements OnInit, AfterViewInit {
       }
     });
     // Reset the message when the dialog closes
-    this.deleteDialog.afterClosed().debug('Closing dialog').subscribe(() => {
-      this.message = '';
-    });
+    this.deleteDialog
+      .afterClosed()
+      .debug('Closing dialog')
+      .subscribe(() => {
+        this.message = '';
+      });
   }
 
   deleteCourse(course) {
     // Return a function with course on its scope to pass to delete dialog
     return () => {
       const { _id: courseId, _rev: courseRev } = course;
-      this.couchService.delete('courses/' + courseId + '?rev=' + courseRev)
-        .subscribe((data) => {
+      this.couchService
+        .delete('courses/' + courseId + '?rev=' + courseRev)
+        .subscribe(data => {
           // It's safer to remove the item from the array based on its id than to splice based on the index
-          this.courses.data = this.courses.data.filter((c: any) => data.id !== c._id);
+          this.courses.data = this.courses.data.filter(
+            (c: any) => data.id !== c._id
+          );
           this.deleteDialog.close();
           this.selection.clear();
-          this.planetMessageService.showMessage('Course deleted: ' + course.courseTitle);
-        }, (error) => this.deleteDialog.componentInstance.message = 'There was a problem deleting this course.');
+          this.planetMessageService.showMessage(
+            'Course deleted: ' + course.courseTitle
+          );
+        }, error => (this.deleteDialog.componentInstance.message = 'There was a problem deleting this course.'));
     };
   }
 
   deleteCourses(courses) {
     return () => {
-      const deleteArray = courses.map((course) => {
+      const deleteArray = courses.map(course => {
         return { _id: course._id, _rev: course._rev, _deleted: true };
       });
-      this.couchService.post(this.dbName + '/_bulk_docs', { docs: deleteArray })
-      .pipe(switchMap(data => {
-        return this.getCourses();
-      })).subscribe((data: any) => {
-        this.setupList(data, this.userShelf.courseIds);
-        this.selection.clear();
-        this.deleteDialog.close();
-        this.planetMessageService.showMessage('You have deleted selected courses');
-      }, (error) => this.deleteDialog.componentInstance.message = 'There was a problem deleting courses.');
+      this.couchService
+        .post(this.dbName + '/_bulk_docs', { docs: deleteArray })
+        .pipe(
+          switchMap(data => {
+            return this.getCourses();
+          })
+        )
+        .subscribe((data: any) => {
+          this.setupList(data, this.userShelf.courseIds);
+          this.selection.clear();
+          this.deleteDialog.close();
+          this.planetMessageService.showMessage(
+            'You have deleted selected courses'
+          );
+        }, error => (this.deleteDialog.componentInstance.message = 'There was a problem deleting courses.'));
     };
   }
 
   goBack() {
-    this.parent ? this.router.navigate([ '/manager' ]) : this.router.navigate([ '/' ]);
+    this.parent
+      ? this.router.navigate(['/manager'])
+      : this.router.navigate(['/']);
   }
 
   /** Whether the number of selected elements matches the total number of rows. */
@@ -199,9 +269,9 @@ export class CoursesComponent implements OnInit, AfterViewInit {
 
   /** Selects all rows if they are not all selected; otherwise clear selection. */
   masterToggle() {
-    this.isAllSelected() ?
-    this.selection.clear() :
-    this.courses.data.forEach(row => this.selection.select(row));
+    this.isAllSelected()
+      ? this.selection.clear()
+      : this.courses.data.forEach(row => this.selection.select(row));
   }
 
   onFilterChange(filterValue: string, field: string) {
@@ -212,8 +282,8 @@ export class CoursesComponent implements OnInit, AfterViewInit {
 
   resetSearch() {
     this.filter = {
-      'gradeLevel': '',
-      'subjectLevel': ''
+      gradeLevel: '',
+      subjectLevel: ''
     };
     this.titleSearch = '';
   }
@@ -221,7 +291,7 @@ export class CoursesComponent implements OnInit, AfterViewInit {
   // Returns a space to fill the MatTable filter field so filtering runs for dropdowns when
   // search text is deleted, but does not run when there are no active filters.
   dropdownsFill() {
-    return Object.entries(this.filter).reduce((emptySpace, [ field, val ]) => {
+    return Object.entries(this.filter).reduce((emptySpace, [field, val]) => {
       if (val) {
         return ' ';
       }
@@ -230,27 +300,32 @@ export class CoursesComponent implements OnInit, AfterViewInit {
   }
 
   updateShelf(newShelf, message) {
-    this.couchService.put('shelf/' + this.userId, newShelf).subscribe((res) => {
+    this.couchService.put('shelf/' + this.userId, newShelf).subscribe(res => {
       newShelf._rev = res.rev;
       this.userService.setShelf(newShelf);
-      this.setupList(this.courses.data,  this.userShelf.courseIds);
+      this.setupList(this.courses.data, this.userShelf.courseIds);
       this.planetMessageService.showMessage(message);
       // Clear selection because setupList breaks Material Table selection
       this.selection.clear();
-    }, (error) => (error));
+    }, error => error);
   }
 
   courseResign(courseId) {
-    const userShelf: any = { courseIds: [ ...this.userShelf.courseIds ], ...this.userShelf };
+    const userShelf: any = {
+      courseIds: [...this.userShelf.courseIds],
+      ...this.userShelf
+    };
     const myCourseIndex = userShelf.courseIds.indexOf(courseId);
     userShelf.courseIds.splice(myCourseIndex, 1);
     this.updateShelf(userShelf, 'Course successfully resigned');
   }
 
   courseAdmission(courseId) {
-    const userShelf: any = { courseIds: [ ...this.userShelf.courseIds ], ...this.userShelf };
+    const userShelf: any = {
+      courseIds: [...this.userShelf.courseIds],
+      ...this.userShelf
+    };
     userShelf.courseIds.push(courseId);
     this.updateShelf(userShelf, 'Course added to your dashboard');
   }
-
 }

From 66a9fed28fad67d3dc55cae962cbdd0a8b206301 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 16:12:01 -0500
Subject: [PATCH 15/64] index createdAt field and fix sorting

---
 src/app/shared/services/pouchDB/courses.service.ts | 7 +++++--
 src/app/shared/services/pouchDB/pouchDB.service.ts | 5 ++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
index 9bc8444b34..8e818946e2 100644
--- a/src/app/shared/services/pouchDB/courses.service.ts
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -13,11 +13,14 @@ export class CoursesService {
   }
 
   getCourses() {
+    // need to use gte because some documents do not have createdAt field
     return Observable.fromPromise(
       this.localDB.find({
         selector: {
-          kind: 'Course'
-        }
+          kind: 'Course',
+          createdAt: { $gte: null }
+        },
+        sort: [{ kind: 'desc' }, { createdAt: 'desc' }]
       })
     );
   }
diff --git a/src/app/shared/services/pouchDB/pouchDB.service.ts b/src/app/shared/services/pouchDB/pouchDB.service.ts
index e3ecf1b063..9f93ba6831 100644
--- a/src/app/shared/services/pouchDB/pouchDB.service.ts
+++ b/src/app/shared/services/pouchDB/pouchDB.service.ts
@@ -28,9 +28,8 @@ export class PouchDBService {
     // indexes the field for faster lookup
     this.localDB.createIndex({
       index: {
-        fields: ['kind']
-      },
-      sort: [{ createdAt: 'desc' }]
+        fields: ['kind', 'createdAt']
+      }
     });
 
     // test is a placeholder temp database

From 8476d7f86686bdab9eb587cac9d34127c20c2070 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 16:19:21 -0500
Subject: [PATCH 16/64] handle unsubscribing from observables

---
 src/app/courses/courses.component.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index e1a17b4ea9..d958399d1f 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -60,7 +60,7 @@ import { CoursesService } from '../shared/services';
   `
   ]
 })
-export class CoursesComponent implements OnInit, AfterViewInit {
+export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   selection = new SelectionModel(true, []);
   courses = new MatTableDataSource();
   @ViewChild(MatSort) sort: MatSort;
@@ -81,6 +81,7 @@ export class CoursesComponent implements OnInit, AfterViewInit {
     subjectLevel: ''
   };
   private _titleSearch = '';
+
   get titleSearch(): string {
     return this._titleSearch;
   }
@@ -91,7 +92,7 @@ export class CoursesComponent implements OnInit, AfterViewInit {
   }
   userId = this.userService.get()._id;
   userShelf: any = [];
-  private onDestroy$ = new Subject<void>();
+  private onDestroy$: Subject<boolean> = new Subject<boolean>();
 
   constructor(
     private couchService: CouchService,
@@ -118,7 +119,8 @@ export class CoursesComponent implements OnInit, AfterViewInit {
           console.log('syncing from courses...');
           console.log(res);
           return this.getCourses();
-        })
+        }),
+        takeUntil(this.onDestroy$)
       )
       .subscribe(
         (courses: any) => {
@@ -328,4 +330,9 @@ export class CoursesComponent implements OnInit, AfterViewInit {
     userShelf.courseIds.push(courseId);
     this.updateShelf(userShelf, 'Course added to your dashboard');
   }
+
+  ngOnDestroy() {
+    this.onDestroy$.next(false);
+    this.onDestroy$.unsubscribe();
+  }
 }

From 35493269c60f8ab716c454ba6987395612c7eb4f Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 16:37:59 -0500
Subject: [PATCH 17/64] add basic type checking for courses

---
 src/app/courses/courses.component.ts          | 10 ++++----
 .../services/pouchDB/courses.service.ts       | 25 ++++++++++++++++++-
 src/app/shared/services/pouchDB/index.ts      |  2 +-
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index d958399d1f..197374c2a2 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -44,7 +44,7 @@ import {
 } from '../shared/table-helpers';
 import * as constants from './constants';
 import { Subject } from 'rxjs/Subject';
-import { CoursesService } from '../shared/services';
+import { CoursesService, Course } from '../shared/services';
 
 @Component({
   templateUrl: './courses.component.html',
@@ -123,11 +123,11 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
         takeUntil(this.onDestroy$)
       )
       .subscribe(
-        (courses: any) => {
+        courses => {
           console.log('fetching courses...');
           console.log(courses);
           this.userShelf = this.userService.getUserShelf();
-          this.setupList(courses.docs, this.userShelf.courseIds);
+          this.setupList(courses, this.userShelf.courseIds);
         },
         error => console.log(error)
       );
@@ -139,8 +139,8 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
       item[property].toLowerCase();
   }
 
-  setupList(courseRes, myCourses) {
-    this.courses.data = courseRes.map((course: any) => {
+  setupList(courseRes: Course[], myCourses) {
+    this.courses.data = courseRes.map(course => {
       const myCourseIndex = myCourses.findIndex(courseId => {
         return course._id === courseId;
       });
diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
index 8e818946e2..7229ae4bc1 100644
--- a/src/app/shared/services/pouchDB/courses.service.ts
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -3,6 +3,29 @@ import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/fromPromise';
 import { environment } from '../../../../environments/environment';
 import { PouchDBService } from './pouchDB.service';
+import { map } from 'rxjs/operators';
+
+interface Step {
+  stepTitle: string;
+  description: string;
+  attachment: string;
+}
+
+// @TODO: Add more fields from the database
+export interface Course {
+  _id: String;
+  _rev: String;
+  kind: string;
+  languageOfInstruction: string;
+  courseTitle: string;
+  memberLimit: number;
+  description: String;
+  method: string;
+  gradeLevel: string;
+  subjectLevel: string;
+  steps: Step[];
+  createdAt: number;
+}
 
 @Injectable()
 export class CoursesService {
@@ -22,7 +45,7 @@ export class CoursesService {
         },
         sort: [{ kind: 'desc' }, { createdAt: 'desc' }]
       })
-    );
+    ).pipe(map((data: { docs: Course[] }) => data.docs));
   }
 
   replicateRemoteCoursesToLocal() {
diff --git a/src/app/shared/services/pouchDB/index.ts b/src/app/shared/services/pouchDB/index.ts
index ee2d978f89..484c551a8b 100644
--- a/src/app/shared/services/pouchDB/index.ts
+++ b/src/app/shared/services/pouchDB/index.ts
@@ -3,6 +3,6 @@ import { AuthService } from './auth.service';
 
 export { PouchDBService } from './pouchDB.service';
 export { AuthService } from './auth.service';
-export { CoursesService } from './courses.service';
+export { CoursesService, Course } from './courses.service';
 
 export const SHARED_SERVICES = [PouchDBService, AuthService];

From 39f9bf01ac53d2f3c020570e4fd04ae0a7477003 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 16:51:14 -0500
Subject: [PATCH 18/64] use truthy value for unsubcribing

---
 src/app/courses/courses.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index 197374c2a2..c76635243c 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -332,7 +332,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngOnDestroy() {
-    this.onDestroy$.next(false);
+    this.onDestroy$.next(true);
     this.onDestroy$.unsubscribe();
   }
 }

From 7d89c22f17ff2508ff56f1ece9d00feb4d255919 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 16:56:28 -0500
Subject: [PATCH 19/64] add return type

---
 src/app/shared/services/pouchDB/courses.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
index 7229ae4bc1..5a9a2f6d90 100644
--- a/src/app/shared/services/pouchDB/courses.service.ts
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -35,7 +35,7 @@ export class CoursesService {
     this.localDB = this.pouchDBService.getLocalPouchDB();
   }
 
-  getCourses() {
+  getCourses(): Observable<Course[]> {
     // need to use gte because some documents do not have createdAt field
     return Observable.fromPromise(
       this.localDB.find({

From d413d7b3d26b63aa70ad16e6687292a0c2a06b2a Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 17:00:54 -0500
Subject: [PATCH 20/64] add type to MatTableDataSource

---
 src/app/courses/courses.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index c76635243c..fd7f09d96d 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -62,7 +62,7 @@ import { CoursesService, Course } from '../shared/services';
 })
 export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   selection = new SelectionModel(true, []);
-  courses = new MatTableDataSource();
+  courses: MatTableDataSource<Course> = new MatTableDataSource<Course>();
   @ViewChild(MatSort) sort: MatSort;
   @ViewChild(MatPaginator) paginator: MatPaginator;
   message = '';

From 8ce6604e904f5193e79a30767bc9374480345993 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 17:31:51 -0500
Subject: [PATCH 21/64] add method to get single course

---
 src/app/shared/services/pouchDB/courses.service.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
index 5a9a2f6d90..b01766ab34 100644
--- a/src/app/shared/services/pouchDB/courses.service.ts
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -48,6 +48,10 @@ export class CoursesService {
     ).pipe(map((data: { docs: Course[] }) => data.docs));
   }
 
+  getCourse(id): Observable<Course> {
+    return Observable.fromPromise(this.localDB.get(id));
+  }
+
   replicateRemoteCoursesToLocal() {
     return this.pouchDBService.replicateRemoteToLocal('courses');
   }

From d4a9280b9d2337edabd15fa2b64b2769580081c1 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 17:31:58 -0500
Subject: [PATCH 22/64] replace with pouch service

---
 .../view-courses/courses-view.component.ts    | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/app/courses/view-courses/courses-view.component.ts b/src/app/courses/view-courses/courses-view.component.ts
index 622751cb23..5bf8c7c504 100644
--- a/src/app/courses/view-courses/courses-view.component.ts
+++ b/src/app/courses/view-courses/courses-view.component.ts
@@ -1,15 +1,14 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
-import { CouchService } from '../../shared/couchdb.service';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { switchMap, takeUntil } from 'rxjs/operators';
 import { DatePipe } from '@angular/common';
-import { UserService } from '../../shared/user.service';
-import { CoursesService } from '../courses.service';
 import { Subject } from 'rxjs/Subject';
+import { CoursesService } from '../../shared/services';
 
 @Component({
   templateUrl: './courses-view.component.html',
-  styles: [ `
+  styles: [
+    `
   .view-container {
     display: grid;
     grid-template-columns: 1fr 1fr;
@@ -28,38 +27,38 @@ import { Subject } from 'rxjs/Subject';
   .course-detail, .course-view {
     overflow: auto;
   }
-  ` ]
+  `
+  ]
 })
-
 export class CoursesViewComponent implements OnInit, OnDestroy {
-
-  onDestroy$ = new Subject<void>();
+  private onDestroy$: Subject<boolean> = new Subject<boolean>();
   courseDetail: any = {};
   parent = this.route.snapshot.data.parent;
 
   constructor(
     private router: Router,
-    private couchService: CouchService,
-    private userService: UserService,
     private route: ActivatedRoute,
-    private coursesService: CoursesService
-  ) { }
+    private courseService: CoursesService
+  ) {}
 
   ngOnInit() {
-    this.coursesService.courseUpdated$.pipe(takeUntil(this.onDestroy$)).subscribe(course => this.courseDetail = course);
-    this.route.paramMap.pipe(takeUntil(this.onDestroy$)).subscribe(
-      (params: ParamMap) => this.coursesService.requestCourse({ courseId: params.get('id'), forceLatest: true }),
-      error => console.log(error)
-    );
+    this.route.paramMap
+      .pipe(
+        switchMap((params: ParamMap) =>
+          this.courseService.getCourse(params.get('id'))
+        )
+      )
+      .subscribe(course => {
+        this.courseDetail = course;
+      });
   }
 
   ngOnDestroy() {
-    this.onDestroy$.next();
-    this.onDestroy$.complete();
+    this.onDestroy$.next(true);
+    this.onDestroy$.unsubscribe();
   }
 
   viewStep() {
-    this.router.navigate([ './step/1' ], { relativeTo: this.route });
+    this.router.navigate(['./step/1'], { relativeTo: this.route });
   }
-
 }

From efb49956f95cc0cfc7f19fad0d5d8dfe0b3108a9 Mon Sep 17 00:00:00 2001
From: Paul <paul.r.albert@gmail.com>
Date: Mon, 21 May 2018 14:53:09 -0400
Subject: [PATCH 23/64] Remove superficial changes and lint fix

---
 src/app/app.module.ts                         |   6 +-
 src/app/courses/courses.component.ts          | 151 ++++++------------
 src/app/courses/courses.module.ts             |   4 +-
 .../view-courses/courses-view.component.ts    |  12 +-
 src/app/login/login-form.component.ts         |  56 +++----
 src/app/shared/auth-guard.service.ts          |  49 ++----
 .../services/pouchDB/courses.service.ts       |   2 +-
 src/app/shared/services/pouchDB/index.ts      |   2 +-
 .../services/pouchDB/pouchDB.service.ts       |   2 +-
 tsconfig.json                                 |   9 +-
 10 files changed, 106 insertions(+), 187 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 4708ea3835..7f14f9aabb 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -34,7 +34,9 @@ import { SHARED_SERVICES } from './shared/services';
       ? ServiceWorkerModule.register('/ngsw-worker.js')
       : []
   ],
-  declarations: [AppComponent, PageNotFoundComponent],
+  declarations: [
+    AppComponent, PageNotFoundComponent
+  ],
   providers: [
     CouchService,
     AuthService,
@@ -46,6 +48,6 @@ import { SHARED_SERVICES } from './shared/services';
     ResourcesService,
     ...SHARED_SERVICES
   ],
-  bootstrap: [AppComponent]
+  bootstrap: [ AppComponent ]
 })
 export class AppModule {}
diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index fd7f09d96d..feaa788263 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -1,55 +1,24 @@
-import {
-  Component,
-  OnInit,
-  AfterViewInit,
-  ViewChild,
-  OnDestroy
-} from '@angular/core';
+import { Component, OnInit, AfterViewInit, ViewChild, OnDestroy } from '@angular/core';
 import { CouchService } from '../shared/couchdb.service';
 import { DialogsPromptComponent } from '../shared/dialogs/dialogs-prompt.component';
-import {
-  MatTableDataSource,
-  MatSort,
-  MatPaginator,
-  MatFormField,
-  MatFormFieldControl,
-  MatDialog,
-  PageEvent
-} from '@angular/material';
+import { MatTableDataSource, MatSort, MatPaginator, MatFormField, MatFormFieldControl, MatDialog, PageEvent } from '@angular/material';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { SelectionModel } from '@angular/cdk/collections';
 import { Router, ActivatedRoute, ParamMap } from '@angular/router';
-import {
-  FormBuilder,
-  FormControl,
-  FormGroup,
-  FormArray,
-  Validators
-} from '@angular/forms';
+import { FormBuilder, FormControl, FormGroup, FormArray, Validators } from '@angular/forms';
 import { UserService } from '../shared/user.service';
 import { forkJoin } from 'rxjs/observable/forkJoin';
-import {
-  switchMap,
-  catchError,
-  map,
-  takeUntil,
-  mergeMap
-} from 'rxjs/operators';
+import { switchMap, catchError, map, takeUntil, mergeMap } from 'rxjs/operators';
 import { of } from 'rxjs/observable/of';
-import {
-  filterDropdowns,
-  filterSpecificFields,
-  composeFilterFunctions
-} from '../shared/table-helpers';
+import { filterDropdowns, filterSpecificFields, composeFilterFunctions } from '../shared/table-helpers';
 import * as constants from './constants';
 import { Subject } from 'rxjs/Subject';
 import { CoursesService, Course } from '../shared/services';
 
 @Component({
   templateUrl: './courses.component.html',
-  styles: [
-    `
+  styles: [ `
     /* Column Widths */
     .mat-column-select {
       max-width: 44px;
@@ -57,8 +26,7 @@ import { CoursesService, Course } from '../shared/services';
     .mat-column-action {
       max-width: 225px;
     }
-  `
-  ]
+  ` ]
 })
 export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   selection = new SelectionModel(true, []);
@@ -71,20 +39,15 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   courseForm: FormGroup;
   readonly dbName = 'courses';
   parent = this.route.snapshot.data.parent;
-  displayedColumns = this.parent
-    ? ['courseTitle', 'action']
-    : ['select', 'courseTitle', 'action'];
+  displayedColumns = this.parent ? [ 'courseTitle', 'action' ] : [ 'select', 'courseTitle', 'action' ];
   gradeOptions: any = constants.gradeLevels;
   subjectOptions: any = constants.subjectLevels;
   filter = {
-    gradeLevel: '',
-    subjectLevel: ''
+    'gradeLevel': '',
+    'subjectLevel': ''
   };
   private _titleSearch = '';
-
-  get titleSearch(): string {
-    return this._titleSearch;
-  }
+  get titleSearch(): string { return this._titleSearch; }
   set titleSearch(value: string) {
     // When setting the titleSearch, also set the courses filter
     this.courses.filter = value ? value : this.dropdownsFill();
@@ -92,7 +55,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
   userId = this.userService.get()._id;
   userShelf: any = [];
-  private onDestroy$: Subject<boolean> = new Subject<boolean>();
+  private onDestroy$ = new Subject<boolean>();
 
   constructor(
     private couchService: CouchService,
@@ -103,8 +66,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
     private userService: UserService,
     private coursesService: CoursesService
   ) {
-    this.userService.shelfChange$
-      .pipe(takeUntil(this.onDestroy$))
+    this.userService.shelfChange$.pipe(takeUntil(this.onDestroy$))
       .subscribe(() => {
         this.userShelf = this.userService.getUserShelf();
         this.setupList(this.courses.data, this.userShelf.courseIds);
@@ -131,12 +93,8 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
         },
         error => console.log(error)
       );
-    this.courses.filterPredicate = composeFilterFunctions([
-      filterDropdowns(this.filter),
-      filterSpecificFields(['courseTitle'])
-    ]);
-    this.courses.sortingDataAccessor = (item, property) =>
-      item[property].toLowerCase();
+    this.courses.filterPredicate = composeFilterFunctions([ filterDropdowns(this.filter), filterSpecificFields([ 'courseTitle' ]) ]);
+    this.courses.sortingDataAccessor = (item, property) => item[property].toLowerCase();
   }
 
   setupList(courseRes: Course[], myCourses) {
@@ -170,7 +128,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
 
   updateCourse(course) {
     const { _id: courseId } = course;
-    this.router.navigate(['/courses/update/' + course._id]);
+    this.router.navigate([ '/courses/update/' + course._id ]);
   }
 
   deleteClick(course) {
@@ -205,61 +163,47 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
       }
     });
     // Reset the message when the dialog closes
-    this.deleteDialog
-      .afterClosed()
-      .debug('Closing dialog')
-      .subscribe(() => {
-        this.message = '';
-      });
+    this.deleteDialog.afterClosed().debug('Closing dialog').subscribe(() => {
+      this.message = '';
+    });
   }
 
   deleteCourse(course) {
     // Return a function with course on its scope to pass to delete dialog
     return () => {
       const { _id: courseId, _rev: courseRev } = course;
-      this.couchService
-        .delete('courses/' + courseId + '?rev=' + courseRev)
+      this.couchService.delete('courses/' + courseId + '?rev=' + courseRev)
         .subscribe(data => {
           // It's safer to remove the item from the array based on its id than to splice based on the index
-          this.courses.data = this.courses.data.filter(
-            (c: any) => data.id !== c._id
-          );
+          this.courses.data = this.courses.data.filter((c: any) => data.id !== c._id);
           this.deleteDialog.close();
           this.selection.clear();
-          this.planetMessageService.showMessage(
-            'Course deleted: ' + course.courseTitle
-          );
-        }, error => (this.deleteDialog.componentInstance.message = 'There was a problem deleting this course.'));
+          this.planetMessageService.showMessage('Course deleted: ' + course.courseTitle);
+        }, error => this.deleteDialog.componentInstance.message = 'There was a problem deleting this course.');
     };
   }
 
   deleteCourses(courses) {
     return () => {
-      const deleteArray = courses.map(course => {
+      const deleteArray = courses.map((course) => {
         return { _id: course._id, _rev: course._rev, _deleted: true };
       });
-      this.couchService
-        .post(this.dbName + '/_bulk_docs', { docs: deleteArray })
-        .pipe(
-          switchMap(data => {
-            return this.getCourses();
-          })
-        )
-        .subscribe((data: any) => {
-          this.setupList(data, this.userShelf.courseIds);
-          this.selection.clear();
-          this.deleteDialog.close();
-          this.planetMessageService.showMessage(
-            'You have deleted selected courses'
-          );
-        }, error => (this.deleteDialog.componentInstance.message = 'There was a problem deleting courses.'));
+      this.couchService.post(this.dbName + '/_bulk_docs', { docs: deleteArray })
+      .pipe(switchMap(data => {
+          return this.getCourses();
+      })).subscribe((data: any) => {
+        this.setupList(data, this.userShelf.courseIds);
+        this.selection.clear();
+        this.deleteDialog.close();
+        this.planetMessageService.showMessage(
+          'You have deleted selected courses'
+        );
+      }, error => this.deleteDialog.componentInstance.message = 'There was a problem deleting courses.');
     };
   }
 
   goBack() {
-    this.parent
-      ? this.router.navigate(['/manager'])
-      : this.router.navigate(['/']);
+    this.parent ? this.router.navigate([ '/manager' ]) : this.router.navigate([ '/' ]);
   }
 
   /** Whether the number of selected elements matches the total number of rows. */
@@ -271,9 +215,9 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
 
   /** Selects all rows if they are not all selected; otherwise clear selection. */
   masterToggle() {
-    this.isAllSelected()
-      ? this.selection.clear()
-      : this.courses.data.forEach(row => this.selection.select(row));
+    this.isAllSelected() ?
+    this.selection.clear() :
+    this.courses.data.forEach(row => this.selection.select(row));
   }
 
   onFilterChange(filterValue: string, field: string) {
@@ -284,8 +228,8 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
 
   resetSearch() {
     this.filter = {
-      gradeLevel: '',
-      subjectLevel: ''
+      'gradeLevel': '',
+      'subjectLevel': ''
     };
     this.titleSearch = '';
   }
@@ -293,7 +237,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   // Returns a space to fill the MatTable filter field so filtering runs for dropdowns when
   // search text is deleted, but does not run when there are no active filters.
   dropdownsFill() {
-    return Object.entries(this.filter).reduce((emptySpace, [field, val]) => {
+    return Object.entries(this.filter).reduce((emptySpace, [ field, val ]) => {
       if (val) {
         return ' ';
       }
@@ -302,21 +246,18 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   updateShelf(newShelf, message) {
-    this.couchService.put('shelf/' + this.userId, newShelf).subscribe(res => {
+    this.couchService.put('shelf/' + this.userId, newShelf).subscribe((res) => {
       newShelf._rev = res.rev;
       this.userService.setShelf(newShelf);
       this.setupList(this.courses.data, this.userShelf.courseIds);
       this.planetMessageService.showMessage(message);
       // Clear selection because setupList breaks Material Table selection
       this.selection.clear();
-    }, error => error);
+    }, (error) => (error));
   }
 
   courseResign(courseId) {
-    const userShelf: any = {
-      courseIds: [...this.userShelf.courseIds],
-      ...this.userShelf
-    };
+    const userShelf: any = { courseIds: [ ...this.userShelf.courseIds ], ...this.userShelf };
     const myCourseIndex = userShelf.courseIds.indexOf(courseId);
     userShelf.courseIds.splice(myCourseIndex, 1);
     this.updateShelf(userShelf, 'Course successfully resigned');
@@ -324,7 +265,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
 
   courseAdmission(courseId) {
     const userShelf: any = {
-      courseIds: [...this.userShelf.courseIds],
+      courseIds: [ ...this.userShelf.courseIds ],
       ...this.userShelf
     };
     userShelf.courseIds.push(courseId);
diff --git a/src/app/courses/courses.module.ts b/src/app/courses/courses.module.ts
index 5c827b089c..7e24f5c2c7 100644
--- a/src/app/courses/courses.module.ts
+++ b/src/app/courses/courses.module.ts
@@ -41,6 +41,8 @@ import { CoursesService as PouchDBCoursesService } from '../shared/services';
     ExamsQuestionComponent,
     ExamsViewComponent
   ],
-  providers: [CoursesService, PouchDBCoursesService]
+  providers: [
+    CoursesService, PouchDBCoursesService
+  ]
 })
 export class CoursesModule {}
diff --git a/src/app/courses/view-courses/courses-view.component.ts b/src/app/courses/view-courses/courses-view.component.ts
index 5bf8c7c504..7de1937b0d 100644
--- a/src/app/courses/view-courses/courses-view.component.ts
+++ b/src/app/courses/view-courses/courses-view.component.ts
@@ -7,8 +7,7 @@ import { CoursesService } from '../../shared/services';
 
 @Component({
   templateUrl: './courses-view.component.html',
-  styles: [
-    `
+  styles: [ `
   .view-container {
     display: grid;
     grid-template-columns: 1fr 1fr;
@@ -27,10 +26,10 @@ import { CoursesService } from '../../shared/services';
   .course-detail, .course-view {
     overflow: auto;
   }
-  `
-  ]
+  ` ]
 })
 export class CoursesViewComponent implements OnInit, OnDestroy {
+
   private onDestroy$: Subject<boolean> = new Subject<boolean>();
   courseDetail: any = {};
   parent = this.route.snapshot.data.parent;
@@ -39,7 +38,7 @@ export class CoursesViewComponent implements OnInit, OnDestroy {
     private router: Router,
     private route: ActivatedRoute,
     private courseService: CoursesService
-  ) {}
+  ) { }
 
   ngOnInit() {
     this.route.paramMap
@@ -59,6 +58,7 @@ export class CoursesViewComponent implements OnInit, OnDestroy {
   }
 
   viewStep() {
-    this.router.navigate(['./step/1'], { relativeTo: this.route });
+    this.router.navigate([ './step/1' ], { relativeTo: this.route });
   }
+
 }
diff --git a/src/app/login/login-form.component.ts b/src/app/login/login-form.component.ts
index f3b8c5ec95..acb2de9588 100644
--- a/src/app/login/login-form.component.ts
+++ b/src/app/login/login-form.component.ts
@@ -5,12 +5,7 @@ import { UserService } from '../shared/user.service';
 import { switchMap } from 'rxjs/operators';
 import { fromPromise } from 'rxjs/observable/fromPromise';
 import { forkJoin } from 'rxjs/observable/forkJoin';
-import {
-  FormControl,
-  FormGroup,
-  FormBuilder,
-  Validators
-} from '@angular/forms';
+import { FormControl, FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { CustomValidators } from '../validators/custom-validators';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { environment } from '../../environments/environment';
@@ -19,30 +14,24 @@ import { AuthService } from '../shared/services';
 
 const registerForm = {
   name: [],
-  password: [
-    '',
-    Validators.compose([
-      Validators.required,
-      CustomValidators.matchPassword('repeatPassword', false)
-    ])
-  ],
-  repeatPassword: [
-    '',
-    Validators.compose([
-      Validators.required,
-      CustomValidators.matchPassword('password', true)
-    ])
-  ]
+  password: [ '', Validators.compose([
+    Validators.required,
+    CustomValidators.matchPassword('repeatPassword', false)
+    ]) ],
+  repeatPassword: [ '', Validators.compose([
+    Validators.required,
+    CustomValidators.matchPassword('password', true)
+    ]) ]
 };
 
 const loginForm = {
-  name: ['', Validators.required],
-  password: ['', Validators.required]
+  name: [ '', Validators.required ],
+  password: [ '', Validators.required ]
 };
 
 @Component({
   templateUrl: './login-form.component.html',
-  styleUrls: ['./login.scss']
+  styleUrls: [ './login.scss' ]
 })
 export class LoginFormComponent {
   public userForm: FormGroup;
@@ -56,11 +45,8 @@ export class LoginFormComponent {
     private validatorService: ValidatorService,
     private authService: AuthService
   ) {
-    registerForm.name = [
-      '',
-      [Validators.required, Validators.pattern(/^[a-z0-9_.-]+$/i)],
-      ac => this.validatorService.isUnique$('_users', 'name', ac, {})
-    ];
+    registerForm.name = [ '', [ Validators.required, Validators.pattern(/^[a-z0-9_.-]+$/i) ],
+      ac => this.validatorService.isUnique$('_users', 'name', ac, {}) ];
     const formObj = this.createMode ? registerForm : loginForm;
     this.userForm = this.formBuilder.group(formObj);
   }
@@ -85,21 +71,19 @@ export class LoginFormComponent {
   welcomeNotification(userId) {
     const data = {
       user: userId,
-      message:
-        'Welcome ' +
-        userId.replace('org.couchdb.user:', '') +
-        ' to the Planet Learning',
+      message: 'Welcome ' + userId.replace('org.couchdb.user:', '') + ' to the Planet Learning',
       link: '',
       type: 'register',
       priority: 1,
       status: 'unread',
       time: Date.now()
     };
-    this.couchService.post('notifications', data).subscribe();
+    this.couchService.post('notifications', data)
+      .subscribe();
   }
 
   reRoute() {
-    return this.router.navigate([this.returnUrl]);
+    return this.router.navigate([ this.returnUrl ]);
   }
 
   createUser({ name, password }: { name: string; password: string }) {
@@ -142,14 +126,14 @@ export class LoginFormComponent {
         switchMap(data => {
           // Navigate into app
           if (isCreate) {
-            return fromPromise(this.router.navigate(['users/update/' + name]));
+            return fromPromise(this.router.navigate([ 'users/update/' + name ]));
           } else {
             return fromPromise(this.reRoute());
           }
         }),
         switchMap(routeSuccess => {
           // Post new session info to login_activity
-          const obsArr = [this.userService.newSessionLog()];
+          const obsArr = [ this.userService.newSessionLog() ];
           // If not in e2e test, also add session to parent domain
           if (
             !environment.test &&
diff --git a/src/app/shared/auth-guard.service.ts b/src/app/shared/auth-guard.service.ts
index 17e524bd48..9ba157bb87 100644
--- a/src/app/shared/auth-guard.service.ts
+++ b/src/app/shared/auth-guard.service.ts
@@ -6,15 +6,11 @@ import { of } from 'rxjs/observable/of';
 import { switchMap, map } from 'rxjs/operators';
 import { AuthService as PouchDBAuthService } from './services';
 
-import {
-  Router,
-  CanActivate,
-  ActivatedRouteSnapshot,
-  RouterStateSnapshot
-} from '@angular/router';
+import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 
 @Injectable()
 export class AuthService {
+
   constructor(
     private couchService: CouchService,
     private userService: UserService,
@@ -23,49 +19,38 @@ export class AuthService {
   ) {}
 
   private checkUser(url: any): Observable<boolean> {
-    return this.authService.getSessionInfo().pipe(
-      switchMap(res => {
+    return this.authService.getSessionInfo()
+      .pipe(switchMap(res => {
         if (res.userCtx.name) {
+          // If user already matches one on the user service, do not make additional call to CouchDB
           if (res.userCtx.name === this.userService.get().name) {
             return of(true);
           }
           return this.userService.setUserConfigAndShelf(res.userCtx);
         }
         this.userService.unset();
-        this.router.navigate(['/login'], {
-          queryParams: { returnUrl: url },
-          replaceUrl: true
-        });
+        this.router.navigate([ '/login' ], { queryParams: { returnUrl: url }, replaceUrl: true });
         return of(false);
       }),
-      map(isLoggedIn => {
+      map((isLoggedIn) => {
         return isLoggedIn;
-      })
-    );
+      }));
   }
 
   // For main app (which requires login).  Uses canActivateChild to check on every route
   // change if session has expired
-  canActivateChild(
-    route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot
-  ): Observable<boolean> {
+  canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
     return this.checkUser(state.url);
   }
 
   // For login route will redirect to main app if there is an active session
-  canActivate(
-    route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot
-  ): Observable<boolean> {
-    return this.authService.getSessionInfo().pipe(
-      map(res => {
-        if (res.userCtx.name) {
-          this.router.navigate(['']);
-          return false;
-        }
-        return true;
-      })
-    );
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
+    return this.authService.getSessionInfo().pipe(map(res => {
+      if (res.userCtx.name) {
+        this.router.navigate([ '' ]);
+        return false;
+      }
+      return true;
+    }));
   }
 }
diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
index b01766ab34..c6194f4c1d 100644
--- a/src/app/shared/services/pouchDB/courses.service.ts
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -43,7 +43,7 @@ export class CoursesService {
           kind: 'Course',
           createdAt: { $gte: null }
         },
-        sort: [{ kind: 'desc' }, { createdAt: 'desc' }]
+        sort: [ { kind: 'desc' }, { createdAt: 'desc' } ]
       })
     ).pipe(map((data: { docs: Course[] }) => data.docs));
   }
diff --git a/src/app/shared/services/pouchDB/index.ts b/src/app/shared/services/pouchDB/index.ts
index 484c551a8b..511c36d810 100644
--- a/src/app/shared/services/pouchDB/index.ts
+++ b/src/app/shared/services/pouchDB/index.ts
@@ -5,4 +5,4 @@ export { PouchDBService } from './pouchDB.service';
 export { AuthService } from './auth.service';
 export { CoursesService, Course } from './courses.service';
 
-export const SHARED_SERVICES = [PouchDBService, AuthService];
+export const SHARED_SERVICES = [ PouchDBService, AuthService ];
diff --git a/src/app/shared/services/pouchDB/pouchDB.service.ts b/src/app/shared/services/pouchDB/pouchDB.service.ts
index 9f93ba6831..601a3c0988 100644
--- a/src/app/shared/services/pouchDB/pouchDB.service.ts
+++ b/src/app/shared/services/pouchDB/pouchDB.service.ts
@@ -28,7 +28,7 @@ export class PouchDBService {
     // indexes the field for faster lookup
     this.localDB.createIndex({
       index: {
-        fields: ['kind', 'createdAt']
+        fields: [ 'kind', 'createdAt' ]
       }
     });
 
diff --git a/tsconfig.json b/tsconfig.json
index 146b8e994d..0c00a75d0a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,8 +9,13 @@
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
     "target": "es5",
-    "typeRoots": ["node_modules/@types"],
-    "lib": ["es2017", "dom"]
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
+    ]
   },
   "angularCompilerOptions": {
     "preserveWhitespaces": false

From 572ae3d4f465eb5fdf0541b6bf16d519f0a8da3c Mon Sep 17 00:00:00 2001
From: Paul <paul.r.albert@gmail.com>
Date: Mon, 21 May 2018 15:20:42 -0400
Subject: [PATCH 24/64] Remove superficial changes 2

---
 src/app/courses/courses.component.ts  |  23 ++----
 src/app/login/login-form.component.ts | 105 +++++++++-----------------
 2 files changed, 43 insertions(+), 85 deletions(-)

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index feaa788263..0caa9d3c5c 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -132,11 +132,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   deleteClick(course) {
-    this.openDeleteDialog(
-      this.deleteCourse(course),
-      'single',
-      course.courseTitle
-    );
+    this.openDeleteDialog(this.deleteCourse(course), 'single', course.courseTitle);
   }
 
   deleteSelected() {
@@ -173,13 +169,13 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
     return () => {
       const { _id: courseId, _rev: courseRev } = course;
       this.couchService.delete('courses/' + courseId + '?rev=' + courseRev)
-        .subscribe(data => {
+        .subscribe((data) => {
           // It's safer to remove the item from the array based on its id than to splice based on the index
           this.courses.data = this.courses.data.filter((c: any) => data.id !== c._id);
           this.deleteDialog.close();
           this.selection.clear();
           this.planetMessageService.showMessage('Course deleted: ' + course.courseTitle);
-        }, error => this.deleteDialog.componentInstance.message = 'There was a problem deleting this course.');
+        }, (error) => this.deleteDialog.componentInstance.message = 'There was a problem deleting this course.');
     };
   }
 
@@ -190,15 +186,13 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
       });
       this.couchService.post(this.dbName + '/_bulk_docs', { docs: deleteArray })
       .pipe(switchMap(data => {
-          return this.getCourses();
+        return this.getCourses();
       })).subscribe((data: any) => {
         this.setupList(data, this.userShelf.courseIds);
         this.selection.clear();
         this.deleteDialog.close();
-        this.planetMessageService.showMessage(
-          'You have deleted selected courses'
-        );
-      }, error => this.deleteDialog.componentInstance.message = 'There was a problem deleting courses.');
+        this.planetMessageService.showMessage('You have deleted selected courses');
+      }, (error) => this.deleteDialog.componentInstance.message = 'There was a problem deleting courses.');
     };
   }
 
@@ -264,10 +258,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   courseAdmission(courseId) {
-    const userShelf: any = {
-      courseIds: [ ...this.userShelf.courseIds ],
-      ...this.userShelf
-    };
+    const userShelf: any = { courseIds: [ ...this.userShelf.courseIds ], ...this.userShelf };
     userShelf.courseIds.push(courseId);
     this.updateShelf(userShelf, 'Course added to your dashboard');
   }
diff --git a/src/app/login/login-form.component.ts b/src/app/login/login-form.component.ts
index acb2de9588..84012c6fa6 100644
--- a/src/app/login/login-form.component.ts
+++ b/src/app/login/login-form.component.ts
@@ -70,13 +70,13 @@ export class LoginFormComponent {
 
   welcomeNotification(userId) {
     const data = {
-      user: userId,
-      message: 'Welcome ' + userId.replace('org.couchdb.user:', '') + ' to the Planet Learning',
-      link: '',
-      type: 'register',
-      priority: 1,
-      status: 'unread',
-      time: Date.now()
+      'user': userId,
+      'message': 'Welcome ' + userId.replace('org.couchdb.user:', '') + ' to the Planet Learning',
+      'link': '',
+      'type': 'register',
+      'priority': 1,
+      'status': 'unread',
+      'time': Date.now()
     };
     this.couchService.post('notifications', data)
       .subscribe();
@@ -94,71 +94,38 @@ export class LoginFormComponent {
       joinDate: Date.now()
     };
 
-    this.authService
-      .signupUser(name, password, opts)
-      .pipe(
-        switchMap(() => {
-          return this.couchService.put('shelf/org.couchdb.user:' + name, {});
-        })
-      )
-      .subscribe(
-        (response: any) => {
-          this.planetMessageService.showMessage(
-            'User created: ' + response.id.replace('org.couchdb.user:', '')
-          );
-          this.welcomeNotification(response.id);
-          this.login(this.userForm.value, true);
-        },
-        error =>
-          this.planetMessageService.showAlert(
-            'An error occurred please try again'
-          )
-      );
+    this.authService.signupUser(name, password, opts)
+    .pipe(switchMap(() => {
+      return this.couchService.put('shelf/org.couchdb.user:' + name, { });
+    }))
+    .subscribe((response: any) => {
+      this.planetMessageService.showMessage('User created: ' + response.id.replace('org.couchdb.user:', ''));
+      this.welcomeNotification(response.id);
+      this.login(this.userForm.value, true);
+    }, error => this.planetMessageService.showAlert('An error occurred please try again'));
   }
 
-  login(
-    { name, password }: { name: string; password: string },
-    isCreate: boolean
-  ) {
+  login({ name, password }: { name: string; password: string }, isCreate: boolean) {
     this.authService
       .login(name, password)
-      .pipe(
-        switchMap(data => {
-          // Navigate into app
-          if (isCreate) {
-            return fromPromise(this.router.navigate([ 'users/update/' + name ]));
-          } else {
-            return fromPromise(this.reRoute());
-          }
-        }),
-        switchMap(routeSuccess => {
-          // Post new session info to login_activity
-          const obsArr = [ this.userService.newSessionLog() ];
-          // If not in e2e test, also add session to parent domain
-          if (
-            !environment.test &&
-            this.userService.getConfig().name === name.toLowerCase()
-          ) {
-            obsArr.push(
-              this.couchService.post(
-                '_session',
-                { name: name.toLowerCase(), password: password },
-                {
-                  withCredentials: true,
-                  domain: this.userService.getConfig().parentDomain
-                }
-              )
-            );
-          }
-          return forkJoin(obsArr);
-        })
-      )
-      .subscribe(
-        res => {},
-        error =>
-          this.planetMessageService.showAlert(
-            'Username and/or password do not match'
-          )
-      );
+      .pipe(switchMap(data => {
+        // Navigate into app
+        if (isCreate) {
+          return fromPromise(this.router.navigate( [ 'users/update/' + name ]));
+        } else {
+          return fromPromise(this.reRoute());
+        }
+      }), switchMap(routeSuccess => {
+        // Post new session info to login_activity
+        const obsArr = [ this.userService.newSessionLog() ];
+        // If not in e2e test, also add session to parent domain
+        if (!environment.test && this.userService.getConfig().name === name.toLowerCase()) {
+          obsArr.push(this.couchService.post('_session', { name: name.toLowerCase(), password: password },
+            { withCredentials: true, domain: this.userService.getConfig().parentDomain });
+        }
+        return forkJoin(obsArr);
+      })).subscribe((res) => {
+
+      }, (error) => this.planetMessageService.showAlert('Username and/or password do not match'));
   }
 }

From 30a6b40b9d7688427260889022f6ff05be4bcd7a Mon Sep 17 00:00:00 2001
From: Laxman Maharjan <email@mlaxman.com.np>
Date: Tue, 22 May 2018 01:28:20 +0545
Subject: [PATCH 25/64] Update question view (fixes #996) (#1016)

---
 src/app/exams/exams-view.component.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/exams/exams-view.component.html b/src/app/exams/exams-view.component.html
index 20d0deb0c3..b2a2ae0531 100644
--- a/src/app/exams/exams-view.component.html
+++ b/src/app/exams/exams-view.component.html
@@ -4,10 +4,11 @@
 
 <div class="space-container">
   <mat-toolbar class="primary-color font-size-1">
-    <span i18n>{{question.header}}</span>
+    <span i18n>Question {{questionNum}} of {{maxQuestions}}</span>
     <span class="toolbar-fill"></span>
   </mat-toolbar>
   <div class="view-container">
+    <b>{{question.header}}</b>
     <p>{{question.body}}</p>
     <ng-container [ngSwitch]="question.type">
       <mat-form-field *ngSwitchCase="'input'">

From 090330df9597817fab6c146134e25d99fd02bde4 Mon Sep 17 00:00:00 2001
From: Tille88 <tillman.jonas@gmail.com>
Date: Tue, 22 May 2018 02:52:03 +0700
Subject: [PATCH 26/64] Navbar selection and animation (fixes #701) (#705)

---
 src/app/home/home.component.html       | 34 ++++++++++++++++++++------
 src/app/home/home.module.ts            |  5 +++-
 src/app/home/home.scss                 | 28 +++++++++++++++++++++
 src/app/home/pulsate-icon.directive.ts | 23 +++++++++++++++++
 4 files changed, 81 insertions(+), 9 deletions(-)
 create mode 100644 src/app/home/pulsate-icon.directive.ts

diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
index 513419b921..b0d2c77366 100644
--- a/src/app/home/home.component.html
+++ b/src/app/home/home.component.html
@@ -37,41 +37,59 @@ <h1 i18n>Planet Learning</h1>
   </a>
   <a routerLink="/notifications" mat-menu-item>See All</a>
 </mat-menu>
-
+<!--Left sidebar-->
 <mat-sidenav-container class="main-content" #content>
   <mat-sidenav #sidenav mode="side" class="primary-color main-sidenav nav-shadow" opened="true" [@sidenavState]="sidenavState" (@sidenavState.done)="endAnimation()">
+    <!--Top part, user content etc.-->
     <ul class="top-nav">
       <li>
-        <a mat-button routerLink="/" i18n-title title="Home">
+        <a mat-button routerLink="/"
+          routerLinkActive="active"
+          [routerLinkActiveOptions]="{exact:true}"
+          planetPulsateIcon
+          i18n-title title="Home">
           <mat-icon svgIcon="home"></mat-icon>
           <label i18n>Home</label>
         </a>
       </li>
       <li>
-        <a mat-button routerLink="/resources" i18n-title title="Resources">
-         <mat-icon svgIcon="myLibrary"></mat-icon>
-         <label i18n>Library</label>
+        <a mat-button routerLink="/resources"
+          routerLinkActive="active"
+          planetPulsateIcon
+          i18n-title title="Resources">
+          <mat-icon svgIcon="myLibrary"></mat-icon>
+          <label i18n>Library</label>
         </a>
       </li>
       <li>
-        <a mat-button routerLink="/courses" i18n-title title="Courses">
+        <a mat-button routerLink="/courses"
+          routerLinkActive="active"
+          planetPulsateIcon
+          i18n-title title="Courses">
           <mat-icon svgIcon="myCourses"></mat-icon>
           <label i18n>Courses</label>
         </a>
       </li>
       <li>
-        <a mat-button routerLink="/meetups" i18n-title title="Meetups">
+        <a mat-button routerLink="/meetups"
+          routerLinkActive="active"
+          planetPulsateIcon
+          i18n-title title="Meetups">
           <mat-icon svgIcon="myMeetups"></mat-icon>
           <label i18n>Meetups</label>
         </a>
       </li>
       <li>
-        <a mat-button routerLink="/users" i18n-title title="Users">
+        <a mat-button routerLink="/users"
+          routerLinkActive="active"
+          planetPulsateIcon
+          i18n-title title="Users">
           <mat-icon svgIcon="myTeams"></mat-icon>
           <label i18n>Members</label>
         </a>
       </li>
     </ul>
+    <!--Bottom part-->
     <ul class="bottom-nav">
       <li>
         <a mat-button routerLink="/" i18n-title title="Surveys">
diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts
index 358bc25a4a..0c545ac7b2 100644
--- a/src/app/home/home.module.ts
+++ b/src/app/home/home.module.ts
@@ -15,6 +15,8 @@ import { PlanetDialogsModule } from '../shared/dialogs/planet-dialogs.module';
 import { DashboardTileComponent } from '../dashboard/dashboard-tile.component';
 import { NotificationsComponent } from '../notifications/notifications.component';
 
+import { PulsateIconDirective } from './pulsate-icon.directive';
+
 @NgModule({
   imports: [
     HomeRouterModule,
@@ -33,7 +35,8 @@ import { NotificationsComponent } from '../notifications/notifications.component
     CommunityComponent,
     NationComponent,
     DashboardTileComponent,
-    NotificationsComponent
+    NotificationsComponent,
+    PulsateIconDirective
   ]
 })
 export class HomeModule {}
diff --git a/src/app/home/home.scss b/src/app/home/home.scss
index 98465f1b01..d84323a38d 100644
--- a/src/app/home/home.scss
+++ b/src/app/home/home.scss
@@ -7,6 +7,33 @@
   grid-template-areas: "header" "main";
   height: 100vh;
 
+  mat-sidenav li {
+    a {
+      border-radius: 0;
+    }
+
+    // takes the left sidenav and alters color of text, background and svg-fill on .active class
+    a.active {
+      background-color: $primary-text;
+      color: $primary;
+      transition: background-color 0.5s cubic-bezier(0, 0, 0.2, 1),
+        color 0.5s cubic-bezier(0, 0, 0.2, 1); // Linear out, slow in;
+      .mat-button-focus-overlay {
+        background-color: rgba(0, 0, 0, 0.06);
+        transition: background-color 1s ease-in;
+      }
+    }
+
+    // Animates pulsating icon when navbar link clicked
+    a.pulsate mat-icon {
+      animation: pulsate 1000ms linear alternate-reverse infinite;
+    }
+  }
+
+  @keyframes pulsate {
+    100% { transform: scale(1.1) }
+  }
+
   .header-nav {
     grid-area: header;
     position: relative;
@@ -73,6 +100,7 @@
       padding: 0 24px;
 
       label {
+        cursor: pointer;
         margin: 0 24px;
       }
     }
diff --git a/src/app/home/pulsate-icon.directive.ts b/src/app/home/pulsate-icon.directive.ts
new file mode 100644
index 0000000000..f636c64ed1
--- /dev/null
+++ b/src/app/home/pulsate-icon.directive.ts
@@ -0,0 +1,23 @@
+import { Directive, HostBinding, HostListener } from '@angular/core';
+import { timer } from 'rxjs/observable/timer';
+
+@Directive({
+  selector: '[planetPulsateIcon]'
+})
+export class PulsateIconDirective {
+
+    constructor() {}
+
+    @HostBinding('class.pulsate') isPulsating = false;
+
+    // On click, set class to pulsate for one second
+    // pulsate class triggers a one second animation (which will repeat if not removed)
+    @HostListener('click') onClick() {
+      this.isPulsating = true;
+      const sub = timer(1000).subscribe(() => {
+        this.isPulsating = false;
+        sub.unsubscribe();
+      });
+    }
+
+}

From 0a519232cb78aeebd02ee8237a0a5e9f45800b82 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Mon, 21 May 2018 15:29:03 -0500
Subject: [PATCH 27/64] update ubuntu package list (#1030)

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 515008911a..7fdd4502c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ branches:
   - l10n_master
 addons:
   apt:
+    update: true
     packages:
       - docker-ce
 env:

From d602c7c4502bf4fcb74b6fe7699b19d5dbf43578 Mon Sep 17 00:00:00 2001
From: dogi <dogi@users.noreply.github.com>
Date: Mon, 21 May 2018 16:29:45 -0400
Subject: [PATCH 28/64] Use treehouses/couchdb:2.1.1 (#1031)

---
 .travis/planet-travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis/planet-travis.yml b/.travis/planet-travis.yml
index 117c69d017..98b9ca4a8c 100644
--- a/.travis/planet-travis.yml
+++ b/.travis/planet-travis.yml
@@ -2,7 +2,7 @@ services:
   couchdb:
     expose:
       - 5984
-    image: couchdb:2.1.1
+    image: treehouses/couchdb:2.1.1
     ports:
       - "5984:5984"
       - "5986:5986"

From 39c2397bd983392d78c9046c3b04b0755fbf7961 Mon Sep 17 00:00:00 2001
From: Machhindra Neupane <newmac1000@gmail.com>
Date: Tue, 22 May 2018 05:03:00 +0545
Subject: [PATCH 29/64] Change add course text (fixes #1013) (#1017)

---
 src/app/exams/exams-add.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/exams/exams-add.component.html b/src/app/exams/exams-add.component.html
index 4853054b46..218d024384 100644
--- a/src/app/exams/exams-add.component.html
+++ b/src/app/exams/exams-add.component.html
@@ -4,7 +4,7 @@
 
 <div class="space-container">
   <mat-toolbar class="primary-color font-size-1">
-    <span i18n>Add Course</span>
+    <span i18n>{{pageType}} Exam</span>
     <span class="toolbar-fill"></span>
     <button mat-raised-button color="accent" (click)="addQuestion()" i18n>Add Question</button>
   </mat-toolbar>

From a2e24aaf6f6e56bbe5343e220c02fe59f95dc6e5 Mon Sep 17 00:00:00 2001
From: Rupesh87 <rupandroo@gmail.com>
Date: Tue, 22 May 2018 05:03:47 +0545
Subject: [PATCH 30/64] [#949] Resend registration request (connects #949)
 (#1028)

* [#949] Resend registration request

* Update manager-dashboard.component.ts

* Remove deep nesting

* Fix shelf url and grammar
---
 .../manager-dashboard.component.ts            | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/app/manager-dashboard/manager-dashboard.component.ts b/src/app/manager-dashboard/manager-dashboard.component.ts
index 2a37b9d484..802c972a80 100644
--- a/src/app/manager-dashboard/manager-dashboard.component.ts
+++ b/src/app/manager-dashboard/manager-dashboard.component.ts
@@ -1,5 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import { UserService } from '../shared/user.service';
+import { CouchService } from '../shared/couchdb.service';
+import { findOneDocument } from '../shared/mangoQueries';
+import { switchMap } from 'rxjs/operators';
+import { of } from 'rxjs/observable/of';
+import { forkJoin } from 'rxjs/observable/forkJoin';
+import { PlanetMessageService } from '../shared/planet-message.service';
 
 @Component({
   template: `
@@ -9,6 +15,8 @@ import { UserService } from '../shared/user.service';
         <a routerLink="/associated/{{ planetType === 'center' ? 'nation' : 'community' }}"
           i18n mat-raised-button>{{ planetType === 'center' ? 'Nation' : 'Community' }}</a>
       </span>
+      <button *ngIf="planetType !== center && showResendConfiguration"
+        (click)="resendConfig()" i18n mat-raised-button>Resend Registration Request</button>
       <a routerLink="/feedback" i18n mat-raised-button>Feedback</a>
     </div>
     <div class="view-container" *ngIf="displayDashboard && planetType !== 'center'">
@@ -26,9 +34,12 @@ export class ManagerDashboardComponent implements OnInit {
   displayDashboard = true;
   message = '';
   planetType = this.userService.getConfig().planetType;
+  showResendConfiguration = false;
 
   constructor(
-    private userService: UserService
+    private userService: UserService,
+    private couchService: CouchService,
+    private planetMessageService: PlanetMessageService
   ) {}
 
   ngOnInit() {
@@ -38,6 +49,39 @@ export class ManagerDashboardComponent implements OnInit {
       this.displayDashboard = false;
       this.message = 'Access restricted to admins';
     }
+    // Check parent if configuration exists
+    this.couchService.post(`communityregistrationrequests/_find`, findOneDocument('name', this.userService.get().name),
+      { domain: this.userService.getConfig().parentDomain }).subscribe((data: any) => {
+        if (data.docs.length === 0) {
+          this.showResendConfiguration = true;
+        }
+      });
+  }
+
+  resendConfig() {
+    const { _id, _rev, ...config } = this.userService.getConfig();
+    const { _rev: userRev, ...userDetail } = this.userService.get();
+    return this.couchService.post('communityregistrationrequests', config, { domain: this.userService.getConfig().parentDomain })
+      .pipe(switchMap((res: any) => {
+        userDetail.requestId = res.id;
+        return this.couchService.post(`_users/_find`,
+          { 'selector': { '_id': userDetail._id }, 'fields': [ '_id', '_rev' ] },
+          { domain: this.userService.getConfig().parentDomain });
+      }), switchMap((user) => {
+        if (user.docs[0]) {
+          userDetail._rev = user.docs[0]._rev;
+        }
+        userDetail.isUserAdmin = false;
+        return forkJoin([
+          this.couchService.put('_users/org.couchdb.user:' + userDetail.name,
+            userDetail, { domain: this.userService.getConfig().parentDomain }),
+          this.couchService.put('shelf/org.couchdb.user:' + userDetail.name,
+            {}, { domain: this.userService.getConfig().parentDomain })
+        ]);
+      })).subscribe((res: any) => {
+        this.planetMessageService.showMessage('Registration request has been sent successfully.');
+        this.showResendConfiguration = false;
+      }, error => this.planetMessageService.showAlert('An error occurred please try again.'));
   }
 
 }

From fb0afd62d7e0810f7b5153229470c6ce751acc3e Mon Sep 17 00:00:00 2001
From: Rupesh87 <rupandroo@gmail.com>
Date: Tue, 22 May 2018 05:57:04 +0545
Subject: [PATCH 31/64] Exam and resource buttons on step in course view (fixes
 #989) (#1009)

---
 .../courses/view-courses/courses-view.component.html  |  4 ++++
 .../courses/view-courses/courses-view.component.ts    | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/app/courses/view-courses/courses-view.component.html b/src/app/courses/view-courses/courses-view.component.html
index 8c781ca75e..fc7b331dd2 100644
--- a/src/app/courses/view-courses/courses-view.component.html
+++ b/src/app/courses/view-courses/courses-view.component.html
@@ -36,6 +36,10 @@
             </mat-panel-description>
           </mat-expansion-panel-header>
           {{step.description}}
+          <mat-action-row>
+            <a mat-raised-button color="accent" class="margin-lr-10" *ngIf="step.attachment" [href]="resourceUrl(step)" target="_blank" i18n>View Resource</a>
+            <a mat-raised-button color="accent" class="margin-lr-10" *ngIf="step.exam" (click)="goToExam(stepNum)" i18n>Take exam</a>
+          </mat-action-row>
         </mat-expansion-panel>
       </ng-container>
     </div>
diff --git a/src/app/courses/view-courses/courses-view.component.ts b/src/app/courses/view-courses/courses-view.component.ts
index 622751cb23..cb412c8433 100644
--- a/src/app/courses/view-courses/courses-view.component.ts
+++ b/src/app/courses/view-courses/courses-view.component.ts
@@ -6,6 +6,7 @@ import { DatePipe } from '@angular/common';
 import { UserService } from '../../shared/user.service';
 import { CoursesService } from '../courses.service';
 import { Subject } from 'rxjs/Subject';
+import { environment } from '../../../environments/environment';
 
 @Component({
   templateUrl: './courses-view.component.html',
@@ -62,4 +63,14 @@ export class CoursesViewComponent implements OnInit, OnDestroy {
     this.router.navigate([ './step/1' ], { relativeTo: this.route });
   }
 
+  goToExam(stepNum) {
+    this.router.navigate([ './step/' + (stepNum + 1) + '/exam', 1 ], { relativeTo: this.route });
+  }
+
+  resourceUrl(stepDetail) {
+    if (Object.keys(stepDetail.attachment.doc._attachments)[0]) {
+      const filename = stepDetail.openWhichFile || Object.keys(stepDetail.attachment.doc._attachments)[0];
+      return environment.couchAddress + 'resources/' + stepDetail.attachment.doc._id + '/' + filename;
+    }
+  }
 }

From d64527d4062faf20aca5caa544a5d4a6c770ecdd Mon Sep 17 00:00:00 2001
From: Jingting Chen <jchen136@hawk.iit.edu>
Date: Mon, 21 May 2018 19:38:08 -0500
Subject: [PATCH 32/64] Special characters not start username or planet name
 (fixes #959) (#979)

---
 src/app/configuration/configuration.component.ts | 5 +++--
 src/app/login/login-form.component.ts            | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/configuration/configuration.component.ts b/src/app/configuration/configuration.component.ts
index 0c56c248d1..32dfbd155d 100644
--- a/src/app/configuration/configuration.component.ts
+++ b/src/app/configuration/configuration.component.ts
@@ -45,7 +45,7 @@ export class ConfigurationComponent implements OnInit {
 
   ngOnInit() {
     this.loginForm = this.formBuilder.group({
-      name: [ '', [ Validators.required, Validators.pattern(/^[a-z0-9_.-]+$/i) ] ],
+      name: [ '', [ Validators.required, Validators.pattern(/^[A-Za-z0-9][a-z0-9_.-]+$/i) ] ],
       password: [
         '',
         Validators.compose([
@@ -66,7 +66,8 @@ export class ConfigurationComponent implements OnInit {
       localDomain: this.defaultLocal,
       name: [
         '',
-        Validators.required,
+        [ Validators.required,
+        Validators.pattern(/^[A-Za-z0-9]/i) ],
         this.parentUniqueValidator('name')
       ],
       parentDomain: [ '', Validators.required ],
diff --git a/src/app/login/login-form.component.ts b/src/app/login/login-form.component.ts
index ced5d87edf..f98146a341 100644
--- a/src/app/login/login-form.component.ts
+++ b/src/app/login/login-form.component.ts
@@ -43,7 +43,7 @@ export class LoginFormComponent {
     private planetMessageService: PlanetMessageService,
     private validatorService: ValidatorService
   ) {
-    registerForm.name = [ '', [ Validators.required, Validators.pattern(/^[a-z0-9_.-]+$/i) ],
+    registerForm.name = [ '', [ Validators.required, Validators.pattern(/^[A-Za-z0-9][a-z0-9_.-]+$/i) ],
       ac => this.validatorService.isUnique$('_users', 'name', ac, {}) ];
     const formObj = this.createMode ? registerForm : loginForm;
     this.userForm = this.formBuilder.group(formObj);

From 16e3235840ffa06e7486403d1a34892d0ed3eed3 Mon Sep 17 00:00:00 2001
From: Machhindra Neupane <newmac1000@gmail.com>
Date: Tue, 22 May 2018 06:28:01 +0545
Subject: [PATCH 33/64] Fix FeedbackView Chrome scroll issue (fixes #948)
 (#984)

---
 src/app/feedback/feedback-view.component.html | 4 ++--
 src/app/feedback/feedback-view.component.ts   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/feedback/feedback-view.component.html b/src/app/feedback/feedback-view.component.html
index 26d2a09c4c..65cd7575c8 100644
--- a/src/app/feedback/feedback-view.component.html
+++ b/src/app/feedback/feedback-view.component.html
@@ -32,12 +32,12 @@
   </mat-toolbar>
   <div class="view-container view-full-height">
     <div class="chat-list" #chatList>
-      <div class="chat-list-item" *ngFor="let message of feedback.messages">
+      <div class="chat-list-item" *ngFor="let message of feedback.messages; trackBy: feedbackTrackByFn">
         <div class="chat-list-user">
           <p>{{message.user}}</p>
           <p class="mat-caption">{{message.time | date:'MMM d, y h:mm a'}}</p>
         </div>
-        <div class="chat-list-message"><mat-card [ngClass]="{'primary-color':message.user!==user.name}">{{message.message}}</mat-card></div>
+        <div class="chat-list-message"><mat-card [ngClass]="{ 'primary-color': message.user !== user.name }">{{message.message}}</mat-card></div>
       </div>
     </div>
     <div class="chat-reply">
diff --git a/src/app/feedback/feedback-view.component.ts b/src/app/feedback/feedback-view.component.ts
index cfd716a186..3b7c854051 100644
--- a/src/app/feedback/feedback-view.component.ts
+++ b/src/app/feedback/feedback-view.component.ts
@@ -107,4 +107,8 @@ export class FeedbackViewComponent implements OnInit, OnDestroy {
     this.chatListElement.nativeElement.scrollTo({ top: this.chatListElement.nativeElement.scrollHeight, behavior: 'smooth' });
   }
 
+  feedbackTrackByFn(index, item) {
+    return item._id;
+  }
+
 }

From d20ce4ca6523a9640e134421cf3e5871b8ff2434 Mon Sep 17 00:00:00 2001
From: Laxman Maharjan <email@mlaxman.com.np>
Date: Tue, 22 May 2018 06:37:17 +0545
Subject: [PATCH 34/64] Parent online status (connects #998) (#1008)

---
 src/app/login/login.component.html |  1 +
 src/app/login/login.component.ts   | 26 ++++++++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html
index a2249801e0..04c024a329 100644
--- a/src/app/login/login.component.html
+++ b/src/app/login/login.component.html
@@ -5,6 +5,7 @@
         <img class="ole-logo" src="assets/OLE_Logo1.png">
         <h1 i18n>Planet Learning</h1>
         <h3 i18n>Version {{ version }}</h3>
+        <span i18n>{online, select, on {Connected} off {Offline}}</span>
       </div>
     </div>
     <div class="login-tile right-tile">
diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts
index 97c65b63cb..2915fff987 100644
--- a/src/app/login/login.component.ts
+++ b/src/app/login/login.component.ts
@@ -2,8 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { environment } from '../../environments/environment';
 import { CouchService } from '../shared/couchdb.service';
 import { Router } from '@angular/router';
-import { tap, catchError } from 'rxjs/operators';
-
+import { tap, switchMap, catchError } from 'rxjs/operators';
 import { of } from 'rxjs/observable/of';
 
 @Component({
@@ -14,6 +13,7 @@ import { of } from 'rxjs/observable/of';
 export class LoginComponent implements OnInit {
 
   version: string = require( '../../../package.json').version;
+  online = 'off';
 
   constructor(
     private couchService: CouchService,
@@ -23,12 +23,22 @@ export class LoginComponent implements OnInit {
   ngOnInit() {
     // If not e2e tests, route to create user if there is no admin
     if (!environment.test) {
-      this.checkAdminExistence().subscribe((noAdmin) => {
-        // false means there is admin
-        if (noAdmin) {
-          this.router.navigate([ '/login/configuration' ]);
-        }
-      });
+      this.checkAdminExistence().pipe(
+        switchMap(noAdmin => {
+          // false means there is admin
+          if (noAdmin) {
+            this.router.navigate([ '/login/configuration' ]);
+            return of([]);
+          }
+          return this.couchService.allDocs('configurations');
+        }),
+        switchMap(data => {
+          if (!data[0] || data[0].planetType === 'center') {
+            return of(false);
+          }
+          return this.couchService.get('', { domain: data[0].parentDomain });
+        })
+      ).subscribe(data => { this.online = (data) ? 'on' : ''; });
     }
   }
 

From eec04fb3df03e9f95f62612ae997c05d99ad69f1 Mon Sep 17 00:00:00 2001
From: Laxman Maharjan <email@mlaxman.com.np>
Date: Tue, 22 May 2018 06:38:00 +0545
Subject: [PATCH 35/64] Notification for community request (fixes #1004)
 (#1007)

---
 .../configuration/configuration.component.ts  | 14 ++++++++++-
 src/app/home/home.component.ts                | 25 +++++++++++++------
 .../notifications/notifications.component.ts  | 11 +++++---
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/src/app/configuration/configuration.component.ts b/src/app/configuration/configuration.component.ts
index 32dfbd155d..031332f76c 100644
--- a/src/app/configuration/configuration.component.ts
+++ b/src/app/configuration/configuration.component.ts
@@ -185,7 +185,19 @@ export class ConfigurationComponent implements OnInit {
             userDetail['isUserAdmin'] =  false;
             return this.couchService.put('_users/org.couchdb.user:' + credentials.name,
               userDetail, { domain: configuration.parentDomain });
-          })),
+          }), switchMap(data => {
+            const requestNotification = {
+              'user': 'SYSTEM',
+              'message': 'New ' + configuration.planetType + ' "' + configuration.name + '" has requested to connect.',
+              'link': '/requests',
+              'type': 'request',
+              'priority': 1,
+              'status': 'unread',
+              'time': Date.now()
+            };
+            // Send notification to parent
+            return this.couchService.post('notifications', requestNotification, { domain: configuration.parentDomain });
+          }))
       ]).debug('Sending request to parent planet').subscribe((data) => {
         this.planetMessageService.showMessage('Admin created: ' + data[1].id.replace('org.couchdb.user:', ''));
         this.router.navigate([ '/login' ]);
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 827d187a60..82e35f5fe0 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -9,6 +9,7 @@ import { interval } from 'rxjs/observable/interval';
 import { tap, switchMap, takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs/Subject';
 import { forkJoin } from 'rxjs/observable/forkJoin';
+import { findDocuments } from '../shared/mangoQueries';
 
 @Component({
   templateUrl: './home.component.html',
@@ -137,14 +138,22 @@ export class HomeComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   getNotification() {
-    const userId = 'org.couchdb.user:' + this.userService.get().name;
-    this.couchService.allDocs('notifications')
-      .subscribe((data) => {
-        data.sort((a, b) => 0 - (new Date(a.time) > new Date(b.time) ? 1 : -1));
-        this.notifications = data.filter((nt: any)  => {
-          return nt.user === userId;
-        });
-      }, (error) => console.log(error));
+    const userFilter = [ {
+      'user': 'org.couchdb.user:' + this.userService.get().name
+    } ];
+    if (this.userService.get().isUserAdmin) {
+      userFilter.push({ 'user': 'SYSTEM' });
+    }
+    this.couchService.post('notifications/_find', findDocuments(
+      { '$or': userFilter,
+      // The sorted item must be included in the selector for sort to work
+        'time': { '$gt': 0 }
+      },
+      0,
+      [ { 'time': 'desc' } ]))
+    .subscribe(data => {
+      this.notifications = data.docs;
+    }, (error) => console.log(error));
   }
 
   readNotification(notification) {
diff --git a/src/app/notifications/notifications.component.ts b/src/app/notifications/notifications.component.ts
index c8aabb20d8..5a43925b61 100644
--- a/src/app/notifications/notifications.component.ts
+++ b/src/app/notifications/notifications.component.ts
@@ -33,9 +33,14 @@ export class NotificationsComponent implements OnInit {
   }
 
   getNotifications() {
-    this.couchService.
-    post('notifications/_find', findDocuments(
-      { 'user': 'org.couchdb.user:' + this.userService.get().name,
+    const userFilter = [ {
+      'user': 'org.couchdb.user:' + this.userService.get().name
+    } ];
+    if (this.userService.get().isUserAdmin) {
+      userFilter.push({ 'user': 'SYSTEM' });
+    }
+    this.couchService.post('notifications/_find', findDocuments(
+      { '$or': userFilter,
       // The sorted item must be included in the selector for sort to work
         'time': { '$gt': 0 }
       },

From f7e8e892f888c7a2ff3ebddf22b25c94109e5708 Mon Sep 17 00:00:00 2001
From: Rupesh87 <rupandroo@gmail.com>
Date: Tue, 22 May 2018 06:39:57 +0545
Subject: [PATCH 36/64] Fix resource attachment mock data (fixes #946) (#985)

---
 couchdb-setup.sh                                 |   5 +++--
 .../resources/attachments}/document.doc          | Bin
 .../resources/attachments}/github.txt            |   0
 design/resources/attachments/image.png           | Bin 0 -> 2829 bytes
 .../resources/attachments}/sample_csv.csv        |   0
 .../resources/attachments}/tenses.pdf            | Bin
 .../resources/resources-attachment-mockup.json   |  15 ++++++++++-----
 7 files changed, 13 insertions(+), 7 deletions(-)
 rename {src/assets => design/resources/attachments}/document.doc (100%)
 rename {src/assets => design/resources/attachments}/github.txt (100%)
 create mode 100644 design/resources/attachments/image.png
 rename {src/assets => design/resources/attachments}/sample_csv.csv (100%)
 rename {src/assets => design/resources/attachments}/tenses.pdf (100%)

diff --git a/couchdb-setup.sh b/couchdb-setup.sh
index c69bf04259..0a5d892fbb 100755
--- a/couchdb-setup.sh
+++ b/couchdb-setup.sh
@@ -60,10 +60,11 @@ insert_attachments() {
   for i in $INPUTS
   do
     ID=$(echo $i | jq -r '.doc_id' )
-    FILE_LOCATION=$(echo $i | jq -r '.file_name')
+    FILE_NAME=$(echo $i | jq -r '.file_name')
+    FILE_LOCATION=$(echo $i | jq -r '.file_location')
     FILE_TYPE=$(echo $i | jq -r '.file_type')
     REV=$(curl $COUCHURL/$DB/$ID | jq -r '._rev')
-    curl -X PUT $COUCHURL/$DB/$ID/$FILE_LOCATION?rev=$REV --data-binary @$FILE_LOCATION -H Content-Type:$FILE_TYPE
+    curl -X PUT $COUCHURL/$DB/$ID/$FILE_NAME?rev=$REV --data-binary @$FILE_LOCATION -H Content-Type:$FILE_TYPE
   done
 }
 
diff --git a/src/assets/document.doc b/design/resources/attachments/document.doc
similarity index 100%
rename from src/assets/document.doc
rename to design/resources/attachments/document.doc
diff --git a/src/assets/github.txt b/design/resources/attachments/github.txt
similarity index 100%
rename from src/assets/github.txt
rename to design/resources/attachments/github.txt
diff --git a/design/resources/attachments/image.png b/design/resources/attachments/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..47e9b2ad10128a9d4ab57c1295f63204d1ccdac7
GIT binary patch
literal 2829
zcmV+o3-a`dP)<h;3K|Lk000e1NJLTq007|t007|#0{{R332h=s0001iP)t-s|Ns90
z005SjmSJIG%F4>Et*!d{`u6tr@9*#Y{QQ)Zl-}On;o;%g+1bLv!b?j_f`WqQ=jWoL
zqRq|Cw6wH0H#eM|oO5$?R#sNKySr#;Xw%cvh=_=)s;YQ+cv4bQMMXs-A|ezN6dM~G
zCMG64JUo7Wel9L93=9lqWo1Z6NLH8G*Z=?uM@d9MRCt{2UFmx2I1D9hVJ~Z0OOv*g
za^L>}r(sDPl-RN(Av0gkznNQt53#jNuGRkVhkJB}>$lx<b84J6`(A6*52Y7Gis7{J
z8QddYwg%D*BSCw;0pwDA?3>c-tBS3L-WB7%^dc*u^=0Ij;NM7kp^liM=$-MkmR_s_
z=0A9XzgWzq7i@{)(TZP!RY!W!HrQG7OVE;DHX0NA7kELVExmLc){gvs@$(cmK+m1v
zFP=cCnpM0WuhIlec&SJ*2zJsG^oS}G{59jGN$61h4JPPG(<n#PGkC*Pnn)Sk^n4LK
z^{Fc8L4b)gnIcRG2?k%%Y>I&M1+iF4(}CEN67<lx*%A{B0^h7~+C7@Uvwdn2u|UJC
z2vwVbU=T^OQc=xgDuYL%n~;TIaFFJeq0YlF*h&*i!9*}<NE5qZ&c!hBCBR7I6&9f`
zP3;0wlRJ+eX>J#AX!{%d(E0~PhF%0Tn3UlKUZ_M$*B-(LX-XHJDS{8lQ_f@P#X;<{
z5)4+-{A#s6FT+5ZU#&J`W+*ReUYQxn>-;e@LwR9Jm8&R&d~*LEGeh|-&4QVsyaUC}
zP(EMEYtr}-7^cW;>#&z5$QZ)7Kz^5=m>J4Tnr~)?^4fyeJq&`mG{IVnnW22#yUEN@
zzGk7r%ut$NjW20&K_pG@7w@bLeW>H(O08WW?;diC8u=hbjrSmW5%aD!7#VsHF0FAU
zNPUPyC16a=d`fe>g3rD1rL3J#ntCBg6Tk*h8f>JArQq@}hSJ0`@DO~Frlo+VSV7)3
zRAARmiGv5JLj@ekd~XEl1@u8hKMb}E<b_ebm@^ruGo>DBiW_LtY`*Q$1f&LdB+aG}
zLpp*#o=!fYGv4Hbq$Qv#+4rbO{~k1j8Q!%#si4S2$>(CUsQwnceuD|BYJQK;;0=`u
z-9EjQqACXNK@GngCJkIG!Q?aAXgEdRqNmuQH?-~5#+&q-ZPB;$iNAeo`^BJ%&z)|b
zV)70I-r4Zfl`sO|!R}em35`F7e+>NxUeY`%!!ACm;pxO39XjiMjOLeMF<w8>i=6G;
z#tJTaUS*rg&|EsPyW(f;VXRw4pP-)hIQ7@U8Brym_I~<Nt(b^kf|Y-pbxvK6(eTUN
z7;)5_Ed4o;9j+o;U)+AiF4Ch9$FalP79?NU#@*-~ya*d}+#NH4Qeryj)ggM!Mmu-o
zT7p#j7YAWk6aJy=+-@tRda;-xXKx$hY#{~vG?4mmh8zSB%ldAk_TBCkIrC_S^!-k!
zS@-hjaJ0JopD0(z{$PgT2Qk0*oE<tyS{&}O!4GCg-J}i@YfWI5K9=E%m>{OT>7fj%
z6+No_;*kugO*Pz9fd?`q7o#{w@PQ1e-9cpfepdKl4(EfqFdtP7+-a2ww`fWo?;zi!
z2=8F6m)%i|G)GRoM~yW!A*K&^M;Cx3cX<s<3$dDML&cHWS~JWpvFW3xsplZ?|4~-e
z1aYUCWt0+F4ioEAPVyOo>L{<z`w*#p+0osdSUvmXD|PezQF-<`DyitkLG1EGrF!$+
zs$|*2Nd5|y^<29d;+yht?M%Iek^9&APIe(z>Qkr=>`wEJ?`NU-=KRpJ><ZJzEvy()
z3sU8fsAUb~Zlyr_G9QPx5jNC4cxogtKNYP~A~`tagMeK;L+bD-<Bz8TKOcoUx~6U)
z;z#F!))>UMSRD8seFyXn1jKSi5#x6L%AwI{*!2P;TO5e515#BndhWz(x=rQA@C{ut
zALAGjho6+gf&A@OYhYSqt9NkOWZGQ4D&SDT*Anjt>0Mz$L4*yI36%9>D*U4INi`kJ
z2%v8SLt3L-F}X3uu0Gy`nE`|d=FrCRmERQ6?q;g!o0zW*dp8m!o+Om{g=RbAh&V*%
zG=nj5KpdaR@=8X{c0}2gMvBH8U5F=>r@v^|q|`o;(HGOWUt>`RaXL-O4fgeG!-mj8
z?R=HkxJju8dgUVdI>!P(R#10K10r!iJ?-kw7%sKEF?#HV(g*~q29UgX?e6(yYTLql
zt<{RFUk<oP4f#wq(6YTPTAy8GcaeSjgM9=w!J?Uu(89F6G#BPn(5@lFEM559LWN`-
zv4+yZY|30gY<8akjz8R{R;MsQ3?6~aWpK=#yANc-ePTaTAG!zF2?i`xmQnsY;1;v5
ztb{rd+W}8qKXbuX&gp{+$(mrn;5h8<5nT6lsFisjAc2+=3V@Z16vvDgb7kTZ{E9A<
zuAyCn`yAuo^(?Xv{>f!f4K#6a;b8iE#Z#oNFx)3DCEQTd;A&AAEAmr@aG$u0Nrn*v
z97D#dM$@eb8M;&g!KdK5HW`}^Gz?uDW}qL7Q~7&7hUqSaYjf$Db=~Vc3O~;f%2JnG
z16<D`V`D{DJqiBF<x)B5BH-dY97A*gL!j|pu6lyuZ=8R^#&4mVHDGYLSZzQiexN?a
zHaS0M_`_(F149s*#ElQ*GTQQD4w@DA!W6y>T;~^4httILE%v52Jcc-dJYXRR6ctFp
z;?9r?7>dFf-W*Yyf|MZ4Slenu_$rR(4<#tBlCOq>_XDlp$dVx}*F51q$l+Q5bsiR(
zhIW%MizMPZ%BJBc$-0m76}vBXcLfz^2F3`T&u~}HotkRKC4Xl#bf7eQWH$d8qNTZJ
zo{7e?$5-ID%O7$yX;$}Y)>0@jn6B3Q#HTK_4$w)jH5eFXdcd?nu(=ge*?UhH-)CiL
z{8L;^*IeDG+wZKq)SO+$P&5<N79BAJq7+GE4j{Z3<-NH|QEve<FjRa$gy-_94@ylC
zNe8_F$Pr9bvWJ*Rp3cp{EbpI|APYmq`Nd^L%3}O$R8^?KcH>~E7GdFRrjIGqX<^G;
zvzNe>Yh?*}tIjtzdG|6MDnh6KhK_QYa@`EtB5)~#K4Y=m)$8@$@?iec6vjj_PrHX&
z%I-SF9S5`J$KvDX0!_R(Lz~ldOetWs7=!axVN5`=TBB7dRKG3Xu2L<H5a<6B<A8Au
zOi~1+de#@iN>}j4?OYuoE+)w%O><wKHO9@WZJR}+8n&4NLKapr<w%tcbj!f+t}Ak_
z_q>Vdo8O7fVDWU9sqXDL*4D^4yG8gi)z>{&0wM#Z?q6s^zSa4diynsd9i4G5kUn|0
z%YC4_Z)~Cd#8Y5;*dBi%R7RG?e={3P2?>3;FtjmtB8o9CYkH0bqj+fQqqyPICGB7M
zjnvxTSdHJrcn}B5yUfBl?RAyry)`iDswMd__YU4OGXr&X^X$8{3wcAeJ@3$M?qVW}
z$Q2fcj%`{_>@k^tQ%D|UA98UPlXHIQ1?}1E1{W(S2d<hxU<Pf5us`25DwGwW5}~3D
zFK7?v^=0JL@{K94^MK(M;b7F-EmyG>MTEHbhhd6Ne>i%p?^n?R@m|dm!$XD&+F_?Z
z8_i#L<L~_@`YJrKuZGeWzZn)H>~toB{@@q=?PxaK&h#eg6Ed{KAH(Oz|DWM-)qq&J
fluG~M|AGGi;AW&b9F!m=00000NkvXXu0mjfqXuyc

literal 0
HcmV?d00001

diff --git a/src/assets/sample_csv.csv b/design/resources/attachments/sample_csv.csv
similarity index 100%
rename from src/assets/sample_csv.csv
rename to design/resources/attachments/sample_csv.csv
diff --git a/src/assets/tenses.pdf b/design/resources/attachments/tenses.pdf
similarity index 100%
rename from src/assets/tenses.pdf
rename to design/resources/attachments/tenses.pdf
diff --git a/design/resources/resources-attachment-mockup.json b/design/resources/resources-attachment-mockup.json
index 07f55e3b25..f3ddec267c 100644
--- a/design/resources/resources-attachment-mockup.json
+++ b/design/resources/resources-attachment-mockup.json
@@ -1,27 +1,32 @@
 [
 	{
 		"doc_id": "0216c7208a72e79b29997d0fd400be3c",
-		"file_name": "./src/assets/image.png",
+    "file_name": "image.png",
+    "file_location": "./design/resources/attachments/image.png",
 		"file_type": "image/jpg"
 	},
 	{
 		"doc_id": "0216c7208a72e79b29997d0fd400beac",
-		"file_name": "./src/assets/github.txt",
+    "file_name": "github.txt",
+    "file_location": "./design/resources/attachments/github.txt",
 		"file_type": "text/plain"
 	},
 	{
 		"doc_id": "0216c7208a72e79b29997ded400beac",
-		"file_name": "./src/assets/tenses.pdf",
+    "file_name": "tenses.pdf",
+    "file_location": "./design/resources/attachments//tenses.pdf",
 		"file_type": "application/pdf"
 	},
 	{
 		"doc_id": "0216c7208a7ss79b29997d0fd400beac",
-		"file_name": "./src/assets/sample_document.doc",
+    "file_name": "document.doc",
+    "file_location": "./design/resources/attachments/document.doc",
 		"file_type": "application/msword"
 	},
 	{
 		"doc_id": "0216s208a72e79b29997d0fd400beac",
-		"file_name":  "./src/assets/sample_csv.csv",
+    "file_name": "sample_csv.csv",
+    "file_location": "./design/resources/attachments/sample_csv.csv",
 		"file_type": "application/vnd.ms-excel"
 	}
 ]

From c9b02ec8b033c5ad90b3795126709286e5fde104 Mon Sep 17 00:00:00 2001
From: Paul <paul.r.albert@gmail.com>
Date: Mon, 21 May 2018 21:10:15 -0500
Subject: [PATCH 37/64] Update version (#1034)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3f6a754483..8e62d0f626 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ang-bell-app",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "license": "AGPL-3.0",
   "scripts": {
     "ng": "ng",

From 0eda750e3b5b925085e6ff7787137ab8797c4083 Mon Sep 17 00:00:00 2001
From: Laxman Maharjan <email@mlaxman.com.np>
Date: Tue, 22 May 2018 11:06:45 +0545
Subject: [PATCH 38/64] Planet code on parent with username (fixes #519) (#927)

---
 src/app/configuration/configuration.component.ts | 7 ++++---
 src/app/login/login-form.component.ts            | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/app/configuration/configuration.component.ts b/src/app/configuration/configuration.component.ts
index 031332f76c..2be3030444 100644
--- a/src/app/configuration/configuration.component.ts
+++ b/src/app/configuration/configuration.component.ts
@@ -158,7 +158,8 @@ export class ConfigurationComponent implements OnInit {
   onSubmitConfiguration() {
     if (this.loginForm.valid && this.configurationFormGroup.valid && this.contactFormGroup.valid) {
       const { confirmPassword, ...credentials } = this.loginForm.value;
-      const configuration = Object.assign({ registrationRequest: 'pending', adminName: credentials.name },
+      const adminName = credentials.name + '@' + this.configurationFormGroup.controls.code.value;
+      const configuration = Object.assign({ registrationRequest: 'pending', adminName },
         this.configurationFormGroup.value, this.contactFormGroup.value);
       const userDetail: any = {
         ...credentials,
@@ -183,8 +184,8 @@ export class ConfigurationComponent implements OnInit {
             // then add user to parent planet with id of configuration and isUserAdmin set to false
             userDetail['requestId'] =  data.id;
             userDetail['isUserAdmin'] =  false;
-            return this.couchService.put('_users/org.couchdb.user:' + credentials.name,
-              userDetail, { domain: configuration.parentDomain });
+            return this.couchService.put('_users/org.couchdb.user:' + adminName,
+              { ...userDetail, name: adminName }, { domain: configuration.parentDomain });
           }), switchMap(data => {
             const requestNotification = {
               'user': 'SYSTEM',
diff --git a/src/app/login/login-form.component.ts b/src/app/login/login-form.component.ts
index f98146a341..5a109e1fca 100644
--- a/src/app/login/login-form.component.ts
+++ b/src/app/login/login-form.component.ts
@@ -108,9 +108,11 @@ export class LoginFormComponent {
       }), switchMap((routeSuccess) => {
         // Post new session info to login_activity
         const obsArr = [ this.userService.newSessionLog() ];
+        const localAdminName = this.userService.getConfig().adminName.split('@')[0];
         // If not in e2e test, also add session to parent domain
-        if (!environment.test && this.userService.getConfig().name === name.toLowerCase()) {
-          obsArr.push(this.couchService.post('_session', { 'name': name.toLowerCase(), 'password': password },
+        if (!environment.test && localAdminName === name) {
+          obsArr.push(this.couchService.post('_session',
+            { 'name': this.userService.getConfig().adminName, 'password': password },
             { withCredentials: true, domain: this.userService.getConfig().parentDomain }));
         }
         return forkJoin(obsArr);

From 762cec2529dd1188f04c147dbd09bca9535be036 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Fri, 18 May 2018 23:34:25 -0500
Subject: [PATCH 39/64] add packages for pouchdb

---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index 8e62d0f626..e630b84f4f 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,8 @@
     "material-icons": "^0.1.0",
     "mime-types": "^2.1.17",
     "ngx-img": "^10.15.0",
+    "pouchdb": "^6.4.3",
+    "pouchdb-authentication": "^1.1.2",
     "rxjs": "5.5.2",
     "zone.js": "^0.8.18"
   },
@@ -52,6 +54,7 @@
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
+    "@types/pouchdb": "^6.3.2",
     "codelyzer": "~3.2.0",
     "htmlhint-ng2": "0.0.13",
     "jasmine-core": "~2.6.2",

From 155059c413a3de2b709e54d67be80d1e345414d1 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Fri, 18 May 2018 23:39:00 -0500
Subject: [PATCH 40/64] allow synthentic imports for pouch

---
 tsconfig.json | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index fcf1a1f90e..146b8e994d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,14 +7,10 @@
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
     "target": "es5",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2017",
-      "dom"
-    ]
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2017", "dom"]
   },
   "angularCompilerOptions": {
     "preserveWhitespaces": false

From 2d3ff66baad01a87798e6d49e03a85ecb439f15e Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 00:33:17 -0500
Subject: [PATCH 41/64] add service for main pouchdb service

---
 src/app/app.module.ts                         | 17 +++--
 src/app/shared/services/index.ts              |  1 +
 src/app/shared/services/pouchDB/index.ts      |  5 ++
 .../services/pouchDB/pouchDB.service.ts       | 68 +++++++++++++++++++
 4 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 src/app/shared/services/index.ts
 create mode 100644 src/app/shared/services/pouchDB/index.ts
 create mode 100644 src/app/shared/services/pouchDB/pouchDB.service.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 75f1b13629..4708ea3835 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -20,6 +20,7 @@ import { environment } from '../environments/environment';
 import { MatIconRegistry } from '@angular/material';
 import { FeedbackService } from './feedback/feedback.service';
 import { ResourcesService } from './resources/resources.service';
+import { SHARED_SERVICES } from './shared/services';
 
 @NgModule({
   imports: [
@@ -33,12 +34,18 @@ import { ResourcesService } from './resources/resources.service';
       ? ServiceWorkerModule.register('/ngsw-worker.js')
       : []
   ],
-  declarations: [
-    AppComponent, PageNotFoundComponent
-  ],
+  declarations: [AppComponent, PageNotFoundComponent],
   providers: [
-    CouchService, AuthService, UserService, ValidatorService, PlanetMessageService, MatIconRegistry, FeedbackService, ResourcesService
+    CouchService,
+    AuthService,
+    UserService,
+    ValidatorService,
+    PlanetMessageService,
+    MatIconRegistry,
+    FeedbackService,
+    ResourcesService,
+    ...SHARED_SERVICES
   ],
-  bootstrap: [ AppComponent ]
+  bootstrap: [AppComponent]
 })
 export class AppModule {}
diff --git a/src/app/shared/services/index.ts b/src/app/shared/services/index.ts
new file mode 100644
index 0000000000..da3c79c58f
--- /dev/null
+++ b/src/app/shared/services/index.ts
@@ -0,0 +1 @@
+export * from './pouchDB';
diff --git a/src/app/shared/services/pouchDB/index.ts b/src/app/shared/services/pouchDB/index.ts
new file mode 100644
index 0000000000..b32e4b342b
--- /dev/null
+++ b/src/app/shared/services/pouchDB/index.ts
@@ -0,0 +1,5 @@
+import { PouchDBService } from './pouchDB.service';
+
+export { PouchDBService } from './pouchDB.service';
+
+export const SHARED_SERVICES = [PouchDBService];
diff --git a/src/app/shared/services/pouchDB/pouchDB.service.ts b/src/app/shared/services/pouchDB/pouchDB.service.ts
new file mode 100644
index 0000000000..8dbdfc2d75
--- /dev/null
+++ b/src/app/shared/services/pouchDB/pouchDB.service.ts
@@ -0,0 +1,68 @@
+import { Injectable } from '@angular/core';
+import PouchDB from 'pouchdb';
+import PouchDBAuth from 'pouchdb-authentication';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/fromEvent';
+import { catchError } from 'rxjs/operators';
+import { environment } from '../../../../environments/environment';
+
+PouchDB.plugin(PouchDBAuth);
+
+type RemoteDatabases = 'courses';
+
+@Injectable()
+export class PouchDBService {
+  private baseUrl = environment.couchAddress;
+  private localDB;
+  private authDB;
+  private remoteDBs = {
+    courses: null
+  };
+  private courses;
+
+  constructor() {
+    this.localDB = new PouchDB('local-pouchdb');
+
+    // test is a placeholder temp database
+    // we need a central remote database
+    // since we will have different levels of authentication (manager, intern)
+    // we will have to create corresponding documents in couchdb and we can sync
+    // we can decide that when the user is being created for the first time?
+    this.authDB = new PouchDB(this.baseUrl + 'courses', {
+      skip_setup: true
+    });
+
+    this.remoteDBs.courses = new PouchDB(this.baseUrl + 'courses');
+
+    this.localDB
+      .sync(this.authDB, { live: true, retry: true })
+      .on('error', console.log.bind(console));
+  }
+
+  replicateRemoteToLocal(key: RemoteDatabases) {
+    return Observable.fromPromise(
+      this.localDB.replicate.from(this.remoteDBs[key])
+    ).pipe(catchError(this.handleError));
+  }
+
+  getLocalPouchDB() {
+    return this.localDB;
+  }
+
+  getAuthDB() {
+    return this.authDB;
+  }
+
+  getRemotePouchDB(key: RemoteDatabases) {
+    return this.remoteDBs[key];
+  }
+
+  updateRemotePouchDB(key: RemoteDatabases, updatedDatabase) {
+    this.remoteDBs[key] = updatedDatabase;
+  }
+
+  private handleError(err) {
+    console.error('An error occurred replicating from the database', err);
+    return Observable.throw(err.message || err);
+  }
+}

From 8d694bca0401f260d3d01ecc4ee766933f4b7155 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 00:36:32 -0500
Subject: [PATCH 42/64] add service for handling auth

---
 .../shared/services/pouchDB/auth.service.ts   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/app/shared/services/pouchDB/auth.service.ts

diff --git a/src/app/shared/services/pouchDB/auth.service.ts b/src/app/shared/services/pouchDB/auth.service.ts
new file mode 100644
index 0000000000..6fe1389b3a
--- /dev/null
+++ b/src/app/shared/services/pouchDB/auth.service.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/fromPromise';
+import { catchError } from 'rxjs/operators';
+import { environment } from '../../../../environments/environment';
+import { PouchDBService } from './pouchDB.service';
+
+@Injectable()
+export class AuthService {
+  private authDB;
+
+  constructor(private pouchdbService: PouchDBService) {
+    this.authDB = this.pouchdbService.getAuthDB();
+  }
+
+  getSessionInfo() {
+    return Observable.fromPromise(this.authDB.getSession()).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  login(username, password) {
+    return Observable.fromPromise(this.authDB.login(username, password)).pipe(
+      catchError(this.handleError)
+    );
+  }
+
+  signupUser(username, password, opts?) {
+    return Observable.fromPromise(
+      this.authDB.signUp(username, password, opts)
+    ).pipe(catchError(this.handleError));
+  }
+
+  private handleError(err) {
+    console.error('An error occurred while signing in the user', err);
+    return Observable.throw(err.message || err);
+  }
+}

From 75b614b546e05f5d5270bb18126d8e45c5628b5a Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 00:48:14 -0500
Subject: [PATCH 43/64] use auth service for authenticating user

---
 src/app/login/login-form.component.ts | 173 +++++++++++++++++---------
 1 file changed, 115 insertions(+), 58 deletions(-)

diff --git a/src/app/login/login-form.component.ts b/src/app/login/login-form.component.ts
index 5a109e1fca..f3b8c5ec95 100644
--- a/src/app/login/login-form.component.ts
+++ b/src/app/login/login-form.component.ts
@@ -5,32 +5,44 @@ import { UserService } from '../shared/user.service';
 import { switchMap } from 'rxjs/operators';
 import { fromPromise } from 'rxjs/observable/fromPromise';
 import { forkJoin } from 'rxjs/observable/forkJoin';
-import { FormControl, FormGroup, FormBuilder, Validators } from '@angular/forms';
+import {
+  FormControl,
+  FormGroup,
+  FormBuilder,
+  Validators
+} from '@angular/forms';
 import { CustomValidators } from '../validators/custom-validators';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { environment } from '../../environments/environment';
 import { ValidatorService } from '../validators/validator.service';
+import { AuthService } from '../shared/services';
 
 const registerForm = {
   name: [],
-  password: [ '', Validators.compose([
-    Validators.required,
-    CustomValidators.matchPassword('repeatPassword', false)
-    ]) ],
-  repeatPassword: [ '', Validators.compose([
-    Validators.required,
-    CustomValidators.matchPassword('password', true)
-    ]) ]
+  password: [
+    '',
+    Validators.compose([
+      Validators.required,
+      CustomValidators.matchPassword('repeatPassword', false)
+    ])
+  ],
+  repeatPassword: [
+    '',
+    Validators.compose([
+      Validators.required,
+      CustomValidators.matchPassword('password', true)
+    ])
+  ]
 };
 
 const loginForm = {
-  name: [ '', Validators.required ],
-  password: [ '', Validators.required ]
+  name: ['', Validators.required],
+  password: ['', Validators.required]
 };
 
 @Component({
   templateUrl: './login-form.component.html',
-  styleUrls: [ './login.scss' ]
+  styleUrls: ['./login.scss']
 })
 export class LoginFormComponent {
   public userForm: FormGroup;
@@ -41,10 +53,14 @@ export class LoginFormComponent {
     private userService: UserService,
     private formBuilder: FormBuilder,
     private planetMessageService: PlanetMessageService,
-    private validatorService: ValidatorService
+    private validatorService: ValidatorService,
+    private authService: AuthService
   ) {
-    registerForm.name = [ '', [ Validators.required, Validators.pattern(/^[A-Za-z0-9][a-z0-9_.-]+$/i) ],
-      ac => this.validatorService.isUnique$('_users', 'name', ac, {}) ];
+    registerForm.name = [
+      '',
+      [Validators.required, Validators.pattern(/^[a-z0-9_.-]+$/i)],
+      ac => this.validatorService.isUnique$('_users', 'name', ac, {})
+    ];
     const formObj = this.createMode ? registerForm : loginForm;
     this.userForm = this.formBuilder.group(formObj);
   }
@@ -68,56 +84,97 @@ export class LoginFormComponent {
 
   welcomeNotification(userId) {
     const data = {
-      'user': userId,
-      'message': 'Welcome ' + userId.replace('org.couchdb.user:', '') + ' to the Planet Learning',
-      'link': '',
-      'type': 'register',
-      'priority': 1,
-      'status': 'unread',
-      'time': Date.now()
+      user: userId,
+      message:
+        'Welcome ' +
+        userId.replace('org.couchdb.user:', '') +
+        ' to the Planet Learning',
+      link: '',
+      type: 'register',
+      priority: 1,
+      status: 'unread',
+      time: Date.now()
     };
-    this.couchService.post('notifications', data)
-      .subscribe();
+    this.couchService.post('notifications', data).subscribe();
   }
 
   reRoute() {
-    return this.router.navigate([ this.returnUrl ]);
+    return this.router.navigate([this.returnUrl]);
   }
 
-  createUser({ name, password }: {name: string, password: string}) {
-    this.couchService.put('_users/org.couchdb.user:' + name,
-      { 'name': name, 'password': password, 'roles': [], 'type': 'user', 'isUserAdmin': false, joinDate: Date.now() })
-    .pipe(switchMap(() => {
-      return this.couchService.put('shelf/org.couchdb.user:' + name, { });
-    })).subscribe((response: any) => {
-      this.planetMessageService.showMessage('User created: ' + response.id.replace('org.couchdb.user:', ''));
-      this.welcomeNotification(response.id);
-      this.login(this.userForm.value, true);
-    }, error => this.planetMessageService.showAlert('An error occurred please try again'));
-  }
+  createUser({ name, password }: { name: string; password: string }) {
+    const opts = {
+      roles: [],
+      type: 'user',
+      isUserAdmin: false,
+      joinDate: Date.now()
+    };
 
-  login({ name, password }: {name: string, password: string}, isCreate: boolean) {
-    this.couchService.post('_session', { 'name': name, 'password': password }, { withCredentials: true })
-      .pipe(switchMap((data) => {
-        // Navigate into app
-        if (isCreate) {
-          return fromPromise(this.router.navigate( [ 'users/update/' + name ]));
-        } else {
-          return fromPromise(this.reRoute());
-        }
-      }), switchMap((routeSuccess) => {
-        // Post new session info to login_activity
-        const obsArr = [ this.userService.newSessionLog() ];
-        const localAdminName = this.userService.getConfig().adminName.split('@')[0];
-        // If not in e2e test, also add session to parent domain
-        if (!environment.test && localAdminName === name) {
-          obsArr.push(this.couchService.post('_session',
-            { 'name': this.userService.getConfig().adminName, 'password': password },
-            { withCredentials: true, domain: this.userService.getConfig().parentDomain }));
-        }
-        return forkJoin(obsArr);
-      })).subscribe((res) => {
+    this.authService
+      .signupUser(name, password, opts)
+      .pipe(
+        switchMap(() => {
+          return this.couchService.put('shelf/org.couchdb.user:' + name, {});
+        })
+      )
+      .subscribe(
+        (response: any) => {
+          this.planetMessageService.showMessage(
+            'User created: ' + response.id.replace('org.couchdb.user:', '')
+          );
+          this.welcomeNotification(response.id);
+          this.login(this.userForm.value, true);
+        },
+        error =>
+          this.planetMessageService.showAlert(
+            'An error occurred please try again'
+          )
+      );
+  }
 
-      }, (error) => this.planetMessageService.showAlert('Username and/or password do not match'));
+  login(
+    { name, password }: { name: string; password: string },
+    isCreate: boolean
+  ) {
+    this.authService
+      .login(name, password)
+      .pipe(
+        switchMap(data => {
+          // Navigate into app
+          if (isCreate) {
+            return fromPromise(this.router.navigate(['users/update/' + name]));
+          } else {
+            return fromPromise(this.reRoute());
+          }
+        }),
+        switchMap(routeSuccess => {
+          // Post new session info to login_activity
+          const obsArr = [this.userService.newSessionLog()];
+          // If not in e2e test, also add session to parent domain
+          if (
+            !environment.test &&
+            this.userService.getConfig().name === name.toLowerCase()
+          ) {
+            obsArr.push(
+              this.couchService.post(
+                '_session',
+                { name: name.toLowerCase(), password: password },
+                {
+                  withCredentials: true,
+                  domain: this.userService.getConfig().parentDomain
+                }
+              )
+            );
+          }
+          return forkJoin(obsArr);
+        })
+      )
+      .subscribe(
+        res => {},
+        error =>
+          this.planetMessageService.showAlert(
+            'Username and/or password do not match'
+          )
+      );
   }
 }

From 0c028fb5c63f9e4dc4f37e62636d2681011b6b39 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 00:48:26 -0500
Subject: [PATCH 44/64] export pouch auth service

---
 src/app/shared/services/pouchDB/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/services/pouchDB/index.ts b/src/app/shared/services/pouchDB/index.ts
index b32e4b342b..f25167bdc2 100644
--- a/src/app/shared/services/pouchDB/index.ts
+++ b/src/app/shared/services/pouchDB/index.ts
@@ -1,5 +1,7 @@
 import { PouchDBService } from './pouchDB.service';
+import { AuthService } from './auth.service';
 
 export { PouchDBService } from './pouchDB.service';
+export { AuthService } from './auth.service';
 
-export const SHARED_SERVICES = [PouchDBService];
+export const SHARED_SERVICES = [PouchDBService, AuthService];

From 55cd4df0c2ab8a372dbe6d72f07a28fd96080405 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 01:14:29 -0500
Subject: [PATCH 45/64] replace couch service with auth service

---
 src/app/shared/auth-guard.service.ts | 59 ++++++++++++++++++----------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/app/shared/auth-guard.service.ts b/src/app/shared/auth-guard.service.ts
index c7652b9cd0..17e524bd48 100644
--- a/src/app/shared/auth-guard.service.ts
+++ b/src/app/shared/auth-guard.service.ts
@@ -4,49 +4,68 @@ import { UserService } from './user.service';
 import { Observable } from 'rxjs/Observable';
 import { of } from 'rxjs/observable/of';
 import { switchMap, map } from 'rxjs/operators';
+import { AuthService as PouchDBAuthService } from './services';
 
-import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import {
+  Router,
+  CanActivate,
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot
+} from '@angular/router';
 
 @Injectable()
 export class AuthService {
-
-  constructor(private couchService: CouchService, private userService: UserService, private router: Router) {}
+  constructor(
+    private couchService: CouchService,
+    private userService: UserService,
+    private router: Router,
+    private authService: PouchDBAuthService
+  ) {}
 
   private checkUser(url: any): Observable<boolean> {
-    return this.couchService
-      .get('_session', { withCredentials: true })
-      .pipe(switchMap((res: any) => {
+    return this.authService.getSessionInfo().pipe(
+      switchMap(res => {
         if (res.userCtx.name) {
-          // If user already matches one on the user service, do not make additional call to CouchDB
           if (res.userCtx.name === this.userService.get().name) {
             return of(true);
           }
           return this.userService.setUserConfigAndShelf(res.userCtx);
         }
         this.userService.unset();
-        this.router.navigate([ '/login' ], { queryParams: { returnUrl: url }, replaceUrl: true });
+        this.router.navigate(['/login'], {
+          queryParams: { returnUrl: url },
+          replaceUrl: true
+        });
         return of(false);
       }),
-      map((isLoggedIn) => {
+      map(isLoggedIn => {
         return isLoggedIn;
-      }));
+      })
+    );
   }
 
   // For main app (which requires login).  Uses canActivateChild to check on every route
   // change if session has expired
-  canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
+  canActivateChild(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot
+  ): Observable<boolean> {
     return this.checkUser(state.url);
   }
 
   // For login route will redirect to main app if there is an active session
-  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
-    return this.couchService.get('_session', { withCredentials: true }).pipe(map(res => {
-      if (res.userCtx.name) {
-        this.router.navigate([ '' ]);
-        return false;
-      }
-      return true;
-    }));
+  canActivate(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot
+  ): Observable<boolean> {
+    return this.authService.getSessionInfo().pipe(
+      map(res => {
+        if (res.userCtx.name) {
+          this.router.navigate(['']);
+          return false;
+        }
+        return true;
+      })
+    );
   }
-
 }

From af65c92a2a6cf534312749dbef4c2438768a5c43 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 01:14:37 -0500
Subject: [PATCH 46/64] add interface for session info return value

---
 src/app/shared/services/pouchDB/auth.service.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/services/pouchDB/auth.service.ts b/src/app/shared/services/pouchDB/auth.service.ts
index 6fe1389b3a..e572716624 100644
--- a/src/app/shared/services/pouchDB/auth.service.ts
+++ b/src/app/shared/services/pouchDB/auth.service.ts
@@ -5,6 +5,12 @@ import { catchError } from 'rxjs/operators';
 import { environment } from '../../../../environments/environment';
 import { PouchDBService } from './pouchDB.service';
 
+interface SessionInfo {
+  userCtx: {
+    name: String;
+    roles: String[];
+  };
+}
 @Injectable()
 export class AuthService {
   private authDB;
@@ -13,7 +19,7 @@ export class AuthService {
     this.authDB = this.pouchdbService.getAuthDB();
   }
 
-  getSessionInfo() {
+  getSessionInfo(): Observable<SessionInfo> {
     return Observable.fromPromise(this.authDB.getSession()).pipe(
       catchError(this.handleError)
     );

From c26c241da4f604e6d718aa92b600dcb920e234cb Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 01:25:33 -0500
Subject: [PATCH 47/64] create class to handle courses

---
 .../services/pouchDB/courses.service.ts       | 24 +++++++++++++++++++
 src/app/shared/services/pouchDB/index.ts      |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 src/app/shared/services/pouchDB/courses.service.ts

diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
new file mode 100644
index 0000000000..0e2b332ada
--- /dev/null
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/fromPromise';
+import { environment } from '../../../../environments/environment';
+import { PouchDBService } from './pouchDB.service';
+
+@Injectable()
+export class CoursesService {
+  private baseUrl = environment.couchAddress;
+  private coursesDB;
+
+  constructor(private pouchDBService: PouchDBService) {
+    this.coursesDB = this.pouchDBService.getLocalPouchDB();
+  }
+
+  replicateRemoteCoursesToLocal() {
+    return this.pouchDBService.replicateRemoteToLocal('courses');
+  }
+
+  private handleError(err) {
+    console.error('An error occurred while fetching courses', err);
+    return Observable.throw(err.message || err);
+  }
+}
diff --git a/src/app/shared/services/pouchDB/index.ts b/src/app/shared/services/pouchDB/index.ts
index f25167bdc2..ee2d978f89 100644
--- a/src/app/shared/services/pouchDB/index.ts
+++ b/src/app/shared/services/pouchDB/index.ts
@@ -3,5 +3,6 @@ import { AuthService } from './auth.service';
 
 export { PouchDBService } from './pouchDB.service';
 export { AuthService } from './auth.service';
+export { CoursesService } from './courses.service';
 
 export const SHARED_SERVICES = [PouchDBService, AuthService];

From f322a4f7b25b3103d2e9d72b7d45669289581136 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 12:24:04 -0500
Subject: [PATCH 48/64] add pouchdb-find plugin

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index e630b84f4f..1dd4fe3954 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "ngx-img": "^10.15.0",
     "pouchdb": "^6.4.3",
     "pouchdb-authentication": "^1.1.2",
+    "pouchdb-find": "^6.4.3",
     "rxjs": "5.5.2",
     "zone.js": "^0.8.18"
   },

From f92912ec372f7100952ae54fc6d520690641a096 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 12:24:29 -0500
Subject: [PATCH 49/64] use pouchdb find plugin and create an index for kind
 field and sort docs by createdDate

---
 src/app/shared/services/pouchDB/pouchDB.service.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/app/shared/services/pouchDB/pouchDB.service.ts b/src/app/shared/services/pouchDB/pouchDB.service.ts
index 8dbdfc2d75..e3ecf1b063 100644
--- a/src/app/shared/services/pouchDB/pouchDB.service.ts
+++ b/src/app/shared/services/pouchDB/pouchDB.service.ts
@@ -1,12 +1,14 @@
 import { Injectable } from '@angular/core';
 import PouchDB from 'pouchdb';
 import PouchDBAuth from 'pouchdb-authentication';
+import PouchDBFind from 'pouchdb-find';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/fromEvent';
 import { catchError } from 'rxjs/operators';
 import { environment } from '../../../../environments/environment';
 
 PouchDB.plugin(PouchDBAuth);
+PouchDB.plugin(PouchDBFind);
 
 type RemoteDatabases = 'courses';
 
@@ -23,6 +25,14 @@ export class PouchDBService {
   constructor() {
     this.localDB = new PouchDB('local-pouchdb');
 
+    // indexes the field for faster lookup
+    this.localDB.createIndex({
+      index: {
+        fields: ['kind']
+      },
+      sort: [{ createdAt: 'desc' }]
+    });
+
     // test is a placeholder temp database
     // we need a central remote database
     // since we will have different levels of authentication (manager, intern)

From a274223ab9aba9f3fd9b30d48d0f20a5cef76bca Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 12:25:07 -0500
Subject: [PATCH 50/64] remove unused fields, rename class variable and add
 method for fetching courses

---
 .../shared/services/pouchDB/courses.service.ts    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
index 0e2b332ada..9bc8444b34 100644
--- a/src/app/shared/services/pouchDB/courses.service.ts
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -6,11 +6,20 @@ import { PouchDBService } from './pouchDB.service';
 
 @Injectable()
 export class CoursesService {
-  private baseUrl = environment.couchAddress;
-  private coursesDB;
+  private localDB;
 
   constructor(private pouchDBService: PouchDBService) {
-    this.coursesDB = this.pouchDBService.getLocalPouchDB();
+    this.localDB = this.pouchDBService.getLocalPouchDB();
+  }
+
+  getCourses() {
+    return Observable.fromPromise(
+      this.localDB.find({
+        selector: {
+          kind: 'Course'
+        }
+      })
+    );
   }
 
   replicateRemoteCoursesToLocal() {

From 39708b2657d2460c0260b8e1b0ca12f173ef287c Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 12:25:27 -0500
Subject: [PATCH 51/64] add and use courses service

---
 src/app/courses/courses.module.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/courses/courses.module.ts b/src/app/courses/courses.module.ts
index cac34a28a9..5c827b089c 100644
--- a/src/app/courses/courses.module.ts
+++ b/src/app/courses/courses.module.ts
@@ -17,6 +17,7 @@ import { CoursesStepViewComponent } from './step-view-courses/courses-step-view.
 import { CoursesService } from './courses.service';
 import { ResourcesViewerComponent } from '../resources/view-resources/resources-viewer.component';
 import { ExamsViewComponent } from '../exams/exams-view.component';
+import { CoursesService as PouchDBCoursesService } from '../shared/services';
 
 @NgModule({
   imports: [
@@ -40,8 +41,6 @@ import { ExamsViewComponent } from '../exams/exams-view.component';
     ExamsQuestionComponent,
     ExamsViewComponent
   ],
-  providers: [
-    CoursesService
-  ]
+  providers: [CoursesService, PouchDBCoursesService]
 })
 export class CoursesModule {}

From 61a5a121c3995e4aeb04c0473b31f271786aa9b5 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 12:25:44 -0500
Subject: [PATCH 52/64] use pouchdb for fetching courses

---
 src/app/courses/courses.component.ts | 197 ++++++++++++++++++---------
 1 file changed, 136 insertions(+), 61 deletions(-)

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index 82dac2f4c9..e1a17b4ea9 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -1,23 +1,55 @@
-import { Component, OnInit, AfterViewInit, ViewChild, OnDestroy } from '@angular/core';
+import {
+  Component,
+  OnInit,
+  AfterViewInit,
+  ViewChild,
+  OnDestroy
+} from '@angular/core';
 import { CouchService } from '../shared/couchdb.service';
 import { DialogsPromptComponent } from '../shared/dialogs/dialogs-prompt.component';
-import { MatTableDataSource, MatSort, MatPaginator, MatFormField, MatFormFieldControl, MatDialog, PageEvent } from '@angular/material';
+import {
+  MatTableDataSource,
+  MatSort,
+  MatPaginator,
+  MatFormField,
+  MatFormFieldControl,
+  MatDialog,
+  PageEvent
+} from '@angular/material';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { SelectionModel } from '@angular/cdk/collections';
 import { Router, ActivatedRoute, ParamMap } from '@angular/router';
-import { FormBuilder, FormControl, FormGroup, FormArray, Validators } from '@angular/forms';
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  FormArray,
+  Validators
+} from '@angular/forms';
 import { UserService } from '../shared/user.service';
 import { forkJoin } from 'rxjs/observable/forkJoin';
-import { switchMap, catchError, map, takeUntil } from 'rxjs/operators';
+import {
+  switchMap,
+  catchError,
+  map,
+  takeUntil,
+  mergeMap
+} from 'rxjs/operators';
 import { of } from 'rxjs/observable/of';
-import { filterDropdowns, filterSpecificFields, composeFilterFunctions } from '../shared/table-helpers';
+import {
+  filterDropdowns,
+  filterSpecificFields,
+  composeFilterFunctions
+} from '../shared/table-helpers';
 import * as constants from './constants';
 import { Subject } from 'rxjs/Subject';
+import { CoursesService } from '../shared/services';
 
 @Component({
   templateUrl: './courses.component.html',
-  styles: [ `
+  styles: [
+    `
     /* Column Widths */
     .mat-column-select {
       max-width: 44px;
@@ -25,9 +57,9 @@ import { Subject } from 'rxjs/Subject';
     .mat-column-action {
       max-width: 225px;
     }
-  ` ]
+  `
+  ]
 })
-
 export class CoursesComponent implements OnInit, AfterViewInit {
   selection = new SelectionModel(true, []);
   courses = new MatTableDataSource();
@@ -39,15 +71,19 @@ export class CoursesComponent implements OnInit, AfterViewInit {
   courseForm: FormGroup;
   readonly dbName = 'courses';
   parent = this.route.snapshot.data.parent;
-  displayedColumns = this.parent ? [ 'courseTitle', 'action' ] : [ 'select', 'courseTitle', 'action' ];
+  displayedColumns = this.parent
+    ? ['courseTitle', 'action']
+    : ['select', 'courseTitle', 'action'];
   gradeOptions: any = constants.gradeLevels;
   subjectOptions: any = constants.subjectLevels;
   filter = {
-    'gradeLevel': '',
-    'subjectLevel': ''
+    gradeLevel: '',
+    subjectLevel: ''
   };
   private _titleSearch = '';
-  get titleSearch(): string { return this._titleSearch; }
+  get titleSearch(): string {
+    return this._titleSearch;
+  }
   set titleSearch(value: string) {
     // When setting the titleSearch, also set the courses filter
     this.courses.filter = value ? value : this.dropdownsFill();
@@ -63,24 +99,42 @@ export class CoursesComponent implements OnInit, AfterViewInit {
     private planetMessageService: PlanetMessageService,
     private router: Router,
     private route: ActivatedRoute,
-    private userService: UserService
+    private userService: UserService,
+    private coursesService: CoursesService
   ) {
-    this.userService.shelfChange$.pipe(takeUntil(this.onDestroy$))
+    this.userService.shelfChange$
+      .pipe(takeUntil(this.onDestroy$))
       .subscribe(() => {
         this.userShelf = this.userService.getUserShelf();
         this.setupList(this.courses.data, this.userShelf.courseIds);
       });
-   }
+  }
 
   ngOnInit() {
-    this.getCourses().subscribe((courses: any) => {
-      // Sort in descending createdDate order, so the new courses can be shown on the top
-      courses.sort((a, b) => b.createdDate - a.createdDate);
-      this.userShelf = this.userService.getUserShelf();
-      this.setupList(courses, this.userShelf.courseIds);
-    }, (error) => console.log(error));
-    this.courses.filterPredicate = composeFilterFunctions([ filterDropdowns(this.filter), filterSpecificFields([ 'courseTitle' ]) ]);
-    this.courses.sortingDataAccessor = (item, property) => item[property].toLowerCase();
+    this.coursesService
+      .replicateRemoteCoursesToLocal()
+      .pipe(
+        mergeMap(res => {
+          console.log('syncing from courses...');
+          console.log(res);
+          return this.getCourses();
+        })
+      )
+      .subscribe(
+        (courses: any) => {
+          console.log('fetching courses...');
+          console.log(courses);
+          this.userShelf = this.userService.getUserShelf();
+          this.setupList(courses.docs, this.userShelf.courseIds);
+        },
+        error => console.log(error)
+      );
+    this.courses.filterPredicate = composeFilterFunctions([
+      filterDropdowns(this.filter),
+      filterSpecificFields(['courseTitle'])
+    ]);
+    this.courses.sortingDataAccessor = (item, property) =>
+      item[property].toLowerCase();
   }
 
   setupList(courseRes, myCourses) {
@@ -96,11 +150,7 @@ export class CoursesComponent implements OnInit, AfterViewInit {
   }
 
   getCourses() {
-    let opts: any = {};
-    if (this.parent) {
-      opts = { domain: this.userService.getConfig().parentDomain };
-    }
-    return this.couchService.allDocs('courses', opts);
+    return this.coursesService.getCourses();
   }
 
   ngAfterViewInit() {
@@ -118,11 +168,15 @@ export class CoursesComponent implements OnInit, AfterViewInit {
 
   updateCourse(course) {
     const { _id: courseId } = course;
-    this.router.navigate([ '/courses/update/' + course._id ]);
+    this.router.navigate(['/courses/update/' + course._id]);
   }
 
   deleteClick(course) {
-    this.openDeleteDialog(this.deleteCourse(course), 'single', course.courseTitle);
+    this.openDeleteDialog(
+      this.deleteCourse(course),
+      'single',
+      course.courseTitle
+    );
   }
 
   deleteSelected() {
@@ -149,45 +203,61 @@ export class CoursesComponent implements OnInit, AfterViewInit {
       }
     });
     // Reset the message when the dialog closes
-    this.deleteDialog.afterClosed().debug('Closing dialog').subscribe(() => {
-      this.message = '';
-    });
+    this.deleteDialog
+      .afterClosed()
+      .debug('Closing dialog')
+      .subscribe(() => {
+        this.message = '';
+      });
   }
 
   deleteCourse(course) {
     // Return a function with course on its scope to pass to delete dialog
     return () => {
       const { _id: courseId, _rev: courseRev } = course;
-      this.couchService.delete('courses/' + courseId + '?rev=' + courseRev)
-        .subscribe((data) => {
+      this.couchService
+        .delete('courses/' + courseId + '?rev=' + courseRev)
+        .subscribe(data => {
           // It's safer to remove the item from the array based on its id than to splice based on the index
-          this.courses.data = this.courses.data.filter((c: any) => data.id !== c._id);
+          this.courses.data = this.courses.data.filter(
+            (c: any) => data.id !== c._id
+          );
           this.deleteDialog.close();
           this.selection.clear();
-          this.planetMessageService.showMessage('Course deleted: ' + course.courseTitle);
-        }, (error) => this.deleteDialog.componentInstance.message = 'There was a problem deleting this course.');
+          this.planetMessageService.showMessage(
+            'Course deleted: ' + course.courseTitle
+          );
+        }, error => (this.deleteDialog.componentInstance.message = 'There was a problem deleting this course.'));
     };
   }
 
   deleteCourses(courses) {
     return () => {
-      const deleteArray = courses.map((course) => {
+      const deleteArray = courses.map(course => {
         return { _id: course._id, _rev: course._rev, _deleted: true };
       });
-      this.couchService.post(this.dbName + '/_bulk_docs', { docs: deleteArray })
-      .pipe(switchMap(data => {
-        return this.getCourses();
-      })).subscribe((data: any) => {
-        this.setupList(data, this.userShelf.courseIds);
-        this.selection.clear();
-        this.deleteDialog.close();
-        this.planetMessageService.showMessage('You have deleted selected courses');
-      }, (error) => this.deleteDialog.componentInstance.message = 'There was a problem deleting courses.');
+      this.couchService
+        .post(this.dbName + '/_bulk_docs', { docs: deleteArray })
+        .pipe(
+          switchMap(data => {
+            return this.getCourses();
+          })
+        )
+        .subscribe((data: any) => {
+          this.setupList(data, this.userShelf.courseIds);
+          this.selection.clear();
+          this.deleteDialog.close();
+          this.planetMessageService.showMessage(
+            'You have deleted selected courses'
+          );
+        }, error => (this.deleteDialog.componentInstance.message = 'There was a problem deleting courses.'));
     };
   }
 
   goBack() {
-    this.parent ? this.router.navigate([ '/manager' ]) : this.router.navigate([ '/' ]);
+    this.parent
+      ? this.router.navigate(['/manager'])
+      : this.router.navigate(['/']);
   }
 
   /** Whether the number of selected elements matches the total number of rows. */
@@ -199,9 +269,9 @@ export class CoursesComponent implements OnInit, AfterViewInit {
 
   /** Selects all rows if they are not all selected; otherwise clear selection. */
   masterToggle() {
-    this.isAllSelected() ?
-    this.selection.clear() :
-    this.courses.data.forEach(row => this.selection.select(row));
+    this.isAllSelected()
+      ? this.selection.clear()
+      : this.courses.data.forEach(row => this.selection.select(row));
   }
 
   onFilterChange(filterValue: string, field: string) {
@@ -212,8 +282,8 @@ export class CoursesComponent implements OnInit, AfterViewInit {
 
   resetSearch() {
     this.filter = {
-      'gradeLevel': '',
-      'subjectLevel': ''
+      gradeLevel: '',
+      subjectLevel: ''
     };
     this.titleSearch = '';
   }
@@ -221,7 +291,7 @@ export class CoursesComponent implements OnInit, AfterViewInit {
   // Returns a space to fill the MatTable filter field so filtering runs for dropdowns when
   // search text is deleted, but does not run when there are no active filters.
   dropdownsFill() {
-    return Object.entries(this.filter).reduce((emptySpace, [ field, val ]) => {
+    return Object.entries(this.filter).reduce((emptySpace, [field, val]) => {
       if (val) {
         return ' ';
       }
@@ -230,27 +300,32 @@ export class CoursesComponent implements OnInit, AfterViewInit {
   }
 
   updateShelf(newShelf, message) {
-    this.couchService.put('shelf/' + this.userId, newShelf).subscribe((res) => {
+    this.couchService.put('shelf/' + this.userId, newShelf).subscribe(res => {
       newShelf._rev = res.rev;
       this.userService.setShelf(newShelf);
-      this.setupList(this.courses.data,  this.userShelf.courseIds);
+      this.setupList(this.courses.data, this.userShelf.courseIds);
       this.planetMessageService.showMessage(message);
       // Clear selection because setupList breaks Material Table selection
       this.selection.clear();
-    }, (error) => (error));
+    }, error => error);
   }
 
   courseResign(courseId) {
-    const userShelf: any = { courseIds: [ ...this.userShelf.courseIds ], ...this.userShelf };
+    const userShelf: any = {
+      courseIds: [...this.userShelf.courseIds],
+      ...this.userShelf
+    };
     const myCourseIndex = userShelf.courseIds.indexOf(courseId);
     userShelf.courseIds.splice(myCourseIndex, 1);
     this.updateShelf(userShelf, 'Course successfully resigned');
   }
 
   courseAdmission(courseId) {
-    const userShelf: any = { courseIds: [ ...this.userShelf.courseIds ], ...this.userShelf };
+    const userShelf: any = {
+      courseIds: [...this.userShelf.courseIds],
+      ...this.userShelf
+    };
     userShelf.courseIds.push(courseId);
     this.updateShelf(userShelf, 'Course added to your dashboard');
   }
-
 }

From c01458282255ff500e6da2050c298631bd9d4608 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 16:12:01 -0500
Subject: [PATCH 53/64] index createdAt field and fix sorting

---
 src/app/shared/services/pouchDB/courses.service.ts | 7 +++++--
 src/app/shared/services/pouchDB/pouchDB.service.ts | 5 ++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
index 9bc8444b34..8e818946e2 100644
--- a/src/app/shared/services/pouchDB/courses.service.ts
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -13,11 +13,14 @@ export class CoursesService {
   }
 
   getCourses() {
+    // need to use gte because some documents do not have createdAt field
     return Observable.fromPromise(
       this.localDB.find({
         selector: {
-          kind: 'Course'
-        }
+          kind: 'Course',
+          createdAt: { $gte: null }
+        },
+        sort: [{ kind: 'desc' }, { createdAt: 'desc' }]
       })
     );
   }
diff --git a/src/app/shared/services/pouchDB/pouchDB.service.ts b/src/app/shared/services/pouchDB/pouchDB.service.ts
index e3ecf1b063..9f93ba6831 100644
--- a/src/app/shared/services/pouchDB/pouchDB.service.ts
+++ b/src/app/shared/services/pouchDB/pouchDB.service.ts
@@ -28,9 +28,8 @@ export class PouchDBService {
     // indexes the field for faster lookup
     this.localDB.createIndex({
       index: {
-        fields: ['kind']
-      },
-      sort: [{ createdAt: 'desc' }]
+        fields: ['kind', 'createdAt']
+      }
     });
 
     // test is a placeholder temp database

From 1de11e8b381617198b172b0a8b4df63a1f57f974 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 16:19:21 -0500
Subject: [PATCH 54/64] handle unsubscribing from observables

---
 src/app/courses/courses.component.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index e1a17b4ea9..d958399d1f 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -60,7 +60,7 @@ import { CoursesService } from '../shared/services';
   `
   ]
 })
-export class CoursesComponent implements OnInit, AfterViewInit {
+export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   selection = new SelectionModel(true, []);
   courses = new MatTableDataSource();
   @ViewChild(MatSort) sort: MatSort;
@@ -81,6 +81,7 @@ export class CoursesComponent implements OnInit, AfterViewInit {
     subjectLevel: ''
   };
   private _titleSearch = '';
+
   get titleSearch(): string {
     return this._titleSearch;
   }
@@ -91,7 +92,7 @@ export class CoursesComponent implements OnInit, AfterViewInit {
   }
   userId = this.userService.get()._id;
   userShelf: any = [];
-  private onDestroy$ = new Subject<void>();
+  private onDestroy$: Subject<boolean> = new Subject<boolean>();
 
   constructor(
     private couchService: CouchService,
@@ -118,7 +119,8 @@ export class CoursesComponent implements OnInit, AfterViewInit {
           console.log('syncing from courses...');
           console.log(res);
           return this.getCourses();
-        })
+        }),
+        takeUntil(this.onDestroy$)
       )
       .subscribe(
         (courses: any) => {
@@ -328,4 +330,9 @@ export class CoursesComponent implements OnInit, AfterViewInit {
     userShelf.courseIds.push(courseId);
     this.updateShelf(userShelf, 'Course added to your dashboard');
   }
+
+  ngOnDestroy() {
+    this.onDestroy$.next(false);
+    this.onDestroy$.unsubscribe();
+  }
 }

From 8f913eef0ba54a05042d296dbbb3daba97c653ef Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 16:37:59 -0500
Subject: [PATCH 55/64] add basic type checking for courses

---
 src/app/courses/courses.component.ts          | 10 ++++----
 .../services/pouchDB/courses.service.ts       | 25 ++++++++++++++++++-
 src/app/shared/services/pouchDB/index.ts      |  2 +-
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index d958399d1f..197374c2a2 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -44,7 +44,7 @@ import {
 } from '../shared/table-helpers';
 import * as constants from './constants';
 import { Subject } from 'rxjs/Subject';
-import { CoursesService } from '../shared/services';
+import { CoursesService, Course } from '../shared/services';
 
 @Component({
   templateUrl: './courses.component.html',
@@ -123,11 +123,11 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
         takeUntil(this.onDestroy$)
       )
       .subscribe(
-        (courses: any) => {
+        courses => {
           console.log('fetching courses...');
           console.log(courses);
           this.userShelf = this.userService.getUserShelf();
-          this.setupList(courses.docs, this.userShelf.courseIds);
+          this.setupList(courses, this.userShelf.courseIds);
         },
         error => console.log(error)
       );
@@ -139,8 +139,8 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
       item[property].toLowerCase();
   }
 
-  setupList(courseRes, myCourses) {
-    this.courses.data = courseRes.map((course: any) => {
+  setupList(courseRes: Course[], myCourses) {
+    this.courses.data = courseRes.map(course => {
       const myCourseIndex = myCourses.findIndex(courseId => {
         return course._id === courseId;
       });
diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
index 8e818946e2..7229ae4bc1 100644
--- a/src/app/shared/services/pouchDB/courses.service.ts
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -3,6 +3,29 @@ import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/fromPromise';
 import { environment } from '../../../../environments/environment';
 import { PouchDBService } from './pouchDB.service';
+import { map } from 'rxjs/operators';
+
+interface Step {
+  stepTitle: string;
+  description: string;
+  attachment: string;
+}
+
+// @TODO: Add more fields from the database
+export interface Course {
+  _id: String;
+  _rev: String;
+  kind: string;
+  languageOfInstruction: string;
+  courseTitle: string;
+  memberLimit: number;
+  description: String;
+  method: string;
+  gradeLevel: string;
+  subjectLevel: string;
+  steps: Step[];
+  createdAt: number;
+}
 
 @Injectable()
 export class CoursesService {
@@ -22,7 +45,7 @@ export class CoursesService {
         },
         sort: [{ kind: 'desc' }, { createdAt: 'desc' }]
       })
-    );
+    ).pipe(map((data: { docs: Course[] }) => data.docs));
   }
 
   replicateRemoteCoursesToLocal() {
diff --git a/src/app/shared/services/pouchDB/index.ts b/src/app/shared/services/pouchDB/index.ts
index ee2d978f89..484c551a8b 100644
--- a/src/app/shared/services/pouchDB/index.ts
+++ b/src/app/shared/services/pouchDB/index.ts
@@ -3,6 +3,6 @@ import { AuthService } from './auth.service';
 
 export { PouchDBService } from './pouchDB.service';
 export { AuthService } from './auth.service';
-export { CoursesService } from './courses.service';
+export { CoursesService, Course } from './courses.service';
 
 export const SHARED_SERVICES = [PouchDBService, AuthService];

From 3d7a4f6c1c243f264cde516474f6240c31defa84 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 16:51:14 -0500
Subject: [PATCH 56/64] use truthy value for unsubcribing

---
 src/app/courses/courses.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index 197374c2a2..c76635243c 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -332,7 +332,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngOnDestroy() {
-    this.onDestroy$.next(false);
+    this.onDestroy$.next(true);
     this.onDestroy$.unsubscribe();
   }
 }

From 36eb2ed1de54b0d26861e4f77da766c6794e1fa8 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 16:56:28 -0500
Subject: [PATCH 57/64] add return type

---
 src/app/shared/services/pouchDB/courses.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
index 7229ae4bc1..5a9a2f6d90 100644
--- a/src/app/shared/services/pouchDB/courses.service.ts
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -35,7 +35,7 @@ export class CoursesService {
     this.localDB = this.pouchDBService.getLocalPouchDB();
   }
 
-  getCourses() {
+  getCourses(): Observable<Course[]> {
     // need to use gte because some documents do not have createdAt field
     return Observable.fromPromise(
       this.localDB.find({

From 8d1872d469f5dfe8b9f6344cbf8678421476a0a4 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 17:00:54 -0500
Subject: [PATCH 58/64] add type to MatTableDataSource

---
 src/app/courses/courses.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index c76635243c..fd7f09d96d 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -62,7 +62,7 @@ import { CoursesService, Course } from '../shared/services';
 })
 export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   selection = new SelectionModel(true, []);
-  courses = new MatTableDataSource();
+  courses: MatTableDataSource<Course> = new MatTableDataSource<Course>();
   @ViewChild(MatSort) sort: MatSort;
   @ViewChild(MatPaginator) paginator: MatPaginator;
   message = '';

From ad13b508c6f837f8d1056a802c2709fe436c59ec Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 17:31:51 -0500
Subject: [PATCH 59/64] add method to get single course

---
 src/app/shared/services/pouchDB/courses.service.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
index 5a9a2f6d90..b01766ab34 100644
--- a/src/app/shared/services/pouchDB/courses.service.ts
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -48,6 +48,10 @@ export class CoursesService {
     ).pipe(map((data: { docs: Course[] }) => data.docs));
   }
 
+  getCourse(id): Observable<Course> {
+    return Observable.fromPromise(this.localDB.get(id));
+  }
+
   replicateRemoteCoursesToLocal() {
     return this.pouchDBService.replicateRemoteToLocal('courses');
   }

From af3918224b35185ae03b994bb7d4cf0eaeb47725 Mon Sep 17 00:00:00 2001
From: LKhadka <l.khadka@outlook.com>
Date: Sat, 19 May 2018 17:31:58 -0500
Subject: [PATCH 60/64] replace with pouch service

---
 .../view-courses/courses-view.component.ts    | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/app/courses/view-courses/courses-view.component.ts b/src/app/courses/view-courses/courses-view.component.ts
index cb412c8433..7b7d84b398 100644
--- a/src/app/courses/view-courses/courses-view.component.ts
+++ b/src/app/courses/view-courses/courses-view.component.ts
@@ -1,16 +1,15 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
-import { CouchService } from '../../shared/couchdb.service';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { switchMap, takeUntil } from 'rxjs/operators';
 import { DatePipe } from '@angular/common';
-import { UserService } from '../../shared/user.service';
-import { CoursesService } from '../courses.service';
 import { Subject } from 'rxjs/Subject';
 import { environment } from '../../../environments/environment';
+import { CoursesService } from '../../shared/services';
 
 @Component({
   templateUrl: './courses-view.component.html',
-  styles: [ `
+  styles: [
+    `
   .view-container {
     display: grid;
     grid-template-columns: 1fr 1fr;
@@ -29,38 +28,39 @@ import { environment } from '../../../environments/environment';
   .course-detail, .course-view {
     overflow: auto;
   }
-  ` ]
+  `
+  ]
 })
-
 export class CoursesViewComponent implements OnInit, OnDestroy {
-
-  onDestroy$ = new Subject<void>();
+  private onDestroy$: Subject<boolean> = new Subject<boolean>();
   courseDetail: any = {};
   parent = this.route.snapshot.data.parent;
 
   constructor(
     private router: Router,
-    private couchService: CouchService,
-    private userService: UserService,
     private route: ActivatedRoute,
-    private coursesService: CoursesService
-  ) { }
+    private courseService: CoursesService
+  ) {}
 
   ngOnInit() {
-    this.coursesService.courseUpdated$.pipe(takeUntil(this.onDestroy$)).subscribe(course => this.courseDetail = course);
-    this.route.paramMap.pipe(takeUntil(this.onDestroy$)).subscribe(
-      (params: ParamMap) => this.coursesService.requestCourse({ courseId: params.get('id'), forceLatest: true }),
-      error => console.log(error)
-    );
+    this.route.paramMap
+      .pipe(
+        switchMap((params: ParamMap) =>
+          this.courseService.getCourse(params.get('id'))
+        )
+      )
+      .subscribe(course => {
+        this.courseDetail = course;
+      });
   }
 
   ngOnDestroy() {
-    this.onDestroy$.next();
-    this.onDestroy$.complete();
+    this.onDestroy$.next(true);
+    this.onDestroy$.unsubscribe();
   }
 
   viewStep() {
-    this.router.navigate([ './step/1' ], { relativeTo: this.route });
+    this.router.navigate(['./step/1'], { relativeTo: this.route });
   }
 
   goToExam(stepNum) {

From 39d3fbc400f875086516952349f2d92f599ab823 Mon Sep 17 00:00:00 2001
From: Paul <paul.r.albert@gmail.com>
Date: Mon, 21 May 2018 14:53:09 -0400
Subject: [PATCH 61/64] Remove superficial changes and lint fix

---
 src/app/app.module.ts                         |   6 +-
 src/app/courses/courses.component.ts          | 151 ++++++------------
 src/app/courses/courses.module.ts             |   4 +-
 .../view-courses/courses-view.component.ts    |  11 +-
 src/app/login/login-form.component.ts         |  56 +++----
 src/app/shared/auth-guard.service.ts          |  49 ++----
 .../services/pouchDB/courses.service.ts       |   2 +-
 src/app/shared/services/pouchDB/index.ts      |   2 +-
 .../services/pouchDB/pouchDB.service.ts       |   2 +-
 tsconfig.json                                 |   9 +-
 10 files changed, 105 insertions(+), 187 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 4708ea3835..7f14f9aabb 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -34,7 +34,9 @@ import { SHARED_SERVICES } from './shared/services';
       ? ServiceWorkerModule.register('/ngsw-worker.js')
       : []
   ],
-  declarations: [AppComponent, PageNotFoundComponent],
+  declarations: [
+    AppComponent, PageNotFoundComponent
+  ],
   providers: [
     CouchService,
     AuthService,
@@ -46,6 +48,6 @@ import { SHARED_SERVICES } from './shared/services';
     ResourcesService,
     ...SHARED_SERVICES
   ],
-  bootstrap: [AppComponent]
+  bootstrap: [ AppComponent ]
 })
 export class AppModule {}
diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index fd7f09d96d..feaa788263 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -1,55 +1,24 @@
-import {
-  Component,
-  OnInit,
-  AfterViewInit,
-  ViewChild,
-  OnDestroy
-} from '@angular/core';
+import { Component, OnInit, AfterViewInit, ViewChild, OnDestroy } from '@angular/core';
 import { CouchService } from '../shared/couchdb.service';
 import { DialogsPromptComponent } from '../shared/dialogs/dialogs-prompt.component';
-import {
-  MatTableDataSource,
-  MatSort,
-  MatPaginator,
-  MatFormField,
-  MatFormFieldControl,
-  MatDialog,
-  PageEvent
-} from '@angular/material';
+import { MatTableDataSource, MatSort, MatPaginator, MatFormField, MatFormFieldControl, MatDialog, PageEvent } from '@angular/material';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { SelectionModel } from '@angular/cdk/collections';
 import { Router, ActivatedRoute, ParamMap } from '@angular/router';
-import {
-  FormBuilder,
-  FormControl,
-  FormGroup,
-  FormArray,
-  Validators
-} from '@angular/forms';
+import { FormBuilder, FormControl, FormGroup, FormArray, Validators } from '@angular/forms';
 import { UserService } from '../shared/user.service';
 import { forkJoin } from 'rxjs/observable/forkJoin';
-import {
-  switchMap,
-  catchError,
-  map,
-  takeUntil,
-  mergeMap
-} from 'rxjs/operators';
+import { switchMap, catchError, map, takeUntil, mergeMap } from 'rxjs/operators';
 import { of } from 'rxjs/observable/of';
-import {
-  filterDropdowns,
-  filterSpecificFields,
-  composeFilterFunctions
-} from '../shared/table-helpers';
+import { filterDropdowns, filterSpecificFields, composeFilterFunctions } from '../shared/table-helpers';
 import * as constants from './constants';
 import { Subject } from 'rxjs/Subject';
 import { CoursesService, Course } from '../shared/services';
 
 @Component({
   templateUrl: './courses.component.html',
-  styles: [
-    `
+  styles: [ `
     /* Column Widths */
     .mat-column-select {
       max-width: 44px;
@@ -57,8 +26,7 @@ import { CoursesService, Course } from '../shared/services';
     .mat-column-action {
       max-width: 225px;
     }
-  `
-  ]
+  ` ]
 })
 export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   selection = new SelectionModel(true, []);
@@ -71,20 +39,15 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   courseForm: FormGroup;
   readonly dbName = 'courses';
   parent = this.route.snapshot.data.parent;
-  displayedColumns = this.parent
-    ? ['courseTitle', 'action']
-    : ['select', 'courseTitle', 'action'];
+  displayedColumns = this.parent ? [ 'courseTitle', 'action' ] : [ 'select', 'courseTitle', 'action' ];
   gradeOptions: any = constants.gradeLevels;
   subjectOptions: any = constants.subjectLevels;
   filter = {
-    gradeLevel: '',
-    subjectLevel: ''
+    'gradeLevel': '',
+    'subjectLevel': ''
   };
   private _titleSearch = '';
-
-  get titleSearch(): string {
-    return this._titleSearch;
-  }
+  get titleSearch(): string { return this._titleSearch; }
   set titleSearch(value: string) {
     // When setting the titleSearch, also set the courses filter
     this.courses.filter = value ? value : this.dropdownsFill();
@@ -92,7 +55,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
   userId = this.userService.get()._id;
   userShelf: any = [];
-  private onDestroy$: Subject<boolean> = new Subject<boolean>();
+  private onDestroy$ = new Subject<boolean>();
 
   constructor(
     private couchService: CouchService,
@@ -103,8 +66,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
     private userService: UserService,
     private coursesService: CoursesService
   ) {
-    this.userService.shelfChange$
-      .pipe(takeUntil(this.onDestroy$))
+    this.userService.shelfChange$.pipe(takeUntil(this.onDestroy$))
       .subscribe(() => {
         this.userShelf = this.userService.getUserShelf();
         this.setupList(this.courses.data, this.userShelf.courseIds);
@@ -131,12 +93,8 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
         },
         error => console.log(error)
       );
-    this.courses.filterPredicate = composeFilterFunctions([
-      filterDropdowns(this.filter),
-      filterSpecificFields(['courseTitle'])
-    ]);
-    this.courses.sortingDataAccessor = (item, property) =>
-      item[property].toLowerCase();
+    this.courses.filterPredicate = composeFilterFunctions([ filterDropdowns(this.filter), filterSpecificFields([ 'courseTitle' ]) ]);
+    this.courses.sortingDataAccessor = (item, property) => item[property].toLowerCase();
   }
 
   setupList(courseRes: Course[], myCourses) {
@@ -170,7 +128,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
 
   updateCourse(course) {
     const { _id: courseId } = course;
-    this.router.navigate(['/courses/update/' + course._id]);
+    this.router.navigate([ '/courses/update/' + course._id ]);
   }
 
   deleteClick(course) {
@@ -205,61 +163,47 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
       }
     });
     // Reset the message when the dialog closes
-    this.deleteDialog
-      .afterClosed()
-      .debug('Closing dialog')
-      .subscribe(() => {
-        this.message = '';
-      });
+    this.deleteDialog.afterClosed().debug('Closing dialog').subscribe(() => {
+      this.message = '';
+    });
   }
 
   deleteCourse(course) {
     // Return a function with course on its scope to pass to delete dialog
     return () => {
       const { _id: courseId, _rev: courseRev } = course;
-      this.couchService
-        .delete('courses/' + courseId + '?rev=' + courseRev)
+      this.couchService.delete('courses/' + courseId + '?rev=' + courseRev)
         .subscribe(data => {
           // It's safer to remove the item from the array based on its id than to splice based on the index
-          this.courses.data = this.courses.data.filter(
-            (c: any) => data.id !== c._id
-          );
+          this.courses.data = this.courses.data.filter((c: any) => data.id !== c._id);
           this.deleteDialog.close();
           this.selection.clear();
-          this.planetMessageService.showMessage(
-            'Course deleted: ' + course.courseTitle
-          );
-        }, error => (this.deleteDialog.componentInstance.message = 'There was a problem deleting this course.'));
+          this.planetMessageService.showMessage('Course deleted: ' + course.courseTitle);
+        }, error => this.deleteDialog.componentInstance.message = 'There was a problem deleting this course.');
     };
   }
 
   deleteCourses(courses) {
     return () => {
-      const deleteArray = courses.map(course => {
+      const deleteArray = courses.map((course) => {
         return { _id: course._id, _rev: course._rev, _deleted: true };
       });
-      this.couchService
-        .post(this.dbName + '/_bulk_docs', { docs: deleteArray })
-        .pipe(
-          switchMap(data => {
-            return this.getCourses();
-          })
-        )
-        .subscribe((data: any) => {
-          this.setupList(data, this.userShelf.courseIds);
-          this.selection.clear();
-          this.deleteDialog.close();
-          this.planetMessageService.showMessage(
-            'You have deleted selected courses'
-          );
-        }, error => (this.deleteDialog.componentInstance.message = 'There was a problem deleting courses.'));
+      this.couchService.post(this.dbName + '/_bulk_docs', { docs: deleteArray })
+      .pipe(switchMap(data => {
+          return this.getCourses();
+      })).subscribe((data: any) => {
+        this.setupList(data, this.userShelf.courseIds);
+        this.selection.clear();
+        this.deleteDialog.close();
+        this.planetMessageService.showMessage(
+          'You have deleted selected courses'
+        );
+      }, error => this.deleteDialog.componentInstance.message = 'There was a problem deleting courses.');
     };
   }
 
   goBack() {
-    this.parent
-      ? this.router.navigate(['/manager'])
-      : this.router.navigate(['/']);
+    this.parent ? this.router.navigate([ '/manager' ]) : this.router.navigate([ '/' ]);
   }
 
   /** Whether the number of selected elements matches the total number of rows. */
@@ -271,9 +215,9 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
 
   /** Selects all rows if they are not all selected; otherwise clear selection. */
   masterToggle() {
-    this.isAllSelected()
-      ? this.selection.clear()
-      : this.courses.data.forEach(row => this.selection.select(row));
+    this.isAllSelected() ?
+    this.selection.clear() :
+    this.courses.data.forEach(row => this.selection.select(row));
   }
 
   onFilterChange(filterValue: string, field: string) {
@@ -284,8 +228,8 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
 
   resetSearch() {
     this.filter = {
-      gradeLevel: '',
-      subjectLevel: ''
+      'gradeLevel': '',
+      'subjectLevel': ''
     };
     this.titleSearch = '';
   }
@@ -293,7 +237,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   // Returns a space to fill the MatTable filter field so filtering runs for dropdowns when
   // search text is deleted, but does not run when there are no active filters.
   dropdownsFill() {
-    return Object.entries(this.filter).reduce((emptySpace, [field, val]) => {
+    return Object.entries(this.filter).reduce((emptySpace, [ field, val ]) => {
       if (val) {
         return ' ';
       }
@@ -302,21 +246,18 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   updateShelf(newShelf, message) {
-    this.couchService.put('shelf/' + this.userId, newShelf).subscribe(res => {
+    this.couchService.put('shelf/' + this.userId, newShelf).subscribe((res) => {
       newShelf._rev = res.rev;
       this.userService.setShelf(newShelf);
       this.setupList(this.courses.data, this.userShelf.courseIds);
       this.planetMessageService.showMessage(message);
       // Clear selection because setupList breaks Material Table selection
       this.selection.clear();
-    }, error => error);
+    }, (error) => (error));
   }
 
   courseResign(courseId) {
-    const userShelf: any = {
-      courseIds: [...this.userShelf.courseIds],
-      ...this.userShelf
-    };
+    const userShelf: any = { courseIds: [ ...this.userShelf.courseIds ], ...this.userShelf };
     const myCourseIndex = userShelf.courseIds.indexOf(courseId);
     userShelf.courseIds.splice(myCourseIndex, 1);
     this.updateShelf(userShelf, 'Course successfully resigned');
@@ -324,7 +265,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
 
   courseAdmission(courseId) {
     const userShelf: any = {
-      courseIds: [...this.userShelf.courseIds],
+      courseIds: [ ...this.userShelf.courseIds ],
       ...this.userShelf
     };
     userShelf.courseIds.push(courseId);
diff --git a/src/app/courses/courses.module.ts b/src/app/courses/courses.module.ts
index 5c827b089c..7e24f5c2c7 100644
--- a/src/app/courses/courses.module.ts
+++ b/src/app/courses/courses.module.ts
@@ -41,6 +41,8 @@ import { CoursesService as PouchDBCoursesService } from '../shared/services';
     ExamsQuestionComponent,
     ExamsViewComponent
   ],
-  providers: [CoursesService, PouchDBCoursesService]
+  providers: [
+    CoursesService, PouchDBCoursesService
+  ]
 })
 export class CoursesModule {}
diff --git a/src/app/courses/view-courses/courses-view.component.ts b/src/app/courses/view-courses/courses-view.component.ts
index 7b7d84b398..81ea96d176 100644
--- a/src/app/courses/view-courses/courses-view.component.ts
+++ b/src/app/courses/view-courses/courses-view.component.ts
@@ -8,8 +8,7 @@ import { CoursesService } from '../../shared/services';
 
 @Component({
   templateUrl: './courses-view.component.html',
-  styles: [
-    `
+  styles: [ `
   .view-container {
     display: grid;
     grid-template-columns: 1fr 1fr;
@@ -28,10 +27,10 @@ import { CoursesService } from '../../shared/services';
   .course-detail, .course-view {
     overflow: auto;
   }
-  `
-  ]
+  ` ]
 })
 export class CoursesViewComponent implements OnInit, OnDestroy {
+
   private onDestroy$: Subject<boolean> = new Subject<boolean>();
   courseDetail: any = {};
   parent = this.route.snapshot.data.parent;
@@ -40,7 +39,7 @@ export class CoursesViewComponent implements OnInit, OnDestroy {
     private router: Router,
     private route: ActivatedRoute,
     private courseService: CoursesService
-  ) {}
+  ) { }
 
   ngOnInit() {
     this.route.paramMap
@@ -60,7 +59,7 @@ export class CoursesViewComponent implements OnInit, OnDestroy {
   }
 
   viewStep() {
-    this.router.navigate(['./step/1'], { relativeTo: this.route });
+    this.router.navigate([ './step/1' ], { relativeTo: this.route });
   }
 
   goToExam(stepNum) {
diff --git a/src/app/login/login-form.component.ts b/src/app/login/login-form.component.ts
index f3b8c5ec95..acb2de9588 100644
--- a/src/app/login/login-form.component.ts
+++ b/src/app/login/login-form.component.ts
@@ -5,12 +5,7 @@ import { UserService } from '../shared/user.service';
 import { switchMap } from 'rxjs/operators';
 import { fromPromise } from 'rxjs/observable/fromPromise';
 import { forkJoin } from 'rxjs/observable/forkJoin';
-import {
-  FormControl,
-  FormGroup,
-  FormBuilder,
-  Validators
-} from '@angular/forms';
+import { FormControl, FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { CustomValidators } from '../validators/custom-validators';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { environment } from '../../environments/environment';
@@ -19,30 +14,24 @@ import { AuthService } from '../shared/services';
 
 const registerForm = {
   name: [],
-  password: [
-    '',
-    Validators.compose([
-      Validators.required,
-      CustomValidators.matchPassword('repeatPassword', false)
-    ])
-  ],
-  repeatPassword: [
-    '',
-    Validators.compose([
-      Validators.required,
-      CustomValidators.matchPassword('password', true)
-    ])
-  ]
+  password: [ '', Validators.compose([
+    Validators.required,
+    CustomValidators.matchPassword('repeatPassword', false)
+    ]) ],
+  repeatPassword: [ '', Validators.compose([
+    Validators.required,
+    CustomValidators.matchPassword('password', true)
+    ]) ]
 };
 
 const loginForm = {
-  name: ['', Validators.required],
-  password: ['', Validators.required]
+  name: [ '', Validators.required ],
+  password: [ '', Validators.required ]
 };
 
 @Component({
   templateUrl: './login-form.component.html',
-  styleUrls: ['./login.scss']
+  styleUrls: [ './login.scss' ]
 })
 export class LoginFormComponent {
   public userForm: FormGroup;
@@ -56,11 +45,8 @@ export class LoginFormComponent {
     private validatorService: ValidatorService,
     private authService: AuthService
   ) {
-    registerForm.name = [
-      '',
-      [Validators.required, Validators.pattern(/^[a-z0-9_.-]+$/i)],
-      ac => this.validatorService.isUnique$('_users', 'name', ac, {})
-    ];
+    registerForm.name = [ '', [ Validators.required, Validators.pattern(/^[a-z0-9_.-]+$/i) ],
+      ac => this.validatorService.isUnique$('_users', 'name', ac, {}) ];
     const formObj = this.createMode ? registerForm : loginForm;
     this.userForm = this.formBuilder.group(formObj);
   }
@@ -85,21 +71,19 @@ export class LoginFormComponent {
   welcomeNotification(userId) {
     const data = {
       user: userId,
-      message:
-        'Welcome ' +
-        userId.replace('org.couchdb.user:', '') +
-        ' to the Planet Learning',
+      message: 'Welcome ' + userId.replace('org.couchdb.user:', '') + ' to the Planet Learning',
       link: '',
       type: 'register',
       priority: 1,
       status: 'unread',
       time: Date.now()
     };
-    this.couchService.post('notifications', data).subscribe();
+    this.couchService.post('notifications', data)
+      .subscribe();
   }
 
   reRoute() {
-    return this.router.navigate([this.returnUrl]);
+    return this.router.navigate([ this.returnUrl ]);
   }
 
   createUser({ name, password }: { name: string; password: string }) {
@@ -142,14 +126,14 @@ export class LoginFormComponent {
         switchMap(data => {
           // Navigate into app
           if (isCreate) {
-            return fromPromise(this.router.navigate(['users/update/' + name]));
+            return fromPromise(this.router.navigate([ 'users/update/' + name ]));
           } else {
             return fromPromise(this.reRoute());
           }
         }),
         switchMap(routeSuccess => {
           // Post new session info to login_activity
-          const obsArr = [this.userService.newSessionLog()];
+          const obsArr = [ this.userService.newSessionLog() ];
           // If not in e2e test, also add session to parent domain
           if (
             !environment.test &&
diff --git a/src/app/shared/auth-guard.service.ts b/src/app/shared/auth-guard.service.ts
index 17e524bd48..9ba157bb87 100644
--- a/src/app/shared/auth-guard.service.ts
+++ b/src/app/shared/auth-guard.service.ts
@@ -6,15 +6,11 @@ import { of } from 'rxjs/observable/of';
 import { switchMap, map } from 'rxjs/operators';
 import { AuthService as PouchDBAuthService } from './services';
 
-import {
-  Router,
-  CanActivate,
-  ActivatedRouteSnapshot,
-  RouterStateSnapshot
-} from '@angular/router';
+import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 
 @Injectable()
 export class AuthService {
+
   constructor(
     private couchService: CouchService,
     private userService: UserService,
@@ -23,49 +19,38 @@ export class AuthService {
   ) {}
 
   private checkUser(url: any): Observable<boolean> {
-    return this.authService.getSessionInfo().pipe(
-      switchMap(res => {
+    return this.authService.getSessionInfo()
+      .pipe(switchMap(res => {
         if (res.userCtx.name) {
+          // If user already matches one on the user service, do not make additional call to CouchDB
           if (res.userCtx.name === this.userService.get().name) {
             return of(true);
           }
           return this.userService.setUserConfigAndShelf(res.userCtx);
         }
         this.userService.unset();
-        this.router.navigate(['/login'], {
-          queryParams: { returnUrl: url },
-          replaceUrl: true
-        });
+        this.router.navigate([ '/login' ], { queryParams: { returnUrl: url }, replaceUrl: true });
         return of(false);
       }),
-      map(isLoggedIn => {
+      map((isLoggedIn) => {
         return isLoggedIn;
-      })
-    );
+      }));
   }
 
   // For main app (which requires login).  Uses canActivateChild to check on every route
   // change if session has expired
-  canActivateChild(
-    route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot
-  ): Observable<boolean> {
+  canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
     return this.checkUser(state.url);
   }
 
   // For login route will redirect to main app if there is an active session
-  canActivate(
-    route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot
-  ): Observable<boolean> {
-    return this.authService.getSessionInfo().pipe(
-      map(res => {
-        if (res.userCtx.name) {
-          this.router.navigate(['']);
-          return false;
-        }
-        return true;
-      })
-    );
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
+    return this.authService.getSessionInfo().pipe(map(res => {
+      if (res.userCtx.name) {
+        this.router.navigate([ '' ]);
+        return false;
+      }
+      return true;
+    }));
   }
 }
diff --git a/src/app/shared/services/pouchDB/courses.service.ts b/src/app/shared/services/pouchDB/courses.service.ts
index b01766ab34..c6194f4c1d 100644
--- a/src/app/shared/services/pouchDB/courses.service.ts
+++ b/src/app/shared/services/pouchDB/courses.service.ts
@@ -43,7 +43,7 @@ export class CoursesService {
           kind: 'Course',
           createdAt: { $gte: null }
         },
-        sort: [{ kind: 'desc' }, { createdAt: 'desc' }]
+        sort: [ { kind: 'desc' }, { createdAt: 'desc' } ]
       })
     ).pipe(map((data: { docs: Course[] }) => data.docs));
   }
diff --git a/src/app/shared/services/pouchDB/index.ts b/src/app/shared/services/pouchDB/index.ts
index 484c551a8b..511c36d810 100644
--- a/src/app/shared/services/pouchDB/index.ts
+++ b/src/app/shared/services/pouchDB/index.ts
@@ -5,4 +5,4 @@ export { PouchDBService } from './pouchDB.service';
 export { AuthService } from './auth.service';
 export { CoursesService, Course } from './courses.service';
 
-export const SHARED_SERVICES = [PouchDBService, AuthService];
+export const SHARED_SERVICES = [ PouchDBService, AuthService ];
diff --git a/src/app/shared/services/pouchDB/pouchDB.service.ts b/src/app/shared/services/pouchDB/pouchDB.service.ts
index 9f93ba6831..601a3c0988 100644
--- a/src/app/shared/services/pouchDB/pouchDB.service.ts
+++ b/src/app/shared/services/pouchDB/pouchDB.service.ts
@@ -28,7 +28,7 @@ export class PouchDBService {
     // indexes the field for faster lookup
     this.localDB.createIndex({
       index: {
-        fields: ['kind', 'createdAt']
+        fields: [ 'kind', 'createdAt' ]
       }
     });
 
diff --git a/tsconfig.json b/tsconfig.json
index 146b8e994d..0c00a75d0a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,8 +9,13 @@
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
     "target": "es5",
-    "typeRoots": ["node_modules/@types"],
-    "lib": ["es2017", "dom"]
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
+    ]
   },
   "angularCompilerOptions": {
     "preserveWhitespaces": false

From 5b6d532f4d7cd1820702d48d3a350ab44965434c Mon Sep 17 00:00:00 2001
From: Paul <paul.r.albert@gmail.com>
Date: Mon, 21 May 2018 15:20:42 -0400
Subject: [PATCH 62/64] Remove superficial changes 2

---
 src/app/courses/courses.component.ts  |  23 ++----
 src/app/login/login-form.component.ts | 105 +++++++++-----------------
 2 files changed, 43 insertions(+), 85 deletions(-)

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index feaa788263..0caa9d3c5c 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -132,11 +132,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   deleteClick(course) {
-    this.openDeleteDialog(
-      this.deleteCourse(course),
-      'single',
-      course.courseTitle
-    );
+    this.openDeleteDialog(this.deleteCourse(course), 'single', course.courseTitle);
   }
 
   deleteSelected() {
@@ -173,13 +169,13 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
     return () => {
       const { _id: courseId, _rev: courseRev } = course;
       this.couchService.delete('courses/' + courseId + '?rev=' + courseRev)
-        .subscribe(data => {
+        .subscribe((data) => {
           // It's safer to remove the item from the array based on its id than to splice based on the index
           this.courses.data = this.courses.data.filter((c: any) => data.id !== c._id);
           this.deleteDialog.close();
           this.selection.clear();
           this.planetMessageService.showMessage('Course deleted: ' + course.courseTitle);
-        }, error => this.deleteDialog.componentInstance.message = 'There was a problem deleting this course.');
+        }, (error) => this.deleteDialog.componentInstance.message = 'There was a problem deleting this course.');
     };
   }
 
@@ -190,15 +186,13 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
       });
       this.couchService.post(this.dbName + '/_bulk_docs', { docs: deleteArray })
       .pipe(switchMap(data => {
-          return this.getCourses();
+        return this.getCourses();
       })).subscribe((data: any) => {
         this.setupList(data, this.userShelf.courseIds);
         this.selection.clear();
         this.deleteDialog.close();
-        this.planetMessageService.showMessage(
-          'You have deleted selected courses'
-        );
-      }, error => this.deleteDialog.componentInstance.message = 'There was a problem deleting courses.');
+        this.planetMessageService.showMessage('You have deleted selected courses');
+      }, (error) => this.deleteDialog.componentInstance.message = 'There was a problem deleting courses.');
     };
   }
 
@@ -264,10 +258,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   courseAdmission(courseId) {
-    const userShelf: any = {
-      courseIds: [ ...this.userShelf.courseIds ],
-      ...this.userShelf
-    };
+    const userShelf: any = { courseIds: [ ...this.userShelf.courseIds ], ...this.userShelf };
     userShelf.courseIds.push(courseId);
     this.updateShelf(userShelf, 'Course added to your dashboard');
   }
diff --git a/src/app/login/login-form.component.ts b/src/app/login/login-form.component.ts
index acb2de9588..84012c6fa6 100644
--- a/src/app/login/login-form.component.ts
+++ b/src/app/login/login-form.component.ts
@@ -70,13 +70,13 @@ export class LoginFormComponent {
 
   welcomeNotification(userId) {
     const data = {
-      user: userId,
-      message: 'Welcome ' + userId.replace('org.couchdb.user:', '') + ' to the Planet Learning',
-      link: '',
-      type: 'register',
-      priority: 1,
-      status: 'unread',
-      time: Date.now()
+      'user': userId,
+      'message': 'Welcome ' + userId.replace('org.couchdb.user:', '') + ' to the Planet Learning',
+      'link': '',
+      'type': 'register',
+      'priority': 1,
+      'status': 'unread',
+      'time': Date.now()
     };
     this.couchService.post('notifications', data)
       .subscribe();
@@ -94,71 +94,38 @@ export class LoginFormComponent {
       joinDate: Date.now()
     };
 
-    this.authService
-      .signupUser(name, password, opts)
-      .pipe(
-        switchMap(() => {
-          return this.couchService.put('shelf/org.couchdb.user:' + name, {});
-        })
-      )
-      .subscribe(
-        (response: any) => {
-          this.planetMessageService.showMessage(
-            'User created: ' + response.id.replace('org.couchdb.user:', '')
-          );
-          this.welcomeNotification(response.id);
-          this.login(this.userForm.value, true);
-        },
-        error =>
-          this.planetMessageService.showAlert(
-            'An error occurred please try again'
-          )
-      );
+    this.authService.signupUser(name, password, opts)
+    .pipe(switchMap(() => {
+      return this.couchService.put('shelf/org.couchdb.user:' + name, { });
+    }))
+    .subscribe((response: any) => {
+      this.planetMessageService.showMessage('User created: ' + response.id.replace('org.couchdb.user:', ''));
+      this.welcomeNotification(response.id);
+      this.login(this.userForm.value, true);
+    }, error => this.planetMessageService.showAlert('An error occurred please try again'));
   }
 
-  login(
-    { name, password }: { name: string; password: string },
-    isCreate: boolean
-  ) {
+  login({ name, password }: { name: string; password: string }, isCreate: boolean) {
     this.authService
       .login(name, password)
-      .pipe(
-        switchMap(data => {
-          // Navigate into app
-          if (isCreate) {
-            return fromPromise(this.router.navigate([ 'users/update/' + name ]));
-          } else {
-            return fromPromise(this.reRoute());
-          }
-        }),
-        switchMap(routeSuccess => {
-          // Post new session info to login_activity
-          const obsArr = [ this.userService.newSessionLog() ];
-          // If not in e2e test, also add session to parent domain
-          if (
-            !environment.test &&
-            this.userService.getConfig().name === name.toLowerCase()
-          ) {
-            obsArr.push(
-              this.couchService.post(
-                '_session',
-                { name: name.toLowerCase(), password: password },
-                {
-                  withCredentials: true,
-                  domain: this.userService.getConfig().parentDomain
-                }
-              )
-            );
-          }
-          return forkJoin(obsArr);
-        })
-      )
-      .subscribe(
-        res => {},
-        error =>
-          this.planetMessageService.showAlert(
-            'Username and/or password do not match'
-          )
-      );
+      .pipe(switchMap(data => {
+        // Navigate into app
+        if (isCreate) {
+          return fromPromise(this.router.navigate( [ 'users/update/' + name ]));
+        } else {
+          return fromPromise(this.reRoute());
+        }
+      }), switchMap(routeSuccess => {
+        // Post new session info to login_activity
+        const obsArr = [ this.userService.newSessionLog() ];
+        // If not in e2e test, also add session to parent domain
+        if (!environment.test && this.userService.getConfig().name === name.toLowerCase()) {
+          obsArr.push(this.couchService.post('_session', { name: name.toLowerCase(), password: password },
+            { withCredentials: true, domain: this.userService.getConfig().parentDomain });
+        }
+        return forkJoin(obsArr);
+      })).subscribe((res) => {
+
+      }, (error) => this.planetMessageService.showAlert('Username and/or password do not match'));
   }
 }

From c801c9f67e0362dab2a7d9908a0120f1875ee7e6 Mon Sep 17 00:00:00 2001
From: Lawrence Khadka <l.khadka@outlook.com>
Date: Tue, 22 May 2018 10:50:01 -0500
Subject: [PATCH 63/64] use void subject for consistency

---
 src/app/courses/courses.component.ts                   | 6 +++---
 src/app/courses/view-courses/courses-view.component.ts | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
index 0caa9d3c5c..9ecea0525b 100644
--- a/src/app/courses/courses.component.ts
+++ b/src/app/courses/courses.component.ts
@@ -55,7 +55,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
   userId = this.userService.get()._id;
   userShelf: any = [];
-  private onDestroy$ = new Subject<boolean>();
+  private onDestroy$ = new Subject<void>();
 
   constructor(
     private couchService: CouchService,
@@ -264,7 +264,7 @@ export class CoursesComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngOnDestroy() {
-    this.onDestroy$.next(true);
-    this.onDestroy$.unsubscribe();
+    this.onDestroy$.next();
+    this.onDestroy$.complete();
   }
 }
diff --git a/src/app/courses/view-courses/courses-view.component.ts b/src/app/courses/view-courses/courses-view.component.ts
index 81ea96d176..4f89d73ad6 100644
--- a/src/app/courses/view-courses/courses-view.component.ts
+++ b/src/app/courses/view-courses/courses-view.component.ts
@@ -31,7 +31,7 @@ import { CoursesService } from '../../shared/services';
 })
 export class CoursesViewComponent implements OnInit, OnDestroy {
 
-  private onDestroy$: Subject<boolean> = new Subject<boolean>();
+  private onDestroy$ = new Subject<void>();
   courseDetail: any = {};
   parent = this.route.snapshot.data.parent;
 
@@ -54,8 +54,8 @@ export class CoursesViewComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy() {
-    this.onDestroy$.next(true);
-    this.onDestroy$.unsubscribe();
+    this.onDestroy$.next();
+    this.onDestroy$.complete();
   }
 
   viewStep() {

From 0c4a45dec1b29ef5f127cb35e0db25cefe805c1d Mon Sep 17 00:00:00 2001
From: augusts7 <dahal_augus@hotmail.com>
Date: Fri, 25 May 2018 19:33:22 -0500
Subject: [PATCH 64/64] fix brackets

---
 src/app/login/login-form.component.ts | 160 +++++++++++++++++---------
 1 file changed, 104 insertions(+), 56 deletions(-)

diff --git a/src/app/login/login-form.component.ts b/src/app/login/login-form.component.ts
index 84012c6fa6..5783e15b3d 100644
--- a/src/app/login/login-form.component.ts
+++ b/src/app/login/login-form.component.ts
@@ -5,7 +5,12 @@ import { UserService } from '../shared/user.service';
 import { switchMap } from 'rxjs/operators';
 import { fromPromise } from 'rxjs/observable/fromPromise';
 import { forkJoin } from 'rxjs/observable/forkJoin';
-import { FormControl, FormGroup, FormBuilder, Validators } from '@angular/forms';
+import {
+  FormControl,
+  FormGroup,
+  FormBuilder,
+  Validators
+} from '@angular/forms';
 import { CustomValidators } from '../validators/custom-validators';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { environment } from '../../environments/environment';
@@ -14,24 +19,30 @@ import { AuthService } from '../shared/services';
 
 const registerForm = {
   name: [],
-  password: [ '', Validators.compose([
-    Validators.required,
-    CustomValidators.matchPassword('repeatPassword', false)
-    ]) ],
-  repeatPassword: [ '', Validators.compose([
-    Validators.required,
-    CustomValidators.matchPassword('password', true)
-    ]) ]
+  password: [
+    '',
+    Validators.compose([
+      Validators.required,
+      CustomValidators.matchPassword('repeatPassword', false)
+    ])
+  ],
+  repeatPassword: [
+    '',
+    Validators.compose([
+      Validators.required,
+      CustomValidators.matchPassword('password', true)
+    ])
+  ]
 };
 
 const loginForm = {
-  name: [ '', Validators.required ],
-  password: [ '', Validators.required ]
+  name: [''", Validators.required ],
+  password:'' "", Validators.required ]
 };
 
 @Component({
-  templateUrl: './login-form.component.html',
-  styleUrls: [ './login.scss' ]
+  templateU'./login-form.component.html'tml",
+  styleUrl'./login.scss'scss" ]
 })
 export class LoginFormComponent {
   public userForm: FormGroup;
@@ -45,14 +56,17 @@ export class LoginFormComponent {
     private validatorService: ValidatorService,
     private authService: AuthService
   ) {
-    registerForm.name = [ '', [ Validators.required, Validators.pattern(/^[a-z0-9_.-]+$/i) ],
-      ac => this.validatorService.isUnique$('_users', 'name', ac, {}) ];
+    registerForm.name = [
+''    "",
+      [ Validators.required, Validators.pattern(/^[a-z0-9_.-]+$/i) ],
+      ac => this.validatorService.is'_users'"_'name', "name", ac, {})
+    ];
     const formObj = this.createMode ? registerForm : loginForm;
     this.userForm = this.formBuilder.group(formObj);
   }
 
-  createMode: boolean = this.router.url.split('?')[0] === '/login/newuser';
-  returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/';
+  createMode: boolean = this.router.ur'?'plit("?")'/login/newuser'newuser";
+  returnUrl = this.route.snapshot.quer'returnUrl'turnU'/'] || "/";
 
   onSubmit() {
     if (this.userForm.valid) {
@@ -70,16 +84,18 @@ export class LoginFormComponent {
 
   welcomeNotification(userId) {
     const data = {
-      'user': userId,
-      'message': 'Welcome ' + userId.replace('org.couchdb.user:', '') + ' to the Planet Learning',
-      'link': '',
-      'type': 'register',
-      'priority': 1,
-      'status': 'unread',
-      'time': Date.now()
+      user: userId,
+      message:
+'Welcome 'elcome " +
+        userId.'org.couchdb.user:'b.''er:", "") +
+' to the Planet Learning'earning",
+    ''link: "",
+    'register'egister",
+      priority: 1,
+      'unread'"unread",
+      time: Date.now()
     };
-    this.couchService.post('notifications', data)
-      .subscribe();
+    this.couchServi'notifications'cations", data).subscribe();
   }
 
   reRoute() {
@@ -89,43 +105,75 @@ export class LoginFormComponent {
   createUser({ name, password }: { name: string; password: string }) {
     const opts = {
       roles: [],
-      type: 'user',
+  'user'pe: "user",
       isUserAdmin: false,
       joinDate: Date.now()
     };
 
-    this.authService.signupUser(name, password, opts)
-    .pipe(switchMap(() => {
-      return this.couchService.put('shelf/org.couchdb.user:' + name, { });
-    }))
-    .subscribe((response: any) => {
-      this.planetMessageService.showMessage('User created: ' + response.id.replace('org.couchdb.user:', ''));
-      this.welcomeNotification(response.id);
-      this.login(this.userForm.value, true);
-    }, error => this.planetMessageService.showAlert('An error occurred please try again'));
+    this.authService
+      .signupUser(name, password, opts)
+      .pipe(
+        switchMap(() => {
+          return this.couchSe'shelf/org.couchdb.user:'hdb.user:" + name, {});
+        })
+      )
+      .subscribe(
+        (response: any) => {
+          this.planetMessageService.showMessage(
+  'User created: 'created: " + response.i'org.couchdb.user:'hd''user:", "")
+          );
+          this.welcomeNotification(response.id);
+          this.login(this.userForm.value, true);
+        },
+        error =>
+          this.planetMessageService.showAlert(
+  'An error occurred please try again'try again"
+          )
+      );
   }
 
-  login({ name, password }: { name: string; password: string }, isCreate: boolean) {
+  login(
+    { name, password }: { name: string; password: string },
+    isCreate: boolean
+  ) {
     this.authService
       .login(name, password)
-      .pipe(switchMap(data => {
-        // Navigate into app
-        if (isCreate) {
-          return fromPromise(this.router.navigate( [ 'users/update/' + name ]));
-        } else {
-          return fromPromise(this.reRoute());
-        }
-      }), switchMap(routeSuccess => {
-        // Post new session info to login_activity
-        const obsArr = [ this.userService.newSessionLog() ];
-        // If not in e2e test, also add session to parent domain
-        if (!environment.test && this.userService.getConfig().name === name.toLowerCase()) {
-          obsArr.push(this.couchService.post('_session', { name: name.toLowerCase(), password: password },
-            { withCredentials: true, domain: this.userService.getConfig().parentDomain });
-        }
-        return forkJoin(obsArr);
-      })).subscribe((res) => {
-
-      }, (error) => this.planetMessageService.showAlert('Username and/or password do not match'));
+      .pipe(
+        switchMap(data => {
+          // Navigate into app
+          if (isCreate) {
+            return fromPromise(this.router.'users/update/'rs/update/" + name ]));
+          } else {
+            return fromPromise(this.reRoute());
+          }
+        }),
+        switchMap(routeSuccess => {
+          // Post new session info to login_activity
+          const obsArr = [ this.userService.newSessionLog() ];
+          // If not in e2e test, also add session to parent domain
+          if (
+            !environment.test &&
+            this.userService.getConfig().name === name.toLowerCase()
+          ) {
+            obsArr.push(
+              this.couchService.post(
+  '_session'    "_session",
+                { name: name.toLowerCase(), password: password },
+                {
+                  withCredentials: true,
+                  domain: this.userService.getConfig().parentDomain
+                }
+              )
+            );
+          }
+          return forkJoin(obsArr);
+        })
+      )
+      .subscribe(
+        res => {},
+        error =>
+          this.planetMessageService.showAlert('Username and/or password do not match' do not match"
+          )
+      );
   }
 }