From d84253bfe0386c39a1109fc00bf242698f08024c Mon Sep 17 00:00:00 2001
From: jjjuni <0210leejun@gmail.com>
Date: Tue, 17 Jun 2025 11:27:24 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20style=20=EB=B0=8F=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/plan.ts                                 | 10 +++-------
 src/app/(afterLogin)/[planId]/page.tsx           | 16 +++++++++++-----
 src/components/common/NoticeModal.tsx            |  2 +-
 src/components/layout/Header.tsx                 |  4 +++-
 .../layout/sidebar/SidebarLogButton.tsx          |  4 +++-
 src/components/mypage/PlanList.tsx               |  3 ++-
 src/hooks/plan/usePlanInfo.ts                    |  2 +-
 src/hooks/schedule/useSchedule.ts                | 12 ++++++------
 8 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/apis/plan.ts b/src/apis/plan.ts
index 5b8a346..cd8d5a6 100644
--- a/src/apis/plan.ts
+++ b/src/apis/plan.ts
@@ -1,3 +1,4 @@
+import { useRouter } from "next/navigation";
 import axiosInstance from "./axiosInstance"
 
 interface PlanType {
@@ -12,13 +13,8 @@ interface PlanType {
 
 // 플랜 참여 확인
 export const isCollaboratorRequest = async (planId: string) => {
-  try {
-    const response = await axiosInstance(`/proxy/api/plan/is-collaborator/${planId}`)
-    return response.data
-  } catch (e) {
-    console.log(e)
-    return null
-  }
+  const response = await axiosInstance(`/proxy/api/plan/is-collaborator/${planId}`)
+  return response.data
 }
 
 // 플랜 목록 조회
diff --git a/src/app/(afterLogin)/[planId]/page.tsx b/src/app/(afterLogin)/[planId]/page.tsx
index 38f72e2..a8ebae5 100644
--- a/src/app/(afterLogin)/[planId]/page.tsx
+++ b/src/app/(afterLogin)/[planId]/page.tsx
@@ -99,14 +99,21 @@ const PlanPage = () => {
     }
   })
 
