From b2a96e0a09adffaf178b88177757186cf0aab534 Mon Sep 17 00:00:00 2001
From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com>
Date: Mon, 28 Mar 2022 19:51:58 +0530
Subject: [PATCH] fix(client): sign up for email list directly (#45508)

* fix(client): sign up for email list directly

* fix: remove extraneous code
---
 .../chinese-traditional/translations.json     |  1 +
 client/i18n/locales/chinese/translations.json |  1 +
 client/i18n/locales/english/translations.json |  1 +
 client/i18n/locales/espanol/translations.json |  1 +
 client/i18n/locales/italian/translations.json |  1 +
 .../i18n/locales/japanese/translations.json   |  1 +
 .../i18n/locales/portuguese/translations.json |  1 +
 .../i18n/locales/ukrainian/translations.json  |  1 +
 .../__snapshots__/email-sign-up.test.js.snap  | 24 ++----
 client/src/pages/email-sign-up.tsx            | 84 +++++++++++++------
 10 files changed, 73 insertions(+), 43 deletions(-)

diff --git a/client/i18n/locales/chinese-traditional/translations.json b/client/i18n/locales/chinese-traditional/translations.json
index 0599a47892..7d592a0485 100644
--- a/client/i18n/locales/chinese-traditional/translations.json
+++ b/client/i18n/locales/chinese-traditional/translations.json
@@ -26,6 +26,7 @@
     "off": "關閉",
     "on": "打開",
     "sign-in": "登錄",
+    "sign-up-email-list": "Sign up for Quincy's weekly emails",
     "sign-out": "退出",
     "curriculum": "課程",
     "forum": "論壇",
diff --git a/client/i18n/locales/chinese/translations.json b/client/i18n/locales/chinese/translations.json
index 907a790058..cf5c4fd788 100644
--- a/client/i18n/locales/chinese/translations.json
+++ b/client/i18n/locales/chinese/translations.json
@@ -26,6 +26,7 @@
     "off": "关闭",
     "on": "打开",
     "sign-in": "登录",
+    "sign-up-email-list": "Sign up for Quincy's weekly emails",
     "sign-out": "退出",
     "curriculum": "课程",
     "forum": "论坛",
diff --git a/client/i18n/locales/english/translations.json b/client/i18n/locales/english/translations.json
index 84cebf0e56..b0fc4200ae 100644
--- a/client/i18n/locales/english/translations.json
+++ b/client/i18n/locales/english/translations.json
@@ -26,6 +26,7 @@
     "off": "Off",
     "on": "On",
     "sign-in": "Sign in",
+    "sign-up-email-list": "Sign up for Quincy's weekly emails",
     "sign-out": "Sign out",
     "curriculum": "Curriculum",
     "forum": "Forum",
diff --git a/client/i18n/locales/espanol/translations.json b/client/i18n/locales/espanol/translations.json
index 27b90308e7..ea8c4564cc 100644
--- a/client/i18n/locales/espanol/translations.json
+++ b/client/i18n/locales/espanol/translations.json
@@ -26,6 +26,7 @@
     "off": "Apagado",
     "on": "Encendido",
     "sign-in": "Iniciar sesión",
+    "sign-up-email-list": "Sign up for Quincy's weekly emails",
     "sign-out": "Cerrar sesión",
     "curriculum": "Currículo",
     "forum": "Foro",
diff --git a/client/i18n/locales/italian/translations.json b/client/i18n/locales/italian/translations.json
index 14dafb2e57..b657bfa545 100644
--- a/client/i18n/locales/italian/translations.json
+++ b/client/i18n/locales/italian/translations.json
@@ -26,6 +26,7 @@
     "off": "Off",
     "on": "On",
     "sign-in": "Accedi",
+    "sign-up-email-list": "Sign up for Quincy's weekly emails",
     "sign-out": "Esci",
     "curriculum": "Curriculum",
     "forum": "Forum",
diff --git a/client/i18n/locales/japanese/translations.json b/client/i18n/locales/japanese/translations.json
index 9077377ebf..a9d553f81e 100644
--- a/client/i18n/locales/japanese/translations.json
+++ b/client/i18n/locales/japanese/translations.json
@@ -26,6 +26,7 @@
     "off": "オフ",
     "on": "オン",
     "sign-in": "サインイン",
+    "sign-up-email-list": "Sign up for Quincy's weekly emails",
     "sign-out": "サインアウト",
     "curriculum": "カリキュラム",
     "forum": "フォーラム",
diff --git a/client/i18n/locales/portuguese/translations.json b/client/i18n/locales/portuguese/translations.json
index 2c451874fd..b2cedf0df1 100644
--- a/client/i18n/locales/portuguese/translations.json
+++ b/client/i18n/locales/portuguese/translations.json
@@ -26,6 +26,7 @@
     "off": "Desligado",
     "on": "Ligado",
     "sign-in": "Iniciar sessão",
+    "sign-up-email-list": "Sign up for Quincy's weekly emails",
     "sign-out": "Encerrar sessão",
     "curriculum": "Currículo",
     "forum": "Fórum",
diff --git a/client/i18n/locales/ukrainian/translations.json b/client/i18n/locales/ukrainian/translations.json
index 304fc72137..fa87fcaaae 100644
--- a/client/i18n/locales/ukrainian/translations.json
+++ b/client/i18n/locales/ukrainian/translations.json
@@ -26,6 +26,7 @@
     "off": "Вимкнути",
     "on": "Увімкнути",
     "sign-in": "Увійти",
+    "sign-up-email-list": "Sign up for Quincy's weekly emails",
     "sign-out": "Вийти",
     "curriculum": "Навчальна програма",
     "forum": "Форум",
diff --git a/client/src/pages/__snapshots__/email-sign-up.test.js.snap b/client/src/pages/__snapshots__/email-sign-up.test.js.snap
index 1449d8c393..1931f92d7b 100644
--- a/client/src/pages/__snapshots__/email-sign-up.test.js.snap
+++ b/client/src/pages/__snapshots__/email-sign-up.test.js.snap
@@ -119,16 +119,8 @@ exports[`<EmailSignUp /> Non-Authenticated user "not accepted terms and conditio
       />
     </div>
     <div
-      className="col-md-4 col-md-offset-2 col-sm-5 col-sm-offset-1 col-xs-12"
+      className="col-md-8 col-md-offset-2 col-sm-10 col-sm-offset-1 col-xs-12"
     >
-      <button
-        className="big-cta-btn btn btn-lg btn-primary btn-block"
-        disabled={false}
-        onClick={[Function]}
-        type="button"
-      >
-        buttons.yes-please
-      </button>
       <div
         className="button-spacer"
         style={
@@ -137,18 +129,14 @@ exports[`<EmailSignUp /> Non-Authenticated user "not accepted terms and conditio
           }
         }
       />
