Merge pull request #754 from sparcs-kaist/dev

Main branch update from Dev branch
sparcs-kaist · Mar 6, 2024 · 329a8e3 · 329a8e3
2 parents 4a5a89e + d44b42e
commit 329a8e3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/packages/web/src/pages/Event/Event2024Spring.tsx b/packages/web/src/pages/Event/Event2024Spring.tsx
@@ -368,8 +368,8 @@ const Event2024Spring = () => {
                 width: "100%",
               }}
             >
-              <img src={GoldPrize} alt="prize" css={{ width: "144px" }} />
-              <img src={SilverPrize} alt="prize" css={{ width: "144px" }} />
+              <img src={GoldPrize} alt="prize" css={{ width: "45%" }} />
+              <img src={SilverPrize} alt="prize" css={{ width: "45%" }} />
             </div>
           </div>
           <Link
@@ -383,7 +383,14 @@ const Event2024Spring = () => {
           </Link>
         </EventStep>
         <EventStep step="EVENT" title="인스타그램 공유이벤트">
-          <Link to="/" css={{ textDecoration: "none", width: "100%" }}>
+          <Link
+            to={{
+              pathname:
+                "https://www.instagram.com/p/C34dMLKpuFw/?igsh=d24yMDZlcWtvczlp",
+            }}
+            target="_blank"
+            css={{ textDecoration: "none", width: "100%" }}
+          >
             <EventButton
               title="인스타그램 게시물 보러가기"
               css={{ background: eventTheme.instagram_button }}

diff --git a/packages/web/src/pages/Event/Event2024SpringLeaderboard.tsx b/packages/web/src/pages/Event/Event2024SpringLeaderboard.tsx
@@ -152,6 +152,7 @@ const LeaderboardItem = ({ value, rank, isMe }: LeaderboardItemProps) => {
         css={{
           ...theme.font16,
           ...theme.ellipsis,
+          minWidth: "78px",
           ...styleText(isMe ? -1 : rank),
         }}
       >
@@ -183,7 +184,7 @@ const LeaderboardItem = ({ value, rank, isMe }: LeaderboardItemProps) => {
             overflow: "hidden",
             whiteSpace: "nowrap",
             textOverflow: "ellipsis",
-            maxWidth: "130px",
+            maxWidth: "100px",
             color: theme.white,
             ...eventTheme.font10,
           }}

diff --git a/packages/web/src/pages/Event/Event2024SpringMissions.tsx b/packages/web/src/pages/Event/Event2024SpringMissions.tsx
@@ -151,7 +151,8 @@ export const MissionContainer = ({ quest }: MissionContainerProps) => {
 };
 
 const Event2024SpringMissions = () => {
-  const { quests } = useValueRecoilState("event2024SpringInfo") || {};
+  const { isAgreeOnTermsOfEvent, quests } =
+    useValueRecoilState("event2024SpringInfo") || {};
   useEventBackgroundEffect();
 
   return (
@@ -161,7 +162,7 @@ const Event2024SpringMissions = () => {
       </HeaderWithBackButton>
       <AdaptiveDiv type="center">
         <div css={{ height: "30px" }} />
-        <CreditAmountContainer />
+        {isAgreeOnTermsOfEvent && <CreditAmountContainer />}
         <SuggestJoinEventContainer />
         {quests?.map((quest) => (
           <MissionContainer key={quest.id} quest={quest} />

diff --git a/packages/web/src/pages/Home/EventSection/EventSection2024Spring.tsx b/packages/web/src/pages/Home/EventSection/EventSection2024Spring.tsx
@@ -21,7 +21,8 @@ const EventSection2024Spring = () => {
     background: eventTheme.black,
   };
 
-  const { isEligible } = useValueRecoilState("event2024SpringInfo") || {};
+  const { isEligible, isAgreeOnTermsOfEvent } =
+    useValueRecoilState("event2024SpringInfo") || {};
 
   return (
     <>
@@ -76,7 +77,7 @@ const EventSection2024Spring = () => {
                 paddingBottom: "15px",
               }}
             >
-              <CreditAmountContainer />
+              {isAgreeOnTermsOfEvent && <CreditAmountContainer />}
               <div css={{ display: "flex", gap: "15px" }}>
                 <Link
                   to="/event/2024spring"