Skip to content

C
clone_excelso
Commit 9dc2f308 authored by Wahyu Adjie Prasetyo's avatar Wahyu Adjie Prasetyo
Browse files
Options

revisi design 2

parent 15e98619
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 84 deletions
app.json
View file @ 9dc2f308
{ {
"expo": { "expo": {
"name": "Excelso_update 09.00 / 20.05.2020", "name": "Excelso_update 17.00 / 22.05.2020",
"slug": "excelso-pro", "slug": "excelso-pro",
"privacy": "public", "privacy": "public",
"sdkVersion": "36.0.0", "sdkVersion": "36.0.0",
......
redux/globalActionType.js
View file @ 9dc2f308
...@@ -37,7 +37,8 @@ const ActionType = { ...@@ -37,7 +37,8 @@ const ActionType = {
SET_CORDINAT :'SET_CORDINAT', SET_CORDINAT :'SET_CORDINAT',
SET_TRANS_ID:'SET_TRANS_ID', SET_TRANS_ID:'SET_TRANS_ID',
CHANGE_TO_CHART:'CHANGE_TO_CHART', CHANGE_TO_CHART:'CHANGE_TO_CHART',
SET_VOUCHER:'SET_VOUCHER' SET_VOUCHER:'SET_VOUCHER',
SET_EDIT_NOTE:'SET_EDIT_NOTE'
} }
export default ActionType; export default ActionType;
\ No newline at end of file
view/Account.js
View file @ 9dc2f308
This diff is collapsed.
view/Item.js
View file @ 9dc2f308
...@@ -42,6 +42,12 @@ class Item extends React.Component { ...@@ -42,6 +42,12 @@ class Item extends React.Component {
}) })
} }
handleEdit() {
const edit_note = {
note: this.state.note
}
}
render() { render() {
const { item } = this.props const { item } = this.props
// console.log("ini id itemnya "+item.id) // console.log("ini id itemnya "+item.id)
...@@ -192,7 +198,7 @@ const styles = StyleSheet.create({ ...@@ -192,7 +198,7 @@ const styles = StyleSheet.create({
}, },
button: { button: {
backgroundColor: '#CFB368', backgroundColor: '#CFB368',
padding:20, padding: 20,
borderRadius: 10, borderRadius: 10,
paddingVertical: 5, paddingVertical: 5,
alignItems: 'center', alignItems: 'center',
......
view/MenuSelection.js
View file @ 9dc2f308
...@@ -26,7 +26,8 @@ class MenuSelection extends React.Component { ...@@ -26,7 +26,8 @@ class MenuSelection extends React.Component {
list_cart: [], list_cart: [],
indicator: true, indicator: true,
my_lat: 0, my_lat: 0,
my_long: 0 my_long: 0,
note :''
} }
} }
...@@ -232,6 +233,9 @@ class MenuSelection extends React.Component { ...@@ -232,6 +233,9 @@ class MenuSelection extends React.Component {
} }
clearNegatif(item, index) { clearNegatif(item, index) {
const list_order_item = this.props.order_item; const list_order_item = this.props.order_item;
for (let i = 0; i < list_order_item.length; index++) { 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 { ...@@ -107,7 +107,7 @@ class Outlets extends React.Component {
} }
dataOutlets[i]['full_address'] = address; dataOutlets[i]['full_address'] = address;
console.log("INI YAA: "+JSON.stringify(dataOutlets)); console.log("INI YAA: " + JSON.stringify(dataOutlets));
} }
this.setState({ this.setState({
...@@ -226,34 +226,35 @@ class Outlets extends React.Component { ...@@ -226,34 +226,35 @@ class Outlets extends React.Component {
RenderItem = ({ item }) => { RenderItem = ({ item }) => {
return ( return (
<View style={{ flexDirection: 'row', flex: 1 }}> <View style={{ flexDirection: 'row', flex: 6 }}>
<View style={styles.list_addrees}> <View style={styles.list_addrees}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#ccb46c', fontSize: 20, margin: 5 }}>{item.name}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#ccb46c', fontSize: 18, margin: 5 }}>{item.name}</Text>
<Text style={{ fontFamily: 'Gotham-Light', color: '#b1b1b2', fontSize: 15, margin: 5 }}>{item.full_address}</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' }}> <Text style={{ fontFamily: 'Gotham-Light', margin: 5, color: '#aeaead' }}>
{item.distance} KM {item.distance} KM
</Text> </Text>
</View> </View>
<View style={{ flex: 1,top:20 }}> <View style={{flex:4,flexDirection:'row'}}>
<TouchableOpacity onPress={() => { Linking.openURL('tel:'+ item.phone) }}> <View style={{ flex: 2, top: 20 }}>
<Icon <TouchableOpacity onPress={() => { Linking.openURL('tel:' + item.phone) }}>
name='ios-call' <Icon
type='ionicon' name='ios-call'
color='grey' type='ionicon'
size={40} color='grey'
/> size={30}
</TouchableOpacity> />
</TouchableOpacity>
</View> </View>
<View style={{ flex: 1,top:20 }}> <View style={{ flex: 2, top: 20 }}>
<TouchableOpacity onPress={() => Linking.openURL('https://www.google.com/maps/dir/?api=1&destination=' + item.lat +' '+ item.long)}> <TouchableOpacity onPress={() => Linking.openURL('https://www.google.com/maps/dir/?api=1&destination=' + item.lat + ' ' + item.long)}>
<Icon <Icon
name='ios-navigate' name='ios-navigate'
type='ionicon' type='ionicon'
color='grey' color='grey'
size={40} size={30}
/> />
</TouchableOpacity> </TouchableOpacity>
</View>
</View> </View>
</View> </View>
); );
...@@ -334,7 +335,7 @@ const styles = StyleSheet.create({ ...@@ -334,7 +335,7 @@ const styles = StyleSheet.create({
flex: 1, flex: 1,
}, },
list_addrees: { list_addrees: {
flex: 3, flex: 6,
margin: 20, margin: 20,
}, },
......
view/ProfilePage.js
View file @ 9dc2f308
...@@ -105,52 +105,45 @@ class ProfilePage extends PureComponent { ...@@ -105,52 +105,45 @@ class ProfilePage extends PureComponent {
</Text> </Text>
</View> </View>
<View style={{ flex: 3 }}> <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> <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}> editable={false} value={this.state.email}>
</TextInput> </TextInput>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Date of Birth</Text> <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}> editable={false}>
{this.state.dob_day} / {this.state.dob_month} / {this.state.dob_year} {this.state.dob_day} / {this.state.dob_month} / {this.state.dob_year}
</TextInput> </TextInput>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>Gender</Text> <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}> editable={false} value={this.state.gender}>
</TextInput> </TextInput>
</View> </View>
</View> </View>
<View style={{ flex: 2 }}> <View style={{ flex: 2 }}>
<View style={{ flex: 1 }}> <View style={{ flex: 1 }}>
<View style={{ flexDirection: 'row', top: 10, margin: 5,marginRight:20,marginLeft:20 }}> <View style={{ 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={{ flex: 1, margin: 5 }}> <View style={{ flex: 1, margin: 5 }}>
<TouchableOpacity title="Edit" onPress={() => this.props.navigation.navigate('Change password')}> <TouchableOpacity title="Edit" onPress={() => this.props.navigation.navigate('Change password')}>
<View style={{ height: 60, borderRadius: 20, backgroundColor: '#CFB368' }}> <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368',justifyContent:'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center', margin: 15 }}>Change Password</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center' }}>Change Password</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</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 }}> <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: 60, borderRadius: 20, backgroundColor: '#CFB368' }}> <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368',justifyContent:'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 19, textAlign: 'center', margin: 15 }}>Language</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center' }}>Language</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<View style={{ flex: 1, margin: 5 }}> <View style={{ flex: 1, margin: 5 }}>
<TouchableOpacity title="Edit" onPress={() => this.logout()}> <TouchableOpacity title="Edit" onPress={() => this.logout()}>
<View style={{ height: 60, borderRadius: 20, backgroundColor: '#CFB368' }}> <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368',justifyContent:'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 19, textAlign: 'center', margin: 15 }}>Logout</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center' }}>Logout</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