diff --git a/apps/admin/src/main.tsx b/apps/admin/src/main.tsx index 040d57b..e0d9727 100644 --- a/apps/admin/src/main.tsx +++ b/apps/admin/src/main.tsx @@ -1,4 +1,8 @@ -import { createRouter, RouterProvider } from "@tanstack/react-router"; +import { + createHashHistory, + createRouter, + RouterProvider, +} from "@tanstack/react-router"; import { TanStackQueryContext, TanStackQueryProvider, @@ -52,8 +56,10 @@ window.logout = Logout; // Create a new router instance const TanStackQueryProviderContext = TanStackQueryContext(); +const hashHistory = createHashHistory(); const router = createRouter({ routeTree, + history: hashHistory, context: { ...TanStackQueryProviderContext, }, diff --git a/apps/user/src/layout/user-nav.tsx b/apps/user/src/layout/user-nav.tsx index b191997..8f29812 100644 --- a/apps/user/src/layout/user-nav.tsx +++ b/apps/user/src/layout/user-nav.tsx @@ -15,10 +15,10 @@ import { DropdownMenuTrigger, } from "@workspace/ui/components/dropdown-menu"; import { Icon } from "@workspace/ui/composed/icon"; -import { removeCookie } from "@workspace/ui/lib/cookies"; import { useTranslation } from "react-i18next"; import { useNavs } from "@/layout/navs"; import { useGlobalStore } from "@/stores/global"; +import { Logout } from "@/utils/common"; export function UserNav() { const { t } = useTranslation("components"); @@ -27,9 +27,8 @@ export function UserNav() { const navs = useNavs(); const handleLogout = () => { - removeCookie("Authorization"); setUser(undefined); - navigate({ to: "/" }); + Logout(); }; if (user) { @@ -43,13 +42,13 @@ export function UserNav() { className="object-cover" src={user?.auth_methods?.[0]?.auth_identifier ?? ""} /> - + {user?.auth_methods?.[0]?.auth_identifier .toUpperCase() .charAt(0)} - + {user?.auth_methods?.[0]?.auth_identifier.split("@")[0]} - + {user?.auth_methods?.[0]?.auth_identifier .toUpperCase() .charAt(0)} @@ -96,7 +95,7 @@ export function UserNav() { className="size-4 flex-none text-muted-foreground" icon={item.icon as string} /> - {item.title} + {item.title} - {t("menu.logout", "Logout")} + {t("menu.logout", "Logout")} diff --git a/apps/user/src/main.tsx b/apps/user/src/main.tsx index ef569bc..f330340 100644 --- a/apps/user/src/main.tsx +++ b/apps/user/src/main.tsx @@ -1,4 +1,8 @@ -import { createRouter, RouterProvider } from "@tanstack/react-router"; +import { + createHashHistory, + createRouter, + RouterProvider, +} from "@tanstack/react-router"; import { TanStackQueryContext, TanStackQueryProvider, @@ -43,8 +47,10 @@ window.logout = Logout; // Create a new router instance const TanStackQueryProviderContext = TanStackQueryContext(); +const hashHistory = createHashHistory(); const router = createRouter({ routeTree, + history: hashHistory, context: { ...TanStackQueryProviderContext, },