Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 42 additions & 26 deletions src/components/nav/topbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import React from 'react'
import { Search, Bell, User, Settings as SettingsIcon, Command } from 'lucide-react'
import { cn } from '@/lib/utils'
import { Button } from '@/components/ui/button'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import {
DropdownMenu,
DropdownMenuContent,
Expand Down Expand Up @@ -53,27 +54,37 @@ export function Topbar() {
{/* Right Side - Actions */}
<div className="flex items-center gap-2">
{/* Notifications */}
<Button
variant="ghost"
size="icon"
className="text-neutral-medium hover:text-[var(--foreground)] hover:bg-[var(--surface)] transition-colors duration-150"
aria-label="Notifications"
>
<Bell className="size-4" />
</Button>

{/* User Menu */}
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
size="icon"
className="text-neutral-medium hover:text-[var(--foreground)] hover:bg-[var(--surface)] transition-colors duration-150"
aria-label="User menu"
aria-label="Notifications"
>
<User className="size-4" />
<Bell className="size-4" />
</Button>
</DropdownMenuTrigger>
</TooltipTrigger>
<TooltipContent>Notifications</TooltipContent>
</Tooltip>

{/* User Menu */}
<DropdownMenu>
<Tooltip>
<TooltipTrigger asChild>
<DropdownMenuTrigger asChild>
<Button
variant="ghost"
size="icon"
className="text-neutral-medium hover:text-[var(--foreground)] hover:bg-[var(--surface)] transition-colors duration-150"
aria-label="User menu"
>
<User className="size-4" />
</Button>
</DropdownMenuTrigger>
</TooltipTrigger>
<TooltipContent>My Account</TooltipContent>
</Tooltip>
<DropdownMenuContent
align="end"
className="bg-[var(--background)] border border-[var(--border)] text-[var(--foreground)]"
Expand All @@ -94,17 +105,22 @@ export function Topbar() {
</DropdownMenu>

{/* Settings Link */}
<Button
variant="ghost"
size="icon"
className="text-neutral-medium hover:text-[var(--foreground)] hover:bg-[var(--surface)] transition-colors duration-150"
aria-label="Settings"
asChild
>
<a href="/settings">
<SettingsIcon className="size-4" />
</a>
</Button>
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
size="icon"
className="text-neutral-medium hover:text-[var(--foreground)] hover:bg-[var(--surface)] transition-colors duration-150"
aria-label="Settings"
asChild
>
<a href="/settings">
<SettingsIcon className="size-4" />
</a>
</Button>
</TooltipTrigger>
<TooltipContent>Settings</TooltipContent>
</Tooltip>
</div>
</header>
)
Expand Down
Loading