-
+
{{ message.userFirstName }} {{ message.userLastName }}
diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 73576e422..fb4a650d7 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -1,32 +1,32 @@
diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index c3c2978bb..afbb31351 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -13,20 +13,28 @@
- {{ $t('navbar.user_search') }}
-
+
+ {{ $t('navbar.user_search') }}
+
+
{{ $t('creation') }}
- {{ openCreations.value }}
+ {{ openCreations }}
-
+
{{ $t('navbar.automaticContributions') }}
-
+
{{ $t('navbar.instances') }}
- {{ $t('navbar.statistic') }}
+
+ {{ $t('navbar.statistic') }}
+
{{ $t('navbar.my-account') }}
{{ $t('navbar.logout') }}
@@ -51,8 +59,10 @@ import {
vBToggle,
vBColorMode,
} from 'bootstrap-vue-next'
+import { useRoute } from 'vue-router'
const store = useStore()
+const route = useRoute()
const openCreations = computed(() => store.state.openCreations)
@@ -61,7 +71,7 @@ const { mutate: executeLogout } = useMutation(logout)
const handleLogout = async () => {
window.location.assign(CONFIG.WALLET_LOGIN_URL)
// window.location = CONFIG.WALLET_LOGIN_URL
- store.dispatch('logout')
+ await store.dispatch('logout')
await executeLogout()
}
@@ -69,6 +79,10 @@ const handleWallet = () => {
window.location = CONFIG.WALLET_AUTH_URL.replace('{token}', store.state.token)
store.dispatch('logout') // logout without redirect
}
+
+const isActive = (tabRoute) => {
+ return tabRoute === route.name
+}