Merge pull request #11 from will-lp1/add-toolbar

Add toolbar, and improve sidebar document switching

Author: will-lp1

apps/snow-leopard/app/documents/[id]/page.tsx

@@ -1,9 +1,10 @@
 import { notFound } from 'next/navigation';
 import { getUser } from '@/app/(auth)/auth';
-import { getDocumentById } from '@/lib/db/queries';
+import { getDocumentsById } from '@/lib/db/queries';
 import { AlwaysVisibleArtifact } from '@/components/always-visible-artifact';
 import { checkSubscriptionStatus } from '@/lib/subscription';
 import { Paywall } from '@/components/paywall'; 
+import type { Document } from '@snow-leopard/db';
 
 export const dynamic = 'auto';
 export const dynamicParams = true;
@@ -13,45 +14,54 @@ export default async function DocumentPage(props: { params: Promise<{ id: string
   try {
     const documentId = params.id;
 
+    const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+    if (!uuidRegex.test(documentId)) {
+      console.warn(`[DocumentPage] Invalid document ID format: ${documentId}`);
+      return notFound(); 
+    }
+
     const { hasActiveSubscription } = await checkSubscriptionStatus();
 
     if (!hasActiveSubscription) {
       return <Paywall isOpen={true} required={true} />;
     }
 
-    const [document, user] = await Promise.all([
-      getDocumentById({ id: documentId }),
+    const [documentsResult, user] = await Promise.all([
+      getDocumentsById({ ids: [documentId], userId: 'placeholder' }),
       getUser(),
     ]);
 
     if (!user) {
-      console.warn(`[documents/[id]/page.tsx] User ${documentId}: Active subscription status but no logged-in user found by getUser(). Redirecting.`);
-      return notFound(); // Or redirect('/login')
+      console.warn(`[DocumentPage] User not found after subscription check. Redirecting.`);
+      return notFound(); 
     }
 
-    if (!document || user.id !== document.userId) {
-      if (!document) { 
-        return (
-          <AlwaysVisibleArtifact 
-            chatId="placeholder-for-artifact"
-            initialDocumentId="init"
-            showCreateDocumentForId={documentId}
-          />
-        );
-      } else {
-        return notFound();
-      }
-    }
+    const documents: Document[] = await getDocumentsById({ ids: [documentId], userId: user.id });
 
+    if (!documents || documents.length === 0) {
+      console.log(`[DocumentPage] Document ${documentId} not found for user ${user.id}. Showing create prompt.`);
+      return (
+        <AlwaysVisibleArtifact 
+          chatId="placeholder-for-artifact"
+          initialDocumentId="init"
+          initialDocuments={[]}
+          showCreateDocumentForId={documentId}
+          user={user}
+        />
+      );
+    }
+    
     return (
       <AlwaysVisibleArtifact 
         chatId="placeholder-for-artifact"
         initialDocumentId={documentId}
+        initialDocuments={documents}
+        user={user}
       />
     );
 
   } catch (error) {
-    console.error(`Page error for document ${params.id}:`, error);
+    console.error(`[DocumentPage] Page error for document ${params.id}:`, error);
     return notFound();
   }
 } 

apps/snow-leopard/app/documents/page.tsx

@@ -1,5 +1,5 @@
 import { redirect } from 'next/navigation';
-import { getSession } from '@/app/(auth)/auth'; 
+import { getSession, getUser } from '@/app/(auth)/auth';
 import { AlwaysVisibleArtifact } from '@/components/always-visible-artifact';
 import { checkSubscriptionStatus } from '@/lib/subscription';
 import { Paywall } from '@/components/paywall';
@@ -13,12 +13,21 @@ export default async function Page() {
 
   const { hasActiveSubscription } = await checkSubscriptionStatus();
 
+  // Fetch user data for passing to client component
+  const user = await getUser();
+  if (!user) {
+    // If getUser fails, redirect to login or home
+    redirect('/');
+  }
+
   return (
     <>
       {hasActiveSubscription ? (
         <AlwaysVisibleArtifact 
-          chatId="new-chat" 
-          initialDocumentId="init" 
+          chatId="new-chat"
+          initialDocumentId="init"
+          initialDocuments={[]} // No existing docs for new chat
+          user={user}
         />
       ) : (
         <Paywall isOpen={true} required={true} />

apps/snow-leopard/app/page.tsx

@@ -88,7 +88,7 @@ export default function Home() {
 
         <div className="flex flex-col items-center max-w-4xl mb-32">
           {/* START ADD: Add Snow Leopard GIF */}
-          <div className="mb-8 w-full max-w-xs sm:max-w-sm md:max-w-md lg:max-w-lg xl:max-w-xl p-1 bg-muted/30 rounded-xl border border-border/50 shadow-inner">
+          <div className="mt-4 mb-8 w-full max-w-xs sm:max-w-sm md:max-w-md lg:max-w-lg xl:max-w-xl p-1 bg-muted/30 rounded-xl border border-border/50 shadow-inner">
             <img
               src="/demo.gif"
               alt="Snow Leopard demo"