An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
feat: default sidebar closed and hide for guests (#783)
Yoshiki Miurabf74b44ef970
diff --git a/app/layout.tsx b/app/layout.tsxindex 1e14224e..155eca7a 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 { UserProvider } from '@/lib/contexts/user-context'import { createClient } from '@/lib/supabase/server'import { cn } from '@/lib/utils'@@ -79,15 +80,17 @@ export default async function RootLayout({enableSystemdisableTransitionOnChange>- <SidebarProvider defaultOpen>- <AppSidebar hasUser={!!user} />- <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">- <ArtifactRoot>{children}</ArtifactRoot>- </main>- </div>- </SidebarProvider>+ <UserProvider hasUser={!!user}>+ <SidebarProvider defaultOpen={false}>+ {user && <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">+ <ArtifactRoot>{children}</ArtifactRoot>+ </main>+ </div>+ </SidebarProvider>+ </UserProvider><Toaster /><Analytics /></ThemeProvider>diff --git a/components/app-sidebar.tsx b/components/app-sidebar.tsxindex f7739f86..7b50f4eb 100644--- a/components/app-sidebar.tsx+++ b/components/app-sidebar.tsx@@ -20,7 +20,7 @@ import { ChatHistorySection } from './sidebar/chat-history-section'import { ChatHistorySkeleton } from './sidebar/chat-history-skeleton'import { IconLogo } from './ui/icons'-export default function AppSidebar({ hasUser = false }: { hasUser?: boolean }) {+export default function AppSidebar() {return (<Sidebar side="left" variant="sidebar" collapsible="offcanvas"><SidebarHeader className="flex flex-row justify-between items-center">@@ -41,13 +41,11 @@ export default function AppSidebar({ hasUser = false }: { hasUser?: boolean }) {</SidebarMenuButton></SidebarMenuItem></SidebarMenu>- {hasUser && (- <div className="flex-1 overflow-y-auto">- <Suspense fallback={<ChatHistorySkeleton />}>- <ChatHistorySection />- </Suspense>- </div>- )}+ <div className="flex-1 overflow-y-auto">+ <Suspense fallback={<ChatHistorySkeleton />}>+ <ChatHistorySection />+ </Suspense>+ </div></SidebarContent><SidebarRail /></Sidebar>diff --git a/components/artifact/chat-artifact-container.tsx b/components/artifact/chat-artifact-container.tsxindex 101e0047..d4dc44d9 100644--- a/components/artifact/chat-artifact-container.tsx+++ b/components/artifact/chat-artifact-container.tsx@@ -2,6 +2,7 @@import React, { useCallback, useEffect, useRef, useState } from 'react'+import { useHasUser } from '@/lib/contexts/user-context'import { cn } from '@/lib/utils'import { SidebarTrigger, useSidebar } from '@/components/ui/sidebar'@@ -44,6 +45,7 @@ export function ChatArtifactContainer({const containerRef = useRef<HTMLDivElement>(null)const [width, setWidth] = useState(DEFAULT_WIDTH)const [isResizing, setIsResizing] = useState(false)+ const hasUser = useHasUser()const { open, isMobile: isMobileSidebar } = useSidebar()// Load saved width after hydration@@ -131,7 +133,7 @@ export function ChatArtifactContainer({return (<div className="flex-1 min-h-0 min-w-0 h-screen flex"><div className="absolute p-4 z-50 transition-opacity duration-1000">- {(!open || isMobileSidebar) && (+ {hasUser && (!open || isMobileSidebar) && (<SidebarTrigger className="animate-fade-in" />)}</div>diff --git a/lib/contexts/user-context.tsx b/lib/contexts/user-context.tsxnew file mode 100644index 00000000..dace022a--- /dev/null+++ b/lib/contexts/user-context.tsx@@ -0,0 +1,19 @@+'use client'++import { createContext, useContext } from 'react'++const UserContext = createContext(false)++export function UserProvider({+ hasUser,+ children+}: {+ hasUser: boolean+ children: React.ReactNode+}) {+ return <UserContext.Provider value={hasUser}>{children}</UserContext.Provider>+}++export function useHasUser() {+ return useContext(UserContext)+}