From 3b76bfabdb22a85a7c1f675d8f986e643c0fa7ce Mon Sep 17 00:00:00 2001
From: Barry Low <barrylow@gmail.com>
Date: Mon, 12 Nov 2018 23:11:21 -0800
Subject: [PATCH] update sign-up form responses

---
 .../components/SignupForm.js                  |  2 +-
 .../components/SignupVerifyResponse.js        | 36 ++++++++++++-------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/client/src/views/email-verification/components/SignupForm.js b/client/src/views/email-verification/components/SignupForm.js
index 4a8b7b862..408fd5c3a 100644
--- a/client/src/views/email-verification/components/SignupForm.js
+++ b/client/src/views/email-verification/components/SignupForm.js
@@ -44,7 +44,7 @@ export class SignupForm extends Component {
       >
         {(NewsletterSignup, { loading, error, data }) => {
           return (
-            <Grid container className={classes.signupRight} direction='column' justify={alignCenter ? 'center' : ''}>
+            <Grid container className={classes.signupRight} direction='column' justify={alignCenter ? 'center' : 'flex-start'}>
               {displayTitle && <Typography variant='h4' className={classes.textWhite} gutterBottom>Stay in touch!</Typography>}
               {displayIntro && <Typography variant='subtitle1' className={classes.textWhite} gutterBottom>Opt-in our mailing list to stay up to date with the Advanced Algos Project.</Typography>}
               <form id='email-signup' action='#' className='form-inline' autoComplete='off'>
diff --git a/client/src/views/email-verification/components/SignupVerifyResponse.js b/client/src/views/email-verification/components/SignupVerifyResponse.js
index 5fa3db408..a31cbe11b 100644
--- a/client/src/views/email-verification/components/SignupVerifyResponse.js
+++ b/client/src/views/email-verification/components/SignupVerifyResponse.js
@@ -31,24 +31,34 @@ export class SignupVerifyResponse extends React.Component {
       } else {
         BannerText = ['Newsletter Signup Error: ', <br key='EmailSignupConfirm-error-br' />, error.message]
       }
+      return (
+        <BannerTopBar
+          size='big'
+          title={BannerTitle}
+          text={BannerText}
+          backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg'
+        />
+      )
     }
     if (loading && !error) {
       BannerText = ['Processing newsletter sign-up...', <br key='EmailSignupConfirm-br' />, 'Thank you for opting-in to recieve updates about the Advanced Algos project!']
     }
     if (data !== undefined && data !== null) {
       console.log(data)
-      return (
-        <React.Fragment>
-          <BannerTopBar
-            size='big'
-            title={BannerTitle}
-            text={BannerText}
-            backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg'
-          >
-            {displayForm && <SignupForm alignCenter />}
-          </BannerTopBar>
-        </React.Fragment>
-      )
+      if (data.master_NewsletterSignupVerify === 'SUCCESS') {
+        return (
+          <React.Fragment>
+            <BannerTopBar
+              size='big'
+              title='Mailing Sign-Up Complete!'
+              text='We look forward to keeping you up-to-date on the Advanced Algos project.'
+              backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg'
+            >
+              {displayForm && <SignupForm alignCenter />}
+            </BannerTopBar>
+          </React.Fragment>
+        )
+      }
     } else {
       return (
         <BannerTopBar
@@ -63,7 +73,7 @@ export class SignupVerifyResponse extends React.Component {
 }
 
 SignupVerifyResponse.propTypes = {
-  mutate: PropTypes.string,
+  mutate: PropTypes.function,
   loading: PropTypes.bool,
   error: PropTypes.object,
   data: PropTypes.object