Skip to content

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

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

# Conflicts:
#	view/Auth.js
parents ad483a18 424f3b37
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 61 deletions
view/Auth.js
View file @ fe4cca37
...@@ -232,10 +232,8 @@ class Auth extends React.Component { ...@@ -232,10 +232,8 @@ class Auth extends React.Component {
textAlign: 'center' textAlign: 'center'
}, title: 'PROFIL' }, title: 'PROFIL'
}} /> }} />
{/* <Stack.Screen name="Change Profil" component={ChangeProfile} /> */}
<Stack.Screen name="Change language" component={ChangeLanguage} />
<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} />
<Stack.Screen name="Change password" component={ChangePassword} options={{ <Stack.Screen name="Change password" component={ChangePassword} options={{
headerStyle: { backgroundColor: '#CFB368' }, headerStyle: { backgroundColor: '#CFB368' },
headerTitleContainerStyle: { alignContent: 'center' }, headerTitleContainerStyle: { alignContent: 'center' },
...@@ -247,7 +245,7 @@ class Auth extends React.Component { ...@@ -247,7 +245,7 @@ class Auth extends React.Component {
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'CHANGE PASSWORD' }, title: 'CHANGE PASSWORD'
}}/> }} />
<Stack.Screen name="Card Activation" component={CardActivation} /> <Stack.Screen name="Card Activation" component={CardActivation} />
<Stack.Screen name="Renewal" component={Renewal} /> <Stack.Screen name="Renewal" component={Renewal} />
<Stack.Screen name="Account" component={Account} /> <Stack.Screen name="Account" component={Account} />
...@@ -258,31 +256,18 @@ class Auth extends React.Component { ...@@ -258,31 +256,18 @@ class Auth extends React.Component {
<Stack.Screen name="Upgrade Premium" component={UpgradePremium} /> <Stack.Screen name="Upgrade Premium" component={UpgradePremium} />
<Stack.Screen name="Camera" component={Cameras} /> <Stack.Screen name="Camera" component={Cameras} />
<Stack.Screen name="Delivery Address" component={DeliveryAddress} options={{ <Stack.Screen name="Delivery Address" component={DeliveryAddress} options={{
headerStyle: { backgroundColor: "#ccb46c" }, headerStyle: { backgroundColor: '#CFB368' },
headerBackTitleStyle: { color: 'white' }, headerTitleContainerStyle: { alignContent: 'center' },
headerTintColor: '#fff',
headerTitleAlign: 'center', headerTitleAlign: 'center',
headerTitleStyle: {
fontFamily: 'Gotham-Black',
color: 'white',
fontSize: 20,
},
title: 'Delivery Address'
}} />
<Stack.Screen name="Address Detail" component={AddressDetail} options={{
headerStyle: { backgroundColor: "#ccb46c" },
headerBackTitleStyle: { color: 'white' },
headerTintColor: '#fff', headerTintColor: '#fff',
headerTitleAlign: 'center',
headerTitleStyle: { headerTitleStyle: {
alignSelf: 'center',
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white', color: 'white',
fontSize: 20, textAlign: 'center'
}, }, title: 'Delivery Address'
title: ' Tambah Alamat'
}} /> }} />
<Stack.Screen name="Menu Detail" component={MenuDetail} options={({ route }) => ({ <Stack.Screen name="Address Detail" component={AddressDetail} options={{
title: route.params.nameMenu,
headerStyle: { backgroundColor: '#CFB368' }, headerStyle: { backgroundColor: '#CFB368' },
headerTitleContainerStyle: { alignContent: 'center' }, headerTitleContainerStyle: { alignContent: 'center' },
headerTitleAlign: 'center', headerTitleAlign: 'center',
...@@ -292,8 +277,9 @@ class Auth extends React.Component { ...@@ -292,8 +277,9 @@ class Auth extends React.Component {
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
} }, title: 'Tambah Alamat'
})} /> }} />
<Stack.Screen name="Menu Detail" component={MenuDetail} />
<Stack.Screen name="Pickup Name" component={PickupName} options={{ <Stack.Screen name="Pickup Name" component={PickupName} options={{
headerStyle: { backgroundColor: '#CFB368' }, headerStyle: { backgroundColor: '#CFB368' },
headerTitleContainerStyle: { alignContent: 'center' }, headerTitleContainerStyle: { alignContent: 'center' },
...@@ -311,7 +297,21 @@ class Auth extends React.Component { ...@@ -311,7 +297,21 @@ class Auth extends React.Component {
<Stack.Screen name="Card Info" component={CardInfo} /> <Stack.Screen name="Card Info" component={CardInfo} />
<Stack.Screen name="Shopping Cart" component={ShoppingCart} /> <Stack.Screen name="Shopping Cart" component={ShoppingCart} />
<Stack.Screen name="Order History" component={OrderHistory} /> <Stack.Screen name="Order History" component={OrderHistory} />
<Stack.Screen name="Reward History" component={RewardHistory} /> <Stack.Screen name="Reward History" component={RewardHistory}
options={{
headerStyle: { backgroundColor: '#CFB368' },
headerTitleContainerStyle: { alignContent: 'center' },
headerTitleAlign: 'center',
headerTintColor: '#fff',
headerTitleStyle: {
alignSelf: 'center',
fontFamily: 'Gotham-Black',
fontSize: 18,
color: 'white',
textAlign: 'center'
}, title: 'Reward History'
}}
/>
<Stack.Screen name="Order Detail" component={OrderDetail} options={({ navigation, route }) => ({ <Stack.Screen name="Order Detail" component={OrderDetail} options={({ navigation, route }) => ({
headerLeft: props => <HeaderBackButton {...props} onPress={() => navigation.navigate('Home', { screen: 'ORDER' })} />, headerLeft: props => <HeaderBackButton {...props} onPress={() => navigation.navigate('Home', { screen: 'ORDER' })} />,
......
view/ChangePassword.js
View file @ fe4cca37
...@@ -52,8 +52,6 @@ class ChangePassword extends React.Component { ...@@ -52,8 +52,6 @@ class ChangePassword extends React.Component {
onChangeText={(old_password) => this.setState({ old_password })} onChangeText={(old_password) => this.setState({ old_password })}
value={this.state.old_password} value={this.state.old_password}
secureTextEntry={true} secureTextEntry={true}
placeholder='******'
placeholderTextColor='gray'
textAlign='center' /> textAlign='center' />
</View> </View>
</View> </View>
...@@ -66,8 +64,6 @@ class ChangePassword extends React.Component { ...@@ -66,8 +64,6 @@ class ChangePassword extends React.Component {
onChangeText={(Password) => this.setState({ Password })} onChangeText={(Password) => this.setState({ Password })}
value={this.state.Password} value={this.state.Password}
secureTextEntry={true} secureTextEntry={true}
placeholder='******'
placeholderTextColor='gray'
textAlign='center' /> textAlign='center' />
</View> </View>
</View> </View>
...@@ -80,8 +76,6 @@ class ChangePassword extends React.Component { ...@@ -80,8 +76,6 @@ class ChangePassword extends React.Component {
onChangeText={(Password_confirmation) => this.setState({ Password_confirmation })} onChangeText={(Password_confirmation) => this.setState({ Password_confirmation })}
value={this.state.Password_confirmation} value={this.state.Password_confirmation}
secureTextEntry={true} secureTextEntry={true}
placeholder='******'
placeholderTextColor='gray'
textAlign='center' /> textAlign='center' />
</View> </View>
</View> </View>
......
view/RewardHistory.js
View file @ fe4cca37
...@@ -61,16 +61,16 @@ class RewardHistory extends React.Component { ...@@ -61,16 +61,16 @@ class RewardHistory extends React.Component {
<Image source={{ uri: item.reward.title_image }} <Image source={{ uri: item.reward.title_image }}
resizeMethod="resize" resizeMethod="resize"
resizeMode='cover' resizeMode='cover'
style={{ height: 150, width: '100%' }} /> style={{ height: 100, width: '100%' }} />
</View> </View>
<View style={{ flexDirection: 'row', justifyContent:'space-between', padding:10 }}> <View style={{ flexDirection: 'row', justifyContent:'space-between', padding:10 }}>
<View> <View>
<Text style={{fontWeight:'bold', textAlign:'left'}}>{item.reward.title}</Text> <Text style={{textAlign:'left', fontSize: 12, fontFamily: 'Gotham-Black'}}>{item.reward.title}</Text>
<Text style={{textAlign:'left'}}>{item.reward.subtitle}</Text> <Text style={{textAlign:'left', fontSize: 12, fontFamily: 'Gotham-Light'}}>{item.reward.subtitle}</Text>
</View> </View>
<View> <View>
<Text style={{textAlign:'right'}}>Digunakan:</Text> <Text style={{textAlign:'right',fontSize: 12, fontFamily: 'Gotham-Light'}}>Used at</Text>
<Text style={{textAlign:'right'}}>{item.used_time}</Text> <Text style={{textAlign:'right', fontSize: 12, fontFamily: 'Gotham-Light'}}>{item.used_time}</Text>
</View> </View>
</View> </View>
</Card> </Card>
......
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