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

Merge branch 'ui-redesign' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign

This commit is contained in:
apapachristou 2020-07-15 09:46:35 +03:00
parent e7a26c40ae bac925a6b6
commit 367e6c33f1
9 changed files with 127 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dmp-frontend/src/app/ui/auth/login/login.component.html
View File

@ -4,37 +4,45 @@
<h3 class="card-title title">{{'GENERAL.TITLES.SIGN-IN' | translate}}</h3>
<hr class="line">
<div class="row justify-content-center">
<div class="d-flex flex-column">
<div *ngIf="hasOpenAireOauth()" class="col-auto pb-4 pr-4">
<div class="row justify-content-center pb-4">
<div class="flex-column">
<div *ngIf="hasOpenAireOauth()" class="col-auto pr-4">
<button mat-icon-button (click)="openaireLogin()" class="d-flex justify-content-center">
<span class="openaireIcon"></span>
</button>
</div>
</div>
<div class="flex-column">
<div *ngIf="hasOrcidOauth()" class="col-auto pl-4 pr-4">
<button mat-icon-button (click)="orcidLogin()" class="d-flex justify-content-center">
<span class="orcidIconMedium"></span>
</button>
</div>
</div>
<div class="flex-column">
<div *ngIf="hasB2AccessOauth()" class="col-auto pl-4">
<button mat-icon-button (click)="b2AccessLogin()" class="d-flex justify-content-center">
<span class="iconmedium"></span>
</button>
</div>
</div>
</div>
<div class="row justify-content-center">
<div class="flex-column">
<div *ngIf="hasGoogleOauth()" class="col-auto pr-4">
<button mat-icon-button id="googleSignInButton" class="d-flex justify-content-center">
<span class="googleIcon"></span>
</button>
</div>
</div>
<div class="d-flex flex-column">
<div *ngIf="hasOrcidOauth()" class="col-auto pl-4 pr-4 pb-4">
<button mat-icon-button (click)="orcidLogin()" class="d-flex justify-content-center">
<span class="orcidIconMedium"></span>
</button>
</div>
<div class="flex-column">
<div *ngIf="hasFacebookOauth()" class="col-auto pl-4 pr-4">
<button mat-icon-button (click)="facebookLogin()" class="d-flex justify-content-center">
<span class="facebookIcon"></span>
</button>
</div>
</div>
<div class="d-flex flex-column">
<div *ngIf="hasB2AccessOauth()" class="col-auto pl-4 pb-4">
<button mat-icon-button (click)="b2AccessLogin()" class="d-flex justify-content-center">
<span class="iconmedium"></span>
</button>
</div>
<div class="flex-column">
<div *ngIf="hasTwitterOauth()" class="col-auto pl-4">
<button mat-icon-button (click)="twitterLogin()" class="d-flex justify-content-center">
<span class="twitterIcon"></span>

3
dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation.component.html
View File

@ -7,8 +7,7 @@
<h1 mat-dialog-title class="title">{{'DMP-LISTING.ACTIONS.INVITE-AUTHORS' | translate}}</h1>
</div>
<div mat-dialog-content class="row content">
<mat-form-field class="col pt-2 pb-2 mb-4">
<mat-label></mat-label>
<mat-form-field class="col pt-0 pb-2 mb-4" appearance="standard">
<app-multiple-auto-complete [formControl]="formGroup.get('users')"
placeholder="{{'INVITATION-EDITOR.AUTOCOMPLETE-USER-EMAIL' | translate}}"
[configuration]="usersAutoCompleteConfiguration">

38
dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html
View File

@ -1,10 +1,38 @@
<form>
<form class="mb-0">
<div class="dropdown-top"></div>
<div class="dropdown-options">
<mat-divider class="col-12 top-divider"></mat-divider>
<div class="col-12 pl-2">
<a mat-button class="profile mt-2 mb-2 pl-0">
<mat-icon class="check-icon">check</mat-icon>{{ data.user.email }}
</a>
</div>
<mat-divider class="col-12"></mat-divider>
<div class="col-12">
<a mat-button class="profile mt-2"
(click)="navigateToProfile()">{{'USER-DIALOG.USER-PROFILE-SETTINGS' | translate}}</a>
<a mat-button class="profile mb-2"
(click)="navigateToMyDmps()">{{'USER-PROFILE.ASSOCIATED-DMPS' | translate}}</a>
</div>
<mat-divider class="col-12"></mat-divider>
<div class="col-12">
<a mat-button class="logout mb-2" (click)="logout()">
{{ 'USER-DIALOG.LOG-OUT' | translate }}
</a>
</div>
</div>
</form>
<!-- <form>
<div mat-dialog-title>
<div class="row">
<div class="col-auto">
<img mat-card-avatar class="my-mat-card-avatar" [src]="this.getPrincipalAvatar()" (error)="applyFallbackAvatar($event)">
<!-- <img mat-card-avatar class="my-mat-card-avatar" *ngIf="!this.principalHasAvatar()" [src]="this.getDefaultAvatar()"> -->
</div>
<img mat-card-avatar class="my-mat-card-avatar" [src]="this.getPrincipalAvatar()" (error)="applyFallbackAvatar($event)"> -->
<!-- <img mat-card-avatar class="my-mat-card-avatar" *ngIf="!this.principalHasAvatar()" [src]="this.getDefaultAvatar()"> -->
<!-- </div>
<span class="user-label col">{{this.getPrincipalName()}}</span>
</div>
</div>
@ -19,4 +47,4 @@
<a mat-button class="logout" (click)="logout()"><mat-icon class="mr-1">exit_to_app</mat-icon>{{ 'USER-DIALOG.LOG-OUT' | translate }}</a>
</div>
</div>
</form>
</form> -->

