From bb04b14b55664de34bdd0b2c098b668372926ea8 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 15 Feb 2026 09:28:44 +0000
Subject: [PATCH 1/3] feat: add user onboarding flow and clarify org/team
 hierarchy

- Add multi-step onboarding page (/onboarding) that guides new users
  through workspace creation and team invitations
- Update middleware to redirect users without organizations to onboarding
- Redirect signup to onboarding instead of dashboard
- Login checks for org membership and redirects to onboarding if needed
- Rename "Organization" to "Workspace" throughout settings UI
- Rename "Team" tab to "Teams" in settings
- Hide default team from team list and TeamSwitcher dropdown
- TeamSwitcher now shows org name as primary context with building icon
- Additional teams shown as optional sub-groups under workspace
- Empty state for teams explains the workspace-first model
- Sidebar "Team" link renamed to "Members" pointing to workspace tab

https://claude.ai/code/session_014ACXuHTJ4gc7oH6woD9dXo
---
 components/settings/SettingsOrganization.vue |  51 +--
 components/settings/SettingsTeam.vue         |  51 ++-
 components/sidebar/AppSidebar.vue            |   4 +-
 components/sidebar/TeamSwitcher.vue          |  74 +++-
 middleware/auth.global.ts                    |  29 +-
 pages/login/index.vue                        |  12 +-
 pages/onboarding/index.vue                   | 406 +++++++++++++++++++
 pages/settings/index.vue                     |   4 +-
 pages/signup/index.vue                       |   4 +-
 9 files changed, 572 insertions(+), 63 deletions(-)
 create mode 100644 pages/onboarding/index.vue

diff --git a/components/settings/SettingsOrganization.vue b/components/settings/SettingsOrganization.vue
index 9117c72..9ea1024 100644
--- a/components/settings/SettingsOrganization.vue
+++ b/components/settings/SettingsOrganization.vue
@@ -5,9 +5,9 @@
       <CardHeader>
         <CardTitle class="flex items-center gap-2">
           <Icon name="lucide:building-2" class="h-5 w-5" />
-          <span data-testid="organization-title">Organization Settings</span>
+          <span data-testid="organization-title">Workspace Settings</span>
         </CardTitle>
-        <CardDescription>Manage your organization profile and URL namespace.</CardDescription>
+        <CardDescription>Manage your workspace profile and URL namespace. Your workspace is the shared space where your team collaborates.</CardDescription>
       </CardHeader>
       <CardContent class="space-y-4">
         <div v-if="isLoading" class="space-y-3">
@@ -17,12 +17,12 @@
         </div>
 
         <div v-else-if="!organizationDetails" class="text-sm text-muted-foreground">
-          No active organization context is available.
+          No active workspace context is available.
         </div>
 
         <template v-else>
           <div class="space-y-2">
-            <Label for="organization-name">Organization Name</Label>
+            <Label for="organization-name">Workspace Name</Label>
             <Input
               id="organization-name"
               data-testid="organization-name-input"
@@ -33,7 +33,7 @@
           </div>
 
           <div class="space-y-2">
-            <Label for="organization-slug">Organization Slug</Label>
+            <Label for="organization-slug">Workspace URL</Label>
             <Input
               id="organization-slug"
               data-testid="organization-slug-input"
@@ -59,7 +59,7 @@
 
           <div class="flex items-center justify-between gap-3">
             <p v-if="!canEditOrganization" class="text-sm text-muted-foreground">
-              Only owners and admins can update organization details.
+              Only owners and admins can update workspace details.
             </p>
             <div class="ml-auto">
               <Button
@@ -68,7 +68,7 @@
                 @click="updateOrganization"
               >
                 <Icon v-if="isSaving" name="lucide:loader-2" class="h-4 w-4 mr-2 animate-spin" />
-                Save Organization
+                Save Changes
               </Button>
             </div>
           </div>
@@ -85,7 +85,7 @@
               <Icon name="lucide:users" class="h-5 w-5" />
               Members
             </CardTitle>
-            <CardDescription>Manage organization members and their roles.</CardDescription>
+            <CardDescription>Manage workspace members and their roles. All members have access to shared projects.</CardDescription>
           </div>
           <Button v-if="canManageMembers" size="sm" @click="showInviteDialog = true">
             <Icon name="lucide:user-plus" class="h-4 w-4 mr-2" />
@@ -120,9 +120,9 @@
                   <span v-if="m.userId === currentUserId" class="text-xs text-muted-foreground">(you)</span>
                 </p>
                 <p class="text-xs text-muted-foreground truncate">{{ m.email }}</p>
-                <div v-if="m.teams && m.teams.length > 0" class="flex flex-wrap gap-1 mt-1">
+                <div v-if="nonDefaultTeams(m.teams).length > 0" class="flex flex-wrap gap-1 mt-1">
                   <Badge
-                    v-for="t in m.teams"
+                    v-for="t in nonDefaultTeams(m.teams)"
                     :key="t.id"
                     variant="outline"
                     class="text-xs"
@@ -229,11 +229,11 @@
           <Icon name="lucide:alert-triangle" class="h-5 w-5" />
           Danger Zone
         </CardTitle>
-        <CardDescription>Permanently delete this organization and all related data.</CardDescription>
+        <CardDescription>Permanently delete this workspace and all related data.</CardDescription>
       </CardHeader>
       <CardContent>
         <p v-if="!canDeleteOrganization" class="text-sm text-muted-foreground mb-3">
-          Only organization owners can delete the organization.
+          Only workspace owners can delete the workspace.
         </p>
         <Button
           data-testid="organization-open-delete-dialog"
@@ -241,7 +241,7 @@
           :disabled="!canDeleteOrganization"
           @click="showDeleteDialog = true"
         >
-          Delete Organization
+          Delete Workspace
         </Button>
       </CardContent>
     </Card>
@@ -254,7 +254,7 @@
           <DialogDescription>
             Are you sure you want to remove
             <strong>{{ memberToRemove?.name || memberToRemove?.email }}</strong>
-            from this organization? They will lose access to all organization resources.
+            from this workspace? They will lose access to all workspace resources.
           </DialogDescription>
         </DialogHeader>
         <DialogFooter>
@@ -276,7 +276,7 @@
       <DialogContent>
         <DialogHeader>
           <DialogTitle>Invite Member</DialogTitle>
-          <DialogDescription>Send an invitation to join this organization.</DialogDescription>
+          <DialogDescription>Send an invitation to join this workspace.</DialogDescription>
         </DialogHeader>
         <div class="space-y-4 py-4">
           <div class="space-y-2">
@@ -316,7 +316,7 @@
     <Dialog :open="showDeleteDialog" @update:open="showDeleteDialog = $event">
       <DialogContent>
         <DialogHeader>
-          <DialogTitle class="text-red-600">Delete Organization</DialogTitle>
+          <DialogTitle class="text-red-600">Delete Workspace</DialogTitle>
           <DialogDescription>
             Type <strong>{{ organizationDetails?.slug }}</strong> to confirm permanent deletion.
           </DialogDescription>
@@ -337,7 +337,7 @@
             @click="deleteOrganization"
           >
             <Icon v-if="isDeleting" name="lucide:loader-2" class="h-4 w-4 mr-2 animate-spin" />
-            Delete Organization
+            Delete Workspace
           </Button>
         </DialogFooter>
       </DialogContent>
@@ -445,7 +445,7 @@ export default {
         }
       } catch (error) {
         console.error('Error loading organization settings:', error)
-        toast.error('Failed to load organization settings')
+        toast.error('Failed to load workspace settings')
       } finally {
         this.isLoading = false
       }
@@ -458,6 +458,11 @@ export default {
       this.organizationLogo = this.organizationDetails.logo || ''
     },
 
+    nonDefaultTeams(teams) {
+      if (!teams || !Array.isArray(teams)) return []
+      return teams.filter((t) => t.name !== 'Default')
+    },
+
     getInitials(name) {
       if (!name) return '?'
       return name
@@ -593,7 +598,7 @@ export default {
         this.organizationDetails.memberCount--
         this.showRemoveMemberDialog = false
         this.memberToRemove = null
-        toast.success('Member removed from organization')
+        toast.success('Member removed from workspace')
       } catch (error) {
         console.error('Error removing member:', error)
         toast.error(error?.data?.error?.message || 'Failed to remove member')
@@ -653,10 +658,10 @@ export default {
         })
         this.organizationDetails = response.data
         this.setFormValues()
-        toast.success('Organization updated')
+        toast.success('Workspace updated')
       } catch (error) {
         console.error('Error updating organization:', error)
-        toast.error(error?.data?.error?.message || error?.statusMessage || 'Failed to update organization')
+        toast.error(error?.data?.error?.message || error?.statusMessage || 'Failed to update workspace')
       } finally {
         this.isSaving = false
       }
@@ -675,11 +680,11 @@ export default {
         this.showDeleteDialog = false
         this.deleteConfirmation = ''
         this.organizationDetails = null
-        toast.success('Organization deleted')
+        toast.success('Workspace deleted')
         await navigateTo('/settings#team')
       } catch (error) {
         console.error('Error deleting organization:', error)
-        toast.error(error?.data?.error?.message || error?.statusMessage || 'Failed to delete organization')
+        toast.error(error?.data?.error?.message || error?.statusMessage || 'Failed to delete workspace')
       } finally {
         this.isDeleting = false
       }
diff --git a/components/settings/SettingsTeam.vue b/components/settings/SettingsTeam.vue
index 8c3714e..968d70c 100644
--- a/components/settings/SettingsTeam.vue
+++ b/components/settings/SettingsTeam.vue
@@ -1,15 +1,17 @@
 <template>
   <div class="space-y-6">
-    <!-- Your Teams -->
+    <!-- Explanation -->
     <Card>
       <CardHeader>
         <div class="flex items-center justify-between">
           <div>
             <CardTitle class="flex items-center gap-2">
               <Icon name="lucide:users" class="h-5 w-5" />
-              <span data-testid="team-title">Your Teams</span>
+              <span data-testid="team-title">Teams</span>
             </CardTitle>
-            <CardDescription>All teams you belong to across organizations.</CardDescription>
+            <CardDescription>
+              Your workspace operates as a single shared space by default. Create additional teams to organize different projects or departments separately.
+            </CardDescription>
           </div>
           <Button data-testid="team-open-create-dialog" size="sm" @click="showCreateTeamDialog = true">
             <Icon name="lucide:plus" class="h-4 w-4 mr-2" />
@@ -23,16 +25,25 @@
           <Skeleton class="h-14 w-full" />
         </div>
 
-        <div v-else-if="allTeams.length === 0" class="text-center py-6">
-          <p class="text-muted-foreground">No teams found. Create a team to get started.</p>
-          <Button data-testid="team-open-create-dialog" class="mt-3" @click="showCreateTeamDialog = true">
-            Create Team
+        <div v-else-if="additionalTeams.length === 0" class="text-center py-8">
+          <div class="flex justify-center mb-4">
+            <div class="flex items-center justify-center w-12 h-12 rounded-full bg-muted">
+              <Icon name="lucide:users" class="w-6 h-6 text-muted-foreground" />
+            </div>
+          </div>
+          <p class="font-medium mb-1">No additional teams</p>
+          <p class="text-sm text-muted-foreground max-w-sm mx-auto">
+            All workspace members share access to projects. Create a team when you need separate groups for different projects or departments.
+          </p>
+          <Button data-testid="team-open-create-dialog" class="mt-4" variant="outline" @click="showCreateTeamDialog = true">
+            <Icon name="lucide:plus" class="h-4 w-4 mr-2" />
+            Create your first team
           </Button>
         </div>
 
         <div v-else class="space-y-2">
           <button
-            v-for="team in allTeams"
+            v-for="team in additionalTeams"
             :key="team.id"
             :data-testid="`team-list-item-${team.id}`"
             class="w-full flex items-center justify-between rounded-lg border p-3 text-left transition-colors hover:bg-accent/50"
@@ -58,7 +69,7 @@
     </Card>
 
     <!-- Active Team Settings -->
-    <Card v-if="currentTeam">
+    <Card v-if="currentTeam && !isDefaultTeam(currentTeam)">
       <CardHeader>
         <CardTitle class="flex items-center gap-2">
           <Icon name="lucide:settings" class="h-5 w-5" />
@@ -88,7 +99,7 @@
     </Card>
 
     <!-- Team Members -->
