An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
Fix Docker sidebar and chat history persistence (#791)
Yoshiki Miuraebe3b6012626
diff --git a/app/layout.tsx b/app/layout.tsxindex 155eca7a..65a0b72e 100644--- a/app/layout.tsx+++ b/app/layout.tsx@@ -3,6 +3,7 @@ import { Inter as FontSans } from 'next/font/google'import { Analytics } from '@vercel/analytics/next'+import { getCurrentUserId } from '@/lib/auth/get-current-user'import { UserProvider } from '@/lib/contexts/user-context'import { createClient } from '@/lib/supabase/server'import { cn } from '@/lib/utils'@@ -66,6 +67,8 @@ export default async function RootLayout({user = supabaseUser}+ const userId = user?.id ?? (await getCurrentUserId())+return (<html lang="en" suppressHydrationWarning><body@@ -80,9 +83,9 @@ export default async function RootLayout({enableSystemdisableTransitionOnChange>- <UserProvider hasUser={!!user}>+ <UserProvider hasUser={!!userId}><SidebarProvider defaultOpen={false}>- {user && <AppSidebar />}+ {userId && <AppSidebar />}<div className="flex flex-col flex-1 min-w-0"><Header user={user} /><main className="flex flex-1 min-h-0 min-w-0 overflow-hidden">diff --git a/docker-compose.yaml b/docker-compose.yamlindex 738ed0a8..96c7efff 100644--- a/docker-compose.yaml+++ b/docker-compose.yaml@@ -13,8 +13,9 @@ services:- morphic:latestenv_file: .env.local # Load environment variablesenvironment:- # Database connection for Docker Compose+ # Database connection for Docker Compose (override any cloud DB from .env.local)DATABASE_URL: postgresql://${POSTGRES_USER:-morphic}:${POSTGRES_PASSWORD:-morphic}@postgres:5432/${POSTGRES_DB:-morphic}+ DATABASE_RESTRICTED_URL: postgresql://${POSTGRES_USER:-morphic}:${POSTGRES_PASSWORD:-morphic}@postgres:5432/${POSTGRES_DB:-morphic}DATABASE_SSL_DISABLED: 'true' # Disable SSL for local Docker PostgreSQL# Authentication settings (default: disabled for personal Docker use)ENABLE_AUTH: ${ENABLE_AUTH:-false}