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.

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

Main branch update from Dev branch #840

Merged
merged 2 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import { Link } from "react-router-dom";

import AdaptiveDiv from "@/components/AdaptiveDiv";
import Button from "@/components/Button";
import Title from "@/components/Title";
import WhiteContainer from "@/components/WhiteContainer";

import theme from "@/tools/theme";

const EventSection2024FallResult = () => {
const styleText = {
...theme.font14,
marginBottom: "12px",
};
const styleButton = {
padding: "14px 0 13px",
borderRadius: "12px",
...theme.font14_bold,
};

return (
<AdaptiveDiv type="center">
<Title icon="festival" isHeader>
추석 이벤트
</Title>
<WhiteContainer>
<div css={styleText}>
<b>🎉 경품 추첨 결과 발표 및 상품 수령 안내</b>
</div>
<div css={styleText}>
많은 관심을 가지고 이벤트에 참여해 주셔서 감사드립니다. 🙇
</div>
<div css={styleText}>
인스타그램 게시글을 통해 경품 추첨 결과 및 수령 방법을 확인하실 수
있습니다.
</div>
<div css={styleText}>
당첨되신 분들께는 이벤트 참여 때 등록해주신 연락처로 경품 수령 방법을
안내해 드렸으나, 연락을 받지 못하신 분들은{" "}
<b>마이 페이지 {">"} 채널톡 문의하기</b>를 통해 문의주시면
감사하겠습니다.
</div>
<a
href="https://www.instagram.com/sparcs.kaist/"
target="_blank"
rel="noreferrer"
css={{ textDecoration: "none" }}
>
<Button type="purple" css={styleButton}>
인스타그램에서 추첨 결과 확인하기
</Button>
</a>
<div css={{ height: "12px" }} />
<Link to="/event/2024fall-store" css={{ textDecoration: "none" }}>
<Button type="purple" css={styleButton}>
응모권 리더보드 확인하기
</Button>
</Link>
</WhiteContainer>
</AdaptiveDiv>
);
};

export default EventSection2024FallResult;
3 changes: 2 additions & 1 deletion packages/web/src/pages/Home/EventSection/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import EventSection2023Fall from "./EventSection2023Fall";
import EventSection2023Spring from "./EventSection2023Spring";
import EventSection2024Fall from "./EventSection2024Fall";
import EventSection2024FallResult from "./EventSection2024FallResult";
import EventSection2024Spring from "./EventSection2024Spring";

import { eventMode } from "@/tools/loadenv";
Expand All @@ -16,7 +17,7 @@ const EventSection = () => {
case "2024fall":
return <EventSection2024Fall />;
default:
return null;
return <EventSection2024FallResult />;
}
};

Expand Down
2 changes: 1 addition & 1 deletion packages/web/src/tools/loadenv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const kakaoSDKKey = env.REACT_APP_KAKAO_SDK_KEY; // optional
export const gaTrackingId = env.REACT_APP_GA_TRACKING_ID; // optional
export const firebaseConfig: Nullable<FirebaseConfig> =
env.REACT_APP_FIREBASE_CONFIG && JSON.parse(env.REACT_APP_FIREBASE_CONFIG); // optional
export const eventMode = env.REACT_APP_EVENT_MODE || "2024fall"; // optional. "2023fall"로 설정 가능
export const eventMode = env.REACT_APP_EVENT_MODE || null; // optional. "2024fall"로 설정 가능

// devicet-type 감지
const userAgent = navigator.userAgent.toLowerCase();
Expand Down
Loading