From 65312aeb14d15295fd350aa320f72875c3cc0a11 Mon Sep 17 00:00:00 2001 From: HBSPS Date: Wed, 25 Sep 2024 19:54:23 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=EC=9D=BC=EC=A0=95=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=B2=AB=20=EC=9D=BC?= =?UTF-8?q?=EC=A0=95=20=EB=B2=88=ED=98=B8=200=EB=B2=88=EC=97=90=EC=84=9C?= =?UTF-8?q?=201=EB=B2=88=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/react-native/src/components/editPlan/ScheduleBlock.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native/src/components/editPlan/ScheduleBlock.tsx b/packages/react-native/src/components/editPlan/ScheduleBlock.tsx index 2fa06ac7..219401a1 100644 --- a/packages/react-native/src/components/editPlan/ScheduleBlock.tsx +++ b/packages/react-native/src/components/editPlan/ScheduleBlock.tsx @@ -27,7 +27,7 @@ export default function ScheduleBlock({ ) : ( - {order} + {order + 1} )} From 92e2274af25d2a35b7b1f6c4b4db0756aa06a8f7 Mon Sep 17 00:00:00 2001 From: HBSPS Date: Wed, 25 Sep 2024 20:55:45 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=EC=9E=A5=EC=86=8C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B2=84=ED=8A=BC=20=ED=81=B4=EB=A6=AD=20=EB=AC=B4?= =?UTF-8?q?=EB=B0=98=EC=9D=91=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/TripPlanner/AddSchedule.tsx | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/react-native/src/pages/TripPlanner/AddSchedule.tsx b/packages/react-native/src/pages/TripPlanner/AddSchedule.tsx index d727d2bd..54eb27a2 100644 --- a/packages/react-native/src/pages/TripPlanner/AddSchedule.tsx +++ b/packages/react-native/src/pages/TripPlanner/AddSchedule.tsx @@ -42,7 +42,10 @@ export default function AddSchedule() { style={{ gap: 15 }} onPress={() => setAddTYpe('new')} > - + setAddTYpe('new')} + /> 새 장소 추가하기 @@ -75,7 +78,10 @@ export default function AddSchedule() { style={{ gap: 15 }} onPress={() => setAddTYpe('prev')} > - + setAddTYpe('prev')} + /> 담은 SPOT!에서 선택하기 @@ -109,6 +115,13 @@ export default function AddSchedule() { selectedSpot?.type === 'mySpot' && selectedSpot.id === mySpot.contentId } + onPress={() => { + setSelectedSpot({ + type: 'mySpot', + id: mySpot.contentId, + }); + setLocationName(mySpot.title); + }} /> {mySpot.title} From 369340929ecac554a2f835554a2fad05c16a6aa1 Mon Sep 17 00:00:00 2001 From: HBSPS Date: Wed, 25 Sep 2024 20:59:13 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20SPOT=20=EC=97=AC=ED=96=89=EC=97=90?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80=20=EC=B2=B4=ED=81=AC=EB=B0=95=EC=8A=A4=20?= =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/react-native/src/components/tripPlan/TripPlanCard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native/src/components/tripPlan/TripPlanCard.tsx b/packages/react-native/src/components/tripPlan/TripPlanCard.tsx index 28f4fc1f..27f6083a 100644 --- a/packages/react-native/src/components/tripPlan/TripPlanCard.tsx +++ b/packages/react-native/src/components/tripPlan/TripPlanCard.tsx @@ -43,7 +43,7 @@ export default function TripPlanCard({ {isSelectionMode ? ( - + ) : ( From e5d96a50689f5c3fa5014413216bfe6d0c1777cf Mon Sep 17 00:00:00 2001 From: HBSPS Date: Wed, 25 Sep 2024 21:01:25 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=EC=97=AC=ED=96=89=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=EC=97=90=20=EC=B6=94=EA=B0=80=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=ED=94=8C=EB=A1=9C=ED=8C=85=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/react-native/src/pages/HomeSpotAdd.tsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/react-native/src/pages/HomeSpotAdd.tsx b/packages/react-native/src/pages/HomeSpotAdd.tsx index 2f8c68c3..1ba7d5d1 100644 --- a/packages/react-native/src/pages/HomeSpotAdd.tsx +++ b/packages/react-native/src/pages/HomeSpotAdd.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; import { Dimensions, View } from 'react-native'; -import { Button, FloatingPlusButton, Font } from 'design-system'; +import { Button, Font } from 'design-system'; import { useNavigation, useRoute } from '@react-navigation/native'; import useTripPlansQuery from '@/apis/queries/tripPlan/useTripPlansQuery'; import Header from '@/components/common/Header'; @@ -74,11 +74,6 @@ export default withSuspense(function HomeSpotAdd() { - navigation.navigate('TripPlanner/Post')} - /> ); });