diff --git a/src/app/favicon.ico b/src/app/favicon.ico deleted file mode 100644 index 718d6fe..0000000 Binary files a/src/app/favicon.ico and /dev/null differ diff --git a/src/components/StatsCard.tsx b/src/components/StatsCard.tsx index 3fe5e8e..763384e 100644 --- a/src/components/StatsCard.tsx +++ b/src/components/StatsCard.tsx @@ -61,7 +61,7 @@ export function StatsCard({ usageData, substance }: StatsCardProps) { return ( - + {substanceLabel} Stats @@ -69,20 +69,20 @@ export function StatsCard({ usageData, substance }: StatsCardProps) {
-

{todayUsage}

-

Today

+

{todayUsage}

+

Today

-

{weekAverage}

-

Daily Avg (7d)

+

{weekAverage}

+

Daily Avg (7d)

-

{streak}

-

Free days

+

{streak}

+

Free days

-

{totalDays}

-

Days tracked

+

{totalDays}

+

Days tracked

diff --git a/src/components/UserHeader.tsx b/src/components/UserHeader.tsx index 61465d5..28d2b3d 100644 --- a/src/components/UserHeader.tsx +++ b/src/components/UserHeader.tsx @@ -1,7 +1,6 @@ 'use client'; import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'; -import { Button } from '@/components/ui/button'; import { DropdownMenu, DropdownMenuContent, @@ -13,7 +12,7 @@ import { User } from '@/lib/session'; import { fetchPreferences } from '@/lib/storage'; import { useEffect, useState } from 'react'; import { useRouter } from 'next/navigation'; -import { Cigarette, Leaf, LogOut, Home } from 'lucide-react'; +import { Cigarette, Leaf, LogOut, Home, ChevronDown } from 'lucide-react'; interface UserHeaderProps { user: User; @@ -36,10 +35,14 @@ export function UserHeader({ user }: UserHeaderProps) { .join('') .toUpperCase() || user.email[0].toUpperCase(); - const handleLogout = async () => { + const handleLogout = () => { window.location.href = '/api/auth/logout'; }; + const handleNavigate = (path: string) => { + router.push(path); + }; + return (

router.push('/')} + onClick={() => handleNavigate('/')} > QuitTraq

@@ -60,34 +63,35 @@ export function UserHeader({ user }: UserHeaderProps) { )} -
+
- - - router.push('/')} className="cursor-pointer"> - - Dashboard + + handleNavigate('/')}> + + Dashboard - router.push('/track/nicotine')} className="cursor-pointer"> - - Track Nicotine Usage + handleNavigate('/track/nicotine')}> + + Track Nicotine Usage - router.push('/track/marijuana')} className="cursor-pointer"> - - Track Marijuana Usage + handleNavigate('/track/marijuana')}> + + Track Marijuana Usage - - - Sign out + + + Sign out diff --git a/src/components/ui/dropdown-menu.tsx b/src/components/ui/dropdown-menu.tsx index ff0ef8f..9717aa2 100644 --- a/src/components/ui/dropdown-menu.tsx +++ b/src/components/ui/dropdown-menu.tsx @@ -16,7 +16,7 @@ const DropdownMenuContent = React.forwardRef< ref={ref} sideOffset={sideOffset} className={cn( - "z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md", + "z-[100] min-w-[12rem] overflow-hidden rounded-lg border border-white/20 bg-zinc-900 p-2 text-white shadow-xl", "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2", className )} @@ -35,7 +35,7 @@ const DropdownMenuItem = React.forwardRef< (({ className, ...props }, ref) => ( ))