First merge from develop to main (WIP) #7

Merged
sugar merged 199 commits from develop into main 2026-01-27 17:47:07 +00:00
2 changed files with 17 additions and 1 deletions
Showing only changes of commit 9e51414a13 - Show all commits

View File

@@ -23,10 +23,12 @@ import {
useSidebar, useSidebar,
} from '@/components/ui/sidebar'; } from '@/components/ui/sidebar';
import { useUserInfo } from '@/hooks/data/useUserInfo'; import { useUserInfo } from '@/hooks/data/useUserInfo';
import { useLogout } from '@/hooks/useLogout';
export function NavUser() { export function NavUser() {
const { isMobile } = useSidebar(); const { isMobile } = useSidebar();
const { data: user } = useUserInfo(); const { data: user } = useUserInfo();
const { logout } = useLogout();
return ( return (
<SidebarMenu> <SidebarMenu>
@@ -71,7 +73,7 @@ export function NavUser() {
</div> </div>
</DropdownMenuLabel> </DropdownMenuLabel>
<DropdownMenuSeparator /> <DropdownMenuSeparator />
<DropdownMenuItem> <DropdownMenuItem onClick={logout}>
<IconLogout /> <IconLogout />
</DropdownMenuItem> </DropdownMenuItem>

View File

@@ -0,0 +1,14 @@
import { useNavigate } from '@tanstack/react-router';
import { useCallback } from 'react';
import { removeToken } from '@/lib/token';
export function useLogout() {
const navigate = useNavigate();
const logout = useCallback(() => {
removeToken();
void navigate({ to: '/login' });
}, [navigate]);
return { logout };
}