diff --git a/src/assets/svg.js b/src/assets/svg.js index b086a98..9101a57 100644 --- a/src/assets/svg.js +++ b/src/assets/svg.js @@ -114,10 +114,10 @@ export const svgXml = { `, search: ` - - - - + + + + `, persent: ` diff --git a/src/components/Header.js b/src/components/Header.js index 58121b5..5b5b692 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -41,7 +41,8 @@ export default function Header(props) { style={{ color: COLOR_WHITE, fontSize: 16, - fontWeight: 'bold', + // fontWeight: 'bold', + fontFamily: 'NanumSquareRoundB', textAlign: 'center', }}> {title} diff --git a/src/components/ListModal.js b/src/components/ListModal.js index 4af3573..833f903 100644 --- a/src/components/ListModal.js +++ b/src/components/ListModal.js @@ -147,15 +147,15 @@ const styles = StyleSheet.create({ listButton: { // backgroundColor: 'blue', padding: 8, - paddingHorizontal: 16, + paddingHorizontal: 0, }, buttonText: { - fontSize: 12, + fontSize: 13, color: COLOR_TEXT_BLACK, fontWeight: 'normal', }, buttonText2: { - fontSize: 12, + fontSize: 13, color: '#A4D65E', fontWeight: 'normal', }, diff --git a/src/components/MapDart.js b/src/components/MapDart.js index 0b4a945..92ec988 100644 --- a/src/components/MapDart.js +++ b/src/components/MapDart.js @@ -73,6 +73,7 @@ const styles = StyleSheet.create({ dart: { padding: 3, alignItems: 'center', + fontFamily: 'NanumSquareRoundR', backgroundColor: COLOR_PRIMARY, borderRadius: 8, borderBottomLeftRadius: 0, diff --git a/src/screens/signup/SplashScreen.js b/src/screens/signup/SplashScreen.js index 733a7d2..bead4cc 100644 --- a/src/screens/signup/SplashScreen.js +++ b/src/screens/signup/SplashScreen.js @@ -31,6 +31,7 @@ export default function SplashScreen() { // AsyncStorage(=디바이스에 저장하는 데이터)에 저장된 토큰을 가져온다. const accessToken = await AsyncStorage.getItem('accessToken'); const refreshToken = await AsyncStorage.getItem('refreshToken'); + const userId = await AsyncStorage.getItem('userId'); //없으면 그만 console.log('accessToken:', accessToken); @@ -39,7 +40,7 @@ export default function SplashScreen() { } //토큰이 맞는지 확인 -> 헤더에 토큰 넣어서 백엔드 요청 - const response = await axios.get(`${API_URL}/hello/security-test`, { + const response = await axios.get(`${API_URL}/v1/users/${userId}`, { headers: {Authorization: `Bearer ${accessToken}`}, }); console.log('response:', response.data.data);