Merge pull request #169 from softeerbootcamp4th/feat/#168/MiniQuizRes…

…ultModal Feat/#168/mini quiz result modal
softeerbootcamp4th · Aug 23, 2024 · 8053d11 · 8053d11
2 parents 9ad0d52 + 8711dec
commit 8053d11
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 23 deletions.
diff --git a/service/public/sitemap.xml b/service/public/sitemap.xml
@@ -11,7 +11,7 @@
     <priority>0.8</priority>
   </url>
   <url>
-    <loc>https://casper-event.store/introduce</loc>
+    <loc>https://casper-event.store/intro</loc>
     <lastmod>2024-08-21</lastmod>
     <priority>0.6</priority>
   </url>

diff --git a/service/src/components/header/Header.jsx b/service/src/components/header/Header.jsx
@@ -8,7 +8,7 @@ function Header() {
   const { userInfo, setUserInfo } = useContext(AuthContext);
   const [openPhoneInputModal, setOpenPhoneInputModal] = useState(false);
   const textColor =
-    useLocation().pathname === '/introduce'
+    useLocation().pathname === '/intro'
       ? 'text-neutral-white'
       : 'text-neutral-black';
 
@@ -65,7 +65,7 @@ function Header() {
           이벤트 참여하기
         </NavLink>
         <NavLink
-          to="introduce"
+          to="intro"
           className={({ isActive }) =>
             `text-nowrap pr-[44px] ${textColor} ${
               isActive

diff --git a/service/src/components/modal/GetItemModal.jsx b/service/src/components/modal/GetItemModal.jsx
@@ -21,7 +21,6 @@ function GetItemModal({ close, item }) {
         setUserInfo(updatedUserInfo);
         navigate('/event');
       } else {
-        console.log(userInfo);
         const updatedUserInfo = { ...userInfo, toolBoxCnt: toolBoxCnt + 1 };
         setUserInfo(updatedUserInfo);
         close();

diff --git a/service/src/pages/eventIntro/EventIntroMain.jsx b/service/src/pages/eventIntro/EventIntroMain.jsx
@@ -45,7 +45,7 @@ function EventIntroMain() {
                   </p>
                 </button>
               </Link>
-              <Link to="introduce">
+              <Link to="intro">
                 <button className="flex items-center justify-center bg-transparent rounded-full px-1000 py-500 border-[2px] border-solid border-neutral-black hover:scale-105 duration-200">
                   <p className="text-neutral-black text-detail-2-semibold">
                     캐스퍼 EV 알아보기

diff --git a/service/src/pages/eventIntro/EventIntroRewards.jsx b/service/src/pages/eventIntro/EventIntroRewards.jsx
@@ -8,6 +8,7 @@ function EventIntroRewards() {
     const fetchInfo = async () => {
       try {
         const data = await getPrizeInfo();
+        console.log(data);
         if (Array.isArray(data)) {
           setInfo(data);
         } else {
@@ -46,7 +47,7 @@ function EventIntroRewards() {
             응모에 많이 참여할 수록 당첨 확률이 높아져요.
           </p>
           <p className="text-detail-3-semibold text-primary-blue">
-            1등 당첨자 발표: nnnn.nn.nn nn시
+            1등 당첨자 발표: 2024.08.29 13시
           </p>
         </div>
         <div>

diff --git a/service/src/pages/miniquiz/MiniQuizResultMain.jsx b/service/src/pages/miniquiz/MiniQuizResultMain.jsx
@@ -12,7 +12,6 @@ function MiniQuizResultMain({ response }) {
   const [userGotPrize, setUserGotPrize] = useState(false);
   const [toolBoxModal, setToolBoxModal] = useState(false);
   const [orderModal, setOrderModal] = useState(false);
-  let correctMessage = '정답입니다!';
 
   useEffect(() => {
     const check = async () => {
@@ -53,9 +52,6 @@ function MiniQuizResultMain({ response }) {
     return <div>예상치 못한 오류가 발생했습니다.</div>; // MiniQuizResult에 navigate state로 전달된 값이 잘못되었을 때
   }
 
-  if (successOrder <= 500 && !userGotPrize)
-    correctMessage = successOrder + '번째 ' + correctMessage;
-
   return (
     <>
       {isCorrect ? (
@@ -70,7 +66,15 @@ function MiniQuizResultMain({ response }) {
               선착순 당첨
             </div>
           </div>
-          <div className="py-500 text-body-1-bold mb-400">{correctMessage}</div>
+          <div className="flex gap-500">
+            {successOrder <= 500 && !userGotPrize && (
+              <span className="py-500 text-body-1-bold mb-400">
+                {successOrder + '번째 '}
+              </span>
+            )}
+
+            <span className="py-500 text-body-1-bold mb-400"> 정답입니다!</span>
+          </div>
         </>
       ) : (
         <>

diff --git a/service/src/pages/newCarIntro/NewCarIntro.jsx b/service/src/pages/newCarIntro/NewCarIntro.jsx
@@ -10,10 +10,7 @@ function NewCarIntro() {
       <Helmet>
         <title>캐스퍼 EV 소개</title>
         <meta name="description" content="캐스퍼 EV에 대해 알아보세요!" />
-        <meta
-          property="og:url"
-          content="https://casper-event.store/introduce"
-        />
+        <meta property="og:url" content="https://casper-event.store/introd" />
         <meta property="og:title" content="캐스퍼 EV 소개" />
         <meta
           property="og:description"

diff --git a/service/src/router.jsx b/service/src/router.jsx
@@ -61,7 +61,7 @@ const router = createBrowserRouter([
         ],
       },
       {
-        path: 'introduce',
+        path: 'intro',
         element: <NewCarIntro />,
       },
     ],

diff --git a/service/vite.config.js b/service/vite.config.js
@@ -12,13 +12,7 @@ export default defineConfig({
     react(),
     svgr(),
     prerender({
-      routes: [
-        '/',
-        '/event',
-        '/event/worldCup',
-        '/event/miniQuiz',
-        '/introduce',
-      ],
+      routes: ['/', '/event', '/event/worldCup', '/event/miniQuiz', '/intro'],
       renderer: '@prerenderer/renderer-puppeteer',
       rendererOptions: {
         maxConcurrentRoutes: 1,
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,7 +61,7 @@ const router = createBrowserRouter([ @@
             ],
           },
           {
-            path: 'introduce',
+            path: 'intro',
             element: <NewCarIntro />,
           },
         ],
@@ Expand Down @@