Skip to content

Commit ae618a9

Browse files
committed
fix: show user name in user menu when opened
1 parent a1133d5 commit ae618a9

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

spring-boot-admin-server-ui/src/main/frontend/shell/NavbarUserMenu.vue

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
</template>
1717

1818
<template #menuItems>
19+
<div class="link link--no-hover" v-if="userName">
20+
<span>
21+
{{$t('navbar.signedInAs')}} <strong v-text="userName"></strong>
22+
</span>
23+
</div>
1924

2025
<NavbarLink v-for="userSubMenuItem in submenuItems" :key="userSubMenuItem.name" :view="userSubMenuItem"/>
2126

@@ -53,6 +58,10 @@ export default {
5358
type: String,
5459
default: undefined
5560
},
61+
userName: {
62+
type: String,
63+
default: undefined
64+
},
5665
csrfToken: {
5766
type: String,
5867
default: undefined
@@ -67,6 +76,10 @@ export default {
6776

6877
<style scoped>
6978
.link {
70-
@apply flex w-full items-center rounded-md px-3 py-2 text-sm hover:bg-gray-100;
79+
@apply flex w-full items-center rounded-md px-3 py-2 text-sm hover:bg-gray-100 break-all;
80+
}
81+
82+
.link--no-hover {
83+
@apply hover:bg-white;
7184
}
7285
</style>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navbar": {
3+
"signedInAs": "Angemeldet als",
34
"logout": "Abmelden"
45
}
56
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"navbar": {
3+
"signedInAs": "Signed in as",
34
"logout": "Log out"
45
}
56
}

spring-boot-admin-server-ui/src/main/frontend/shell/navbar.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,9 @@
160160
class="text-base font-medium leading-none text-white"
161161
v-text="userName"
162162
/>
163-
adsa
164163
</div>
165164
</div>
166165
<div class="mt-3 px-2 space-y-1 text-black">
167-
168166
<NavbarLink v-for="userSubMenuItem in userSubMenuItems" :key="userSubMenuItem.name"
169167
:applications="applications" :error="error" :view="userSubMenuItem"/>
170168

@@ -231,7 +229,7 @@ export default {
231229
data: () => ({
232230
showMenu: false,
233231
brand: '<img src="assets/img/icon-spring-boot-admin.svg"><span>Spring Boot Admin</span>',
234-
userName: 'Stephan Köninger',
232+
userName: '[email protected]',
235233
csrfToken: null,
236234
csrfParameterName: null,
237235
currentLanguage: null
@@ -257,7 +255,7 @@ export default {
257255
},
258256
created() {
259257
this.brand = sbaConfig.uiSettings.brand;
260-
this.userName = sbaConfig.user ? sbaConfig.user.name : null;
258+
//this.userName = sbaConfig.user ? sbaConfig.user.name : null;
261259
this.availableLocales = AVAILABLE_LANGUAGES;
262260
this.csrfToken = readCookie('XSRF-TOKEN');
263261
this.csrfParameterName = sbaConfig.csrf.parameterName;

0 commit comments

Comments
 (0)