Skip to content

N
new_excelso
Commit 7446a597 authored by Afid's avatar Afid
Browse files
Options

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

parents 3c311b79 470fab22
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 81 deletions
view/Home.js
View file @ 7446a597
......@@ -259,22 +259,22 @@ class Home extends React.Component {
<Text style={{ textAlign: 'center', color: '#fff', fontWeight: 'bold' }}>{i18n.t('pickup')}</Text>
</TouchableOpacity> */}
<TouchableOpacity style={styles.buttonDelivery} onPress={() => this._delivery()}>
<Text style={{ textAlign: 'center', color: '#354175', fontWeight: 'bold',fontFamily:'Gotham-Black' }}>DELIVERY</Text>
<Text style={{ textAlign: 'center', color: '#354175', fontFamily: 'Gotham-Black' }}>DELIVERY</Text>
</TouchableOpacity>
<TouchableOpacity style={styles.buttonPickup} onPress={() => this._pickup()}>
<Text style={{ textAlign: 'center', color: '#fff', fontWeight: 'bold',fontFamily:'Gotham-Black' }}>PICK UP</Text>
<Text style={{ textAlign: 'center', color: '#fff', fontFamily: 'Gotham-Black' }}>PICK UP</Text>
</TouchableOpacity>
</View>
{/* <Text style={{ textAlign: 'center', fontSize: 12, }}>
{i18n.t('orderInfo')}
</Text> */}
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily:'Gotham-Black' }}>
<Text style={{ textAlign: 'center', fontSize: 12, fontFamily: 'Gotham-Black' }}>
YOU WILL PICKUP YOUR ORDER AT
</Text>
{this.state.indicator == true ? (
<ActivityIndicator size="small" color="#c9af6d" />
) : (
<Text style={{ textAlign: "center", fontSize: 12, top: 5, fontWeight: 'bold' }}>
<Text style={{ textAlign: "center", fontSize: 12, top: 5, fontFamily: 'Gotham-Light' }}>
Excelso {this.props.name_outlet}
</Text>
)}
......@@ -282,7 +282,7 @@ class Home extends React.Component {
<Text style={{ textAlign: 'center', bottom: 5, color: 'white' }}>{i18n.t('orderNow')}</Text>
</TouchableOpacity> */}
<TouchableOpacity style={styles.submitOrder} activeOpacity={.5} onPress={() => this._orderNow()}>
<Text style={{ textAlign: 'center', bottom: 5, color: 'white' }}>ORDER NOW</Text>
<Text style={{ textAlign: 'center', bottom: 5, color: 'white', fontFamily: 'Gotham-Black' }}>ORDER NOW</Text>
</TouchableOpacity>
</Card>
{
......@@ -290,7 +290,7 @@ class Home extends React.Component {
this.state.account_number === "" ? (
<View style={styles.card}>
<Card style={{ padding: 10, margin: 10, alignContent: 'center' }}>
<Text style={{ textAlign: "center" }}> Anda belum aktivasi kartu</Text>
<Text style={{ textAlign: "center", fontFamily: 'Gotham-Light' }}> Anda belum aktivasi kartu</Text>
<Text>
</Text>
<Text style={{ textAlign: "center", fontSize: 40, color: '#c9af6d' }}>
......@@ -316,16 +316,16 @@ class Home extends React.Component {
{/* <Text>
YOUR CARD NUMBER | {this.state.expire_date}
</Text> */}
<View style={{ flexDirection: 'row', flex: 1 }}>
<View style={{ flexDirection: 'row', flex: 1, paddingBottom:5 }}>
<View style={{ flex: 0.5 }}>
<Text style={{ fontSize: 9 ,fontFamily:'Gotham-Black'}}>YOUR CARD NUMBER</Text>
<Text style={{ fontSize: 10, fontFamily: 'Gotham-Light' }}>YOUR CARD NUMBER</Text>
</View>
<View style={{ flex: 0.5 }}>
<Text style={{ fontSize: 9, textAlign: 'right',fontFamily:'Gotham-Black' }}>Expired At {this.state.expire_date}</Text>
<Text style={{ fontSize: 10, textAlign: 'right', fontFamily: 'Gotham-Light' }}>Expired At {this.state.expire_date}</Text>
</View>
</View>
<View style={{ paddingHorizontal: 10 }}>
<Text style={{ textAlign: "center", fontSize: 30, color: '#c9af6d',fontFamily:'Gotham-Black' }}>
<Text style={{ textAlign: "center", fontSize: 30, color: '#c9af6d', fontFamily: 'Gotham-Black' }}>
{this.state.account_number}
</Text>
</View>
......@@ -337,12 +337,12 @@ class Home extends React.Component {
</Text> */}
<View style={{ flexDirection: 'row', flex: 1 }}>
<View style={{ flex: 0.3, justifyContent: 'center' }}>
<View style={{ flex: 0.2, justifyContent: 'center' }}>
{/* <Text>{i18n.t('balance')}</Text> */}
<Text style={{ fontSize: 10 }}>BALANCE</Text>
<Text style={{ fontSize: 10, fontFamily: 'Gotham-Light' }}>BALANCE</Text>
</View>
<View style={{ flex: 0.7 }}>
<Text style={{ fontSize: 20 }}>IDR. {this.state.balance}</Text>
<View style={{ flex: 0.8, alignItems:'center'}}>
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.balance}</Text>
</View>
</View>
......@@ -352,12 +352,12 @@ class Home extends React.Component {
{i18n.t('point')} {this.state.point}
</Text> */}
<View style={{ flexDirection: 'row', flex: 1 }}>
<View style={{ flex: 0.3, justifyContent: 'center' }}>
<View style={{ flex: 0.2, justifyContent: 'center' }}>
{/* <Text>{i18n.t('balance')}</Text> */}
<Text style={{ fontSize: 10 }}>POINTS</Text>
<Text style={{ fontSize: 10, fontFamily: 'Gotham-Light' }}>POINTS</Text>
</View>
<View style={{ flex: 0.7 }}>
<Text style={{ fontSize: 20 }}>IDR. {this.state.point}</Text>
<View style={{ flex: 0.8,alignItems:'center' }}>
<Text style={{ fontSize: 20, fontFamily: 'Gotham-Black', color:'gray' }}>IDR {this.state.point}</Text>
</View>
</View>
</Card>
......@@ -369,14 +369,14 @@ class Home extends React.Component {
// style={styles.submitUpgradePemium}
activeOpacity={.5} onPress={this.onPress}>
<View style={styles.topUseBalance}>
<Text style={{ textAlign: 'center', bottom: 5, color: 'white' }}>TOP BALANCE </Text>
<Text style={{ textAlign: 'center', bottom: 5, color: 'white', fontFamily: 'Gotham-Black' }}>TOP BALANCE </Text>
</View>
</TouchableOpacity>
<TouchableOpacity
// style={styles.submitUpgradePemium}
activeOpacity={.5} onPress={this.onPress}>
<View style={styles.topUseBalance}>
<Text style={{ textAlign: 'center', bottom: 5, color: 'white' }}>USE BALANCE </Text>
<Text style={{ textAlign: 'center', bottom: 5, color: 'white', fontFamily: 'Gotham-Black' }}>USE BALANCE </Text>
</View>
</TouchableOpacity>
</View>
......@@ -404,7 +404,8 @@ const styles = StyleSheet.create({
titleText: {
margin: 15,
fontSize: 18,
fontWeight: 'bold',
// fontWeight: 'bold',
fontFamily: 'Gotham-Black',
color: 'white',
// textAlign: 'center'
},
......@@ -447,9 +448,9 @@ const styles = StyleSheet.create({
submitOrder: {
margin: 10,
paddingTop: 15,
paddingBottom: 5,
backgroundColor: '#c9af6d',
paddingTop: 10,
paddingBottom: -5,
backgroundColor: '#CFB368',
borderRadius: 10,
borderWidth: 0,
borderColor: '#fff',
......@@ -459,9 +460,9 @@ const styles = StyleSheet.create({
flex: 0.5,
backgroundColor: 'green',
top: 20,
margin: 10,
margin: 5,
padding: 10,
paddingHorizontal: 30,
paddingHorizontal: 23,
borderRadius: 10,
backgroundColor: '#CFB368',
paddingBottom: -5
......
view/ItemShopingCart.js
View file @ 7446a597
......@@ -36,20 +36,20 @@ class ItemShoping extends React.Component {
<Image source={{ uri: item.image }} style={{ height: 100, width: 100, borderRadius: 5, top: 5 }}></Image>
</View>
<View >
<Text style={{ fontSize: 20, margin: 5, marginRight: 10, fontWeight: 'bold' }}>{item.name}</Text>
<Text style={{ fontSize: 15, margin: 5, marginRight: 10 }}>Rp. {item.price}</Text>
<Text style={{ fontSize: 20, margin: 5, marginRight: 10, fontFamily: 'Gotham-Black' }}>{item.name}</Text>
<Text style={{ fontSize: 15, margin: 5, marginRight: 10, fontFamily: 'Gotham-Light'}}>Rp. {item.price}</Text>
<View style={{ flexDirection: 'row', flex: 1 }}>
<View style={styles.shadowEdit}></View>
<View style={styles.shadowAdd}>
<TouchableOpacity onPress={() => this.props.handleMin()}>
<Text style={{ fontSize: 20, margin: 2 }}> - </Text>
<Text style={{ fontSize: 20, margin: 2, color:'#CFB368' }}> - </Text>
</TouchableOpacity>
<TextInput
style={{ height: 25, padding: 2, textAlign: 'center', margin: 2 }}
keyboardType={'numeric'}
onChangeText={(quantity) => this.handleChangeQuantity(item, quantity)}>{item.quantity}</TextInput>
<TouchableOpacity onPress={() => this.props.handleAdd()}>
<Text style={{ fontSize: 20, margin: 2 }}> + </Text>
<Text style={{ fontSize: 20, margin: 2, color:'#CFB368'}}> + </Text>
</TouchableOpacity>
</View>
</View>
......
view/ShoppingCart.js
View file @ 7446a597
This diff is collapsed.
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