diff --git a/src/components/ui/sidebar.tsx b/src/components/ui/sidebar.tsx index 30638ac..fb15502 100644 --- a/src/components/ui/sidebar.tsx +++ b/src/components/ui/sidebar.tsx @@ -89,9 +89,7 @@ function SidebarProvider({ ) // Helper to toggle the sidebar. - const toggleSidebar = React.useCallback(() => { - return isMobile ? setOpenMobile((open) => !open) : setOpen((open) => !open) - }, [isMobile, setOpen, setOpenMobile]) + const toggleSidebar = () => setOpen((open) => !open); // Adds a keyboard shortcut to toggle the sidebar. React.useEffect(() => { @@ -157,13 +155,15 @@ function Sidebar({ collapsible = "offcanvas", className, children, + forceSheet = false, ...props }: React.ComponentProps<"div"> & { side?: "left" | "right" variant?: "sidebar" | "floating" | "inset" - collapsible?: "offcanvas" | "icon" | "none" + collapsible?: "offcanvas" | "icon" | "none", + forceSheet?: boolean }) { - const { isMobile, state, openMobile, setOpenMobile } = useSidebar() + const { isMobile, state, open, setOpen } = useSidebar() if (collapsible === "none") { return ( @@ -180,14 +180,14 @@ function Sidebar({ ) } - if (isMobile) { + if (isMobile || forceSheet) { return ( - +
{ authData ?
: null} - {/*
*/} - +
+ +
diff --git a/src/ui/component/Header.tsx b/src/ui/component/Header.tsx index bcd0230..02b9e30 100644 --- a/src/ui/component/Header.tsx +++ b/src/ui/component/Header.tsx @@ -2,13 +2,53 @@ import { Label } from '@/components/ui/label'; import { SidebarTrigger } from '@/components/ui/sidebar'; import { Separator } from '@/components/ui/separator'; import { useState } from 'react'; +import { Button } from '@/components/ui/button'; +import { useAuthStore } from '@/store/authStore'; +import { LogOutIcon } from 'lucide-react'; +import { useNavigate } from 'react-router-dom'; +import { PageRouting } from '@/const/PageRouting'; export default function Header() { + const navigate = useNavigate(); + const { logout } = useAuthStore(); + + const handleClickLogoutButton = () => { + logout(); + navigate(PageRouting["LOGIN"].path); + } + return ( -
- - - +
+
+ + + +
+
+ +
); } \ No newline at end of file diff --git a/src/ui/component/SideBar.tsx b/src/ui/component/SideBar.tsx index 4aace1d..2e91130 100644 --- a/src/ui/component/SideBar.tsx +++ b/src/ui/component/SideBar.tsx @@ -8,7 +8,7 @@ import { export default function SideBar() { return ( - + );