Merge branch 'main' into closet

miikii41 · Dec 4, 2024 · 005f79a · 005f79a
2 parents f7a8155 + eac49bb
commit 005f79a
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 75 deletions.
diff --git a/App.tsx b/App.tsx
@@ -75,13 +75,12 @@ function SetterNavigator() {
       <Stack.Screen name="RequestApproval" component={RequestApproval} />
       <Stack.Screen name="RequestAccepted" component={RequestAccepted} />
       <Stack.Screen name="ClosetMain" component={ClosetMain} />
+        <Stack.Screen name="AddCloset" component={AddCloset} />
       <Stack.Screen name="InitialLogin" component={InitialLogin} />
-
       <Stack.Screen name="ChatDetail" component={ChatDetail} />
             <Stack.Screen name="ChatList" component={ChatList} />
             <Stack.Screen name="DoraCloset" component={DoraCloset} />
 
-
       <Stack.Screen name="MatchingPage" component={MatchingPage} />
 
     </Stack.Navigator>

diff --git a/src/components/Chat/ChatDetail.tsx b/src/components/Chat/ChatDetail.tsx
@@ -78,6 +78,9 @@ const ChatDetail = ({ route }) => {
         <TouchableOpacity
         onPress={() => navigation.navigate('DoraCloset')} >
 
+        onPress={() => navigation.navigate('AddCloset')} >
+
+
           <Image
             source={require('../../assets/Closet/hanger.png')}
             style={styles.hangerImage}

diff --git a/src/components/Closet/AddCloset.tsx b/src/components/Closet/AddCloset.tsx
@@ -76,7 +76,10 @@ const AddCloset = () => {
 
   return (
     <View style={styles.container}>
-      <Text style={styles.title}>ADD TO CLOSET</Text>
+      <Text style={styles.title}>Dora의 옷장</Text>
+
+        <View style={{ paddingHorizontal: 45, paddingVertical: 5 }}>
+        </View>
 
       {/* 카테고리 버튼 */}
       <View style={styles.categoryContainer}>

diff --git a/src/components/Home/Main/SetterMainPage.tsx b/src/components/Home/Main/SetterMainPage.tsx
@@ -111,72 +111,72 @@ const styles = StyleSheet.create({
     marginBottom: 20,
   },
   button: {
-    backgroundColor: '#ff69b4', // 핑크 배경
-    paddingVertical: 15,
-    paddingHorizontal: 20,
-    borderRadius: 12,
-    alignItems: 'center',
-    justifyContent: 'center',
-    flexDirection: 'row',
-    shadowColor: '#000',
-    shadowOffset: { width: 0, height: 2 },
-    shadowOpacity: 0.2,
-    shadowRadius: 4,
-    elevation: 5,
-    width: '80%',
-  },
-  buttonText: {
-    fontSize: 16,
-    fontWeight: 'bold',
-    color: '#fff',
-  },
-  singleButtonContainer: {
-    alignItems: 'center',
-    width: '80%',
-    marginTop: 10,
-  },
-  singleButton: {
-    backgroundColor: '#555',
-    paddingVertical: 15,
-    borderRadius: 12,
-    alignItems: 'center',
-    justifyContent: 'center',
-    width: '80%',
-    shadowColor: '#000',
-    shadowOffset: { width: 0, height: 2 },
-    shadowOpacity: 0.2,
-    shadowRadius: 4,
-    elevation: 5,
-  },
-  singleButtonText: {
-    fontSize: 16,
-    fontWeight: 'bold',
-    color: '#fff',
-  },
-  hiddenButton: {
-    display: 'none',
-  },
-  iconWrapper: {
-    width: 24,
-    height: 24,
-    borderRadius: 12,
-    backgroundColor: '#ff69b4',
-    alignItems: 'center',
-    justifyContent: 'center',
-    marginRight: 5,
-  },
-progressWrapper: {
-    position: 'relative', // 부모 요소를 기준으로 자식 요소 겹치기
-    alignItems: 'center',
-    justifyContent: 'center',
-    marginTop: 10,
-  },
-  progressText: {
-    position: 'absolute', // 부모 뷰의 중앙에 배치
-    fontSize: 18, // 텍스트 크기
-    fontWeight: 'bold', // 굵은 텍스트
-    color: '#ff69b4', // 핑크 텍스트
-  },
-});
+     backgroundColor: '#ffe4e9', // 더 부드러운 핑크 배경
+     paddingVertical: 15,
+     paddingHorizontal: 20,
+     borderRadius: 12,
+     alignItems: 'center',
+     justifyContent: 'center',
+     flexDirection: 'row',
+     shadowColor: '#000',
+     shadowOffset: { width: 0, height: 2 },
+     shadowOpacity: 0.2,
+     shadowRadius: 4,
+     elevation: 5,
+     width: '80%',
+   },
+   buttonText: {
+     fontSize: 16,
+     fontWeight: 'bold',
+     color: '#333', // 더 부드러운 텍스트 색상
+   },
+   singleButtonContainer: {
+     alignItems: 'center',
+     width: '80%',
+     marginTop: 10,
+   },
+   singleButton: {
+     backgroundColor: '#d9d9d9', // 더 부드러운 회색
+     paddingVertical: 15,
+     borderRadius: 12,
+     alignItems: 'center',
+     justifyContent: 'center',
+     width: '80%',
+     shadowColor: '#000',
+     shadowOffset: { width: 0, height: 2 },
+     shadowOpacity: 0.2,
+     shadowRadius: 4,
+     elevation: 5,
+   },
+   singleButtonText: {
+     fontSize: 16,
+     fontWeight: 'bold',
+     color: '#333', // 텍스트 색상 유지
+   },
+   hiddenButton: {
+     display: 'none',
+   },
+   iconWrapper: {
+     width: 24,
+     height: 24,
+     borderRadius: 12,
+     backgroundColor: '#ffe4e9', // 부드러운 핑크
+     alignItems: 'center',
+     justifyContent: 'center',
+     marginRight: 5,
+   },
+   progressWrapper: {
+     position: 'relative', // 부모 요소를 기준으로 자식 요소 겹치기
+     alignItems: 'center',
+     justifyContent: 'center',
+     marginTop: 10,
+   },
+   progressText: {
+     position: 'absolute', // 부모 뷰의 중앙에 배치
+     fontSize: 18, // 텍스트 크기
+     fontWeight: 'bold', // 굵은 텍스트
+     color: '#ff69b4', // 핑크 텍스트
+   },
+ });
 
 export default SetterMainPage;
