Merge pull request #38 from softeerbootcamp4th/develop

[Deploy] version 0.0.2
softeerbootcamp4th · Aug 13, 2024 · 95162bd · 95162bd
2 parents 05c8062 + 6aad48a
commit 95162bd
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 25 deletions.
diff --git a/Caecae/public/assets/EventEnterBtn.svg → Caecae/public/assets/goEventBtn.svg b/Caecae/public/assets/EventEnterBtn.svg → Caecae/public/assets/goEventBtn.svg
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/RacingGame/RacingGame.tsx b/Caecae/src/components/RacingGame/RacingGame.tsx
@@ -29,7 +29,7 @@ const gameContent = (
             <button className="w-[500px]" onClick={handlePlayGame}>
               <img
                 className="w-[500px]"
-                src="public/assets/gameStartBtn.svg"
+                src="/assets/gameStartBtn.svg"
                 alt="gameStartBtn"
               />
             </button>
@@ -44,7 +44,7 @@ const gameContent = (
           <div className="flex flex-row items-center justify-center mt-2">
             <div className="font-bold text-[28px] mr-2 text-[#666666]">stop :</div>
             <div className="ml-2">
-              <img src="public/assets/spacebarBtn.svg" alt="spacebarBtn" />
+              <img src="/assets/spacebarBtn.svg" alt="spacebarBtn" />
             </div>
           </div>
         </div>
@@ -68,14 +68,14 @@ const gameContent = (
             >
               <img
                 className="h-[50px]"
-                src="public/assets/enterEventBtn.svg"
+                src="/assets/enterEventBtn.svg"
                 alt="enterEventBtn"
               />
             </button>
             <button className="" onClick={handlePlayGame}>
               <img
                 className="h-[50px]"
-                src="public/assets/retryBtn.svg"
+                src="/assets/retryBtn.svg"
                 alt="retryBtn"
               />
             </button>

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/features/EventInfoLanding/GoToEvent.tsx b/Caecae/src/features/EventInfoLanding/GoToEvent.tsx
@@ -56,8 +56,8 @@ const GoToEvent = () => {
                   <Link to="/findcasper">
                     <button className="mb-16">
                       <img
-                        src="/assets/eventEnterBtn.svg"
-                        alt="eventEnterBtn"
+                        src="/assets/goEventBtn.svg"
+                        alt="goEventBtn"
                       />
                     </button>
                   </Link>
@@ -101,8 +101,8 @@ const GoToEvent = () => {
                   <Link to="/racecasper">
                     <button className="mb-16">
                       <img
-                        src="/assets/eventEnterBtn.svg"
-                        alt="eventEnterBtn"
+                        src="/assets/goEventBtn.svg"
+                        alt="goEventBtn"
                       />
                     </button>
                   </Link>

diff --git a/Caecae/src/features/RacingGameLanding/EventIntro.tsx b/Caecae/src/features/RacingGameLanding/EventIntro.tsx
@@ -44,7 +44,7 @@ const EventIntro = () => {
             <Link to="/racecaspergame">
               <div className="bg-white w-[300px] h-[100px] flex flex-row justify-center items-center gap-3">
                 <span className="text-[24px]">전력 질주하러 가기</span>
-                <img src="/public/assets/rightShevron.svg" alt="rightShevron" />
+                <img src="/assets/rightShevron.svg" alt="rightShevron" />
               </div>
             </Link>
           </div>

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

diff --git a/Caecae/src/pages/RacingGame/Enter/EnterComplete.tsx b/Caecae/src/pages/RacingGame/Enter/EnterComplete.tsx
@@ -12,7 +12,7 @@ const EnterComplete = () => {
                     중복 응모시 등록된 점수 중 최고점수 1건만 추첨에 반영됩니다.
                 </div>
                 <div className="flex justify-center items-center">
-                    <img src="/public/assets/racingGameEnterImage.svg" alt="racingGameEnterImage" className="pr-[80px]" />
+                    <img src="/assets/racingGameEnterImage.svg" alt="racingGameEnterImage" className="pr-[80px]" />
                 </div>
                 <div 
                     className="flex justify-center items-center w-[50%] h-[70px] bg-[#002C5F] mt-[30px] hover:cursor-pointer"

diff --git a/Caecae/src/pages/RacingGame/Enter/SelectCustom.tsx b/Caecae/src/pages/RacingGame/Enter/SelectCustom.tsx
@@ -13,11 +13,11 @@ const SelectCustom = () => {
     const [selectedOption, setSelectedOption] = useState<number | null>(null);
     const [enterable, setEnterable] = useState(false);
     const options: Option[] = [
-        { id: 1, imgSrc: "/public/assets/racingGameCase1Image.svg", title: "Case 1. 공간활용의 기술", description: "캐스퍼 일렉트릭의 구석구석을\n활용해 많은 물건도 알차게 실을래요." },
-        { id: 2, imgSrc: "/public/assets/racingGameCase2Image.svg", title: "Case 2. 레저의 정석", description: "캐스퍼 일렉트릭과 함께 방방곡곡\n누빌 레저 라이프가 기대되어요." },
-        { id: 3, imgSrc: "/public/assets/racingGameCase3Image.svg", title: <>Case 3. 여행의 정석 <span className="text-[10px]">Camping</span></>, description: "캐스퍼 일렉트릭과 함께 아웃도어\n활동을 쉽고 편안하게 할래요." },
-        { id: 4, imgSrc: "/public/assets/racingGameCase4Image.svg", title: <>Case 4. 여행의 정석 <span className="text-[10px]">Picnic</span></>, description: "캐스퍼 일렉트릭과 함께하는 즐거운\n피크닉이 기대되어요." },
-        { id: 5, imgSrc: "/public/assets/racingGameCase5Image.svg", title: "Case 5. 펫 프렌들리", description: "캐스퍼 일렉트릭으로 반려동물과\n편안하고 안전한 여행을 할래요." },
+        { id: 1, imgSrc: "/assets/racingGameCase1Image.svg", title: "Case 1. 공간활용의 기술", description: "캐스퍼 일렉트릭의 구석구석을\n활용해 많은 물건도 알차게 실을래요." },
+        { id: 2, imgSrc: "/assets/racingGameCase2Image.svg", title: "Case 2. 레저의 정석", description: "캐스퍼 일렉트릭과 함께 방방곡곡\n누빌 레저 라이프가 기대되어요." },
+        { id: 3, imgSrc: "/assets/racingGameCase3Image.svg", title: <>Case 3. 여행의 정석 <span className="text-[10px]">Camping</span></>, description: "캐스퍼 일렉트릭과 함께 아웃도어\n활동을 쉽고 편안하게 할래요." },
+        { id: 4, imgSrc: "/assets/racingGameCase4Image.svg", title: <>Case 4. 여행의 정석 <span className="text-[10px]">Picnic</span></>, description: "캐스퍼 일렉트릭과 함께하는 즐거운\n피크닉이 기대되어요." },
+        { id: 5, imgSrc: "/assets/racingGameCase5Image.svg", title: "Case 5. 펫 프렌들리", description: "캐스퍼 일렉트릭으로 반려동물과\n편안하고 안전한 여행을 할래요." },
     ];
 
     const handleOptionSelect = (id: number) => {
@@ -49,8 +49,8 @@ const SelectCustom = () => {
                             <div className="relative mt-2">
                                 <img 
                                     src={selectedOption === option.id 
-                                        ? "/public/assets/customSelectDescriptionFocus.svg" 
-                                        : "/public/assets/customSelectDescription.svg"} 
+                                        ? "/assets/customSelectDescriptionFocus.svg" 
+                                        : "/assets/customSelectDescription.svg"} 
                                     alt={`option${option.id}`} 
                                 />
                                 <div className="absolute inset-0 top-2 flex flex-col justify-center items-center text-center p-1">