Skip to content

Commit

Permalink
Merge pull request #683 from sparcs-kaist/dev
Browse files Browse the repository at this point in the history
Main branch update from Dev branch
  • Loading branch information
14KGun authored Oct 14, 2023
2 parents 32f1835 + 9210108 commit 93f4964
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 2 deletions.
63 changes: 63 additions & 0 deletions src/pages/Home/EventSection/EventSection2023FallResult.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
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 EventSection2023FallResult = () => {
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}>
많은 관심을 가지고 이벤트에 참여해주셔서 감사합니다 🙇
</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/2023fall-history" css={{ textDecoration: "none" }}>
<Button type="purple" css={styleButton}>
내 달토끼 상점 구매 이력 확인하기
</Button>
</Link>
</WhiteContainer>
</AdaptiveDiv>
);
};

export default EventSection2023FallResult;
3 changes: 2 additions & 1 deletion src/pages/Home/EventSection/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import EventSection2023Fall from "./EventSection2023Fall";
import EventSection2023FallResult from "./EventSection2023FallResult";
import EventSection2023Spring from "./EventSection2023Spring";

import { eventMode } from "tools/loadenv";
Expand All @@ -10,7 +11,7 @@ const EventSection = () => {
case "2023fall":
return <EventSection2023Fall />;
default:
return null;
return <EventSection2023FallResult />;
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/tools/loadenv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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 || "2023fall"; // optional. "2023fall"로 설정 가능
export const eventMode = env.REACT_APP_EVENT_MODE || null; // optional. "2023fall"로 설정 가능

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

0 comments on commit 93f4964

Please sign in to comment.