Skip to content

Commit

Permalink
Merge pull request #46 from BOBpossible/feat/#25_My
Browse files Browse the repository at this point in the history
Feat/#25 my MyPage api 연결코드
  • Loading branch information
yejinleee authored Jul 8, 2022
2 parents 5ba12fa + 8192848 commit 122f908
Show file tree
Hide file tree
Showing 29 changed files with 272 additions and 96 deletions.
Binary file added android/app/src/main/assets/fonts/AntDesign.ttf
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Entypo.ttf
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/EvilIcons.ttf
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Feather.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Fontisto.ttf
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Foundation.ttf
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Ionicons.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Octicons.ttf
Binary file not shown.
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Zocial.ttf
Binary file not shown.
64 changes: 64 additions & 0 deletions ios/BOB_FrontEnd.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,22 @@
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 */
Expand Down Expand Up @@ -57,6 +73,22 @@
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 */
Expand Down Expand Up @@ -161,6 +193,22 @@
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>";
Expand Down Expand Up @@ -279,6 +327,22 @@
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;
};
Expand Down
16 changes: 16 additions & 0 deletions ios/BOB_FrontEnd/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,22 @@
<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>
Expand Down
3 changes: 2 additions & 1 deletion src/api/customAxios.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import axios, {AxiosInstance} from 'axios';

