Merge branch 'dev' of https://github.com/gocreating/express-react-hmr…

…-boilerplate into dev
gocreating · Oct 12, 2016 · 88557e4 · 88557e4
2 parents 6737ecf + c919750
commit 88557e4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/common/components/forms/AvatarForm.js b/src/common/components/forms/AvatarForm.js
@@ -121,7 +121,7 @@ class AvatarForm extends Component {
     } else if (formData.storage === 'local') {
       uploadProcedure = this.uploadToLocal(formData);
     }
-    uploadProcedure
+    return uploadProcedure
       .catch((err) => {
         dispatch(pushErrors([{
           title: 'Fail To Upload Avatar',
@@ -131,7 +131,7 @@ class AvatarForm extends Component {
         throw err;
       })
       .then((downloadURL) => {
-        userAPI(getState().apiEngine)
+        return userAPI(getState().apiEngine)
           .update({
             avatarURL: downloadURL,
           })
@@ -158,6 +158,7 @@ class AvatarForm extends Component {
     const {
       handleSubmit,
       pristine,
+      submitting,
       invalid,
     } = this.props;
     let avatarURL = this.state.avatarURL || this.props.avatarURL;
@@ -184,7 +185,7 @@ class AvatarForm extends Component {
           }]}
         />
         <FormFooter>
-          <Button type="submit" disabled={pristine || invalid}>
+          <Button type="submit" disabled={pristine || submitting || invalid}>
             Upload
           </Button>
         </FormFooter>

diff --git a/src/common/components/forms/LoginForm.js b/src/common/components/forms/LoginForm.js
@@ -40,7 +40,7 @@ class LoginForm extends Component {
   }
 
   _handleSubmit(formData) {
-    userAPI(this.context.store.getState().apiEngine)
+    return userAPI(this.context.store.getState().apiEngine)
       .login(formData)
       .catch((err) => {
         this.context.store.dispatch(pushErrors(err));
@@ -70,6 +70,7 @@ class LoginForm extends Component {
     const {
       handleSubmit,
       pristine,
+      submitting,
       invalid,
     } = this.props;
 
@@ -90,7 +91,7 @@ class LoginForm extends Component {
           placeholder="Password"
         />
         <FormFooter>
-          <Button type="submit" disabled={pristine || invalid}>
+          <Button type="submit" disabled={pristine || submitting || invalid}>
             Login
           </Button>
         </FormFooter>

diff --git a/src/common/components/forms/RegisterForm.js b/src/common/components/forms/RegisterForm.js
@@ -31,7 +31,7 @@ class RegisterForm extends Component {
   }
 
   _handleSubmit(formData) {
-    userAPI(this.context.store.getState().apiEngine)
+    return userAPI(this.context.store.getState().apiEngine)
       .register(formData)
       .catch((err) => {
         this.context.store.dispatch(pushErrors(err));
@@ -46,6 +46,7 @@ class RegisterForm extends Component {
     const {
       handleSubmit,
       pristine,
+      submitting,
       invalid,
     } = this.props;
 
@@ -73,7 +74,7 @@ class RegisterForm extends Component {
           placeholder="Password"
         />
         <FormFooter>
-          <Button type="submit" disabled={pristine || invalid}>
+          <Button type="submit" disabled={pristine || submitting || invalid}>
             Register
           </Button>
         </FormFooter>