Merge branch 'dev' into #737-새터반-택시대제전-이벤트-참여-모달-제작

sparcs-kaist · Feb 22, 2024 · 3d540d5 · 3d540d5
2 parents 713aa8e + c2b8c1d
commit 3d540d5
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 104 deletions.
diff --git a/packages/web/src/atoms/event2024SpringInfo.ts b/packages/web/src/atoms/event2024SpringInfo.ts
@@ -4,6 +4,7 @@ import { atom } from "recoil";
 
 export type Event2024SpringInfoType = Nullable<{
   isAgreeOnTermsOfEvent: boolean;
+  isEligible: boolean;
   completedQuests: QuestId[];
   creditAmount: number;
   groupCreditAmount: number;

diff --git a/packages/web/src/components/ModalPopup/ModalCredit.tsx b/packages/web/src/components/ModalPopup/ModalCredit.tsx
@@ -129,6 +129,11 @@ const ModalCredit = ({
         name: t("page_credit.category_all"),
         body: <BodyMembers values={members} />,
       },
+      {
+        key: "2024SpringEvent",
+        name: t("page_credit.category_2024spring_event"),
+        body: <BodyMembers values={members2024SpringEvent} />,
+      },
       {
         key: "2023FallEvent",
         name: t("page_credit.category_2023fall_event"),
@@ -139,11 +144,6 @@ const ModalCredit = ({
         name: t("page_credit.category_2023spring_event"),
         body: <BodyMembers values={members2023SpringEvent} />,
       },
-      {
-        key: "2024SpringEvent",
-        name: t("page_credit.category_2024spring_event"),
-        body: <BodyMembers values={members2024SpringEvent} />,
-      },
     ],
     [t]
   );

diff --git a/packages/web/src/pages/Home/EventSection/EventSection2024Spring.tsx b/packages/web/src/pages/Home/EventSection/EventSection2024Spring.tsx
@@ -1,5 +1,7 @@
 import { Link } from "react-router-dom";
 
+import { useValueRecoilState } from "@/hooks/useFetchRecoilState";
+
 import AdaptiveDiv from "@/components/AdaptiveDiv";
 import CreditAmountContainer from "@/components/Event/CreditAmoutContainer";
 import EventButton from "@/components/Event/EventButton";
@@ -18,105 +20,97 @@ const EventSection2024Spring = () => {
     background: eventTheme.black,
   };
 
+  const { isEligible } = useValueRecoilState("event2024SpringInfo") || {};
+
   return (
-    <div css={styleContainer}>
-      <AdaptiveDiv type="center">
-        <div
-          css={{
-            display: "flex",
-            alignItems: "center",
-            padding: "30px 0 25px",
-            gap: "8px",
-          }}
-        >
-          <svg width={0} height={0}>
-            <linearGradient id="linearColors" x1={1} y1={0} x2={1} y2={1}>
-              <stop offset={0} stopColor={eventTheme.blue_icon_top} />
-              <stop offset={1} stopColor={eventTheme.blue_icon_bottom} />
-            </linearGradient>
-          </svg>
-          <EmojiEventsRounded
-            sx={{ fill: "url(#linearColors)" }}
-            css={{
-              width: "24px",
-              height: "24px",
-            }}
-          />
-          <div
-            css={{
-              ...eventTheme.font20,
-              background: eventTheme.blue_title,
-              backgroundClip: "text",
-              textFillColor: "transparent",
-            }}
-          >
-            새터반 택시대제전
-          </div>
-          <div
-            css={{
-              ...eventTheme.font16,
-              color: eventTheme.white,
-            }}
-          >
-            D-001
-          </div>
-        </div>
-        <div
-          css={{
-            display: "flex",
-            flexDirection: "column",
-            gap: "15px",
-            paddingBottom: "15px",
-          }}
-        >
-          {/* <div
-            css={{
-              ...eventTheme.font16,
-              display: "flex",
-              padding: "14px 16px",
-              justifyContent: "space-between",
-              alignItems: "center",
-              borderRadius: "12px",
-              border: "1px solid #FFF",
-              color: eventTheme.white,
-            }}
-          >
-            새터 00반 넙죽코인 */}
-          <CreditAmountContainer />
-          {/* </div> */}
-          <div css={{ display: "flex", gap: "15px" }}>
-            <Link
-              to="/event/2024spring"
-              css={{ width: 0, flexGrow: 1, textDecoration: "none" }}
+    <>
+      {isEligible ? (
+        <div css={styleContainer}>
+          <AdaptiveDiv type="center">
+            <div
+              css={{
+                display: "flex",
+                alignItems: "center",
+                padding: "30px 0 25px",
+                gap: "8px",
+              }}
             >
-              <EventButton
-                title="이벤트 안내"
-                css={{ background: eventTheme.blue_button }}
+              <svg width={0} height={0}>
+                <linearGradient id="linearColors" x1={1} y1={0} x2={1} y2={1}>
+                  <stop offset={0} stopColor={eventTheme.blue_icon_top} />
+                  <stop offset={1} stopColor={eventTheme.blue_icon_bottom} />
+                </linearGradient>
+              </svg>
+              <EmojiEventsRounded
+                sx={{ fill: "url(#linearColors)" }}
+                css={{
+                  width: "24px",
+                  height: "24px",
+                }}
               />
-            </Link>
-            <Link
-              to="/event/2024spring-missions"
-              css={{ width: 0, flexGrow: 1, textDecoration: "none" }}
+              <div
+                css={{
+                  ...eventTheme.font20,
+                  background: eventTheme.blue_title,
+                  backgroundClip: "text",
+                  textFillColor: "transparent",
+                }}
+              >
+                새터반 택시대제전
+              </div>
+              <div
+                css={{
+                  ...eventTheme.font16,
+                  color: eventTheme.white,
+                }}
+              >
+                D-001
+              </div>
+            </div>
+            <div
+              css={{
+                display: "flex",
+                flexDirection: "column",
+                gap: "15px",
+                paddingBottom: "15px",
+              }}
             >
-              <EventButton
-                title="퀘스트"
-                css={{ background: eventTheme.purple_button }}
-              />
-            </Link>
-            <Link
-              to="/event/2024spring-leaderboard"
-              css={{ width: 0, flexGrow: 1, textDecoration: "none" }}
-            >
-              <EventButton
-                title="새터반 순위"
-                css={{ background: eventTheme.orange_button }}
-              />
-            </Link>
-          </div>
+              <CreditAmountContainer />
+              <div css={{ display: "flex", gap: "15px" }}>
+                <Link
+                  to="/event/2024spring"
+                  css={{ width: 0, flexGrow: 1, textDecoration: "none" }}
+                >
+                  <EventButton
+                    title="이벤트 안내"
+                    css={{ background: eventTheme.blue_button }}
+                  />
+                </Link>
+                <Link
+                  to="/event/2024spring-missions"
+                  css={{ width: 0, flexGrow: 1, textDecoration: "none" }}
+                >
+                  <EventButton
+                    title="퀘스트"
+                    css={{ background: eventTheme.purple_button }}
+                  />
+                </Link>
+                <Link
+                  to="/event/2024spring-leaderboard"
+                  css={{ width: 0, flexGrow: 1, textDecoration: "none" }}
+                >
+                  <EventButton
+                    title="새터반 순위"
+                    css={{ background: eventTheme.orange_button }}
+                  />
+                </Link>
+              </div>
+            </div>
+            <SuggestJoinEventContainer />
+          </AdaptiveDiv>
         </div>
-        <SuggestJoinEventContainer />
-      </AdaptiveDiv>
-    </div>
+      ) : null}
+    </>
   );
 };
 

diff --git a/packages/web/src/pages/Mypage/langs/en.json b/packages/web/src/pages/Mypage/langs/en.json
@@ -29,9 +29,9 @@
   },
   "page_credit": {
     "category_all": "All",
+    "category_2024spring_event": "2024 Spring Freshman Class Taxi Event",
     "category_2023fall_event": "2023 Fall Thanksgiving Event",
-    "category_2023spring_event": "2023 Spring Taxi Ride Verification Event",
-    "category_2024spring_event": "2024 Spring Freshman Class Taxi Event"
+    "category_2023spring_event": "2023 Spring Taxi Ride Verification Event"
   },
   "page_report": {
     "inquiry": "If you have inquiries about the report details, please use the 'Contact us' menu.",

diff --git a/packages/web/src/pages/Mypage/langs/ko.json b/packages/web/src/pages/Mypage/langs/ko.json
@@ -29,10 +29,9 @@
   },
   "page_credit": {
     "category_all": "전체",
-    "category_2024spring_event": "2024 봄학기 새터반 택시 대제전 이벤트",
+    "category_2024spring_event": "2024 봄학기 새터반 택시대제전 이벤트",
     "category_2023fall_event": "2023 가을학기 한가위 송편 이벤트",
-    "category_2023spring_event": "2023 봄학기 택시 탑승 인증 이벤트",
-    "category_2024spring_event": "2024 봄학기 새터반 택시대제전"
+    "category_2023spring_event": "2023 봄학기 택시 탑승 인증 이벤트"
   },
   "page_report": {
     "inquiry": "아래 신고 내역에 대해 문의하고 싶으신 경우 “채널톡 문의하기” 메뉴를 이용해주세요.",