Commit 860757d2 authored by Wahyu Adjie Prasetyo's avatar Wahyu Adjie Prasetyo

benerin gambar daun new password dan reset password

parent 10b7ccbd
...@@ -121,7 +121,7 @@ class NewPassword extends React.Component { ...@@ -121,7 +121,7 @@ class NewPassword extends React.Component {
textStyle={styles.spinnerTextStyle} textStyle={styles.spinnerTextStyle}
/> />
<View style={{ flex: 3 }}> <View style={{ flex: 3 }}>
<View style={{ flex: 1, marginRight: 30, marginLeft: 30, top: 20 }}> <View style={{ flex: 1, marginRight: 30, marginLeft: 30, top: 20}}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>{i18n.t('email')}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>{i18n.t('email')}</Text>
<Text style={{ fontFamily: 'Gotham-Black', color: '#838383', fontSize: 18, textAlign: 'center', margin: 3, marginBottom: 15 }}>{this.props.email}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#838383', fontSize: 18, textAlign: 'center', margin: 3, marginBottom: 15 }}>{this.props.email}</Text>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>{i18n.t('token')}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>{i18n.t('token')}</Text>
...@@ -150,20 +150,11 @@ class NewPassword extends React.Component { ...@@ -150,20 +150,11 @@ class NewPassword extends React.Component {
<Text style={{ alignSelf: 'center', top: 10, color: 'white', fontFamily: 'Gotham-Black', fontSize: 20 }}>{i18n.t('submit')}</Text> <Text style={{ alignSelf: 'center', top: 10, color: 'white', fontFamily: 'Gotham-Black', fontSize: 20 }}>{i18n.t('submit')}</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
<View style={{flex:2}}>
<ImageBackground source={require('../assets/images/daun.png')} style={styles.logo}>
</ImageBackground>
</View> </View>
</View> </View>
<View style={{ flex: 1, flexDirection: 'row' }}>
<View style={styles.v_logo}>
<View style={{ flex: 1, alignSelf: 'flex-start' }}>
<Image resizeMode="contain" source={require('../assets/images/daun.png')} style={styles.logo} />
</View>
<View style={{ flex: 1 }}>
</View>
</View>
<View style={{ flex: 0.5 }}>
</View>
</View> </View>
</View> </View>
) )
...@@ -183,15 +174,14 @@ const styles = StyleSheet.create({ ...@@ -183,15 +174,14 @@ const styles = StyleSheet.create({
marginTop: 0, marginTop: 0,
}, },
// v_logo: {
v_logo: { // flex: 2,
flex: 2, // flexDirection: 'column-reverse',
flexDirection: 'column-reverse', // alignContent: 'flex-start',
alignContent: 'flex-start', // },
},
logo: { logo: {
alignSelf: 'flex-start', alignSelf: 'flex-start',
marginTop: 50, marginTop: 200,
width: 290, width: 290,
height: 290, height: 290,
bottom: 150, bottom: 150,
......
import React from 'react'; import React from 'react';
import { View, Text, TextInput, StyleSheet, Button, Alert, Image, TouchableOpacity } from 'react-native'; import { View, Text, TextInput, StyleSheet, Button, Alert, Image, TouchableOpacity,ImageBackground } from 'react-native';
import Axios from 'axios'; import Axios from 'axios';
import { BASE_URL_RESET_PASSWORD } from '../model/Base_Model'; import { BASE_URL_RESET_PASSWORD } from '../model/Base_Model';
import ActionType from '../redux/globalActionType'; import ActionType from '../redux/globalActionType';
...@@ -87,12 +87,14 @@ class ResetPassword extends React.Component { ...@@ -87,12 +87,14 @@ class ResetPassword extends React.Component {
render() { render() {
return ( return (
<View style={styles.container}> <View style={styles.container}>
<MyStatusBar /> <MyStatusBar />
<Spinner <Spinner
visible={this.state.spinner} visible={this.state.spinner}
textContent={'Loading...'} textContent={'Loading...'}
textStyle={styles.spinnerTextStyle} textStyle={styles.spinnerTextStyle}
/> />
<View style={{ flex: 3 }}> <View style={{ flex: 3 }}>
<View style={{ flex: 1, marginRight: 30, marginLeft: 30, top: 50 }}> <View style={{ flex: 1, marginRight: 30, marginLeft: 30, top: 50 }}>
<Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>{i18n.t('email')}</Text> <Text style={{ fontFamily: 'Gotham-Black', color: '#CFB368', fontSize: 20, textAlign: 'center', margin: 3 }}>{i18n.t('email')}</Text>
...@@ -111,19 +113,11 @@ class ResetPassword extends React.Component { ...@@ -111,19 +113,11 @@ class ResetPassword extends React.Component {
<TouchableOpacity style={{ height: 60 }} onPress={() => this.handleEnterToken()}> <TouchableOpacity style={{ height: 60 }} onPress={() => this.handleEnterToken()}>
<Text style={{ alignSelf: 'center', color: '#CFB368', fontFamily: 'Gotham-Black', fontSize: 20 }}>{i18n.t('enterToken')}</Text> <Text style={{ alignSelf: 'center', color: '#CFB368', fontFamily: 'Gotham-Black', fontSize: 20 }}>{i18n.t('enterToken')}</Text>
</TouchableOpacity> </TouchableOpacity>
<View style={{flex:2}}>
<ImageBackground source={require('../assets/images/daun.png')} style={styles.logo}>
</ImageBackground>
</View> </View>
</View> </View>
<View style={{ flex: 1, flexDirection: 'row' }}>
<View style={styles.v_logo}>
<View style={{ flex: 1, alignSelf: 'flex-start' }}>
<Image resizeMode="contain" source={require('../assets/images/daun.png')} style={styles.logo}></Image>
</View>
<View style={{ flex: 1 }}>
</View>
</View>
<View style={{ flex: 0.5 }}>
</View>
</View> </View>
</View> </View>
) )
...@@ -164,13 +158,8 @@ const styles = StyleSheet.create({ ...@@ -164,13 +158,8 @@ const styles = StyleSheet.create({
width: 290, width: 290,
height: 290, height: 290,
bottom: 145, bottom: 145,
flexDirection:'column-reverse'
}, },
v_logo: {
flex: 2,
flexDirection: 'column-reverse',
alignContent: 'flex-start',
}
}) })
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
...@@ -198,7 +187,6 @@ const mapDispatchToProps = (dispacth) => { ...@@ -198,7 +187,6 @@ const mapDispatchToProps = (dispacth) => {
}) })
} }
} }
export default connect(mapStateToProps, mapDispatchToProps)(ResetPassword); export default connect(mapStateToProps, mapDispatchToProps)(ResetPassword);
......
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