Commit a5e3579

author

Cristian

committed

Add setSubmitting to false when response is received

1 parent cbe7fda commit a5e3579Copy full SHA for a5e3579

File tree

+19

-18

lines changed

+19

-18

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@ const LoginForm = props => (`
`14`	`14`	`const { history } = props;`
`15`	`15`	`const { email, password } = values;`
`16`	`16`	`Meteor.loginWithPassword(email, password, (err) => {`
	`17`	`+ setSubmitting(false);`
`17`	`18`	`if (err) {`
`18`	`19`	`Bert.alert(err.reason, 'danger');`
`19`	`20`	`return false;`
`20`	`21`	`}`
`21`	`22`	`Bert.alert('Logged in', 'success');`
`22`		`- setSubmitting(false);`
`23`	`23`	`history.push('/');`
`24`	`24`	`});`
`25`	`25`	`}}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,11 @@ const RegisterForm = (props) => {`
`25`	`25`	`onSubmit={(values, { setSubmitting }) => {`
`26`	`26`	`const { email, password, username } = values;`
`27`	`27`	`Meteor.call('createNewUser', { email, password, username }, (err) => {`
	`28`	`+ setSubmitting(false);`
`28`	`29`	`if (err) {`
`29`	`30`	`Bert.alert(err.reason, 'danger');`
`30`	`31`	`return false;`
`31`	`32`	`}`
`32`		`- setSubmitting(false);`
`33`	`33`	`login(email, password);`
`34`	`34`	`});`
`35`	`35`	`}}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ class UserProfileForm extends Component {`
`31`	`31`	`const options = { username: values.username };`
`32`	`32`
`33`	`33`	`Meteor.call('updateUserData', Meteor.userId(), options, (err) => {`
	`34`	`+ setSubmitting(false);`
`34`	`35`	`if (err) {`
`35`	`36`	`Bert.alert(`
`36`	`37`	`There was an error trying to update your user data ${err.message}`,
`@@ -39,7 +40,6 @@ class UserProfileForm extends Component {`
`39`	`40`	`return false;`
`40`	`41`	`}`
`41`	`42`	`Bert.alert('Your profile was updated successfully', 'success');`
`42`		`- setSubmitting(false);`
`43`	`43`	`});`
`44`	`44`	`}}`
`45`	`45`	`render={({`

Lines changed: 15 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,20 +9,21 @@ const LoginPage = () => (`
`9`	`9`	`<Header textAlign="center" as="h3">`
`10`	`10`	`Please Sign in`
`11`	`11`	`</Header>`
`12`		`- <Segment />`
`13`		`- <LoginForm />`
`14`		`- <p className="login-subtitle">`
`15`		`- Not a member?`
`16`		`- {' '}`
`17`		`- <Link color="black" to="/register">`
`18`		`- Sign up here`
`19`		`- </Link>`
`20`		`- </p>`
`21`		`- <p className="login-subtitle">`
`22`		`- Forgot password?`
`23`		`- {' '}`
`24`		`- <Link to="/forgot-password">Click here</Link>`
`25`		`- </p>`
	`12`	`+ <Segment>`
	`13`	`+ <LoginForm />`
	`14`	`+ <p className="login-subtitle">`
	`15`	`+ Not a member?`
	`16`	`+ {' '}`
	`17`	`+ <Link color="black" to="/register">`
	`18`	`+ Sign up here`
	`19`	`+ </Link>`
	`20`	`+ </p>`
	`21`	`+ <p className="login-subtitle">`
	`22`	`+ Forgot password?`
	`23`	`+ {' '}`
	`24`	`+ <Link to="/forgot-password">Click here</Link>`
	`25`	`+ </p>`
	`26`	`+ </Segment>`
`26`	`27`	`</Grid.Column>`
`27`	`28`	`</Grid>`
`28`	`29`	`);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ import ChangePasswordForm from '../components/Forms/ChangePasswordForm';`
`7`	`7`	`const MyAccountPage = (props) => {`
`8`	`8`	`const changePassword = (values, { setSubmitting }) => {`
`9`	`9`	`Meteor.call('changeUserPassword', Meteor.userId(), values.passwordConfirm, (err) => {`
	`10`	`+ setSubmitting(false);`
`10`	`11`	`if (err) {`
`11`	`12`	Bert.alert(`There was an error trying to update your password ${err.message}`, 'danger');
`12`	`13`	`return false;`
`13`	`14`	`}`
`14`	`15`	`Bert.alert('Your password was updated successfully', 'success');`
`15`		`- setSubmitting(false);`
`16`	`16`	`// We need to wait 1 second before redirecting user to login`
`17`	`17`	`// That's because meteor userId() does not update instantly`
`18`	`18`	`setTimeout(() => {`

Comments

(0)