Merge branch 'dev' into rrt/dev

This commit is contained in:
Aaron Louie 2020-06-02 00:24:05 -04:00
commit bedfe79b89

View File

@ -39,7 +39,11 @@ export class NavbarComponent {
if (isSignedIn()) {
this.api.getUser().subscribe(u => {
this.user = u;
if (this.user && this.user.uid) {
this.googleAnalyticsService.setUser(this.user.uid);
}
this._loadNavLinks();
}, error => {
localStorage.removeItem('token');