merge: qa 1002 (#103)

merge: qa 1002 (#103)

packages/design-system/src/TextField.tsx

@@ -12,6 +12,7 @@ interface TextField {
   withoutBorder?: boolean;
   isTitle?: boolean;
   style?: StyleProp<TextStyle>;
+  maxLength?: number;
 }
 
 export function TextField({
@@ -26,6 +27,7 @@ export function TextField({
   withoutBorder = false,
   isTitle = false,
   style,
+  maxLength,
 }: TextField) {
   const defaultClassName = 'text-SPOT-white text-body2 rounded-md p-4';
   const incorrectClassName = 'border-SPOT-red border-[2px]';
@@ -46,13 +48,17 @@ export function TextField({
       value={value}
       onChangeText={onChange}
       placeholder={placeholder}
-      placeholderTextColor='#ffffff'
+      placeholderTextColor="#ffffff"
       className={`${defaultClassName} ${border} ${getBorderClassName()}`}
       onSubmitEditing={onSubmit}
+      maxLength={maxLength}
       numberOfLines={Platform.OS === 'ios' ? undefined : numberOfLines}
       style={[
         {
-          minHeight: Platform.OS === 'ios' && numberOfLines && numberOfLines ? 30 * numberOfLines : undefined,
+          minHeight:
+            Platform.OS === 'ios' && numberOfLines && numberOfLines
+              ? 30 * numberOfLines
+              : undefined,
           backgroundColor: bgColor,
           fontSize: isTitle ? 22 : undefined,
           lineHeight: isTitle ? 30 : undefined,

packages/react-native/src/apis/queries/mypage/useMyBadgeQuery.ts

@@ -3,7 +3,6 @@ import useAuthAxios from '@/apis/useAuthAxios';
 import { BADGE_MAPPER, Region } from '@/constants/CITY';
 import QUERY_KEYS from '@/constants/QUERY_KEYS';
 import { ServerResponse } from '@/types/response';
-import unique from '@/utils/unique';
 import { badgePath } from '@/components/common/Badge';
 
 interface BadgeResponse {

packages/react-native/src/components/camera/FilterCarousel.tsx

@@ -5,7 +5,7 @@ import Animated, {
   interpolate,
   useAnimatedStyle,
 } from 'react-native-reanimated';
-import FILTER_PATHS from '@/constants/FILTER_PATHS';
+import { THUMBNAIL_PATHS } from '@/constants/FILTER_PATHS';
 
 const { width } = Dimensions.get('window');
 
@@ -18,7 +18,7 @@ interface FilterCarouselProps {
 }
 
 interface FilterItemProps {
-  item: (typeof FILTER_PATHS)[number];
+  item: (typeof THUMBNAIL_PATHS)[number];
   animationValue: Animated.SharedValue<number>;
   onPress: () => void;
 }
@@ -76,7 +76,7 @@ function FilterCarousel({
   handleSnap,
 }: FilterCarouselProps) {
   const carouselRef = useRef<ICarouselInstance>(null);
-  const experienceFilterLength = FILTER_PATHS.length;
+  const experienceFilterLength = THUMBNAIL_PATHS.length;
 
   const snapToIndex = (index: number) => {
     const moveMent = Math.abs(filterIndex - index);
@@ -119,7 +119,7 @@ function FilterCarousel({
           : experienceFilterLength - 2 + filterIndex
       }
       scrollAnimationDuration={500}
-      data={FILTER_PATHS}
+      data={THUMBNAIL_PATHS}
       onSnapToItem={(index) => {
         handleSnap((index + 2) % experienceFilterLength);
       }}

packages/react-native/src/components/editPlan/EditPlanTitle.tsx

@@ -1,6 +1,5 @@
 import { Font } from 'design-system';
-import { View, TouchableOpacity } from 'react-native';
-import BackIcon from '@/assets/BackIcon';
+import { View } from 'react-native';
 import { City, Region } from '@/constants/CITY';
 import { getDateString } from '@/utils/date';
 import { getDisplayRegion } from '@/utils/getDisplayRegionName';
@@ -24,9 +23,6 @@ export default function EditPlanTitle({
         className="items-center justify-center flex-row"
         style={{ gap: 30 }}
       >
-        <TouchableOpacity className="p-2">
-          <BackIcon />
-        </TouchableOpacity>
         <View className="items-center">
           <Font.Bold type="title1" color="white">
             {getDisplayRegion({
@@ -40,9 +36,6 @@ export default function EditPlanTitle({
             {getDateString(endDate, '.')}
           </Font.Light>
         </View>
-        <TouchableOpacity className="rotate-180 p-2">
-          <BackIcon />
-        </TouchableOpacity>
       </View>
     </View>
   );

packages/react-native/src/components/home/contents/SetJetting.tsx

@@ -1,6 +1,5 @@
 import { Font } from 'design-system';
 import { Image, ImageSourcePropType, View } from 'react-native';
-import ContentImage from '../ContentImage';
 import SetJettingContent from '../SetJettingContent';
 
 interface SetJettingContent {

packages/react-native/src/components/maps/RecordFormDescription.tsx

@@ -17,6 +17,7 @@ export default function RecordFormDescription() {
           value={description}
           onChange={handleDescriptionChange}
           placeholder="내용을 작성해주세요."
+          maxLength={255}
         />
       </View>
     </View>

packages/react-native/src/components/maps/RecordFormTitle.tsx

@@ -16,6 +16,7 @@ export default function RecordFormTitle() {
           value={title}
           onChange={handleTitleChange}
           placeholder="제목"
+          maxLength={255}
         />
         <View className="w-full justify-center items-end mt-2.5">
           <Font

packages/react-native/src/constants/FILTER_PATHS.ts

@@ -1,16 +1,47 @@
-/* eslint-disable global-require */
-
-const FILTER_PATHS = [
-  require('../assets/filters/dokkaebi1.png'),
-  require('../assets/filters/dokkaebi2.png'),
-  require('../assets/filters/dongbaekkkotPilMuryeop1.png'),
-  require('../assets/filters/dongbaekkkotPilMuryeop2.png'),
-  require('../assets/filters/mrSunshine.png'),
-  require('../assets/filters/saranguiBulsiChak1.png'),
-  require('../assets/filters/saranguiBulsiChak2.png'),
-  require('../assets/filters/seumuldaseotSeumulHana1.png'),
-  require('../assets/filters/seumuldaseotSeumulHana2.png'),
-  require('../assets/filters/itaewonClass.png'),
+const FILTER_FULL_PATHS = [
+  {
+    filter: require('../assets/filters/dokkaebi1.png'),
+    thumbnail: require('../assets/filters/thumb_dokkaebi1.png'),
+  },
+  {
+    filter: require('../assets/filters/dokkaebi2.png'),
+    thumbnail: require('../assets/filters/thumb_dokkaebi2.png'),
+  },
+  {
+    filter: require('../assets/filters/dongbaekkkotPilMuryeop1.png'),
+    thumbnail: require('../assets/filters/thumb_dongbaekkkotPilMuryeop1.png'),
+  },
+  {
+    filter: require('../assets/filters/dongbaekkkotPilMuryeop2.png'),
+    thumbnail: require('../assets/filters/thumb_dongbaekkkotPilMuryeop2.png'),
+  },
+  {
+    filter: require('../assets/filters/mrSunshine.png'),
+    thumbnail: require('../assets/filters/thumb_mrSunshine.png'),
+  },
+  {
+    filter: require('../assets/filters/saranguiBulsiChak1.png'),
+    thumbnail: require('../assets/filters/thumb_saranguiBulsiChak1.png'),
+  },
+  {
+    filter: require('../assets/filters/saranguiBulsiChak2.png'),
+    thumbnail: require('../assets/filters/thumb_saranguiBulsiChak2.png'),
+  },
+  {
+    filter: require('../assets/filters/seumuldaseotSeumulHana1.png'),
+    thumbnail: require('../assets/filters/thumb_seumuldaseotSeumulHana1.png'),
+  },
+  {
+    filter: require('../assets/filters/seumuldaseotSeumulHana2.png'),
+    thumbnail: require('../assets/filters/thumb_seumuldaseotSeumulHana2.png'),
+  },
+  {
+    filter: require('../assets/filters/itaewonClass.png'),
+    thumbnail: require('../assets/filters/thumb_itaewonClass.png'),
+  },
 ];
 
-export default FILTER_PATHS;
+const FILTER_PATHS = FILTER_FULL_PATHS.map((item) => item.filter);
+const THUMBNAIL_PATHS = FILTER_FULL_PATHS.map((item) => item.thumbnail);
+
+export { FILTER_PATHS, THUMBNAIL_PATHS };

packages/react-native/src/pages/CameraPage.tsx

@@ -7,7 +7,7 @@ import useGallery from '@/hooks/useGallery';
 import CheckPhoto from '@/components/camera/CheckPhoto';
 import SpotCamera from '@/components/camera/SpotCamera';
 import { StackRouteProps } from '@/types/navigation';
-import FILTER_PATHS from '@/constants/FILTER_PATHS';
+import { FILTER_PATHS } from '@/constants/FILTER_PATHS';
 import FilterCarousel from '@/components/camera/FilterCarousel';
 
 export default function CameraPage() {

packages/react-native/src/pages/Landing/Landing1.tsx

@@ -30,7 +30,6 @@ export default function Landing1() {
         }}
       >
         <Image
-          // eslint-disable-next-line global-require
           source={require('../../assets/landing/landing1.png')}
           style={{
             width,

packages/react-native/src/pages/Landing/Landing2.tsx

@@ -31,7 +31,6 @@ export default function Landing2() {
         }}
       >
         <Image
-          // eslint-disable-next-line global-require
           source={require('../../assets/landing/landing2.png')}
           style={{ width, height: undefined, aspectRatio: 2.9 / 5 }}
           resizeMode="contain"

packages/react-native/src/pages/Landing/Landing3.tsx

@@ -25,7 +25,6 @@ export default function Landing3() {
         }}
       >
         <Image
-          // eslint-disable-next-line global-require
           source={require('../../assets/landing/landing3.png')}
           style={{ width, height: undefined, aspectRatio: 2.9 / 5 }}
           resizeMode="contain"

packages/react-native/src/pages/Landing/Landing4.tsx

@@ -31,7 +31,6 @@ export default function Landing4() {
         }}
       >
         <Image
-          // eslint-disable-next-line global-require
           source={require('../../assets/landing/landing4.png')}
           style={{ width, height: undefined, aspectRatio: 2.9 / 5 }}
           resizeMode="contain"

packages/react-native/src/pages/Landing/Landing5.tsx

@@ -31,7 +31,6 @@ export default function Landing5() {
         }}
       >
         <Image
-          // eslint-disable-next-line global-require
           source={require('../../assets/landing/landing5.png')}
           style={{ width, height: undefined, aspectRatio: 2.9 / 5 }}
           resizeMode="contain"

packages/react-native/src/pages/Landing/Landing6.tsx

@@ -31,7 +31,6 @@ export default function Landing6() {
         }}
       >
         <Image
-          // eslint-disable-next-line global-require
           source={require('../../assets/landing/landing6.png')}
           style={{ width, height: undefined, aspectRatio: 2.9 / 5 }}
           resizeMode="contain"

packages/react-native/src/pages/Landing/Landing7.tsx

@@ -30,7 +30,6 @@ export default function Landing7() {
         }}
       >
         <Image
-          // eslint-disable-next-line global-require
           source={require('../../assets/landing/landing7.png')}
           style={{ width, height: undefined, aspectRatio: 2.9 / 5 }}
           resizeMode="contain"

packages/react-native/src/pages/Maps/Maps.tsx

@@ -217,7 +217,7 @@ export default withSuspense(function Maps({ navigation }: MapsMainProps) {
                   }}
                 >
                   <Font type="title1" color="black">
-                    로그보기
+                    여행기록보기
                   </Font>
                 </TouchableOpacity>
               </View>

packages/react-native/src/pages/TripPlanner/TripPlannerDetail.tsx

@@ -1,6 +1,6 @@
 import { useState } from 'react';
-import { Image, ScrollView, TouchableOpacity, View } from 'react-native';
-import { Font } from 'design-system';
+import { ScrollView, TouchableOpacity, View } from 'react-native';
+import { Button, Font } from 'design-system';
 import { useNavigation, useRoute } from '@react-navigation/native';
 import CardSlider from '@/components/common/CardSlider';
 import Header from '@/components/common/Header';
@@ -52,22 +52,6 @@ export default withSuspense(function TripPlannerDetail() {
       <View className="rounded-t-2xl bg-SPOT-white flex-1 mt-5 ">
         <Spacing height={10} />
         <ScrollView className="px-5 flex-1 ">
-          <Font.Bold type="body1" color="black">
-            나의 일정
-          </Font.Bold>
-          <Spacing height={10} />
-          <TouchableOpacity
-            className="rounded-md overflow-hidden"
-            onPress={() =>
-              navigation.navigate('TripPlanner/EditPlan', { tripId })
-            }
-          >
-            <Image
-              // eslint-disable-next-line global-require
-              source={require('../../assets/plan.png')}
-              style={{ width: 'auto', height: undefined, aspectRatio: 5 / 2 }}
-            />
-          </TouchableOpacity>
           <Spacing height={10} />
           <View>
             <CardSlider
@@ -120,6 +104,17 @@ export default withSuspense(function TripPlannerDetail() {
             <Spacing height={10} />
           </View>
         </ScrollView>
+        <View className="bg-SPOT-white py-4 px-4">
+          <Button
+            onPress={() =>
+              navigation.navigate('TripPlanner/EditPlan', { tripId })
+            }
+          >
+            <Font.Bold type="title1" color="white">
+              일정 보기
+            </Font.Bold>
+          </Button>
+        </View>
       </View>
       <SpotDetailBottomSheet
         selectedDetailSpotId={selectedSpot}