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

no message

This commit is contained in:
annabakouli 2018-01-08 17:15:45 +02:00
parent 37ae617dfa
commit abc114b8ab
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmp-backend/src/main/resources/application.properties
View File

@ -6,8 +6,7 @@
##########################Persistence##########################################
database.driver-class-name=org.postgresql.Driver
database.url = jdbc:postgresql://develdb1.madgik.di.uoa.gr:5432/dmptool
database.username = dmptool
database.password = dmpt00lu$r
##########################/Persistence##########################################
###################Allowed Proxy Service Host ############################
@ -18,8 +17,7 @@ configuration.externalUrls = file:///C:\\Users\\ikalyvas\\Documents\\Projects\\O
########################/Email#############################
spring.mail.default-encoding=UTF-8
spring.mail.host=smtp.gmail.com
spring.mail.username=kalivasioan@gmail.com
spring.mail.password=A3b*1*92
spring.mail.port=587
spring.mail.protocol=smtp
spring.mail.test-connection=false

8
dmp-frontend/src/app/login/login.component.ts
View File

@ -1,5 +1,5 @@
import { HttpClient } from '@angular/common/http';
import { Component, OnInit, ElementRef, AfterViewInit, VERSION, Injectable } from '@angular/core';
import { Component, OnInit, ElementRef, AfterViewInit, VERSION, Injectable, NgZone } from '@angular/core';
import { Router, ActivatedRoute, Params } from "@angular/router";
import { MatPaginator, MatSort, MatSnackBar } from "@angular/material";
import { TranslateService } from "@ngx-translate/core";
@ -21,7 +21,9 @@ export class LoginComponent implements OnInit {
public authService: AuthService,
public route: ActivatedRoute,
public snackBar: MatSnackBar,
public language: TranslateService) { }
public language: TranslateService,
private zone: NgZone
) { }
ngOnInit() {
gapi.load('auth2', () => {
@ -59,7 +61,7 @@ export class LoginComponent implements OnInit {
});
this.route.queryParams.subscribe((params: Params) => {
let redirectUrl = params['returnUrl'] ? params['returnUrl'] : '/';
this.router.navigate([redirectUrl]);
this.zone.run(() => this.router.navigate([redirectUrl]));
})
}