Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

이벤트 문제 수정 #753

Merged
merged 7 commits into from
Mar 6, 2024
Merged

이벤트 문제 수정 #753

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f9816dc
Fix: many problems:
predict-woo Mar 5, 2024
bf906f8
Fix: problems
predict-woo Mar 5, 2024
7a2ce30
Fix:final
predict-woo Mar 5, 2024
1d54f5a
Remove: import:
predict-woo Mar 5, 2024
c99a3bc
Refactor: restore .env.example
kmc7468 Mar 5, 2024
e7bdb6a
Fix: some buttons don't appear when the user doesn't participate in t…
kmc7468 Mar 6, 2024
fa20ae0
Fix: CreditAmountContainer appears in the mission page when the user …
kmc7468 Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions packages/web/src/pages/Event/Event2024Spring.tsx
View file
Open in desktop
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
81 changes: 42 additions & 39 deletions packages/web/src/pages/Home/EventSection/EventSection2024Spring.tsx
View file
Open in desktop
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 @@ -68,45 +69,47 @@ const EventSection2024Spring = () => {
{getDday("2024-03-18")}
</div>
</div>
<div
css={{
display: "flex",
flexDirection: "column",
gap: "15px",
paddingBottom: "15px",
}}
>
<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>
{isAgreeOnTermsOfEvent && (
<div
css={{
display: "flex",
flexDirection: "column",
gap: "15px",
paddingBottom: "15px",
}}
>
<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>
</div>
)}
<SuggestJoinEventContainer />
</AdaptiveDiv>
</div>
Expand Down