diff --git a/frontend/src/components/Common/Navbar.tsx b/frontend/src/components/Common/Navbar.tsx index 6177c36..7e952e0 100644 --- a/frontend/src/components/Common/Navbar.tsx +++ b/frontend/src/components/Common/Navbar.tsx @@ -20,7 +20,7 @@ function Navbar() { p={4} > - Logo + Logo diff --git a/frontend/src/components/Common/Sidebar.tsx b/frontend/src/components/Common/Sidebar.tsx index f8bc472..1d630f9 100644 --- a/frontend/src/components/Common/Sidebar.tsx +++ b/frontend/src/components/Common/Sidebar.tsx @@ -22,10 +22,6 @@ const Sidebar = () => { const { logout } = useAuth() const [open, setOpen] = useState(false) - const handleLogout = async () => { - logout() - } - return ( <> {/* Mobile */} @@ -48,7 +44,7 @@ const Sidebar = () => { - + @@ -56,7 +52,9 @@ const Sidebar = () => { { + logout() + }} alignItems="center" gap={4} px={4} @@ -67,7 +65,7 @@ const Sidebar = () => { {currentUser?.email && ( - + Logged in as: {currentUser.email} )} @@ -84,7 +82,7 @@ const Sidebar = () => { position="sticky" bg="bg.subtle" top={0} - minW="280px" + minW="xs" h="100vh" p={4} > diff --git a/frontend/src/components/UserSettings/ChangePassword.tsx b/frontend/src/components/UserSettings/ChangePassword.tsx index 5404a78..c94f970 100644 --- a/frontend/src/components/UserSettings/ChangePassword.tsx +++ b/frontend/src/components/UserSettings/ChangePassword.tsx @@ -48,11 +48,10 @@ const ChangePassword = () => { Change Password - + } diff --git a/frontend/src/components/UserSettings/UserInformation.tsx b/frontend/src/components/UserSettings/UserInformation.tsx index 2438778..a7b7c83 100644 --- a/frontend/src/components/UserSettings/UserInformation.tsx +++ b/frontend/src/components/UserSettings/UserInformation.tsx @@ -76,7 +76,7 @@ const UserInformation = () => { User Information @@ -86,7 +86,6 @@ const UserInformation = () => { {...register("full_name", { maxLength: 30 })} type="text" size="md" - w="auto" /> ) : ( { py={2} color={!currentUser?.full_name ? "gray" : "inherit"} truncate - maxWidth="250px" + maxW="sm" > {currentUser?.full_name || "N/A"} @@ -114,10 +113,9 @@ const UserInformation = () => { })} type="email" size="md" - w="auto" /> ) : ( - + {currentUser?.email} )} diff --git a/frontend/src/routes/_layout/index.tsx b/frontend/src/routes/_layout/index.tsx index b32eb4c..0313854 100644 --- a/frontend/src/routes/_layout/index.tsx +++ b/frontend/src/routes/_layout/index.tsx @@ -14,7 +14,7 @@ function Dashboard() { <> - + Hi, {currentUser?.full_name || currentUser?.email} 👋🏼 Welcome back, nice to see you again!