Merge pull request chaechaeis#26 from doyoom/main

전체적정리 최종
miikii41 · Nov 15, 2024 · 83b4ee7 · 83b4ee7
2 parents af8f3b2 + d1e27b2
commit 83b4ee7
Show file tree

Hide file tree

Showing 4 changed files with 2,391 additions and 683 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/Home/Main/SeekerMainPage.tsx b/src/components/Home/Main/SeekerMainPage.tsx
@@ -37,7 +37,7 @@ const SeekerMainPage = () => {
       <View style={styles.buttonContainer}>
         <TouchableOpacity
           style={styles.button}
-          onPress={() => navigation.navigate('ClosetMain')}
+          onPress={() => navigation.navigate('AddCloset')}
         >
           <Icon name="wardrobe-outline" size={24} color="#333" />
           <Text style={styles.buttonText}>CLOSET</Text>
@@ -51,26 +51,23 @@ const SeekerMainPage = () => {
           <Text style={styles.buttonText}>캘린더</Text>
         </TouchableOpacity>
 
-        <TouchableOpacity
-          style={styles.button}
-          onPress={() => navigation.navigate('AddCloset')}
-        >
-          <Text style={styles.buttonText}>Add Closet</Text>
-        </TouchableOpacity>
-      </View>
 
-      <View style={styles.buttonContainer}>
-        <TouchableOpacity
-          style={styles.button}
-          onPress={() => navigation.navigate('RequestSent')}
-        >
-          <Text style={styles.buttonText}>request sent</Text>
-        </TouchableOpacity>
       </View>
+
+<View style={styles.buttonContainer}>
+  <TouchableOpacity
+    style={styles.singleButton} // 새로운 스타일을 적용
+    onPress={() => navigation.navigate('RequestSent')}
+  >
+    <Text style={styles.singleButtonText}>REQUEST SENT</Text>
+  </TouchableOpacity>
+</View>
     </View>
   );
 };
 
+
+
 const styles = StyleSheet.create({
   container: {
     flex: 1,
@@ -128,6 +125,20 @@ const styles = StyleSheet.create({
     color: '#333',
     marginLeft: 8,
   },
-});
+    singleButton: {
+      backgroundColor: '#e0e0e0',
+      padding: 15,
+      borderRadius: 10,
+      alignItems: 'center', // 텍스트를 버튼의 중앙에 배치
+      justifyContent: 'center', // 텍스트를 버튼의 중앙에 배치
+      width: '80%', // 원하는 버튼 크기 조정
+    },
+    singleButtonText: {
+      fontSize: 16,
+      fontWeight: 'bold',
+      color: '#333',
+      textAlign: 'center', // 텍스트 중앙 정렬
+    },
+  });
 
 export default SeekerMainPage;
diff --git a/src/components/Home/Request/RequestPage.tsx b/src/components/Home/Request/RequestPage.tsx
@@ -8,6 +8,7 @@ import BottomButton from '../../../common/BottomButton';
 const RequestPage = ({ route, navigation }: StackScreenProps<HomeStackParams, 'RequestPage'>) => {
   // RequestPage에서 전달된 데이터 가져오기
   const {
+  clothes = [],
     photos = [],
     selectedPlace,
     selectedSeason,