Skip to content

N
new_excelso
Commit 2abb154a authored by Wahyu Adjie Prasetyo's avatar Wahyu Adjie Prasetyo
Browse files
Options

Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek

parents 9dc2f308 2cfe4ba6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 62 deletions
view/Auth.js
View file @ 2abb154a
...@@ -500,7 +500,7 @@ class Auth extends React.Component { ...@@ -500,7 +500,7 @@ class Auth extends React.Component {
{/* <Stack.Screen name="Email Confirmation" component={EmailConfirmation} /> */} {/* <Stack.Screen name="Email Confirmation" component={EmailConfirmation} /> */}
<Stack.Screen name="News Detail" component={NewsDetail} options={{ headerShown: false }} /> <Stack.Screen name="News Detail" component={NewsDetail} options={{ headerShown: false }} />
<Stack.Screen name="Confirm Your Order" component={MenuConfirmation} <Stack.Screen name="CONFIRM YOUR ORDER" component={MenuConfirmation}
options={{ options={{
headerStyle: { backgroundColor: "#CFB368" }, headerStyle: { backgroundColor: "#CFB368" },
headerBackTitleStyle: { color: 'white' }, headerBackTitleStyle: { color: 'white' },
...@@ -509,9 +509,9 @@ class Auth extends React.Component { ...@@ -509,9 +509,9 @@ class Auth extends React.Component {
headerTitleStyle: { headerTitleStyle: {
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white', color: 'white',
fontSize: 18, fontSize: 20,
}, },
title: 'Confirm Your Order' title: 'CONFIRM YOUR ORDER'
}} /> }} />
<Stack.Screen name="Date Time" component={DateTime} /> <Stack.Screen name="Date Time" component={DateTime} />
<Stack.Screen name="New Register" component={NewRegister} <Stack.Screen name="New Register" component={NewRegister}
......
view/MenuConfirmation.js
View file @ 2abb154a
This diff is collapsed.
view/RewardsList.js
View file @ 2abb154a
...@@ -51,7 +51,7 @@ class RewardsList extends React.Component { ...@@ -51,7 +51,7 @@ class RewardsList extends React.Component {
return ( return (
<View style={styles.container}> <View style={styles.container}>
<View style={styles.header}> <View style={styles.header}>
<Text style={{ color: 'white', textAlign: 'center', fontSize: 18, fontFamily: 'Gotham-Black' }}>REWARDS E-VOUCHER</Text> <Text style={{ color: 'white', textAlign: 'center', fontSize: 20, fontFamily: 'Gotham-Black' }}>REWARDS E-VOUCHER</Text>
</View> </View>
<ScrollView style={styles.body}> <ScrollView style={styles.body}>
{ {
...@@ -59,21 +59,21 @@ class RewardsList extends React.Component { ...@@ -59,21 +59,21 @@ class RewardsList extends React.Component {
this.state.rewardsList.map((item, key) => ( this.state.rewardsList.map((item, key) => (
<TouchableOpacity key={key} onPress={() => this.props.navigation.navigate('Reward Detail', { rewardId: item.id })}> <TouchableOpacity key={key} onPress={() => this.props.navigation.navigate('Reward Detail', { rewardId: item.id })}>
<View style={{ alignItems: 'center' }}> <View style={{ alignItems: 'center' }}>
<Card style={{ padding: 5, margin: 10 }}> <Card style={{ padding: 5, margin: 5 }}>
<View> <View>
<Image source={{ uri: item.reward.title_image }} <Image source={{ uri: item.reward.title_image }}
resizeMethod="resize" resizeMethod="resize"
resizeMode='cover' resizeMode='cover'
style={{ height: 100, width: '100%' }} /> style={{ height: 100, width: '100%' }} />
</View> </View>
<View style={{ flexDirection: 'row', justifyContent: 'space-between', padding: 10 }}> <View style={{ flex:1, flexDirection: 'row', justifyContent: 'space-between'}}>
<View> <View style={{flex:0.6}}>
<Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Black' }}>{item.reward.title}</Text> <Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Black', color:'#838383' }}>{item.reward.title}</Text>
<Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light' }}>{item.reward.subtitle}</Text> <Text style={{ textAlign: 'left', fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>{item.reward.subtitle}</Text>
</View> </View>
<View> <View style={{flex:0.4}}>
<Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light' }}>Expired</Text> <Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>Expired On</Text>
<Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light' }}>{item.expire_time}</Text> <Text style={{ textAlign: 'right', fontSize: 12, fontFamily: 'Gotham-Light', color:'#838383' }}>{item.expire_time}</Text>
</View> </View>
</View> </View>
</Card> </Card>
...@@ -86,7 +86,7 @@ class RewardsList extends React.Component { ...@@ -86,7 +86,7 @@ class RewardsList extends React.Component {
</View> </View>
) )
} }
<TouchableOpacity onPress={() => this.props.navigation.navigate('Reward History')}> <TouchableOpacity style={{marginVertical:20}} onPress={() => this.props.navigation.navigate('Reward History')}>
<Text style={{ textAlign: 'center', color: '#CFB368', fontSize: 12, fontFamily: 'Gotham-Black' }}>REDEEM E-VOUCHER HISTORY</Text> <Text style={{ textAlign: 'center', color: '#CFB368', fontSize: 12, fontFamily: 'Gotham-Black' }}>REDEEM E-VOUCHER HISTORY</Text>
</TouchableOpacity> </TouchableOpacity>
<View style={{ height: 15 }} /> <View style={{ height: 15 }} />
......
view/ShoppingCart.js
View file @ 2abb154a
...@@ -393,7 +393,7 @@ class ShoppingCart extends React.Component { ...@@ -393,7 +393,7 @@ class ShoppingCart extends React.Component {
} else if (this.state.checkedBalance == false && this.state.checkedPoint == false && this.state.checkedBalancePoint == false) { } else if (this.state.checkedBalance == false && this.state.checkedPoint == false && this.state.checkedBalancePoint == false) {
Alert.alert('Error', 'Please insert payment methods') Alert.alert('Error', 'Please insert payment methods')
} else { } else {
this.props.navigation.navigate('Confirm Your Order', { balanceUsed: this.state.balanceused, pointused: this.state.pointsused }) this.props.navigation.navigate('CONFIRM YOUR ORDER', { balanceUsed: this.state.balanceused, pointused: this.state.pointsused })
} }
} }
......
view/WelcomeLog.js
View file @ 2abb154a
...@@ -47,8 +47,8 @@ export default class WelcomeLog extends React.Component { ...@@ -47,8 +47,8 @@ export default class WelcomeLog extends React.Component {
}, },
], ],
})}> })}>
<View style={{ height: 50, borderRadius: 20, backgroundColor: '#CFB368' }}> <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'black', fontSize: 20, textAlign: 'center', margin: 15 }}>NEXT</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center', margin:11}}>NEXT</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
......
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