Commit fabe3c4c authored by Wahyu Adjie Prasetyo's avatar Wahyu Adjie Prasetyo

pembenahan hasil meetting

parent c352d7d8
{ {
"expo": { "expo": {
"name": "Excelso_update 03.00 / 19.05.2020", "name": "Excelso_update 13.00 / 19.05.2020",
"slug": "excelso-pro", "slug": "excelso-pro",
"privacy": "public", "privacy": "public",
"sdkVersion": "36.0.0", "sdkVersion": "36.0.0",
......
...@@ -184,14 +184,14 @@ class Account extends React.Component { ...@@ -184,14 +184,14 @@ class Account extends React.Component {
/> />
</View> </View>
<Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 17, textAlign: 'center', top: 5 }}> <Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 17, textAlign: 'center', top: 5 }}>
{this.state.full_name} {/* {this.state.full_name} */}
</Text> </Text>
<View style={{ height: 90, flexDirection: 'row', justifyContent: 'center' }}> <View style={{ height: 90, flexDirection: 'row', justifyContent: 'center' }}>
<TouchableOpacity style={{ flexDirection: 'row' }} onPress={() => this.props.navigation.navigate('Profile')}> <TouchableOpacity style={{ flexDirection: 'row' }} onPress={() => this.props.navigation.navigate('Profile')}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 17, textAlign: 'center', top: 10 }}> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 17, textAlign: 'center', top: 10 }}>
{this.state.email} {this.state.full_name}
</Text> </Text>
<Icon <Icon
containerStyle={{ margin: 5 }} containerStyle={{ margin: 5 }}
...@@ -303,7 +303,7 @@ class Account extends React.Component { ...@@ -303,7 +303,7 @@ class Account extends React.Component {
<Card style={{ height: 100, width: 160 }}> <Card style={{ height: 100, width: 160 }}>
<View style={{ height: 50, alignItems: 'center' }}> <View style={{ height: 50, alignItems: 'center' }}>
<AntDesign name="shoppingcart" size={30} color="gray" style={{ top: 20 }} /> <AntDesign name="shoppingcart" size={30} color="gray" style={{ top: 20 }} />
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 30, fontSize: 14 }}>USE BALANCE</Text> <Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 30, fontSize: 14 }}>BALANCE / POINT</Text>
</View> </View>
</Card> </Card>
</TouchableOpacity> </TouchableOpacity>
......
...@@ -371,6 +371,18 @@ class Auth extends React.Component { ...@@ -371,6 +371,18 @@ class Auth extends React.Component {
/> />
<Stack.Screen name="Order Detail" component={OrderDetail} options={({ navigation, route }) => ({ <Stack.Screen name="Order Detail" component={OrderDetail} options={({ navigation, route }) => ({
headerStyle: { backgroundColor: '#CFB368' },
headerTitleContainerStyle: { alignContent: 'center' },
headerTitleAlign: 'center',
headerTintColor: '#fff',
headerTitleStyle: {
alignSelf: 'center',
fontFamily: 'Gotham-Black',
fontSize: 18,
color: 'white',
textAlign: 'center'
},
title: 'Reward History',
headerLeft: props => <HeaderBackButton {...props} onPress={() => navigation.navigate('Home', { screen: 'ORDER' })} />, headerLeft: props => <HeaderBackButton {...props} onPress={() => navigation.navigate('Home', { screen: 'ORDER' })} />,
})} /> })} />
......
...@@ -289,7 +289,7 @@ class MenuSelection extends React.Component { ...@@ -289,7 +289,7 @@ class MenuSelection extends React.Component {
keyExtractor={(item) => item.id} keyExtractor={(item) => item.id}
/> />
</View> </View>
<View style={{ height: 1, backgroundColor: 'grey', marginRight: 10, marginLeft: 10, marginTop: 5 }}></View> <View style={{ height: 1, backgroundColor: 'grey', marginRight: 10, marginLeft: 10, marginTop: 5, }}></View>
<View style={{ flex: 3 }}> <View style={{ flex: 3 }}>
{this.state.indicator == true ? ( {this.state.indicator == true ? (
<ActivityIndicator style={{ top: 10 }} size="large" color="#c9af6d" /> <ActivityIndicator style={{ top: 10 }} size="large" color="#c9af6d" />
...@@ -309,7 +309,7 @@ class MenuSelection extends React.Component { ...@@ -309,7 +309,7 @@ class MenuSelection extends React.Component {
</View> </View>
<View> <View>
</View> </View>
<View style={{ height: 1, borderWidth: 1, marginLeft: 10, marginRight: 10, borderColor: 'grey' }}></View> <View style={{ height: 1, backgroundColor: 'grey', marginRight: 10, marginLeft: 10, marginTop: 5, }}></View>
<View style={{ height: 70 }}> <View style={{ height: 70 }}>
<View style={{ flex: 1, flexDirection: 'row' }}> <View style={{ flex: 1, flexDirection: 'row' }}>
......
...@@ -106,6 +106,8 @@ class Outlets extends React.Component { ...@@ -106,6 +106,8 @@ class Outlets extends React.Component {
} }
} }
dataOutlets[i]['full_address'] = address; dataOutlets[i]['full_address'] = address;
console.log("INI YAA: "+JSON.stringify(dataOutlets));
} }
this.setState({ this.setState({
...@@ -233,7 +235,7 @@ class Outlets extends React.Component { ...@@ -233,7 +235,7 @@ class Outlets extends React.Component {
</Text> </Text>
</View> </View>
<View style={{ flex: 1,top:20 }}> <View style={{ flex: 1,top:20 }}>
<TouchableOpacity onPress={() => { Linking.openURL('tel:(021) 56985640') }}> <TouchableOpacity onPress={() => { Linking.openURL('tel:'+ item.phone) }}>
<Icon <Icon
name='ios-call' name='ios-call'
type='ionicon' type='ionicon'
...@@ -244,7 +246,7 @@ class Outlets extends React.Component { ...@@ -244,7 +246,7 @@ class Outlets extends React.Component {
</View> </View>
<View style={{ flex: 1,top:20 }}> <View style={{ flex: 1,top:20 }}>
<TouchableOpacity onPress={() => Linking.openURL('https://www.google.com/maps/dir/?api=1&destination=' + item.lat + item.long)}> <TouchableOpacity onPress={() => Linking.openURL('https://www.google.com/maps/dir/?api=1&destination=' + item.lat +' '+ item.long)}>
<Icon <Icon
name='ios-navigate' name='ios-navigate'
type='ionicon' type='ionicon'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment