diff --git a/packages/react-native/src/assets/landing/landing1.png b/packages/react-native/src/assets/landing/landing1.png
index 534ea049..3106d0e7 100644
Binary files a/packages/react-native/src/assets/landing/landing1.png and b/packages/react-native/src/assets/landing/landing1.png differ
diff --git a/packages/react-native/src/assets/landing/landing2.png b/packages/react-native/src/assets/landing/landing2.png
index e06f202c..8ead2604 100644
Binary files a/packages/react-native/src/assets/landing/landing2.png and b/packages/react-native/src/assets/landing/landing2.png differ
diff --git a/packages/react-native/src/assets/landing/landing3.png b/packages/react-native/src/assets/landing/landing3.png
index e4b218f0..2d76bd81 100644
Binary files a/packages/react-native/src/assets/landing/landing3.png and b/packages/react-native/src/assets/landing/landing3.png differ
diff --git a/packages/react-native/src/assets/landing/landing4.png b/packages/react-native/src/assets/landing/landing4.png
index b0657913..4c957772 100644
Binary files a/packages/react-native/src/assets/landing/landing4.png and b/packages/react-native/src/assets/landing/landing4.png differ
diff --git a/packages/react-native/src/assets/landing/landing5.png b/packages/react-native/src/assets/landing/landing5.png
index e379a469..9bf6d763 100644
Binary files a/packages/react-native/src/assets/landing/landing5.png and b/packages/react-native/src/assets/landing/landing5.png differ
diff --git a/packages/react-native/src/assets/landing/landing6.png b/packages/react-native/src/assets/landing/landing6.png
index 7c682e0b..2b4a2406 100644
Binary files a/packages/react-native/src/assets/landing/landing6.png and b/packages/react-native/src/assets/landing/landing6.png differ
diff --git a/packages/react-native/src/assets/landing/landing7.png b/packages/react-native/src/assets/landing/landing7.png
index 4e3fb162..e71b425e 100644
Binary files a/packages/react-native/src/assets/landing/landing7.png and b/packages/react-native/src/assets/landing/landing7.png differ
diff --git a/packages/react-native/src/assets/plan.png b/packages/react-native/src/assets/plan.png
index c741d4af..62ffa18d 100644
Binary files a/packages/react-native/src/assets/plan.png and b/packages/react-native/src/assets/plan.png differ
diff --git a/packages/react-native/src/pages/Home.tsx b/packages/react-native/src/pages/Home.tsx
index ff0506ac..5af4c0e9 100644
--- a/packages/react-native/src/pages/Home.tsx
+++ b/packages/react-native/src/pages/Home.tsx
@@ -42,13 +42,14 @@ export default withSuspense(function Home({ navigation }: HomeScreenProps) {
renderItem={({ item }) => }
/>
+ {/* FIXME: 추후 주석 제거
}
/>
-
+ */}
);
diff --git a/packages/react-native/src/pages/Landing/Landing1.tsx b/packages/react-native/src/pages/Landing/Landing1.tsx
index 00991356..0e813c45 100644
--- a/packages/react-native/src/pages/Landing/Landing1.tsx
+++ b/packages/react-native/src/pages/Landing/Landing1.tsx
@@ -1,7 +1,9 @@
import { Font } from 'design-system';
-import { Image, View } from 'react-native';
+import { Dimensions, Image, View } from 'react-native';
import WordBreak from '@/components/common/WordBreak';
+const { width } = Dimensions.get('window');
+
export default function Landing1() {
return (
@@ -23,8 +25,12 @@ export default function Landing1() {
/>
- {/* eslint-disable-next-line global-require */}
-
+
);
diff --git a/packages/react-native/src/pages/Landing/Landing2.tsx b/packages/react-native/src/pages/Landing/Landing2.tsx
index f1a8126d..92c48463 100644
--- a/packages/react-native/src/pages/Landing/Landing2.tsx
+++ b/packages/react-native/src/pages/Landing/Landing2.tsx
@@ -1,7 +1,9 @@
import { Font } from 'design-system';
-import { Image, View } from 'react-native';
+import { Dimensions, Image, View } from 'react-native';
import WordBreak from '@/components/common/WordBreak';
+const { width } = Dimensions.get('window');
+
export default function Landing2() {
return (
@@ -25,8 +27,12 @@ export default function Landing2() {
/>
- {/* eslint-disable-next-line global-require */}
-
+
);
diff --git a/packages/react-native/src/pages/Landing/Landing3.tsx b/packages/react-native/src/pages/Landing/Landing3.tsx
index c556ac5b..9f90fb7d 100644
--- a/packages/react-native/src/pages/Landing/Landing3.tsx
+++ b/packages/react-native/src/pages/Landing/Landing3.tsx
@@ -1,7 +1,9 @@
import { Font } from 'design-system';
-import { Image, View } from 'react-native';
+import { Dimensions, Image, View } from 'react-native';
import WordBreak from '@/components/common/WordBreak';
+const { width } = Dimensions.get('window');
+
export default function Landing3() {
return (
@@ -18,8 +20,12 @@ export default function Landing3() {
- {/* eslint-disable-next-line global-require */}
-
+
);
diff --git a/packages/react-native/src/pages/Landing/Landing4.tsx b/packages/react-native/src/pages/Landing/Landing4.tsx
index 072bd3a1..e5295f88 100644
--- a/packages/react-native/src/pages/Landing/Landing4.tsx
+++ b/packages/react-native/src/pages/Landing/Landing4.tsx
@@ -1,7 +1,9 @@
import { Font } from 'design-system';
-import { Image, View } from 'react-native';
+import { Dimensions, Image, View } from 'react-native';
import WordBreak from '@/components/common/WordBreak';
+const { width } = Dimensions.get('window');
+
export default function Landing4() {
return (
@@ -24,8 +26,12 @@ export default function Landing4() {
- {/* eslint-disable-next-line global-require */}
-
+
);
diff --git a/packages/react-native/src/pages/Landing/Landing5.tsx b/packages/react-native/src/pages/Landing/Landing5.tsx
index b2c71068..5aeeffed 100644
--- a/packages/react-native/src/pages/Landing/Landing5.tsx
+++ b/packages/react-native/src/pages/Landing/Landing5.tsx
@@ -1,7 +1,9 @@
import { Font } from 'design-system';
-import { Image, View } from 'react-native';
+import { Dimensions, Image, View } from 'react-native';
import WordBreak from '@/components/common/WordBreak';
+const { width } = Dimensions.get('window');
+
export default function Landing5() {
return (
@@ -24,8 +26,12 @@ export default function Landing5() {
- {/* eslint-disable-next-line global-require */}
-
+
);
diff --git a/packages/react-native/src/pages/Landing/Landing6.tsx b/packages/react-native/src/pages/Landing/Landing6.tsx
index c81c9d08..4dc6e770 100644
--- a/packages/react-native/src/pages/Landing/Landing6.tsx
+++ b/packages/react-native/src/pages/Landing/Landing6.tsx
@@ -1,7 +1,9 @@
import { Font } from 'design-system';
-import { Image, View } from 'react-native';
+import { Dimensions, Image, View } from 'react-native';
import WordBreak from '@/components/common/WordBreak';
+const { width } = Dimensions.get('window');
+
export default function Landing6() {
return (
@@ -24,8 +26,12 @@ export default function Landing6() {
- {/* eslint-disable-next-line global-require */}
-
+
);
diff --git a/packages/react-native/src/pages/Landing/Landing7.tsx b/packages/react-native/src/pages/Landing/Landing7.tsx
index 654ffcd0..1798f172 100644
--- a/packages/react-native/src/pages/Landing/Landing7.tsx
+++ b/packages/react-native/src/pages/Landing/Landing7.tsx
@@ -1,7 +1,9 @@
import { Font } from 'design-system';
-import { Image, View } from 'react-native';
+import { Dimensions, Image, View } from 'react-native';
import WordBreak from '@/components/common/WordBreak';
+const { width } = Dimensions.get('window');
+
export default function Landing7() {
return (
@@ -23,8 +25,12 @@ export default function Landing7() {
/>
- {/* eslint-disable-next-line global-require */}
-
+
);
diff --git a/packages/react-native/src/pages/TOS.tsx b/packages/react-native/src/pages/TOS.tsx
index 1bba411f..cf79a285 100644
--- a/packages/react-native/src/pages/TOS.tsx
+++ b/packages/react-native/src/pages/TOS.tsx
@@ -20,10 +20,17 @@ export default function TOS() {
const [selectedAgree, setSelectedAgree] = useState();
const navigation = useNavigation>();
+ const selectedAll = agree.TOS && agree.marketing && agree.privacyCollection;
+
const toggleAgree = (agreeType: keyof Agree) => {
setAgree((prev) => ({ ...prev, [agreeType]: !prev[agreeType] }));
};
+ const toggleAll = () => {
+ if (selectedAll) setAgree({});
+ else setAgree({ TOS: true, marketing: true, privacyCollection: true });
+ };
+
const isInValid = !agree.TOS || !agree.privacyCollection;
const handlePressButton = () => {
@@ -92,11 +99,9 @@ export default function TOS() {
setAgree({})}
+ onPress={toggleAll}
/>
diff --git a/packages/react-native/src/pages/TripPlanner/TripPlannerDetail.tsx b/packages/react-native/src/pages/TripPlanner/TripPlannerDetail.tsx
index 760241b9..113938a6 100644
--- a/packages/react-native/src/pages/TripPlanner/TripPlannerDetail.tsx
+++ b/packages/react-native/src/pages/TripPlanner/TripPlannerDetail.tsx
@@ -11,6 +11,7 @@ import { getDisplayRegion } from '@/utils/getDisplayRegionName';
import AroundCard from '@/components/detail/AroundCard';
import SpotDetailBottomSheet from '@/components/common/SpotDetailBottomSheet';
import useTripPlanMySpotQuery from '@/apis/queries/tripPlan/useTripPlanMySpotQuery';
+import Spacing from '@/components/common/Spacing';
export default withSuspense(function TripPlannerDetail() {
const route = useRoute>();
@@ -35,62 +36,72 @@ export default withSuspense(function TripPlannerDetail() {
})}
-
-
+
+
+
+
+ 일정
+
+
navigation.navigate('TripPlanner/EditPlan', { tripId })
}
>
- {/* eslint-disable-next-line global-require */}
-
+
+
- {data.restaurant.length > 0 && (
- (
- setSelectedSpot(item.contentId)}
- />
- )}
- />
- )}
- {data.attraction.length > 0 && (
- (
- setSelectedSpot(item.contentId)}
- />
- )}
- />
- )}
- {data.accommodation.length > 0 && (
- (
- setSelectedSpot(item.contentId)}
- />
- )}
- />
- )}
+ (
+ setSelectedSpot(item.contentId)}
+ />
+ )}
+ />
+ {data.restaurant.length === 0 && }
+
+ (
+ setSelectedSpot(item.contentId)}
+ />
+ )}
+ />
+ {data.attraction.length === 0 && }
+
+ (
+ setSelectedSpot(item.contentId)}
+ />
+ )}
+ />
+ {data.accommodation.length === 0 && }
+