Merge branch 'frontend'
This commit is contained in:
commit
2a92c10aa4
@ -33,17 +33,17 @@ export class AppComponent {
|
|||||||
(event as NavigationEnd).url === '/login' ||
|
(event as NavigationEnd).url === '/login' ||
|
||||||
(event as NavigationEnd).url === '/register'
|
(event as NavigationEnd).url === '/register'
|
||||||
);
|
);
|
||||||
// if (this.tokenStorage.getToken()) {
|
if (this.tokenStorage.getToken()) {
|
||||||
// this.isLoggedIn = true;
|
this.isLoggedIn = true;
|
||||||
// } else {
|
} else {
|
||||||
// this.isLoggedIn = false;
|
this.isLoggedIn = false;
|
||||||
// }
|
}
|
||||||
// if (
|
if (
|
||||||
// this.isLoggedIn === false &&
|
this.isLoggedIn === false &&
|
||||||
// (event as NavigationEnd).url != '/register'
|
(event as NavigationEnd).url != '/register'
|
||||||
// ) {
|
) {
|
||||||
// this.router.navigate(['/login']);
|
this.router.navigate(['/login']);
|
||||||
// }
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user