-    <Card v-if="currentTeam">
+    <Card v-if="currentTeam && !isDefaultTeam(currentTeam)">
       <CardHeader>
         <CardTitle class="flex items-center gap-2">
           <Icon name="lucide:user-plus" class="h-5 w-5" />
@@ -143,7 +154,7 @@
     </Card>
 
     <!-- Danger Zone -->
-    <Card v-if="currentTeam" class="border-red-200">
+    <Card v-if="currentTeam && !isDefaultTeam(currentTeam)" class="border-red-200">
       <CardHeader>
         <CardTitle class="flex items-center gap-2 text-red-600">
           <Icon name="lucide:alert-triangle" class="h-5 w-5" />
@@ -160,7 +171,7 @@
       <DialogContent>
         <DialogHeader>
           <DialogTitle>Create Team</DialogTitle>
-          <DialogDescription>Create a new operational team in your current organization.</DialogDescription>
+          <DialogDescription>Create a new team to organize a separate group of projects. Team members will have their own workspace context.</DialogDescription>
         </DialogHeader>
         <div class="space-y-4 py-4">
           <div class="space-y-2">
@@ -194,7 +205,7 @@
       <DialogContent>
         <DialogHeader>
           <DialogTitle>Invite to Team</DialogTitle>
-          <DialogDescription>Invite a user directly into this team workspace.</DialogDescription>
+          <DialogDescription>Invite a user directly into this team.</DialogDescription>
         </DialogHeader>
         <div class="space-y-4 py-4">
           <div class="space-y-2">
@@ -289,6 +300,9 @@ export default {
         (this.teamSlug.trim() && this.teamSlug.trim() !== this.currentTeam?.slug)
       )
     },
