diff --git a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.html b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.html index 6cb8c962b..bd512164c 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.html +++ b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.html @@ -22,6 +22,7 @@
+
diff --git a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts index f3a288b66..b16e560ce 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts +++ b/dmp-frontend/src/app/ui/misc/navigation/navigation.component.ts @@ -92,13 +92,17 @@ export class NavigationComponent extends BaseComponent implements OnInit { } public principalHasAvatar(): boolean { - return this.authentication.current().avatarUrl != null; + return this.authentication.current().avatarUrl != null && this.authentication.current().avatarUrl.length > 0; } public getPrincipalAvatar(): string { return this.authentication.current().avatarUrl; } + public getDefaultAvatar(): string { + return 'assets/images/profile-placeholder.png'; + } + openProfile() { const dialogRef = this.dialog.open(UserDialogComponent, { hasBackdrop: true, diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html index f922a2279..df07a6a64 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html +++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.html @@ -2,8 +2,8 @@
- + +
{{this.getPrincipalName()}}
diff --git a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts index 1486663fa..80404784a 100644 --- a/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts +++ b/dmp-frontend/src/app/ui/misc/navigation/user-dialog/user-dialog.component.ts @@ -36,13 +36,17 @@ export class UserDialogComponent implements OnInit { } public principalHasAvatar(): boolean { - return this.authentication.current() && this.authentication.current().avatarUrl != null; + return this.authentication.current() && this.authentication.current().avatarUrl != null && this.authentication.current().avatarUrl.length > 0; } public getPrincipalAvatar(): string { return this.authentication.current() && this.authentication.current().avatarUrl; } + public getDefaultAvatar(): string { + return 'assets/images/profile-placeholder.png'; + } + public navigateToProfile() { this.dialogRef.close(); this.router.navigate(['/profile']); diff --git a/dmp-frontend/src/app/ui/navbar/navbar.component.html b/dmp-frontend/src/app/ui/navbar/navbar.component.html index dd338bbf3..023476217 100644 --- a/dmp-frontend/src/app/ui/navbar/navbar.component.html +++ b/dmp-frontend/src/app/ui/navbar/navbar.component.html @@ -54,8 +54,8 @@