update

Author: TusharW4ni

app/app.vue

@@ -6,40 +6,46 @@
   const { data: session } = await authClient.useSession(useFetch)
 
   const items = computed<NavigationMenuItem[]>(() => {
-    const baseItems: NavigationMenuItem[] = [
-      {
-        label: 'Dashboard',
-        to: '/',
-        icon: 'i-lucide-layout-dashboard',
-      },
-      {
-        label: 'Rides',
-        to: '/rides',
-        icon: 'i-lucide-car',
-      },
-      {
-        label: 'People',
-        to: '/people',
-        icon: 'i-lucide-users',
-      },
-    ]
+    const role = session.value?.user?.role
 
-    if (session.value?.user?.role === 'ADMIN') {
-      baseItems.push({
-        label: 'Admins',
-        to: '/admin',
-        icon: 'i-lucide-shield-check',
-      })
+    if (role === 'VOLUNTEER') {
+      return [
+        {
+          label: 'Rides',
+          to: '/rides',
+          icon: 'i-lucide-car',
+        },
+      ]
+    }
+
+    if (role === 'ADMIN') {
+      return [
+        {
+          label: 'Dashboard',
+          to: '/',
+          icon: 'i-lucide-layout-dashboard',
+        },
+        {
+          label: 'Rides',
+          to: '/rides',
+          icon: 'i-lucide-car',
+        },
+        {
+          label: 'People',
+          to: '/people',
+          icon: 'i-lucide-users',
+        },
+      ]
     }
 
-    return baseItems
+    return []
   })
 
   async function handleLogout() {
     await authClient.signOut({
       fetchOptions: {
         onSuccess: () => {
-          navigateTo('/auth')
+          window.location.href = '/auth'
         },
       },
     })

app/middleware/auth.global.ts

@@ -7,5 +7,14 @@ export default defineNuxtRouteMiddleware(async (to) => {
     if (to.path !== '/auth') {
       return navigateTo('/auth')
     }
+  } else {
+    // User is logged in
+    const role = session.value.user.role
+    if (role === 'VOLUNTEER') {
+      // Volunteers can only access /rides and its sub-paths
+      if (!to.path.startsWith('/rides')) {
+        return navigateTo('/rides')
+      }
+    }
   }
 })

app/pages/auth.vue

@@ -45,12 +45,15 @@
         otp: state.otp.join(''),
       })
 
-      const user = await $fetch(`/api/get/users/byEmail/${data.user.email}`)
-
       if (error) {
         toast.add({ title: 'Error', description: error.message, color: 'error' })
       } else {
-        await navigateTo('/', { external: true })
+        const role = data.user.role
+        if (role === 'VOLUNTEER') {
+          await navigateTo('/rides', { external: true })
+        } else {
+          await navigateTo('/', { external: true })
+        }
       }
     }
   }
@@ -78,9 +81,20 @@
           />
         </UFormField>
 
-        <UButton loading-auto type="submit" class="w-full justify-center">
-          {{ isEmailSent ? 'Login' : 'Send OTP' }}
-        </UButton>
+        <div class="flex gap-2">
+          <UButton
+            v-if="isEmailSent"
+            color="neutral"
+            variant="ghost"
+            class="flex-1 justify-center"
+            @click="isEmailSent = false"
+          >
+            Back
+          </UButton>
+          <UButton loading-auto type="submit" class="flex-1 justify-center">
+            {{ isEmailSent ? 'Login' : 'Send OTP' }}
+          </UButton>
+        </div>
       </UForm>
     </UCard>
   </div>