diff --git a/frontend/app/components/modules/simulator-configs/simulator-chair-active-toggle.tsx b/frontend/app/components/modules/simulator-configs/simulator-chair-active-toggle.tsx index f8c2c930..920c913c 100644 --- a/frontend/app/components/modules/simulator-configs/simulator-chair-active-toggle.tsx +++ b/frontend/app/components/modules/simulator-configs/simulator-chair-active-toggle.tsx @@ -37,7 +37,7 @@ export const SimulatorChairActiveToggle: FC = () => { id="chair-activity" /> - {!isAnotherSimulatorBeingUsed && ( + {isAnotherSimulatorBeingUsed && (
{ destLoc={data?.destination_coordinate} />
- {!isAnotherSimulatorBeingUsed && ( + {isAnotherSimulatorBeingUsed && (
現在、他のシミュレーターが使用中です diff --git a/frontend/app/components/primitives/frame/frame.tsx b/frontend/app/components/primitives/frame/frame.tsx index 2b1c85ad..d51c3c7e 100644 --- a/frontend/app/components/primitives/frame/frame.tsx +++ b/frontend/app/components/primitives/frame/frame.tsx @@ -7,7 +7,7 @@ export const MainFrame: FC>> = ({ ...props }) => { return ( -
>> = ({ {...props} >
{children}
-
+ ); }; diff --git a/frontend/app/routes/_index/route.tsx b/frontend/app/routes/_index/route.tsx index 57374db4..48096e28 100644 --- a/frontend/app/routes/_index/route.tsx +++ b/frontend/app/routes/_index/route.tsx @@ -48,53 +48,56 @@ const Links = [ export default function Index() { return ( -
- - -
-

- ISURIDE -

-
    - {Links.map(({ to, title, description, Icon, style }) => { - return ( -
  • - - -

    - - {title} - - - {description} - -

    - -
  • - ); - })} -
-
-
-
+ + +
+

+ + ISURIDE Top +

+
    + {Links.map(({ to, title, description, Icon, style }) => { + return ( +
  • + + +

    + + {title} + + + {description} + +

    + +
  • + ); + })} +
+
+
); } diff --git a/frontend/app/routes/client/route.tsx b/frontend/app/routes/client/route.tsx index 4be79069..ab8c47f7 100644 --- a/frontend/app/routes/client/route.tsx +++ b/frontend/app/routes/client/route.tsx @@ -1,11 +1,15 @@ import { Outlet } from "@remix-run/react"; import { FooterNavigation } from "~/components/modules/footer-navigation/footer-navigation"; import { MainFrame } from "~/components/primitives/frame/frame"; +import { Text } from "~/components/primitives/text/text"; import { ClientProvider } from "../../contexts/client-context"; export default function ClientLayout() { return ( + + ISURIDE + diff --git a/frontend/app/routes/owner/route.tsx b/frontend/app/routes/owner/route.tsx index af89468d..318916d9 100644 --- a/frontend/app/routes/owner/route.tsx +++ b/frontend/app/routes/owner/route.tsx @@ -11,7 +11,7 @@ const tabs = [ { key: "sales", label: "売上", to: "/owner/sales" }, ] as const; -const Tab = () => { +const Content = () => { const matches = useMatches(); const activeTab = matches[2]?.pathname.split("/").at(-1) || "index"; @@ -63,7 +63,7 @@ export default function OwnerLayout() { アカウント切替え
- +