From 587f4b4d78e683d377da9f2961351c9bf06919bb Mon Sep 17 00:00:00 2001 From: rathi Date: Fri, 22 Nov 2024 00:19:56 -0500 Subject: [PATCH] Added way to see name of account in sidebar --- src/components/MobileNav.tsx | 20 ++++++++++++++------ src/components/Sidebar.tsx | 12 +++++++++--- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/components/MobileNav.tsx b/src/components/MobileNav.tsx index 5b4e40e..70777a2 100644 --- a/src/components/MobileNav.tsx +++ b/src/components/MobileNav.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Plus, CalendarIcon, SettingsIcon, LogOut } from 'lucide-react'; +import { Plus, CalendarIcon, SettingsIcon, LogOut, User } from 'lucide-react'; import { useThemeContext } from '../contexts/ThemeContext'; import { useAuth } from '../contexts/AuthContext'; @@ -12,7 +12,7 @@ interface MobileNavProps { export const MobileNav: React.FC = ({ activeView, setActiveView }) => { const { theme } = useThemeContext(); - const { signOut } = useAuth(); + const { signOut, user } = useAuth(); return ( <> @@ -45,6 +45,11 @@ export const MobileNav: React.FC = ({ activeView, setActiveView icon={} label="Settings" /> + } + label={user?.email?.split('@')[0] ?? 'Account'} + tooltip={user?.email} + /> } @@ -59,10 +64,11 @@ export const MobileNav: React.FC = ({ activeView, setActiveView interface NavButtonProps { active?: boolean; - onClick: () => void; + onClick?: () => void; icon: React.ReactNode; label: string; variant?: 'default' | 'danger'; + tooltip?: string; } const NavButton: React.FC = ({ @@ -70,7 +76,8 @@ const NavButton: React.FC = ({ onClick, icon, label, - variant = 'default' + variant = 'default', + tooltip }) => { const { theme } = useThemeContext(); @@ -85,8 +92,9 @@ const NavButton: React.FC = ({ className={` ${baseStyles} ${variantStyles} - ${active ? 'scale-95 shadow-inner' : 'hover:scale-105'} + ${active ? 'scale-95 shadow-inner' : onClick ? 'hover:scale-105' : ''} `} + title={tooltip} >
= ({ {icon}
{label} diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx index 28c88f6..ae9b372 100644 --- a/src/components/Sidebar.tsx +++ b/src/components/Sidebar.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Plus, CalendarIcon, SettingsIcon, LogOut } from 'lucide-react'; +import { Plus, CalendarIcon, SettingsIcon, LogOut, User } from 'lucide-react'; import { useThemeContext } from '../contexts/ThemeContext'; import { useAuth } from '../contexts/AuthContext'; @@ -12,7 +12,7 @@ interface SidebarProps { export const Sidebar: React.FC = ({ activeView, setActiveView }) => { const { theme } = useThemeContext(); - const { signOut } = useAuth(); + const { signOut, user } = useAuth(); return (