From 9a12d6b6fa5b2f9becabe9af2915fa4e97446b08 Mon Sep 17 00:00:00 2001 From: ChatonDeAru <823314+chatondearu@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:04:41 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fixing=20routing=20after=20reset?= =?UTF-8?q?=20password=20success?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/app/components/FOHeader.vue | 4 ++-- modules/app/middleware/admin.ts | 4 ++-- modules/app/pages/profile/auth/reset.vue | 2 +- modules/app/pages/profile/index.vue | 2 +- modules/app/stores/{profile.ts => member.ts} | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename modules/app/stores/{profile.ts => member.ts} (93%) diff --git a/modules/app/components/FOHeader.vue b/modules/app/components/FOHeader.vue index ff07209..3d2bd04 100644 --- a/modules/app/components/FOHeader.vue +++ b/modules/app/components/FOHeader.vue @@ -6,7 +6,7 @@ defineOptions({ }) const router = useRouter() -const { user, displayName, waitingMailValidation, loading } = storeToRefs(useProfile()) +const { user, displayName, waitingMailValidation, loading } = storeToRefs(useMember()) const { auth } = useSupabaseClient() const { showErrorPage } = useErrorSystem() @@ -32,7 +32,7 @@ const signOut = async () => { const { error } = await auth.signOut() showErrorPage(error) - router.push('/') + router.push('/signin') } diff --git a/modules/app/middleware/admin.ts b/modules/app/middleware/admin.ts index 7a1c969..96487e8 100644 --- a/modules/app/middleware/admin.ts +++ b/modules/app/middleware/admin.ts @@ -1,7 +1,7 @@ export default defineNuxtRouteMiddleware((to, _from) => { - const { roles } = storeToRefs(useProfile()) + const { roles } = storeToRefs(useMember()) - if (!roles.value.incllude('admin')) { + if (!roles.value.include('admin')) { return navigateTo('/') } }) \ No newline at end of file diff --git a/modules/app/pages/profile/auth/reset.vue b/modules/app/pages/profile/auth/reset.vue index 1b7fa05..c48701d 100644 --- a/modules/app/pages/profile/auth/reset.vue +++ b/modules/app/pages/profile/auth/reset.vue @@ -8,6 +8,6 @@ const router = useRouter() \ No newline at end of file diff --git a/modules/app/pages/profile/index.vue b/modules/app/pages/profile/index.vue index 9e28b07..9653a98 100644 --- a/modules/app/pages/profile/index.vue +++ b/modules/app/pages/profile/index.vue @@ -5,7 +5,7 @@ definePageMeta({ name: 'Profile', }) -const { displayName, profile } = storeToRefs(useProfile()) +const { displayName, profile } = storeToRefs(useMember()) const isPasswordModalOpen = ref(false) const isEmailModalOpen = ref(false) diff --git a/modules/app/stores/profile.ts b/modules/app/stores/member.ts similarity index 93% rename from modules/app/stores/profile.ts rename to modules/app/stores/member.ts index 586eae1..607c16b 100644 --- a/modules/app/stores/profile.ts +++ b/modules/app/stores/member.ts @@ -7,7 +7,7 @@ // }, // } -export const useProfile = defineStore('profile', () => { +export const useMember = defineStore('member', () => { const user = useSupabaseUser() const client = useSupabaseClient() const { showErrorPage } = useErrorSystem() @@ -85,5 +85,5 @@ export const useProfile = defineStore('profile', () => { }) if (import.meta.hot) { - import.meta.hot.accept(acceptHMRUpdate(useProfile, import.meta.hot)) + import.meta.hot.accept(acceptHMRUpdate(useMember, import.meta.hot)) } \ No newline at end of file