diff --git a/App/FollowApp/asset/img/.img b/App/FollowApp/asset/img/.img deleted file mode 100644 index e69de29..0000000 diff --git a/App/FollowApp/src/screens/MyCloset/Image/12.png b/App/FollowApp/asset/img/MyCloset/profile.png similarity index 100% rename from App/FollowApp/src/screens/MyCloset/Image/12.png rename to App/FollowApp/asset/img/MyCloset/profile.png diff --git a/App/FollowApp/src/context/MySelectionContext.js b/App/FollowApp/src/context/MySelectionContext.js index bb06ddc..fbddd92 100644 --- a/App/FollowApp/src/context/MySelectionContext.js +++ b/App/FollowApp/src/context/MySelectionContext.js @@ -3,8 +3,12 @@ import React, {useState, createContext} from 'react'; const MySelectionContext = createContext({ state: {top: '', bottom: ''}, actions: { - setTop: () => {}, - setBottom: () => {}, + setTop: () => { + // this is intentional + }, + setBottom: () => { + // this is intentional + }, }, }); diff --git a/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js b/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js index 33f8ddb..237bae6 100644 --- a/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js +++ b/App/FollowApp/src/screens/MyCloset/MyClosetScreen.js @@ -1,76 +1,67 @@ import React from 'react'; import {StyleSheet, View, Image, Text, TouchableOpacity} from 'react-native'; +import styled from 'styled-components'; function MyClosetScreen({navigation}) { return ( - + - + + + - - 주돌이 - + 주돌이 - - jkworldchampion@gamil.com - + jkworldchampion@gamil.com navigation.navigate('MyClothes')}> - MyCloth + MyCloth navigation.navigate('MyLook')}> - MyLook + MyLook navigation.navigate('MyAvatar')}> - MyAvatar + MyAvatar navigation.navigate('TryOn')}> - TryOn + TryOn ); } +const ProfileContainer = styled.View` + top: 0; + left: 0; + right: 0; + bottom: 0; + align-items: center; + justify-content: center; +`; +const ProfileImage = styled.Image` + width: 110px; + height: 110px; + position: absolute; +`; + const styles = StyleSheet.create({ - container: { - width: 110, - height: 110, - position: 'absolute', - marginTop: 100, - marginLeft: 140, - }, - BoxButton: { + boxButton: { justifyContent: 'flex-start', backgroundColor: 'black', padding: 0, @@ -79,17 +70,31 @@ const styles = StyleSheet.create({ width: 170, height: 150, }, - upbox: { + upBox: { width: '100%', height: '10%', backgroundColor: 'black', }, - Boxtext: { + boxText: { fontSize: 16.5, textAlign: 'center', marginTop: 60, color: 'white', }, + nameText: { + marginTop: 60, + textAlign: 'center', + fontWeight: 'bold', + fontSize: 20, + color: 'black', + }, + emailText: { + marginTop: 10, + textAlign: 'center', + fontWeight: 'normal', + fontSize: 15, + color: 'black', + }, }); export default MyClosetScreen;