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

--

This commit is contained in:
Nikolaos Laskaris 2017-11-13 19:19:10 +02:00
parent 6f605960e5
commit 26a2c765cc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
</button> </button>
--> -->
<div class="nav navbar-nav navbar-left"> <div class="nav navbar-nav navbar-left">
<div class="dropdown "> <div class="dropdown" [ngClass]="{false:'invisible'}[tokenService.isLoggedIn() == true]">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"> Manage <span class="caret"></span> </button> <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown"> Manage <span class="caret"></span> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a class="cursor" (click)="goToDMPs()">My DMPs</a></li> <li><a class="cursor" (click)="goToDMPs()">My DMPs</a></li>

7
dmp-frontend/src/app/services/login/token.service.ts
View File

@ -1,6 +1,7 @@
import { Injectable, Inject} from '@angular/core'; import { Injectable, Inject} from '@angular/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import {LocalStorageService} from 'ngx-webstorage'; import {LocalStorageService} from 'ngx-webstorage';
import {Router} from '@angular/router';
import 'rxjs/add/operator/map'; import 'rxjs/add/operator/map';
import { DOCUMENT } from '@angular/platform-browser'; import { DOCUMENT } from '@angular/platform-browser';
@ -13,7 +14,7 @@ declare function sign_out_google(): any;
@Injectable() @Injectable()
export class TokenService { export class TokenService {
constructor (private storage : LocalStorageService, @Inject(DOCUMENT) private document) { constructor (private storage : LocalStorageService, @Inject(DOCUMENT) private document, private router : Router) {
//var csrfToken : string = jQuery(document).find('meta[name="csrf-token"]').attr('content'); //var csrfToken : string = jQuery(document).find('meta[name="csrf-token"]').attr('content');
//this.setCSRFToken(csrfToken); //this.setCSRFToken(csrfToken);
} }
@ -96,7 +97,9 @@ export class TokenService {
this.setProvider(null); this.setProvider(null);
window.location.reload(); this.router.navigate(['/login'], { queryParams: { /*returnUrl: this.state.url*/ }});
//window.location.reload();
} }