From 4f99b27524518dab63fe834205b2b2645dc04a3c Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Fri, 15 Apr 2016 11:58:26 -0400
Subject: [PATCH 01/30] Add spot to inject service-level and global headers.

---
 front/current/services/rest.service.ts | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/front/current/services/rest.service.ts b/front/current/services/rest.service.ts
index 68db133..d8d3a06 100644
--- a/front/current/services/rest.service.ts
+++ b/front/current/services/rest.service.ts
@@ -6,6 +6,7 @@ import { config } from '../config';
 import { extend } from '../lib/object';
 import { param } from '../lib/url';
 
+
 export class Model {
   constructor(
       public service:any,
@@ -32,7 +33,10 @@ export class Model {
     return this;
   };
 
-  get url(): string {
+  get headers():any {
+    return config.HEADERS;
+  };
+  get url():string {
     return (
       this.service.config.url +
       this.service.url +
@@ -52,7 +56,7 @@ export class Model {
     let self = this;
     self.loading = true;
     self.error = undefined;
-    return (self._http.get(self.url, {headers: config.HEADERS})
+    return (self._http.get(self.url, {headers: self.headers})
       .do(self.parse.bind(self), self.setError.bind(self), () => { self.loading = false; })
       .subscribe(observer));
   };
@@ -66,14 +70,14 @@ export class Model {
       self._http[method](
         self.url,
         JSON.stringify(self.data),
-        {headers: config.HEADERS}
+        {headers: self.headers}
       )
       .do(self.parse.bind(self), self.setError.bind(self), () => { self.loading = false; })
       .subscribe(observer));
   };
   destroy():Observable<Response> {
     // Delete a model on the server.
-    return this._http.delete(this.url, {headers: config.HEADERS});
+    return this._http.delete(this.url, {headers: this.headers});
   };
 };
 
@@ -111,7 +115,10 @@ export class Collection {
     return this;
   };
 
-  public get url(): string {
+  get headers():any {
+    return config.HEADERS;
+  };
+  get url():string {
     return this.service.config.url + this.service.url + param(this.filters);
   };
 
@@ -127,7 +134,7 @@ export class Collection {
     let self = this;
     self.loading = true;
     self.error = undefined;
-    return (self._http.get(self.url, {headers: config.HEADERS})
+    return (self._http.get(self.url, {headers: self.headers})
       .do(self.parse.bind(self), self.setError.bind(self), () => { self.loading = false; })
       .subscribe(observer));
   };
-- 
GitLab


From a4fe0598c10fecdbdf240507ec67ea313c90f50c Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Fri, 15 Apr 2016 13:04:45 -0400
Subject: [PATCH 02/30] Refactor config to allow monkey-patching in new
 headers.

---
 config/dev.config.ts                   |  6 ++----
 config/production.config.ts            |  6 ++----
 config/staging.config.ts               |  6 ++----
 front/current/services/rest.service.ts | 10 +++++++---
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/config/dev.config.ts b/config/dev.config.ts
index 781445d..6aa061a 100644
--- a/config/dev.config.ts
+++ b/config/dev.config.ts
@@ -1,13 +1,11 @@
-import { Headers } from 'angular2/http';
-
 export class config {
   public static SERVICES:any = {
     "user": {"url": "http://127.0.0.1:5600"},
     "project": {"url": "http://127.0.0.1:5310"},
     "document": {"url": "http://127.0.0.1:5320"}
   };
-  public static HEADERS = new Headers({
+  public static HEADERS:any = {
     'x-blocpower-app-key': '$APP_KEY'
-  });
+  };
   public static static_url:string = '/current';
 };
diff --git a/config/production.config.ts b/config/production.config.ts
index 9e99a36..87748e9 100644
--- a/config/production.config.ts
+++ b/config/production.config.ts
@@ -1,13 +1,11 @@
-import { Headers } from 'angular2/http';
-
 export class config {
   public static SERVICES:any = {
     "user": {"url": "http://user.s.blocpower.us"},
     "project": {"url": "http://project.s.blocpower.us"},
     "document": {"url": "http://document.s.blocpower.us"}
   };
-  public static HEADERS = new Headers({
+  public static HEADERS = {
     'x-blocpower-app-key': '$APP_KEY'
-  });
+  };
   public static static_url:string = '$CURRENT';
 };
diff --git a/config/staging.config.ts b/config/staging.config.ts
index d8a54a4..0754322 100644
--- a/config/staging.config.ts
+++ b/config/staging.config.ts
@@ -1,13 +1,11 @@
-import { Headers } from 'angular2/http';
-
 export class config {
   public static SERVICES:any = {
     "user": {"url": "http://staging.user.s.blocpower.us"},
     "project": {"url": "http://staging.project.s.blocpower.us"},
     "document": {"url": "http://staging.document.s.blocpower.us"}
   };
-  public static HEADERS = new Headers({
+  public static HEADERS = {
     'x-blocpower-app-key': '$APP_KEY'
-  });
+  };
   public static static_url:string = '$CURRENT';
 };
diff --git a/front/current/services/rest.service.ts b/front/current/services/rest.service.ts
index d8d3a06..5cd9dfe 100644
--- a/front/current/services/rest.service.ts
+++ b/front/current/services/rest.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from 'angular2/core';
-import { Http, Response, URLSearchParams } from 'angular2/http';
+import { Http, Response, Headers } from 'angular2/http';
 import { Observable } from 'rxjs/Observable';
 
 import { config } from '../config';
@@ -34,7 +34,8 @@ export class Model {
   };
 
   get headers():any {
-    return config.HEADERS;
+    let headers = extend({}, config.HEADERS);
+    return new Headers(headers);
   };
   get url():string {
     return (
@@ -45,6 +46,7 @@ export class Model {
   };
 
   parse(response:Response):Model {
+    // Update the model and metadata from the response.
     return this.set(response.json().data);
   };
   setError(response:Response) {
@@ -116,13 +118,15 @@ export class Collection {
   };
 
   get headers():any {
-    return config.HEADERS;
+    let headers = extend({}, config.HEADERS);
+    return new Headers(headers);
   };
   get url():string {
     return this.service.config.url + this.service.url + param(this.filters);
   };
 
   parse(response:Response):Collection {
+    // Update the collection and metadata from the response.
     return this.set(response.json().data);
   };
   setError(response:Response) {
-- 
GitLab


From becd1cb11839133cf4b39af7c90003d65057efaf Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Fri, 15 Apr 2016 14:15:52 -0400
Subject: [PATCH 03/30] Add a wrapper for local storage.

---
 front/current/lib/cache.ts | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 front/current/lib/cache.ts

diff --git a/front/current/lib/cache.ts b/front/current/lib/cache.ts
new file mode 100644
index 0000000..9398b17
--- /dev/null
+++ b/front/current/lib/cache.ts
@@ -0,0 +1,27 @@
+import { extend } from './object';
+
+
+class Cache {
+  // A wrapper around local storage.
+  public get(key:string):any {
+    return localStorage.getItem(key);
+  };
+  public set(key:string, value:any):any {
+    return localStorage.setItem(key, value);
+  };
+
+  public getObject(key:string):any {
+    // JSON.parse's an object from local storage.
+    return JSON.parse(this.get(key)) || {};
+  };
+  public setObject(key:string, value:any):any {
+    // JSON.stringify's an object into local storage.
+    return this.set(key, JSON.stringify(value));
+  };
+  public updateObject(key:string, value:any):any {
+    // Update an object in local storage.
+    let object = this.getObject(key) || {};
+    return this.setObject(key, extend(object, value));
+  };
+};
+export default new Cache();
-- 
GitLab


From 3f1a7a1b3c6df23a0e529d993a8fae619a523a11 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Fri, 15 Apr 2016 14:16:10 -0400
Subject: [PATCH 04/30] Send the app token on subsequent requests to the same
 service.

---
 .../services/document/document.service.ts     |  1 +
 .../services/project/document-slot.service.ts |  1 +
 .../services/project/project.service.ts       |  1 +
 front/current/services/rest.service.ts        | 25 ++++++++++++++++++-
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/front/current/services/document/document.service.ts b/front/current/services/document/document.service.ts
index 3850b18..524591c 100644
--- a/front/current/services/document/document.service.ts
+++ b/front/current/services/document/document.service.ts
@@ -3,6 +3,7 @@ import { config } from '../../config';
 
 @Injectable()
 export class DocumentService {
+  public service_name:string = 'document';
   public config:any = config.SERVICES.document;
   public url:string = '/document/';
 };
diff --git a/front/current/services/project/document-slot.service.ts b/front/current/services/project/document-slot.service.ts
index 8f0960f..960d1f5 100644
--- a/front/current/services/project/document-slot.service.ts
+++ b/front/current/services/project/document-slot.service.ts
@@ -3,6 +3,7 @@ import { config } from '../../config';
 
 @Injectable()
 export class DocumentSlotService {
+  public service_name:string = 'project';
   public config:any = config.SERVICES.project;
   public url:string = '/project/document/';
 };
diff --git a/front/current/services/project/project.service.ts b/front/current/services/project/project.service.ts
index d41e5b7..66586fb 100644
--- a/front/current/services/project/project.service.ts
+++ b/front/current/services/project/project.service.ts
@@ -3,6 +3,7 @@ import { config } from '../../config';
 
 @Injectable()
 export class ProjectService {
+  public service_name:string = 'project';
   public config:any = config.SERVICES.project;
   public url:string = '/project/';
 };
diff --git a/front/current/services/rest.service.ts b/front/current/services/rest.service.ts
index 5cd9dfe..1ceb042 100644
--- a/front/current/services/rest.service.ts
+++ b/front/current/services/rest.service.ts
@@ -4,6 +4,7 @@ import { Observable } from 'rxjs/Observable';
 
 import { config } from '../config';
 import { extend } from '../lib/object';
+import cache from '../lib/cache';
 import { param } from '../lib/url';
 
 
@@ -35,6 +36,11 @@ export class Model {
 
   get headers():any {
     let headers = extend({}, config.HEADERS);
+
+    let token = cache.getObject('app_tokens')[this.service.service_name];
+    if (token)
+      headers['x-blocpower-app-token'] = token;
+
     return new Headers(headers);
   };
   get url():string {
@@ -47,6 +53,12 @@ export class Model {
 
   parse(response:Response):Model {
     // Update the model and metadata from the response.
+
+    // Set the app token in the cache.
+    let app_tokens = cache.getObject('app_tokens');
+    app_tokens[this.service.service_name] = response.headers.get('x-blocpower-app-token');
+    cache.setObject('app_tokens', app_tokens);
+
     return this.set(response.json().data);
   };
   setError(response:Response) {
@@ -119,6 +131,11 @@ export class Collection {
 
   get headers():any {
     let headers = extend({}, config.HEADERS);
+
+    let token = cache.getObject('app_tokens')[this.service.service_name];
+    if (token)
+      headers['x-blocpower-app-token'] = token;
+
     return new Headers(headers);
   };
   get url():string {
@@ -126,7 +143,13 @@ export class Collection {
   };
 
   parse(response:Response):Collection {
-    // Update the collection and metadata from the response.
+    // Update the model and metadata from the response.
+
+    // Set the app token in the cache.
+    let app_tokens = cache.getObject('app_tokens');
+    app_tokens[this.service.service_name] = response.headers.get('x-blocpower-app-token');
+    cache.setObject('app_tokens', app_tokens);
+
     return this.set(response.json().data);
   };
   setError(response:Response) {
-- 
GitLab


From a3758972563a6ba58a4d4080f15a9fd80169a868 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Fri, 15 Apr 2016 16:42:55 -0400
Subject: [PATCH 05/30] Add googleapis dependency.

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

diff --git a/front/package.json b/front/package.json
index 21cb01b..9129149 100644
--- a/front/package.json
+++ b/front/package.json
@@ -16,6 +16,7 @@
     "config-json": "^1.0.0",
     "es6-promise": "^3.0.2",
     "es6-shim": "^0.33.3",
+    "googleapis": "^5.0.0",
     "node-sass": "^3.4.2",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.2",
-- 
GitLab


From 465e6235e94a95d9ba303c2911cc8a669545a2de Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Mon, 25 Apr 2016 12:27:35 -0400
Subject: [PATCH 06/30] Add google platform API to the index.

---
 front/index.default.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/front/index.default.html b/front/index.default.html
index a5c6978..9280e52 100644
--- a/front/index.default.html
+++ b/front/index.default.html
@@ -21,6 +21,8 @@
     <script src="node_modules/angular2/bundles/router.dev.js"></script>
     <script src="node_modules/angular2/bundles/http.dev.js"></script>
 
+    <script src="//apis.google.com/js/platform.js" async defer></script>
+
     <!-- SystemJS -->
     <script>
       System.config({
-- 
GitLab


From 4e52a017fda04a3ebaedae222794d69d5d5d767b Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Mon, 25 Apr 2016 12:27:45 -0400
Subject: [PATCH 07/30] Add a google auth service.

---
 front/current/services/google.service.ts | 39 ++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 front/current/services/google.service.ts

diff --git a/front/current/services/google.service.ts b/front/current/services/google.service.ts
new file mode 100644
index 0000000..4fd0df0
--- /dev/null
+++ b/front/current/services/google.service.ts
@@ -0,0 +1,39 @@
+import { Injectable } from 'angular2/core';
+import { config } from '../config';
+
+
+declare var gapi:any;
+
+@Injectable()
+export class GoogleAuthService {
+  public auth2:any;
+  public user:any; // Google user, not blocpower user.
+
+  constructor() {
+    let self = this;
+    gapi.load('auth2', function() {
+      let auth2 = self.auth2 = gapi.auth2.init({
+        client_id: config.google_client_id
+      });
+
+      auth2.currentUser.listen(self.change.bind(self)); // User change
+
+      // Sign in the user if they are already signed in.
+      if (auth2.isSignedIn.get() == true)
+        auth2.signIn();
+
+      self.change(auth2.currentUser.get());
+
+      gapi.signin2.render('google-login', {
+        'scope': 'email',
+        'width': 50,
+        'height': 50,
+        'longtitle': false
+      });
+    });
+  };
+
+  public change(user:any) {
+    this.user = user;
+  };
+};
-- 
GitLab


From b4998a3c8775684641323491d9a4709eff126650 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Mon, 25 Apr 2016 12:28:06 -0400
Subject: [PATCH 08/30] Use flexbox styling for the nav component.

---
 .../current/assets/styles/components/_nav.scss  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/front/current/assets/styles/components/_nav.scss b/front/current/assets/styles/components/_nav.scss
index d4d220e..c1906cb 100644
--- a/front/current/assets/styles/components/_nav.scss
+++ b/front/current/assets/styles/components/_nav.scss
@@ -6,14 +6,19 @@ nav.vertical {
 
   ul {
     margin: 0;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
 
     li {
-      display: block;
       list-style: none;
+      flex-basis: 50px;
+      line-height: 50px;
+      vertical-align: middle;
+      text-align: center;
+      height: 50px;
 
       a {
-        display: block;
-        padding: 14px;
         color: inherit;
         &:visited {
           color: inherit;
@@ -25,15 +30,19 @@ nav.vertical {
           color: inherit;
         }
         &.logo {
-          padding: 7px;
           img {
             width: 35px;
+            margin: 7px;
           }
         }
       }
       &.current {
         background: $white;
       }
+      &.spacer {
+        flex-grow: 1;
+        flex-basis: auto;
+      }
     }
   }
 }
-- 
GitLab


From bc4d1b6701343a6f29cf5dfa8696021b1d2a7062 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Mon, 25 Apr 2016 12:28:13 -0400
Subject: [PATCH 09/30] Add simple google signin.

---
 front/current/components/app/app.component.html |  3 ++-
 front/current/components/app/app.component.ts   |  9 +++++++--
 front/current/components/nav/nav.component.html | 14 +++++++++-----
 front/current/components/nav/nav.component.ts   |  6 ++++++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/front/current/components/app/app.component.html b/front/current/components/app/app.component.html
index 70ccb89..bc1abd7 100644
--- a/front/current/components/app/app.component.html
+++ b/front/current/components/app/app.component.html
@@ -1,2 +1,3 @@
 <navigation-bar></navigation-bar>
-<router-outlet></router-outlet>
+<router-outlet *ngIf="googleAuthService.user"></router-outlet>
+<div *ngIf="!googleAuthService.user">Please sign in.</div>
diff --git a/front/current/components/app/app.component.ts b/front/current/components/app/app.component.ts
index 5db938c..d364762 100644
--- a/front/current/components/app/app.component.ts
+++ b/front/current/components/app/app.component.ts
@@ -1,5 +1,4 @@
 import { Component } from 'angular2/core';
-
 import { RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS } from 'angular2/router';
 
 import { config } from '../../config';
@@ -12,6 +11,8 @@ import { ContactMethodService } from '../../services/project/contact-method.serv
 import { DocumentSlotService } from '../../services/project/document-slot.service';
 import { DocumentService } from '../../services/document/document.service';
 
+import { GoogleAuthService } from '../../services/google.service';
+
 import { NavComponent } from '../nav/nav.component';
 import { ProjectListComponent } from '../projects/list.component';
 import { ProjectDetailComponent } from '../project/detail.component'
@@ -25,7 +26,8 @@ import { ProjectDetailComponent } from '../project/detail.component'
     RestService,
     ProjectService, AddressService, ContactService, ContactMethodService,
     DocumentSlotService,
-    DocumentService
+    DocumentService,
+    GoogleAuthService
   ],
   directives: [ROUTER_DIRECTIVES, NavComponent]
 })
@@ -43,5 +45,8 @@ import { ProjectDetailComponent } from '../project/detail.component'
   }
 ])
 export class AppComponent {
+  constructor(
+      public googleAuthService:GoogleAuthService
+    ) {};
   public title:string = 'Project Dashboard';
 }
diff --git a/front/current/components/nav/nav.component.html b/front/current/components/nav/nav.component.html
index 164369f..6ff0fa1 100644
--- a/front/current/components/nav/nav.component.html
+++ b/front/current/components/nav/nav.component.html
@@ -1,12 +1,12 @@
 <nav class="vertical">
   <ul>
-    <li>
-      <a class="logo" href="/">
-        <img
+    <li><!--
+      --><a class="logo" href="/"><!--
+        --><img
           alt="BlocPower"
           src="{{ config.static_url }}/assets/images/logo.png"><!--
-      --></a>
-    </li>
+      --></a><!--
+    --></li>
     <li>
       <a>
         <i class="icon-gauge"></i>
@@ -17,5 +17,9 @@
         <i class="icon-list"></i>
       </a>
     </li>
+    <li class="spacer"></li>
+    <li>
+      <div id="google-login"></div>
+    </li>
   </ul>
 </nav>
diff --git a/front/current/components/nav/nav.component.ts b/front/current/components/nav/nav.component.ts
index 8e57ad5..479ce1f 100644
--- a/front/current/components/nav/nav.component.ts
+++ b/front/current/components/nav/nav.component.ts
@@ -1,6 +1,8 @@
 import { Component } from 'angular2/core';
 import { ROUTER_DIRECTIVES } from 'angular2/router';
+
 import { config } from '../../config';
+import { GoogleAuthService } from '../../services/google.service';
 
 
 @Component({
@@ -9,5 +11,9 @@ import { config } from '../../config';
   directives: [ROUTER_DIRECTIVES]
 })
 export class NavComponent {
+  constructor(
+      public googleAuthService:GoogleAuthService
+    ) {};
+
   public config:any = config;
 };
-- 
GitLab


From c47d294c96323dcddd14cdd4b46be9666258a526 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Mon, 25 Apr 2016 12:41:15 -0400
Subject: [PATCH 10/30] Reimplement google auth service as a singleton.

---
 front/current/components/app/app.component.html          | 4 ++--
 front/current/components/app/app.component.ts            | 9 +++------
 front/current/components/nav/nav.component.ts            | 6 +-----
 front/current/components/project/detail.component.ts     | 5 ++++-
 front/current/components/projects/list.component.ts      | 5 ++++-
 .../{services/google.service.ts => lib/google.ts}        | 6 ++----
 6 files changed, 16 insertions(+), 19 deletions(-)
 rename front/current/{services/google.service.ts => lib/google.ts} (89%)

diff --git a/front/current/components/app/app.component.html b/front/current/components/app/app.component.html
index bc1abd7..95459c7 100644
--- a/front/current/components/app/app.component.html
+++ b/front/current/components/app/app.component.html
@@ -1,3 +1,3 @@
 <navigation-bar></navigation-bar>
-<router-outlet *ngIf="googleAuthService.user"></router-outlet>
-<div *ngIf="!googleAuthService.user">Please sign in.</div>
+<div *ngIf="!googleAuth.user">Please sign in.</div>
+<router-outlet></router-outlet>
diff --git a/front/current/components/app/app.component.ts b/front/current/components/app/app.component.ts
index d364762..20c99b1 100644
--- a/front/current/components/app/app.component.ts
+++ b/front/current/components/app/app.component.ts
@@ -11,7 +11,7 @@ import { ContactMethodService } from '../../services/project/contact-method.serv
 import { DocumentSlotService } from '../../services/project/document-slot.service';
 import { DocumentService } from '../../services/document/document.service';
 
-import { GoogleAuthService } from '../../services/google.service';
+import googleAuth from '../../lib/google';
 
 import { NavComponent } from '../nav/nav.component';
 import { ProjectListComponent } from '../projects/list.component';
@@ -26,8 +26,7 @@ import { ProjectDetailComponent } from '../project/detail.component'
     RestService,
     ProjectService, AddressService, ContactService, ContactMethodService,
     DocumentSlotService,
-    DocumentService,
-    GoogleAuthService
+    DocumentService
   ],
   directives: [ROUTER_DIRECTIVES, NavComponent]
 })
@@ -45,8 +44,6 @@ import { ProjectDetailComponent } from '../project/detail.component'
   }
 ])
 export class AppComponent {
-  constructor(
-      public googleAuthService:GoogleAuthService
-    ) {};
+  public googleAuth = googleAuth;
   public title:string = 'Project Dashboard';
 }
diff --git a/front/current/components/nav/nav.component.ts b/front/current/components/nav/nav.component.ts
index 479ce1f..5c2cc6e 100644
--- a/front/current/components/nav/nav.component.ts
+++ b/front/current/components/nav/nav.component.ts
@@ -1,8 +1,6 @@
 import { Component } from 'angular2/core';
 import { ROUTER_DIRECTIVES } from 'angular2/router';
-
 import { config } from '../../config';
-import { GoogleAuthService } from '../../services/google.service';
 
 
 @Component({
@@ -11,9 +9,7 @@ import { GoogleAuthService } from '../../services/google.service';
   directives: [ROUTER_DIRECTIVES]
 })
 export class NavComponent {
-  constructor(
-      public googleAuthService:GoogleAuthService
-    ) {};
+  constructor() {};
 
   public config:any = config;
 };
diff --git a/front/current/components/project/detail.component.ts b/front/current/components/project/detail.component.ts
index c2c0812..06a30c0 100644
--- a/front/current/components/project/detail.component.ts
+++ b/front/current/components/project/detail.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from 'angular2/core';
-import { RouteParams, ROUTER_DIRECTIVES } from 'angular2/router';
+import { CanActivate, RouteParams, ROUTER_DIRECTIVES } from 'angular2/router';
 
 import { config } from '../../config';
 
@@ -11,6 +11,8 @@ import { ContactMethodService } from '../../services/project/contact-method.serv
 import { DocumentSlotService } from '../../services/project/document-slot.service';
 import { DocumentService } from '../../services/document/document.service';
 
+import googleAuth from '../../lib/google';
+
 import { AddressComponent } from './address.component';
 import { ContactsComponent } from './contacts.component';
 import { SlotsComponent } from './slots.component';
@@ -21,6 +23,7 @@ import { SlotsComponent } from './slots.component';
   templateUrl: config.static_url + '/components/project/detail.component.html',
   directives: [ROUTER_DIRECTIVES, AddressComponent, ContactsComponent, SlotsComponent]
 })
+@CanActivate(() => { return googleAuth.user; })
 export class ProjectDetailComponent implements OnInit {
   constructor(
       private _routeParams:RouteParams,
diff --git a/front/current/components/projects/list.component.ts b/front/current/components/projects/list.component.ts
index 92780f7..90d1e8c 100644
--- a/front/current/components/projects/list.component.ts
+++ b/front/current/components/projects/list.component.ts
@@ -1,16 +1,19 @@
 import { Component, OnInit } from 'angular2/core';
-import { ROUTER_DIRECTIVES } from 'angular2/router';
+import { CanActivate, ROUTER_DIRECTIVES } from 'angular2/router';
 import { Control } from 'angular2/common';
 
 import { config } from '../../config';
 import { RestService, Model, Collection } from '../../services/rest.service';
 import { ProjectService } from '../../services/project/project.service';
+import googleAuth from '../../lib/google';
+
 
 @Component({
   selector: 'project-list',
   templateUrl: config.static_url + '/components/projects/list.component.html',
   directives: [ROUTER_DIRECTIVES]
 })
+@CanActivate(() => { return googleAuth.user; })
 export class ProjectListComponent implements OnInit {
   constructor(
       private _restService:RestService,
diff --git a/front/current/services/google.service.ts b/front/current/lib/google.ts
similarity index 89%
rename from front/current/services/google.service.ts
rename to front/current/lib/google.ts
index 4fd0df0..e174086 100644
--- a/front/current/services/google.service.ts
+++ b/front/current/lib/google.ts
@@ -1,11 +1,8 @@
-import { Injectable } from 'angular2/core';
 import { config } from '../config';
 
 
 declare var gapi:any;
-
-@Injectable()
-export class GoogleAuthService {
+class GoogleAuth {
   public auth2:any;
   public user:any; // Google user, not blocpower user.
 
@@ -37,3 +34,4 @@ export class GoogleAuthService {
     this.user = user;
   };
 };
+export default new GoogleAuth();
-- 
GitLab


From c65dcbb0a50e9499f895310d50df3d819fba7cce Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Mon, 25 Apr 2016 13:18:46 -0400
Subject: [PATCH 11/30] Improve layout styling.

---
 .../assets/styles/components/_global.scss     |  9 ++-
 .../assets/styles/components/_nav.scss        | 75 ++++++++++---------
 .../current/components/app/app.component.html |  2 +-
 3 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/front/current/assets/styles/components/_global.scss b/front/current/assets/styles/components/_global.scss
index 900bc13..2a47036 100644
--- a/front/current/assets/styles/components/_global.scss
+++ b/front/current/assets/styles/components/_global.scss
@@ -37,7 +37,7 @@ body {
 }
 
 my-app {
-  display: block;
+  display: flex;
   height: 100%;
 }
 
@@ -127,3 +127,10 @@ input[type=file].hidden {
 }
 
 .float-right { display: inline; float: right; }
+
+.fullscreen {
+  margin: auto 0;
+  vertical-align: middle;
+  text-align: center;
+  flex-grow: 1;
+}
diff --git a/front/current/assets/styles/components/_nav.scss b/front/current/assets/styles/components/_nav.scss
index c1906cb..70f244d 100644
--- a/front/current/assets/styles/components/_nav.scss
+++ b/front/current/assets/styles/components/_nav.scss
@@ -1,48 +1,49 @@
-nav.vertical {
-  background-color: $gray-01;
-  width: 50px;
-  height: 100%;
-  float: left;
+navigation-bar {
+  flex-basis: 50px;
 
-  ul {
-    margin: 0;
-    display: flex;
-    flex-direction: column;
-    height: 100%;
+  nav.vertical {
+    background-color: $gray-01;
 
-    li {
-      list-style: none;
-      flex-basis: 50px;
-      line-height: 50px;
-      vertical-align: middle;
-      text-align: center;
-      height: 50px;
+    ul {
+      margin: 0;
+      display: flex;
+      flex-direction: column;
+      height: 100%;
 
-      a {
-        color: inherit;
-        &:visited {
-          color: inherit;
-        }
-        &:active {
+      li {
+        list-style: none;
+        flex-basis: 50px;
+        line-height: 50px;
+        vertical-align: middle;
+        text-align: center;
+        height: 50px;
+
+        a {
           color: inherit;
+          &:visited {
+            color: inherit;
+          }
+          &:active {
+            color: inherit;
+          }
+          &:hover {
+            color: inherit;
+          }
+          &.logo {
+            img {
+              width: 35px;
+              margin: 7px;
+            }
+          }
         }
-        &:hover {
-          color: inherit;
+        &.current {
+          background: $white;
         }
-        &.logo {
-          img {
-            width: 35px;
-            margin: 7px;
-          }
+        &.spacer {
+          flex-grow: 1;
+          flex-basis: auto;
         }
       }
-      &.current {
-        background: $white;
-      }
-      &.spacer {
-        flex-grow: 1;
-        flex-basis: auto;
-      }
     }
   }
 }
diff --git a/front/current/components/app/app.component.html b/front/current/components/app/app.component.html
index 95459c7..fcd21ed 100644
--- a/front/current/components/app/app.component.html
+++ b/front/current/components/app/app.component.html
@@ -1,3 +1,3 @@
 <navigation-bar></navigation-bar>
-<div *ngIf="!googleAuth.user">Please sign in.</div>
+<div class="fullscreen" *ngIf="!googleAuth.user">Please sign in.</div>
 <router-outlet></router-outlet>
-- 
GitLab


From 89405a1eaab9e81722446a8e2240c6da597be697 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Thu, 28 Apr 2016 10:34:36 -0400
Subject: [PATCH 12/30] Add google_client_id field to configuration.

---
 config/dev.config.ts        | 1 +
 config/production.config.ts | 1 +
 config/staging.config.ts    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/config/dev.config.ts b/config/dev.config.ts
index 69df98f..3c265c8 100644
--- a/config/dev.config.ts
+++ b/config/dev.config.ts
@@ -8,5 +8,6 @@ export class config {
   public static HEADERS:any = {
     'x-blocpower-app-key': '$APP_KEY'
   };
+  public static google_client_id:string = '$GOOGLE_CLIENT_ID';
   public static static_url:string = '/current';
 };
diff --git a/config/production.config.ts b/config/production.config.ts
index 87748e9..7f59d76 100644
--- a/config/production.config.ts
+++ b/config/production.config.ts
@@ -7,5 +7,6 @@ export class config {
   public static HEADERS = {
     'x-blocpower-app-key': '$APP_KEY'
   };
+  public static google_client_id:string = '$GOOGLE_CLIENT_ID';
   public static static_url:string = '$CURRENT';
 };
diff --git a/config/staging.config.ts b/config/staging.config.ts
index 0754322..c097f5e 100644
--- a/config/staging.config.ts
+++ b/config/staging.config.ts
@@ -7,5 +7,6 @@ export class config {
   public static HEADERS = {
     'x-blocpower-app-key': '$APP_KEY'
   };
+  public static google_client_id:string = '$GOOGLE_CLIENT_ID';
   public static static_url:string = '$CURRENT';
 };
-- 
GitLab


From 825d085dacef027e6f2f30630021c75e78ded66a Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Thu, 28 Apr 2016 10:49:03 -0400
Subject: [PATCH 13/30] Remove unused constructor.

---
 front/current/components/nav/nav.component.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/front/current/components/nav/nav.component.ts b/front/current/components/nav/nav.component.ts
index 5c2cc6e..8e57ad5 100644
--- a/front/current/components/nav/nav.component.ts
+++ b/front/current/components/nav/nav.component.ts
@@ -9,7 +9,5 @@ import { config } from '../../config';
   directives: [ROUTER_DIRECTIVES]
 })
 export class NavComponent {
-  constructor() {};
-
   public config:any = config;
 };
-- 
GitLab


From ec3b66027d3de2cf13c4d80274d67af87f6d642b Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Thu, 28 Apr 2016 12:53:27 -0400
Subject: [PATCH 14/30] Add a signout icon.

---
 front/current/assets/fontello/config.json     |   6 ++++++
 .../assets/fontello/css/blocpower-codes.css   |   3 ++-
 .../fontello/css/blocpower-embedded.css       |  15 ++++++++-------
 .../fontello/css/blocpower-ie7-codes.css      |   3 ++-
 .../assets/fontello/css/blocpower-ie7.css     |   3 ++-
 .../current/assets/fontello/css/blocpower.css |  17 +++++++++--------
 .../assets/fontello/font/blocpower.eot        | Bin 8260 -> 8552 bytes
 .../assets/fontello/font/blocpower.svg        |   2 ++
 .../assets/fontello/font/blocpower.ttf        | Bin 8088 -> 8380 bytes
 .../assets/fontello/font/blocpower.woff       | Bin 4948 -> 5128 bytes
 .../assets/fontello/font/blocpower.woff2      | Bin 4124 -> 4288 bytes
 11 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/front/current/assets/fontello/config.json b/front/current/assets/fontello/config.json
index 7785853..cc781f7 100644
--- a/front/current/assets/fontello/config.json
+++ b/front/current/assets/fontello/config.json
@@ -71,6 +71,12 @@
       "css": "upload",
       "code": 59402,
       "src": "fontawesome"
+    },
+    {
+      "uid": "0d20938846444af8deb1920dc85a29fb",
+      "css": "logout",
+      "code": 59403,
+      "src": "fontawesome"
     }
   ]
 }
\ No newline at end of file
diff --git a/front/current/assets/fontello/css/blocpower-codes.css b/front/current/assets/fontello/css/blocpower-codes.css
index d35dd5d..0edfa21 100644
--- a/front/current/assets/fontello/css/blocpower-codes.css
+++ b/front/current/assets/fontello/css/blocpower-codes.css
@@ -9,4 +9,5 @@
 .icon-mobile:before { content: '\e807'; } /* '' */
 .icon-envelope:before { content: '\e808'; } /* '' */
 .icon-fax:before { content: '\e809'; } /* '' */
-.icon-upload:before { content: '\e80a'; } /* '' */
\ No newline at end of file
+.icon-upload:before { content: '\e80a'; } /* '' */
+.icon-logout:before { content: '\e80b'; } /* '' */
\ No newline at end of file
diff --git a/front/current/assets/fontello/css/blocpower-embedded.css b/front/current/assets/fontello/css/blocpower-embedded.css
index 64bac37..3f71918 100644
--- a/front/current/assets/fontello/css/blocpower-embedded.css
+++ b/front/current/assets/fontello/css/blocpower-embedded.css
@@ -1,15 +1,15 @@
 @font-face {
   font-family: 'blocpower';
-  src: url('../font/blocpower.eot?944541');
-  src: url('../font/blocpower.eot?944541#iefix') format('embedded-opentype'),
-       url('../font/blocpower.svg?944541#blocpower') format('svg');
+  src: url('../font/blocpower.eot?50626490');
+  src: url('../font/blocpower.eot?50626490#iefix') format('embedded-opentype'),
+       url('../font/blocpower.svg?50626490#blocpower') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 @font-face {
   font-family: 'blocpower';
-  src: url('data:application/octet-stream;base64,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') format('woff'),
-       url('data:application/octet-stream;base64,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') format('truetype');
+  src: url('data:application/octet-stream;base64,d09GRgABAAAAABQIAA8AAAAAILwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABWAAAADMAAABCsP6z7U9TLzIAAAGMAAAAQwAAAFY+IEj+Y21hcAAAAdAAAACAAAACCqm17StjdnQgAAACUAAAABMAAAAgBtX/BGZwZ20AAAJkAAAFkAAAC3CKkZBZZ2FzcAAAB/QAAAAIAAAACAAAABBnbHlmAAAH/AAACN4AAAy6l7XL6mhlYWQAABDcAAAAMwAAADYJlxRpaGhlYQAAERAAAAAfAAAAJAc9A1pobXR4AAARMAAAACYAAAA0LBj/9mxvY2EAABFYAAAAHAAAABwRhBU5bWF4cAAAEXQAAAAgAAAAIAGADHluYW1lAAARlAAAAYUAAALZ2Vl9rHBvc3QAABMcAAAAbgAAAJGc39PHcHJlcAAAE4wAAAB6AAAAhuVBK7x4nGNgZGBg4GKQY9BhYHRx8wlh4GBgYYAAkAxjTmZ6IlAMygPKsYBpDiBmg4gCAIojA08AeJxjYGROYZzAwMrAwFTFtIeBgaEHQjM+YDBkZAKKMrAyM2AFAWmuKQwOLxhecDMH/c9iiGIOYpgGFGYEyQEA4GMLnAB4nO2R3Q0CMQyDv3Lh+LmOwgAMxBNTMZ63OJxcJJag0mcpbtoHGzgDi3mYgPFmkOdld5S/cC8/eNZOpK9t362keo7Sk3fDP65cuHLzu43pi5X/maWf3yQOKs3GCaImW1GT+arJxtQ4adQ4c9Q4fdS4B9Rkk2rcjVs8YH4Bs8AfcXicY2BAAxIQyBz0PwuEARJsA90AeJytVml300YUHXlJnIQsJQstamHExGmwRiZswYAJQbJjIF2crZWgixQ76b7xid/gX/Nk2nPoN35a7xsvJJC053Cak6N3583VzNtlElqS2AvrkZSbL8XU1iaN7DwJ6YZNy1F8KDt7IWWKyd8FURCtltq3HYdERCJQta6wRBD7HlmaZHzoUUbLtqRXTcotPekuW+NBvVXffho6yrE7oaRmM3RoPbIlVRhVokimPVLSpmWo+itJK7y/wsxXzVDCiE4iabwZxtBI3htntMpoNbbjKIpsstwoUiSa4UEUeZTVEufkigkMygfNkPLKpxHlw/yIrNijnFawS7bT/L4vead3OT+xX29RtuRAH8iO7ODsdCVfhFtbYdy0k+0oVBF213dCbNnsVP9mj/KaRgO3KzK90IxgqXyFECs/ocz+IVktnE/5kkejWrKRE0HrZU7sSz6B1uOIKXHNGFnQ3dEJEdT9kjMM9pg+Hvzx3imWCxMCeBzLekclnAgTKWFzNEnaMHJgJWWLKqn1rpg45XVaxFvCfu3a0ZfOaONQd2I8Ww8dWzlRyfFoUqeZTJ3aSc2jKQ2ilHQmeMyvAyg/oklebWM1iZVH0zhmxoREIgIt3EtTQSw7saQpBM2jGb25G6a5di1apMkD9dyj9/TmVri501PaDvSzRn9Wp2I62AvT6WnkL/Fp2uUiRen66Rl+TOJB1gIykS02w5SDB2/9DtLL15YchdcG2O7t8yuofdZE8KQB+xvQHk/VKQlMhZhViFZAYq1rWZbJ1awWqcjUd0OaVr6s0wSKchwXx76Mcf1fMzOWmBK+34nTsyMuPXPtSwjTHHybdT2a16nFcgFxZnlOp1mW7+s0x/IDneZZntfpCEtbp6MsP9RpgeVHOh1jeUELmnTfwZCLMOQCDpAwhKUDQ1hegiEsFQxhuQhDWBZhCMslGMLyYxjCchmGsLysZdXUU0nj2plYBmxCYGKOHrnMReVqKrlUQrtoVGpDnhJulVQUz6p/ZaBePPKGObAWSJfIml8xzpWPRuX41hUtbxo7V8Cx6m8fjvY58VLWi4U/Bf/V1lQlvWLNw5Or8BuGnmwnqjapeHRNl89VPbr+X1RUWAv0G0iFWCjKsmxwZyKEjzqdhmqglUPMbMw8tOt1y5qfw/03MUIWUP34NxQaC9yDTllJWe3grNXX27LcO4NyOBMsSTE38/pW+CIjs9J+kVnKno98HnAFjEpl2GoDrRW82ScxD5neJM8EcVtRNkja2M4EiQ0c84B5850EJmHqqg3kTuGGDfgFYW7BeSdconqjLIfuRezzKKT8W6fiRPaoaIzAs9kbYa/vQspvcQwkNPmlfgxUFaGpGDUV0DRSbqgGX8bZum1Cxg70Iyp2w7Ks4sPHFveVkm0ZhHykiNWjo5/WXqJOqtx+ZhSX752+BcEgNTF/e990cZDKu1rJMkdtA1O3GpVT15pD41WH6uZR9b3j7BM5a5puuiceel/TqtvBxVwssPZtDtJSJhfU9WGFDaLLxaVQ6mU0Se+4BxgWGNDvUIqN/6v62HyeK1WF0XEk307Ut9HnYAz8D9h/R/UD0Pdj6HINLs/3mhOfbvThbJmuohfrp+g3MGutuVm6BtzQdAPiIUetjrjKDXynBnF6pLkc6SHgY90V4gHAJoDF4BPdtYzmUwCj+Yw5PsDnzGHQZA6DLeYw2GbOGsAOcxjsMofBHnMYfMGcdYAvmcMgZA6DiDkMnjAnAHjKHAZfMYfB18xh8A1z7gN8yxwGMXMYJMxhsK/p1jDMLV7QXaC2QVWgA1NPWNzD4lBTZcj+jheG/b1BzP7BIKb+qOn2kPoTLwz1Z4OY+otBTP1V050h9TdeGOrvBjH1D4OY+ky/GMtlBr+MfJcKB5RdbD7n74n3D9vFQLkAAQAB//8AD3ictVZrbBTXFb7n3pk7s7PL7Gt2Zm2vx+v17qzxOjbszu6CAXsxGIwwxBhDeCTG5ZXHYgppUtKSVAooLbSUtIQSStRKblO1aZMfOK1Cm6ogBaURSiWKqqgqVdSSPzSV+qtSkygeeu6sG4iS9E9V27o7Z84d75xzvscljJBb77GbdIaopJX0kIW1nhYg0B2nlNDVBJcDBAiBcQJAtjBMkREtkO1oTgZatVZJNgq5CrFMqnAnnuEJwzJ1cPKuU3ZJqWgpjmwmDB0K0APVStnNV6pwJgMP6KE/2sUXT/7kJqWpzjSlkLk23L+qE8a+LqUMyWymdJTrM4vgDZXP/qWyeTdc8y7YEdPGrJrVbsCi2Gap/9zbjtMspQ09feaLeo4QwrGW99lNFiRh0kZ6yQC5m+wgS2uLg6BowJnCJwPAVKDA6KQMfln4gXVJfl0T2zdvXL+2PPdTCsmthVzC4EpHxsmX3YpVKppRjPNzcRVjEPn2uXx7Iy5AI14CjTg/l69iPo5xx1xcEvvttDlj2YCrmb7jkl5Jm7N/8yNqWfZs9bNz8LHo3D4TLxP7zDTYwOviw6qLrPe7OzI0WxdfJxbvzTs2gfrRfewnvTV76yH2dzZG8mSUrK+tzZqcAR0ZdJnEEBxAGbZySgEmUSbVCUJmC8euhoaJJMlbiCzPk9fM7wSyemhhb+fo/FEjFtJIHvIqwgYyCsdfw2yDUrFcqeIv9tNSON4w+6EXERNGJDmQSYh9vCOTd/LVitMLjg5tWNwAmJZZKooHqy7ehn8cPTi1YkiWJWk8LpdLG+/ZdfdJty9AQ/8KGprUR2OB5Su33QslP7l51+jwUHmJSoPvzWW12spt9+09cnD/oP8/2Fitv77/STVAIbZz44behf2LFgfirMgCZuQdNciXrnI6PamRStufzImnj6gqBdHHW9jHaTYPOdZOCrXONsScDtjK1URCEEpkEuEnejmJPZxH11gdRjwmy00FcHuA29APYPBML2ATemi/ZFPLUJBzR0+/eUY6+YcTkOnuMy7uPjx66oEaXbrv5PMnDixiQxcTcOT+U/TMlbP8hHeutStxcaj/oW/94OT+Pmlw75l1h3dfTOCM8fVwmaAbSIJYNUMQHHCyBD6P9/daTVQ2C2CEwTJx4Zk8OG4VKkWcEUzw69c5T8k69z7kHCQ5IqU4zSjyn69zHe/LIOEnLniNQtLgpsDSAFlZW94JwKNIxWoPlWg7YMexGVSmkjxFZEZlVse3oBLQSYIaxci9hPMQX9PXkitXciVFbinAHJfK0Qa3WsGPuRI1TORiZRk0OBiPGlzgQ3RQvH3eaXCPxSZWeAtWTEysgOOKpineoZwLlSxczbmamlW1t8xUcKd3Wo7IA1jevl2aEYHWsAEjM/4zVwcnwN/n5rwF/pMzqqbBn7x3wiYN7PJOcz4g6t+3M5gyTb/NiIP3WQz1aZRka+2riih8okifSthwFFu/64O19rTD5EQhZ8xBvwf54OR78NUFL/C66iLq+5E5lmkhHGyKKksVQ/CibINVFCSqFvtptWgjWZAoFpYb4sHFbimSyqpLKoXhs90tcU1VJYVBa1tKXxBWJc3ghqHQiJp2bCQ16F37RyAmB7mi2XY6pESSdHk8lGf0++EFeiqdkjSWMFq6zw4XKikrEkvrYdddHOQhyjq1TjtMkxE1mGnOqLIaZCas298VwrmC3WmDGqG5II9rkuiLJLABL9HXkB9JZMhCMlgbiGkBxqhwHWyPQiRZkSYJ4ojJDUQAE6zBwQhn4lsIBz5Sdhe6Ti4eU+VUIec6GR3bUalGXUfAIoGwwLFXmIvaYyAwqtHb+PG1mDU7SZrK2A9rqndDIAJsJbQvsDWAf9PdKe9Ga1dXK9itXbV4s7+1Dsdw5Kr3mBj8XwOx2OxlsYUuxZU0eH8evfU10kQq5K5aVwBnzZBejDKcNuC0b1uroOJIuehk+0qS4Fy0YSzVqOmPGM2mH3ytE5gIg07zPiyoD4s5QN90cx9eyVagqe3KSNpZ2UJTg51tO15JJyvzr7nlUCYdpCE7Gyw/MxnrWAo9BVbJuvC6N9TA/aupxPFqsjkFzSlr5ePmxe7R1lMd+UAsBJqh5vcM6tZYttDnor77eia4HEY2V8lqcg+5nxwiXyPPkh+TV8gl8mLthQgkyfkXnvzShjU8oE5/9+CDyxfji3/7+Oe2LpzPfbabFh4cyFQTkKRFkvVmSCKG1UBSnUyEKX4t5UqAT8bnUSWi0cb8LYttIYyFhqNBivqyhaJ7z4M1Fy4AuXDpwqWLv3n1l794+aWf/eiH33vuO8988xtPHX3i8KNfmKrv2XXf9k0b160dWrFsSbl0V6HdbjIDnGAXW9CJ4kUTseHbdlVIiYwEin5cWgSvLCi7Dm7iqDMmwkfoy3+N4//n/dUyHkSWQXt0Oue6uWGcu5tjw2kHxpd4ds61LThkudFNYRO8PZq6WiD1M5anNXVY4H1YxJ+8Emk//vSlvNVMe8/RxyvZWf9N6A7E0/b4YN4bXzKOr7QVTxZmZFO4Ys4+8dHXPvspV967/0v67adta5t3A3nH8Nxynu1AnbVIFtVkpLZGQooJ4klEYmRKyK5EAB1GlkCuE0UFifn6wrk8jucWoScyH2lK9vbM72yzk9mmrGl0tAfkZAF44T+HvGWAA3AHGnbIMjq1AUnaQwFPvMKoAcWXHpBDdU2tqxr+8Rmuyy+rv914YpSOH/vpVzdL60/C9odfv/nGfv7lX//zV1+BB4OXRT2XtTCfkeWZADSPnXj+xJi/eFcfvfzII5ffFcucn9ZRW/KkJvTSQAvBCjlaKL9toVgt1jwlXIb7VioRNo4MEnrDyIjZ0ZTryuWFm+YME/kA4rArUC+MM2H5t1BoGp5aKtpYm4JG2ihdGGy1hCdZ08LjwB4UNFBV3xzRCZGZfuhry8855ZTyoPd79MIPdNPUP0Bzhd5gD43JekAC9NNjKyY0NRjg83Aalaz3GD4oURW69aB3VTPC06b+FprvtI7mijfIvwHqjhuGAAB4nGNgZGBgAOKHJ8pb4vltvjJwM78AijBcdn+RAqP///2fxfyaOQjI5WBgAokCAJhkDroAeJxjYGRgYA76nwUkX/z/+/8X82sGoAgK4AUAtkkHnAB4nGN+wcDADMf//zIv+P+fMRXKFwSy14DF/4NxJEiegQEA/LYVJwAAAAAAAABmAQ4BsgIAAjQCtgNCA64EGgVqBdwGXQABAAAADQDBAAwAAAAAAAIANgBGAHMAAAC9C3AAAAAAeJx1kM1OwkAUhc8AYpDEBSauZ6PBmJQfowsXhoQAOxcsYF3K0BZLp5kOGla+he/gA7n1WTwtE2L8adPb7557e++ZAmjhEwL765bPngUazPZcwTEeHFepjxzXyI+Oj9DE3HGd+sLxCa7x5LiJM7xxgqg1mK3x7ligJc4cV3AqLhxXqd84rpFHjo9wLuaO69Q3jk8wE6+Om7gUH0Od7UwcRla2h1ey3+3dycVOakpx6ifS39pIm1wO5EqnViWJ9gK9WSQ6yPSLMlMVbhPfHPIDzJTJY53Kntc9aBOVKuNbtSw25M9h39qVXBm9kWM3W2ZGr1Vgvcja7L7T+b4TQ2hk2MEgRogIFhJtqld899FFD3ekBTskO/ddMVL4SKj42PKLqKzkzAd8VsxSqoodCdlDwLjhjCILuE3jhVWDKWPICQnnmD/qv5VZGXM6KHZIuvPo8XffhDEtyS+dLA9nyPHMnX2qlk4Lt6Z0JzH+4VtyXlFbUwmoe+XfsVTv0eH9zzm/AGKXiAUAAAB4nG3BURaCIBAF0HmKQJbtxEVRjshpAo5Ax+X74W/3UkeXkf6b0KGHwgANA4sbRtzxwIQnDd41z0pCqabkECPvurDb35sSXquVED8zH9VsLi6Fq/6mVxC2HH8sKXO/ukO3LMktWpJPrRKdJFweAQAAeJxj8N7BcCIoYiMjY1/kBsadHAwcDMkFGxlYnTYxMDJogRibuZgYOSAsPgYwi81pF9MBoDQnkM3utIvBAcJmZnDZqMLYERixwaEjYiNzistGNRBvF0cDAyOLQ0dySARISSQQbOZhYuTR2sH4v3UDS+9GJgYXAAx2I/QAAA==') format('woff'),
+       url('data:application/octet-stream;base64,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') format('truetype');
 }
 /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
 /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
@@ -17,7 +17,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'blocpower';
-    src: url('../font/blocpower.svg?944541#blocpower') format('svg');
+    src: url('../font/blocpower.svg?50626490#blocpower') format('svg');
   }
 }
 */
@@ -62,4 +62,5 @@
 .icon-mobile:before { content: '\e807'; } /* '' */
 .icon-envelope:before { content: '\e808'; } /* '' */
 .icon-fax:before { content: '\e809'; } /* '' */
-.icon-upload:before { content: '\e80a'; } /* '' */
\ No newline at end of file
+.icon-upload:before { content: '\e80a'; } /* '' */
+.icon-logout:before { content: '\e80b'; } /* '' */
\ No newline at end of file
diff --git a/front/current/assets/fontello/css/blocpower-ie7-codes.css b/front/current/assets/fontello/css/blocpower-ie7-codes.css
index 52046ba..b2b831a 100644
--- a/front/current/assets/fontello/css/blocpower-ie7-codes.css
+++ b/front/current/assets/fontello/css/blocpower-ie7-codes.css
@@ -9,4 +9,5 @@
 .icon-mobile { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe807;&nbsp;'); }
 .icon-envelope { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe808;&nbsp;'); }
 .icon-fax { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe809;&nbsp;'); }
-.icon-upload { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80a;&nbsp;'); }
\ No newline at end of file
+.icon-upload { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80a;&nbsp;'); }
+.icon-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80b;&nbsp;'); }
\ No newline at end of file
diff --git a/front/current/assets/fontello/css/blocpower-ie7.css b/front/current/assets/fontello/css/blocpower-ie7.css
index f8e2262..a05f7f2 100644
--- a/front/current/assets/fontello/css/blocpower-ie7.css
+++ b/front/current/assets/fontello/css/blocpower-ie7.css
@@ -20,4 +20,5 @@
 .icon-mobile { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe807;&nbsp;'); }
 .icon-envelope { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe808;&nbsp;'); }
 .icon-fax { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe809;&nbsp;'); }
-.icon-upload { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80a;&nbsp;'); }
\ No newline at end of file
+.icon-upload { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80a;&nbsp;'); }
+.icon-logout { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe80b;&nbsp;'); }
\ No newline at end of file
diff --git a/front/current/assets/fontello/css/blocpower.css b/front/current/assets/fontello/css/blocpower.css
index c755445..8eedef5 100644
--- a/front/current/assets/fontello/css/blocpower.css
+++ b/front/current/assets/fontello/css/blocpower.css
@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'blocpower';
-  src: url('../font/blocpower.eot?52046343');
-  src: url('../font/blocpower.eot?52046343#iefix') format('embedded-opentype'),
-       url('../font/blocpower.woff2?52046343') format('woff2'),
-       url('../font/blocpower.woff?52046343') format('woff'),
-       url('../font/blocpower.ttf?52046343') format('truetype'),
-       url('../font/blocpower.svg?52046343#blocpower') format('svg');
+  src: url('../font/blocpower.eot?31577778');
+  src: url('../font/blocpower.eot?31577778#iefix') format('embedded-opentype'),
+       url('../font/blocpower.woff2?31577778') format('woff2'),
+       url('../font/blocpower.woff?31577778') format('woff'),
+       url('../font/blocpower.ttf?31577778') format('truetype'),
+       url('../font/blocpower.svg?31577778#blocpower') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -15,7 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'blocpower';
-    src: url('../font/blocpower.svg?52046343#blocpower') format('svg');
+    src: url('../font/blocpower.svg?31577778#blocpower') format('svg');
   }
 }
 */
@@ -65,4 +65,5 @@
 .icon-mobile:before { content: '\e807'; } /* '' */
 .icon-envelope:before { content: '\e808'; } /* '' */
 .icon-fax:before { content: '\e809'; } /* '' */
-.icon-upload:before { content: '\e80a'; } /* '' */
\ No newline at end of file
+.icon-upload:before { content: '\e80a'; } /* '' */
+.icon-logout:before { content: '\e80b'; } /* '' */
\ No newline at end of file
diff --git a/front/current/assets/fontello/font/blocpower.eot b/front/current/assets/fontello/font/blocpower.eot
index 38c80942c5fed9690229a7e7769c0519e2194646..aec6e8f23da566135a3a75a1528c0f3eef252d39 100644
GIT binary patch
delta 733
zcmXv~Ur19?82`R=?mfHP-R`!$-dT-U(>cshqH`7{F8AO=K8j?}a=5vru3d74K7>9L
zL@zb&gFX15AVDBOnn58EBqa1=NP-}Q55Wk6UJ8<!eVcR-_k8E~`+ncwjd;0N<W2*u
z2TCF)?JaNam*S6SDgYP<fWeV`%6z`|qm}Se0OlCETMURVhZ2CkME=02naw{cJsBdr
z0ic@M)TBwghwwaEB|9-aI=A-eI{+uW^KCAZO55l3n<N<~e=J9Yt(#vXO!=WHmoH95
z8U_!46R}Q2bfPel^4_n%K=>zNe?B#3;;eHT!0RL&xRuIhc8BgQ6OK@WyJlgsIRAC~
zBQ>CqzhvIdnBOk9Qm#PMTEZ)swtiv{s#Y5dw~PUj1|SW*_KJ{o(5Pb|!Fl2(I;1G8
z)+`IlR1byqlKr*bGn>0w9bln$(`42<f8ZizRZSduSL4zfb%p^P{^8^71B4+Cz40C$
z8Dbv@CNm-DLFP>6;~;V166C2G6Uc_EfDZuYaFsR({YK;Q(3w!!CZB8#>4qCMv^55s
zJH64^MQk_feKjiF7!)?IZumOdPchVOD1yy1-AKZ2jK;b;I-@behX!UCwV)^~iDWXd
zqBszbU?_^QrdNUq#)Mk=ton@u%`mhB!>{5w^(;FkYjz2f34EAHIuz9|TsDOwDpM3F
zF$E)<TG?{w?nOh}aqGCK8O&a3*`j^Y-j4qL&E>rt?n}Qw<>e~9-B(Wkx0c`2g)VEr
z)7H!vsw91*H0TNg7G<w_FMlDOkjLabalMw#wffBC;}r3(u7ROu?bP)<#6%%mxKpIa
J)u0}9{sW9Tmec?M

delta 433
zcmXw!zb`{k6vxkb_x1J1d$iAwh%S9WlrVHE65{z0i!LIO7^Hcs`i4Gz(Q0ZC20|<}
z*I+Oh3<ilv7lWAm2O?CkNovvoG5B>#+?$hgKi}{7+?!h(ywIg#4PZBrm%`#_QSHv_
zTg&eNr~|-6%rfk!srzx_U8;{*Hls;b-y%Tm3i;Zsov=3Z+mpom0J5Dh(l+Tn;v98X
zBDpyGz<L${*be!pX55%@uipj%yb<!lCJD|yM)TfP;uh1&<l1r*-)|%wk`PL!Vurd}
zeMfvl?6-`Zjmyd+@e8pwXISy#<kAtnSqC5#?NmDRoNc`Zs40`bVb90y$AOMBfPjx5
z;3!6U8T--0Lqf3K1f&eWG_c=OCv^{f(*zO1q>HpEQS$H=AxII4p9o)E6CC`QNpAYk
z?~?gBTPuu-r*d=UI;w89_!;%~zJkn3mB^(&I`rRpNbN#}n`(&fseaer04RlXwShG%
cC?G=-9Vnp_UFb#+%BWx!FV{s1BlS(n55sL_S^xk5

diff --git a/front/current/assets/fontello/font/blocpower.svg b/front/current/assets/fontello/font/blocpower.svg
index 5bbd3fb..33f0ab2 100644
--- a/front/current/assets/fontello/font/blocpower.svg
+++ b/front/current/assets/fontello/font/blocpower.svg
@@ -27,6 +27,8 @@
 <glyph glyph-name="fax" unicode="&#xe809;" d="M161 636q37 0 63-27t26-63v-607q0-37-26-63t-63-26h-72q-36 0-63 26t-26 63v607q0 37 26 63t63 27h72z m768-91q32-19 51-52t20-72v-428q0-59-42-101t-101-42h-482q-37 0-63 26t-26 63v857q0 23 15 38t38 16h375q23 0 49-11t43-27l85-85q15-15 26-42t12-49v-91z m-411-552v71q0 8-5 13t-13 5h-71q-8 0-13-5t-5-13v-71q0-8 5-13t13-5h71q8 0 13 5t5 13z m0 143v71q0 8-5 13t-13 5h-71q-8 0-13-5t-5-13v-71q0-8 5-13t13-5h71q8 0 13 5t5 13z m0 143v71q0 8-5 13t-13 5h-71q-8 0-13-5t-5-13v-71q0-8 5-13t13-5h71q8 0 13 5t5 13z m143-286v71q0 8-5 13t-13 5h-72q-7 0-12-5t-5-13v-71q0-8 5-13t12-5h72q8 0 13 5t5 13z m0 143v71q0 8-5 13t-13 5h-72q-7 0-12-5t-5-13v-71q0-8 5-13t12-5h72q8 0 13 5t5 13z m0 143v71q0 8-5 13t-13 5h-72q-7 0-12-5t-5-13v-71q0-8 5-13t12-5h72q8 0 13 5t5 13z m143-286v71q0 8-5 13t-13 5h-72q-8 0-13-5t-5-13v-71q0-8 5-13t13-5h72q8 0 13 5t5 13z m0 143v71q0 8-5 13t-13 5h-72q-8 0-13-5t-5-13v-71q0-8 5-13t13-5h72q8 0 13 5t5 13z m0 143v71q0 8-5 13t-13 5h-72q-8 0-13-5t-5-13v-71q0-8 5-13t13-5h72q8 0 13 5t5 13z m53 214v143h-89q-22 0-38 15t-16 38v90h-357v-286h500z" horiz-adv-x="1000" />
 
 <glyph glyph-name="upload" unicode="&#xe80a;" d="M624 361q-5-11-17-11h-107v-196q0-8-5-13t-13-5h-107q-8 0-13 5t-5 13v196h-107q-8 0-13 5t-5 13q0 7 6 13l178 178q6 5 13 5t12-5l179-178q8-9 4-20z m-195 293q-83 0-153-41t-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152-41 152-110 111-152 41z m428-304q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="logout" unicode="&#xe80b;" d="M357 46q0-2 1-11t0-14-2-14-5-11-12-3h-178q-67 0-114 47t-47 114v392q0 67 47 114t114 47h178q8 0 13-5t5-13q0-2 1-11t0-15-2-13-5-11-12-3h-178q-37 0-63-27t-27-63v-392q0-37 27-63t63-27h174t6 0 7-2 4-3 4-5 1-8z m518 304q0-14-11-25l-303-304q-11-10-25-10t-25 10-11 25v161h-250q-14 0-25 11t-11 25v214q0 15 11 25t25 11h250v161q0 14 11 25t25 10 25-10l303-304q11-10 11-25z" horiz-adv-x="928.6" />
 </font>
 </defs>
 </svg>
\ No newline at end of file
diff --git a/front/current/assets/fontello/font/blocpower.ttf b/front/current/assets/fontello/font/blocpower.ttf
index 6473b344e6e8f02df119bb36d8eb8145e9a03003..ebe78f244e2b786af45cedab5108b41b198983db 100644
GIT binary patch
delta 734
zcmXv~O-K}R6o2pkpRb+SopE)Xt&~`HT^Dt!&~YtF{Mf)l9z!x{b8*)-b=n~}(L>n5
zAUY`%=)r?hhXU!K85G_M3c46pAPCVRkRa$%l!vvqE6p(fH@}bf@qbHQTRrp9*%APD
z1HizrlX0JJ{%9e*1i;kcsbX0AbSMCrk4X=YxOwNn!u%lNHvpQO&rG_+R}o&OsN^SR
zMiw{Ue+S^?_rDs=WwO3S^9EUlNKcLuA$RhtgsDC>j5@{X#Ib?H-$ZN?VNVo>Gr_sq
zbA*2qu6HuiF5dOe00jMn!#6WdZg=p`8sP*Dxa$@si_2ej-qHXH=?m_yocpb(g=&TE
zg+G@t>s`by)Vw*2H;n<31t1H&@|U2f(oM%efV0F4^pay=^FCr+q;@DhLWb2Om3srM
zR8B%(6~7lCW7$j`sT&XZOKp|`9RB6w>@~!p8+yCDOv=YTkeJ9M(E*V&k&lDGfeYYJ
zGbSM$Dg%BQIEO2=H|V#b$79X0xGdJS#7xUT9pz}Gu{~%f&tt1q8>&$8Xhf2OrWI;y
zJ;~6NQHnIqb|M)&(N1=>wcAN6gcjx)ji4y&sdPHEuBeDdFlJ-2;km>l#w4xuL94e8
zbj#8Yta=SkYo}PXsQUy=r|^C%tty&N3djm&l%^?BU<xL5t+cJ0#;T=%HcVXAE#@mV
zZPPkwZAahNcWZmsjSIg(<NIZLr*A*|KYFgwfdTJ{ai)>4lu3F<=%VWkn9W}BUj9rt
zA&!ZA(zQytz{Y_Q;&lNUo}+*wN+_d(K2%XdKL$|unrr%1X`+xX+%8hFjj5W5{~z>i
BjQ{`u

delta 416
zcmXw!ze_?<6vxl;zWnuG`7|MNNiwpi!O02=mE3d-1c#89sc-1zBTb$|*kBY*%4?9O
zmY|{SEe`${6=hUgU{eki4uu_!?&Waq=llJhd%3MhBUJNMdH@&(fJ9o6)VIy&4dMpX
zce+&cn(z7?!1y8g-mIEaPV2QK@dW^{=A?p3x=5^1x8`=r*%!9555UgIZ^{{I+jjiu
z2XMs656UE1))>t@s>Cz0Qq<<OME{F~D-r@b`LyJ$jy(}S5PK9!Q?VkHi9d+FyONS=
zCl9XaO*eq4t>z2G_tNY=fU8UXiMp3jUn2`GfGM%wi(yKSVhHVe75(!vAVmPSfDKQJ
z)a~?388`@%&e5hs$FAR^pCV=hO(qmU7*5fDhKtu-?8vxeP2M-Sj%wN2{z*AjKY?eR
zLF6VJTmSERRa`<rZ;1iDD|)Pd10WbK=LDM+(1Z**96>W$(26#+BaZ@(>QQ&xICoDA
Ezi;hZs{jB1

diff --git a/front/current/assets/fontello/font/blocpower.woff b/front/current/assets/fontello/font/blocpower.woff
index e7244bcc25a1078ad263198bf58ccb0ff2efbf32..2ac1d49132233dca15168d6d58218397bf26e470 100644
GIT binary patch
delta 3035
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
TH(_CS=QXOnr+k@PZ0P?1e^h{}

delta 2794
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

diff --git a/front/current/assets/fontello/font/blocpower.woff2 b/front/current/assets/fontello/font/blocpower.woff2
index 76bbea9abca85683a65482596f2805a980c7317c..29f8beb00cf52a263b7657b5e312adc765d5d139 100644
GIT binary patch
literal 4288
zcmV;x5I^sCPew8T0RR9101&_c4*&oF03f^o01#;a0RR9100000000000000000000
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

literal 4124
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
a>gwuef~4Rq8+})pibem_oP~eoYoh>5?(fb3

-- 
GitLab


From 5e9e19aad0b5009559a342e908bc4e420ac213e6 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Thu, 28 Apr 2016 12:53:44 -0400
Subject: [PATCH 15/30] Migrate to a separate signin page.

---
 .../current/components/app/app.component.html |  1 -
 front/current/components/app/app.component.ts | 22 ++++++++++----
 .../components/login/login.component.html     |  1 +
 .../components/login/login.component.ts       | 14 +++++++++
 .../current/components/nav/nav.component.html |  4 +--
 front/current/components/nav/nav.component.ts | 10 +++++--
 .../components/project/detail.component.ts    |  5 +---
 .../components/projects/list.component.ts     |  4 +--
 .../directives/google-login.directive.ts      | 29 +++++++++++++++++++
 .../google.ts => services/google.service.ts}  | 11 +++++--
 10 files changed, 81 insertions(+), 20 deletions(-)
 create mode 100644 front/current/components/login/login.component.html
 create mode 100644 front/current/components/login/login.component.ts
 create mode 100644 front/current/directives/google-login.directive.ts
 rename front/current/{lib/google.ts => services/google.service.ts} (84%)

diff --git a/front/current/components/app/app.component.html b/front/current/components/app/app.component.html
index fcd21ed..70ccb89 100644
--- a/front/current/components/app/app.component.html
+++ b/front/current/components/app/app.component.html
@@ -1,3 +1,2 @@
 <navigation-bar></navigation-bar>
-<div class="fullscreen" *ngIf="!googleAuth.user">Please sign in.</div>
 <router-outlet></router-outlet>
diff --git a/front/current/components/app/app.component.ts b/front/current/components/app/app.component.ts
index 20c99b1..77db73d 100644
--- a/front/current/components/app/app.component.ts
+++ b/front/current/components/app/app.component.ts
@@ -1,5 +1,5 @@
 import { Component } from 'angular2/core';
-import { RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS } from 'angular2/router';
+import { RouteConfig, ROUTER_PROVIDERS, RouterLink } from 'angular2/router';
 
 import { config } from '../../config';
 
@@ -11,11 +11,14 @@ import { ContactMethodService } from '../../services/project/contact-method.serv
 import { DocumentSlotService } from '../../services/project/document-slot.service';
 import { DocumentService } from '../../services/document/document.service';
 
-import googleAuth from '../../lib/google';
+import { GoogleService } from '../../services/google.service';
+
+import { GoogleLoginRouterOutlet } from '../../directives/google-login.directive';
 
 import { NavComponent } from '../nav/nav.component';
 import { ProjectListComponent } from '../projects/list.component';
 import { ProjectDetailComponent } from '../project/detail.component'
+import { LoginComponent } from '../login/login.component';
 
 
 @Component({
@@ -23,12 +26,15 @@ import { ProjectDetailComponent } from '../project/detail.component'
   templateUrl: config.static_url + '/components/app/app.component.html',
   providers: [
     ROUTER_PROVIDERS,
+
     RestService,
     ProjectService, AddressService, ContactService, ContactMethodService,
     DocumentSlotService,
-    DocumentService
+    DocumentService,
+
+    GoogleService
   ],
-  directives: [ROUTER_DIRECTIVES, NavComponent]
+  directives: [GoogleLoginRouterOutlet, NavComponent]
 })
 @RouteConfig([
   {
@@ -38,12 +44,16 @@ import { ProjectDetailComponent } from '../project/detail.component'
     useAsDefault: true
   },
   {
-    path: '/project/:id/:section',
+    path: '/project/:id',
     name: 'Project',
     component: ProjectDetailComponent
+  },
+  {
+    path: '/login',
+    name: 'Login',
+    component: LoginComponent
   }
 ])
 export class AppComponent {
-  public googleAuth = googleAuth;
   public title:string = 'Project Dashboard';
 }
diff --git a/front/current/components/login/login.component.html b/front/current/components/login/login.component.html
new file mode 100644
index 0000000..0c37dcb
--- /dev/null
+++ b/front/current/components/login/login.component.html
@@ -0,0 +1 @@
+<div *ngIf="!googleService.isLoggedIn()" class="google-login"></div>
diff --git a/front/current/components/login/login.component.ts b/front/current/components/login/login.component.ts
new file mode 100644
index 0000000..292ddef
--- /dev/null
+++ b/front/current/components/login/login.component.ts
@@ -0,0 +1,14 @@
+import { Component } from 'angular2/core';
+import { config } from '../../config';
+import { GoogleService } from '../../services/google.service';
+
+
+@Component({
+  selector: 'login',
+  templateUrl: config.static_url + '/components/login/login.component.html'
+})
+export class LoginComponent {
+  constructor (
+      public googleService:GoogleService
+    ) {};
+};
diff --git a/front/current/components/nav/nav.component.html b/front/current/components/nav/nav.component.html
index 6ff0fa1..ca1e20f 100644
--- a/front/current/components/nav/nav.component.html
+++ b/front/current/components/nav/nav.component.html
@@ -18,8 +18,8 @@
       </a>
     </li>
     <li class="spacer"></li>
-    <li>
-      <div id="google-login"></div>
+    <li *ngIf="googleService.isLoggedIn()">
+      <i class="icon-logout"></i>
     </li>
   </ul>
 </nav>
diff --git a/front/current/components/nav/nav.component.ts b/front/current/components/nav/nav.component.ts
index 8e57ad5..057ed10 100644
--- a/front/current/components/nav/nav.component.ts
+++ b/front/current/components/nav/nav.component.ts
@@ -1,13 +1,19 @@
 import { Component } from 'angular2/core';
-import { ROUTER_DIRECTIVES } from 'angular2/router';
+import { RouterLink } from 'angular2/router';
+
 import { config } from '../../config';
+import { GoogleService } from '../../services/google.service';
 
 
 @Component({
   selector: 'navigation-bar',
   templateUrl: config.static_url + '/components/nav/nav.component.html',
-  directives: [ROUTER_DIRECTIVES]
+  directives: [RouterLink]
 })
 export class NavComponent {
+  constructor(
+      public googleService:GoogleService
+    ) {}
+
   public config:any = config;
 };
diff --git a/front/current/components/project/detail.component.ts b/front/current/components/project/detail.component.ts
index 06a30c0..c2c0812 100644
--- a/front/current/components/project/detail.component.ts
+++ b/front/current/components/project/detail.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from 'angular2/core';
-import { CanActivate, RouteParams, ROUTER_DIRECTIVES } from 'angular2/router';
+import { RouteParams, ROUTER_DIRECTIVES } from 'angular2/router';
 
 import { config } from '../../config';
 
@@ -11,8 +11,6 @@ import { ContactMethodService } from '../../services/project/contact-method.serv
 import { DocumentSlotService } from '../../services/project/document-slot.service';
 import { DocumentService } from '../../services/document/document.service';
 
-import googleAuth from '../../lib/google';
-
 import { AddressComponent } from './address.component';
 import { ContactsComponent } from './contacts.component';
 import { SlotsComponent } from './slots.component';
@@ -23,7 +21,6 @@ import { SlotsComponent } from './slots.component';
   templateUrl: config.static_url + '/components/project/detail.component.html',
   directives: [ROUTER_DIRECTIVES, AddressComponent, ContactsComponent, SlotsComponent]
 })
-@CanActivate(() => { return googleAuth.user; })
 export class ProjectDetailComponent implements OnInit {
   constructor(
       private _routeParams:RouteParams,
diff --git a/front/current/components/projects/list.component.ts b/front/current/components/projects/list.component.ts
index 90d1e8c..835c628 100644
--- a/front/current/components/projects/list.component.ts
+++ b/front/current/components/projects/list.component.ts
@@ -1,11 +1,10 @@
 import { Component, OnInit } from 'angular2/core';
-import { CanActivate, ROUTER_DIRECTIVES } from 'angular2/router';
+import { ROUTER_DIRECTIVES } from 'angular2/router';
 import { Control } from 'angular2/common';
 
 import { config } from '../../config';
 import { RestService, Model, Collection } from '../../services/rest.service';
 import { ProjectService } from '../../services/project/project.service';
-import googleAuth from '../../lib/google';
 
 
 @Component({
@@ -13,7 +12,6 @@ import googleAuth from '../../lib/google';
   templateUrl: config.static_url + '/components/projects/list.component.html',
   directives: [ROUTER_DIRECTIVES]
 })
-@CanActivate(() => { return googleAuth.user; })
 export class ProjectListComponent implements OnInit {
   constructor(
       private _restService:RestService,
diff --git a/front/current/directives/google-login.directive.ts b/front/current/directives/google-login.directive.ts
new file mode 100644
index 0000000..cae7f61
--- /dev/null
+++ b/front/current/directives/google-login.directive.ts
@@ -0,0 +1,29 @@
+import { ElementRef, DynamicComponentLoader, Attribute, Directive } from 'angular2/core';
+import { Router, RouterOutlet, ComponentInstruction } from 'angular2/router';
+import { GoogleService } from '../services/google.service';
+
+
+@Directive({
+  selector: 'router-outlet'
+})
+export class GoogleLoginRouterOutlet extends RouterOutlet {
+  constructor(
+      _elementRef:ElementRef, _loader:DynamicComponentLoader,
+      public router:Router, @Attribute('name') nameAttr:string,
+      public googleService:GoogleService
+    ) {
+    super(_elementRef, _loader, router, nameAttr);
+  }
+
+  activate(instruction:ComponentInstruction) {
+    if (this._canActivate(instruction.urlPath)) {
+      return super.activate(instruction);
+    }
+
+    this.router.navigate(['Login']);
+  }
+
+  private _canActivate(url) {
+    return url == 'login' || this.googleService.isLoggedIn();
+  }
+}
diff --git a/front/current/lib/google.ts b/front/current/services/google.service.ts
similarity index 84%
rename from front/current/lib/google.ts
rename to front/current/services/google.service.ts
index e174086..f9a5224 100644
--- a/front/current/lib/google.ts
+++ b/front/current/services/google.service.ts
@@ -1,8 +1,12 @@
+import { Injectable } from 'angular2/core';
 import { config } from '../config';
 
 
 declare var gapi:any;
-class GoogleAuth {
+
+
+@Injectable()
+export class GoogleService {
   public auth2:any;
   public user:any; // Google user, not blocpower user.
 
@@ -33,5 +37,8 @@ class GoogleAuth {
   public change(user:any) {
     this.user = user;
   };
+
+  public isLoggedIn() {
+    return !!this.user;
+  };
 };
-export default new GoogleAuth();
-- 
GitLab


From 04868cf0572014856c1596274efa3ebb772f7fc6 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Thu, 28 Apr 2016 13:50:47 -0400
Subject: [PATCH 16/30] Display the google signin button correctly.

---
 front/current/components/login/login.component.html | 2 +-
 front/current/services/google.service.ts            | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/front/current/components/login/login.component.html b/front/current/components/login/login.component.html
index 0c37dcb..634aec9 100644
--- a/front/current/components/login/login.component.html
+++ b/front/current/components/login/login.component.html
@@ -1 +1 @@
-<div *ngIf="!googleService.isLoggedIn()" class="google-login"></div>
+<div *ngIf="!googleService.isLoggedIn()" id="google-login"></div>
diff --git a/front/current/services/google.service.ts b/front/current/services/google.service.ts
index f9a5224..63d1203 100644
--- a/front/current/services/google.service.ts
+++ b/front/current/services/google.service.ts
@@ -26,10 +26,7 @@ export class GoogleService {
       self.change(auth2.currentUser.get());
 
       gapi.signin2.render('google-login', {
-        'scope': 'email',
-        'width': 50,
-        'height': 50,
-        'longtitle': false
+        'scope': 'email'
       });
     });
   };
-- 
GitLab


From d968189ffd9b008dbc0baa69457d874570a4298e Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Thu, 28 Apr 2016 13:51:02 -0400
Subject: [PATCH 17/30] Add styling for the login component.

---
 front/current/assets/styles/components/_login.scss | 9 +++++++++
 front/current/assets/styles/styles.scss            | 1 +
 2 files changed, 10 insertions(+)
 create mode 100644 front/current/assets/styles/components/_login.scss

diff --git a/front/current/assets/styles/components/_login.scss b/front/current/assets/styles/components/_login.scss
new file mode 100644
index 0000000..c69371d
--- /dev/null
+++ b/front/current/assets/styles/components/_login.scss
@@ -0,0 +1,9 @@
+login {
+  flex-grow: 1;
+  margin: auto 0;
+  text-align: center;
+
+  #google-login {
+    display: inline-block;
+  }
+}
diff --git a/front/current/assets/styles/styles.scss b/front/current/assets/styles/styles.scss
index 791c60f..81aec0f 100644
--- a/front/current/assets/styles/styles.scss
+++ b/front/current/assets/styles/styles.scss
@@ -8,6 +8,7 @@
 @import 'components/animation';
 @import 'components/button';
 @import 'components/nav';
+@import 'components/login';
 @import 'components/project';
 @import 'components/project-list';
 @import 'components/loaders';
-- 
GitLab


From d581b9451f642653cddd262b06569030f257de16 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Thu, 28 Apr 2016 14:03:12 -0400
Subject: [PATCH 18/30] Fix project list styling.

---
 .../styles/components/_project-list.scss      | 67 ++++++++++---------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/front/current/assets/styles/components/_project-list.scss b/front/current/assets/styles/components/_project-list.scss
index 8721446..0e17541 100644
--- a/front/current/assets/styles/components/_project-list.scss
+++ b/front/current/assets/styles/components/_project-list.scss
@@ -1,44 +1,47 @@
-div.projects {
-  width: calc(100% - 60px); // TODO Replace this with something more global.
-  margin-left: 60px;
-  padding: 10px 0;
+project-list {
+  flex-grow: 1;
 
-  table {
+  div.projects {
     width: 100%;
-    font-size: .9em;
+    padding: 10px;
 
-    th.project-state, td.project-state {
-      width: 150px;
-    }
-
-    tr {
-      border-bottom: 1px solid $light-gray;
+    table {
+      width: 100%;
+      font-size: .9em;
 
-      th, td {
-        line-height: 1.5em;
-        padding: 5px;
+      th.project-state, td.project-state {
+        width: 150px;
       }
-      th {
-        text-transform: uppercase;
-        font-weight: normal;
-        text-align: left;
-        color: $gray-02;
-      }
-      td {
-        text-align: left;
-        vertical-align: top;
+
+      tr {
+        border-bottom: 1px solid $light-gray;
+
+        th, td {
+          line-height: 1.5em;
+          padding: 5px;
+        }
+        th {
+          text-transform: uppercase;
+          font-weight: normal;
+          text-align: left;
+          color: $gray-02;
+        }
+        td {
+          text-align: left;
+          vertical-align: top;
+        }
       }
-    }
 
-    tbody {
-      tr:last-child {
-        border-bottom: none;
+      tbody {
+        tr:last-child {
+          border-bottom: none;
+        }
       }
-    }
 
-    ul.document-list {
-      li {
-        list-style: none;
+      ul.document-list {
+        li {
+          list-style: none;
+        }
       }
     }
   }
-- 
GitLab


From ae2722f617a9ddc49866cc14d555f4472f810d6d Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Thu, 28 Apr 2016 14:19:15 -0400
Subject: [PATCH 19/30] Add cached google token.

---
 front/current/components/login/login.component.html |  2 +-
 front/current/services/google.service.ts            | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/front/current/components/login/login.component.html b/front/current/components/login/login.component.html
index 634aec9..c352e26 100644
--- a/front/current/components/login/login.component.html
+++ b/front/current/components/login/login.component.html
@@ -1 +1 @@
-<div *ngIf="!googleService.isLoggedIn()" id="google-login"></div>
+<div id="google-login"></div>
diff --git a/front/current/services/google.service.ts b/front/current/services/google.service.ts
index 63d1203..80b32f6 100644
--- a/front/current/services/google.service.ts
+++ b/front/current/services/google.service.ts
@@ -1,5 +1,6 @@
 import { Injectable } from 'angular2/core';
 import { config } from '../config';
+import cache from '../lib/cache';
 
 
 declare var gapi:any;
@@ -9,9 +10,14 @@ declare var gapi:any;
 export class GoogleService {
   public auth2:any;
   public user:any; // Google user, not blocpower user.
+  public google_token:string;
 
   constructor() {
     let self = this;
+
+    // Retrieve the google login token from localStorage.
+    self.google_token = cache.get('x-blocpower-google-token')
+
     gapi.load('auth2', function() {
       let auth2 = self.auth2 = gapi.auth2.init({
         client_id: config.google_client_id
@@ -33,9 +39,14 @@ export class GoogleService {
 
   public change(user:any) {
     this.user = user;
+    if (user)
+      this.google_token = user.getAuthResponse().id_token;
+    else
+      this.google_token = null;
+    cache.set('x-blocpower-google-token', this.google_token);
   };
 
   public isLoggedIn() {
-    return !!this.user;
+    return !!this.google_token;
   };
 };
-- 
GitLab


From 2b23e7d6a4b86344551a3400aa67439fe5874207 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Thu, 28 Apr 2016 14:24:36 -0400
Subject: [PATCH 20/30] Fix project detail page styling.

---
 front/current/assets/styles/components/_project.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss
index 413adc9..ddccb80 100644
--- a/front/current/assets/styles/components/_project.scss
+++ b/front/current/assets/styles/components/_project.scss
@@ -8,8 +8,7 @@
 project {
   display: flex;
   flex-direction: column;
-  margin-left: 50px;
-  height: 100%;
+  flex-grow: 1;
 
   header {
     display: flex;
-- 
GitLab


From 8c58686e23bf4f0d64471ae2143251c2174daeba Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Thu, 28 Apr 2016 14:26:10 -0400
Subject: [PATCH 21/30] Do not send set section router param on the project
 detail link.

---
 front/current/components/projects/list.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/current/components/projects/list.component.html b/front/current/components/projects/list.component.html
index 9a99266..299f2b4 100644
--- a/front/current/components/projects/list.component.html
+++ b/front/current/components/projects/list.component.html
@@ -29,7 +29,7 @@
         <td>
           <a
             class="unstyled"
-            [routerLink]="['../Project', {id: project.data['id'], section: 'summary'}]"
+            [routerLink]="['../Project', {id: project.data['id']}]"
             >{{ project.data['name'] }}</a>
         </td>
       </tr>
-- 
GitLab


From f6aa9f69569d3b2017de17d3050639d74c5ab02c Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Thu, 28 Apr 2016 15:16:57 -0400
Subject: [PATCH 22/30] Add logout ability.

---
 .../current/components/nav/nav.component.html |  4 +++-
 front/current/services/google.service.ts      | 24 ++++++++-----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/front/current/components/nav/nav.component.html b/front/current/components/nav/nav.component.html
index ca1e20f..6b6651c 100644
--- a/front/current/components/nav/nav.component.html
+++ b/front/current/components/nav/nav.component.html
@@ -19,7 +19,9 @@
     </li>
     <li class="spacer"></li>
     <li *ngIf="googleService.isLoggedIn()">
-      <i class="icon-logout"></i>
+      <a (click)="googleService.logOut()">
+        <i class="icon-logout"></i>
+      </a>
     </li>
   </ul>
 </nav>
diff --git a/front/current/services/google.service.ts b/front/current/services/google.service.ts
index 80b32f6..5beab0f 100644
--- a/front/current/services/google.service.ts
+++ b/front/current/services/google.service.ts
@@ -20,20 +20,11 @@ export class GoogleService {
 
     gapi.load('auth2', function() {
       let auth2 = self.auth2 = gapi.auth2.init({
-        client_id: config.google_client_id
+        client_id: config.google_client_id,
+        hosted_domain: 'blocpower.org'
       });
-
       auth2.currentUser.listen(self.change.bind(self)); // User change
-
-      // Sign in the user if they are already signed in.
-      if (auth2.isSignedIn.get() == true)
-        auth2.signIn();
-
-      self.change(auth2.currentUser.get());
-
-      gapi.signin2.render('google-login', {
-        'scope': 'email'
-      });
+      gapi.signin2.render('google-login', {'scope': 'email'});
     });
   };
 
@@ -42,11 +33,16 @@ export class GoogleService {
     if (user)
       this.google_token = user.getAuthResponse().id_token;
     else
-      this.google_token = null;
+      this.google_token = undefined;
     cache.set('x-blocpower-google-token', this.google_token);
   };
 
+  public logOut() {
+    this.change(undefined);
+    this.auth2.signOut();
+  };
+
   public isLoggedIn() {
-    return !!this.google_token;
+    return this.google_token && this.google_token !== 'undefined';
   };
 };
-- 
GitLab


From 961b3745baac1d89e025d4aee7729d0a34c09b81 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Thu, 28 Apr 2016 16:28:37 -0400
Subject: [PATCH 23/30] Disconnect users after logout.

---
 front/current/services/google.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/current/services/google.service.ts b/front/current/services/google.service.ts
index 5beab0f..9c37bd7 100644
--- a/front/current/services/google.service.ts
+++ b/front/current/services/google.service.ts
@@ -39,7 +39,7 @@ export class GoogleService {
 
   public logOut() {
     this.change(undefined);
-    this.auth2.signOut();
+    this.auth2.disconnect();
   };
 
   public isLoggedIn() {
-- 
GitLab


From 9478fdc6f84b5bfcea4be940e84342f1618e71f4 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Thu, 28 Apr 2016 16:37:02 -0400
Subject: [PATCH 24/30] Move login button rendering to ngOnInit of the login
 component.

---
 front/current/components/login/login.component.ts | 8 ++++++--
 front/current/services/google.service.ts          | 8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/front/current/components/login/login.component.ts b/front/current/components/login/login.component.ts
index 292ddef..f8100ef 100644
--- a/front/current/components/login/login.component.ts
+++ b/front/current/components/login/login.component.ts
@@ -1,4 +1,4 @@
-import { Component } from 'angular2/core';
+import { Component, OnInit } from 'angular2/core';
 import { config } from '../../config';
 import { GoogleService } from '../../services/google.service';
 
@@ -7,8 +7,12 @@ import { GoogleService } from '../../services/google.service';
   selector: 'login',
   templateUrl: config.static_url + '/components/login/login.component.html'
 })
-export class LoginComponent {
+export class LoginComponent implements OnInit {
   constructor (
       public googleService:GoogleService
     ) {};
+
+  ngOnInit() {
+    this.googleService.render();
+  };
 };
diff --git a/front/current/services/google.service.ts b/front/current/services/google.service.ts
index 9c37bd7..fcc368e 100644
--- a/front/current/services/google.service.ts
+++ b/front/current/services/google.service.ts
@@ -14,20 +14,20 @@ export class GoogleService {
 
   constructor() {
     let self = this;
-
-    // Retrieve the google login token from localStorage.
     self.google_token = cache.get('x-blocpower-google-token')
-
     gapi.load('auth2', function() {
       let auth2 = self.auth2 = gapi.auth2.init({
         client_id: config.google_client_id,
         hosted_domain: 'blocpower.org'
       });
       auth2.currentUser.listen(self.change.bind(self)); // User change
-      gapi.signin2.render('google-login', {'scope': 'email'});
     });
   };
 
+  public render() {
+    gapi.signin2.render('google-login', {'scope': 'email'});
+  };
+
   public change(user:any) {
     this.user = user;
     if (user)
-- 
GitLab


From 4e9af0a14e85d951310327bdfcc64acbc1b35446 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Fri, 29 Apr 2016 10:10:47 -0400
Subject: [PATCH 25/30] Send in auth headers with each API request.

---
 front/current/lib/cache.ts               |  3 +++
 front/current/services/google.service.ts |  3 +++
 front/current/services/rest.service.ts   | 34 ++++++++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/front/current/lib/cache.ts b/front/current/lib/cache.ts
index 9398b17..9110b35 100644
--- a/front/current/lib/cache.ts
+++ b/front/current/lib/cache.ts
@@ -9,6 +9,9 @@ class Cache {
   public set(key:string, value:any):any {
     return localStorage.setItem(key, value);
   };
+  public remove(key:string):any {
+    return localStorage.removeItem(key);
+  };
 
   public getObject(key:string):any {
     // JSON.parse's an object from local storage.
diff --git a/front/current/services/google.service.ts b/front/current/services/google.service.ts
index fcc368e..265edf7 100644
--- a/front/current/services/google.service.ts
+++ b/front/current/services/google.service.ts
@@ -40,6 +40,9 @@ export class GoogleService {
   public logOut() {
     this.change(undefined);
     this.auth2.disconnect();
+
+    cache.remove('x-blocpower-auth-key');
+    cache.remove('x-blocpower-auth-token');
   };
 
   public isLoggedIn() {
diff --git a/front/current/services/rest.service.ts b/front/current/services/rest.service.ts
index 1ceb042..a022298 100644
--- a/front/current/services/rest.service.ts
+++ b/front/current/services/rest.service.ts
@@ -41,6 +41,18 @@ export class Model {
     if (token)
       headers['x-blocpower-app-token'] = token;
 
+    for (
+        let h of [
+          'x-blocpower-google-token',
+          'x-blocpower-auth-key',
+          'x-blocpower-auth-token'
+        ]
+      ) {
+      let t = cache.get(h);
+      if (t)
+        headers[h] = t;
+    };
+
     return new Headers(headers);
   };
   get url():string {
@@ -59,6 +71,11 @@ export class Model {
     app_tokens[this.service.service_name] = response.headers.get('x-blocpower-app-token');
     cache.setObject('app_tokens', app_tokens);
 
+    // Set headers in the cache.
+    for (let h of ['x-blocpower-auth-key', 'x-blocpower-auth-token']) {
+      cache.set(h, response.headers.get(h));
+    };
+
     return this.set(response.json().data);
   };
   setError(response:Response) {
@@ -136,6 +153,18 @@ export class Collection {
     if (token)
       headers['x-blocpower-app-token'] = token;
 
+    for (
+        let h of [
+          'x-blocpower-google-token',
+          'x-blocpower-auth-key',
+          'x-blocpower-auth-token'
+        ]
+      ) {
+      let t = cache.get(h);
+      if (t)
+        headers[h] = t;
+    };
+
     return new Headers(headers);
   };
   get url():string {
@@ -150,6 +179,11 @@ export class Collection {
     app_tokens[this.service.service_name] = response.headers.get('x-blocpower-app-token');
     cache.setObject('app_tokens', app_tokens);
 
+    // Set headers in the cache.
+    for (let h of ['x-blocpower-auth-key', 'x-blocpower-auth-token']) {
+      cache.set(h, response.headers.get(h));
+    };
+
     return this.set(response.json().data);
   };
   setError(response:Response) {
-- 
GitLab


From eb81a1a5a51cdf7e3df98e1bf5abcdecb114b71b Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Fri, 29 Apr 2016 10:57:49 -0400
Subject: [PATCH 26/30] Fix project detail styling.

---
 front/current/assets/styles/components/_project.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss
index ddccb80..29ee3e6 100644
--- a/front/current/assets/styles/components/_project.scss
+++ b/front/current/assets/styles/components/_project.scss
@@ -13,8 +13,9 @@ project {
   header {
     display: flex;
     border-bottom: 1px solid $light-gray;
-    flex-basis: 300px;
+    flex-basis: 200px;
     flex-grow: 0;
+    flex-shrink: 0;
 
     .project-details, .project-contacts { padding: 10px; }
     .project-details {
-- 
GitLab


From 4ab29e4b27440aebbe3fae1e7384f018761784de Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Fri, 29 Apr 2016 11:04:25 -0400
Subject: [PATCH 27/30] Add logout redirect.

---
 front/current/components/nav/nav.component.html |  2 +-
 front/current/components/nav/nav.component.ts   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/front/current/components/nav/nav.component.html b/front/current/components/nav/nav.component.html
index 6b6651c..85b3a3f 100644
--- a/front/current/components/nav/nav.component.html
+++ b/front/current/components/nav/nav.component.html
@@ -19,7 +19,7 @@
     </li>
     <li class="spacer"></li>
     <li *ngIf="googleService.isLoggedIn()">
-      <a (click)="googleService.logOut()">
+      <a (click)="logOut()">
         <i class="icon-logout"></i>
       </a>
     </li>
diff --git a/front/current/components/nav/nav.component.ts b/front/current/components/nav/nav.component.ts
index 057ed10..6856d23 100644
--- a/front/current/components/nav/nav.component.ts
+++ b/front/current/components/nav/nav.component.ts
@@ -1,5 +1,5 @@
 import { Component } from 'angular2/core';
-import { RouterLink } from 'angular2/router';
+import { Router, RouterLink } from 'angular2/router';
 
 import { config } from '../../config';
 import { GoogleService } from '../../services/google.service';
@@ -12,8 +12,14 @@ import { GoogleService } from '../../services/google.service';
 })
 export class NavComponent {
   constructor(
-      public googleService:GoogleService
+      public googleService:GoogleService,
+      public router:Router
     ) {}
 
   public config:any = config;
+
+  public logOut() {
+    this.googleService.logOut();
+    this.router.navigate(['Login']);
+  };
 };
-- 
GitLab


From ee2042b6f32daa18354fde92f588308fea36f5bb Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Fri, 29 Apr 2016 11:26:58 -0400
Subject: [PATCH 28/30] Add next parameter to login page.

---
 front/current/directives/google-login.directive.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/front/current/directives/google-login.directive.ts b/front/current/directives/google-login.directive.ts
index cae7f61..5d031a4 100644
--- a/front/current/directives/google-login.directive.ts
+++ b/front/current/directives/google-login.directive.ts
@@ -16,11 +16,14 @@ export class GoogleLoginRouterOutlet extends RouterOutlet {
   }
 
   activate(instruction:ComponentInstruction) {
+    let url;
+
     if (this._canActivate(instruction.urlPath)) {
       return super.activate(instruction);
     }
 
-    this.router.navigate(['Login']);
+    url = '/' + instruction.urlPath + '?' + instruction.urlParams.join('&');
+    this.router.navigate(['Login', {next: encodeURIComponent(url)}]);
   }
 
   private _canActivate(url) {
-- 
GitLab


From 3826c59f1b40b23cd82fef3316fb75f40ac35bb2 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Fri, 29 Apr 2016 12:28:20 -0400
Subject: [PATCH 29/30] Add a login redirect.

---
 .../components/login/login.component.ts       | 23 +++++++++++++++++--
 front/current/services/google.service.ts      | 12 ++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/front/current/components/login/login.component.ts b/front/current/components/login/login.component.ts
index f8100ef..8416f9a 100644
--- a/front/current/components/login/login.component.ts
+++ b/front/current/components/login/login.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from 'angular2/core';
+import { Router, RouteParams } from 'angular2/router';
 import { config } from '../../config';
 import { GoogleService } from '../../services/google.service';
 
@@ -9,10 +10,28 @@ import { GoogleService } from '../../services/google.service';
 })
 export class LoginComponent implements OnInit {
   constructor (
-      public googleService:GoogleService
+      public googleService:GoogleService,
+      public router:Router,
+      public routeParams:RouteParams
     ) {};
 
   ngOnInit() {
-    this.googleService.render();
+    let self = this;
+    let next = self.routeParams.get('next');
+    next = (next ? decodeURIComponent(next) : '/');
+
+    self.googleService.render();
+    self.googleService.onLogIn(() => {
+      // router.navigateByURL is the right way to do this, but causes an error
+      //  where google attempts to grab the removed login button.  This causes
+      //  the googleService to crash and thus doesn't execute the onInit of the
+      //  next component in the instruction set.
+      //
+      //  As a workaround, we circumvent angular routing and just navigate to
+      //  the next url.
+      //
+      //self.router.navigateByUrl(next);
+      window.location.href = next;
+    });
   };
 };
diff --git a/front/current/services/google.service.ts b/front/current/services/google.service.ts
index 265edf7..fbb5a2d 100644
--- a/front/current/services/google.service.ts
+++ b/front/current/services/google.service.ts
@@ -11,6 +11,7 @@ export class GoogleService {
   public auth2:any;
   public user:any; // Google user, not blocpower user.
   public google_token:string;
+  private login_listeners:any[] = [];
 
   constructor() {
     let self = this;
@@ -29,12 +30,19 @@ export class GoogleService {
   };
 
   public change(user:any) {
+    let old_token = this.google_token;
+
     this.user = user;
     if (user)
       this.google_token = user.getAuthResponse().id_token;
     else
       this.google_token = undefined;
     cache.set('x-blocpower-google-token', this.google_token);
+
+    if (!old_token && this.google_token) {
+      while (this.login_listeners.length)
+        this.login_listeners.pop()();
+    }
   };
 
   public logOut() {
@@ -45,6 +53,10 @@ export class GoogleService {
     cache.remove('x-blocpower-auth-token');
   };
 
+  public onLogIn(f) {
+    this.login_listeners.push(f);
+  };
+
   public isLoggedIn() {
     return this.google_token && this.google_token !== 'undefined';
   };
-- 
GitLab


From ddb65f7a82bf5dcbbd42304a156c37b587a684d6 Mon Sep 17 00:00:00 2001
From: astex <0astex@gmail.com>
Date: Fri, 29 Apr 2016 14:24:42 -0400
Subject: [PATCH 30/30] Add missing service_name attributes to additional
 services.

---
 front/current/services/project/address.service.ts        | 1 +
 front/current/services/project/contact-method.service.ts | 1 +
 front/current/services/project/contact.service.ts        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/front/current/services/project/address.service.ts b/front/current/services/project/address.service.ts
index 3aece4a..6157031 100644
--- a/front/current/services/project/address.service.ts
+++ b/front/current/services/project/address.service.ts
@@ -4,6 +4,7 @@ import { config } from '../../config';
 
 @Injectable()
 export class AddressService {
+  public service_name:string = 'project';
   public config:any = config.SERVICES.project;
   public url:string = '/address/';
 };
diff --git a/front/current/services/project/contact-method.service.ts b/front/current/services/project/contact-method.service.ts
index be12ed1..c2691ac 100644
--- a/front/current/services/project/contact-method.service.ts
+++ b/front/current/services/project/contact-method.service.ts
@@ -4,6 +4,7 @@ import { Model } from '../rest.service';
 
 @Injectable()
 export class ContactMethodService {
+  public service_name:string = 'project';
   public config:any = config.SERVICES.project;
   public url:string = '/contact/method/';
 
diff --git a/front/current/services/project/contact.service.ts b/front/current/services/project/contact.service.ts
index 4271bc2..e50ac2b 100644
--- a/front/current/services/project/contact.service.ts
+++ b/front/current/services/project/contact.service.ts
@@ -3,6 +3,7 @@ import { config } from '../../config';
 
 @Injectable()
 export class ContactService {
+  public service_name:string = 'project';
   public config:any = config.SERVICES.project;
   public url:string = '/contact/';
 };
-- 
GitLab