Merge branch 'main' into feat/#25_My

App.tsx

@@ -10,7 +10,6 @@ import 'react-native-gesture-handler';
 import {enableScreens} from 'react-native-screens';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import {QueryClient, QueryClientProvider} from 'react-query';
-import {customAxios} from './src/api/customAxios';
 import {getRegisterStatus, postToken} from './src/api';
 
 enableScreens();
@@ -38,9 +37,16 @@ export default function App() {
       if (value !== null) {
         //GET user register status 그리고 그안에서 setIslogin true 만들거나 false로 냅두기
 
-        await postToken();
+        const newToken = await postToken();
+
+        await AsyncStorage.multiSet([
+          ['accessToken', newToken.result.accessToken],
+          ['refreshToken', newToken.result.refreshToken],
+        ]);
+
         const registerResult = await getRegisterStatus();
-        if (registerResult === 'DONE') {
+        console.log('가입 상태 확인 요청:', registerResult);
+        if (registerResult !== 'NEW') {
           setIsLogin(true);
         }
       }

ios/BOB_FrontEnd.xcodeproj/project.pbxproj

@@ -20,22 +20,6 @@
 		D6D041C14C1D4CC0B3849B2B /* Pretendard-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 11C955E157164BEF96CBCC24 /* Pretendard-Regular.ttf */; };
 		DA0493B728749E5000F9CA59 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = DA0493B628749E5000F9CA59 /* GoogleService-Info.plist */; };
 		F2D1474B88BC47BDBF1013E0 /* Poppins-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 193D3C47DC2D49CAB80AA0A8 /* Poppins-Bold.ttf */; };
