Merge pull request #36 from softeerbootcamp4th/fix/backtohome

[Fix] 이벤트로 돌아가기 버튼 활성화 및 Mainpage path 변경
softeerbootcamp4th · Aug 13, 2024 · fbdf736 · fbdf736
2 parents 4322369 + bfe08ef
commit fbdf736
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/Caecae/src/components/FindingGame/FindingGameResult.tsx b/Caecae/src/components/FindingGame/FindingGameResult.tsx
@@ -3,6 +3,7 @@ import {
   initFindingGameState,
 } from "../../jobs/FindingGame/FindingGameWork";
 import { useExistState, store } from "../../shared/Hyundux/index";
+import { Link } from "../../shared/Hyunouter";
 
 const FindingGameResult = () => {
   const state = useExistState(initFindingGameState);
@@ -51,9 +52,11 @@ const FindingGameResult = () => {
         </div>
         <div className="flex-grow"></div>
         <div className="bg-[#002C5F] flex justify-center items-center w-10/12 py-[14px] mb-[40px]">
-          <p className="text-[white] font-bold text-[18px]">
-            이벤트 홈으로 돌아가기
-          </p>
+          <Link to="/findcasper">
+            <p className="text-[white] font-bold text-[18px]">
+              이벤트 홈으로 돌아가기
+            </p>
+          </Link>
         </div>
       </div>
     </>

diff --git a/Caecae/src/components/common/Navigation/Navigation.tsx b/Caecae/src/components/common/Navigation/Navigation.tsx
@@ -33,7 +33,7 @@ const Navigation: React.FC = () => {
       } relative bg-navigation flex justify-center items-center h-16 border-b-4 border-navigationUnderline header`}
     >
       <div className="absolute left-0 ml-10 logo">
-        <Link to="/mainpage">
+        <Link to="/">
           <img src="/assets/casperLogo.svg" alt="casperLogo" />
         </Link>
       </div>
@@ -43,17 +43,17 @@ const Navigation: React.FC = () => {
             before:absolute before:bottom-0 before:left-0 before:w-full before:h-0.5 before:bg-white
             before:transform before:transition-transform before:duration-300 before:ease-in-out
             ${
-              isActive("/mainpage")
+              isActive("/")
                 ? "before:scale-x-100"
                 : "before:scale-x-0 hover:before:scale-x-50"
             }
           `}
         >
           <div className="h-full flex items-center">
-            <Link to="/mainpage">
+            <Link to="/">
               <span
                 className={`font-bold ${
-                  isActive("/mainpage")
+                  isActive("/")
                     ? "text-white"
                     : "text-navigationText hover:text-white transition-colors duration-300"
                 }`}

diff --git a/Caecae/src/index.tsx b/Caecae/src/index.tsx
@@ -13,7 +13,7 @@ const App = () => {
     <div>
       <Router>
         <Routes>
-          <Route path="/mainpage" element={<EventInfoLandingPage />} />
+          <Route path="/" element={<EventInfoLandingPage />} />
           <Route path="/findcasper" element={<FindingGameLandingPage />} />
           <Route path="/racecasper" element={<RacingGameLandingPage />} />
           <Route