Merge pull request trungvose#47 from trungk18/phase1-bugs-fixing

Phase1 bugs fixing

Author: trungvose

backend/package-lock.json

@@ -19,10 +19,10 @@ export class ProjectGuard implements CanActivate {
   }
 
   getFromStoreOrApi(): Observable<ProjectState> {
-    return combineLatest([this._projectQuery.all$, this._projectQuery.isLoading$]).pipe(      
-      map(([state, loading]) => {       
+    return combineLatest([this._projectQuery.all$, this._projectQuery.isLoading$]).pipe(
+      map(([state, loading]) => {
         if (!loading) {
-          this._projectService.getProject().subscribe();
+          this._projectService.getProject();
         }
         return state;
       }),

frontend/package-lock.json

@@ -24,9 +24,9 @@ export class ProjectService {
     this._store.setLoading(isLoading);
   }
 
-  getProject(): Subscription {
+  getProject() {
     this.setLoading(true);
-    return this._http
+    this._http
       .get<JProject>(`${this.baseUrl}/project`)
       .pipe(
         map((project) => {

frontend/src/app/project/project.guard.ts

@@ -11,7 +11,8 @@
     "start:back": "npm run install-dependencies-back && cd backend && npm run start:dev",
     "build:back": "cd backend && npm run build",
     "build": "npm run install-dependencies && npm run build:back && npm run build:front",
-    "heroku-postbuild": "npm run install-dependencies-back && npm run build:back"
+    "heroku-postbuild": "npm run install-dependencies-back && npm run build:back",
+    "netlify-build": "npm run install-dependencies-front && npm run build:front"
   },
   "repository": {
     "type": "git",