From c7ea4eb75c42b5eace4437aa5a5ae0097f1cc723 Mon Sep 17 00:00:00 2001 From: d0422 Date: Mon, 7 Oct 2024 09:48:30 +0900 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=EC=97=AC=ED=96=89=EA=B8=B0?= =?UTF-8?q?=EB=A1=9D=EB=B3=B4=EA=B8=B0=20->=20=EC=97=AC=ED=96=89=EA=B8=B0?= =?UTF-8?q?=EB=A1=9D=20=EB=B3=B4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/react-native/src/pages/Maps/Maps.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native/src/pages/Maps/Maps.tsx b/packages/react-native/src/pages/Maps/Maps.tsx index 43d42aef..7ff0674c 100644 --- a/packages/react-native/src/pages/Maps/Maps.tsx +++ b/packages/react-native/src/pages/Maps/Maps.tsx @@ -217,7 +217,7 @@ export default withSuspense(function Maps({ navigation }: MapsMainProps) { }} > - 여행기록보기 + 여행기록 보기 From 9db887ea02aab217a7eab3b88942c63315c8fdda Mon Sep 17 00:00:00 2001 From: d0422 Date: Mon, 7 Oct 2024 09:53:14 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20home=20add=20=EB=A9=98=ED=8A=B8=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/Home/HomeSpotAdd.tsx | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/packages/react-native/src/pages/Home/HomeSpotAdd.tsx b/packages/react-native/src/pages/Home/HomeSpotAdd.tsx index b0a8aec9..d8a1cc56 100644 --- a/packages/react-native/src/pages/Home/HomeSpotAdd.tsx +++ b/packages/react-native/src/pages/Home/HomeSpotAdd.tsx @@ -46,24 +46,31 @@ export default withSuspense(function HomeSpotAdd() { {isEmpty ? ( ) : ( - - {data?.map((plan) => ( - - { - setTripId(plan.id); - }} - /> - - ))} + + + + 나의 여행은 Trip Planner 탭에서 확인할 수 있습니다. + + + + {data?.map((plan) => ( + + { + setTripId(plan.id); + }} + /> + + ))} + )} From 8318efe4806a37b7f9016a96cd6817c1e3f87df4 Mon Sep 17 00:00:00 2001 From: d0422 Date: Mon, 7 Oct 2024 09:58:51 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20mypage=EC=97=90=EC=84=9C=20=EB=82=B4?= =?UTF-8?q?=EC=97=AC=ED=96=89=EC=97=90=20=EB=8B=B4=EA=B8=B0=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=9E=91=EB=8F=99=ED=95=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/react-native/src/pages/Home/Detail.tsx | 7 ++++++- packages/react-native/src/routes/MyPageStackNavigator.tsx | 2 ++ packages/react-native/src/types/navigation.ts | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/react-native/src/pages/Home/Detail.tsx b/packages/react-native/src/pages/Home/Detail.tsx index 908f32bb..c3fca7fe 100644 --- a/packages/react-native/src/pages/Home/Detail.tsx +++ b/packages/react-native/src/pages/Home/Detail.tsx @@ -48,7 +48,12 @@ const Detail = withSuspense(() => { headerHeight - insets.top > 0 ? headerHeight - insets.top : 0; const handleAddPlan = () => { - navigation.navigate('Home/AddSpot', { + const currentRoute = route.name.split('/')[0]; + const nextRoute = `${currentRoute}/AddSpot` as + | 'Home/AddSpot' + | 'Mypage/AddSpot'; + + navigation.navigate(nextRoute, { spots: [ { contentId: Number(contentId), diff --git a/packages/react-native/src/routes/MyPageStackNavigator.tsx b/packages/react-native/src/routes/MyPageStackNavigator.tsx index adff025c..cb7a52fb 100644 --- a/packages/react-native/src/routes/MyPageStackNavigator.tsx +++ b/packages/react-native/src/routes/MyPageStackNavigator.tsx @@ -3,6 +3,7 @@ import MyPage from '@/pages/MyPage'; import EditProfile from '@/pages/MyPage/EditProfile'; import EditProfileWithNickname from '@/pages/MyPage/EditProfileWithNickname'; import Detail from '@/pages/Home/Detail'; +import HomeSpotAdd from '@/pages/Home/HomeSpotAdd'; const Stack = createStackNavigator(); @@ -19,6 +20,7 @@ export default function MyPageStackNavigator() { component={EditProfileWithNickname} /> + ); } diff --git a/packages/react-native/src/types/navigation.ts b/packages/react-native/src/types/navigation.ts index 8b31222b..a5b9825e 100644 --- a/packages/react-native/src/types/navigation.ts +++ b/packages/react-native/src/types/navigation.ts @@ -43,6 +43,9 @@ export type StackParamList = { 'MyPage/EditProfile': { nickname: string }; 'MyPage/EditProfileWithNickname': { nickname: string }; 'MyPage/Detail': { contentId: number; id: number; workId: number }; + 'Mypage/AddSpot': { + spots: SpotResponse[]; + }; 'Home/Main': undefined; 'Home/Search': { title: string };