-  const { data: isCollaborator, isPending: isCollabPending } = useQuery({
+  const { data: isCollaborator, isPending: isCollabPending, error: collabError } = useQuery({
     queryKey: ["isCollaborator", planId],
     queryFn: async () => isCollaboratorRequest(planId),
     enabled: !!planId,
+    retry: 1,
   })
 
+  const handleEnter = async (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === 'Enter' && email.trim() !== "") {
+      invitePlan();
+    }
+  }
+
   useEffect(() => {
-    if (!isCollabPending && isCollaborator) {
+    if (collabError) {
       if (!isCollaborator?.isExist) {
         handleNotice("존재하지 않는 플랜입니다.", true)
         pageAnimateRouter.replace('/')
@@ -116,7 +123,7 @@ const PlanPage = () => {
         pageAnimateRouter.replace('/')
       }
     }
-  }, [isCollaborator])
+  }, [isCollaborator, collabError])
 
   return (
     <AnimatePresence>
@@ -152,7 +159,7 @@ const PlanPage = () => {
                           placeholder="초대할 상대방 이메일을 입력해주세요"
                           value={email}
                           onChange={(e) => setEmail(e.target.value)}
-                          onKeyDown={() => { }} />
+                          onKeyDown={handleEnter} />
                         <PlaneIcon
                           className={`${email.trim() !== "" ? `text-point cursor-pointer` : `text-gray-300`}
                           w-4 transition-all-300-out`}
@@ -161,7 +168,6 @@ const PlanPage = () => {
                     </Motion.MotionDiv>
                   }
                 </AnimatePresence>
-
               </div>
               {user?.email === authorEmail ? (
                 <Button text={"삭제"} isActive={true} isDelete={true} onClick={deletePlan} />
diff --git a/src/components/common/NoticeModal.tsx b/src/components/common/NoticeModal.tsx
index d23232f..6de66a4 100644
--- a/src/components/common/NoticeModal.tsx
+++ b/src/components/common/NoticeModal.tsx
@@ -37,7 +37,7 @@ const NoticeModal = () => {
             className={`absolute top-0 z-[9999] w-screen h-screen flex items-center justify-center pointer-events-none`}>
               <div 
                 className={`
-                  ${isAlert ? `text-red-400 border-red-400` : `text-gray-400 border-gray-400`}
+                  ${isAlert ? `text-red-400 border-red-400` : `text-point border-point`}
                   lg:text-[16px] text-[14px] z-[9999]  bg-white py-8 px-6 border rounded-[8px] pointer-events-auto select-none`}>
                 {NoticeModalText}
               </div>
diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx
index e46f276..16596eb 100644
--- a/src/components/layout/Header.tsx
+++ b/src/components/layout/Header.tsx
@@ -10,6 +10,7 @@ import Image from "next/image";
 import { getUserRequest } from "@/apis/user";
 import { AnimatePresence } from "framer-motion";
 import useSidebarStore from "@/stores/useSidebarStore";
+import { useRouter } from "next/navigation";
 
 const Header = () => {
 
@@ -28,6 +29,7 @@ const Header = () => {
     setUser,
   } = useUserStore();
 
+  const router = useRouter();
   const pageAnimateRouter = usePageAnimateRouter();
 
   useEffect(() => {
@@ -81,7 +83,7 @@ const Header = () => {
           ) : (
             <KakaoIcon
               className={`lg:w-10 w-8 cursor-pointer`}
-              onClick={() => pageAnimateRouter.push(`${process.env.NEXT_PUBLIC_DOMAIN}/oauth2/authorization/kakao`)} />
+              onClick={() => router.push(`${process.env.NEXT_PUBLIC_DOMAIN}/oauth2/authorization/kakao`)} />
           ))}
         </Motion.MotionDiv>
       ) : (
diff --git a/src/components/layout/sidebar/SidebarLogButton.tsx b/src/components/layout/sidebar/SidebarLogButton.tsx
index cbdd197..d6e69b2 100644
--- a/src/components/layout/sidebar/SidebarLogButton.tsx
+++ b/src/components/layout/sidebar/SidebarLogButton.tsx
@@ -2,6 +2,7 @@ import { logOutRequest } from "@/apis/user";
 import usePageAnimateRouter from "@/hooks/common/usePageAnimateRouter";
 import useSidebarStore from "@/stores/useSidebarStore";
 import useUserStore from "@/stores/useUserStore";
+import { useRouter } from "next/navigation";
 
 interface SidebarLogButtonProps {
   isLoggedIn: boolean;
@@ -19,6 +20,7 @@ const SidebarLogButton = ({
     setIsSidebarOpen,
   } = useSidebarStore();
   
+  const router = useRouter();
   const pageAnimateRouter = usePageAnimateRouter();
 
   const logOut = async () => {
@@ -36,7 +38,7 @@ const SidebarLogButton = ({
       className={
         `${isLoggedIn ? loginClass : logoutClass}
         rounded-[8px] w-full py-2.5 text-[16px] border text-center transition-all-300-out cursor-pointer`}
-      onClick={isLoggedIn ? logOut : () => pageAnimateRouter.push(`${process.env.NEXT_PUBLIC_DOMAIN}/oauth2/authorization/kakao`)}>
+      onClick={isLoggedIn ? logOut : () => router.push(`${process.env.NEXT_PUBLIC_DOMAIN}/oauth2/authorization/kakao`)}>
       {isLoggedIn ? `로그아웃` : `로그인`}
     </div>
   )
diff --git a/src/components/mypage/PlanList.tsx b/src/components/mypage/PlanList.tsx
index 2ea84cd..592d60d 100644
--- a/src/components/mypage/PlanList.tsx
+++ b/src/components/mypage/PlanList.tsx
@@ -30,7 +30,8 @@ const PlanList: React.FC<PlanListProps> = ({
     queryFn: () => requestQuery.before
       ? getPlansRequest({ before: requestQuery.before })
       : getPlansRequest({ after: requestQuery.after }),
-  })
+    }, 
+  )
 
   return (
     <div
diff --git a/src/hooks/plan/usePlanInfo.ts b/src/hooks/plan/usePlanInfo.ts
index bac0d95..a3c19cf 100644
--- a/src/hooks/plan/usePlanInfo.ts
+++ b/src/hooks/plan/usePlanInfo.ts
@@ -36,7 +36,7 @@ export const usePlanInfo = (planId: string) => {
       const data = docSnapshot.data();
 
       if (data) {
-        setTitle(data?.title)
+        setTitle(data?.title) 
         setAuthorEmail(data?.authorEmail)
         setDays(data?.startDate, data?.endDate)
         setTags(data?.tags)
diff --git a/src/hooks/schedule/useSchedule.ts b/src/hooks/schedule/useSchedule.ts
index d2ed45f..814ec96 100644
--- a/src/hooks/schedule/useSchedule.ts
+++ b/src/hooks/schedule/useSchedule.ts
@@ -8,8 +8,8 @@ import usePlanStore from "@/stores/usePlanStore";
 export const useSchedule = (planId: string) => {
 
   const {
-    isSchedulePending: isPending,
-    setIsSchedulePending: setIsPending,
+    isSchedulePending,
+    setIsSchedulePending,
   } = usePlanStore();
 
   const [layout, setLayout] = useState<CustomLayout[]>([]);
@@ -20,7 +20,7 @@ export const useSchedule = (planId: string) => {
       const docSnap = await getDoc(targetDoc);
 
       if (!docSnap.exists()) {
-        setIsPending(true);
+        setIsSchedulePending(true);
         return;
       }
     }
@@ -33,13 +33,13 @@ export const useSchedule = (planId: string) => {
       const data = docSnapshot.data();
       if (data) {
         setLayout(data.scheduleList);
-        setIsPending(false);
+        setIsSchedulePending(false);
       }
     });
 
     return () => {
       setLayout([]);
-      setIsPending(true);
+      setIsSchedulePending(true);
       unsubscribe()
     };
   }, [planId]);
@@ -52,7 +52,7 @@ export const useSchedule = (planId: string) => {
   }, [planId]);
 
   const updateSchedule = (updatedLayout: CustomLayout[]) => {
-    if (!isPending) {
+    if (!isSchedulePending) {
       throttledUpdateSchedule(updatedLayout);
     }
   };

From 6f4c06e4843cf7af9eedceab87ba2dc21468098b Mon Sep 17 00:00:00 2001
From: jjjuni <0210leejun@gmail.com>
Date: Tue, 17 Jun 2025 11:34:58 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20=EC=97=90=EB=9F=AC=20?=
 =?UTF-8?q?=ED=95=B8=EB=93=A4=EB=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(afterLogin)/[planId]/page.tsx | 3 ++-
 src/types/error/type.ts                | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/(afterLogin)/[planId]/page.tsx b/src/app/(afterLogin)/[planId]/page.tsx
index a8ebae5..fdf79c0 100644
--- a/src/app/(afterLogin)/[planId]/page.tsx
+++ b/src/app/(afterLogin)/[planId]/page.tsx
@@ -80,7 +80,8 @@ const PlanPage = () => {
       handleNotice(`${data?.userName}님을 초대하였습니다.`, false);
     },
     onError: (e: AxiosError<ErrorResponse>) => {
-      const message = e?.response?.data?.error || "";
+      const message = e?.response?.data?.detail || "";
+      console.log(e)
       handleNotice(message, true);
     },
   })
diff --git a/src/types/error/type.ts b/src/types/error/type.ts
index 570f7ee..6367722 100644
--- a/src/types/error/type.ts
+++ b/src/types/error/type.ts
@@ -1,3 +1,3 @@
 export interface ErrorResponse {
-  error: string;
+  detail: string;
 }
\ No newline at end of file

From 1bb30a5be4bbbbedaf4fe3ecf793499b32137b60 Mon Sep 17 00:00:00 2001
From: jjjuni <0210leejun@gmail.com>
Date: Tue, 17 Jun 2025 13:30:17 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=90=9B=20=EB=B9=8C=EB=93=9C=20?=
 =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/plan.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/apis/plan.ts b/src/apis/plan.ts
index cd8d5a6..86039a4 100644
--- a/src/apis/plan.ts
+++ b/src/apis/plan.ts
@@ -1,4 +1,3 @@
-import { useRouter } from "next/navigation";
 import axiosInstance from "./axiosInstance"
 
 interface PlanType {