Skip to content

N
new_excelso
Commit 9dc2f308 authored by Wahyu Adjie Prasetyo's avatar Wahyu Adjie Prasetyo
Browse files
Options

revisi design 2

parent 15e98619
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 84 deletions
app.json
View file @ 9dc2f308
{
"expo": {
"name": "Excelso_update 09.00 / 20.05.2020",
"name": "Excelso_update 17.00 / 22.05.2020",
"slug": "excelso-pro",
"privacy": "public",
"sdkVersion": "36.0.0",
......
redux/globalActionType.js
View file @ 9dc2f308
......@@ -37,7 +37,8 @@ const ActionType = {
SET_CORDINAT :'SET_CORDINAT',
SET_TRANS_ID:'SET_TRANS_ID',
CHANGE_TO_CHART:'CHANGE_TO_CHART',
SET_VOUCHER:'SET_VOUCHER'
SET_VOUCHER:'SET_VOUCHER',
SET_EDIT_NOTE:'SET_EDIT_NOTE'
}
export default ActionType;
\ No newline at end of file
view/Account.js
View file @ 9dc2f308
......@@ -176,29 +176,22 @@ class Account extends React.Component {
return (
<View style={styles.container}>
<ScrollView>
<View style={{ flex: 1, height: 90, top: 30 }}>
<View style={{ flex: 1, height: 90 }}>
<View style={{ alignSelf: 'center' }}>
<Image
style={{ height: 70, width: 70, top: 5, justifyContent: 'center' }}
style={{ height: 70, width: 70, justifyContent: 'center',top:20 }}
source={require('../assets/images/people-actv.png')}
/>
</View>
<Text style={{ fontFamily: 'Gotham-Black', color: 'grey', fontSize: 17, textAlign: 'center', top: 5 }}>
{/* {this.state.full_name} */}
</Text>
<View style={{ height: 90, flexDirection: 'row', justifyContent: 'center' }}>
<TouchableOpacity style={{ flexDirection: 'row' }} onPress={() => this.props.navigation.navigate('Profile')}>
<View style={{ height: 90, justifyContent: 'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 17, textAlign: 'center', top: 10 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 18, textAlign: 'center' }}>
{this.state.full_name}
</Text>
<Icon
containerStyle={{ margin: 5 }}
name='ios-create'
type='ionicon'
color='#CFB368'
/>
<TouchableOpacity onPress={() => this.props.navigation.navigate('Profile')}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 18, textAlign: 'center',top:2 }}>
View Profil
</Text>
</TouchableOpacity>
</View>
</View>
......@@ -216,9 +209,9 @@ class Account extends React.Component {
</View>
<View style={{ flex: 1, height: 250 }}>
<TouchableOpacity style={{ top: 20, marginLeft: 10, marginRight: 10, justifyContent: 'center' }} onPress={() => this.logout()}>
<TouchableOpacity style={{ top: 20, marginLeft: 15, marginRight: 15, justifyContent: 'center' }} onPress={() => this.logout()}>
<View style={{ height: 40, borderRadius: 20, backgroundColor: '#CFB368', justifyContent: 'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 20, textAlign: 'center', margin: 15 }}>LOGOUT</Text>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center', margin: 15 }}>LOGOUT</Text>
</View>
</TouchableOpacity>
<View style={styles.v_logo}>
......@@ -235,7 +228,7 @@ class Account extends React.Component {
<View>
<View style={styles.Card}>
<View style={styles.card}>
<Card style={{ padding: 20, alignContent: 'center' }}>
<Card style={{ padding: 10, alignContent: 'center' }}>
<View style={{ flexDirection: 'row', flex: 1, paddingBottom: 5 }}>
<View style={{ flex: 0.5 }}>
......@@ -277,23 +270,24 @@ class Account extends React.Component {
</View>
</View>
<TouchableOpacity style={styles.submitTopUp} activeOpacity={.5} onPress={() => this.props.navigation.navigate('TopUpInfo')}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#fff', textAlign: 'center' }}>TOP UP BALANCE</Text>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center' }}>TOP UP BALANCE</Text>
</TouchableOpacity>
<View style={{ padding: 10, margin: 10, height: 200, top: 20 }}>
<ImageBackground style={{ width: '100%', height: '100%', padding: 0, margin: 0 }} resizeMode='stretch' source={this.state.img_card ? { uri: this.state.img_card } : null}>
<View style={{ justifyContent: 'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', margin: 15, fontSize: 20, color: '#c9af6d', top: 120 }}>
<Text style={{ fontFamily: 'Gotham-Black', margin: 15, fontSize: 14, color: '#c9af6d', top: 120 }}>
{this.state.account_number}
</Text>
</View>
</ImageBackground>
</View>
<View style={{marginLeft:20,marginRight:20,padding:5}}>
<View style={{ flex: 1, flexDirection: 'row', justifyContent: 'center', top: 10 }}>
<TouchableOpacity style={{ marginBottom: 10 }} onPress={() => this.TransferBalance()} >
<Card style={{ height: 100, width: 160 }}>
<View style={{ height: 50, alignItems: 'center' }}>
<MaterialIcons name="monetization-on" size={30} color="gray" style={{ top: 20 }} />
<View style={{ height: 50, alignItems: 'center',padding:10 }}>
<MaterialIcons name="monetization-on" size={30} color="gray" style={{ top: 10 }} />
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 30, fontSize: 14 }}>TRANSFER BALANCE</Text>
</View>
</Card>
......@@ -301,30 +295,51 @@ class Account extends React.Component {
<View style={{ width: 5 }}></View>
<TouchableOpacity>
<Card style={{ height: 100, width: 160 }}>
<View style={{ height: 50, alignItems: 'center' }}>
<AntDesign name="shoppingcart" size={30} color="gray" style={{ top: 20 }} />
<View style={{ height: 50, alignItems: 'center',padding:10 }}>
<AntDesign name="shoppingcart" size={30} color="gray" style={{ top: 10 }} />
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 30, fontSize: 14 }}>BALANCE / POINT</Text>
</View>
</Card>
</TouchableOpacity>
</View>
<View style={{ flex: 1, flexDirection: 'row', justifyContent: 'center', top: 10 }}>
<TouchableOpacity style={{ marginBottom: 10 }} onPress={() => this.TransferBalance()} >
<Card style={{ height: 100, width: 160 }}>
<View style={{ height: 50, alignItems: 'center',padding:10 }}>
<MaterialIcons name="autorenew" size={30} color="gray" style={{ top: 10 }} />
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 20, fontSize: 14,margin:5 }}>RENEWAL</Text>
</View>
</Card>
</TouchableOpacity>
<View style={{ width: 5 }}></View>
<TouchableOpacity style={{ marginBottom: 10 }} onPress={() => this.props.navigation.navigate('Transaction History')} >
<Card style={{ height: 100, width: 160 }}>
<View style={{ height: 50, alignItems: 'center',padding:10 }}>
<MaterialIcons name="autorenew" size={30} color="gray" style={{ top: 10 }} />
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 20, fontSize: 14,margin:5}}>TRANSACTION HISTORY</Text>
</View>
</Card>
</TouchableOpacity>
</View>
{/* <View style={{ flex: 1, flexDirection: 'row', justifyContent: 'center', top: 5}}>
<TouchableOpacity onPress={() => this.props.navigation.navigate('Renewal')} style={{ marginBottom: 20 }}>
<Card style={{ height: 100, width: 160 }}>
<View style={{ height: 50, alignItems: 'center' }}>
<View style={{ height: 50, alignItems: 'center',padding:5 }}>
<MaterialIcons name="autorenew" size={30} color="gray" style={{ top: 20 }} />
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 30, fontSize: 14 }}>RENEWAL</Text>
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 20, fontSize: 14,margin:5 }}>RENEWAL</Text>
</View>
</Card>
</TouchableOpacity>
<TouchableOpacity onPress={() => this.props.navigation.navigate('Transaction History')} style={{ marginBottom: 20, marginRight: 5, marginLeft: 5 }}>
<Card style={{ height: 100, width: 160 }}>
<View style={{ height: 50, alignItems: 'center' }}>
<View style={{ height: 50, alignItems: 'center',padding:5 }}>
<MaterialIcons name="autorenew" size={30} color="gray" style={{ top: 20 }} />
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 30, fontSize: 14 }}>TRANSACTION HISTORY</Text>
<Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', top: 20, fontSize: 14,margin:5}}>TRANSACTION HISTORY</Text>
</View>
</Card>
</TouchableOpacity>
</View> */}
</View>
<View style={{ flex: 1, flexDirection: 'row', justifyContent: 'center', top: 10 }}>
{this.state.premium === false ? (
......@@ -342,8 +357,8 @@ class Account extends React.Component {
</View>
<View style={{ flex: 1 }}>
<TouchableOpacity onPress={() => this.logout()}>
<View style={{ height: 50, borderRadius: 20, backgroundColor: '#CFB368', margin: 20 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 20, textAlign: 'center', margin: 15 }}>LOGOUT</Text>
<View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368',justifyContent:'center',marginLeft:20,marginRight:20,marginBottom:10,padding:10,top:5,bottom:5 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center' }}>LOGOUT</Text>
</View>
</TouchableOpacity>
......@@ -380,12 +395,16 @@ const styles = StyleSheet.create({
top: 50,
alignItems: 'center',
alignContent: 'center',
marginRight:10,
marginLeft:10,
},
card: {
top: 20,
flex: 1,
alignItems: 'center'
alignItems: 'center',
marginRight:10,
marginLeft:10
},
line: {
......@@ -416,11 +435,11 @@ const styles = StyleSheet.create({
},
submitTopUp: {
marginTop: 70,
top: 20,
paddingTop: 15,
paddingBottom: 15,
marginLeft: 15,
marginRight: 15,
top:10,
height:40,
marginLeft: 20,
justifyContent:'center',
marginRight: 20,
backgroundColor: '#c9af6d',
borderRadius: 10,
borderWidth: 0,
......
view/Item.js
View file @ 9dc2f308
......@@ -42,6 +42,12 @@ class Item extends React.Component {
})
}
handleEdit() {
const edit_note = {
note: this.state.note
}
}
render() {
const { item } = this.props
// console.log("ini id itemnya "+item.id)
......@@ -192,7 +198,7 @@ const styles = StyleSheet.create({
},
button: {
backgroundColor: '#CFB368',
padding:20,
padding: 20,
borderRadius: 10,
paddingVertical: 5,
alignItems: 'center',
......
view/MenuSelection.js
View file @ 9dc2f308
......@@ -26,7 +26,8 @@ class MenuSelection extends React.Component {
list_cart: [],
indicator: true,
my_lat: 0,
my_long: 0
my_long: 0,
note :''
}
}
......@@ -232,6 +233,9 @@ class MenuSelection extends React.Component {
}
clearNegatif(item, index) {
const list_order_item = this.props.order_item;
for (let i = 0; i < list_order_item.length; index++) {
......
view/Outlets.js
View file @ 9dc2f308
......@@ -107,7 +107,7 @@ class Outlets extends React.Component {
}
dataOutlets[i]['full_address'] = address;
console.log("INI YAA: "+JSON.stringify(dataOutlets));
console.log("INI YAA: " + JSON.stringify(dataOutlets));
}
this.setState({
......@@ -226,36 +226,37 @@ class Outlets extends React.Component {
RenderItem = ({ item }) => {
return (
<View style={{ flexDirection: 'row', flex: 1 }}>
<View style={{ flexDirection: 'row', flex: 6 }}>
<View style={styles.list_addrees}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#ccb46c', fontSize: 20, margin: 5 }}>{item.name}</Text>
<Text style={{ fontFamily: 'Gotham-Light', color: '#b1b1b2', fontSize: 15, margin: 5 }}>{item.full_address}</Text>
<Text style={{ fontFamily: 'Gotham-Black', color: '#ccb46c', fontSize: 18, margin: 5 }}>{item.name}</Text>
<Text style={{ fontFamily: 'Gotham-Light', color: '#b1b1b2', fontSize: 12, margin: 5 }}>{item.full_address}</Text>
<Text style={{ fontFamily: 'Gotham-Light', margin: 5, color: '#aeaead' }}>
{item.distance} KM
</Text>
</View>
<View style={{ flex: 1,top:20 }}>
<TouchableOpacity onPress={() => { Linking.openURL('tel:'+ item.phone) }}>
<View style={{flex:4,flexDirection:'row'}}>
<View style={{ flex: 2, top: 20 }}>
<TouchableOpacity onPress={() => { Linking.openURL('tel:' + item.phone) }}>
<Icon
name='ios-call'
type='ionicon'
color='grey'
size={40}
size={30}
/>
</TouchableOpacity>
</View>
<View style={{ flex: 1,top:20 }}>
<TouchableOpacity onPress={() => Linking.openURL('https://www.google.com/maps/dir/?api=1&destination=' + item.lat +' '+ item.long)}>
<View style={{ flex: 2, top: 20 }}>
<TouchableOpacity onPress={() => Linking.openURL('https://www.google.com/maps/dir/?api=1&destination=' + item.lat + ' ' + item.long)}>
<Icon
name='ios-navigate'
type='ionicon'
color='grey'
size={40}
size={30}
/>
</TouchableOpacity>
</View>
</View>
</View>
);
}
render() {
......@@ -334,7 +335,7 @@ const styles = StyleSheet.create({
flex: 1,
},
list_addrees: {
flex: 3,
flex: 6,
margin: 20,
},
......
view/ProfilePage.js
View file @ 9dc2f308
......@@ -105,52 +105,45 @@ class ProfilePage extends PureComponent {
</Text>
</View>
<View style={{ flex: 3 }}>
<View style={{ flex: 1, margin: 20,top:20 }}>
<View style={{ flex: 1, margin: 20,top:10}}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Email</Text>
<TextInput style={{ height: 40, borderWidth: 1, padding: 5, margin: 10, borderRadius: 10, borderColor: 'grey', fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }}
<TextInput style={{ height: 40, padding: 5, fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }}
editable={false} value={this.state.email}>
</TextInput>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Date of Birth</Text>
<TextInput style={{ height: 40, borderWidth: 1, padding: 5, margin: 10, borderRadius: 10, borderColor: 'grey', fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }}
<TextInput style={{ height: 40, padding: 5, margin: 10, fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }}
editable={false}>
{this.state.dob_day} / {this.state.dob_month} / {this.state.dob_year}
</TextInput>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Gender</Text>
<TextInput style={{ height: 40, borderWidth: 1, padding: 5, margin: 10, borderRadius: 10, borderColor: 'grey', fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }}
<TextInput style={{ height: 40, padding: 5, margin: 10, fontFamily: 'Gotham-Black', textAlign: 'center', color: 'grey', fontWeight: 'bold', fontSize: 20 }}
editable={false} value={this.state.gender}>
</TextInput>
</View>
</View>
<View style={{ flex: 2 }}>
<View style={{ flex: 1 }}>
<View style={{ flexDirection: 'row', top: 10, margin: 5,marginRight:20,marginLeft:20 }}>
<View style={{ flex: 1, margin: 5 }}>
<TouchableHighlight title="Edit" onPress={() => this.handleChangeProfil()}>
<View style={{ height: 60, borderRadius: 20, backgroundColor: '#CFB368' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 19, textAlign: 'center', margin: 15 }}>Edit</Text>
</View>
</TouchableHighlight>
</View>
<View style={{ top: 10, margin: 5,marginRight:20,marginLeft:20 }}>
<View style={{ flex: 1, margin: 5 }}>
<TouchableOpacity title="Edit" onPress={() => this.props.navigation.navigate('Change password')}>
<View style={{ height: 60, borderRadius: 20, backgroundColor: '#CFB368' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center', margin: 15 }}>Change Password</Text>
<View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368',justifyContent:'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center' }}>Change Password</Text>
</View>
</TouchableOpacity>
</View>
</View>
<View style={{ flex: 1, flexDirection: 'row', top: 10, margin: 5, marginRight:20,marginLeft:20 }}>
<View style={{ flex: 1, top: 10, margin: 5, marginRight:20,marginLeft:20 }}>
<View style={{ flex: 1, margin: 5 }}>
<TouchableOpacity title="Edit" onPress={() => this.props.navigation.navigate('Change language')}>
<View style={{ height: 60, borderRadius: 20, backgroundColor: '#CFB368' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 19, textAlign: 'center', margin: 15 }}>Language</Text>
<View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368',justifyContent:'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center' }}>Language</Text>
</View>
</TouchableOpacity>
</View>
<View style={{ flex: 1, margin: 5 }}>
<TouchableOpacity title="Edit" onPress={() => this.logout()}>
<View style={{ height: 60, borderRadius: 20, backgroundColor: '#CFB368' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 19, textAlign: 'center', margin: 15 }}>Logout</Text>
<View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368',justifyContent:'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center' }}>Logout</Text>
</View>
</TouchableOpacity>
</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