Skip to content

Commit

Permalink
Merge pull request #819 from sparcs-kaist/815-2024-추석-이벤트-이벤트-소개-페이지
Browse files Browse the repository at this point in the history
#815 2024 추석 이벤트 이벤트 소개 페이지
  • Loading branch information
kmc7468 authored Sep 5, 2024
2 parents 182a2c4 + ce66ff8 commit 9ad1853
Show file tree
Hide file tree
Showing 10 changed files with 694 additions and 293 deletions.
485 changes: 221 additions & 264 deletions packages/web/src/pages/Event/Event2024Fall.tsx

Large diffs are not rendered by default.

49 changes: 21 additions & 28 deletions packages/web/src/pages/Home/EventSection/EventSection2024Fall.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { ReactElement, useCallback, useEffect, useState } from "react";
import { ReactElement } from "react";
import { Link } from "react-router-dom";

import AdaptiveDiv from "@/components/AdaptiveDiv";
import CreditAmountStatusContainer from "@/components/Event/CreditAmountStatusContainer";
import WhiteContainerSuggestJoinEvent from "@/components/Event/WhiteContainerSuggestJoinEvent";
// import CreditAmountStatusContainer from "@/components/Event/CreditAmountStatusContainer";
// import WhiteContainerSuggestJoinEvent from "@/components/Event/WhiteContainerSuggestJoinEvent";
import Title from "@/components/Title";
import WhiteContainer from "@/components/WhiteContainer";

import theme from "@/tools/theme";

// ToDo : 2023fall 이미지
import { ReactComponent as BackgroundMain } from "@/static/events/2023fallHomeMain.svg";
import { ReactComponent as BackgroundMission } from "@/static/events/2023fallHomeMission.svg";
import { ReactComponent as BackgroundStore } from "@/static/events/2023fallHomeStore.svg";
Expand Down Expand Up @@ -67,65 +66,59 @@ const ButtonContainer = ({
};

const EventSection2024Fall = () => {
const [amountType, setAmountType] = useState<"credit" | "ticket">("credit");
const changeAmountType = useCallback(
() => setAmountType((prev) => (prev === "credit" ? "ticket" : "credit")),
[]
);
useEffect(() => {
const interval = setInterval(changeAmountType, 3000);
return () => clearInterval(interval);
});

return (
<AdaptiveDiv type="center">
<Title icon="festival" isHeader>
한가위 송편 이벤트
추석 이벤트
</Title>
<CreditAmountStatusContainer
{/* <CreditAmountStatusContainer
type={amountType}
css={{ ...theme.cursor() }}
onClick={changeAmountType}
/>
/> */}
<div css={{ display: "flex", gap: "15px" }}>
<Link to="/event/2024fall" css={{ width: 0, flexGrow: 1 }}>
<ButtonContainer
title="이벤트 안내"
description={
<>
2024/09/09 - 09/23
2024/09/07 - 09/23
<br />
절찬리 진행 !
진행 예정!
</>
}
>
<BackgroundMain css={{ width: "100%", height: "100%" }} />
</ButtonContainer>
</Link>
<Link to="/event/2024fall-missions" css={{ width: 0, flexGrow: 1 }}>
<div css={{ width: 0, flexGrow: 1, opacity: 0.5 }}>
{/* <Link to="/event/2024fall-missions"> */}
<ButtonContainer
title="퀘스트"
description={<>이지피지하게 달성하고 달달한 송편 받기</>}
description={<>이지피지하게 달성하고 송편코인 받기</>}
>
<BackgroundMission css={{ width: "100%", height: "100%" }} />
</ButtonContainer>
</Link>
<Link to="/event/2024fall-store" css={{ width: 0, flexGrow: 1 }}>
{/* </Link> */}
</div>
<div css={{ width: 0, flexGrow: 1, opacity: 0.5 }}>
{/* <Link to="/event/2024fall-store" > */}
<ButtonContainer
title="달토끼 상점"
title="응모권 교환소"
description={
<>
귀여운 달토끼가
응모권 구매해서
<br />
상점 주인?
경품 추첨에 참여하기
</>
}
>
<BackgroundStore css={{ width: "100%", height: "100%" }} />
</ButtonContainer>
</Link>
{/* </Link> */}
</div>
</div>
<WhiteContainerSuggestJoinEvent />
{/* <WhiteContainerSuggestJoinEvent /> */}
</AdaptiveDiv>
);
};
Expand Down
120 changes: 120 additions & 0 deletions packages/web/src/static/events/2024fallMainSection1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions packages/web/src/static/events/2024fallMainSection2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 69 additions & 0 deletions packages/web/src/static/events/2024fallMainSection4.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions packages/web/src/static/events/2024fallMainSection6.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
173 changes: 173 additions & 0 deletions packages/web/src/static/events/2024fallMainStep2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions packages/web/src/static/events/2024fallMainStep3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions packages/web/src/static/events/2024fallMainTitle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion packages/web/src/static/members/members2024FallEvent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,17 @@ const members: Members = [
},
{
position: "🖥️ Back-end Developer",
list: [{ name: "김민찬", id: "static", period: "2024" }],
list: [
{ name: "김민찬", id: "static", period: "2024" },
{ name: "박태현", id: "source", period: "2024" },
],
},
{
position: "⚙️ Front-end Developer",
list: [
{ name: "권진현", id: "daystar", period: "2024" },
{ name: "황민성", id: "minseong", period: "2024" },
{ name: "김효경", id: "diana", period: "2024" },
],
},
{
Expand Down

0 comments on commit 9ad1853

Please sign in to comment.