MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

fixing the navigation

This commit is contained in:
Nikolaos Laskaris 2017-11-10 17:53:53 +02:00
parent c993d24484
commit c40c3436cd
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dmp-frontend/src/app/app.component.html
View File

@ -56,10 +56,10 @@
--> -->
<div id="appBody" class="child_div_right"> <div id="appBody" class="child_div_right">
<router-outlet [ngClass]="{true:'visible'}[tokenService.isLoggedIn() == true]" ></router-outlet> <router-outlet></router-outlet>
<!--this should be invisible --> <!--this should be invisible -->
<app-main-sign-in [ngClass]="'invisible'"></app-main-sign-in> <app-main-sign-in [ngClass]="'invisible'"></app-main-sign-in>

2
dmp-frontend/src/app/app.component.ts
View File

@ -50,7 +50,7 @@ export class AppComponent implements OnInit {
login(){ login(){
console.log("navigating to login") console.log("navigating to login")
//redirect to login page //redirect to login page
this.router.navigate(['/login'], { queryParams: { refresh : Math.random() /*,returnUrl: this.state.url*/ }}); this.router.navigate(['/login'], { queryParams: { /*refresh : Math.random() ,returnUrl: this.state.url*/ }});
location.reload(); location.reload();
} }

1
dmp-frontend/src/app/login/googgle-sign-in/googgle-sign-in.component.ts
View File

@ -75,7 +75,6 @@ export class GooggleSignInComponent implements OnInit, AfterViewInit, Injectable
//simple_notifier("success",null,"Successful login"); //simple_notifier("success",null,"Successful login");
let profile = googleUser.getBasicProfile(); let profile = googleUser.getBasicProfile();
this.tokenService.login(googleUser.getAuthResponse().id_token, TokenProvider.google, profile.getName(), profile.getEmail()); this.tokenService.login(googleUser.getAuthResponse().id_token, TokenProvider.google, profile.getName(), profile.getEmail());
this.router.navigate(['/workspace'], { queryParams: { /*returnUrl: this.state.url*/ }});
}, },
function (error) { function (error) {
//simple_notifier("danger",null,"Failed to login"); //simple_notifier("danger",null,"Failed to login");

4
dmp-frontend/src/app/user-workspace/user-workspace.component.ts
View File

@ -18,8 +18,8 @@ export class UserWorkspaceComponent implements OnInit {
ngOnInit() { ngOnInit() {
if(!this.tokenService.isLoggedIn()) //if(!this.tokenService.isLoggedIn())
this.router.navigate([''], { queryParams: { /*returnUrl: this.state.url*/ }}); //this.router.navigate([''], { queryParams: { /*returnUrl: this.state.url*/ }});
} }