Fixed a number of issues

src/pages/dashboard/team/invite.astro

@@ -8,12 +8,20 @@ import { eq } from 'drizzle-orm';
 const user = Astro.locals.user;
 if (!user) return Astro.redirect('/login');
 
-const userMembership = await db.select()
+// Get current team from cookie
+const currentTeamId = Astro.cookies.get('currentTeamId')?.value;
+
+const userMemberships = await db.select()
   .from(members)
   .where(eq(members.userId, user.id))
-  .get();
+  .all();
 
-if (!userMembership) return Astro.redirect('/dashboard');
+if (userMemberships.length === 0) return Astro.redirect('/dashboard');
+
+// Use current team or fallback to first membership
+const userMembership = currentTeamId
+  ? userMemberships.find(m => m.organizationId === currentTeamId) || userMemberships[0]
+  : userMemberships[0];
 
 const isAdmin = userMembership.role === 'owner' || userMembership.role === 'admin';
 if (!isAdmin) return Astro.redirect('/dashboard/team');
@@ -22,7 +30,7 @@ if (!isAdmin) return Astro.redirect('/dashboard/team');
 <DashboardLayout title="Invite Team Member - Chronus">
   <div class="max-w-2xl mx-auto">
     <h1 class="text-3xl font-bold mb-6">Invite Team Member</h1>
-    
+
     <form method="POST" action="/api/team/invite" class="card bg-base-100 shadow-xl border border-base-200">
       <div class="card-body">
         <div class="alert alert-info mb-4">
@@ -34,13 +42,13 @@ if (!isAdmin) return Astro.redirect('/dashboard/team');
           <label class="label" for="email">
             <span class="label-text">Email Address</span>
           </label>
-          <input 
-            type="email" 
+          <input
+            type="email"
             id="email"
-            name="email" 
-            placeholder="user@example.com" 
-            class="input input-bordered" 
-            required 
+            name="email"
+            placeholder="user@example.com"
+            class="input input-bordered"
+            required
           />
         </div>
 

src/pages/dashboard/team/settings.astro

@@ -11,18 +11,22 @@ if (!user) return Astro.redirect('/login');
 // Get current team from cookie
 const currentTeamId = Astro.cookies.get('currentTeamId')?.value;
 
-const userMembership = await db.select()
+const userMemberships = await db.select()
   .from(members)
   .where(eq(members.userId, user.id))
-  .get();
+  .all();
 
-if (!userMembership) return Astro.redirect('/dashboard');
+if (userMemberships.length === 0) return Astro.redirect('/dashboard');
+
+// Use current team or fallback to first membership
+const userMembership = currentTeamId
+  ? userMemberships.find(m => m.organizationId === currentTeamId) || userMemberships[0]
+  : userMemberships[0];
 
 const isAdmin = userMembership.role === 'owner' || userMembership.role === 'admin';
 if (!isAdmin) return Astro.redirect('/dashboard/team');
 
-// Use current team or fallback to membership org
-const orgId = currentTeamId || userMembership.organizationId;
+const orgId = userMembership.organizationId;
 
 const organization = await db.select()
   .from(organizations)
@@ -55,34 +59,34 @@ const successType = url.searchParams.get('success');
         <Icon name="heroicons:building-office-2" class="w-6 h-6" />
         Team Settings
       </h2>
-      
+
       {successType === 'org-name' && (
         <div class="alert alert-success mb-4">
           <Icon name="heroicons:check-circle" class="w-6 h-6" />
           <span>Team name updated successfully!</span>
         </div>
       )}
-      
+
       <form action="/api/organizations/update-name" method="POST" class="space-y-4">
         <input type="hidden" name="organizationId" value={organization.id} />
-        
+
         <label class="form-control">
           <div class="label">
             <span class="label-text font-medium">Team Name</span>
           </div>
-          <input 
-            type="text" 
-            name="name" 
+          <input
+            type="text"
+            name="name"
             value={organization.name}
