From c20718bfbadeba7806c44e66bee5c84e0af140cd Mon Sep 17 00:00:00 2001 From: henrydays Date: Tue, 12 Mar 2019 23:27:58 +0000 Subject: [PATCH 1/3] reset --- App/app/App.js | 63 +++++++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/App/app/App.js b/App/app/App.js index 070e30ab..f55f2fe2 100755 --- a/App/app/App.js +++ b/App/app/App.js @@ -132,6 +132,12 @@ class App extends Component { _toggle=()=>{ this.setState({modalResetPassword:false}) } + //faz call + _reset=()=>{ + //fecha modal + this.setState({modalResetPassword:false}) + //faz call + } _keyboardDidShow() { //alert('Keyboard Shown'); @@ -191,6 +197,8 @@ class App extends Component { isVisible={this.state.modalResetPassword} onBackdropPress={this._toggle} onBackButtonPress={this._toggle} + animationInTiming={1500} + animationOutTiming={1500} > @@ -211,11 +219,11 @@ class App extends Component { /> - Caso tenhas problemas com este processo deves contactar a comissão atravês do email geral. + Caso tenhas problemas com este processo deves contactar a comissão organizadora atravês do email geral. @@ -249,10 +257,10 @@ class App extends Component { - Scan QR + @@ -271,13 +279,11 @@ class App extends Component { placeholder="Password" /> { !this.props.loadingLogin && - - Entrar - + + + Login + + } {this.props.alignItems && @@ -300,8 +306,8 @@ class App extends Component { Não sabes a password? {this.setState({modalResetPassword:true})}}> - - Recuperar Password + + Reset Password @@ -332,7 +338,7 @@ const styles = { }, resetPassword:{ - borderRadius: 90, + borderColor: "#bfbdbd", borderWidth: 1, @@ -344,14 +350,14 @@ const styles = { backgroundColor: "white", - borderRadius: 90, + borderRadius: 3, height: SCREEN_HEIGHT * 0.08, borderColor: "#bfbdbd", borderWidth: 1, paddingLeft: SCREEN_WIDTH * 0.05 }, passwordInput: { - borderRadius: 90, + borderColor: "#bfbdbd", borderWidth: 1, @@ -361,7 +367,7 @@ const styles = { backgroundColor: "white", - borderRadius: 90, + borderRadius: 3, height: SCREEN_HEIGHT * 0.08, borderColor: "#bfbdbd", borderWidth: 1, @@ -373,15 +379,19 @@ const styles = { }, scanQR: { //flexDirection: 'row', - paddingTop: 5, + flex:1, +//paddingTop: 5, backgroundColor: 10, + alignItems:'center', + padding:5, + paddingRight:15, - width: 80, - paddingLeft: 10, - backgroundColor: "#f24b4b", - borderBottomRightRadius: 90, - borderTopRightRadius: 90, - height: "100%" + //width: 80, + // paddingLeft: 10, + backgroundColor: "#CC1A17", + borderBottomRightRadius: 3, + borderTopRightRadius: 3, + // height: "100%" }, inputSection: { flexDirection: "row", @@ -389,7 +399,7 @@ const styles = { backgroundColor: "white", - borderRadius: 90, + borderRadius: 3, height: SCREEN_HEIGHT * 0.08, borderColor: "#bfbdbd", borderWidth: 1 @@ -448,7 +458,8 @@ const styles = { justifyContent: "center", alignItems: "center", - marginTop: 200 + marginTop: 200, + }, logo2: { From adef17b12e3a8e4be8d26cc29adbe61d7df6bfdd Mon Sep 17 00:00:00 2001 From: henrydays Date: Wed, 13 Mar 2019 00:36:42 +0000 Subject: [PATCH 2/3] =?UTF-8?q?reset=20em=20condi=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/app/App.js | 18 +++++++------- App/app/store/actions/actionTypes.js | 2 +- App/app/store/actions/api.js | 36 +++++++++++++++++++++++++++- App/app/store/actions/index.js | 3 ++- App/package-lock.json | 5 ++++ App/package.json | 1 + 6 files changed, 54 insertions(+), 11 deletions(-) diff --git a/App/app/App.js b/App/app/App.js index f55f2fe2..33efa9f0 100755 --- a/App/app/App.js +++ b/App/app/App.js @@ -135,6 +135,7 @@ class App extends Component { //faz call _reset=()=>{ //fecha modal + this.props.resetPassword(this.props.userDetails.token,this.state.resetText), this.setState({modalResetPassword:false}) //faz call } @@ -193,12 +194,12 @@ class App extends Component { /> - @@ -207,15 +208,15 @@ class App extends Component { this.setState({ resetText })} + + onChangeText={r => this.setState({ resetText:r })} clearButtonMode="always" value={this.state.resetText} clearTextOnFocus={true} onSubmitEditing={Keyboard.dismiss} - placeholder="geral@enei.pt" + placeholder="Email ou Qr code" />