Skip to content

N
new_excelso
Commit 5bb056a4 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 fdf6d7c4 7a1edd1c
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 34 deletions
view/Auth.js
View file @ 5bb056a4
...@@ -383,7 +383,7 @@ class Auth extends React.Component { ...@@ -383,7 +383,7 @@ class Auth extends React.Component {
fontSize: 20, fontSize: 20,
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'Shopping Cart' }, title: 'SHOPPING CART'
}} /> }} />
<Stack.Screen name="Order History" component={OrderHistory} /> <Stack.Screen name="Order History" component={OrderHistory} />
<Stack.Screen name="Reward History" component={RewardHistory} <Stack.Screen name="Reward History" component={RewardHistory}
...@@ -532,7 +532,19 @@ class Auth extends React.Component { ...@@ -532,7 +532,19 @@ class Auth extends React.Component {
title: 'REGISTER' title: 'REGISTER'
}} /> }} />
<Stack.Screen name="TopUpInfo" component={TopUpInfo} options={{ headerShown: false }} /> <Stack.Screen name="TopUpInfo" component={TopUpInfo} options={{ headerShown: false }} />
<Stack.Screen name="Reward Detail" component={RewardDetail} /> <Stack.Screen name="Reward Detail" component={RewardDetail}
options={{
headerStyle: { backgroundColor: "#CFB368" },
headerBackTitleStyle: { color: 'white' },
headerTintColor: '#fff',
headerTitleAlign: 'center',
headerTitleStyle: {
fontFamily: 'Gotham-Black',
color: 'white',
fontSize: 20,
},
title: 'REWARD DETAIL'
}} />
<Stack.Screen name="Reward Select" component={RewardSelect} <Stack.Screen name="Reward Select" component={RewardSelect}
options={{ options={{
headerStyle: { backgroundColor: "#CFB368" }, headerStyle: { backgroundColor: "#CFB368" },
......
view/Home.js
View file @ 5bb056a4
...@@ -277,13 +277,13 @@ class Home extends React.Component { ...@@ -277,13 +277,13 @@ class Home extends React.Component {
{/* <Text style={{ textAlign: 'center', fontSize: 12, }}> {/* <Text style={{ textAlign: 'center', fontSize: 12, }}>
{i18n.t('orderInfo')} {i18n.t('orderInfo')}
</Text> */} </Text> */}
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black' }}> <Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black', color:'#838383' }}>
YOU WILL PICKUP YOUR ORDER AT YOU WILL PICKUP YOUR ORDER AT
</Text> </Text>
{this.state.indicator == true ? ( {this.state.indicator == true ? (
<ActivityIndicator size="small" color="#c9af6d" /> <ActivityIndicator size="small" color="#c9af6d" />
) : ( ) : (
<Text style={{ textAlign: "center", fontSize: 12, top: 5, fontFamily: 'Gotham-Light' }}> <Text style={{ textAlign: "center", fontSize: 12, top: 5, fontFamily: 'Gotham-Light', color:'#838383' }}>
Excelso {this.props.name_outlet} Excelso {this.props.name_outlet}
</Text> </Text>
)} )}
...@@ -291,7 +291,7 @@ class Home extends React.Component { ...@@ -291,7 +291,7 @@ class Home extends React.Component {
<Text style={{ textAlign: 'center', bottom: 5, color: 'white' }}>{i18n.t('orderNow')}</Text> <Text style={{ textAlign: 'center', bottom: 5, color: 'white' }}>{i18n.t('orderNow')}</Text>
</TouchableOpacity> */} </TouchableOpacity> */}
<TouchableOpacity style={styles.submitOrder} activeOpacity={.5} onPress={() => this._orderNow()}> <TouchableOpacity style={styles.submitOrder} activeOpacity={.5} onPress={() => this._orderNow()}>
<Text style={{ textAlign: 'center', bottom: 5, color: 'white', fontFamily: 'Gotham-Black' }}>ORDER NOW</Text> <Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 16 }}>ORDER NOW</Text>
</TouchableOpacity> </TouchableOpacity>
</Card> </Card>
{ {
...@@ -351,7 +351,7 @@ class Home extends React.Component { ...@@ -351,7 +351,7 @@ class Home extends React.Component {
<Text style={{ fontSize: 10, fontFamily: 'Gotham-Light' }}>BALANCE</Text> <Text style={{ fontSize: 10, fontFamily: 'Gotham-Light' }}>BALANCE</Text>
</View> </View>
<View style={{ flex: 0.8, alignItems:'center'}}> <View style={{ flex: 0.8, alignItems:'center'}}>
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.balance}</Text> <Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.balance}</Text>
</View> </View>
</View> </View>
...@@ -366,7 +366,7 @@ class Home extends React.Component { ...@@ -366,7 +366,7 @@ class Home extends React.Component {
<Text style={{ fontSize: 10, fontFamily: 'Gotham-Light' }}>POINTS</Text> <Text style={{ fontSize: 10, fontFamily: 'Gotham-Light' }}>POINTS</Text>
</View> </View>
<View style={{ flex: 0.8,alignItems:'center' }}> <View style={{ flex: 0.8,alignItems:'center' }}>
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.point}</Text> <Text style={{ fontSize: 14, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.point}</Text>
</View> </View>
</View> </View>
</Card> </Card>
...@@ -378,14 +378,14 @@ class Home extends React.Component { ...@@ -378,14 +378,14 @@ class Home extends React.Component {
// style={styles.submitUpgradePemium} // style={styles.submitUpgradePemium}
activeOpacity={.5} onPress={() => this.props.navigation.navigate('TopUpInfo')}> activeOpacity={.5} onPress={() => this.props.navigation.navigate('TopUpInfo')}>
<View style={styles.topUseBalance}> <View style={styles.topUseBalance}>
<Text style={{ textAlign: 'center', bottom: 5, color: 'white', fontFamily: 'Gotham-Black' }}>TOP BALANCE </Text> <Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 16 }}>TOP BALANCE </Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity <TouchableOpacity
// style={styles.submitUpgradePemium} // style={styles.submitUpgradePemium}
activeOpacity={.5} onPress={this.onPress}> activeOpacity={.5} onPress={this.onPress}>
<View style={styles.topUseBalance}> <View style={styles.topUseBalance}>
<Text style={{ textAlign: 'center', bottom: 5, color: 'white', fontFamily: 'Gotham-Black' }}>USE BALANCE </Text> <Text style={{ textAlign: 'center', color: 'white', fontFamily: 'Gotham-Black', fontSize: 16 }}>USE BALANCE </Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
...@@ -456,9 +456,9 @@ const styles = StyleSheet.create({ ...@@ -456,9 +456,9 @@ const styles = StyleSheet.create({
}, },
submitOrder: { submitOrder: {
height:40,
margin: 10, margin: 10,
paddingTop: 10, paddingTop:10,
paddingBottom: -5,
backgroundColor: '#CFB368', backgroundColor: '#CFB368',
borderRadius: 10, borderRadius: 10,
borderWidth: 0, borderWidth: 0,
...@@ -467,11 +467,12 @@ const styles = StyleSheet.create({ ...@@ -467,11 +467,12 @@ const styles = StyleSheet.create({
topUseBalance: { topUseBalance: {
flex: 0.5, flex: 0.5,
height:40,
backgroundColor: 'green', backgroundColor: 'green',
top: 20, top: 20,
margin: 5, margin:5,
padding: 10, padding: 10,
paddingHorizontal: 23, paddingHorizontal: 15,
borderRadius: 10, borderRadius: 10,
backgroundColor: '#CFB368', backgroundColor: '#CFB368',
paddingBottom: -5 paddingBottom: -5
......
view/RewardDetail.js
View file @ 5bb056a4
...@@ -16,7 +16,7 @@ class RewardDetail extends React.Component { ...@@ -16,7 +16,7 @@ class RewardDetail extends React.Component {
image: '', image: '',
title: '', title: '',
subtitle: '', subtitle: '',
content: "", content: '',
expire: '', expire: '',
code: '', code: '',
used: '', used: '',
...@@ -93,18 +93,19 @@ class RewardDetail extends React.Component { ...@@ -93,18 +93,19 @@ class RewardDetail extends React.Component {
render() { render() {
console.log(this.state.content)
return ( return (
<View style={styles.container}> <View style={styles.container}>
<ScrollView> <ScrollView>
<View style={styles.images}> <View style={styles.images}>
<Image style={{ height: 250, width: '100%' }} source={this.state.image ? { uri: this.state.image } : null} /> <Image style={{ height: 250, width: '100%' }} source={this.state.image ? { uri: this.state.image } : null} />
<View style={styles.voucher_code}> <View style={styles.voucher_code}>
<Text style={styles.text_voucher}>Voucher Code : </Text> <Text style={styles.text_voucher}>VOUCHER CODE : </Text>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 18, textAlign: 'center', marginBottom: 5, top: 15 }}>{this.state.code}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 20, textAlign: 'center', marginBottom: 5, top: 15 }}>{this.state.code}</Text>
</View> </View>
<View style={styles.expire_time}> <View style={styles.expire_time}>
<Text style={styles.text_expire}>Expire Time : </Text> <Text style={styles.text_expire}>EXPIRE TIME : </Text>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 20, textAlign: 'center', marginBottom: 5, top: 7 }}>{this.state.expire}</Text> <Text style={{ fontFamily: 'Gotham-Light', color: 'white', fontSize: 14, textAlign: 'center', marginBottom: 5, top: 7 }}>{this.state.expire}</Text>
</View> </View>
</View> </View>
...@@ -113,32 +114,34 @@ class RewardDetail extends React.Component { ...@@ -113,32 +114,34 @@ class RewardDetail extends React.Component {
<View style={{ marginRight: 5, marginLeft: 5 }}> <View style={{ marginRight: 5, marginLeft: 5 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 15 }}>{this.state.title}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 15 }}>{this.state.title}</Text>
</View> </View>
<View style={{ marginRight: 20, marginLeft: 20 }}> <View
<HTML html={this.state.content} /> style={{ marginHorizontal:20 }}
>
<HTML html={this.state.content} tagsStyles={{ p: {fontFamily: 'Gotham-Light', marginTop: 8, marginBottom: 8}, blockquote: { backgroundColor: "#f1f1f1", padding: 12, paddingBottom: 0, marginTop: 6 } }}/>
</View> </View>
</View> </View>
<View style={styles.content}> <View style={styles.content}>
{this.state.cur_time >= this.state.exp_time ? ( {this.state.cur_time >= this.state.exp_time ? (
<View style={{ flex: 1, height: 50, marginRight: 70, marginLeft: 70, justifyContent: 'center' }}> <View style={{ flex: 1, height: 50, marginRight: 70, marginLeft: 70, justifyContent: 'center' }}>
<TouchableOpacity> <TouchableOpacity>
<View style={{ height: 50, borderRadius: 20, backgroundColor: 'red' }}> <View style={{ height: 40, borderRadius: 10, backgroundColor: 'red' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 20, textAlign: 'center', margin: 15 }}>EXPIRED</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center', margin: 11 }}>EXPIRED</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
) )
: this.state.used == 0 ? ( : this.state.used == 0 ? (
<View style={{ flex: 1, height: 50, marginRight: 70, marginLeft: 70, justifyContent: 'center' }}> <View style={{ flex: 1, height: 50, marginRight: 70, marginLeft: 70, justifyContent: 'center'}}>
<TouchableOpacity onPress={() => this.useVoucher()}> <TouchableOpacity onPress={() => this.useVoucher()}>
<View style={{ height: 50, borderRadius: 20, backgroundColor: '#CFB368' }}> <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 20, textAlign: 'center', margin: 15 }}>USE VOUCHER</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center', margin: 11 }}>USE VOUCHER</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
) : ( ) : (
<TouchableOpacity onPress={() => this.useDVoucher()}> <TouchableOpacity onPress={() => this.useDVoucher()}>
<View style={{ height: 50, borderRadius: 20, backgroundColor: '#CFB368' }}> <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 20, textAlign: 'center', margin: 15 }}>USED VOUCHER</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center', margin: 11 }}>USED VOUCHER</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
)} )}
...@@ -166,24 +169,24 @@ const styles = StyleSheet.create({ ...@@ -166,24 +169,24 @@ const styles = StyleSheet.create({
height: 70, height: 70,
marginLeft: 20, marginLeft: 20,
marginRight: 20, marginRight: 20,
backgroundColor: '#01919c', backgroundColor: '#CFB368',
flex: 1, flex: 1,
marginTop: -140 marginTop: -140
}, },
expire_time: { expire_time: {
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Light',
flex: 1, flex: 1,
marginLeft: 20, marginLeft: 20,
marginRight: 20, marginRight: 20,
height: 70, height: 70,
justifyContent:'center', justifyContent:'center',
backgroundColor: 'black', backgroundColor: '#838383',
}, },
text_voucher: { text_voucher: {
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Light',
fontSize: 14, fontSize: 14,
marginLeft: 10, marginLeft: 10,
top:5, top:5,
...@@ -200,8 +203,8 @@ const styles = StyleSheet.create({ ...@@ -200,8 +203,8 @@ const styles = StyleSheet.create({
}, },
text_expire: { text_expire: {
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Light',
fontSize: 15, fontSize: 14,
marginLeft: 10, marginLeft: 10,
top: 5, top: 5,
color: 'white' color: 'white'
......
view/RewardsList.js
View file @ 5bb056a4
...@@ -103,7 +103,7 @@ const styles = StyleSheet.create({ ...@@ -103,7 +103,7 @@ const styles = StyleSheet.create({
}, },
header: { header: {
flex: 0.1, flex: 0.1,
backgroundColor: '#ccb46c', backgroundColor: '#CFB368',
justifyContent: 'center' justifyContent: 'center'
}, },
......
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