flfeders/FEDEO
2
1
Fork 0
Code Issues 62 Pull Requests Actions Packages Projects 21 Releases Wiki Activity

Fixed Loading Error at Login/Tenant Switch

Browse Source
This commit is contained in:
florianfederspiel
2025-09-16 17:33:57 +02:00
parent cd1d9f4cf2
commit 95a122c4bf
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/TenantDropdown.vue
View File

@@ -15,7 +15,7 @@ const selectedTenant = ref(auth.user.tenant_id)
v-model="selectedTenant" v-model="selectedTenant"
> >
<UButton color="gray" variant="ghost" :class="[open && 'bg-gray-50 dark:bg-gray-800']" class="w-full"> <UButton color="gray" variant="ghost" :class="[open && 'bg-gray-50 dark:bg-gray-800']" class="w-full">
<UAvatar :alt="auth.tenants.find(i => auth.activeTenant === i.id).name" size="md" /> <UAvatar :alt="auth.activeTenantData?.name" size="md" />
<span class="truncate text-gray-900 dark:text-white font-semibold">{{auth.tenants.find(i => auth.activeTenant === i.id).name}}</span> <span class="truncate text-gray-900 dark:text-white font-semibold">{{auth.tenants.find(i => auth.activeTenant === i.id).name}}</span>
</UButton> </UButton>

6
layouts/default.vue
View File

@@ -114,7 +114,7 @@ const footerLinks = [
<template> <template>
<div v-if="!auth.loading"> <div v-if="!auth.loading">
<div v-if="auth.tenants.find(t => t.id === auth.activeTenant).locked === 'maintenance_tenant'"> <div v-if="auth.activeTenantData?.locked === 'maintenance_tenant'">
<UContainer class="min-h-screen flex items-center justify-center bg-gray-50 dark:bg-gray-900"> <UContainer class="min-h-screen flex items-center justify-center bg-gray-50 dark:bg-gray-900">
<UCard class="max-w-lg text-center p-10"> <UCard class="max-w-lg text-center p-10">
<UColorModeImage <UColorModeImage
@@ -151,7 +151,7 @@ const footerLinks = [
</UCard> </UCard>
</UContainer> </UContainer>
</div> </div>
<div v-else-if="auth.tenants.find(t => t.id === auth.activeTenant).locked === 'maintenance'"> <div v-else-if="auth.activeTenantData?.locked === 'maintenance'">
<UContainer class="min-h-screen flex items-center justify-center bg-gray-50 dark:bg-gray-900"> <UContainer class="min-h-screen flex items-center justify-center bg-gray-50 dark:bg-gray-900">
<UCard class="max-w-lg text-center p-10"> <UCard class="max-w-lg text-center p-10">
<UColorModeImage <UColorModeImage
@@ -181,7 +181,7 @@ const footerLinks = [
</UCard> </UCard>
</UContainer> </UContainer>
</div> </div>
<div v-else-if="auth.tenants.find(t => t.id === auth.activeTenant).locked === 'no_subscription'"> <div v-else-if="auth.activeTenantData?.locked === 'no_subscription'">
<UContainer class="min-h-screen flex items-center justify-center bg-gray-50 dark:bg-gray-900"> <UContainer class="min-h-screen flex items-center justify-center bg-gray-50 dark:bg-gray-900">
<UCard class="max-w-lg text-center p-10"> <UCard class="max-w-lg text-center p-10">
<UColorModeImage <UColorModeImage

1
stores/auth.ts
View File

@@ -15,6 +15,7 @@ export const useAuthStore = defineStore("auth", {
actions: { actions: {
async init(token) { async init(token) {
await this.fetchMe(token) await this.fetchMe(token)
navigateTo("/")
}, },
async login(email: string, password: string) { async login(email: string, password: string) {