sudacode/ghostfolio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Feature/clean up user database schema (#1242)

Browse Source 
* Clean up user database schema

* Update changelog
This commit is contained in:
Thomas Kaul
2022-09-10 16:11:49 +02:00
committed by GitHub
parent 980ad1028c
commit 4f8fe83a16
14 changed files with 45 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/client/src/app/core/auth.guard.ts
View File

@@ -7,7 +7,6 @@ import {
} from '@angular/router';
import { SettingsStorageService } from '@ghostfolio/client/services/settings-storage.service';
import { UserService } from '@ghostfolio/client/services/user/user.service';
import { ViewMode } from '@prisma/client';
import { EMPTY } from 'rxjs';
import { catchError } from 'rxjs/operators';
@@ -80,13 +79,13 @@ export class AuthGuard implements CanActivate {
return;
} else if (
state.url.startsWith('/home') &&
user.settings.viewMode === ViewMode.ZEN
user.settings.viewMode === 'ZEN'
) {
this.router.navigate(['/zen']);
resolve(false);
return;
} else if (state.url.startsWith('/start')) {
if (user.settings.viewMode === ViewMode.ZEN) {
if (user.settings.viewMode === 'ZEN') {
this.router.navigate(['/zen']);
} else {
this.router.navigate(['/home']);
@@ -96,7 +95,7 @@ export class AuthGuard implements CanActivate {
return;
} else if (
state.url.startsWith('/zen') &&
user.settings.viewMode === ViewMode.DEFAULT
user.settings.viewMode === 'DEFAULT'
) {
this.router.navigate(['/home']);
resolve(false);