-		EB55705289B54ED6A22E3ACC /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1555FB275CE6443F814781D1 /* AntDesign.ttf */; };
-		0DEC298CF7AC425092ED9EAC /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4AAD370287E04F9FBBCA0084 /* Entypo.ttf */; };
-		55306C6F4D9446E98AC68239 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D526AB4F33934FBCB57E46B0 /* EvilIcons.ttf */; };
-		AF9BD7F6FAC543908B71F971 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3B210A7A5713469E8C2EC63E /* Feather.ttf */; };
-		F576574EC53348FA90D0D23B /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 71A6D769554041DD906742A4 /* FontAwesome.ttf */; };
-		CF6369A247294167BA6D7FDC /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 07651703BC4E4DA0B4D2DDEB /* FontAwesome5_Brands.ttf */; };
-		EA50B6C72211470DA7AD612D /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6E67FA8DB94941B2A2526999 /* FontAwesome5_Regular.ttf */; };
-		1F2F8388B6E14BEB9C39D07B /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0C5F95ADA35B45AE97F127A2 /* FontAwesome5_Solid.ttf */; };
-		192ACC4A1A01402D8292E07C /* Fontisto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 57D27D793A374F58B537F1CA /* Fontisto.ttf */; };
-		E74C3C73A7AC40D18715D0ED /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 169B2DD340194E41840400EC /* Foundation.ttf */; };
-		11BE4731A2A740A4AF95AA9D /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E14175E1B366457D8E3D4BE8 /* Ionicons.ttf */; };
-		E367F2D8C8C44585AE786352 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E3265F61279F4BAAAC02B6CE /* MaterialCommunityIcons.ttf */; };
-		3F4EAE63C8BF4233B36BCD2F /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 98E30308134140E2B14F3307 /* MaterialIcons.ttf */; };
-		BB91474E32E746DAA3171CE3 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0CD39CDB1E32435D9D76D76F /* Octicons.ttf */; };
-		3617B312A75F42B6B2C8D796 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 13D77FA9D23941ECA9C443FD /* SimpleLineIcons.ttf */; };
-		94C5455CEF524C46A4A1AF97 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 26097C94E000424088B6C430 /* Zocial.ttf */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -73,22 +57,6 @@
 		DA0493B628749E5000F9CA59 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		DA4D399328742AD400BCAFF5 /* BOB_FrontEnd.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = BOB_FrontEnd.entitlements; path = BOB_FrontEnd/BOB_FrontEnd.entitlements; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
-		1555FB275CE6443F814781D1 /* AntDesign.ttf */ = {isa = PBXFileReference; name = "AntDesign.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		4AAD370287E04F9FBBCA0084 /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		D526AB4F33934FBCB57E46B0 /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		3B210A7A5713469E8C2EC63E /* Feather.ttf */ = {isa = PBXFileReference; name = "Feather.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		71A6D769554041DD906742A4 /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		07651703BC4E4DA0B4D2DDEB /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Brands.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		6E67FA8DB94941B2A2526999 /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Regular.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		0C5F95ADA35B45AE97F127A2 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Solid.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		57D27D793A374F58B537F1CA /* Fontisto.ttf */ = {isa = PBXFileReference; name = "Fontisto.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		169B2DD340194E41840400EC /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		E14175E1B366457D8E3D4BE8 /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		E3265F61279F4BAAAC02B6CE /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		98E30308134140E2B14F3307 /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		0CD39CDB1E32435D9D76D76F /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		13D77FA9D23941ECA9C443FD /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
-		26097C94E000424088B6C430 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -193,22 +161,6 @@
 				11C955E157164BEF96CBCC24 /* Pretendard-Regular.ttf */,
 				4752C974ABD44F989EB7740B /* Pretendard-SemiBold.ttf */,
 				193D3C47DC2D49CAB80AA0A8 /* Poppins-Bold.ttf */,
-				1555FB275CE6443F814781D1 /* AntDesign.ttf */,
-				4AAD370287E04F9FBBCA0084 /* Entypo.ttf */,
-				D526AB4F33934FBCB57E46B0 /* EvilIcons.ttf */,
-				3B210A7A5713469E8C2EC63E /* Feather.ttf */,
-				71A6D769554041DD906742A4 /* FontAwesome.ttf */,
-				07651703BC4E4DA0B4D2DDEB /* FontAwesome5_Brands.ttf */,
-				6E67FA8DB94941B2A2526999 /* FontAwesome5_Regular.ttf */,
-				0C5F95ADA35B45AE97F127A2 /* FontAwesome5_Solid.ttf */,
-				57D27D793A374F58B537F1CA /* Fontisto.ttf */,
-				169B2DD340194E41840400EC /* Foundation.ttf */,
-				E14175E1B366457D8E3D4BE8 /* Ionicons.ttf */,
-				E3265F61279F4BAAAC02B6CE /* MaterialCommunityIcons.ttf */,
-				98E30308134140E2B14F3307 /* MaterialIcons.ttf */,
-				0CD39CDB1E32435D9D76D76F /* Octicons.ttf */,
-				13D77FA9D23941ECA9C443FD /* SimpleLineIcons.ttf */,
-				26097C94E000424088B6C430 /* Zocial.ttf */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -327,22 +279,6 @@
 				D6D041C14C1D4CC0B3849B2B /* Pretendard-Regular.ttf in Resources */,
 				1361569F6A8C4E128DF3EC4A /* Pretendard-SemiBold.ttf in Resources */,
 				F2D1474B88BC47BDBF1013E0 /* Poppins-Bold.ttf in Resources */,
-				EB55705289B54ED6A22E3ACC /* AntDesign.ttf in Resources */,
-				0DEC298CF7AC425092ED9EAC /* Entypo.ttf in Resources */,
-				55306C6F4D9446E98AC68239 /* EvilIcons.ttf in Resources */,
-				AF9BD7F6FAC543908B71F971 /* Feather.ttf in Resources */,
-				F576574EC53348FA90D0D23B /* FontAwesome.ttf in Resources */,
-				CF6369A247294167BA6D7FDC /* FontAwesome5_Brands.ttf in Resources */,
-				EA50B6C72211470DA7AD612D /* FontAwesome5_Regular.ttf in Resources */,
-				1F2F8388B6E14BEB9C39D07B /* FontAwesome5_Solid.ttf in Resources */,
-				192ACC4A1A01402D8292E07C /* Fontisto.ttf in Resources */,
-				E74C3C73A7AC40D18715D0ED /* Foundation.ttf in Resources */,
-				11BE4731A2A740A4AF95AA9D /* Ionicons.ttf in Resources */,
-				E367F2D8C8C44585AE786352 /* MaterialCommunityIcons.ttf in Resources */,
-				3F4EAE63C8BF4233B36BCD2F /* MaterialIcons.ttf in Resources */,
-				BB91474E32E746DAA3171CE3 /* Octicons.ttf in Resources */,
-				3617B312A75F42B6B2C8D796 /* SimpleLineIcons.ttf in Resources */,
-				94C5455CEF524C46A4A1AF97 /* Zocial.ttf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

ios/BOB_FrontEnd/Info.plist

@@ -68,22 +68,6 @@
 		<string>Pretendard-Medium.ttf</string>
 		<string>Pretendard-Regular.ttf</string>
 		<string>Pretendard-SemiBold.ttf</string>
-		<string>AntDesign.ttf</string>
-		<string>Entypo.ttf</string>
-		<string>EvilIcons.ttf</string>
-		<string>Feather.ttf</string>
-		<string>FontAwesome.ttf</string>
-		<string>FontAwesome5_Brands.ttf</string>
-		<string>FontAwesome5_Regular.ttf</string>
-		<string>FontAwesome5_Solid.ttf</string>
-		<string>Fontisto.ttf</string>
-		<string>Foundation.ttf</string>
-		<string>Ionicons.ttf</string>
-		<string>MaterialCommunityIcons.ttf</string>
-		<string>MaterialIcons.ttf</string>
-		<string>Octicons.ttf</string>
-		<string>SimpleLineIcons.ttf</string>
-		<string>Zocial.ttf</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>

src/api/login.ts

@@ -7,7 +7,7 @@ const getAccessToken = async () => {
 };
 
 const getRefreshToken = async () => {
-  const refreshtoken = await AsyncStorage.getItem('accessToken');
+  const refreshtoken = await AsyncStorage.getItem('refreshToken');
   return refreshtoken;
 };
 
@@ -20,13 +20,8 @@ export const postToken = async () => {
     const response = await customAxios().post('/auth/token', null, {
       params: {accessToken: accessToken, refreshToken: refreshToken},
     });
-    console.log('리프레시 토큰 응답: ', response);
-    await AsyncStorage.multiSet([
-      ['accessToken', response.data.result.accessToken],
-      ['refreshToken', response.data.result.refreshToken],
-    ]);
-    console.log('리프레시 토큰 성공: ', response);
-    return response;
+    console.log('리프레시 토큰 성공: ', response.data);
+    return response.data;
   } catch (error) {
     console.log('토큰 리프레시 갱신 에러: ', error);
   }

src/api/queryKey.ts

@@ -1,4 +1,5 @@
 export const queryKey = {
   POINTSLIST: 'pointsList',
   REVIEWSME: 'reviewList',
+  HOMEDATA: 'homeData',
 };

src/components/Home/HomeAnimatedHeader.tsx

@@ -20,32 +20,20 @@ import {useQuery} from 'react-query';
 import {customAxios} from '../../api/customAxios';
 import {useRecoilValue} from 'recoil';
 import {userToken} from '../../state';
-import {HomeData} from '../../screens/Home/Main';
-import AsyncStorage from '@react-native-async-storage/async-storage';
+import {IHomeData} from '../../data';
 
 const WIDTH = Dimensions.get('window').width;
 const HEADER_HEIGHT = Platform.OS === 'ios' ? hp(25.8) : hp(28.6);
 type AnimatedHeaderProps = {
   animatedValue: Animated.Value;
   paddingTop: number;
-  data?: HomeData;
+  data?: IHomeData;
 };
 
 export const AnimatedHeader: FC<AnimatedHeaderProps> = ({animatedValue, paddingTop, data}) => {
   const [addressModal, setAddressModal] = useState(false);
   const barProgressValue = useRef(new Animated.Value(0)).current;
   const navigation = useNavigation();
-  const token = AsyncStorage.getItem('accessToken');
-
-  //주소동 받는 퀘리 있어야함
-
-  // const getHomeInfo = async () => {
-  //   const response = await customAxios(await token).get('/api/v1/missions/me');
-  //   return response.data.result;
-  // };
-  // const {data} = useQuery<HomeData>('homeInfo', getHomeInfo, {
-  //   retry: false,
-  // });
 
   //헤더 길이 바꿔주는 애니메이션 Main.tsx의 스크롤 위치에 따라 변한다
   const heightAnimStyle = useStyle({
@@ -78,8 +66,8 @@ export const AnimatedHeader: FC<AnimatedHeaderProps> = ({animatedValue, paddingT
     }),
   });
   useEffect(() => {
-    barProgressFill(7);
-  }, [barProgressFill]);
+    barProgressFill(data.rewards);
+  }, [barProgressFill, data.rewards]);
 
   const circleAnimStyle = useStyle({
     opacity: animatedValue.interpolate({
@@ -117,7 +105,7 @@ export const AnimatedHeader: FC<AnimatedHeaderProps> = ({animatedValue, paddingT
   const expandHeader = () => {
     return (
       <Animated.View style={[styles.circleWrap, circleAnimStyle]}>
-        <CircleBar progress={7} />
+        <CircleBar progress={data?.rewards} />
         <Text style={[DesignSystem.grey17, styles.circleBar]}>미션 10개 달성시 1000P</Text>
       </Animated.View>
     );

src/components/Home/HomeCircleBar.tsx

@@ -7,7 +7,7 @@ import {calHeight} from '../../assets/CalculateLength';
 import {heightPercentageToDP as hp} from 'react-native-responsive-screen';
 
 export type CircleBarProps = {
-  progress: number;
+  progress?: number;
 };
 export const CircleBar: FC<CircleBarProps> = ({progress}) => {
   const styles = StyleSheet.create({
@@ -35,7 +35,7 @@ export const CircleBar: FC<CircleBarProps> = ({progress}) => {
         style={{transform: [{scaleX: -1}]}}
         size={Platform.OS === 'ios' ? hp((108 / 812) * 100) : hp(calHeight(108))}
         width={5}
-        fill={progress * 10}
+        fill={progress !== undefined ? progress * 10 : 0}
         tintColor="#615EFF"
         duration={2000}
         rotation={0}

src/components/Home/HomeNoMission.tsx

@@ -0,0 +1,17 @@
+import React from 'react';
+import {Image, Text, View} from 'react-native';
+import {DesignSystem} from '../../assets/DesignSystem';
+
+export const HomeNoMission = () => {
+  return (
+    <View style={[DesignSystem.centerArrange, {flex: 1, marginBottom: 50}]}>
+      <Text style={[DesignSystem.title1SB, {color: '#111111', marginBottom: 2}]}>
+        주변에 미션이 없어요
+      </Text>
+      <Text style={[DesignSystem.body1Lt, {color: '#949494', marginBottom: 38}]}>
+        빠른 시일내에 미션을 업데이트 할게요!
+      </Text>
+      <Image source={require('../../assets/images/noMission/cryingBob.png')} />
+    </View>
+  );
+};

src/components/Register/RegisterAddress.tsx

@@ -2,8 +2,6 @@ import React, {useEffect, useState} from 'react';
 import type {FC} from 'react';
 import {StyleSheet, Text, TouchableOpacity, View} from 'react-native';
 import AddressSearchModal from '../../modal/AddressSearchModal';
-import {useRecoilValue} from 'recoil';
-import {address} from '../../state';
 import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
 import {RegisterInterface} from '../../data';
 type RegisterAddressProps = {
@@ -22,27 +20,16 @@ export const RegisterAddress: FC<RegisterAddressProps> = ({
   error,
 }) => {
   const [addressModal, setAddressModal] = useState(false);
-  const userAddress = useRecoilValue(address);
 
-  //지도 모달에서 주소 바뀔때마다 회원가입 데이타 갱신
-  useEffect(() => {
-    setRegisterData({
-      ...registerData,
-      addressStreet: userAddress.address,
-      addressDong: userAddress.bname,
-      x: userAddress.x,
-      y: userAddress.y,
-    });
-  }, [userAddress]);
-
-  useEffect(() => {}, [userAddress]);
   return (
     <View style={[styles.addressWrap]}>
       <AddressSearchModal
         visible={addressModal}
         closeAddressModal={() => setAddressModal(false)}
-        value={value}
+        setRegisterData={setRegisterData}
+        registerData={registerData}
         onChange={onChange}
+        value={value}
       />
       <Text style={[styles.formHeadText]}>주소</Text>
       <TouchableOpacity onPress={() => setAddressModal(true)}>