From e826310d09cce47d3d6cb733e66cf902b60fbc92 Mon Sep 17 00:00:00 2001
From: jisu Seo <jseo9732@gmail.com>
Date: Mon, 15 Jan 2024 20:16:22 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Style:=20=EC=97=AC=ED=96=89=EC=A7=80=20->?=
 =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/member.ts                    | 4 ++--
 src/api/tours.ts                     | 4 ++--
 src/api/trips.ts                     | 4 ++--
 src/components/MyTrip/MyTrip.tsx     | 2 +-
 src/components/Mypage/MypageList.tsx | 2 +-
 src/components/Wish/Wish.tsx         | 4 ++--
 src/components/common/like/Like.tsx  | 2 +-
 src/components/common/nav/Nav.tsx    | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/api/member.ts b/src/api/member.ts
index 0a5e6093..30cbe196 100644
--- a/src/api/member.ts
+++ b/src/api/member.ts
@@ -53,7 +53,7 @@ export const getMemberTrips = async (page?: number, size?: number) => {
   }
 };
 
-// 나의 관심 여행지 조회
+// 나의 관심 목록 조회
 export const getMemberTours = async (page?: number, size?: number) => {
   try {
     const res = await authClient.get(`member/tours?&page=${page}&size=${size}`);
@@ -97,7 +97,7 @@ export const getMemberReviews = async (page?: number, size?: number) => {
   }
 };
 
-// 나의 관심 여행지 삭제
+// 나의 관심 목록 삭제
 // export const deleteMemberTours = async (tourItemId: number) => {
 //   const res = await authClient.delete(`member/tours/${tourItemId}`);
 //   return res;
diff --git a/src/api/tours.ts b/src/api/tours.ts
index 6933f0a8..1311c8f2 100644
--- a/src/api/tours.ts
+++ b/src/api/tours.ts
@@ -33,7 +33,7 @@ export const getDetailTours = async (tourItemId: number) => {
   }
 };
 
