Fix navigation

infhyroyage · Apr 14, 2024 · 3dbb286 · 3dbb286
1 parent 5307b25
commit 3dbb286
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 13 deletions.
diff --git a/src/components/TestDoing.tsx b/src/components/TestDoing.tsx
@@ -109,7 +109,11 @@ function TestDoing({
   const onClickNextQuestionButton = async () => {
     if (questionNumber === getTestRes.length) {
       // 結果へ遷移
-      navigate(`/result`);
+      navigate(
+        import.meta.env.VITE_API_URI === "http://localhost:9229"
+          ? "/result"
+          : "/QuestionAnswerPortal/result"
+      );
     } else {
       // 次問題へ遷移
       setSecondTranslation(INIT_2ND_TRANSLATION);

diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
@@ -43,7 +43,11 @@ function TopBar() {
 
   const onClickBackspaceButton = () => {
     setTopBarTitle("Question Answer Portal");
-    navigate("/");
+    navigate(
+      import.meta.env.VITE_API_URI === "http://localhost:9229"
+        ? "/"
+        : "/QuestionAnswerPortal/"
+    );
   };
 
   return (
@@ -54,21 +58,30 @@ function TopBar() {
             {topBarTitle}
           </Typography>
           <Stack direction="row" spacing={3}>
-            {location.pathname === "/" && <ThemeSwitch />}
-            {location.pathname !== "/" ? (
-              <Tooltip title="タイトルへ">
-                <IconButton onClick={onClickBackspaceButton}>
-                  <BackspaceIcon sx={{ color: "white" }} />
-                </IconButton>
-              </Tooltip>
+            <ThemeSwitch />
+            {import.meta.env.VITE_API_URI === "http://localhost:9229" ? (
+              location.pathname !== "/" && (
+                <Tooltip title="タイトルへ">
+                  <IconButton onClick={onClickBackspaceButton}>
+                    <BackspaceIcon sx={{ color: "white" }} />
+                  </IconButton>
+                </Tooltip>
+              )
             ) : (
-              import.meta.env.VITE_API_URI !== "http://localhost:9229" && (
+              <>
+                {location.pathname !== "/QuestionAnswerPortal/" && (
+                  <Tooltip title="タイトルへ">
+                    <IconButton onClick={onClickBackspaceButton}>
+                      <BackspaceIcon sx={{ color: "white" }} />
+                    </IconButton>
+                  </Tooltip>
+                )}
                 <Tooltip title="ログアウト">
                   <IconButton onClick={onClickLogoutButton}>
                     <LogoutIcon sx={{ color: "white" }} />
                   </IconButton>
                 </Tooltip>
-              )
+              </>
             )}
           </Stack>
         </Toolbar>

diff --git a/src/pages/Result.tsx b/src/pages/Result.tsx
@@ -94,7 +94,16 @@ export default function Result() {
   return (
     <Box p={2}>
       <Box display="flex" justifyContent="center" alignItems="center" pb={1}>
-        <Button variant="contained" onClick={() => navigate("/")}>
+        <Button
+          variant="contained"
+          onClick={() =>
+            navigate(
+              import.meta.env.VITE_API_URI === "http://localhost:9229"
+                ? "/"
+                : "/QuestionAnswerPortal/"
+            )
+          }
+        >
           タイトルへ
         </Button>
       </Box>

diff --git a/src/pages/Root.tsx b/src/pages/Root.tsx
@@ -97,7 +97,13 @@ export default function Root() {
                 {getTestsRes[course].map((test: Test) => (
                   <ListItemButton
                     key={test.id}
-                    onClick={() => navigate(`/tests/${test.id}`)}
+                    onClick={() =>
+                      navigate(
+                        import.meta.env.VITE_API_URI === "http://localhost:9229"
+                          ? `/tests/${test.id}`
+                          : `/QuestionAnswerPortal/tests/${test.id}`
+                      )
+                    }
                   >
                     <ListItemIcon sx={{ ml: 2 }}>
                       <ArticleIcon />