An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
feat: enhance user menu with theme/link submenus and fix avatar display
Yoshiki Miura9d1e41fb2a7b
diff --git a/components/external-link-items.tsx b/components/external-link-items.tsxnew file mode 100644index 00000000..66481db5--- /dev/null+++ b/components/external-link-items.tsx@@ -0,0 +1,38 @@+'use client'++import { DropdownMenuItem } from '@/components/ui/dropdown-menu'+import Link from 'next/link'+import { SiDiscord, SiGithub, SiX } from 'react-icons/si'++const externalLinks = [+ {+ name: 'X',+ href: 'https://x.com/morphic_ai',+ icon: <SiX className="mr-2 h-4 w-4" />+ },+ {+ name: 'Discord',+ href: 'https://discord.gg/zRxaseCuGq',+ icon: <SiDiscord className="mr-2 h-4 w-4" />+ },+ {+ name: 'GitHub',+ href: 'https://git.new/morphic',+ icon: <SiGithub className="mr-2 h-4 w-4" />+ }+]++export function ExternalLinkItems() {+ return (+ <>+ {externalLinks.map(link => (+ <DropdownMenuItem key={link.name} asChild>+ <Link href={link.href} target="_blank" rel="noopener noreferrer">+ {link.icon}+ <span>{link.name}</span>+ </Link>+ </DropdownMenuItem>+ ))}+ </>+ )+}diff --git a/components/footer.tsx b/components/footer.tsxindex 8c1cd36c..d6f0a9a7 100644--- a/components/footer.tsx+++ b/components/footer.tsx@@ -1,42 +1,18 @@-import Link from 'next/link'import React from 'react'-import { SiDiscord, SiGithub, SiX } from 'react-icons/si'-import { Button } from './ui/button'+// import { SiDiscord, SiGithub, SiX } from 'react-icons/si' // Removed+// import { Button } from './ui/button' // Removed if Button is no longer usedconst Footer: React.FC = () => {+ // Footer content is now removed.+ // Consider if the footer component itself is still needed.+ // If not, it can be deleted and removed from app/layout.tsx.return (<footer className="w-fit p-1 md:p-2 fixed bottom-0 right-0 hidden lg:block">- <div className="flex justify-end">- <Button- variant={'ghost'}- size={'icon'}- className="text-muted-foreground/50"- >- <Link href="https://discord.gg/zRxaseCuGq" target="_blank">- <SiDiscord size={18} />- </Link>- </Button>- <Button- variant={'ghost'}- size={'icon'}- className="text-muted-foreground/50"- >- <Link href="https://x.com/morphic_ai" target="_blank">- <SiX size={18} />- </Link>- </Button>- <Button- variant={'ghost'}- size={'icon'}- className="text-muted-foreground/50"- >- <Link href="https://git.new/morphic" target="_blank">- <SiGithub size={18} />- </Link>- </Button>- </div>+ <div className="flex justify-end">{/* Social links were here */}</div></footer>)+ // Or, if the footer is no longer needed at all:+ // return null}export default Footerdiff --git a/components/header.tsx b/components/header.tsxindex c141b5e4..62c78aab 100644--- a/components/header.tsx+++ b/components/header.tsx@@ -5,7 +5,6 @@ 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'@@ -33,7 +32,6 @@ export const Header: React.FC<HeaderProps> = ({ user }) => {<Link href="/auth/login">Sign In</Link></Button>)}- <ModeToggle /></div></header>)diff --git a/components/theme-menu-items.tsx b/components/theme-menu-items.tsxnew file mode 100644index 00000000..4960eab0--- /dev/null+++ b/components/theme-menu-items.tsx@@ -0,0 +1,26 @@+'use client'++import { DropdownMenuItem } from '@/components/ui/dropdown-menu'+import { Laptop, Moon, Sun } from 'lucide-react'+import { useTheme } from 'next-themes'++export function ThemeMenuItems() {+ const { setTheme } = useTheme()++ return (+ <>+ <DropdownMenuItem onClick={() => setTheme('light')}>+ <Sun className="mr-2 h-4 w-4" />+ <span>Light</span>+ </DropdownMenuItem>+ <DropdownMenuItem onClick={() => setTheme('dark')}>+ <Moon className="mr-2 h-4 w-4" />+ <span>Dark</span>+ </DropdownMenuItem>+ <DropdownMenuItem onClick={() => setTheme('system')}>+ <Laptop className="mr-2 h-4 w-4" />+ <span>System</span>+ </DropdownMenuItem>+ </>+ )+}diff --git a/components/user-menu.tsx b/components/user-menu.tsxindex a23a132b..d555a35b 100644--- a/components/user-menu.tsx+++ b/components/user-menu.tsx@@ -7,10 +7,17 @@ import {DropdownMenuItem,DropdownMenuLabel,DropdownMenuSeparator,+ DropdownMenuSub,+ DropdownMenuSubContent,+ DropdownMenuSubTrigger,DropdownMenuTrigger} from '@/components/ui/dropdown-menu'+import { createClient } from '@/lib/supabase/client'import { User } from '@supabase/supabase-js'-import { LogoutButton } from './logout-button' // Import the existing LogoutButton+import { Link2, LogOut, Palette } from 'lucide-react'+import { useRouter } from 'next/navigation'+import { ExternalLinkItems } from './external-link-items'+import { ThemeMenuItems } from './theme-menu-items'import { Button } from './ui/button'interface UserMenuProps {@@ -18,9 +25,31 @@ interface UserMenuProps {}export default function UserMenu({ user }: UserMenuProps) {- const getInitials = (email: string | undefined) => {- if (!email) return ''- return email.split('@')[0].substring(0, 2).toUpperCase()+ const router = useRouter()+ const userName =+ user.user_metadata?.full_name || user.user_metadata?.name || 'User'+ const avatarUrl =+ user.user_metadata?.avatar_url || user.user_metadata?.picture++ const getInitials = (name: string, email: string | undefined) => {+ if (name && name !== 'User') {+ const names = name.split(' ')+ if (names.length > 1) {+ return `${names[0][0]}${names[names.length - 1][0]}`.toUpperCase()+ }+ return name.substring(0, 2).toUpperCase()+ }+ if (email) {+ return email.split('@')[0].substring(0, 2).toUpperCase()+ }+ return 'U'+ }++ const handleLogout = async () => {+ const supabase = createClient()+ await supabase.auth.signOut()+ router.push('/')+ router.refresh()}return (@@ -28,31 +57,45 @@ export default function UserMenu({ user }: UserMenuProps) {<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>+ <AvatarImage src={avatarUrl} alt={userName} />+ <AvatarFallback>{getInitials(userName, user.email)}</AvatarFallback></Avatar></Button></DropdownMenuTrigger>- <DropdownMenuContent className="w-56" align="end" forceMount>+ <DropdownMenuContent className="w-60" 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">+ <p className="text-sm font-medium leading-none truncate">+ {userName}+ </p>+ <p className="text-xs leading-none text-muted-foreground truncate">{user.email}</p></div></DropdownMenuLabel><DropdownMenuSeparator />- {/* <DropdownMenuItem>Profile</DropdownMenuItem> */}- {/* <DropdownMenuItem>Settings</DropdownMenuItem> */}+ <DropdownMenuSub>+ <DropdownMenuSubTrigger>+ <Palette className="mr-2 h-4 w-4" />+ <span>Theme</span>+ </DropdownMenuSubTrigger>+ <DropdownMenuSubContent>+ <ThemeMenuItems />+ </DropdownMenuSubContent>+ </DropdownMenuSub>+ <DropdownMenuSub>+ <DropdownMenuSubTrigger>+ <Link2 className="mr-2 h-4 w-4" />+ <span>Links</span>+ </DropdownMenuSubTrigger>+ <DropdownMenuSubContent>+ <ExternalLinkItems />+ </DropdownMenuSubContent>+ </DropdownMenuSub><DropdownMenuSeparator />- <DropdownMenuItem asChild>- {/* Use the LogoutButton component here */}- <LogoutButton />+ <DropdownMenuItem onClick={handleLogout}>+ <LogOut className="mr-2 h-4 w-4" />+ <span>Logout</span></DropdownMenuItem></DropdownMenuContent></DropdownMenu>diff --git a/next.config.mjs b/next.config.mjsindex b7cfb42d..eb6fcf00 100644--- a/next.config.mjs+++ b/next.config.mjs@@ -7,8 +7,13 @@ const nextConfig = {hostname: 'i.ytimg.com',port: '',pathname: '/vi/**'+ },+ {+ protocol: 'https',+ hostname: 'lh3.googleusercontent.com',+ port: '',+ pathname: '/a/**' // Google user content often follows this pattern}- // Add other domains here if needed in the future]}}