-// 관심 여행지 등록
+// 관심 목록 등록
 export const postLikedTours = async (options: { id: number }) => {
   try {
     const { id } = options;
@@ -48,7 +48,7 @@ export const postLikedTours = async (options: { id: number }) => {
   }
 };
 
-// 관심 여행지 삭제
+// 관심 목록 삭제
 export const deleteLikedTours = async (options: { id: number }) => {
   try {
     const { id } = options;
diff --git a/src/api/trips.ts b/src/api/trips.ts
index 7d7aeb81..e989500a 100644
--- a/src/api/trips.ts
+++ b/src/api/trips.ts
@@ -39,13 +39,13 @@ export const getTripsLike = async (
   return res;
 };
 
-// 우리의 관심 여행지 등록
+// 우리의 관심 목록 등록
 export const postTripsLike = async (tripId: number, tourItemIds: number[]) => {
   const res = await client.post(`trips/${tripId}/tripLikedTours`, tourItemIds);
   return res;
 };
 
-// 우리의 관심 여행지 좋아요/싫어요
+// 우리의 관심 목록 좋아요/싫어요
 export const postTripsLikeHate = async (
   tripId: number,
   tourId: number,
diff --git a/src/components/MyTrip/MyTrip.tsx b/src/components/MyTrip/MyTrip.tsx
index 3d7a7813..59422bbb 100644
--- a/src/components/MyTrip/MyTrip.tsx
+++ b/src/components/MyTrip/MyTrip.tsx
@@ -47,7 +47,7 @@ const MyTrip = () => {
         />
       ) : (
         <NoDataMessage
-          message1="저장된 관심 여행지가 없습니다."
+          message1="저장된 관심 목록이 없습니다."
           message2="가고 싶은 장소를 저장해보세요!"
           icon={<PenIcon size={44} fill="#EDEDED" color="#EDEDED" />}
         />
diff --git a/src/components/Mypage/MypageList.tsx b/src/components/Mypage/MypageList.tsx
index ed6dbbae..3e0ab261 100644
--- a/src/components/Mypage/MypageList.tsx
+++ b/src/components/Mypage/MypageList.tsx
@@ -4,7 +4,7 @@ const MypageList = () => {
   return (
     <div>
       <MypageItem link="/mytrip">나의 여정</MypageItem>
-      <MypageItem link="/wishlist">나의 관심 여행지</MypageItem>
+      <MypageItem link="/wishlist">나의 관심 목록</MypageItem>
       <MypageItem link="/myPageReview">나의 리뷰</MypageItem>
       <MypageItem link="/mypage/survey">나의 여행 취향 설정</MypageItem>
     </div>
diff --git a/src/components/Wish/Wish.tsx b/src/components/Wish/Wish.tsx
index 6a0e219a..7858c79c 100644
--- a/src/components/Wish/Wish.tsx
+++ b/src/components/Wish/Wish.tsx
@@ -45,7 +45,7 @@ const Wish = () => {
   return (
     <div className="mt-3 min-h-[100vh]">
       <div className="sticky top-0 z-[105] bg-white py-0.5">
-        <h1 className="title2 pt-3">나의 관심 여행지</h1>
+        <h1 className="title2 pt-3">나의 관심 목록</h1>
         <WishCategory onCategoryClick={handleCategoryClick} />
       </div>
 
@@ -59,7 +59,7 @@ const Wish = () => {
         />
       ) : (
         <NoDataMessage
-          message1="저장된 관심 여행지가 없습니다."
+          message1="저장된 관심 목록이 없습니다."
           message2="가고 싶은 장소를 저장해보세요!"
           icon={<HeartIcon size={44} fill="#EDEDED" color="#EDEDED" />}
         />
diff --git a/src/components/common/like/Like.tsx b/src/components/common/like/Like.tsx
index cc9cea19..159bf56d 100644
--- a/src/components/common/like/Like.tsx
+++ b/src/components/common/like/Like.tsx
@@ -75,7 +75,7 @@ const Like = ({ liked, id }: LikeProps) => {
             title={'로그인'}
             message={
               <>
-                관심 여행지 등록시 로그인이 필요합니다.
+                관심 목록 등록시 로그인이 필요합니다.
                 <br />
                 로그인 하시겠습니까?
               </>
diff --git a/src/components/common/nav/Nav.tsx b/src/components/common/nav/Nav.tsx
index 5fb9d35a..7695f624 100644
--- a/src/components/common/nav/Nav.tsx
+++ b/src/components/common/nav/Nav.tsx
@@ -94,7 +94,7 @@ const Nav = () => {
             title={'로그인'}
             message={
               <>
-                관심 여행지 조회를 위해 로그인이 필요합니다.
+                관심 목록 조회를 위해 로그인이 필요합니다.
                 <br />
                 로그인 하시겠습니까?
               </>

From fafcfa2b9983714cbf18b642215ebf67639a0205 Mon Sep 17 00:00:00 2001
From: jisu Seo <jseo9732@gmail.com>
Date: Mon, 15 Jan 2024 20:32:30 +0900
Subject: [PATCH 2/2] =?UTF-8?q?Refactor:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EA=B2=BD=EB=A1=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Auth/Login/KakaoLogin.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Auth/Login/KakaoLogin.tsx b/src/components/Auth/Login/KakaoLogin.tsx
index 5146b85c..dfc5dd26 100644
--- a/src/components/Auth/Login/KakaoLogin.tsx
+++ b/src/components/Auth/Login/KakaoLogin.tsx
@@ -28,10 +28,10 @@ const KakaoLogin = () => {
         genderType: gender,
         survey: null,
       });
-      if (signup) {
+      if (signup === 'true') {
         // signup이 true면 이미 회원가입을 했던 유저
         navigate('/');
-      } else {
+      } else if (signup === 'false') {
         // signup이 false면 이전에 회원가입을 하지 않았던 유저
         navigate('/signup/success');
       }