Skip to content

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

add

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