diff --git a/packages/web/src/components/ModalPopup/ModalChatPayment.tsx b/packages/web/src/components/ModalPopup/ModalChatPayment.tsx index e59b8515..d19b55b1 100644 --- a/packages/web/src/components/ModalPopup/ModalChatPayment.tsx +++ b/packages/web/src/components/ModalPopup/ModalChatPayment.tsx @@ -1,7 +1,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import useAccountFromChats from "@/hooks/chat/useAccountFromChats"; -import { useEvent2024SpringQuestComplete } from "@/hooks/event/useEvent2024SpringQuestComplete"; +import { useEvent2024FallQuestComplete } from "@/hooks/event/useEvent2024FallQuestComplete"; import { useValueRecoilState } from "@/hooks/useFetchRecoilState"; import { useAxios } from "@/hooks/useTaxiAPI"; @@ -50,8 +50,8 @@ const ModalChatPayment = ({ [userOid, roomInfo] ); const onCopy = useCallback(() => setIsCopied(true), [setIsCopied]); - //#region event2024Spring - const event2024SpringQuestComplete = useEvent2024SpringQuestComplete(); + //#region event2024Fall + const event2024FallQuestComplete = useEvent2024FallQuestComplete(); //#endregion useEffect(() => { @@ -69,9 +69,8 @@ const ModalChatPayment = ({ method: "post", data: { roomId: roomInfo._id }, onSuccess: () => { - //#region event2024Spring - event2024SpringQuestComplete("payingAndSending"); - event2024SpringQuestComplete("paying"); + //#region event2024Fall + event2024FallQuestComplete("farePayment"); //#endregion modalProps.onChangeIsOpen?.(false); onRecall?.(); diff --git a/packages/web/src/components/ModalPopup/ModalChatSaveAccount.tsx b/packages/web/src/components/ModalPopup/ModalChatSaveAccount.tsx index 43d714e4..e5ce6b20 100644 --- a/packages/web/src/components/ModalPopup/ModalChatSaveAccount.tsx +++ b/packages/web/src/components/ModalPopup/ModalChatSaveAccount.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useState } from "react"; -import { useEvent2024SpringQuestComplete } from "@/hooks/event/useEvent2024SpringQuestComplete"; +import { useEvent2024FallQuestComplete } from "@/hooks/event/useEvent2024FallQuestComplete"; import { useFetchRecoilState, useValueRecoilState, @@ -32,8 +32,8 @@ const ModalChatSaveAcount = ({ const { account: accountOrigin } = useValueRecoilState("loginInfo") || {}; const [account, setAccount] = useState(accountDefault || ""); const fetchLoginInfo = useFetchRecoilState("loginInfo"); - //#region event2024Spring - const event2024SpringQuestComplete = useEvent2024SpringQuestComplete(); + //#region event2024Fall + const event2024FallQuestComplete = useEvent2024FallQuestComplete(); //#endregion useEffect(() => setAccount(accountDefault || ""), [accountDefault]); @@ -45,14 +45,14 @@ const ModalChatSaveAcount = ({ method: "post", data: { account }, onSuccess: () => { - //#region event2024Spring - event2024SpringQuestComplete("accountChanging"); + //#region event2024Fall + event2024FallQuestComplete("accountChanging"); //#endregion fetchLoginInfo(); }, onError: () => setAlert("계좌번호 저장을 실패하였습니다."), }); - }, [account, event2024SpringQuestComplete]); + }, [account]); const styleTitle = { ...theme.font18, diff --git a/packages/web/src/components/ModalPopup/ModalChatSettlement.tsx b/packages/web/src/components/ModalPopup/ModalChatSettlement.tsx index 75d15d7a..d9179994 100644 --- a/packages/web/src/components/ModalPopup/ModalChatSettlement.tsx +++ b/packages/web/src/components/ModalPopup/ModalChatSettlement.tsx @@ -1,7 +1,7 @@ import { useMemo, useRef, useState } from "react"; import useSendMessage from "@/hooks/chat/useSendMessage"; -import { useEvent2024SpringQuestComplete } from "@/hooks/event/useEvent2024SpringQuestComplete"; +import { useEvent2024FallQuestComplete } from "@/hooks/event/useEvent2024FallQuestComplete"; import { useValueRecoilState } from "@/hooks/useFetchRecoilState"; import { useAxios } from "@/hooks/useTaxiAPI"; @@ -40,7 +40,7 @@ const ModalChatSettlement = ({ const isValidAccount = useMemo(() => regExpTest.account(account), [account]); const isRequesting = useRef(false); const sendMessage = useSendMessage(roomInfo._id, isRequesting); - const event2024SpringQuestComplete = useEvent2024SpringQuestComplete(); + const event2024FallQuestComplete = useEvent2024FallQuestComplete(); const onClickOk = () => { if (isRequesting.current || !isValidAccount) return; @@ -57,9 +57,8 @@ const ModalChatSettlement = ({ isRequesting.current = false; if (account !== defaultAccount) openSaveAccountModal?.(account); } - //#region event2024Spring - event2024SpringQuestComplete("payingAndSending"); - event2024SpringQuestComplete("sending"); + //#region event2024Fall + event2024FallQuestComplete("fareSettlement"); //#endregion modalProps.onChangeIsOpen?.(false); }, diff --git a/packages/web/src/components/ModalPopup/ModalMypageModify.tsx b/packages/web/src/components/ModalPopup/ModalMypageModify.tsx index dcd26702..b85ed44d 100644 --- a/packages/web/src/components/ModalPopup/ModalMypageModify.tsx +++ b/packages/web/src/components/ModalPopup/ModalMypageModify.tsx @@ -2,7 +2,7 @@ import axiosOri from "axios"; import { useCallback, useEffect, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; -import { useEvent2024SpringQuestComplete } from "@/hooks/event/useEvent2024SpringQuestComplete"; +import { useEvent2024FallQuestComplete } from "@/hooks/event/useEvent2024FallQuestComplete"; import { useFetchRecoilState, useValueRecoilState, @@ -144,8 +144,8 @@ const ModalMypageModify = ({ ...modalProps }: ModalMypageModifyProps) => { const loginInfo = useValueRecoilState("loginInfo"); const fetchLoginInfo = useFetchRecoilState("loginInfo"); - //#region event2024Spring - const event2024SpringQuestComplete = useEvent2024SpringQuestComplete(); + //#region event2024Fall + const event2024FallQuestComplete = useEvent2024FallQuestComplete(); //#endregion const setAlert = useSetRecoilState(alertAtom); @@ -169,8 +169,8 @@ const ModalMypageModify = ({ ...modalProps }: ModalMypageModifyProps) => { method: "post", data: { nickname }, onError: () => setAlert(t("page_modify.nickname_failed")), - //#region event2024Spring - onSuccess: () => event2024SpringQuestComplete("nicknameChanging"), // event2024Spring + //#region event2024Fall + onSuccess: () => event2024FallQuestComplete("nicknameChanging"), // event2024Fall //#endregion }); } @@ -181,8 +181,8 @@ const ModalMypageModify = ({ ...modalProps }: ModalMypageModifyProps) => { method: "post", data: { account }, onError: () => setAlert(t("page_modify.account_failed")), - //#region event2024Spring - onSuccess: () => event2024SpringQuestComplete("accountChanging"), // event2024Spring + //#region event2024Fall + onSuccess: () => event2024FallQuestComplete("accountChanging"), // event2024Fall //#endregion }); } diff --git a/packages/web/src/components/ModalPopup/ModalNotification.tsx b/packages/web/src/components/ModalPopup/ModalNotification.tsx index f0f7f871..fbd19675 100644 --- a/packages/web/src/components/ModalPopup/ModalNotification.tsx +++ b/packages/web/src/components/ModalPopup/ModalNotification.tsx @@ -1,7 +1,7 @@ import { useCallback, useRef } from "react"; import { useTranslation } from "react-i18next"; -import { useEvent2024SpringQuestComplete } from "@/hooks/event/useEvent2024SpringQuestComplete"; +import { useEvent2024FallQuestComplete } from "@/hooks/event/useEvent2024FallQuestComplete"; import { useFetchRecoilState, useValueRecoilState, @@ -65,8 +65,8 @@ const ModalNotification = ({ const notificationOptions = useValueRecoilState("notificationOptions"); const fetchNotificationOptions = useFetchRecoilState("notificationOptions"); const isAxiosCalled = useRef(false); - //#region event2024Spring - const event2024SpringQuestComplete = useEvent2024SpringQuestComplete(); + //#region event2024Fall + const event2024FallQuestComplete = useEvent2024FallQuestComplete(); //#endregion const styleTitle = { @@ -113,12 +113,12 @@ const ModalNotification = ({ fetchNotificationOptions(); isAxiosCalled.current = false; - //#region event2024Spring + //#region event2024Fall if (optionName === "advertisement" && value) - event2024SpringQuestComplete("adPushAgreement"); + event2024FallQuestComplete("adPushAgreement"); //#endregion }, - [deviceToken, event2024SpringQuestComplete] + [deviceToken] ); const onChangeNotificationAll = useCallback( async (value: boolean) => { @@ -149,11 +149,11 @@ const ModalNotification = ({ fetchNotificationOptions(); isAxiosCalled.current = false; - //#region event2024Spring - if (value) event2024SpringQuestComplete("adPushAgreement"); + //#region event2024Fall + if (value) event2024FallQuestComplete("adPushAgreement"); //#endregion }, - [deviceToken, event2024SpringQuestComplete] + [deviceToken] ); const onChangeNotificationChatting = useCallback( onChangeNotificationOption("chatting"), diff --git a/packages/web/src/components/ModalPopup/ModalRoomShare.tsx b/packages/web/src/components/ModalPopup/ModalRoomShare.tsx index daee028b..087d04be 100644 --- a/packages/web/src/components/ModalPopup/ModalRoomShare.tsx +++ b/packages/web/src/components/ModalPopup/ModalRoomShare.tsx @@ -1,4 +1,4 @@ -import { useEvent2024SpringQuestComplete } from "@/hooks/event/useEvent2024SpringQuestComplete"; +import { useEvent2024FallQuestComplete } from "@/hooks/event/useEvent2024FallQuestComplete"; import Modal from "@/components/Modal"; @@ -19,8 +19,8 @@ const ModalRoomShare = ({ onChangeIsOpen, roomInfo, }: ModalRoomShareProps) => { - //#region event2024Spring - const event2024SpringQuestComplete = useEvent2024SpringQuestComplete(); + //#region event2024Fall + const event2024FallQuestComplete = useEvent2024FallQuestComplete(); //#endregion const styleTitle = { ...theme.font18, @@ -32,17 +32,17 @@ const ModalRoomShare = ({ fontSize: "21px", margin: "0 4px 0 0", }; - //#region event2024Spring - const onChangeIsOpenWithEvent2023Fall = (isOpen: boolean) => { + //#region event2024Fall + const onChangeIsOpenWithEvent2024Fall = (isOpen: boolean) => { onChangeIsOpen?.(isOpen); - !isOpen && event2024SpringQuestComplete("roomSharing"); + !isOpen && event2024FallQuestComplete("roomSharing"); }; //#endregion return (
diff --git a/packages/web/src/pages/Event/Event2024Fall.tsx b/packages/web/src/pages/Event/Event2024Fall.tsx index c0132b13..61ea687f 100644 --- a/packages/web/src/pages/Event/Event2024Fall.tsx +++ b/packages/web/src/pages/Event/Event2024Fall.tsx @@ -1,4 +1,5 @@ import { memo, useEffect, useState } from "react"; +import { Link } from "react-router-dom"; import { useValueRecoilState } from "@/hooks/useFetchRecoilState"; import { useAxios } from "@/hooks/useTaxiAPI"; @@ -26,7 +27,7 @@ import { ReactComponent as MainStep3 } from "@/static/events/2024fallMainStep3.s import { ReactComponent as MainTitle } from "@/static/events/2024fallMainTitle.svg"; const EVENT_INSTAGRAM_URL = - "https://www.instagram.com/p/C_H7YTfPEGZ/?igsh=MXh3MWc0NnJsZml3MQ=="; + "https://www.instagram.com/p/C_j1gibhTOa/?igsh=eWoyMnhweGNzeWR2"; const Event2024Fall = () => { const [isOpenShare, setIsOpenShare] = useState(false); @@ -117,19 +118,21 @@ const Event2024Fall = () => { 이벤트 참여 동의만 해도 송편코인 200개 지급
- {/* */} - - {/* */} + +
{ 경품 추첨 결과는 9월 30일에 발표
- {/* */} - - {/* */} + + +
{
위 이미지는 실제와 다를 수 있음
- {/* */} - - {/* */} + + +
{
window.open(EVENT_INSTAGRAM_URL, "_blank")} @@ -319,11 +315,9 @@ const Event2024Fall = () => {
- {/* 추첨 결과는 인스타그램, Ara, Taxi 홈페이지에 발표 -
- 실물 상품 또는 기프티콘으로 지급 -
*/} - 인스타그램 게시물은 9월 6일 정오에 업로드 예정 + 이 영역을 누르면 인스타그램 게시물로 이동 +
+ 추첨 결과는 인스타그램, Ara, Taxi 홈페이지에 발표
diff --git a/packages/web/src/pages/Home/EventSection/EventSection2024Fall.tsx b/packages/web/src/pages/Home/EventSection/EventSection2024Fall.tsx index c41b964f..84531885 100644 --- a/packages/web/src/pages/Home/EventSection/EventSection2024Fall.tsx +++ b/packages/web/src/pages/Home/EventSection/EventSection2024Fall.tsx @@ -2,8 +2,8 @@ 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"; @@ -71,11 +71,7 @@ const EventSection2024Fall = () => { 추석 이벤트 - {/* */} +
{ <> 2024/09/07 - 09/23
- 진행 예정! + 절찬리 진행 중! } > -
- {/* */} - 이지피지하게 달성하고 송편코인 받기} - > - - - {/* */} +
+ + 이지피지하게 달성하고 송편코인 받기} + > + + +
-
- {/* */} - - 응모권 구매해서 -
- 경품 추첨에 참여하기 - - } - > - - - {/* */} +
+ + + 응모권 구매해서 +
+ 경품 추첨에 참여하기 + + } + > + + +
- {/* */} + ); }; diff --git a/packages/web/src/static/events/2024fallMainSection2.svg b/packages/web/src/static/events/2024fallMainSection2.svg index 651b19b1..3fdcac14 100644 --- a/packages/web/src/static/events/2024fallMainSection2.svg +++ b/packages/web/src/static/events/2024fallMainSection2.svg @@ -13,7 +13,7 @@ - + diff --git a/packages/web/src/static/events/2024fallMainSection4.svg b/packages/web/src/static/events/2024fallMainSection4.svg index c311eca8..7d15753c 100644 --- a/packages/web/src/static/events/2024fallMainSection4.svg +++ b/packages/web/src/static/events/2024fallMainSection4.svg @@ -1,13 +1,13 @@ - - + + - + - + @@ -18,8 +18,8 @@ - - + + @@ -33,8 +33,8 @@ - - + + @@ -45,25 +45,25 @@ - - + + - - + + - - + + - - + + - - + + - - - - - + + + + +