Skip to content

An AI-powered search engine with a generative UI

feat: implement user menu and conditional rendering in header

Yoshiki Miura59dd78d31ec6
diff --git a/app/layout.tsx b/app/layout.tsx
index e3a08b1b..6bd38a06 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -4,6 +4,7 @@ import Header from '@/components/header'
import { ThemeProvider } from '@/components/theme-provider'
import { SidebarProvider } from '@/components/ui/sidebar'
import { Toaster } from '@/components/ui/sonner'
+import { createClient } from '@/lib/supabase/server'
import { cn } from '@/lib/utils'
import type { Metadata, Viewport } from 'next'
import { Inter as FontSans } from 'next/font/google'
@@ -41,11 +42,16 @@ export const viewport: Viewport = {
maximumScale: 1
}
-export default function RootLayout({
+export default async function RootLayout({
children
}: Readonly<{
children: React.ReactNode
}>) {
+ const supabase = await createClient()
+ const {
+ data: { user }
+ } = await supabase.auth.getUser()
+
return (
<html lang="en" suppressHydrationWarning>
<body
@@ -63,7 +69,7 @@ export default function RootLayout({
<SidebarProvider defaultOpen>
<AppSidebar />
<div className="flex flex-col flex-1">
- <Header />
+ <Header user={user} />
<main className="flex flex-1 min-h-0">
<ArtifactRoot>{children}</ArtifactRoot>
</main>
diff --git a/components/header.tsx b/components/header.tsx
index 07fe6b24..c141b5e4 100644
--- a/components/header.tsx
+++ b/components/header.tsx
@@ -2,20 +2,37 @@
import { useSidebar } from '@/components/ui/sidebar'
import { cn } from '@/lib/utils'
+import { User } from '@supabase/supabase-js'
+import Link from 'next/link'
import React from 'react'
import { ModeToggle } from './mode-toggle'
+import { Button } from './ui/button'
+import UserMenu from './user-menu'
-export const Header: React.FC = () => {
+interface HeaderProps {
+ user: User | null
+}
+
+export const Header: React.FC<HeaderProps> = ({ user }) => {
const { open } = useSidebar()
return (
<header
className={cn(
- 'absolute top-0 right-0 p-2 flex justify-end items-center z-10 backdrop-blur lg:backdrop-blur-none bg-background/80 lg:bg-transparent transition-[width] duration-200 ease-linear',
+ 'absolute top-0 right-0 p-2 flex justify-between items-center z-10 backdrop-blur lg:backdrop-blur-none bg-background/80 lg:bg-transparent transition-[width] duration-200 ease-linear',
open ? 'md:w-[calc(100%-var(--sidebar-width))]' : 'md:w-full',
'w-full'
)}
>
- <div className="flex gap-0.5">
+ <div></div>
+
+ <div className="flex items-center gap-2">
+ {user ? (
+ <UserMenu user={user} />
+ ) : (
+ <Button asChild size="sm">
+ <Link href="/auth/login">Sign In</Link>
+ </Button>
+ )}
<ModeToggle />
</div>
</header>
diff --git a/components/user-menu.tsx b/components/user-menu.tsx
new file mode 100644
index 00000000..a23a132b
--- /dev/null
+++ b/components/user-menu.tsx
@@ -0,0 +1,60 @@
+'use client'
+
+import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuLabel,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger
+} from '@/components/ui/dropdown-menu'
+import { User } from '@supabase/supabase-js'
+import { LogoutButton } from './logout-button' // Import the existing LogoutButton
+import { Button } from './ui/button'
+
+interface UserMenuProps {
+ user: User
+}
+
+export default function UserMenu({ user }: UserMenuProps) {
+ const getInitials = (email: string | undefined) => {
+ if (!email) return ''
+ return email.split('@')[0].substring(0, 2).toUpperCase()
+ }
+
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button variant="ghost" className="relative h-8 w-8 rounded-full">
+ <Avatar className="h-8 w-8">
+ {/* Attempt to use user metadata for avatar, fallback to email */}
+ <AvatarImage
+ src={user.user_metadata?.avatar_url}
+ alt={user.email ?? 'User Avatar'}
+ />
+ <AvatarFallback>{getInitials(user.email)}</AvatarFallback>
+ </Avatar>
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent className="w-56" align="end" forceMount>
+ <DropdownMenuLabel className="font-normal">
+ <div className="flex flex-col space-y-1">
+ <p className="text-sm font-medium leading-none">Account</p>
+ <p className="text-xs leading-none text-muted-foreground">
+ {user.email}
+ </p>
+ </div>
+ </DropdownMenuLabel>
+ <DropdownMenuSeparator />
+ {/* <DropdownMenuItem>Profile</DropdownMenuItem> */}
+ {/* <DropdownMenuItem>Settings</DropdownMenuItem> */}
+ <DropdownMenuSeparator />
+ <DropdownMenuItem asChild>
+ {/* Use the LogoutButton component here */}
+ <LogoutButton />
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ )
+}