diff --git a/src/components/Home/MyPage/MyPageTabView.tsx b/src/components/Home/MyPage/MyPageTabView.tsx
@@ -12,7 +12,7 @@ import PortfolioPage from './PortfolioPage';
 import Review from './Review';
 
 export const ProfileSection = ({ navigation }: { navigation: any }) => {
-  const UserName = '세터';
+  const UserName = 'fashionlover';
   const instagramURL = 'https://www.instagram.com/fashion_seek_/?utm_source=ig_web_button_share_sheet';
   const blogURL = 'https://section.blog.naver.com/BlogHome.naver?directoryNo=0&currentPage=1&groupId=0';
 

diff --git a/src/components/Home/Request/RequestApproval.tsx b/src/components/Home/Request/RequestApproval.tsx
@@ -7,10 +7,10 @@ const RequestApproval = () => {
 
   // 이름과 해시태그 데이터
   const hashtags = [
-    "   Dora #학교 #발표 #비즈니스",
+    "Dora #학교 #발표 #비즈니스",
     "Ariana #비즈니스 #회사 #미니멀",
-    " Minki #친구 #여행 #캐쥬얼",
-    " Sabrina #친구 #공원 #스트리트"
+    "Minki #친구 #여행 #캐쥬얼",
+    "Sabrina #친구 #공원 #스트리트"
   ];
 
   return (

diff --git a/src/components/Home/Request/RequestStyle.tsx b/src/components/Home/Request/RequestStyle.tsx
@@ -370,7 +370,7 @@ const styles = StyleSheet.create({
     false: '#fff', // 스위치가 꺼졌을 때 thumb 색상
   },
   bottomButton: {
-    backgroundColor: '#f5c6d5', // 부드러운 핑크색 (다음 버튼)
+    backgroundColor: '#ffe4e9', // 부드러운 핑크색 (다음 버튼)
     paddingVertical: 15,
     borderRadius: 10,
     alignItems: 'center',