Skip to content

N
new_excelso
Commit 424f3b37 authored by Trisno's avatar Trisno
Browse files
Options

benerin change password dan update design reward history

parent 699c0721
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 60 deletions
view/Auth.js
View file @ 424f3b37
...@@ -92,22 +92,22 @@ function HomePage({ navigation }) { ...@@ -92,22 +92,22 @@ function HomePage({ navigation }) {
if (route.name === 'HOME') { if (route.name === 'HOME') {
// iconName = focused ? 'ios-home' : 'ios-home' // iconName = focused ? 'ios-home' : 'ios-home'
return <Image source={require('../assets/icon/icon-home.png')} style={{height :50, width:50}} tintColor={ focused ? '#CFB368' : 'gray'} /> return <Image source={require('../assets/icon/icon-home.png')} style={{ height: 50, width: 50 }} tintColor={focused ? '#CFB368' : 'gray'} />
} else if (route.name === 'MENU') { } else if (route.name === 'MENU') {
// iconName = focused ? 'ios-paper' : 'ios-paper'; // iconName = focused ? 'ios-paper' : 'ios-paper';
return <Image source={require('../assets/icon/icon-menu.png')} style={{height :50, width:50}} tintColor={ focused ? '#CFB368' : 'gray'}/> return <Image source={require('../assets/icon/icon-menu.png')} style={{ height: 50, width: 50 }} tintColor={focused ? '#CFB368' : 'gray'} />
} else if (route.name === 'REWARDS') { } else if (route.name === 'REWARDS') {
// iconName = focused ? 'ios-gift' : 'ios-gift'; // iconName = focused ? 'ios-gift' : 'ios-gift';
return <Image source={require('../assets/icon/icon-rewards.png')} style={{height :50, width:50}} tintColor={ focused ? '#CFB368' : 'gray'}/> return <Image source={require('../assets/icon/icon-rewards.png')} style={{ height: 50, width: 50 }} tintColor={focused ? '#CFB368' : 'gray'} />
} else if (route.name === 'ORDER') { } else if (route.name === 'ORDER') {
// iconName = focused ? 'md-cart' : 'md-cart'; // iconName = focused ? 'md-cart' : 'md-cart';
return <Image source={require('../assets/icon/icon-order.png')} style={{height :50, width:50}} tintColor={ focused ? '#CFB368' : 'gray'}/> return <Image source={require('../assets/icon/icon-order.png')} style={{ height: 50, width: 50 }} tintColor={focused ? '#CFB368' : 'gray'} />
} else if (route.name === 'OUTLETS') { } else if (route.name === 'OUTLETS') {
// iconName = focused ? 'ios-cafe' : 'ios-cafe'; // iconName = focused ? 'ios-cafe' : 'ios-cafe';
return <Image source={require('../assets/icon/icon-outlets.png')} style={{height :50, width:50}} tintColor={ focused ? '#CFB368' : 'gray'}/> return <Image source={require('../assets/icon/icon-outlets.png')} style={{ height: 50, width: 50 }} tintColor={focused ? '#CFB368' : 'gray'} />
} else if (route.name === 'ACCOUNT') { } else if (route.name === 'ACCOUNT') {
// iconName = focused ? 'account' : 'account'; // iconName = focused ? 'account' : 'account';
return <Image source={require('../assets/icon/icon-account.png')} style={{height :50, width:50}} tintColor={ focused ? '#CFB368' : 'gray'}/> return <Image source={require('../assets/icon/icon-account.png')} style={{ height: 50, width: 50 }} tintColor={focused ? '#CFB368' : 'gray'} />
} }
// You can return any component that you like here! // You can return any component that you like here!
...@@ -146,11 +146,11 @@ class Auth extends React.Component { ...@@ -146,11 +146,11 @@ class Auth extends React.Component {
<Stack.Screen name="Login" component={Login} options={{ headerShown: false }} /> <Stack.Screen name="Login" component={Login} options={{ headerShown: false }} />
<Stack.Screen name="LoginWelcome" component={WelcomeLog} options={{ <Stack.Screen name="LoginWelcome" component={WelcomeLog} options={{
headerShown: false , headerShown: false,
}} /> }} />
<Stack.Screen name="Home" component={Home} /> <Stack.Screen name="Home" component={Home} />
<Stack.Screen name="Profile" component={ProfilePage} options={{ <Stack.Screen name="Profile" component={ProfilePage} options={{
headerStyle: { backgroundColor: '#CFB368' }, headerStyle: { backgroundColor: '#CFB368' },
headerTitleContainerStyle: { alignContent: 'center' }, headerTitleContainerStyle: { alignContent: 'center' },
...@@ -162,7 +162,7 @@ class Auth extends React.Component { ...@@ -162,7 +162,7 @@ class Auth extends React.Component {
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'PROFIL' }, title: 'PROFIL'
}}/> }} />
<Stack.Screen name="Change Profil" component={ChangeProfile} options={{ <Stack.Screen name="Change Profil" component={ChangeProfile} options={{
headerStyle: { backgroundColor: '#CFB368' }, headerStyle: { backgroundColor: '#CFB368' },
headerTitleContainerStyle: { alignContent: 'center' }, headerTitleContainerStyle: { alignContent: 'center' },
...@@ -174,7 +174,7 @@ class Auth extends React.Component { ...@@ -174,7 +174,7 @@ class Auth extends React.Component {
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'CHANGE PROFIL' }, title: 'CHANGE PROFIL'
}}/> }} />
<Stack.Screen name="Register" component={Register} /> <Stack.Screen name="Register" component={Register} />
{/* <Stack.Screen name="Change language" component={ChangeLanguage} /> */} {/* <Stack.Screen name="Change language" component={ChangeLanguage} /> */}
<Stack.Screen name="Email Confirmation" component={EmailConfirmation} options={{ <Stack.Screen name="Email Confirmation" component={EmailConfirmation} options={{
...@@ -189,17 +189,17 @@ class Auth extends React.Component { ...@@ -189,17 +189,17 @@ class Auth extends React.Component {
textAlign: 'center' textAlign: 'center'
}, title: 'EMAIL CONFIRMATION' }, title: 'EMAIL CONFIRMATION'
}} /> }} />
<Stack.Screen name="Welcomes" component={WelcomeReg} options={{ <Stack.Screen name="Welcomes" component={WelcomeReg} options={{
headerShown: false , headerShown: false,
}} /> }} />
</> </>
) : this.props.pageEmailConfirmation === true ? ( ) : this.props.pageEmailConfirmation === true ? (
<> <>
<Stack.Screen name="Email Confirmation" component={EmailConfirmation} /> <Stack.Screen name="Email Confirmation" component={EmailConfirmation} />
<Stack.Screen name="Login" component={Login} /> <Stack.Screen name="Login" component={Login} />
<Stack.Screen name="LoginWelcome" component={WelcomeLog} options={{ <Stack.Screen name="LoginWelcome" component={WelcomeLog} options={{
headerShown: false , headerShown: false,
}} /> }} />
<Stack.Screen name="Home" component={Home} options={{ headerShown: false }} /> <Stack.Screen name="Home" component={Home} options={{ headerShown: false }} />
</> </>
...@@ -219,8 +219,22 @@ class Auth extends React.Component { ...@@ -219,8 +219,22 @@ class Auth extends React.Component {
} }
}} /> }} />
<Stack.Screen name="Profile" component={ProfilePage} <Stack.Screen name="Profile" component={ProfilePage}
options={{ options={{
headerStyle: { backgroundColor: '#CFB368' },
headerTitleContainerStyle: { alignContent: 'center' },
headerTitleAlign: 'center',
headerTintColor: '#fff',
headerTitleStyle: {
alignSelf: 'center',
fontFamily: 'Gotham-Black',
color: 'white',
textAlign: 'center'
}, title: 'PROFIL'
}} />
<Stack.Screen name="Change Profil" component={ChangeProfile} />
<Stack.Screen name="Change language" component={ChangeLanguage} />
<Stack.Screen name="Change password" component={ChangePassword} options={{
headerStyle: { backgroundColor: '#CFB368' }, headerStyle: { backgroundColor: '#CFB368' },
headerTitleContainerStyle: { alignContent: 'center' }, headerTitleContainerStyle: { alignContent: 'center' },
headerTitleAlign: 'center', headerTitleAlign: 'center',
...@@ -230,22 +244,8 @@ class Auth extends React.Component { ...@@ -230,22 +244,8 @@ class Auth extends React.Component {
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'PROFIL' }, title: 'CHANGE PASSWORD'
}}/> }} />
<Stack.Screen name="Change Profil" component={ChangeProfile} />
<Stack.Screen name="Change language" component={ChangeLanguage} />
<Stack.Screen name="Change password" component={ChangePassword} options={{
headerStyle: { backgroundColor: '#CFB368' },
headerTitleContainerStyle: { alignContent: 'center' },
headerTitleAlign: 'center',
headerTintColor: '#fff',
headerTitleStyle: {
alignSelf: 'center',
fontFamily: 'Gotham-Black',
color: 'white',
textAlign: 'center'
}, 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,7 +258,7 @@ class Auth extends React.Component { ...@@ -258,7 +258,7 @@ class Auth extends React.Component {
<Stack.Screen name="Delivery Address" component={DeliveryAddress} /> <Stack.Screen name="Delivery Address" component={DeliveryAddress} />
<Stack.Screen name="Address Detail" component={AddressDetail} /> <Stack.Screen name="Address Detail" component={AddressDetail} />
<Stack.Screen name="Menu Detail" component={MenuDetail} /> <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' },
headerTitleAlign: 'center', headerTitleAlign: 'center',
...@@ -269,13 +269,27 @@ class Auth extends React.Component { ...@@ -269,13 +269,27 @@ class Auth extends React.Component {
color: 'white', color: 'white',
textAlign: 'center' textAlign: 'center'
}, title: 'PICKUP STORE' }, title: 'PICKUP STORE'
}}/> }} />
<Stack.Screen name="Outlet Detail" component={OutletDetail} /> <Stack.Screen name="Outlet Detail" component={OutletDetail} />
<Stack.Screen name="Menu Select" component={MenuSelection} options={{ headerShown: false }} /> <Stack.Screen name="Menu Select" component={MenuSelection} options={{ headerShown: false }} />
<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' })} />,
...@@ -360,19 +374,19 @@ class Auth extends React.Component { ...@@ -360,19 +374,19 @@ class Auth extends React.Component {
}} /> }} />
<Stack.Screen name="TopUpInfo" component={TopUpInfo} /> <Stack.Screen name="TopUpInfo" component={TopUpInfo} />
<Stack.Screen name="Reward Detail" component={RewardDetail} /> <Stack.Screen name="Reward Detail" component={RewardDetail} />
<Stack.Screen name="Reward Select" component={RewardSelect} <Stack.Screen name="Reward Select" component={RewardSelect}
options={{ options={{
headerStyle: { backgroundColor: "#CFB368" }, headerStyle: { backgroundColor: "#CFB368" },
headerBackTitleStyle: { color: 'white' }, headerBackTitleStyle: { color: 'white' },
headerTintColor: '#fff', headerTintColor: '#fff',
headerTitleAlign: 'center', headerTitleAlign: 'center',
headerTitleStyle: { headerTitleStyle: {
fontFamily: 'Gotham-Black', fontFamily: 'Gotham-Black',
color: 'white', color: 'white',
fontSize: 18, fontSize: 18,
}, },
title: 'REWARD SELECT' title: 'REWARD SELECT'
}} /> }} />
</Stack.Navigator> </Stack.Navigator>
) )
} }
......
view/ChangePassword.js
View file @ 424f3b37
...@@ -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 @ 424f3b37
...@@ -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