Skip to content

C
clone_excelso
Commit a77c139f authored by Trisno's avatar Trisno
Browse files
Options

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

parents 406fb6f4 5bb056a4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 157 additions and 138 deletions
app.json
View file @ a77c139f
{ {
"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 @ a77c139f
...@@ -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 @ a77c139f
This diff is collapsed.
view/AddreesDetail.js
View file @ a77c139f
...@@ -161,8 +161,8 @@ class AddreesDetail extends React.Component { ...@@ -161,8 +161,8 @@ class AddreesDetail extends React.Component {
/> />
<ScrollView> <ScrollView>
<View style={styles.content}> <View style={styles.content}>
<View style={{ height: 45, borderRadius: 10, borderColor: 'grey', borderWidth: 1, flexDirection: 'row', marginTop: 15, marginLeft: 10, marginRight: 10 }}> <View style={{ height: 45, borderRadius: 10, borderColor: '#ccb46c', borderWidth: 1, flexDirection: 'row', marginTop: 15, marginLeft: 10, marginRight: 10 }}>
<View style={{ flex: 1 }}> <View style={{ flex: 1,top:5 }}>
<MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" /> <MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" />
</View> </View>
<View style={{ flex: 6 }}> <View style={{ flex: 6 }}>
...@@ -195,7 +195,7 @@ class AddreesDetail extends React.Component { ...@@ -195,7 +195,7 @@ class AddreesDetail extends React.Component {
<MapView.Marker <MapView.Marker
coordinate={{ coordinate={{
latitude: this.state.latitude, latitude: this.state.latitude,
longitude:this.state.longitude longitude: this.state.longitude
}} }}
title={"Lokasi Kamu "} title={"Lokasi Kamu "}
description={this.state.street} description={this.state.street}
...@@ -210,32 +210,33 @@ class AddreesDetail extends React.Component { ...@@ -210,32 +210,33 @@ class AddreesDetail extends React.Component {
</View> </View>
</View> </View>
<View style={styles.name_addrees_input}> <View style={styles.name_addrees_input}>
<View style={{ flexDirection: 'row', top: 20 }}> <View style={{ flexDirection: 'row', top: 10,justifyContent:'center' }}>
<View style={{ flex: 0.5 }}> <MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" />
<MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" /> <View style={{ flex: 3 ,justifyContent:'center'}}>
</View> <Text style={{ fontFamily: 'Gotham-Light',textAlign:'center' }}>{this.state.street}</Text>
<View style={{ flex: 3 }}> <Text style={{ fontFamily: 'Gotham-Light',textAlign:'center' }}>{this.state.city} </Text>
<Text style={{ fontFamily: 'Gotham-Light' }}>{this.state.street}</Text><Text style={{ fontFamily: 'Gotham-Light' }}>{this.state.city} <Text>{this.state.region}</Text><Text>{this.state.postalCode}</Text></Text> <Text style={{fontFamily: 'Gotham-Light',textAlign:'center'}}>{this.state.region}</Text>
<Text style={{fontFamily: 'Gotham-Light',textAlign:'center'}}>{this.state.postalCode}</Text>
</View> </View>
</View> </View>
<View style={styles.field_name_addrees}> <View style={styles.field_name_addrees}>
<View style={{ width: 55, justifyContent: 'center' }}> <Text style={{ fontFamily: 'Gotham-Black', color: "#ccb46c",textAlign:'center',fontSize:18 }}>Nama</Text>
<Text style={{ fontFamily: 'Gotham-Black', marginLeft: 10, color: "#ccb46c" }}>Nama</Text>
</View>
<TextInput style={{ height: 40, borderWidth: 1, padding: 5, flex: 1, margin: 10, borderRadius: 10, borderColor: 'grey' }} onChangeText={(name) => this.setState({ name })} /> <TextInput style={{ height: 40, borderWidth: 1, padding: 5, flex: 1, margin: 10, borderRadius: 10, borderColor: 'grey' }} onChangeText={(name) => this.setState({ name })} />
</View> </View>
<View style={styles.field_detail_addrees}> <View style={styles.field_detail_addrees}>
<View style={{ width: 55, justifyContent: 'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', marginLeft: 10, color: "#ccb46c" }} >Detail</Text> <Text style={{ fontFamily: 'Gotham-Black', marginLeft: 10, color: "#ccb46c",textAlign:'center',fontSize:18 }} >Detail</Text>
</View> <TextInput style={{ height: 150, borderWidth: 1, padding: 5, flex: 1, margin: 10, borderRadius: 10, borderColor: 'grey',justifyContent:'flex-start' }}
<TextInput style={{ height: 80, borderWidth: 1, padding: 5, flex: 1, margin: 10, borderRadius: 10, borderColor: 'grey' }} onChangeText={(description) => this.setState({ description })} /> onChangeText={(description) => this.setState({ description })}
numberOfLines={10}
multiline={true} />
</View> </View>
<View style={{ margin: 50, justifyContent: 'center' }}> <View style={{ margin: 50, justifyContent: 'center' }}>
<TouchableOpacity onPress={() => this.saveAddress()}> <TouchableOpacity onPress={() => this.saveAddress()}>
<View style={{ height: 40, borderRadius: 20, backgroundColor: '#CFB368', justifyContent: 'center' }}> <View style={{ height: 40, borderRadius: 10, backgroundColor: '#CFB368', justifyContent: 'center' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 20, textAlign: 'center' }}>+ Tambah Alamat</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center' }}>+ Tambah Alamat</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
...@@ -252,6 +253,7 @@ const styles = StyleSheet.create({ ...@@ -252,6 +253,7 @@ const styles = StyleSheet.create({
container: { container: {
flex: 1, flex: 1,
backgroundColor: '#ffff' backgroundColor: '#ffff'
}, },
header: { header: {
...@@ -261,7 +263,8 @@ const styles = StyleSheet.create({ ...@@ -261,7 +263,8 @@ const styles = StyleSheet.create({
content: { content: {
flex: 3, flex: 3,
margin: 5, marginRight:10,
marginLeft:10,
}, },
field_search: { field_search: {
...@@ -271,22 +274,27 @@ const styles = StyleSheet.create({ ...@@ -271,22 +274,27 @@ const styles = StyleSheet.create({
cont_google_map: { cont_google_map: {
flex: 1, flex: 1,
top: 5, top: 5,
marginRight:10,
marginLeft:10,
height: 250, height: 250,
}, },
name_addrees_input: { name_addrees_input: {
flex: 1, flex: 1,
margin: 5, marginLeft:10,
marginRight:10,
top:20
}, },
field_name_addrees: { field_name_addrees: {
flexDirection: 'column', flexDirection: 'column',
top: 25, top: 40,
justifyContent:'center'
}, },
field_detail_addrees: { field_detail_addrees: {
flexDirection: 'column', flexDirection: 'column',
top: 25, top: 40,
}, },
button: { button: {
......
view/Auth.js
View file @ a77c139f
...@@ -240,7 +240,7 @@ class Auth extends React.Component { ...@@ -240,7 +240,7 @@ class Auth extends React.Component {
headerTitleStyle: { headerTitleStyle: {
alignSelf: 'center', alignSelf: 'center',
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
fontSize: 18, fontSize: 20,
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'LANGUAGE' }, title: 'LANGUAGE'
...@@ -266,7 +266,7 @@ class Auth extends React.Component { ...@@ -266,7 +266,7 @@ class Auth extends React.Component {
headerTitleStyle: { headerTitleStyle: {
alignSelf: 'center', alignSelf: 'center',
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
fontSize: 18, fontSize: 20,
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'ACTIVATE CARD' }, title: 'ACTIVATE CARD'
...@@ -293,7 +293,7 @@ class Auth extends React.Component { ...@@ -293,7 +293,7 @@ class Auth extends React.Component {
headerTitleStyle: { headerTitleStyle: {
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white', color: 'white',
fontSize: 18, fontSize: 20,
}, },
title: 'TRANSFER BALANCE' title: 'TRANSFER BALANCE'
}} /> }} />
...@@ -308,7 +308,7 @@ class Auth extends React.Component { ...@@ -308,7 +308,7 @@ class Auth extends React.Component {
headerTitleStyle: { headerTitleStyle: {
alignSelf: 'center', alignSelf: 'center',
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
fontSize: 18, fontSize: 20,
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'Upgrade Premium' }, title: 'Upgrade Premium'
...@@ -322,9 +322,10 @@ class Auth extends React.Component { ...@@ -322,9 +322,10 @@ class Auth extends React.Component {
headerTitleStyle: { headerTitleStyle: {
alignSelf: 'center', alignSelf: 'center',
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
fontSize: 20,
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'Delivery Address' }, title: 'DELIVERY ADDRESS'
}} /> }} />
<Stack.Screen name="Address Detail" component={AddressDetail} options={{ <Stack.Screen name="Address Detail" component={AddressDetail} options={{
headerStyle: { backgroundColor: '#CFB368' }, headerStyle: { backgroundColor: '#CFB368' },
...@@ -334,9 +335,10 @@ class Auth extends React.Component { ...@@ -334,9 +335,10 @@ class Auth extends React.Component {
headerTitleStyle: { headerTitleStyle: {
alignSelf: 'center', alignSelf: 'center',
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
fontSize: 20,
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'Tambah Alamat' }, title: 'TAMBAH ALAMAT'
}} /> }} />
<Stack.Screen name="Menu Detail" component={MenuDetail} <Stack.Screen name="Menu Detail" component={MenuDetail}
options={({ route }) => ({ options={({ route }) => ({
...@@ -347,6 +349,7 @@ class Auth extends React.Component { ...@@ -347,6 +349,7 @@ class Auth extends React.Component {
headerTitleStyle: { headerTitleStyle: {
alignSelf: 'center', alignSelf: 'center',
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
fontSize: 20,
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: route.params.nameMenu }, title: route.params.nameMenu
...@@ -360,6 +363,7 @@ class Auth extends React.Component { ...@@ -360,6 +363,7 @@ class Auth extends React.Component {
headerTitleStyle: { headerTitleStyle: {
alignSelf: 'center', alignSelf: 'center',
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
fontSize: 20,
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'PICKUP STORE' }, title: 'PICKUP STORE'
...@@ -391,7 +395,7 @@ class Auth extends React.Component { ...@@ -391,7 +395,7 @@ class Auth extends React.Component {
headerTitleStyle: { headerTitleStyle: {
alignSelf: 'center', alignSelf: 'center',
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
fontSize: 18, fontSize: 20,
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'Reward History' }, title: 'Reward History'
...@@ -406,7 +410,7 @@ class Auth extends React.Component { ...@@ -406,7 +410,7 @@ class Auth extends React.Component {
headerTitleStyle: { headerTitleStyle: {
alignSelf: 'center', alignSelf: 'center',
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
fontSize: 18, fontSize: 20,
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, },
...@@ -428,7 +432,7 @@ class Auth extends React.Component { ...@@ -428,7 +432,7 @@ class Auth extends React.Component {
headerTintColor: '#fff', headerTintColor: '#fff',
headerTitleStyle: { headerTitleStyle: {
textAlign: 'center', textAlign: 'center',
fontSize: 15, fontSize: 20,
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white' color: 'white'
}, },
...@@ -444,7 +448,7 @@ class Auth extends React.Component { ...@@ -444,7 +448,7 @@ class Auth extends React.Component {
headerTintColor: '#fff', headerTintColor: '#fff',
headerTitleStyle: { headerTitleStyle: {
textAlign: 'center', textAlign: 'center',
fontSize: 15, fontSize: 20,
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white' color: 'white'
}, },
...@@ -460,7 +464,7 @@ class Auth extends React.Component { ...@@ -460,7 +464,7 @@ class Auth extends React.Component {
headerTintColor: '#fff', headerTintColor: '#fff',
headerTitleStyle: { headerTitleStyle: {
textAlign: 'center', textAlign: 'center',
fontSize: 15, fontSize: 20,
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white' color: 'white'
}, },
...@@ -480,7 +484,7 @@ class Auth extends React.Component { ...@@ -480,7 +484,7 @@ class Auth extends React.Component {
headerTitleStyle: { headerTitleStyle: {
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white', color: 'white',
fontSize: 18, fontSize: 20,
}, },
title: 'TRANSACTION HISTORY' title: 'TRANSACTION HISTORY'
}} /> }} />
...@@ -493,7 +497,7 @@ class Auth extends React.Component { ...@@ -493,7 +497,7 @@ class Auth extends React.Component {
headerTitleStyle: { headerTitleStyle: {
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white', color: 'white',
fontSize: 18, fontSize: 20,
}, },
title: 'TRANSACTION DETAIL' title: 'TRANSACTION DETAIL'
}} /> }} />
......
view/DeliveryAddrees.js
View file @ a77c139f
...@@ -242,8 +242,8 @@ class DeliveryAddrees extends React.Component { ...@@ -242,8 +242,8 @@ class DeliveryAddrees extends React.Component {
return ( return (
<View style={styles.container}> <View style={styles.container}>
<View style={{ height: 45, borderRadius: 10, borderColor: '#ccb46c', borderWidth: 1, flexDirection: 'row', marginTop: 15, marginLeft: 10, marginRight: 10 }}> <View style={{ height: 45, borderRadius: 10, borderColor: '#ccb46c', borderWidth: 1, flexDirection: 'row', marginTop: 15, marginLeft: 20, marginRight: 20 }}>
<View style={{ flex: 1 }}> <View style={{ flex: 1,top:5 }}>
<MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" /> <MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" />
</View> </View>
<View style={{ flex: 6 }}> <View style={{ flex: 6 }}>
...@@ -258,8 +258,8 @@ class DeliveryAddrees extends React.Component { ...@@ -258,8 +258,8 @@ class DeliveryAddrees extends React.Component {
</View> </View>
<View style={styles.btn_addreess}> <View style={styles.btn_addreess}>
<TouchableOpacity onPress={() => this.addAdreess()}> <TouchableOpacity onPress={() => this.addAdreess()}>
<View style={{ height: 40, borderRadius: 15, 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: 20 }}> + Tambah Alamat </Text> <Text style={{ fontFamily: 'Gotham-Black', textAlign: 'center', color: 'white', fontSize: 16 }}> + Tambah Alamat </Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
......
view/Home.js
View file @ a77c139f
...@@ -412,7 +412,7 @@ const styles = StyleSheet.create({ ...@@ -412,7 +412,7 @@ const styles = StyleSheet.create({
}, },
titleText: { titleText: {
margin: 15, margin: 15,
fontSize: 18, fontSize: 20,
// fontWeight: 'bold', // fontWeight: 'bold',
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white', color: 'white',
......
view/Item.js
View file @ a77c139f
...@@ -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/Login.js
View file @ a77c139f
...@@ -216,10 +216,10 @@ class Login extends React.Component { ...@@ -216,10 +216,10 @@ class Login extends React.Component {
secureTextEntry={true} secureTextEntry={true}
/> />
</View> </View>
<View style={{ flex: 1, height: 50, marginRight: 70, marginLeft: 70, justifyContent: 'center' }}> <View style={{ flex: 1, height: 40, marginRight: 70, marginLeft: 70, justifyContent: 'center' }}>
<TouchableOpacity onPress={()=>this.handleLoggin()}> <TouchableOpacity onPress={()=>this.handleLoggin()}>
<View style={{ height: 50, borderRadius: 20, backgroundColor: '#CFB368' }}> <View style={{ height: 50, borderRadius: 10, backgroundColor: '#CFB368' }}>
<Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 20, textAlign: 'center', margin: 15 }}>LOGIN</Text> <Text style={{ fontFamily: 'Gotham-Black', color: 'white', fontSize: 16, textAlign: 'center', margin: 15 }}>LOGIN</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
...@@ -227,10 +227,10 @@ class Login extends React.Component { ...@@ -227,10 +227,10 @@ class Login extends React.Component {
<View style={styles.v_policy}> <View style={styles.v_policy}>
<View style={{ flex: 1, justifyContent: 'center' }}> <View style={{ flex: 1, justifyContent: 'center' }}>
<TouchableOpacity onPress={() => this.props.navigation.navigate('New Register')}> <TouchableOpacity onPress={() => this.props.navigation.navigate('New Register')}>
<Text style={{ fontFamily: 'Gotham-Light', color: '#CFB368', fontSize: 19, textAlign: 'center', marginBottom: 5 }}>REGISTER</Text> <Text style={{ fontFamily: 'Gotham-Light', color: '#CFB368', fontSize: 16, textAlign: 'center', marginBottom: 5 }}>REGISTER</Text>
</TouchableOpacity> </TouchableOpacity>
<TouchableOpacity onPress={() => this.props.navigation.navigate('Reset Password')}> <TouchableOpacity onPress={() => this.props.navigation.navigate('Reset Password')}>
<Text style={{ fontFamily: 'Gotham-Light', color: '#CFB368', fontSize: 19, textAlign: 'center', marginTop: 5 }}>FORGOT PASSWORD</Text> <Text style={{ fontFamily: 'Gotham-Light', color: '#CFB368', fontSize: 16, textAlign: 'center', marginTop: 5 }}>FORGOT PASSWORD</Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
......
view/MenuSelection.js
View file @ a77c139f
...@@ -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 @ a77c139f
...@@ -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/PickupName.js
View file @ a77c139f
...@@ -203,7 +203,7 @@ class PickupName extends React.Component { ...@@ -203,7 +203,7 @@ class PickupName extends React.Component {
<View> <View>
<TouchableOpacity onPress={() => this.getOutletDetail(item.id, item.name)}> <TouchableOpacity onPress={() => this.getOutletDetail(item.id, item.name)}>
<View style={{ flexDirection: 'row', flex: 1 }}> <View style={{ flexDirection: 'row', flex: 1 }}>
<View> <View style={{top:10}}>
<MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" /> <MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" />
</View> </View>
<View style={styles.list_addrees}> <View style={styles.list_addrees}>
...@@ -237,8 +237,8 @@ class PickupName extends React.Component { ...@@ -237,8 +237,8 @@ class PickupName extends React.Component {
<View> <View>
<TouchableOpacity onPress={() => Alert.alert('','Mohon Maaf Outlet Tutup !')}> <TouchableOpacity onPress={() => Alert.alert('','Mohon Maaf Outlet Tutup !')}>
<View style={{ flexDirection: 'row', flex: 1 }}> <View style={{ flexDirection: 'row', flex: 1 }}>
<View> <View style={{top:10}}>
<MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" /> <MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" />
</View> </View>
<View style={styles.list_addrees}> <View style={styles.list_addrees}>
<View style={{ margin: 5 }}> <View style={{ margin: 5 }}>
...@@ -285,7 +285,7 @@ class PickupName extends React.Component { ...@@ -285,7 +285,7 @@ class PickupName extends React.Component {
/> />
<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' }}>
<View style={{ flex: 1 }}> <View style={{ flex: 1,top:5 }}>
<MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" /> <MaterialCommunityIcons name="map-marker" size={32} color="#ccb46c" />
</View> </View>
<View style={{ flex: 6 }}> <View style={{ flex: 6 }}>
...@@ -338,7 +338,8 @@ const styles = StyleSheet.create({ ...@@ -338,7 +338,8 @@ const styles = StyleSheet.create({
searchbar: { searchbar: {
flex: 1, flex: 1,
justifyContent: 'center', justifyContent: 'center',
margin: 10, marginRight: 20,
marginLeft:20,
} }
}) })
......
view/ProfilePage.js
View file @ a77c139f
...@@ -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