Skip to content

Commit

Permalink
Merge pull request #753 from sparcs-kaist/#752-fix-event-problems
Browse files Browse the repository at this point in the history
이벤트 문제 수정
  • Loading branch information
kmc7468 authored Mar 6, 2024
2 parents 9a2a0b8 + fa20ae0 commit d44b42e
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
13 changes: 10 additions & 3 deletions packages/web/src/pages/Event/Event2024Spring.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/pages/Event/Event2024SpringMissions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ export const MissionContainer = ({ quest }: MissionContainerProps) => {
};

const Event2024SpringMissions = () => {
const { quests } = useValueRecoilState("event2024SpringInfo") || {};
const { isAgreeOnTermsOfEvent, quests } =
useValueRecoilState("event2024SpringInfo") || {};
useEventBackgroundEffect();

return (
Expand All @@ -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} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ const EventSection2024Spring = () => {
background: eventTheme.black,
};

const { isEligible } = useValueRecoilState("event2024SpringInfo") || {};
const { isEligible, isAgreeOnTermsOfEvent } =
useValueRecoilState("event2024SpringInfo") || {};

return (
<>
Expand Down Expand Up @@ -76,7 +77,7 @@ const EventSection2024Spring = () => {
paddingBottom: "15px",
}}
>
<CreditAmountContainer />
{isAgreeOnTermsOfEvent && <CreditAmountContainer />}
<div css={{ display: "flex", gap: "15px" }}>
<Link
to="/event/2024spring"
Expand Down

0 comments on commit d44b42e

Please sign in to comment.