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

리더보드 만들기 #731

Merged
merged 10 commits into from
Feb 19, 2024
47 changes: 41 additions & 6 deletions packages/web/src/components/Footer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import { ModalCredit, ModalPrivacyPolicy } from "@/components/ModalPopup";
import ButtonAboveFooter from "./ButtonAboveFooter";

import { ReactComponent as SparcsLogo } from "@/static/assets/sparcsLogos/SparcsLogoWithText.svg";
import { ReactComponent as SparcsLogoWhite } from "@/static/events/2024SparcsLogoWithTextWhite.svg";

type FooterProps = {
type?: "only-logo" | "full" | "event-2023fall";
type?: "only-logo" | "full" | "event-2023fall" | "event-2024spring";
children?: ReactNode;
};

Expand Down Expand Up @@ -72,11 +73,45 @@ const Footer = ({ type = "full", children }: FooterProps) => {
</a>
</>
)}
<div css={{ padding: "6px" }}>
<a href="https://sparcs.org/" target="_blank" rel="noreferrer">
<SparcsLogo style={{ height: "27px", opacity: 0.632 }} />
</a>
</div>
{type === "event-2024spring" && (
<>
<ModalPrivacyPolicy
isOpen={isOpenPrivacyPolicy}
onChangeIsOpen={setIsOpenPrivacyPolicy}
/>
<ModalCredit
defaultSelectedCatagory="2024SpringEvent"
isOpen={isOpenCredit}
onChangeIsOpen={setIsOpenCredit}
/>
<a className="popup-channeltalk">
<ButtonAboveFooter text="채널톡 문의하기" />
</a>
<ButtonAboveFooter
text="개인정보 처리방침"
onClick={onClickPrivacyPolicy}
/>
<Link to="/event/2024spring-guide" css={{ textDecoration: "none" }}>
<ButtonAboveFooter text="택시 살펴보기" />
</Link>
<ButtonAboveFooter
text="새터반 택시대제전을 만든 사람들"
onClick={onClickCredit}
/>
<div css={{ padding: "6px" }}>
<a href="https://sparcs.org/" target="_blank" rel="noreferrer">
<SparcsLogoWhite style={{ height: "27px", opacity: 0.632 }} />
</a>
</div>
</>
)}
{type !== "event-2024spring" && (
<div css={{ padding: "6px" }}>
<a href="https://sparcs.org/" target="_blank" rel="noreferrer">
<SparcsLogo style={{ height: "27px", opacity: 0.632 }} />
</a>
</div>
)}
</div>
);
};
Expand Down
6 changes: 6 additions & 0 deletions packages/web/src/components/ModalPopup/ModalCredit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
members,
members2023FallEvent,
members2023SpringEvent,
members2024SpringEvent,
} from "@/static/members";

type MemberProps = Members[number]["list"][number];
Expand Down Expand Up @@ -138,6 +139,11 @@ const ModalCredit = ({
name: t("page_credit.category_2023spring_event"),
body: <BodyMembers values={members2023SpringEvent} />,
},
{
key: "2024SpringEvent",
name: t("page_credit.category_2024spring_event"),
body: <BodyMembers values={members2024SpringEvent} />,
},
],
[t]
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const useFetchEvent2024SpringInfo = () => {
return useCallback((onError?: AxiosOption["onError"]) => {
if (eventMode === "2024spring") {
axios({
url: "/events/2024spring/global-state/",
url: "/events/2024spring/globalState/",
method: "get",
onSuccess: (data) => setEvent2024SpringInfo(data),
onError: onError,
Expand Down
Loading
Loading