-            placeholder="Organization name" 
-            class="input input-bordered w-full" 
-            required 
+            placeholder="Organization name"
+            class="input input-bordered w-full"
+            required
           />
           <div class="label">
             <span class="label-text-alt text-base-content/60">This name is visible to all team members</span>
           </div>
         </label>
-        
+
         <div class="flex justify-end">
           <button type="submit" class="btn btn-primary">
             <Icon name="heroicons:check" class="w-5 h-5" />
@@ -106,7 +110,7 @@ const successType = url.searchParams.get('success');
           Add Category
         </a>
       </div>
-      
+
       <p class="text-base-content/70 mb-4">
         Categories help organize time tracking by type of work. All team members use the same categories.
       </p>
@@ -126,16 +130,16 @@ const successType = url.searchParams.get('success');
               <div class="card-body p-4">
                 <div class="flex items-center gap-3">
                   {category.color && (
-                    <span class="w-4 h-4 rounded-full flex-shrink-0" style={`background-color: ${category.color}`}></span>
+                    <span class="w-4 h-4 rounded-full shrink-0" style={`background-color: ${category.color}`}></span>
                   )}
-                  <div class="flex-grow min-w-0">
+                  <div class="grow min-w-0">
                     <h3 class="font-semibold truncate">{category.name}</h3>
                     <p class="text-xs text-base-content/60">
                       Created {category.createdAt?.toLocaleDateString() ?? 'N/A'}
                     </p>
                   </div>
-                  <a 
-                    href={`/dashboard/team/settings/categories/${category.id}/edit`} 
+                  <a
+                    href={`/dashboard/team/settings/categories/${category.id}/edit`}
                     class="btn btn-ghost btn-xs"
                   >
                     <Icon name="heroicons:pencil" class="w-4 h-4" />

src/pages/dashboard/team/settings/categories/[id]/edit.astro

@@ -10,12 +10,20 @@ if (!user) return Astro.redirect('/login');
 
 const { id } = Astro.params;
 
-const userMembership = await db.select()
+// Get current team from cookie
+const currentTeamId = Astro.cookies.get('currentTeamId')?.value;
+
+const userMemberships = await db.select()
   .from(members)
   .where(eq(members.userId, user.id))
-  .get();
+  .all();
 
-if (!userMembership) return Astro.redirect('/dashboard');
+if (userMemberships.length === 0) return Astro.redirect('/dashboard');
+
+// Use current team or fallback to first membership
+const userMembership = currentTeamId
+  ? userMemberships.find(m => m.organizationId === currentTeamId) || userMemberships[0]
+  : userMemberships[0];
 
 const isAdmin = userMembership.role === 'owner' || userMembership.role === 'admin';
 if (!isAdmin) return Astro.redirect('/dashboard/team/settings');
@@ -39,21 +47,21 @@ if (!category) return Astro.redirect('/dashboard/team/settings');
       </a>
       <h1 class="text-3xl font-bold">Edit Category</h1>
     </div>
-    
+
     <form method="POST" action={`/api/categories/${id}/update`} class="card bg-base-200 shadow-xl border border-base-300">
       <div class="card-body">
         <div class="form-control">
           <label class="label pb-2" for="name">
             <span class="label-text font-medium">Category Name</span>
           </label>
-          <input 
-            type="text" 
+          <input
+            type="text"
             id="name"
-            name="name" 
+            name="name"
             value={category.name}
-            placeholder="Development" 
-            class="input input-bordered w-full" 
-            required 
+            placeholder="Development"
+            class="input input-bordered w-full"
+            required
           />
         </div>
 
@@ -61,12 +69,12 @@ if (!category) return Astro.redirect('/dashboard/team/settings');
           <label class="label pb-2" for="color">
             <span class="label-text font-medium">Color (optional)</span>
           </label>
-          <input 
-            type="color" 
+          <input
+            type="color"
             id="color"
             name="color"
             value={category.color || '#3b82f6'}
-            class="input input-bordered w-full h-12" 
+            class="input input-bordered w-full h-12"
           />
         </div>