Merge branch 'master' into prop-types

plugins/talk-plugin-auth/client/components/ForgotContent.js

@@ -39,13 +39,13 @@ class ForgotContent extends React.Component {
           </Button>
           {passwordRequestSuccess
             ? <p className={styles.passwordRequestSuccess}>
-                {passwordRequestSuccess}
-              </p>
+              {passwordRequestSuccess}
+            </p>
             : null}
           {passwordRequestFailure
             ? <p className={styles.passwordRequestFailure}>
-                {passwordRequestFailure}
-              </p>
+              {passwordRequestFailure}
+            </p>
             : null}
         </form>
         <div className={styles.footer}>

plugins/talk-plugin-auth/client/components/SignInButton.js

@@ -9,8 +9,8 @@ const SignInButton = ({loggedIn, showSignInDialog}) => (
   <div className="talk-stream-auth-sign-in-button">
     {!loggedIn
       ? <Button id="coralSignInButton" onClick={showSignInDialog} full>
-          {t('sign_in.sign_in_to_comment')}
-        </Button>
+        {t('sign_in.sign_in_to_comment')}
+      </Button>
       : null}
   </div>
 );

plugins/talk-plugin-auth/client/components/SignInContainer.js

@@ -97,6 +97,9 @@ class SignInContainer extends React.Component {
           // allow success UI to be shown for a second, and then close the modal
           this.props.hideSignInDialog();
         }, 2500);
+      })
+      .catch((err) => {
+        console.error(err);
       });
   };
 

plugins/talk-plugin-auth/client/components/SignInContent.js

@@ -29,63 +29,63 @@ const SignInContent = ({
       {auth.error && <Alert>{auth.error}</Alert>}
       {auth.emailVerificationFailure
         ? <form onSubmit={handleResendVerification}>
-            <p>{t('sign_in.request_new_verify_email')}</p>
+          <p>{t('sign_in.request_new_verify_email')}</p>
+          <TextField
+            id="confirm-email"
+            type="email"
+            label={t('sign_in.email')}
+            value={emailToBeResent}
+            onChange={handleChangeEmail}
+          />
+          <Button id="resendConfirmEmail" type="submit" cStyle="black" full>
+              Send Email
+          </Button>
+          {emailVerificationLoading && <Spinner />}
+          {emailVerificationSuccess && <Success />}
+        </form>
+        : <div>
+          <div className={`${styles.socialConnections} social-connections`}>
+            <Button cStyle="facebook" onClick={fetchSignInFacebook} full>
+              {t('sign_in.facebook_sign_in')}
+            </Button>
+          </div>
+          <div className={styles.separator}>
+            <h1>
+              {t('sign_in.or')}
+            </h1>
+          </div>
+          <form onSubmit={handleSignIn}>
             <TextField
-              id="confirm-email"
+              id="email"
               type="email"
               label={t('sign_in.email')}
-              value={emailToBeResent}
-              onChange={handleChangeEmail}
+              value={formData.email}
+              style={{fontSize: 16}}
+              onChange={handleChange}
             />
-            <Button id="resendConfirmEmail" type="submit" cStyle="black" full>
-              Send Email
-            </Button>
-            {emailVerificationLoading && <Spinner />}
-            {emailVerificationSuccess && <Success />}
+            <TextField
+              id="password"
+              type="password"
+              label={t('sign_in.password')}
+              value={formData.password}
+              style={{fontSize: 16}}
+              onChange={handleChange}
+            />
+            <div className={styles.action}>
+              {!auth.isLoading
+                ? <Button
+                  id="coralLogInButton"
+                  type="submit"
+                  cStyle="black"
+                  className={styles.signInButton}
+                  full
+                >
+                  {t('sign_in.sign_in')}
+                </Button>
+                : <Spinner />}
+            </div>
           </form>
-        : <div>
-            <div className={`${styles.socialConnections} social-connections`}>
-              <Button cStyle="facebook" onClick={fetchSignInFacebook} full>
-                {t('sign_in.facebook_sign_in')}
-              </Button>
-            </div>
-            <div className={styles.separator}>
-              <h1>
-                {t('sign_in.or')}
-              </h1>
-            </div>
-            <form onSubmit={handleSignIn}>
-              <TextField
-                id="email"
-                type="email"
-                label={t('sign_in.email')}
-                value={formData.email}
-                style={{fontSize: 16}}
-                onChange={handleChange}
-              />
-              <TextField
-                id="password"
-                type="password"
-                label={t('sign_in.password')}
-                value={formData.password}
-                style={{fontSize: 16}}
-                onChange={handleChange}
-              />
-              <div className={styles.action}>
-                {!auth.isLoading
-                  ? <Button
-                      id="coralLogInButton"
-                      type="submit"
-                      cStyle="black"
-                      className={styles.signInButton}
-                      full
-                    >
-                      {t('sign_in.sign_in')}
-                    </Button>
-                  : <Spinner />}
-              </div>
-            </form>
-          </div>}
+        </div>}
       <div className={`${styles.footer} footer`}>
         <span>
           <a onClick={() => changeView('FORGOT')}>