From 38a337e068e5926883bc2ac3b51151664c8b67e4 Mon Sep 17 00:00:00 2001
From: andyye <63383967+0ev@users.noreply.github.com>
Date: Fri, 23 Feb 2024 03:49:28 +0900
Subject: [PATCH 01/29] Add referer
---
.../web/src/components/Skeleton/Routes.tsx | 5 ++++
packages/web/src/pages/Home/index.tsx | 24 ++++++++++++++++++-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/packages/web/src/components/Skeleton/Routes.tsx b/packages/web/src/components/Skeleton/Routes.tsx
index 276b1ce66..4b74a3ab8 100644
--- a/packages/web/src/components/Skeleton/Routes.tsx
+++ b/packages/web/src/components/Skeleton/Routes.tsx
@@ -27,6 +27,11 @@ const routeProps = [
component: lazy(() => import("@/pages/Home")),
exact: true,
},
+ {
+ path: "/event/2024spring-invite/:eventStatusId",
+ component: lazy(() => import("@/pages/Home")),
+ exact: true,
+ },
{
path: "/event/:eventName",
component: lazy(() => import("@/pages/Event")),
diff --git a/packages/web/src/pages/Home/index.tsx b/packages/web/src/pages/Home/index.tsx
index ee5205152..6e5000097 100644
--- a/packages/web/src/pages/Home/index.tsx
+++ b/packages/web/src/pages/Home/index.tsx
@@ -1,5 +1,8 @@
+import { useEffect } from "react";
import { useHistory, useParams } from "react-router-dom";
+import useQuery from "@/hooks/useTaxiAPI";
+
import Footer from "@/components/Footer";
import { ModalPrivacyPolicy } from "@/components/ModalPopup";
@@ -7,13 +10,31 @@ import EventSection from "./EventSection";
import InfoSection from "./InfoSection";
import RoomSection from "./RoomSection";
+import { getDynamicLink } from "@/tools/trans";
+
const Home = () => {
const history = useHistory();
- const { roomId: _roomId } = useParams<{ roomId: string }>();
+ const { roomId: _roomId, eventStatusId: eventStatusId } = useParams<{
+ roomId: string;
+ eventStatusId: string;
+ }>();
const roomId = _roomId === "privacyPolicy" ? null : _roomId;
+ const [, eventProfile] = useQuery.get(
+ `/events/2024spring/invite/search/:${roomId}`,
+ {},
+ [eventStatusId]
+ );
+
const onChangeIsOpenPrivacyPolicy = () => history.replace("/home");
+ useEffect(() => {
+ if (!eventStatusId) return;
+ const dynamicLink = getDynamicLink(window.location.pathname);
+ window.location.replace(dynamicLink);
+
+ }, [eventStatusId]);
+
return (
<>
@@ -25,6 +46,7 @@ const Home = () => {
isOpen={_roomId === "privacyPolicy"}
onChangeIsOpen={onChangeIsOpenPrivacyPolicy}
/>
+ {/* 모달 완성되면 넣을 곳 */}
);
};
From 387d1c77028760b541c83abcf09e70989079a7e2 Mon Sep 17 00:00:00 2001
From: andyye <63383967+0ev@users.noreply.github.com>
Date: Fri, 23 Feb 2024 04:06:41 +0900
Subject: [PATCH 02/29] Fix home
---
.../ModalPopup/ModalEvent2024SpringJoin.tsx | 47 +++++++++++--------
.../web/src/pages/Event/Event2024Spring.tsx | 5 +-
packages/web/src/pages/Home/index.tsx | 13 +++--
3 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/packages/web/src/components/ModalPopup/ModalEvent2024SpringJoin.tsx b/packages/web/src/components/ModalPopup/ModalEvent2024SpringJoin.tsx
index d5904801e..5be711a75 100644
--- a/packages/web/src/components/ModalPopup/ModalEvent2024SpringJoin.tsx
+++ b/packages/web/src/components/ModalPopup/ModalEvent2024SpringJoin.tsx
@@ -8,6 +8,7 @@ import {
useValueRecoilState,
} from "@/hooks/useFetchRecoilState";
import { useAxios } from "@/hooks/useTaxiAPI";
+import useQuery from "@/hooks/useTaxiAPI";
import Button from "@/components/Button";
import DottedLine from "@/components/DottedLine";
@@ -22,11 +23,14 @@ import theme from "@/tools/theme";
import FestivalRoundedIcon from "@mui/icons-material/FestivalRounded";
-type ModalEvent2024SpringJoinProps = Parameters[0];
+type ModalEvent2024SpringJoinProps = Parameters[0] & {
+ inviterId?: string;
+};
-const ModalEvent2024SpringJoin = (
- modalProps: ModalEvent2024SpringJoinProps
-) => {
+const ModalEvent2024SpringJoin = ({
+ inviterId,
+ ...modalProps
+}: ModalEvent2024SpringJoinProps) => {
const axios = useAxios();
const setAlert = useSetRecoilState(alertAtom);
const isLogin = useIsLogin();
@@ -43,8 +47,11 @@ const ModalEvent2024SpringJoin = (
const [phoneNumber, setPhoneNumber] = useState("");
const [group, setGroup] = useState(0);
- // 추천인 구현 방식에 따라 삭제가 필요할 수도 있습니다.
- const [inviter] = useState("");
+ const [, inviterInfo] = useQuery.get(
+ `/events/2024spring/invite/search/${inviterId}`,
+ {},
+ [inviterId]
+ );
const isValidPhoneNumber = useMemo(
() => regExpTest.phoneNumber(phoneNumber),
@@ -61,7 +68,7 @@ const ModalEvent2024SpringJoin = (
axios({
url: "/events/2024spring/globalState/create",
method: "post",
- data: { phoneNumber, group, inviter },
+ data: { phoneNumber, group, inviterId },
onSuccess: () => {
fetchLoginInfo();
//#region event2024Spring
@@ -178,16 +185,17 @@ const ModalEvent2024SpringJoin = (
css={{ width: "100%", marginLeft: "10px" }}
/>
- {/* 추천인이 있을 경우에만 표시하도록 변경 필요 */}
- {/*
- 추천인
-
![추천인]()
-
추천인닉네임
-
+ 추천인
+
![추천인]()
+
추천인닉네임
+