iroiro fix

biome.json

@@ -11,6 +11,10 @@
   },
   "linter": {
     "rules": {
+      "correctness": {
+        "noUnusedImports": "warn",
+        "noUnusedVariables": "warn"
+      },
       "style": {
         "noNonNullAssertion": "warn"
       }

src/main.tsx

@@ -4,7 +4,7 @@ import ReactDOM from "react-dom/client";
 import { SWRConfig } from "swr";
 
 import { Router } from "./Router";
-import { theme, config } from "./theme/theme";
+import { config, theme } from "./theme/theme";
 import { fetcher } from "./utils/fetcher";
 
 const injectThemeSchemeScript = () => {

src/pages/-components/Header.tsx

@@ -1,4 +1,4 @@
-import { Link } from "@tanstack/react-router";
+import { useMatchRoute, useNavigate } from "@tanstack/react-router";
 import { Avatar, HStack, Heading } from "@yamada-ui/react";
 
 import { HeaderMenu } from "./HeaderMenu";
@@ -8,6 +8,8 @@ import { useMySelfStore } from "@/store/user";
 
 export const Header = () => {
   const { mySelf } = useMySelfStore();
+  const navigate = useNavigate();
+  const matchRoute = useMatchRoute();
 
   return (
     <HStack
@@ -16,8 +18,26 @@ export const Header = () => {
       py="2"
       bg="bg"
       color="darkText"
+      pos="sticky"
+      top="0"
+      zIndex="1"
     >
-      <Heading size="lg" isTruncated fontWeight="light" as={Link} to="/">
+      <Heading
+        size="lg"
+        isTruncated
+        fontWeight="light"
+        cursor="pointer"
+        onClick={() => {
+          if (matchRoute({ to: "/" })) {
+            window.scroll({
+              top: 0,
+              behavior: "smooth",
+            });
+          } else {
+            navigate({ to: "/" });
+          }
+        }}
+      >
         at Dusk.
       </Heading>
       {mySelf ? (

src/pages/-components/HeaderMenu.tsx

@@ -5,6 +5,7 @@ import {
   Menu,
   MenuButton,
   MenuList,
+  VStack,
   useDisclosure,
 } from "@yamada-ui/react";
 
@@ -19,9 +20,9 @@ export const HeaderMenu = () => {
         <DotsNine size={20} weight="bold" />
       </MenuButton>
 
-      <MenuList alignItems="center" gap="md">
+      <MenuList as={VStack} px="2">
         <LogoutButton />
-        <HStack>
+        <HStack justify="center">
           <ToggleThemeButton />
           <ToggleColorModeButton />
         </HStack>

src/pages/-components/LogoutDialog.tsx

@@ -1,6 +1,7 @@
 import { Dialog } from "@yamada-ui/react";
 
 import { useLoginStore } from "@/store/login";
+import { useNavigate } from "@tanstack/react-router";
 
 export const LogoutDialog = ({
   isOpen,
@@ -10,12 +11,17 @@ export const LogoutDialog = ({
   onClose: () => void;
 }) => {
   const { logout } = useLoginStore();
+  const navigate = useNavigate();
+
   return (
     <Dialog
       isOpen={isOpen}
       header="ログアウトしますか？"
       success="する"
-      onSuccess={logout}
+      onSuccess={() => {
+        logout();
+        navigate({ to: "/login" });
+      }}
       cancel="しない"
       onCancel={onClose}
     />

src/routeTree.gen.ts

@@ -97,15 +97,80 @@ declare module "@tanstack/react-router" {
 
 // Create and export the route tree
 
-export const routeTree = rootRoute.addChildren({
-  IndexRoute,
-  LoginRoute: LoginRoute.addChildren({
-    LoginLayoutRoute: LoginLayoutRoute.addChildren({
-      LoginLayoutGetTokenRoute,
-      LoginLayoutIndexLazyRoute,
-    }),
-  }),
-})
+interface LoginLayoutRouteChildren {
+  LoginLayoutGetTokenRoute: typeof LoginLayoutGetTokenRoute
+  LoginLayoutIndexLazyRoute: typeof LoginLayoutIndexLazyRoute
+}
+
+const LoginLayoutRouteChildren: LoginLayoutRouteChildren = {
+  LoginLayoutGetTokenRoute: LoginLayoutGetTokenRoute,
+  LoginLayoutIndexLazyRoute: LoginLayoutIndexLazyRoute,
+}
+
+const LoginLayoutRouteWithChildren = LoginLayoutRoute._addFileChildren(
+  LoginLayoutRouteChildren,
+)
+
+interface LoginRouteChildren {
+  LoginLayoutRoute: typeof LoginLayoutRouteWithChildren
+}
+
+const LoginRouteChildren: LoginRouteChildren = {
+  LoginLayoutRoute: LoginLayoutRouteWithChildren,
+}
+
+const LoginRouteWithChildren = LoginRoute._addFileChildren(LoginRouteChildren)
+
+export interface FileRoutesByFullPath {
+  "/": typeof IndexRoute
+  "/login": typeof LoginLayoutRouteWithChildren
+  "/login/getToken": typeof LoginLayoutGetTokenRoute
+  "/login/": typeof LoginLayoutIndexLazyRoute
+}
+
+export interface FileRoutesByTo {
+  "/": typeof IndexRoute
+  "/login": typeof LoginLayoutIndexLazyRoute
+  "/login/getToken": typeof LoginLayoutGetTokenRoute
+}
+
+export interface FileRoutesById {
+  __root__: typeof rootRoute
+  "/": typeof IndexRoute
+  "/login": typeof LoginRouteWithChildren
+  "/login/_layout": typeof LoginLayoutRouteWithChildren
+  "/login/_layout/getToken": typeof LoginLayoutGetTokenRoute
+  "/login/_layout/": typeof LoginLayoutIndexLazyRoute
+}
+
+export interface FileRouteTypes {
+  fileRoutesByFullPath: FileRoutesByFullPath
+  fullPaths: "/" | "/login" | "/login/getToken" | "/login/"
+  fileRoutesByTo: FileRoutesByTo
+  to: "/" | "/login" | "/login/getToken"
+  id:
+    | "__root__"
+    | "/"
+    | "/login"
+    | "/login/_layout"
+    | "/login/_layout/getToken"
+    | "/login/_layout/"
+  fileRoutesById: FileRoutesById
+}
+
+export interface RootRouteChildren {
+  IndexRoute: typeof IndexRoute
+  LoginRoute: typeof LoginRouteWithChildren
+}
+
+const rootRouteChildren: RootRouteChildren = {
+  IndexRoute: IndexRoute,
+  LoginRoute: LoginRouteWithChildren,
+}
+
+export const routeTree = rootRoute
+  ._addFileChildren(rootRouteChildren)
+  ._addFileTypes<FileRouteTypes>()
 
 /* prettier-ignore-end */
 

src/store/login.ts

@@ -26,6 +26,8 @@ export const useLoginStore = create<LoginState & LoginActions>()(
       logout: () => {
         set(() => ({
           isLogin: false,
+          token: undefined,
+          instance: undefined,
         }));
         useMySelfStore.setState({
           mySelf: undefined,

src/theme/components/menu.ts

@@ -4,10 +4,17 @@ import { initialThemeScheme } from "../theme";
 
 import type { ComponentMultiStyle, MenuProps } from "@yamada-ui/react";
 
-const YmdMenu: ComponentMultiStyle<MenuProps> = defaultTheme.components.Menu;
+const YmdMenu: ComponentMultiStyle<"Menu", MenuProps> =
+  defaultTheme.components.Menu;
 
-export const Menu: ComponentMultiStyle<MenuProps> = {
+export const Menu: ComponentMultiStyle<"Menu", MenuProps> = {
   baseStyle: ({ theme, themeScheme, colorMode }) => ({
+    ...YmdMenu.baseStyle,
+    content: {
+      // @ts-expect-error contentはあります！
+      ...YmdMenu.baseStyle?.content,
+      minW: "unset",
+    },
     list: {
       // @ts-expect-error listはあります！
       ...YmdMenu.baseStyle?.list,