export const customAxios = (token?: string): AxiosInstance => {
export const customAxios = (token?: string, params?: {}): AxiosInstance => {
console.log(params);
if (token === undefined) {
return axios.create({
baseURL: 'https://bobpossible.shop',
Expand Down
4 changes: 4 additions & 0 deletions src/api/queryKey.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export const queryKey = {
POINTSLIST: 'pointsList',
REVIEWLIST: 'reviewList',
};
36 changes: 26 additions & 10 deletions src/components/MissionSuccessList.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {useState} from 'react';
import React, {useEffect, useState} from 'react';
import {View, FlatList} from 'react-native';
import {MissionSuccessfulCard} from './MissionSuccessfulCard';
import {customAxios} from '../api/customAxios';
Expand Down Expand Up @@ -73,47 +73,61 @@ const dummyMission = [
completeStatus: '미션 성공',
},
];
interface DataResponse {
interface DataCompletedMissionsType {
dayOfWeek: string;
mission: string;
missionId: number;
missionStatus: string; //NEW, PROGRESS, OWNER_CHECK
missionStatus: string; ///NEW, PROGRESS, OWNER_CHECK
point: number;
storeCategory: string;
storeName: string;
successDate: string;
}

export const MissionSuccessList = () => {
const token = useRecoilValue(userToken);
const [CompletedMissionsData, setCompletedMissionsData] = useState<DataResponse[]>([]);
const [DataCompletedMissions, setDataCompletedMissions] = useState<DataCompletedMissionsType[]>([]);

const getMissionsMeComplete = async () => {
const res = await customAxios(token).get('missions/me/complete');
console.log('getMissionsMeProgress res.data : ', res.data);
res.data.result.forEach((e: any) => {
setCompletedMissionsData((prev) => [
setDataCompletedMissions((prev) => [
...prev,
{
dayOfWeek: e.dayOfWeek,
mission: e.mission,
missionId: e.missionId,
missionStatus: e.missionStatus,
point: e.point,
storeCategory: e.storeCategory,
storeName: e.storeName,
successDate: e.successDate,
},
]);
});
// CompletedMissionsData.length로할지, typeof(CompletedMissionsData);
// var noMission = useState(CompletedMissionsData.length === 0); //미션이없는상태면 true
// DataCompletedMissions.length로할지, typeof(DataCompletedMissions);
// var noMission = useState(DataCompletedMissions.length === 0); //미션이없는상태면 true
// var 스코프 호출되는지 확인
};
//prettier-ignore
const DAYOFWEEK = {
MONDAY: '월', TUESDAY: '화', WEDNESSDAY: '수', THURSDAY: '목', FRIDAY: '금', SATURDAY: '토', SUNDAY: '일',
};
// useEffect(() => {
// prettier-ignore
// const DAYOFWEEK = {
// MONDAY: '월', TUESDAY: '화', WEDNESSDAY: '수', THURSDAY: '목', FRIDAY: '금', SATURDAY: '토', SUNDAY: '일',
// };
// // console.log(DAYOFWEEK['MONDAY']);
// }, []); ///왜 미션갯수만큼렌더링???
return (
<FlatList
style={{marginTop: 18}}
showsVerticalScrollIndicator={false}
contentContainerStyle={{paddingBottom: 60, backgroundColor: '#F6F6FA'}}
scrollEventThrottle={10}
data={dummyMission}
// data={CompletedMissionsData}
// data={DataCompletedMissions}
renderItem={({item}) => (
<>
<MissionSuccessfulCard
Expand All @@ -124,13 +138,15 @@ export const MissionSuccessList = () => {
storeCategory={'중국집'}
storeName={'반이학생마라탕'}
successDate={'2022-07-07T07:43:57.267Z'}
dayOfWeek={DAYOFWEEK['MONDAY']}
// mission={item.mission}
// missionId={item.missionId}
// // missionStatus={item.missionStatus}
// point={item.poin}
// storeCategory={item.storeCategory}
// storeName={item.storeName}
// successDate={'2022-07-07T07:43:57.267Z'}
// successDate={item.successDate}
// dayOfWeek={DAYOFWEEK[item.dayOfWeek]}
/>
</>
)}
Expand Down
8 changes: 5 additions & 3 deletions src/components/MissionSuccessfulCard.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {useState} from 'react';
import React, {useEffect, useState} from 'react';
import type {FC} from 'react';
import {View, StyleSheet, Text, TouchableOpacity} from 'react-native';
import {widthPercentageToDP as wp, heightPercentageToDP as hp} from 'react-native-responsive-screen';
Expand All @@ -22,23 +22,25 @@ export type MissionSuccessfulCardProps = {
storeName: string;
missionStatus?: string; //"NEW","PROGRESS","OWNER_CHECK"
successDate: string; //성공날짜 서버에 따라 수정필
dayOfWeek: string;
};

//prettier-ignore
export const MissionSuccessfulCard: FC<MissionSuccessfulCardProps> = ({
mission, missionId, point, storeCategory, storeName, missionStatus, successDate
mission, missionId, point, storeCategory, storeName, missionStatus, successDate, dayOfWeek
}) => {
const [reviewModal, setReviewModal] = useState(false);
function handleReviewPress() {
setReviewModal(true);
}
const storeId = 1; //서버 후 수정


return (
<View style={[styles.missionCardWrap]}>
<View style={[styles.missionCard]}>
<View style={[styles.missionMain]}>
<Text style={[DesignSystem.caption1Lt, styles.dateText]}>{successDate.slice(5,7)}/{successDate.slice(8,10)} {'(월)'}{'미션 성공'}</Text>
<Text style={[DesignSystem.caption1Lt, styles.dateText]}>{successDate.slice(5,7)}/{successDate.slice(8,10)} ({dayOfWeek}){'미션 성공'}</Text>
<View style={[styles.nameBox]}>
<Text style={[DesignSystem.title4Md, DesignSystem.grey17]}>{storeName}</Text>
<Text style={[DesignSystem.body2Lt, DesignSystem.grey10]}>{storeCategory}</Text>
Expand Down
2 changes: 1 addition & 1 deletion src/components/MissionUser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import type {FC} from 'react';
import {View, StyleSheet, Text, Image} from 'react-native';
import {Colors} from 'react-native-paper';
import { DesignSystem } from '../assets/DesignSystem';
import {DesignSystem} from '../assets/DesignSystem';

export type MissionUserProps = {
userprofile?: any; //?????????프사
Expand Down
23 changes: 4 additions & 19 deletions src/components/My/MyPointList.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {FC} from 'react';
import {View, StyleSheet, Text, TouchableOpacity, Image} from 'react-native';
import {View, StyleSheet, Text} from 'react-native';
import moment from 'moment';
import {DesignSystem} from '../../assets/DesignSystem';

Expand All @@ -22,16 +22,12 @@ export const MyPointList: FC<MyPointListProps> = ({date, title, subTitle, point}
<Text style={[styles.dateText, DesignSystem.title3SB]}>{month}.{day}</Text>
</View>
<View style={[styles.listDetailsWrap]}>
<View style={[styles.listMissionWrap]}>
<View>
<Text style={[styles.storeNameText, DesignSystem.title3SB]}>{title}</Text>
{subTitle !== undefined && (<Text style={[styles.missionText, {fontFamily: 'Pretendard-Light'}]}>{subTitle}</Text>)}
</View>
<View style={[styles.listPointWrap]}>
{point > 0 ?
<Text style={[DesignSystem.title3SB, {color: '#6C69FF'}]}>{point.toString().replace(/\B(?=(\d{3})(?!\d))/g, ',')}P</Text>
:
<Text style={[DesignSystem.title3SB, {color: '#B7B7B7'}]}>{point.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')}P</Text>
}
<View>
<Text style={[DesignSystem.title3SB, {color: point > 0 ? '#6C69FF' : '#B7B7B7'}]}>{point.toString().replace(/\B(?=(\d{3})(?!\d))/g, ',')}P</Text>
</View>
</View>
</View>
Expand All @@ -51,25 +47,14 @@ const styles = StyleSheet.create({
},
listDetailsWrap: {
flex: 1,
// backgroundColor: 'yellow',
flexDirection: 'row',
justifyContent: 'space-between',
},
listMissionWrap: {

},
storeNameText: {
color: '#3F3F3F',
},
missionText: {
color: '#949494',
fontSize: 16,
fontFamily: 'Pretendard-Light',
},
listPointWrap: {

},
pointText: {
color: '#6C69FF',
},
});
Loading

0 comments on commit 122f908

Please sign in to comment.