Skip to content

N
new_excelso
Commit 1aa2ff3b authored by Trisno's avatar Trisno
Browse files
Options

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

parents 9db5e26d 56233833
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 44 deletions
assets/icon/1.png 0 → 100644
View file @ 1aa2ff3b
This diff is collapsed.
assets/icon/2.png 0 → 100644
View file @ 1aa2ff3b
This diff is collapsed.
assets/icon/3.png 0 → 100644
View file @ 1aa2ff3b
This diff is collapsed.
assets/icon/4.png 0 → 100644
View file @ 1aa2ff3b
This diff is collapsed.
view/Account.js
View file @ 1aa2ff3b
...@@ -207,7 +207,7 @@ class Account extends React.Component { ...@@ -207,7 +207,7 @@ class Account extends React.Component {
</View> </View>
<View style={{ flex: 1, height: 250 }}> <View style={{ flex: 1, height: 250 }}>
<TouchableOpacity style={{ top: 20, marginLeft: 15, marginRight: 15, justifyContent: 'center' }} onPress={() => this.logout()}> <TouchableOpacity style={{ top: 10, marginLeft: 15, marginRight: 15, justifyContent: 'center' }} onPress={() => this.logout()}>
<View style={{ height: 40, borderRadius: 20, backgroundColor: '#CFB368', justifyContent: 'center' }}> <View style={{ height: 40, borderRadius: 20, backgroundColor: '#CFB368', justifyContent: 'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center', margin: 15 }}>LOGOUT</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center', margin: 15 }}>LOGOUT</Text>
</View> </View>
...@@ -293,41 +293,53 @@ class Account extends React.Component { ...@@ -293,41 +293,53 @@ class Account extends React.Component {
</ImageBackground> </ImageBackground>
</View> </View>
<View style={{ marginLeft: 20, marginRight: 20, padding: 5 }}> <View style={{ marginLeft: 20, marginRight: 20, padding: 5 }}>
<View style={{ flex: 1, flexDirection: 'row', justifyContent: 'center'}}> <View style={{ flex: 1, flexDirection: 'row', justifyContent: 'center' }}>
<TouchableOpacity style={{ marginBottom: 10 }} onPress={() => this.TransferBalance()} > <TouchableOpacity style={{ marginBottom:5}} onPress={() => this.TransferBalance()} >
<Card style={{ height: 100, width: 155 }}> <Card style={{ height: 120, width: 155 }}>
<View style={{ height: 50, alignItems: 'center', padding: 10 }}> <View style={{ height: 50, alignItems: 'center', padding: 10 }}>
<MaterialIcons name="monetization-on" size={30} color="gray" style={{ top: 10 }} /> <Image
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 10, fontSize: 14, color: '#838383' }}>TRANSFER BALANCE</Text> style={{ height: 50, width: 50, justifyContent: 'center' }}
source={require('../assets/icon/4.png')}
/>
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 5, fontSize: 14, color: '#838383' }}>TRANSFER BALANCE</Text>
</View> </View>
</Card> </Card>
</TouchableOpacity> </TouchableOpacity>
<View style={{ width: 5 }}></View> <View style={{ width: 5 }}></View>
<TouchableOpacity> <TouchableOpacity style={{ marginBottom:5}}>
<Card style={{ height: 100, width: 155 }}> <Card style={{ height: 120, width: 155 }}>
<View style={{ height: 50, alignItems: 'center', padding: 10 }}> <View style={{ height: 50, alignItems: 'center', padding: 10 }}>
<AntDesign name="shoppingcart" size={30} color="gray" style={{ top: 10 }} /> <Image
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 20, fontSize: 14, color: '#838383' }}>BALANCE / POINT</Text> style={{ height: 50, width: 50, justifyContent: 'center' }}
source={require('../assets/icon/2.png')}
/>
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 5, fontSize: 14, color: '#838383' }}>BALANCE / POINT</Text>
</View> </View>
</Card> </Card>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<View style={{ flex: 1, flexDirection: 'row', justifyContent: 'center', top: 10 }}> <View style={{ flex: 1, flexDirection: 'row', justifyContent: 'center'}}>
<TouchableOpacity style={{ marginBottom: 10 }} onPress={() => this.TransferBalance()} > <TouchableOpacity style={{ marginBottom: 10 }} onPress={() => this.TransferBalance()} >
<Card style={{ height: 100, width: 155 }}> <Card style={{ height: 120, width: 155 }}>
<View style={{ height: 50, alignItems: 'center', padding: 10 }}> <View style={{ height: 50, alignItems: 'center', padding: 10 }}>
<MaterialIcons name="autorenew" size={30} color="gray" style={{ top: 10 }} /> <Image
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 20, fontSize: 14, margin: 5, color: '#838383' }}>RENEWAL</Text> style={{ height: 50, width: 50, justifyContent: 'center' }}
source={require('../assets/icon/4.png')}
/>
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 5, fontSize: 14, margin: 5, color: '#838383' }}>RENEWAL</Text>
</View> </View>
</Card> </Card>
</TouchableOpacity> </TouchableOpacity>
<View style={{ width: 5 }}></View> <View style={{ width: 5 }}></View>
<TouchableOpacity style={{ marginBottom: 10 }} onPress={() => this.props.navigation.navigate('Transaction History')} > <TouchableOpacity style={{ marginBottom: 10 }} onPress={() => this.props.navigation.navigate('Transaction History')} >
<Card style={{ height: 100, width: 155 }}> <Card style={{ height: 120, width: 155 }}>
<View style={{ height: 50, alignItems: 'center', padding: 10 }}> <View style={{ height: 50, alignItems: 'center', padding: 10 }}>
<MaterialIcons name="autorenew" size={30} color="gray" style={{ top: 10 }} /> <Image
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 10, fontSize: 14, margin: 5, color: '#838383' }}>TRANSACTION HISTORY</Text> style={{ height: 50, width: 50, justifyContent: 'center' }}
source={require('../assets/icon/4.png')}
/>
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', fontSize: 14, margin: 5, color: '#838383' }}>TRANSACTION HISTORY</Text>
</View> </View>
</Card> </Card>
</TouchableOpacity> </TouchableOpacity>
...@@ -349,7 +361,7 @@ class Account extends React.Component { ...@@ -349,7 +361,7 @@ class Account extends React.Component {
</View> </View>
<View style={{ flex: 1 }}> <View style={{ flex: 1 }}>
<TouchableOpacity onPress={() => this.logout()}> <TouchableOpacity onPress={() => this.logout()}>
<View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', justifyContent: 'center', marginLeft: 20, marginRight: 20, marginBottom: 10, padding: 10, top: 5, bottom: 5 }}> <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', justifyContent: 'center', marginLeft: 20, marginRight: 20, marginBottom: 10, padding: 5, bottom: 5 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center' }}>LOGOUT</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center' }}>LOGOUT</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
......
view/AddreesDetail.js
View file @ 1aa2ff3b
...@@ -213,14 +213,17 @@ class AddreesDetail extends React.Component { ...@@ -213,14 +213,17 @@ class AddreesDetail extends React.Component {
</View> </View>
<View style={styles.name_addrees_input}> <View style={styles.name_addrees_input}>
<View style={{ flexDirection: 'row', top: 10,justifyContent:'center' }}> <View style={{ flexDirection: 'row', top: 10,justifyContent:'center' }}>
<View style={{flex:1,justifyContent:'center',flexDirection:'row'}}>
<MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" /> <MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" />
</View>
<View style={{ flex: 3 ,justifyContent:'center'}}> <View style={{ flex: 3 ,justifyContent:'center'}}>
<Text style={{ fontFamily: 'Gotham-Light',textAlign:'center' }}>{this.state.street}</Text> <Text style={{ fontFamily: 'Gotham-Light',textAlign:'center' }}>{this.state.street}</Text>
<Text style={{ fontFamily: 'Gotham-Light',textAlign:'center' }}>{this.state.city} </Text> <Text style={{ fontFamily: 'Gotham-Light',textAlign:'center' }}>{this.state.city} </Text>
<Text style={{fontFamily: 'Gotham-Light',textAlign:'center'}}>{this.state.region}</Text> <Text style={{fontFamily: 'Gotham-Light',textAlign:'center'}}>{this.state.region}</Text>
<Text style={{fontFamily: 'Gotham-Light',textAlign:'center'}}>{this.state.postalCode}</Text> <Text style={{fontFamily: 'Gotham-Light',textAlign:'center'}}>{this.state.postalCode}</Text>
</View> </View>
<View style={{flex:1}}>
</View>
</View> </View>
<View style={styles.field_name_addrees}> <View style={styles.field_name_addrees}>
<Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c",textAlign:'center',fontSize:18 }}>Label</Text> <Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c",textAlign:'center',fontSize:18 }}>Label</Text>
......
view/Auth.js
View file @ 1aa2ff3b
...@@ -156,7 +156,7 @@ class Auth extends React.Component { ...@@ -156,7 +156,7 @@ class Auth extends React.Component {
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'PROFIL' }, title: 'PROFILE'
}} /> }} />
<Stack.Screen name="Change Profil" component={ChangeProfile} options={{ <Stack.Screen name="Change Profil" component={ChangeProfile} options={{
headerStyle: { backgroundColor: '#CFB368' }, headerStyle: { backgroundColor: '#CFB368' },
...@@ -228,7 +228,7 @@ class Auth extends React.Component { ...@@ -228,7 +228,7 @@ class Auth extends React.Component {
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'PROFIL' }, title: 'PROFILE'
}} /> }} />
<Stack.Screen name="Change Profil" component={ChangeProfile} /> <Stack.Screen name="Change Profil" component={ChangeProfile} />
<Stack.Screen name="Change language" component={ChangeLanguage} <Stack.Screen name="Change language" component={ChangeLanguage}
......
view/DeliveryAddrees.js
View file @ 1aa2ff3b
...@@ -222,7 +222,7 @@ class DeliveryAddrees extends React.Component { ...@@ -222,7 +222,7 @@ class DeliveryAddrees extends React.Component {
<View style={styles.list_addrees}> <View style={styles.list_addrees}>
<TouchableOpacity onPress={() => this.onSave(item.address, item.id , item.name)}> <TouchableOpacity onPress={() => this.onSave(item.address, item.id , item.name)}>
<View style={{ flex: 1, flexDirection: 'row', margin: 5, }}> <View style={{ flex: 1, flexDirection: 'row', margin: 5, }}>
<View style={{ flex: 1, marginBottom: 10, justifyContent: 'center' }}> <View style={{ flex: 1, justifyContent: 'center' }}>
<View> <View>
<CheckBox <CheckBox
checkedIcon='dot-circle-o' checkedIcon='dot-circle-o'
...@@ -271,7 +271,7 @@ class DeliveryAddrees extends React.Component { ...@@ -271,7 +271,7 @@ class DeliveryAddrees extends React.Component {
<View style={styles.btn_addreess}> <View style={styles.btn_addreess}>
<TouchableOpacity onPress={() => this.addAdreess()}> <TouchableOpacity onPress={() => this.addAdreess()}>
<View style={{ height: 40, borderRadius: 10, marginRight: 70, marginLeft: 70, backgroundColor: '#CFB368', justifyContent: 'center', alignContent: 'center' }}> <View style={{ height: 40, borderRadius: 10, marginRight: 70, marginLeft: 70, backgroundColor: '#CFB368', justifyContent: 'center', alignContent: 'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', color: 'white', fontSize: 16 }}> + Tambah Alamat </Text> <Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', color: 'white', fontSize: 16 }}> Tambah Alamat </Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
...@@ -314,11 +314,13 @@ const styles = StyleSheet.create({ ...@@ -314,11 +314,13 @@ const styles = StyleSheet.create({
list_addrees: { list_addrees: {
flex: 1, flex: 1,
margin: 20, top:20,
marginLeft:20,
marginRight:20,
marginBottom:10,
borderWidth: 1, borderWidth: 1,
borderColor: 'grey', borderColor: '#838383',
borderRadius: 10, borderRadius: 10,
} }
}) })
......
view/PickupName.js
View file @ 1aa2ff3b
...@@ -279,13 +279,13 @@ class PickupName extends React.Component { ...@@ -279,13 +279,13 @@ class PickupName extends React.Component {
return ( return (
<View style={styles.container}> <View style={styles.container}>
<Spinner {/* <Spinner
visible={this.state.spinner} visible={this.state.spinner}
textContent={'Loading...'} textContent={'Loading...'}
textStyle={styles.spinnerTextStyle} textStyle={styles.spinnerTextStyle}
/> /> */}
<View style={styles.searchbar}> <View style={styles.searchbar}>
<View style={{ height: 45, borderRadius: 10, borderColor: '#ccb46c', borderWidth: 1, flexDirection: 'row' }}> <View style={{ height: 45, borderRadius: 10, borderColor: '#ccb46c', borderWidth: 1, flexDirection: 'row',backgroundColor:'red' }}>
<View style={{ flex: 1,top:5 }}> <View style={{ flex: 1,top:5 }}>
<MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" /> <MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" />
</View> </View>
...@@ -341,6 +341,7 @@ const styles = StyleSheet.create({ ...@@ -341,6 +341,7 @@ const styles = StyleSheet.create({
justifyContent: 'center', justifyContent: 'center',
marginRight: 20, marginRight: 20,
marginLeft:20, marginLeft:20,
backgroundColor:'green'
} }
}) })
......
view/ProfilePage.js
View file @ 1aa2ff3b
...@@ -106,19 +106,21 @@ class ProfilePage extends PureComponent { ...@@ -106,19 +106,21 @@ class ProfilePage extends PureComponent {
</View> </View>
<View style={{ flex: 3 }}> <View style={{ flex: 3 }}>
<View style={{ flex: 1, margin: 20,top:10}}> <View style={{ flex: 1, margin: 20,top:10}}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Email</Text> <View style={{top:20}}>
<TextInput style={{ height: 40, padding: 5, fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }} <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 18, textAlign: 'center' }}>Email</Text>
editable={false} value={this.state.email}> <Text style={{ fontFamily: 'Gotham-Black', color: '#838383', fontSize: 14, textAlign: 'center'}}>{this.state.email}</Text>
</TextInput> </View>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Date of Birth</Text>
<TextInput style={{ height: 40, padding: 5, margin: 10, fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }} <View style={{top:30}}>
editable={false}> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 18, textAlign: 'center'}}>Date of Birth</Text>
{this.state.dob_day} / {this.state.dob_month} / {this.state.dob_year} <Text style={{ fontFamily: 'Gotham-Black', color: '#838383', fontSize: 14, textAlign: 'center'}}>{this.state.dob_day} / {this.state.dob_month} / {this.state.dob_year}</Text>
</TextInput> </View>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Gender</Text>
<TextInput style={{ height: 40, padding: 5, margin: 10, fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }} <View style={{top:40,marginBottom:40}}>
editable={false} value={this.state.gender}> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 18, textAlign: 'center' }}>Gender</Text>
</TextInput> <Text style={{ fontFamily: 'Gotham-Black', color: '#838383', fontSize: 14, textAlign: 'center'}}>{this.state.gender}</Text>
</View>
</View> </View>
</View> </View>
<View style={{ flex: 2 }}> <View style={{ flex: 2 }}>
...@@ -132,7 +134,7 @@ class ProfilePage extends PureComponent { ...@@ -132,7 +134,7 @@ class ProfilePage extends PureComponent {
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</View> </View>
<View style={{ flex: 1, top: 10, margin: 5, marginRight:20,marginLeft:20 }}> <View style={{ flex: 1, margin: 5, marginRight:20,marginLeft:20 }}>
<View style={{ flex: 1, margin: 5 }}> <View style={{ flex: 1, margin: 5 }}>
<TouchableOpacity title="Edit" onPress={() => this.props.navigation.navigate('Change language')}> <TouchableOpacity title="Edit" onPress={() => this.props.navigation.navigate('Change language')}>
<View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368',justifyContent:'center' }}> <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368',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