-    </div>
-    <div
-      className="col-md-4 col-sm-5 col-xs-12"
-    >
-      <button
+      <a
         className="big-cta-btn btn btn-lg btn-primary btn-block"
-        disabled={false}
+        href="http://localhost:3000/signin"
         onClick={[Function]}
-        type="button"
+        onKeyDown={[Function]}
       >
-        buttons.no-thanks
-      </button>
+        buttons.sign-up-email-list
+      </a>
       <div
         className="button-spacer"
         style={
diff --git a/client/src/pages/email-sign-up.tsx b/client/src/pages/email-sign-up.tsx
index 8444876f87..f29ffba38c 100644
--- a/client/src/pages/email-sign-up.tsx
+++ b/client/src/pages/email-sign-up.tsx
@@ -9,21 +9,27 @@ import { createSelector } from 'reselect';
 import IntroDescription from '../components/Intro/components/IntroDescription';
 import createRedirect from '../components/create-redirect';
 import { ButtonSpacer, Spacer } from '../components/helpers';
+import { apiLocation } from '../../../config/env.json';
 
-import { acceptTerms, userSelector } from '../redux';
+import { acceptTerms, userSelector, isSignedInSelector } from '../redux';
 
 import './email-sign-up.css';
-
 interface AcceptPrivacyTermsProps {
   acceptTerms: (accept: boolean | null) => void;
   acceptedPrivacyTerms: boolean;
+  isSignedIn: boolean;
   t: TFunction;
 }
 
 const mapStateToProps = createSelector(
   userSelector,
-  ({ acceptedPrivacyTerms }: { acceptedPrivacyTerms: boolean }) => ({
-    acceptedPrivacyTerms
+  isSignedInSelector,
+  (
+    { acceptedPrivacyTerms }: { acceptedPrivacyTerms: boolean },
+    isSignedIn: boolean
+  ) => ({
+    acceptedPrivacyTerms,
+    isSignedIn
   })
 );
 const mapDispatchToProps = (dispatch: Dispatch) =>
@@ -33,10 +39,12 @@ const RedirectToLearn = createRedirect('/learn');
 function AcceptPrivacyTerms({
   acceptTerms,
   acceptedPrivacyTerms,
+  isSignedIn,
   t
 }: AcceptPrivacyTermsProps) {
   const acceptedPrivacyRef = useRef(acceptedPrivacyTerms);
   const acceptTermsRef = useRef(acceptTerms);
+
   useEffect(() => {
     acceptedPrivacyRef.current = acceptedPrivacyTerms;
     acceptTermsRef.current = acceptTerms;
@@ -59,28 +67,10 @@ function AcceptPrivacyTerms({
     acceptTerms(isWeeklyEmailAccepted);
   }
 
-  return acceptedPrivacyTerms ? (
-    <RedirectToLearn />
-  ) : (
-    <>
-      <Helmet>
-        <title>{t('misc.email-signup')} | freeCodeCamp.org</title>
-      </Helmet>
-      <Grid>
+  function renderEmailListOptin(isSignedIn: boolean) {
+    if (isSignedIn) {
+      return (
         <Row>
-          <Col md={8} mdOffset={2} sm={10} smOffset={1} xs={12}>
-            <Spacer />
-            <IntroDescription />
-            <hr />
-          </Col>
-        </Row>
-        <Row className='email-sign-up' data-cy='email-sign-up'>
-          <Col md={8} mdOffset={2} sm={10} smOffset={1} xs={12}>
-            <strong>{t('misc.quincy')}</strong>
-            <Spacer />
-            <p>{t('misc.email-blast')}</p>
-            <Spacer />
-          </Col>
           <Col md={4} mdOffset={2} sm={5} smOffset={1} xs={12}>
             <Button
               block={true}
@@ -105,6 +95,50 @@ function AcceptPrivacyTerms({
             </Button>
             <ButtonSpacer />
           </Col>
+        </Row>
+      );
+    } else {
+      return (
+        <Col md={8} mdOffset={2} sm={10} smOffset={1} xs={12}>
+          <ButtonSpacer />
+          <Button
+            block={true}
+            bsSize='lg'
+            bsStyle='primary'
+            className='big-cta-btn'
+            href={`${apiLocation}/signin`}
+          >
+            {t('buttons.sign-up-email-list')}
+          </Button>
+          <ButtonSpacer />
+        </Col>
+      );
+    }
+  }
+
+  return acceptedPrivacyTerms ? (
+    <RedirectToLearn />
+  ) : (
+    <>
+      <Helmet>
+        <title>{t('misc.email-signup')} | freeCodeCamp.org</title>
+      </Helmet>
+      <Grid>
+        <Row>
+          <Col md={8} mdOffset={2} sm={10} smOffset={1} xs={12}>
+            <Spacer />
+            <IntroDescription />
+            <hr />
+          </Col>
+        </Row>
+        <Row className='email-sign-up' data-cy='email-sign-up'>
+          <Col md={8} mdOffset={2} sm={10} smOffset={1} xs={12}>
+            <strong>{t('misc.quincy')}</strong>
+            <Spacer />
+            <p>{t('misc.email-blast')}</p>
+            <Spacer />
+          </Col>
+          {renderEmailListOptin(isSignedIn)}
           <Col xs={12}>
             <Spacer />
           </Col>