+    additionalTeams() {
+      return this.allTeams.filter((t) => !this.isDefaultTeam(t))
+    },
   },
 
   async mounted() {
@@ -306,6 +320,11 @@ export default {
   },
 
   methods: {
+    isDefaultTeam(team) {
+      if (!team) return false
+      return team.name === 'Default'
+    },
+
     async fetchActiveTeam() {
       try {
         const response = await $fetch('/api/teams/active')
@@ -414,7 +433,7 @@ export default {
     },
 
     async loadTeamMembers() {
-      if (!this.currentTeam?.id) {
+      if (!this.currentTeam?.id || this.isDefaultTeam(this.currentTeam)) {
         this.teamMembers = []
         return
       }
@@ -543,7 +562,7 @@ export default {
 
       const organizationId = await this.resolveOrganizationId()
       if (!organizationId) {
-        toast.error('No active organization context')
+        toast.error('No active workspace context')
         return
       }
 
@@ -596,7 +615,7 @@ export default {
 
       const organizationId = await this.resolveOrganizationId()
       if (!organizationId) {
-        toast.error('No active organization context')
+        toast.error('No active workspace context')
         return
       }
 
diff --git a/components/sidebar/AppSidebar.vue b/components/sidebar/AppSidebar.vue
index 7e459e9..2f6b8e8 100644
--- a/components/sidebar/AppSidebar.vue
+++ b/components/sidebar/AppSidebar.vue
@@ -53,8 +53,8 @@ const managementItems = [
     icon: 'lucide:package',
   },
   {
-    title: 'Team',
-    url: '/settings#team',
+    title: 'Members',
+    url: '/settings#organization',
     icon: 'lucide:user-plus',
   },
 ]
diff --git a/components/sidebar/TeamSwitcher.vue b/components/sidebar/TeamSwitcher.vue
index 19cdc7b..522aa6a 100644
--- a/components/sidebar/TeamSwitcher.vue
+++ b/components/sidebar/TeamSwitcher.vue
@@ -13,30 +13,32 @@
               class="flex aspect-square size-8 items-center justify-center rounded-lg bg-sidebar-primary text-sidebar-primary-foreground"
             >
               <Icon v-if="isLoadingTeams" name="lucide:loader-2" class="size-4 animate-spin" />
-              <Icon v-else name="lucide:users" class="size-4" />
+              <Icon v-else name="lucide:building-2" class="size-4" />
             </div>
 
             <div class="grid flex-1 text-left text-sm leading-tight">
               <template v-if="isLoadingTeams">
-                <span class="truncate">Loading teams...</span>
+                <span class="truncate">Loading...</span>
                 <span class="truncate text-xs text-muted-foreground">Please wait</span>
               </template>
 
-              <template v-else-if="activeTeam">
-                <span data-testid="team-switcher-active-name" class="truncate font-semibold">{{ activeTeam.name }}</span>
+              <template v-else-if="activeOrganization">
+                <span data-testid="team-switcher-active-name" class="truncate font-semibold">
+                  {{ displayName }}
+                </span>
                 <span data-testid="team-switcher-active-org" class="truncate text-xs text-muted-foreground">
-                  {{ activeOrganization?.name || 'No governance context' }}
+                  {{ displaySubtitle }}
                 </span>
               </template>
 
               <template v-else-if="teamsError">
-                <span class="truncate font-semibold text-red-500"> Error loading teams </span>
+                <span class="truncate font-semibold text-red-500"> Error loading </span>
                 <span class="truncate text-xs text-red-400">Please refresh</span>
               </template>
 
               <template v-else>
-                <span class="truncate font-semibold"> Select team </span>
-                <span class="truncate text-xs text-muted-foreground">No team active</span>
+                <span class="truncate font-semibold"> Select workspace </span>
+                <span class="truncate text-xs text-muted-foreground">No workspace active</span>
               </template>
             </div>
             <Icon name="lucide:chevrons-up-down" class="ml-auto" />
@@ -48,12 +50,10 @@
           :side="isMobile ? 'bottom' : 'right'"
           :side-offset="4"
         >
-          <DropdownMenuLabel class="text-xs text-muted-foreground"> Teams </DropdownMenuLabel>
-
           <div v-if="isLoadingTeams" class="p-2">
             <div class="flex items-center gap-2 text-muted-foreground">
               <Icon name="lucide:loader-2" class="size-4 animate-spin" />
-              <span class="text-sm">Loading teams...</span>
+              <span class="text-sm">Loading...</span>
             </div>
           </div>
 
@@ -69,14 +69,29 @@
           </div>
 
           <template v-else>
-            <DropdownMenuItem v-for="team in teams" :key="team.id" class="gap-2 p-2" @click="setActiveTeam(team)">
+            <!-- Workspace (default) option -->
+            <DropdownMenuLabel class="text-xs text-muted-foreground"> Workspace </DropdownMenuLabel>
+            <DropdownMenuItem class="gap-2 p-2" @click="switchToDefaultTeam">
               <div class="flex size-6 items-center justify-center rounded-sm border">
-                <Icon name="lucide:users" class="size-4 shrink-0" />
+                <Icon name="lucide:building-2" class="size-4 shrink-0" />
               </div>
-              <span :data-testid="`team-switcher-item-${team.id}`" class="flex-1">{{ team.name }}</span>
-              <Icon v-if="activeTeam?.id === team.id" name="lucide:check" class="size-4 text-primary" />
+              <span class="flex-1">{{ activeOrganization?.name || 'Workspace' }}</span>
+              <Icon v-if="isOnDefaultTeam" name="lucide:check" class="size-4 text-primary" />
             </DropdownMenuItem>
 
+            <!-- Additional teams -->
+            <template v-if="additionalTeams.length > 0">
+              <DropdownMenuSeparator />
+              <DropdownMenuLabel class="text-xs text-muted-foreground"> Teams </DropdownMenuLabel>
+              <DropdownMenuItem v-for="team in additionalTeams" :key="team.id" class="gap-2 p-2" @click="setActiveTeam(team)">
+                <div class="flex size-6 items-center justify-center rounded-sm border">
+                  <Icon name="lucide:users" class="size-4 shrink-0" />
+                </div>
+                <span :data-testid="`team-switcher-item-${team.id}`" class="flex-1">{{ team.name }}</span>
+                <Icon v-if="activeTeam?.id === team.id" name="lucide:check" class="size-4 text-primary" />
+              </DropdownMenuItem>
+            </template>
+
             <DropdownMenuSeparator />
             <DropdownMenuItem data-testid="team-switcher-manage" class="gap-2 p-2" @click="goToTeamSettings">
               <div class="flex size-6 items-center justify-center rounded-md border bg-background">
@@ -141,6 +156,29 @@ export default {
       }
       return false
     },
+
+    additionalTeams() {
+      return this.teams.filter((t) => t.name !== 'Default')
+    },
+
+    isOnDefaultTeam() {
+      if (!this.activeTeam) return true
+      return this.activeTeam.name === 'Default'
+    },
+
+    displayName() {
+      if (!this.activeTeam || this.activeTeam.name === 'Default') {
+        return this.activeOrganization?.name || 'Workspace'
+      }
+      return this.activeTeam.name
+    },
+
+    displaySubtitle() {
+      if (!this.activeTeam || this.activeTeam.name === 'Default') {
+        return this.additionalTeams.length > 0 ? 'All projects' : 'Workspace'
+      }
+      return this.activeOrganization?.name || ''
+    },
   },
 
   async mounted() {
@@ -231,6 +269,12 @@ export default {
       }
     },
 
+    async switchToDefaultTeam() {
+      const defaultTeam = this.teams.find((t) => t.name === 'Default')
+      if (!defaultTeam || defaultTeam.id === this.activeTeam?.id) return
+      await this.setActiveTeam(defaultTeam)
+    },
+
     async setActiveTeam(team) {
       if (team.id === this.activeTeam?.id) return
 
diff --git a/middleware/auth.global.ts b/middleware/auth.global.ts
index f10c6c6..1b9f48b 100644
--- a/middleware/auth.global.ts
+++ b/middleware/auth.global.ts
@@ -9,7 +9,7 @@ export default defineNuxtRouteMiddleware(async (to, _from) => {
   // On team subdomains, all routes are public. Redirect app routes to team root.
   const teamSubdomain = useState('teamSubdomain')
   if (teamSubdomain.value) {
-    const appRoutes = ['/dashboard', '/settings', '/reports', '/feedback', '/help', '/products', '/login', '/signup', '/auth']
+    const appRoutes = ['/dashboard', '/settings', '/reports', '/feedback', '/help', '/products', '/login', '/signup', '/auth', '/onboarding']
     if (appRoutes.some((r) => to.path.startsWith(r))) {
       return navigateTo('/')
     }
@@ -20,7 +20,7 @@ export default defineNuxtRouteMiddleware(async (to, _from) => {
     const { data: session } = await authClient.useSession(useFetch)
 
     // Protected routes that require authentication
-    const protectedRoutes = ['/dashboard', '/settings', '/reports', '/feedback', '/help', '/products']
+    const protectedRoutes = ['/dashboard', '/settings', '/reports', '/feedback', '/help', '/products', '/onboarding']
 
     // Auth routes that should redirect to dashboard if user is already logged in
     const authRoutes = ['/login', '/signup', '/auth']
@@ -29,6 +29,8 @@ export default defineNuxtRouteMiddleware(async (to, _from) => {
 
     const isAuthRoute = authRoutes.some((route) => to.path.startsWith(route))
 
+    const isOnboardingRoute = to.path.startsWith('/onboarding')
+
     if (isProtectedRoute && !session.value?.user) {
       // Redirect to login page if trying to access protected route without being logged in
       return navigateTo('/login')
@@ -38,6 +40,29 @@ export default defineNuxtRouteMiddleware(async (to, _from) => {
     if (isAuthRoute && session.value?.user) {
       return navigateTo('/dashboard')
     }
+
+    // Onboarding check: redirect users without organizations to onboarding
+    if (session.value?.user && isProtectedRoute && !isOnboardingRoute) {
+      const onboardingChecked = useState('onboarding-checked', () => false)
+      const needsOnboarding = useState('needs-onboarding', () => false)
+
+      if (!onboardingChecked.value) {
+        try {
+          const orgsResponse = await $fetch('/api/auth/organization/list')
+          const orgs = Array.isArray(orgsResponse) ? orgsResponse : (orgsResponse as any)?.data || []
+          needsOnboarding.value = orgs.length === 0
+          onboardingChecked.value = true
+        } catch (_error) {
+          // If check fails, don't block navigation
+          onboardingChecked.value = true
+          needsOnboarding.value = false
+        }
+      }
+
+      if (needsOnboarding.value) {
+        return navigateTo('/onboarding')
+      }
+    }
   } catch (error) {
     // If there's an error checking session, allow access but log the error
     console.error('Auth middleware error:', error)
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 7a21f47..b5e22d1 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -129,7 +129,17 @@ export default {
         if (result.error) {
           this.error = result.error.message || 'Sign in failed'
         } else {
-          // Success - redirect to dashboard
+          // Check if user has an organization; if not, redirect to onboarding
+          try {
+            const orgs = await authClient.organization.list()
+            const orgList = Array.isArray(orgs.data) ? orgs.data : []
+            if (orgList.length === 0) {
+              await navigateTo('/onboarding')
+              return
+            }
+          } catch (_e) {
+            // If check fails, proceed to dashboard
+          }
           await navigateTo('/dashboard')
         }
       } catch (err) {
diff --git a/pages/onboarding/index.vue b/pages/onboarding/index.vue
new file mode 100644
index 0000000..8cecd42
--- /dev/null
+++ b/pages/onboarding/index.vue
@@ -0,0 +1,406 @@
+<template>
+  <NuxtLayout name="clean">
+    <div class="min-h-screen flex items-center justify-center bg-background py-12 px-4 sm:px-6 lg:px-8">
+      <div class="w-full max-w-lg">
+        <!-- Step Indicator -->
+        <div class="flex items-center justify-center mb-8">
+          <div v-for="(step, index) in steps" :key="step.key" class="flex items-center">
+            <div
+              class="flex items-center justify-center w-8 h-8 rounded-full text-sm font-medium transition-colors"
+              :class="{
+                'bg-primary text-primary-foreground': currentStep === index,
+                'bg-primary text-primary-foreground': currentStep > index,
+                'bg-muted text-muted-foreground': currentStep < index,
+              }"
+            >
+              <Icon v-if="currentStep > index" name="lucide:check" class="w-4 h-4" />
+              <span v-else>{{ index + 1 }}</span>
+            </div>
+            <div
+              v-if="index < steps.length - 1"
+              class="w-12 h-0.5 mx-2 transition-colors"
+              :class="currentStep > index ? 'bg-primary' : 'bg-muted'"
+            />
+          </div>
+        </div>
+
+        <!-- Step 1: Create Workspace -->
+        <Card v-if="currentStep === 0">
+          <CardHeader class="text-center">
+            <div class="flex justify-center mb-4">
+              <div class="flex items-center justify-center w-12 h-12 rounded-full bg-primary/10">
+                <Icon name="lucide:building-2" class="w-6 h-6 text-primary" />
+              </div>
+            </div>
+            <CardTitle class="text-2xl">Create your workspace</CardTitle>
+            <CardDescription>
+              A workspace is where your team collaborates on feedback and projects. You can think of it as your company or organization.
+            </CardDescription>
+          </CardHeader>
+          <CardContent>
+            <form @submit.prevent="createWorkspace" class="space-y-4">
+              <div class="space-y-2">
+                <Label for="org-name">Workspace name</Label>
+                <Input
+                  id="org-name"
+                  v-model="orgName"
+                  placeholder="Acme Inc."
+                  :disabled="isCreatingOrg"
+                  @input="generateSlug"
+                />
+              </div>
+              <div class="space-y-2">
+                <Label for="org-slug">URL</Label>
+                <div class="flex items-center gap-2">
+                  <Input
+                    id="org-slug"
+                    v-model="orgSlug"
+                    placeholder="acme-inc"
+                    :disabled="isCreatingOrg"
+                    class="flex-1"
+                  />
+                  <span class="text-sm text-muted-foreground whitespace-nowrap">.veerify.com</span>
+                </div>
+                <p class="text-xs text-muted-foreground">
+                  This will be your public workspace URL. You can change it later.
+                </p>
+              </div>
+
+              <div
+                v-if="createOrgError"
+                class="p-3 bg-destructive/10 border border-destructive/20 text-destructive rounded-md text-sm"
+              >
+                {{ createOrgError }}
+              </div>
+
+              <Button type="submit" class="w-full" :disabled="isCreatingOrg || !orgName.trim() || !orgSlug.trim()">
+                <Icon v-if="isCreatingOrg" name="lucide:loader-2" class="w-4 h-4 mr-2 animate-spin" />
+                {{ isCreatingOrg ? 'Creating workspace...' : 'Create workspace' }}
+              </Button>
+            </form>
+          </CardContent>
+        </Card>
+
+        <!-- Step 2: Invite Members -->
+        <Card v-if="currentStep === 1">
+          <CardHeader class="text-center">
+            <div class="flex justify-center mb-4">
+              <div class="flex items-center justify-center w-12 h-12 rounded-full bg-primary/10">
+                <Icon name="lucide:user-plus" class="w-6 h-6 text-primary" />
+              </div>
+            </div>
+            <CardTitle class="text-2xl">Invite your team</CardTitle>
+            <CardDescription>
+              Veerify works best with your team. Add members now or invite them later from settings.
+            </CardDescription>
+          </CardHeader>
+          <CardContent>
+            <div class="space-y-4">
+              <div v-for="(invite, index) in inviteEmails" :key="index" class="flex items-center gap-2">
+                <Input
+                  v-model="inviteEmails[index]"
+                  type="email"
+                  :placeholder="index === 0 ? 'teammate@company.com' : 'Another teammate'"
+                  :disabled="isInviting"
+                />
+                <Button
+                  v-if="inviteEmails.length > 1"
+                  variant="ghost"
+                  size="icon"
+                  class="shrink-0"
+                  :disabled="isInviting"
+                  @click="removeInviteField(index)"
+                >
+                  <Icon name="lucide:x" class="w-4 h-4" />
+                </Button>
+              </div>
+
+              <Button
+                v-if="inviteEmails.length < 5"
+                variant="outline"
+                size="sm"
+                class="w-full"
+                :disabled="isInviting"
+                @click="addInviteField"
+              >
+                <Icon name="lucide:plus" class="w-4 h-4 mr-2" />
+                Add another
+              </Button>
+
+              <div
+                v-if="inviteError"
+                class="p-3 bg-destructive/10 border border-destructive/20 text-destructive rounded-md text-sm"
+              >
+                {{ inviteError }}
+              </div>
+
+              <div
+                v-if="inviteSuccess"
+                class="p-3 bg-green-500/10 border border-green-500/20 text-green-700 dark:text-green-400 rounded-md text-sm"
+              >
+                {{ inviteSuccess }}
+              </div>
+
+              <div class="flex flex-col gap-2 pt-2">
+                <Button
+                  :disabled="isInviting || !hasValidEmails"
+                  @click="sendInvitations"
+                >
+                  <Icon v-if="isInviting" name="lucide:loader-2" class="w-4 h-4 mr-2 animate-spin" />
+                  {{ isInviting ? 'Sending invitations...' : 'Send invitations' }}
+                </Button>
+                <Button variant="ghost" :disabled="isInviting" @click="skipInvitations">
+                  Skip for now
+                </Button>
+              </div>
+            </div>
+          </CardContent>
+        </Card>
+
+        <!-- Step 3: How it Works -->
+        <Card v-if="currentStep === 2">
+          <CardHeader class="text-center">
+            <div class="flex justify-center mb-4">
+              <div class="flex items-center justify-center w-12 h-12 rounded-full bg-primary/10">
+                <Icon name="lucide:sparkles" class="w-6 h-6 text-primary" />
+              </div>
+            </div>
+            <CardTitle class="text-2xl">You're all set!</CardTitle>
+            <CardDescription>
+              Your workspace <strong>{{ createdOrgName }}</strong> is ready to go.
+            </CardDescription>
+          </CardHeader>
+          <CardContent>
+            <div class="space-y-4">
+              <!-- Quick overview cards -->
+              <div class="grid gap-3">
+                <div class="flex items-start gap-3 rounded-lg border p-3">
+                  <div class="flex items-center justify-center w-8 h-8 rounded-md bg-blue-500/10 shrink-0">
+                    <Icon name="lucide:message-square" class="w-4 h-4 text-blue-600 dark:text-blue-400" />
+                  </div>
+                  <div>
+                    <p class="font-medium text-sm">Collect feedback</p>
+                    <p class="text-xs text-muted-foreground">Gather feature requests, bug reports, and ideas from your users.</p>
+                  </div>
+                </div>
+                <div class="flex items-start gap-3 rounded-lg border p-3">
+                  <div class="flex items-center justify-center w-8 h-8 rounded-md bg-purple-500/10 shrink-0">
+                    <Icon name="lucide:package" class="w-4 h-4 text-purple-600 dark:text-purple-400" />
+                  </div>
+                  <div>
+                    <p class="font-medium text-sm">Organize with projects</p>
+                    <p class="text-xs text-muted-foreground">Create projects for different products or areas. Need more separation? Create additional teams later.</p>
+                  </div>
+                </div>
+                <div class="flex items-start gap-3 rounded-lg border p-3">
+                  <div class="flex items-center justify-center w-8 h-8 rounded-md bg-green-500/10 shrink-0">
+                    <Icon name="lucide:users" class="w-4 h-4 text-green-600 dark:text-green-400" />
+                  </div>
+                  <div>
+                    <p class="font-medium text-sm">Collaborate with your team</p>
+                    <p class="text-xs text-muted-foreground">Everyone in your workspace has access. Invite more members anytime from settings.</p>
+                  </div>
+                </div>
+              </div>
+
+              <Button class="w-full" @click="goToDashboard">
+                Go to dashboard
+                <Icon name="lucide:arrow-right" class="w-4 h-4 ml-2" />
+              </Button>
+            </div>
+          </CardContent>
+        </Card>
+      </div>
+    </div>
+  </NuxtLayout>
+</template>
+
+<script>
+import { authClient } from '~/lib/auth-client'
+
+export default {
+  name: 'OnboardingPage',
+  layout: 'clean',
+
+  data() {
+    return {
+      currentStep: 0,
+      steps: [
+        { key: 'workspace', label: 'Create workspace' },
+        { key: 'invite', label: 'Invite team' },
+        { key: 'done', label: 'All set' },
+      ],
+
+      // Step 1: Create workspace
+      orgName: '',
+      orgSlug: '',
+      isCreatingOrg: false,
+      createOrgError: '',
+      createdOrgId: null,
+      createdOrgName: '',
+
+      // Step 2: Invite members
+      inviteEmails: [''],
+      isInviting: false,
+      inviteError: '',
+      inviteSuccess: '',
+
+      // Page state
+      isCheckingOrgs: true,
+    }
+  },
+
+  computed: {
+    hasValidEmails() {
+      const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+      return this.inviteEmails.some((email) => emailRegex.test(email.trim()))
+    },
+  },
+
+  async mounted() {
+    await this.checkExistingOrganizations()
+  },
+
+  methods: {
+    async checkExistingOrganizations() {
+      try {
+        this.isCheckingOrgs = true
+        const { data } = await authClient.organization.list()
+        const orgs = Array.isArray(data) ? data : []
+        if (orgs.length > 0) {
+          // User already has an org, skip onboarding
+          await navigateTo('/dashboard')
+        }
+      } catch (_error) {
+        // If check fails, show onboarding anyway
+      } finally {
+        this.isCheckingOrgs = false
+      }
+    },
+
+    generateSlug() {
+      this.orgSlug = this.orgName
+        .toLowerCase()
+        .replace(/[^a-z0-9\s-]/g, '')
+        .replace(/\s+/g, '-')
+        .replace(/-+/g, '-')
+        .replace(/^-|-$/g, '')
+    },
+
+    async createWorkspace() {
+      if (!this.orgName.trim() || !this.orgSlug.trim()) return
+
+      this.isCreatingOrg = true
+      this.createOrgError = ''
+
+      try {
+        const result = await authClient.organization.create({
+          name: this.orgName.trim(),
+          slug: this.orgSlug.trim(),
+        })
+
+        if (result.error) {
+          this.createOrgError = result.error.message || 'Failed to create workspace'
+          return
+        }
+
+        this.createdOrgId = result.data?.id || null
+        this.createdOrgName = this.orgName.trim()
+
+        // Set the new org as active
+        if (this.createdOrgId) {
+          await authClient.organization.setActive({
+            organizationId: this.createdOrgId,
+          })
+
+          // Resolve team context so the session has activeTeamId
+          await $fetch('/api/teams/active').catch(() => null)
+        }
+
+        this.currentStep = 1
+      } catch (error) {
+        this.createOrgError = error?.message || 'An unexpected error occurred'
+        console.error('Error creating workspace:', error)
+      } finally {
+        this.isCreatingOrg = false
+      }
+    },
+
+    addInviteField() {
+      if (this.inviteEmails.length < 5) {
+        this.inviteEmails.push('')
+      }
+    },
+
+    removeInviteField(index) {
+      this.inviteEmails.splice(index, 1)
+    },
+
+    async sendInvitations() {
+      if (!this.createdOrgId) return
+
+      const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+      const validEmails = this.inviteEmails
+        .map((e) => e.trim())
+        .filter((e) => emailRegex.test(e))
+
+      if (validEmails.length === 0) return
+
+      this.isInviting = true
+      this.inviteError = ''
+      this.inviteSuccess = ''
+
+      try {
+        let successCount = 0
+        const errors = []
+
+        for (const email of validEmails) {
+          try {
+            await authClient.organization.inviteMember({
+              organizationId: this.createdOrgId,
+              email,
+              role: 'member',
+            })
+            successCount++
+          } catch (error) {
+            errors.push(`${email}: ${error?.message || 'Failed to send'}`)
+          }
+        }
+
+        if (successCount > 0) {
+          this.inviteSuccess = `${successCount} invitation${successCount > 1 ? 's' : ''} sent successfully!`
+        }
+
+        if (errors.length > 0) {
+          this.inviteError = errors.join(', ')
+        }
+
+        // Move to next step after a brief delay to show success
+        if (successCount > 0) {
+          setTimeout(() => {
+            this.currentStep = 2
+          }, 1500)
+        }
+      } catch (error) {
+        this.inviteError = error?.message || 'Failed to send invitations'
+        console.error('Error sending invitations:', error)
+      } finally {
+        this.isInviting = false
+      }
+    },
+
+    skipInvitations() {
+      this.currentStep = 2
+    },
+
+    async goToDashboard() {
+      // Clear the onboarding check cache so middleware doesn't redirect back
+      if (import.meta.client) {
+        useState('onboarding-checked').value = true
+        useState('needs-onboarding').value = false
+      }
+      await navigateTo('/dashboard')
+    },
+  },
+}
+</script>
diff --git a/pages/settings/index.vue b/pages/settings/index.vue
index cfad44f..884dfa0 100644
--- a/pages/settings/index.vue
+++ b/pages/settings/index.vue
@@ -52,8 +52,8 @@ const allTabs = [
   { key: 'profile', label: 'Profile', icon: 'lucide:user' },
   { key: 'security', label: 'Security', icon: 'lucide:shield' },
   { key: 'notifications', label: 'Notifications', icon: 'lucide:bell' },
-  { key: 'organization', label: 'Organization', icon: 'lucide:building-2' },
-  { key: 'team', label: 'Team', icon: 'lucide:users' },
+  { key: 'organization', label: 'Workspace', icon: 'lucide:building-2' },
+  { key: 'team', label: 'Teams', icon: 'lucide:users' },
   { key: 'billing', label: 'Billing', icon: 'lucide:credit-card' },
   { key: 'appearance', label: 'Appearance', icon: 'lucide:palette' },
 ]
diff --git a/pages/signup/index.vue b/pages/signup/index.vue
index 9be0048..e6bc22a 100644
--- a/pages/signup/index.vue
+++ b/pages/signup/index.vue
@@ -140,8 +140,8 @@ export default {
         if (result.error) {
           this.error = result.error.message || 'Sign up failed'
         } else {
-          // Success - redirect to dashboard
-          await navigateTo('/dashboard')
+          // Success - redirect to onboarding to set up workspace
+          await navigateTo('/onboarding')
         }
       } catch (err) {
         this.error = 'An unexpected error occurred'

From 95262bcd60ae6782056ea73119c4582c517a1951 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 15 Feb 2026 23:59:33 +0000
Subject: [PATCH 2/3] feat: add personal account layer with optional workspace
 onboarding

Users now land on a personal dashboard after signup/login instead of
being forced through onboarding. The dashboard shows submission stats
and recent feedback when no workspace exists, with a CTA to create one.

- Add personal dashboard state for users without organizations
- Create /submissions page and GET /api/user/submissions endpoint
- Add always-visible Personal section to sidebar (My Submissions, Notifications)
- Remove forced onboarding redirect from middleware; onboarding is now CTA-accessible
- Add submissionMode column to project schema (anonymous vs account_required)
- Simplify login/signup to always redirect to /dashboard

https://claude.ai/code/session_014ACXuHTJ4gc7oH6woD9dXo
---
 components/sidebar/AppSidebar.vue  |  31 ++
 middleware/auth.global.ts          |  32 +-
 pages/dashboard/index.vue          | 455 +++++++++++++++++++++--------
 pages/login/index.vue              |  11 -
 pages/onboarding/index.vue         |  27 --
 pages/signup/index.vue             |   3 +-
 pages/submissions/index.vue        | 218 ++++++++++++++
 server/api/user/submissions.get.ts |  59 ++++
 server/database/schema/feedback.ts |   4 +
 9 files changed, 645 insertions(+), 195 deletions(-)
 create mode 100644 pages/submissions/index.vue
 create mode 100644 server/api/user/submissions.get.ts

diff --git a/components/sidebar/AppSidebar.vue b/components/sidebar/AppSidebar.vue
index 2f6b8e8..515b3e8 100644
--- a/components/sidebar/AppSidebar.vue
+++ b/components/sidebar/AppSidebar.vue
@@ -20,6 +20,20 @@ const props = withDefaults(defineProps<SidebarProps>(), {
   collapsible: 'icon',
 })
 
+// Always-visible personal items
+const personalItems: SidebarNavItem[] = [
+  {
+    title: 'My Submissions',
+    url: '/submissions',
+    icon: 'lucide:list',
+  },
+  {
+    title: 'Notifications',
+    url: '/settings#notifications',
+    icon: 'lucide:bell',
+  },
+]
+
 // Define navigation items
 const feedbackItems: SidebarNavItem[] = [
   {
@@ -80,6 +94,23 @@ const supportItems = [
     </SidebarHeader>
 
     <SidebarContent>
+      <!-- Personal Section (always visible) -->
+      <SidebarGroup>
+        <SidebarGroupLabel>Personal</SidebarGroupLabel>
+        <SidebarGroupContent>
+          <SidebarMenu>
+            <SidebarMenuItem v-for="item in personalItems" :key="item.title">
+              <SidebarMenuButton as-child :tooltip="item.title">
+                <NuxtLink :to="item.url">
+                  <Icon :name="item.icon" class="w-5 h-5 shrink-0" />
+                  <span>{{ item.title }}</span>
+                </NuxtLink>
+              </SidebarMenuButton>
+            </SidebarMenuItem>
+          </SidebarMenu>
+        </SidebarGroupContent>
+      </SidebarGroup>
+
       <!-- Feedback Section -->
       <SidebarGroup>
         <SidebarGroupLabel>Feedback</SidebarGroupLabel>
diff --git a/middleware/auth.global.ts b/middleware/auth.global.ts
index 1b9f48b..63d201a 100644
--- a/middleware/auth.global.ts
+++ b/middleware/auth.global.ts
@@ -9,7 +9,7 @@ export default defineNuxtRouteMiddleware(async (to, _from) => {
   // On team subdomains, all routes are public. Redirect app routes to team root.
   const teamSubdomain = useState('teamSubdomain')
   if (teamSubdomain.value) {
-    const appRoutes = ['/dashboard', '/settings', '/reports', '/feedback', '/help', '/products', '/login', '/signup', '/auth', '/onboarding']
+    const appRoutes = ['/dashboard', '/settings', '/reports', '/feedback', '/help', '/products', '/login', '/signup', '/auth', '/onboarding', '/submissions']
     if (appRoutes.some((r) => to.path.startsWith(r))) {
       return navigateTo('/')
     }
@@ -20,7 +20,7 @@ export default defineNuxtRouteMiddleware(async (to, _from) => {
     const { data: session } = await authClient.useSession(useFetch)
 
     // Protected routes that require authentication
-    const protectedRoutes = ['/dashboard', '/settings', '/reports', '/feedback', '/help', '/products', '/onboarding']
+    const protectedRoutes = ['/dashboard', '/settings', '/reports', '/feedback', '/help', '/products', '/onboarding', '/submissions']
 
     // Auth routes that should redirect to dashboard if user is already logged in
     const authRoutes = ['/login', '/signup', '/auth']
@@ -29,42 +29,14 @@ export default defineNuxtRouteMiddleware(async (to, _from) => {
 
     const isAuthRoute = authRoutes.some((route) => to.path.startsWith(route))
 
-    const isOnboardingRoute = to.path.startsWith('/onboarding')
-
     if (isProtectedRoute && !session.value?.user) {
-      // Redirect to login page if trying to access protected route without being logged in
       return navigateTo('/login')
     }
 
-    // If user is logged in and trying to access auth routes, redirect to dashboard
     if (isAuthRoute && session.value?.user) {
       return navigateTo('/dashboard')
     }
-
-    // Onboarding check: redirect users without organizations to onboarding
-    if (session.value?.user && isProtectedRoute && !isOnboardingRoute) {
-      const onboardingChecked = useState('onboarding-checked', () => false)
-      const needsOnboarding = useState('needs-onboarding', () => false)
-
-      if (!onboardingChecked.value) {
-        try {
-          const orgsResponse = await $fetch('/api/auth/organization/list')
-          const orgs = Array.isArray(orgsResponse) ? orgsResponse : (orgsResponse as any)?.data || []
-          needsOnboarding.value = orgs.length === 0
-          onboardingChecked.value = true
-        } catch (_error) {
-          // If check fails, don't block navigation
-          onboardingChecked.value = true
-          needsOnboarding.value = false
-        }
-      }
-
-      if (needsOnboarding.value) {
-        return navigateTo('/onboarding')
-      }
-    }
   } catch (error) {
-    // If there's an error checking session, allow access but log the error
     console.error('Auth middleware error:', error)
   }
 })
diff --git a/pages/dashboard/index.vue b/pages/dashboard/index.vue
index 5ccad22..221e39c 100644
--- a/pages/dashboard/index.vue
+++ b/pages/dashboard/index.vue
@@ -1,170 +1,375 @@
 <template>
   <NuxtLayout name="dashboard">
     <div class="p-6">
-      <div class="mb-6">
-        <h1 class="text-3xl font-bold text-foreground">Dashboard</h1>
-        <p class="text-muted-foreground">Welcome to your Veerify feedback management dashboard</p>
+      <!-- Loading state -->
+      <div v-if="isLoading" class="space-y-6">
+        <Skeleton class="h-8 w-48" />
+        <Skeleton class="h-4 w-64" />
+        <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
+          <Skeleton class="h-24" />
+          <Skeleton class="h-24" />
+          <Skeleton class="h-24" />
+          <Skeleton class="h-24" />
+        </div>
       </div>
 
-      <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
-        <!-- Stats Cards -->
-        <div class="bg-card p-6 rounded-lg border border-border">
-          <div class="flex items-center">
-            <Icon name="lucide:message-square" class="w-8 h-8 text-blue-600 dark:text-blue-400" />
-            <div class="ml-4">
-              <p class="text-sm font-medium text-muted-foreground">Total Feedback</p>
-              <p class="text-2xl font-bold text-card-foreground">247</p>
-            </div>
-          </div>
+      <!-- Personal Dashboard (no workspace) -->
+      <template v-else-if="!hasOrganization">
+        <div class="mb-6">
+          <h1 class="text-3xl font-bold text-foreground">Welcome, {{ userName }}</h1>
+          <p class="text-muted-foreground">This is your personal dashboard. Track your feedback submissions and manage your account.</p>
         </div>
 
-        <div class="bg-card p-6 rounded-lg border border-border">
-          <div class="flex items-center">
-            <Icon name="lucide:users" class="w-8 h-8 text-green-600 dark:text-green-400" />
-            <div class="ml-4">
-              <p class="text-sm font-medium text-muted-foreground">Active Users</p>
-              <p class="text-2xl font-bold text-card-foreground">1,284</p>
+        <div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
+          <!-- Left column: submissions summary -->
+          <div class="lg:col-span-2 space-y-6">
+            <!-- Quick stats -->
+            <div class="grid grid-cols-1 sm:grid-cols-3 gap-4">
+              <div class="bg-card p-5 rounded-lg border border-border">
+                <div class="flex items-center gap-3">
+                  <div class="flex items-center justify-center w-10 h-10 rounded-lg bg-blue-500/10">
+                    <Icon name="lucide:message-square" class="w-5 h-5 text-blue-600 dark:text-blue-400" />
+                  </div>
+                  <div>
+                    <p class="text-sm text-muted-foreground">My Submissions</p>
+                    <p class="text-2xl font-bold text-card-foreground">{{ submissionCount }}</p>
+                  </div>
+                </div>
+              </div>
+              <div class="bg-card p-5 rounded-lg border border-border">
+                <div class="flex items-center gap-3">
+                  <div class="flex items-center justify-center w-10 h-10 rounded-lg bg-green-500/10">
+                    <Icon name="lucide:check-circle" class="w-5 h-5 text-green-600 dark:text-green-400" />
+                  </div>
+                  <div>
+                    <p class="text-sm text-muted-foreground">Completed</p>
+                    <p class="text-2xl font-bold text-card-foreground">{{ completedCount }}</p>
+                  </div>
+                </div>
+              </div>
+              <div class="bg-card p-5 rounded-lg border border-border">
+                <div class="flex items-center gap-3">
+                  <div class="flex items-center justify-center w-10 h-10 rounded-lg bg-purple-500/10">
+                    <Icon name="lucide:arrow-up" class="w-5 h-5 text-purple-600 dark:text-purple-400" />
+                  </div>
+                  <div>
+                    <p class="text-sm text-muted-foreground">Total Votes</p>
+                    <p class="text-2xl font-bold text-card-foreground">{{ totalVotes }}</p>
+                  </div>
+                </div>
+              </div>
             </div>
-          </div>
-        </div>
 
-        <div class="bg-card p-6 rounded-lg border border-border">
-          <div class="flex items-center">
-            <Icon name="lucide:trending-up" class="w-8 h-8 text-purple-600 dark:text-purple-400" />
-            <div class="ml-4">
-              <p class="text-sm font-medium text-muted-foreground">Features Shipped</p>
-              <p class="text-2xl font-bold text-card-foreground">18</p>
-            </div>
+            <!-- Recent submissions -->
+            <Card>
+              <CardHeader>
+                <div class="flex items-center justify-between">
+                  <div>
+                    <CardTitle>Recent Submissions</CardTitle>
+                    <CardDescription>Your latest feedback across all projects</CardDescription>
+                  </div>
+                  <Button v-if="recentSubmissions.length > 0" variant="outline" size="sm" @click="navigateTo('/submissions')">
+                    View all
+                  </Button>
+                </div>
+              </CardHeader>
+              <CardContent>
+                <div v-if="recentSubmissions.length === 0" class="text-center py-8">
+                  <div class="flex justify-center mb-4">
+                    <div class="flex items-center justify-center w-12 h-12 rounded-full bg-muted">
+                      <Icon name="lucide:message-square" class="w-6 h-6 text-muted-foreground" />
+                    </div>
+                  </div>
+                  <p class="font-medium mb-1">No submissions yet</p>
+                  <p class="text-sm text-muted-foreground">
+                    Submit feedback on public boards to see your activity here.
+                  </p>
+                </div>
+                <div v-else class="space-y-3">
+                  <div
+                    v-for="item in recentSubmissions"
+                    :key="item.id"
+                    class="flex items-center justify-between rounded-lg border p-3"
+                  >
+                    <div class="min-w-0 flex-1">
+                      <p class="font-medium truncate">{{ item.title }}</p>
+                      <p class="text-xs text-muted-foreground">
+                        {{ item.projectName || 'Unknown project' }} · {{ formatDate(item.createdAt) }}
+                      </p>
+                    </div>
+                    <div class="flex items-center gap-2 shrink-0 ml-3">
+                      <Badge :variant="getStatusVariant(item.status)" class="text-xs">
+                        {{ formatStatus(item.status) }}
+                      </Badge>
+                      <span class="text-xs text-muted-foreground flex items-center gap-1">
+                        <Icon name="lucide:arrow-up" class="w-3 h-3" />
+                        {{ item.voteCount }}
+                      </span>
+                    </div>
+                  </div>
+                </div>
+              </CardContent>
+            </Card>
           </div>
-        </div>
 
-        <div class="bg-card p-6 rounded-lg border border-border">
-          <div class="flex items-center">
-            <Icon name="lucide:heart" class="w-8 h-8 text-red-600 dark:text-red-400" />
-            <div class="ml-4">
-              <p class="text-sm font-medium text-muted-foreground">User Satisfaction</p>
-              <p class="text-2xl font-bold text-card-foreground">94%</p>
-            </div>
+          <!-- Right column: CTA + quick actions -->
+          <div class="space-y-6">
+            <!-- Create workspace CTA -->
+            <Card class="border-primary/20 bg-primary/5">
+              <CardHeader>
+                <div class="flex items-center justify-center w-10 h-10 rounded-lg bg-primary/10 mb-2">
+                  <Icon name="lucide:building-2" class="w-5 h-5 text-primary" />
+                </div>
+                <CardTitle class="text-lg">Want to collect feedback?</CardTitle>
+                <CardDescription>
+                  Create a workspace to set up your own feedback boards, manage projects, and collaborate with your team.
+                </CardDescription>
+              </CardHeader>
+              <CardContent>
+                <Button class="w-full" @click="navigateTo('/onboarding')">
+                  <Icon name="lucide:plus" class="w-4 h-4 mr-2" />
+                  Create a workspace
+                </Button>
+              </CardContent>
+            </Card>
+
+            <!-- Quick links -->
+            <Card>
+              <CardHeader>
+                <CardTitle class="text-base">Quick Actions</CardTitle>
+              </CardHeader>
+              <CardContent class="space-y-2">
+                <Button variant="outline" class="w-full justify-start" @click="navigateTo('/submissions')">
+                  <Icon name="lucide:list" class="w-4 h-4 mr-2" />
+                  View all submissions
+                </Button>
+                <Button variant="outline" class="w-full justify-start" @click="navigateTo('/settings')">
+                  <Icon name="lucide:settings" class="w-4 h-4 mr-2" />
+                  Account settings
+                </Button>
+              </CardContent>
+            </Card>
           </div>
         </div>
-      </div>
+      </template>
 
-      <!-- Recent Activity -->
-      <div class="mt-8 bg-card rounded-lg border border-border">
-        <div class="p-6 border-b border-border">
-          <h2 class="text-lg font-semibold text-card-foreground">Recent Activity</h2>
+      <!-- Workspace Dashboard (has organization) -->
+      <template v-else>
+        <div class="mb-6">
+          <h1 class="text-3xl font-bold text-foreground">Dashboard</h1>
+          <p class="text-muted-foreground">Welcome to your Veerify feedback management dashboard</p>
         </div>
-        <div class="p-6">
-          <div class="space-y-4">
-            <div class="flex items-center space-x-3">
-              <div class="w-8 h-8 bg-blue-100 dark:bg-blue-900/30 rounded-full flex items-center justify-center">
-                <Icon name="lucide:message-square" class="w-4 h-4 text-blue-600 dark:text-blue-400" />
-              </div>
-              <div>
-                <p class="text-sm font-medium text-card-foreground">New feature request submitted</p>
-                <p class="text-xs text-muted-foreground">2 hours ago</p>
+
+        <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
+          <!-- Stats Cards -->
+          <div class="bg-card p-6 rounded-lg border border-border">
+            <div class="flex items-center">
+              <Icon name="lucide:message-square" class="w-8 h-8 text-blue-600 dark:text-blue-400" />
+              <div class="ml-4">
+                <p class="text-sm font-medium text-muted-foreground">Total Feedback</p>
+                <p class="text-2xl font-bold text-card-foreground">247</p>
               </div>
             </div>
-            <div class="flex items-center space-x-3">
-              <div class="w-8 h-8 bg-green-100 dark:bg-green-900/30 rounded-full flex items-center justify-center">
-                <Icon name="lucide:check" class="w-4 h-4 text-green-600 dark:text-green-400" />
-              </div>
-              <div>
-                <p class="text-sm font-medium text-card-foreground">Feature marked as completed</p>
-                <p class="text-xs text-muted-foreground">4 hours ago</p>
+          </div>
+
+          <div class="bg-card p-6 rounded-lg border border-border">
+            <div class="flex items-center">
+              <Icon name="lucide:users" class="w-8 h-8 text-green-600 dark:text-green-400" />
+              <div class="ml-4">
+                <p class="text-sm font-medium text-muted-foreground">Active Users</p>
+                <p class="text-2xl font-bold text-card-foreground">1,284</p>
               </div>
             </div>
-            <div class="flex items-center space-x-3">
-              <div class="w-8 h-8 bg-purple-100 dark:bg-purple-900/30 rounded-full flex items-center justify-center">
-                <Icon name="lucide:user-plus" class="w-4 h-4 text-purple-600 dark:text-purple-400" />
-              </div>
-              <div>
-                <p class="text-sm font-medium text-card-foreground">New user registered</p>
-                <p class="text-xs text-muted-foreground">1 day ago</p>
+          </div>
+
+          <div class="bg-card p-6 rounded-lg border border-border">
+            <div class="flex items-center">
+              <Icon name="lucide:trending-up" class="w-8 h-8 text-purple-600 dark:text-purple-400" />
+              <div class="ml-4">
+                <p class="text-sm font-medium text-muted-foreground">Features Shipped</p>
+                <p class="text-2xl font-bold text-card-foreground">18</p>
               </div>
             </div>
-            <div class="flex items-center space-x-3">
-              <div class="w-8 h-8 bg-orange-100 dark:bg-orange-900/30 rounded-full flex items-center justify-center">
-                <Icon name="lucide:star" class="w-4 h-4 text-orange-600 dark:text-orange-400" />
-              </div>
-              <div>
-                <p class="text-sm font-medium text-card-foreground">Feature received 10+ upvotes</p>
-                <p class="text-xs text-muted-foreground">2 days ago</p>
+          </div>
+
+          <div class="bg-card p-6 rounded-lg border border-border">
+            <div class="flex items-center">
+              <Icon name="lucide:heart" class="w-8 h-8 text-red-600 dark:text-red-400" />
+              <div class="ml-4">
+                <p class="text-sm font-medium text-muted-foreground">User Satisfaction</p>
+                <p class="text-2xl font-bold text-card-foreground">94%</p>
               </div>
             </div>
           </div>
         </div>
-      </div>
 
-      <!-- Top Feature Requests -->
-      <div class="mt-8 bg-card rounded-lg border border-border">
-        <div class="p-6 border-b border-border">
-          <h2 class="text-lg font-semibold text-card-foreground">Top Feature Requests</h2>
-        </div>
-        <div class="p-6">
-          <div class="space-y-4">
-            <div class="flex items-center justify-between p-4 border border-border rounded-lg">
-              <div class="flex items-center space-x-4">
-                <div class="w-10 h-10 bg-blue-100 dark:bg-blue-900/30 rounded-lg flex items-center justify-center">
-                  <Icon name="lucide:zap" class="w-5 h-5 text-blue-600 dark:text-blue-400" />
+        <!-- Recent Activity -->
+        <div class="mt-8 bg-card rounded-lg border border-border">
+          <div class="p-6 border-b border-border">
+            <h2 class="text-lg font-semibold text-card-foreground">Recent Activity</h2>
+          </div>
+          <div class="p-6">
+            <div class="space-y-4">
+              <div class="flex items-center space-x-3">
+                <div class="w-8 h-8 bg-blue-100 dark:bg-blue-900/30 rounded-full flex items-center justify-center">
+                  <Icon name="lucide:message-square" class="w-4 h-4 text-blue-600 dark:text-blue-400" />
                 </div>
                 <div>
-                  <h3 class="font-medium text-card-foreground">Dark mode support</h3>
-                  <p class="text-sm text-muted-foreground">Requested by 45 users</p>
+                  <p class="text-sm font-medium text-card-foreground">New feature request submitted</p>
+                  <p class="text-xs text-muted-foreground">2 hours ago</p>
                 </div>
               </div>
-              <div class="flex items-center space-x-2">
-                <span
-                  class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-blue-100 text-blue-800 dark:bg-blue-900/30 dark:text-blue-300"
-                >
-                  In Progress
-                </span>
-                <span class="text-sm font-medium text-card-foreground">45 votes</span>
-              </div>
-            </div>
-
-            <div class="flex items-center justify-between p-4 border border-border rounded-lg">
-              <div class="flex items-center space-x-4">
-                <div class="w-10 h-10 bg-green-100 dark:bg-green-900/30 rounded-lg flex items-center justify-center">
-                  <Icon name="lucide:smartphone" class="w-5 h-5 text-green-600 dark:text-green-400" />
+              <div class="flex items-center space-x-3">
+                <div class="w-8 h-8 bg-green-100 dark:bg-green-900/30 rounded-full flex items-center justify-center">
+                  <Icon name="lucide:check" class="w-4 h-4 text-green-600 dark:text-green-400" />
                 </div>
                 <div>
-                  <h3 class="font-medium text-card-foreground">Mobile app</h3>
-                  <p class="text-sm text-muted-foreground">Requested by 32 users</p>
+                  <p class="text-sm font-medium text-card-foreground">Feature marked as completed</p>
+                  <p class="text-xs text-muted-foreground">4 hours ago</p>
                 </div>
               </div>
-              <div class="flex items-center space-x-2">
-                <span
-                  class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-yellow-100 text-yellow-800 dark:bg-yellow-900/30 dark:text-yellow-300"
-                >
-                  Planned
-                </span>
-                <span class="text-sm font-medium text-card-foreground">32 votes</span>
-              </div>
-            </div>
-
-            <div class="flex items-center justify-between p-4 border border-border rounded-lg">
-              <div class="flex items-center space-x-4">
-                <div class="w-10 h-10 bg-purple-100 dark:bg-purple-900/30 rounded-lg flex items-center justify-center">
-                  <Icon name="lucide:bell" class="w-5 h-5 text-purple-600 dark:text-purple-400" />
+              <div class="flex items-center space-x-3">
+                <div class="w-8 h-8 bg-purple-100 dark:bg-purple-900/30 rounded-full flex items-center justify-center">
+                  <Icon name="lucide:user-plus" class="w-4 h-4 text-purple-600 dark:text-purple-400" />
                 </div>
                 <div>
-                  <h3 class="font-medium text-card-foreground">Email notifications</h3>
-                  <p class="text-sm text-muted-foreground">Requested by 28 users</p>
+                  <p class="text-sm font-medium text-card-foreground">New user registered</p>
+                  <p class="text-xs text-muted-foreground">1 day ago</p>
                 </div>
               </div>
-              <div class="flex items-center space-x-2">
-                <span
-                  class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-secondary text-secondary-foreground"
-                >
-                  Under Review
-                </span>
-                <span class="text-sm font-medium text-card-foreground">28 votes</span>
+              <div class="flex items-center space-x-3">
+                <div class="w-8 h-8 bg-orange-100 dark:bg-orange-900/30 rounded-full flex items-center justify-center">
+                  <Icon name="lucide:star" class="w-4 h-4 text-orange-600 dark:text-orange-400" />
+                </div>
+                <div>
+                  <p class="text-sm font-medium text-card-foreground">Feature received 10+ upvotes</p>
+                  <p class="text-xs text-muted-foreground">2 days ago</p>
+                </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
+      </template>
     </div>
   </NuxtLayout>
 </template>
+
+<script>
+import { authClient } from '~/lib/auth-client'
+
+export default {
+  name: 'DashboardPage',
+
+  data() {
+    return {
+      isLoading: true,
+      hasOrganization: false,
+      userName: '',
+      recentSubmissions: [],
+      submissionCount: 0,
+      completedCount: 0,
+      totalVotes: 0,
+    }
+  },
+
+  async mounted() {
+    await this.initialize()
+  },
+
+  methods: {
+    async initialize() {
+      try {
+        this.isLoading = true
+
+        const [sessionResult, orgsResult] = await Promise.all([
+          authClient.useSession(useFetch),
+          authClient.organization.list().catch(() => ({ data: [] })),
+        ])
+
+        const session = sessionResult.data.value
+        this.userName = session?.user?.name || 'there'
+
+        const orgs = Array.isArray(orgsResult.data) ? orgsResult.data : []
+        this.hasOrganization = orgs.length > 0
+
+        // If personal dashboard, load submissions
+        if (!this.hasOrganization) {
+          await this.loadSubmissions()
+        }
+      } catch (error) {
+        console.error('Dashboard initialization error:', error)
+      } finally {
+        this.isLoading = false
+      }
+    },
+
+    async loadSubmissions() {
+      try {
+        const response = await $fetch('/api/user/submissions', {
+          params: { limit: 5 },
+        })
+        this.recentSubmissions = response?.data || []
+        this.submissionCount = response?.pagination?.totalCount || 0
+
+        // Calculate stats from the full list
+        this.completedCount = this.recentSubmissions.filter(
+          (s) => s.status === 'completed'
+        ).length
+        this.totalVotes = this.recentSubmissions.reduce(
+          (sum, s) => sum + (s.voteCount || 0),
+          0
+        )
+
+        // If we have more items than the preview, fetch full stats
+        if (this.submissionCount > 5) {
+          const fullResponse = await $fetch('/api/user/submissions', {
+            params: { limit: 50 },
+          })
+          const allItems = fullResponse?.data || []
+          this.completedCount = allItems.filter(
+            (s) => s.status === 'completed'
+          ).length
+          this.totalVotes = allItems.reduce(
+            (sum, s) => sum + (s.voteCount || 0),
+            0
+          )
+        }
+      } catch (_error) {
+        // Submissions loading is non-critical
+      }
+    },
+
+    formatDate(date) {
+      if (!date) return ''
+      const d = new Date(date)
+      const now = new Date()
+      const diffMs = now.getTime() - d.getTime()
+      const diffDays = Math.floor(diffMs / (1000 * 60 * 60 * 24))
+
+      if (diffDays === 0) return 'Today'
+      if (diffDays === 1) return 'Yesterday'
+      if (diffDays < 7) return `${diffDays} days ago`
+      return d.toLocaleDateString()
+    },
+
+    formatStatus(status) {
+      const labels = {
+        open: 'Open',
+        in_progress: 'In Progress',
+        planned: 'Planned',
+        completed: 'Completed',
+        closed: 'Closed',
+        declined: 'Declined',
+      }
+      return labels[status] || status
+    },
+
+    getStatusVariant(status) {
+      if (status === 'completed') return 'default'
+      if (status === 'in_progress' || status === 'planned') return 'secondary'
+      if (status === 'declined' || status === 'closed') return 'outline'
+      return 'secondary'
+    },
+  },
+}
+</script>
diff --git a/pages/login/index.vue b/pages/login/index.vue
index b5e22d1..57437d3 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -129,17 +129,6 @@ export default {
         if (result.error) {
           this.error = result.error.message || 'Sign in failed'
         } else {
-          // Check if user has an organization; if not, redirect to onboarding
-          try {
-            const orgs = await authClient.organization.list()
-            const orgList = Array.isArray(orgs.data) ? orgs.data : []
-            if (orgList.length === 0) {
-              await navigateTo('/onboarding')
-              return
-            }
-          } catch (_e) {
-            // If check fails, proceed to dashboard
-          }
           await navigateTo('/dashboard')
         }
       } catch (err) {
diff --git a/pages/onboarding/index.vue b/pages/onboarding/index.vue
index 8cecd42..4cbe347 100644
--- a/pages/onboarding/index.vue
+++ b/pages/onboarding/index.vue
@@ -245,8 +245,6 @@ export default {
       inviteError: '',
       inviteSuccess: '',
 
-      // Page state
-      isCheckingOrgs: true,
     }
   },
 
@@ -257,27 +255,7 @@ export default {
     },
   },
 
-  async mounted() {
-    await this.checkExistingOrganizations()
-  },
-
   methods: {
-    async checkExistingOrganizations() {
-      try {
-        this.isCheckingOrgs = true
-        const { data } = await authClient.organization.list()
-        const orgs = Array.isArray(data) ? data : []
-        if (orgs.length > 0) {
-          // User already has an org, skip onboarding
-          await navigateTo('/dashboard')
-        }
-      } catch (_error) {
-        // If check fails, show onboarding anyway
-      } finally {
-        this.isCheckingOrgs = false
-      }
-    },
-
     generateSlug() {
       this.orgSlug = this.orgName
         .toLowerCase()
@@ -394,11 +372,6 @@ export default {
     },
 
     async goToDashboard() {
-      // Clear the onboarding check cache so middleware doesn't redirect back
-      if (import.meta.client) {
-        useState('onboarding-checked').value = true
-        useState('needs-onboarding').value = false
-      }
       await navigateTo('/dashboard')
     },
   },
diff --git a/pages/signup/index.vue b/pages/signup/index.vue
index e6bc22a..6730d16 100644
--- a/pages/signup/index.vue
+++ b/pages/signup/index.vue
@@ -140,8 +140,7 @@ export default {
         if (result.error) {
           this.error = result.error.message || 'Sign up failed'
         } else {
-          // Success - redirect to onboarding to set up workspace
-          await navigateTo('/onboarding')
+          await navigateTo('/dashboard')
         }
       } catch (err) {
         this.error = 'An unexpected error occurred'
diff --git a/pages/submissions/index.vue b/pages/submissions/index.vue
new file mode 100644
index 0000000..b89e03a
--- /dev/null
+++ b/pages/submissions/index.vue
@@ -0,0 +1,218 @@
+<template>
+  <NuxtLayout name="dashboard">
+    <div class="p-6">
+      <div class="mb-6">
+        <h1 class="text-3xl font-bold text-foreground">My Submissions</h1>
+        <p class="text-muted-foreground">All feedback you've submitted across projects</p>
+      </div>
+
+      <!-- Loading -->
+      <div v-if="isLoading" class="space-y-3">
+        <Skeleton class="h-16 w-full" />
+        <Skeleton class="h-16 w-full" />
+        <Skeleton class="h-16 w-full" />
+        <Skeleton class="h-16 w-full" />
+      </div>
+
+      <!-- Error -->
+      <Card v-else-if="error">
+        <CardContent class="text-center py-8">
+          <Icon name="lucide:alert-circle" class="w-8 h-8 text-destructive mx-auto mb-3" />
+          <p class="font-medium mb-2">Failed to load submissions</p>
+          <p class="text-sm text-muted-foreground mb-4">{{ error }}</p>
+          <Button variant="outline" @click="loadSubmissions">
+            <Icon name="lucide:refresh-cw" class="w-4 h-4 mr-2" />
+            Try again
+          </Button>
+        </CardContent>
+      </Card>
+
+      <!-- Empty state -->
+      <Card v-else-if="submissions.length === 0">
+        <CardContent class="text-center py-12">
+          <div class="flex justify-center mb-4">
+            <div class="flex items-center justify-center w-14 h-14 rounded-full bg-muted">
+              <Icon name="lucide:message-square" class="w-7 h-7 text-muted-foreground" />
+            </div>
+          </div>
+          <p class="font-medium text-lg mb-1">No submissions yet</p>
+          <p class="text-sm text-muted-foreground max-w-sm mx-auto">
+            When you submit feedback on public boards, your submissions will appear here so you can track their progress.
+          </p>
+        </CardContent>
+      </Card>
+
+      <!-- Submissions list -->
+      <template v-else>
+        <!-- Status filter -->
+        <div class="flex items-center gap-2 mb-4 flex-wrap">
+          <Button
+            v-for="filter in statusFilters"
+            :key="filter.value"
+            :variant="activeFilter === filter.value ? 'default' : 'outline'"
+            size="sm"
+            @click="activeFilter = filter.value"
+          >
+            {{ filter.label }}
+            <Badge v-if="filter.count > 0" variant="secondary" class="ml-1.5 text-xs">
+              {{ filter.count }}
+            </Badge>
+          </Button>
+        </div>
+
+        <!-- List -->
+        <div class="space-y-3">
+          <div
+            v-for="item in filteredSubmissions"
+            :key="item.id"
+            class="flex items-center justify-between rounded-lg border bg-card p-4"
+          >
+            <div class="min-w-0 flex-1">
+              <p class="font-medium">{{ item.title }}</p>
+              <p v-if="item.body" class="text-sm text-muted-foreground truncate mt-0.5">
+                {{ item.body }}
+              </p>
+              <div class="flex items-center gap-3 mt-2 text-xs text-muted-foreground">
+                <span class="flex items-center gap-1">
+                  <Icon name="lucide:package" class="w-3 h-3" />
+                  {{ item.projectName || 'Unknown project' }}
+                </span>
+                <span>{{ formatDate(item.createdAt) }}</span>
+                <span v-if="item.commentCount > 0" class="flex items-center gap-1">
+                  <Icon name="lucide:message-circle" class="w-3 h-3" />
+                  {{ item.commentCount }}
+                </span>
+              </div>
+            </div>
+            <div class="flex items-center gap-3 shrink-0 ml-4">
+              <Badge :variant="getStatusVariant(item.status)" class="text-xs">
+                {{ formatStatus(item.status) }}
+              </Badge>
+              <div class="flex items-center gap-1 text-sm text-muted-foreground">
+                <Icon name="lucide:arrow-up" class="w-4 h-4" />
+                <span class="font-medium">{{ item.voteCount }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- Pagination -->
+        <div v-if="totalPages > 1" class="flex items-center justify-between mt-6">
+          <p class="text-sm text-muted-foreground">
+            Page {{ page }} of {{ totalPages }} ({{ totalCount }} submissions)
+          </p>
+          <div class="flex gap-2">
+            <Button variant="outline" size="sm" :disabled="page <= 1" @click="goToPage(page - 1)">
+              Previous
+            </Button>
+            <Button variant="outline" size="sm" :disabled="page >= totalPages" @click="goToPage(page + 1)">
+              Next
+            </Button>
+          </div>
+        </div>
+      </template>
+    </div>
+  </NuxtLayout>
+</template>
+
+<script>
+export default {
+  name: 'SubmissionsPage',
+
+  data() {
+    return {
+      submissions: [],
+      isLoading: true,
+      error: null,
+      page: 1,
+      totalCount: 0,
+      totalPages: 1,
+      activeFilter: 'all',
+    }
+  },
+
+  computed: {
+    filteredSubmissions() {
+      if (this.activeFilter === 'all') return this.submissions
+      return this.submissions.filter((s) => s.status === this.activeFilter)
+    },
+
+    statusFilters() {
+      const counts = {}
+      for (const s of this.submissions) {
+        counts[s.status] = (counts[s.status] || 0) + 1
+      }
+      return [
+        { value: 'all', label: 'All', count: this.submissions.length },
+        { value: 'open', label: 'Open', count: counts.open || 0 },
+        { value: 'in_progress', label: 'In Progress', count: counts.in_progress || 0 },
+        { value: 'planned', label: 'Planned', count: counts.planned || 0 },
+        { value: 'completed', label: 'Completed', count: counts.completed || 0 },
+      ].filter((f) => f.value === 'all' || f.count > 0)
+    },
+  },
+
+  async mounted() {
+    await this.loadSubmissions()
+  },
+
+  methods: {
+    async loadSubmissions() {
+      this.isLoading = true
+      this.error = null
+
+      try {
+        const response = await $fetch('/api/user/submissions', {
+          params: { page: this.page, limit: 20 },
+        })
+        this.submissions = response?.data || []
+        this.totalCount = response?.pagination?.totalCount || 0
+        this.totalPages = response?.pagination?.totalPages || 1
+      } catch (error) {
+        this.error = 'Something went wrong. Please try again.'
+        console.error('Error loading submissions:', error)
+      } finally {
+        this.isLoading = false
+      }
+    },
+
+    async goToPage(newPage) {
+      this.page = newPage
+      await this.loadSubmissions()
+    },
+
+    formatDate(date) {
+      if (!date) return ''
+      const d = new Date(date)
+      const now = new Date()
+      const diffMs = now.getTime() - d.getTime()
+      const diffDays = Math.floor(diffMs / (1000 * 60 * 60 * 24))
+
+      if (diffDays === 0) return 'Today'
+      if (diffDays === 1) return 'Yesterday'
+      if (diffDays < 7) return `${diffDays} days ago`
+      if (diffDays < 30) return `${Math.floor(diffDays / 7)} weeks ago`
+      return d.toLocaleDateString()
+    },
+
+    formatStatus(status) {
+      const labels = {
+        open: 'Open',
+        in_progress: 'In Progress',
+        planned: 'Planned',
+        completed: 'Completed',
+        closed: 'Closed',
+        declined: 'Declined',
+      }
+      return labels[status] || status
+    },
+
+    getStatusVariant(status) {
+      if (status === 'completed') return 'default'
+      if (status === 'in_progress' || status === 'planned') return 'secondary'
+      if (status === 'declined' || status === 'closed') return 'outline'
+      return 'secondary'
+    },
+  },
+}
+</script>
diff --git a/server/api/user/submissions.get.ts b/server/api/user/submissions.get.ts
new file mode 100644
index 0000000..51108af
--- /dev/null
+++ b/server/api/user/submissions.get.ts
@@ -0,0 +1,59 @@
+import { auth } from '~/lib/auth'
+import { db } from '~/server/database/drizzle'
+import { feedback, project } from '~/server/database/schema/feedback'
+import { eq, desc, sql } from 'drizzle-orm'
+
+export default defineEventHandler(async (event) => {
+  const session = await auth.api.getSession({
+    headers: event.node.req.headers as any,
+  })
+  if (!session?.user) {
+    throw createError({ statusCode: 401, statusMessage: 'Unauthorized' })
+  }
+
+  const query = getQuery(event)
+  const page = Math.max(1, parseInt(String(query.page || '1'), 10))
+  const limit = Math.min(50, Math.max(1, parseInt(String(query.limit || '20'), 10)))
+  const offset = (page - 1) * limit
+
+  // Get all feedback submitted by this user across all projects
+  const [items, countResult] = await Promise.all([
+    db
+      .select({
+        id: feedback.id,
+        title: feedback.title,
+        body: feedback.body,
+        status: feedback.status,
+        voteCount: feedback.voteCount,
+        commentCount: feedback.commentCount,
+        createdAt: feedback.createdAt,
+        updatedAt: feedback.updatedAt,
+        projectId: feedback.projectId,
+        projectName: project.name,
+        projectSlug: project.slug,
+      })
+      .from(feedback)
+      .leftJoin(project, eq(feedback.projectId, project.id))
+      .where(eq(feedback.authorUserId, session.user.id))
+      .orderBy(desc(feedback.createdAt))
+      .limit(limit)
+      .offset(offset),
+    db
+      .select({ count: sql<number>`count(*)::int` })
+      .from(feedback)
+      .where(eq(feedback.authorUserId, session.user.id)),
+  ])
+
+  const totalCount = countResult[0]?.count || 0
+
+  return {
+    success: true,
+    data: items,
+    pagination: {
+      page,
+      limit,
+      totalCount,
+      totalPages: Math.ceil(totalCount / limit),
+    },
+  }
+})
diff --git a/server/database/schema/feedback.ts b/server/database/schema/feedback.ts
index 0ab4a98..bd292ee 100644
--- a/server/database/schema/feedback.ts
+++ b/server/database/schema/feedback.ts
@@ -19,6 +19,10 @@ export const project = pgTable(
     isPublic: boolean('is_public')
       .$defaultFn(() => false)
       .notNull(),
+    // Controls who can submit feedback: 'anonymous' allows anonymous + optional email, 'account_required' requires login
+    submissionMode: text('submission_mode')
+      .$defaultFn(() => 'anonymous')
+      .notNull(),
     customDomain: text('custom_domain'),
     settings: jsonb('settings').$type<Record<string, any>>(),
     createdAt: timestamp('created_at')

From 33383b238e5e645c5fc1b0adecc5f04df8e3f88b Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 16 Feb 2026 09:30:26 +0000
Subject: [PATCH 3/3] feat: add /get-started route and context-aware sidebar
 for personal users
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a public /get-started page for external links (e.g., marketing site)
that routes authenticated users to onboarding and shows a signup CTA for
visitors. Signup and login now support a `redirect` query param so the
flow chains: /get-started → /signup?redirect=/onboarding → /onboarding.

The sidebar and settings page are now context-aware:
- Sidebar shows a "Create workspace" CTA in the header for personal users
  instead of the TeamSwitcher, and hides Feedback/Management sections
- Settings page hides Workspace, Teams, and Billing tabs when user has no org
- Middleware honors redirect param on auth routes for logged-in users
- Dashboard link moved to always-visible Personal section

https://claude.ai/code/session_014ACXuHTJ4gc7oH6woD9dXo
---
 components/sidebar/AppSidebar.vue   | 112 +++++++++++++++++-----------
 components/sidebar/TeamSwitcher.vue |   5 ++
 middleware/auth.global.ts           |   6 +-
 pages/get-started/index.vue         | 101 +++++++++++++++++++++++++
 pages/login/index.vue               |  11 ++-
 pages/settings/index.vue            |  10 ++-
 pages/signup/index.vue              |  11 ++-
 7 files changed, 206 insertions(+), 50 deletions(-)
 create mode 100644 pages/get-started/index.vue

diff --git a/components/sidebar/AppSidebar.vue b/components/sidebar/AppSidebar.vue
index 515b3e8..a6ff298 100644
--- a/components/sidebar/AppSidebar.vue
+++ b/components/sidebar/AppSidebar.vue
@@ -20,8 +20,16 @@ const props = withDefaults(defineProps<SidebarProps>(), {
   collapsible: 'icon',
 })
 
+// Shared state set by TeamSwitcher — defaults to true to avoid flash of missing content
+const hasActiveOrganization = useState('hasActiveOrganization', () => true)
+
 // Always-visible personal items
 const personalItems: SidebarNavItem[] = [
+  {
+    title: 'Dashboard',
+    url: '/dashboard',
+    icon: 'lucide:layout-dashboard',
+  },
   {
     title: 'My Submissions',
     url: '/submissions',
@@ -34,13 +42,8 @@ const personalItems: SidebarNavItem[] = [
   },
 ]
 
-// Define navigation items
+// Workspace navigation items (only shown when org is active)
 const feedbackItems: SidebarNavItem[] = [
-  {
-    title: 'Dashboard',
-    url: '/dashboard',
-    icon: 'lucide:layout-dashboard',
-  },
   {
     title: 'Feedback',
     url: '/feedback',
@@ -60,7 +63,7 @@ const feedbackItems: SidebarNavItem[] = [
   },
 ]
 
-const managementItems = [
+const managementItems: SidebarNavItem[] = [
   {
     title: 'Products',
     url: '/products',
@@ -73,7 +76,7 @@ const managementItems = [
   },
 ]
 
-const supportItems = [
+const supportItems: SidebarNavItem[] = [
   {
     title: 'Help Center',
     url: '/help',
@@ -90,7 +93,25 @@ const supportItems = [
 <template>
   <Sidebar data-testid="app-sidebar" v-bind="props">
     <SidebarHeader>
-      <TeamSwitcher />
+      <!-- Show TeamSwitcher when user has an org, otherwise show a Create Workspace CTA -->
+      <TeamSwitcher v-if="hasActiveOrganization" />
+      <SidebarMenu v-else>
+        <SidebarMenuItem>
+          <SidebarMenuButton as-child size="lg" tooltip="Create a workspace">
+            <NuxtLink to="/get-started">
+              <div
+                class="flex aspect-square size-8 items-center justify-center rounded-lg border-2 border-dashed border-sidebar-border text-sidebar-foreground/60"
+              >
+                <Icon name="lucide:plus" class="size-4" />
+              </div>
+              <div class="grid flex-1 text-left text-sm leading-tight">
+                <span class="truncate font-semibold">Create workspace</span>
+                <span class="truncate text-xs text-muted-foreground">Get started</span>
+              </div>
+            </NuxtLink>
+          </SidebarMenuButton>
+        </SidebarMenuItem>
+      </SidebarMenu>
     </SidebarHeader>
 
     <SidebarContent>
@@ -111,45 +132,48 @@ const supportItems = [
         </SidebarGroupContent>
       </SidebarGroup>
 
-      <!-- Feedback Section -->
-      <SidebarGroup>
-        <SidebarGroupLabel>Feedback</SidebarGroupLabel>
-        <SidebarGroupContent>
-          <SidebarMenu>
-            <SidebarMenuItem v-for="item in feedbackItems" :key="item.title">
-              <SidebarMenuButton v-if="item.disabled" :tooltip="item.title" disabled aria-disabled="true">
-                <Icon :name="item.icon" class="w-5 h-5 shrink-0" />
-                <span>{{ item.title }}</span>
-              </SidebarMenuButton>
-              <SidebarMenuButton v-else as-child :tooltip="item.title">
-                <NuxtLink :to="item.url">
+      <!-- Workspace sections (only when org is active) -->
+      <template v-if="hasActiveOrganization">
+        <!-- Feedback Section -->
+        <SidebarGroup>
+          <SidebarGroupLabel>Feedback</SidebarGroupLabel>
+          <SidebarGroupContent>
+            <SidebarMenu>
+              <SidebarMenuItem v-for="item in feedbackItems" :key="item.title">
+                <SidebarMenuButton v-if="item.disabled" :tooltip="item.title" disabled aria-disabled="true">
                   <Icon :name="item.icon" class="w-5 h-5 shrink-0" />
                   <span>{{ item.title }}</span>
-                </NuxtLink>
-              </SidebarMenuButton>
-            </SidebarMenuItem>
-          </SidebarMenu>
-        </SidebarGroupContent>
-      </SidebarGroup>
+                </SidebarMenuButton>
+                <SidebarMenuButton v-else as-child :tooltip="item.title">
+                  <NuxtLink :to="item.url">
+                    <Icon :name="item.icon" class="w-5 h-5 shrink-0" />
+                    <span>{{ item.title }}</span>
+                  </NuxtLink>
+                </SidebarMenuButton>
+              </SidebarMenuItem>
+            </SidebarMenu>
+          </SidebarGroupContent>
+        </SidebarGroup>
 
-      <!-- Management Section -->
-      <SidebarGroup>
-        <SidebarGroupLabel>Management</SidebarGroupLabel>
-        <SidebarGroupContent>
-          <SidebarMenu>
-            <SidebarMenuItem v-for="item in managementItems" :key="item.title">
-              <SidebarMenuButton as-child :tooltip="item.title">
-                <NuxtLink :to="item.url">
-                  <Icon :name="item.icon" class="w-5 h-5 shrink-0" />
-                  <span>{{ item.title }}</span>
-                </NuxtLink>
-              </SidebarMenuButton>
-            </SidebarMenuItem>
-          </SidebarMenu>
-        </SidebarGroupContent>
-      </SidebarGroup>
+        <!-- Management Section -->
+        <SidebarGroup>
+          <SidebarGroupLabel>Management</SidebarGroupLabel>
+          <SidebarGroupContent>
+            <SidebarMenu>
+              <SidebarMenuItem v-for="item in managementItems" :key="item.title">
+                <SidebarMenuButton as-child :tooltip="item.title">
+                  <NuxtLink :to="item.url">
+                    <Icon :name="item.icon" class="w-5 h-5 shrink-0" />
+                    <span>{{ item.title }}</span>
+                  </NuxtLink>
+                </SidebarMenuButton>
+              </SidebarMenuItem>
+            </SidebarMenu>
+          </SidebarGroupContent>
+        </SidebarGroup>
+      </template>
 
-      <!-- Support Section -->
+      <!-- Support Section (always visible) -->
       <SidebarGroup>
         <SidebarGroupLabel>Support</SidebarGroupLabel>
         <SidebarGroupContent>
diff --git a/components/sidebar/TeamSwitcher.vue b/components/sidebar/TeamSwitcher.vue
index 522aa6a..76e598a 100644
--- a/components/sidebar/TeamSwitcher.vue
+++ b/components/sidebar/TeamSwitcher.vue
@@ -191,6 +191,11 @@ export default {
       this.activeTeam = teamSwitcherCache.activeTeam
       this.activeOrganization = teamSwitcherCache.activeOrganization
       this.isLoadingTeams = false
+
+      // Share org state with the sidebar and other components
+      if (import.meta.client) {
+        useState('hasActiveOrganization').value = !!this.activeOrganization
+      }
     },
 
     async fetchTeamContext() {
diff --git a/middleware/auth.global.ts b/middleware/auth.global.ts
index 63d201a..8f312b0 100644
--- a/middleware/auth.global.ts
+++ b/middleware/auth.global.ts
@@ -9,7 +9,7 @@ export default defineNuxtRouteMiddleware(async (to, _from) => {
   // On team subdomains, all routes are public. Redirect app routes to team root.
   const teamSubdomain = useState('teamSubdomain')
   if (teamSubdomain.value) {
-    const appRoutes = ['/dashboard', '/settings', '/reports', '/feedback', '/help', '/products', '/login', '/signup', '/auth', '/onboarding', '/submissions']
+    const appRoutes = ['/dashboard', '/settings', '/reports', '/feedback', '/help', '/products', '/login', '/signup', '/auth', '/onboarding', '/submissions', '/get-started']
     if (appRoutes.some((r) => to.path.startsWith(r))) {
       return navigateTo('/')
     }
@@ -34,6 +34,10 @@ export default defineNuxtRouteMiddleware(async (to, _from) => {
     }
 
     if (isAuthRoute && session.value?.user) {
+      const redirect = to.query.redirect
+      if (redirect && typeof redirect === 'string' && redirect.startsWith('/')) {
+        return navigateTo(redirect)
+      }
       return navigateTo('/dashboard')
     }
   } catch (error) {
diff --git a/pages/get-started/index.vue b/pages/get-started/index.vue
new file mode 100644
index 0000000..560c89b
--- /dev/null
+++ b/pages/get-started/index.vue
@@ -0,0 +1,101 @@
+<template>
+  <NuxtLayout name="clean">
+    <div class="min-h-screen flex items-center justify-center bg-background py-12 px-4 sm:px-6 lg:px-8">
+      <div class="w-full max-w-md">
+        <!-- Loading while checking auth -->
+        <div v-if="isChecking" class="flex justify-center">
+          <Icon name="lucide:loader-2" class="w-8 h-8 animate-spin text-muted-foreground" />
+        </div>
+
+        <!-- Unauthenticated: show CTA -->
+        <Card v-else>
+          <CardHeader class="text-center">
+            <div class="flex justify-center mb-4">
+              <div class="flex items-center justify-center w-14 h-14 rounded-full bg-primary/10">
+                <Icon name="lucide:building-2" class="w-7 h-7 text-primary" />
+              </div>
+            </div>
+            <CardTitle class="text-2xl">Start collecting feedback</CardTitle>
+            <CardDescription class="text-base">
+              Create a workspace to set up feedback boards, manage projects, and collaborate with your team.
+            </CardDescription>
+          </CardHeader>
+          <CardContent class="space-y-4">
+            <div class="grid gap-3 rounded-lg border p-4">
+              <div class="flex items-start gap-3">
+                <Icon name="lucide:check-circle" class="w-5 h-5 text-green-600 dark:text-green-400 mt-0.5 shrink-0" />
+                <p class="text-sm">Public feedback boards for your users</p>
+              </div>
+              <div class="flex items-start gap-3">
+                <Icon name="lucide:check-circle" class="w-5 h-5 text-green-600 dark:text-green-400 mt-0.5 shrink-0" />
+                <p class="text-sm">Upvoting and prioritization</p>
+              </div>
+              <div class="flex items-start gap-3">
+                <Icon name="lucide:check-circle" class="w-5 h-5 text-green-600 dark:text-green-400 mt-0.5 shrink-0" />
+                <p class="text-sm">Team collaboration and project management</p>
+              </div>
+            </div>
+
+            <Button class="w-full" size="lg" @click="goToSignUp">
+              Create your workspace
+              <Icon name="lucide:arrow-right" class="w-4 h-4 ml-2" />
+            </Button>
+
+            <p class="text-center text-sm text-muted-foreground">
+              Already have an account?
+              <NuxtLink :to="loginUrl" class="text-primary underline underline-offset-4 hover:text-primary/80">
+                Sign in
+              </NuxtLink>
+            </p>
+          </CardContent>
+        </Card>
+      </div>
+    </div>
+  </NuxtLayout>
+</template>
+
+<script>
+import { authClient } from '~/lib/auth-client'
+
+export default {
+  name: 'GetStartedPage',
+  layout: 'clean',
+
+  data() {
+    return {
+      isChecking: true,
+    }
+  },
+
+  computed: {
+    loginUrl() {
+      return '/login?redirect=/onboarding'
+    },
+  },
+
+  async mounted() {
+    await this.checkAuth()
+  },
+
+  methods: {
+    async checkAuth() {
+      try {
+        const { data: session } = await authClient.useSession(useFetch)
+        if (session.value?.user) {
+          // Already logged in, go straight to onboarding
+          await navigateTo('/onboarding')
+          return
+        }
+      } catch (_error) {
+        // If check fails, show the page
+      } finally {
+        this.isChecking = false
+      }
+    },
+
+    goToSignUp() {
+      navigateTo('/signup?redirect=/onboarding')
+    },
+  },
+}
+</script>
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 57437d3..48cc680 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -70,7 +70,7 @@
                   <!-- Sign Up Link -->
                   <div class="text-center text-sm">
                     Don't have an account?
-                    <NuxtLink to="/signup" class="underline underline-offset-4"> Sign up </NuxtLink>
+                    <NuxtLink :to="signupLink" class="underline underline-offset-4"> Sign up </NuxtLink>
                   </div>
                 </div>
               </form>
@@ -110,6 +110,12 @@ export default {
       error: '',
     }
   },
+  computed: {
+    signupLink() {
+      const redirect = this.$route.query.redirect
+      return redirect ? `/signup?redirect=${encodeURIComponent(redirect)}` : '/signup'
+    },
+  },
   methods: {
     async handleSubmit() {
       if (!this.email || !this.password) {
@@ -129,7 +135,8 @@ export default {
         if (result.error) {
           this.error = result.error.message || 'Sign in failed'
         } else {
-          await navigateTo('/dashboard')
+          const redirect = this.$route.query.redirect
+          await navigateTo(redirect && typeof redirect === 'string' && redirect.startsWith('/') ? redirect : '/dashboard')
         }
       } catch (err) {
         this.error = 'An unexpected error occurred'
diff --git a/pages/settings/index.vue b/pages/settings/index.vue
index 884dfa0..f5984ea 100644
--- a/pages/settings/index.vue
+++ b/pages/settings/index.vue
@@ -83,11 +83,16 @@ export default {
     return {
       activeTab: 'profile',
       currentOrgRole: null,
+      hasOrganization: false,
     }
   },
   computed: {
     availableTabs() {
       return allTabs.filter((tab) => {
+        // Workspace-only tabs: hide when user has no org
+        if (['organization', 'team', 'billing'].includes(tab.key) && !this.hasOrganization) {
+          return false
+        }
         if (tab.key === 'billing') {
           return this.currentOrgRole === 'owner'
         }
@@ -105,7 +110,7 @@ export default {
     const validKeys = this.availableTabs.map((t) => t.key)
     if (hash && validKeys.includes(hash)) {
       this.activeTab = hash
-    } else if (hash === 'billing' && !validKeys.includes('billing')) {
+    } else if (hash && !validKeys.includes(hash)) {
       this.activeTab = 'profile'
       window.history.replaceState(null, null, '#profile')
     }
@@ -116,9 +121,12 @@ export default {
         const activeOrg = await $fetch('/api/auth/organization/get-full-organization').catch(() => null)
         if (!activeOrg?.id && !activeOrg?.name) {
           this.currentOrgRole = null
+          this.hasOrganization = false
           return
         }
 
+        this.hasOrganization = true
+
         let slug = activeOrg.slug || null
         if (!slug) {
           const listedOrgs = await $fetch('/api/auth/organization/list').catch(() => null)
diff --git a/pages/signup/index.vue b/pages/signup/index.vue
index 6730d16..7341590 100644
--- a/pages/signup/index.vue
+++ b/pages/signup/index.vue
@@ -75,7 +75,7 @@
                   <!-- Sign In Link -->
                   <div class="text-center text-sm">
                     Already have an account?
-                    <NuxtLink to="/login" class="underline underline-offset-4"> Sign in </NuxtLink>
+                    <NuxtLink :to="loginLink" class="underline underline-offset-4"> Sign in </NuxtLink>
                   </div>
                 </div>
               </form>
@@ -115,6 +115,12 @@ export default {
       error: '',
     }
   },
+  computed: {
+    loginLink() {
+      const redirect = this.$route.query.redirect
+      return redirect ? `/login?redirect=${encodeURIComponent(redirect)}` : '/login'
+    },
+  },
   methods: {
     async handleSubmit() {
       if (!this.name || !this.email || !this.password) {
@@ -140,7 +146,8 @@ export default {
         if (result.error) {
           this.error = result.error.message || 'Sign up failed'
         } else {
-          await navigateTo('/dashboard')
+          const redirect = this.$route.query.redirect
+          await navigateTo(redirect && typeof redirect === 'string' && redirect.startsWith('/') ? redirect : '/dashboard')
         }
       } catch (err) {
         this.error = 'An unexpected error occurred'