Merge from git

2021-11-01 11:21:39 +00:00
parent adcff32d73
commit d94b3b3e5a
210 changed files with 69742 additions and 3359 deletions
@@ -9,7 +9,7 @@ import Footer from "../../components/footer";

 import { useSelector, shallowEqual, connect } from "react-redux";
 import { wrapper } from "../../store/store";
-import Cookies from "cookies";
+
 import { useRouter } from "next/router";
 import { useState } from "react";
 import useTranslation from "next-translate/useTranslation";
@@ -33,7 +33,8 @@ const Home = (props) => {
        <div>
            <Head>
                <title>
-                    {t("search:page-title")} - {t("common:service-name")}
+                    {t("account:register-new-account-heading")} -{" "}
+                    {t("common:service-name")}
                </title>
            </Head>
            <div id="page_wrapper">
@@ -43,7 +44,6 @@ const Home = (props) => {
                <div className="govuk-grid-row">
                    <div className="govuk-grid-column-full">
                        <div className="govuk-width-container">
-                            <Banner />
                            <Breadcrumbs slug={appealtypes} />
                            <main
                                className="govuk-main-wrapper--auto-spacing"
@@ -54,10 +54,26 @@ const Home = (props) => {
                                    <div className="govuk-grid-column-two-thirds">
                                        {registerFormComplete != true ||
                                        accountCreatedComplete != true ? (
-                                            <h1>Create a new account</h1>
+                                            <h1>
+                                                {t(
+                                                    "account:register-new-account-heading"
+                                                )}
+                                            </h1>
                                        ) : (
                                            <h1>
-                                                Your account has been created
+                                                {props.accountDetails.accCr !=
+                                                "false"
+                                                    ? props.accountDetails
+                                                          .accCr == "exists"
+                                                        ? t(
+                                                              "account:register-new-account-status-not-created-label"
+                                                          )
+                                                        : t(
+                                                              "account:register-new-account-status-created-label"
+                                                          )
+                                                    : t(
+                                                          "account:register-new-account-checking-label"
+                                                      )}
                                            </h1>
                                        )}
                                        <RegisterForm
@@ -80,54 +96,37 @@ const Home = (props) => {
                                    accountCreatedComplete != true ? (
                                        <div className="govuk-grid-column-one-third">
                                            <h2 className="govuk-heading-m">
-                                                Help
+                                                {t("account:help-heading")}
                                            </h2>

                                            <h3>
-                                                Companies or submissions by more
-                                                than one individual (groups)
+                                                {t(
+                                                    "account:help-sub-heading-1"
+                                                )}
                                            </h3>

                                            <p className="govuk-body">
-                                                If you are submitting an appeal
-                                                or representation from a company
-                                                e.g. &quot;Acme Inc&quot; or a
-                                                group of people e.g.
-                                                &quot;Residents of 1-10 High
-                                                street&quot;, you should enter
-                                                the name of the company or group
-                                                in the Company/Group field. You
-                                                will be deemed as acting as
-                                                their representative.
+                                                {t("account:help-paragraph-1")}
                                            </p>

                                            <h3>
-                                                Enforcement appeals by
-                                                married/civil partnership
-                                                couples
+                                                {t(
+                                                    "account:help-sub-heading-2"
+                                                )}
                                            </h3>

                                            <p className="govuk-body">
-                                                You should not enter a group
-                                                name. You need only enter your
-                                                partner&apos;s name on the
-                                                appeal form itself as an
-                                                additional appellant.
+                                                {t("account:help-paragraph-2")}
                                            </p>

                                            <h3>
-                                                Other appeals by married/civil
-                                                partnership couples
+                                                {t(
+                                                    "account:help-sub-heading-3"
+                                                )}
                                            </h3>

                                            <p className="govuk-body">
-                                                For any other type of appeal,
-                                                for example a planning appeal,
-                                                you should enter a group name
-                                                when creating your account e.g.
-                                                &quot;Mr and Mrs Smith&quot;, if
-                                                that is the name on the
-                                                application.
+                                                {t("account:help-paragraph-3")}
                                            </p>
                                        </div>
                                    ) : (