48
dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.scss
View File

@ -6,6 +6,50 @@ $mat-card-header-size: 40px !default;
flex-shrink: 0;
}
.profile, .logout {
margin-left: 3em;
.top-divider {
border-top-style: none !important;
}
.profile, .logout {
padding-left: 1.1875rem;
font-weight: 300;
color: #212121;
height: 1.875rem;
width: 100%;
text-align: left;
}
.dropdown-top {
width: 0rem;
border-bottom: 0.625rem solid #FFFFFF;
border-left: 0.625rem solid transparent;
border-right: 0.625rem solid transparent;
margin: 0 87%;
}
.dropdown-options {
background-color: #FFFFFF;
min-width: 10rem;
width: 13.625rem;
}
.dropdown-options a:hover {
background-color: rgba(255, 255, 255, 0.609) !important;
}
.dropdown-options a:hover {
background-color: #ddd;
}
::ng-deep .mat-dialog-container {
background-color: transparent;
padding: 0rem;
overflow: initial;
box-shadow: none;
}
.check-icon {
color: #129D99;
transform: scale(0.7);
}

5
dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts
View File

@ -55,4 +55,9 @@ export class UserDialogComponent implements OnInit {
this.dialogRef.close();
this.router.navigate(['/profile']);
}
public navigateToMyDmps() {
this.dialogRef.close();
this.router.navigate(['/plans']);
}
}

17
dmp-frontend/src/app/ui/navbar/navbar.component.ts
View File

@ -14,6 +14,8 @@ import { UserService } from '@app/core/services/user/user.service';
import { FaqDialogComponent } from '../faq/dialog/faq-dialog.component';
import { DmpInvitationDialogComponent } from '../dmp/invitation/dmp-invitation.component';
import { StartNewDmpDialogComponent } from '../dmp/start-new-dmp-dialogue/start-new-dmp-dialog.component';
import { UserListingModel } from '@app/core/model/user/user-listing';
import { Principal } from '@app/core/model/auth/principal';
const availableLanguages: any[] = require('../../../assets/resources/language.json');
@ -33,6 +35,7 @@ export class NavbarComponent extends BaseComponent implements OnInit {
language = this.languages[0];
currentRoute: string;
selectedLanguage = 'en';
private user: UserListingModel;
@Output() sidebarToggled: EventEmitter<any> = new EventEmitter();
constructor(location: Location,
@ -41,7 +44,8 @@ export class NavbarComponent extends BaseComponent implements OnInit {
private authentication: AuthService,
private dialog: MatDialog,
private progressIndicationService: ProgressIndicationService,
private languageService: LanguageService
private languageService: LanguageService,
public userService: UserService
) {
super();
this.location = location;
@ -69,6 +73,7 @@ export class NavbarComponent extends BaseComponent implements OnInit {
this.progressIndicationService.getProgressIndicationObservable().pipe(takeUntil(this._destroyed)).subscribe(x => {
setTimeout(() => { this.progressIndication = x; });
});
this.getPrincipalAsUser();
}
public isAuthenticated(): boolean {
@ -79,6 +84,13 @@ export class NavbarComponent extends BaseComponent implements OnInit {
return this.currentRoute === '/language-editor' || this.currentRoute === '/profile';
}
public getPrincipalAsUser() {
const principal: Principal = this.authentication.current();
if (principal) {
this.userService.getUser(principal.id).pipe(takeUntil(this._destroyed)).subscribe(result => this.user = result);
}
}
sidebarOpen() {
const toggleButton = this.toggleButton;
const body = document.getElementsByTagName('body')[0];
@ -211,6 +223,9 @@ export class NavbarComponent extends BaseComponent implements OnInit {
autoFocus: false,
closeOnNavigation: true,
disableClose: false,
data: {
user: this.user
},
position: { top: '64px', right: '1em' }
});
}

1
dmp-frontend/src/assets/i18n/en.json
View File

@ -1238,6 +1238,7 @@
},
"USER-DIALOG": {
"USER-PROFILE": "My Profile",
"USER-PROFILE-SETTINGS": "My Profile Settings...",
"EXIT": "Exit ",
"LOG-OUT": "Log Out"
},

1
dmp-frontend/src/assets/i18n/es.json
View File

@ -1216,6 +1216,7 @@
},
"USER-DIALOG": {
"USER-PROFILE": "Mi perfil",
"USER-PROFILE-SETTINGS": "My Profile Settings...",
"EXIT": "Salir ",
"LOG-OUT": "Cerrar la sesión"
},

1
dmp-frontend/src/assets/i18n/gr.json
View File

@ -1217,6 +1217,7 @@
},
"USER-DIALOG": {
"USER-PROFILE": "Το Προφίλ μου",
"USER-PROFILE-SETTINGS": "My Profile Settings...",
"EXIT": "Έξοδος ",
"LOG-OUT": "Αποσύνδεση"
},