diff --git a/dmp-frontend/dmp-frontend-1-nov-2017.tar.gz b/dmp-frontend/dmp-frontend-1-nov-2017.tar.gz deleted file mode 100644 index 11a14df3f..000000000 Binary files a/dmp-frontend/dmp-frontend-1-nov-2017.tar.gz and /dev/null differ diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts index c261cbe4e..884023531 100644 --- a/dmp-frontend/src/app/app-routing.module.ts +++ b/dmp-frontend/src/app/app-routing.module.ts @@ -33,7 +33,10 @@ const appRoutes: Routes = [ imports: [ RouterModule.forRoot( appRoutes - // { enableTracing: true } // <-- debugging purposes only + ,{ + useHash: true + //,enableTracing: true <-- debugging purposes only + } ) ], exports: [ diff --git a/dmp-frontend/src/app/app.component.css b/dmp-frontend/src/app/app.component.css index 0955e30ae..7c310ecd1 100644 --- a/dmp-frontend/src/app/app.component.css +++ b/dmp-frontend/src/app/app.component.css @@ -81,19 +81,25 @@ padding-bottom: 500px; */ + + z-index: 1; overflow-x: hidden; height: 100%; width: 0px; top: 0px; left: 0px; - background-color: #111; + background-color: #f8f8f8; transition: 0.5s; padding-top: 60px; } .sidenav.expanded{ width: 15%; + + border-style: solid; + border-width: thin; + } #appBody { @@ -116,7 +122,7 @@ } .sidenav a:hover { - color: #f1f1f1; + color: #000; } .sidenav .closebtn { diff --git a/dmp-frontend/src/app/app.component.html b/dmp-frontend/src/app/app.component.html index aaac20ed4..fa83f61da 100644 --- a/dmp-frontend/src/app/app.component.html +++ b/dmp-frontend/src/app/app.component.html @@ -46,8 +46,12 @@ My Workspace Orphan Datasets - Clients - Contact + ... + Basically + George + tell us + what to + put here
@@ -58,8 +62,8 @@ --> -
diff --git a/dmp-frontend/src/app/dmps/dmp.component.ts b/dmp-frontend/src/app/dmps/dmp.component.ts index 90288c376..2886ddf43 100644 --- a/dmp-frontend/src/app/dmps/dmp.component.ts +++ b/dmp-frontend/src/app/dmps/dmp.component.ts @@ -167,7 +167,7 @@ updateDMP(){ } cloneDMP(dmp){ - dmp = {"id": dmp.id}; + dmp = {"id": dmp.id, "label": dmp.label}; this.serverService.cloneDmp(dmp).subscribe( response => { simple_notifier("success",null,"Successfully cloned the DMP"); diff --git a/dmp-frontend/src/app/login/googgle-sign-in/googgle-sign-in.component.ts b/dmp-frontend/src/app/login/googgle-sign-in/googgle-sign-in.component.ts index 14307165c..5914af6b2 100644 --- a/dmp-frontend/src/app/login/googgle-sign-in/googgle-sign-in.component.ts +++ b/dmp-frontend/src/app/login/googgle-sign-in/googgle-sign-in.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ElementRef, AfterViewInit, VERSION } from '@angular/core'; +import { Component, OnInit, ElementRef, AfterViewInit, VERSION, Injectable } from '@angular/core'; import { TokenService, TokenProvider } from '../../services/login/token.service'; import {Router} from '@angular/router'; @@ -14,15 +14,31 @@ declare function simple_notifier(type: string, title: string, message:string): a templateUrl: './googgle-sign-in.component.html', styleUrls: ['./googgle-sign-in.component.css'] }) -export class GooggleSignInComponent implements OnInit, AfterViewInit { +export class GooggleSignInComponent implements OnInit, AfterViewInit, Injectable { - fixedRendering : boolean = false; + constructor(private element: ElementRef, private tokenService : TokenService, private router : Router) { } ngOnInit() { + //this.googleInit(); + } + + ngAfterViewInit() { + + /* + $( window ).on( "load", function(){ + + if($("#googleBtn").length == 0) { + alert("GoogleButton found"); + } + + }); + */ + + this.googleInit(); } @@ -70,21 +86,7 @@ export class GooggleSignInComponent implements OnInit, AfterViewInit { - ngAfterViewInit() { - - /* - $( window ).on( "load", function(){ - if($("#googleBtn").length == 0) { - alert("GoogleButton found"); - } - - }); - */ - - this.googleInit(); - - } }