From e9668a67ec034935808d4d27b07c1457cd8bb9fa Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Wed, 14 Aug 2024 12:42:49 +0100
Subject: [PATCH] removed duplicate signin button on new appeal

---
 components/header.js                   |   1 +
 pages/auth/signin.js                   | 121 +++++++++++++++----------
 pages/index.js                         |   2 +-
 styles/sass/welshgov/_application.scss |  23 ++++-
 4 files changed, 95 insertions(+), 52 deletions(-)

diff --git a/components/header.js b/components/header.js
index 6396503a..3750da5e 100644
--- a/components/header.js
+++ b/components/header.js
@@ -44,6 +44,7 @@ const Header = (props) => {
         "/auth/error",
         "/myportal",
         "/myportal/[appealtypes]",
+        "/newappeal/[appealtypes]",
         "/newappeal",
         "/myportal/dnsapplications",
         "/myportal/dnsdetails",
diff --git a/pages/auth/signin.js b/pages/auth/signin.js
index a10e774b..02ad3eac 100644
--- a/pages/auth/signin.js
+++ b/pages/auth/signin.js
@@ -42,60 +42,85 @@ const SignIn = (props) => {
                     <Breadcrumbs />
                     <ServiceBanner noSignin={true} />
                     <main
-                        className="govuk-main-wrapper govuk-!-padding-top-0 govuk-!-margin-top-4 wgForm"
-                        id="main-content"
+                        className="govuk-main-wrapper govuk-main-wrapper--auto-spacing "
+                        id="signin"
                         role="main"
                     >
-                        <div className="govuk-grid-row ">
-                            <div className="govuk-grid-column-two-thirds ">
-                                <h1>{t("auth:auth-page-title")} </h1>
-                            </div>
-                        </div>
                         <div className="govuk-grid-row">
-                            <div className="govuk-grid-column-two-thirds ">
-                                <form
-                                    method="post"
-                                    action="/api/auth/signin/email"
-                                    onSubmit={handleSubmit}
-                                >
-                                    <div className={"govuk-form-group "}>
-                                        <input
-                                            className="govuk-input"
-                                            name="csrfToken"
-                                            type="hidden"
-                                            defaultValue={csrfToken}
-                                        />
-                                        <input
-                                            className="govuk-input"
-                                            name="callbackUrl"
-                                            type="hidden"
-                                            defaultValue={callbackUrl}
-                                        />
+                            <div className="govuk-grid-column-full">
+                                <div className="card">
+                                    <div className="card-body">
+                                        <div className="govuk-body-m">
+                                            <legend className="govuk-fieldset__legend govuk-fieldset__legend--l">
+                                                <h1 className="govuk-fieldset__heading govuk-heading-m">
+                                                    {t("auth:auth-page-title")}{" "}
+                                                </h1>
+                                            </legend>
 
-                                        <label
-                                            className="govuk-label"
-                                            htmlFor="email"
-                                        >
-                                            {t("auth:auth-email-label")}
-                                        </label>
+                                            <div className="govuk-grid-row">
+                                                <div className="govuk-grid-column-two-thirds ">
+                                                    <form
+                                                        method="post"
+                                                        action="/api/auth/signin/email"
+                                                        onSubmit={handleSubmit}
+                                                    >
+                                                        <div
+                                                            className={
+                                                                "govuk-form-group "
+                                                            }
+                                                        >
+                                                            <input
+                                                                className="govuk-input"
+                                                                name="csrfToken"
+                                                                type="hidden"
+                                                                defaultValue={
+                                                                    csrfToken
+                                                                }
+                                                            />
+                                                            <input
+                                                                className="govuk-input"
+                                                                name="callbackUrl"
+                                                                type="hidden"
+                                                                defaultValue={
+                                                                    callbackUrl
+                                                                }
+                                                            />
 
-                                        <input
-                                            className="govuk-input  govuk-!-width-three-quarters"
-                                            type="email"
-                                            id="email"
-                                            name="email"
-                                        />
+                                                            <label
+                                                                className="govuk-label"
+                                                                htmlFor="email"
+                                                            >
+                                                                {t(
+                                                                    "auth:auth-email-label"
+                                                                )}
+                                                            </label>
+
+                                                            <input
+                                                                className="govuk-input  govuk-!-width-three-quarters"
+                                                                type="email"
+                                                                id="email"
+                                                                name="email"
+                                                            />
+                                                        </div>
+                                                        <div className="govuk-form-group">
+                                                            <button
+                                                                type="submit"
+                                                                className="govuk-button"
+                                                                disabled={
+                                                                    buttonDisabled
+                                                                }
+                                                            >
+                                                                {t(
+                                                                    "auth:auth-signin-button-label"
+                                                                )}
+                                                            </button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <div className="govuk-form-group">
-                                        <button
-                                            type="submit"
-                                            className="govuk-button"
-                                            disabled={buttonDisabled}
-                                        >
-                                            {t("auth:auth-signin-button-label")}
-                                        </button>
-                                    </div>
-                                </form>
+                                </div>
                             </div>
                         </div>
                     </main>
diff --git a/pages/index.js b/pages/index.js
index ad1ba3f9..f75c0f7b 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -128,7 +128,7 @@ const Home = (props) => {
                         </div>
                     ) : (
                         <>
-                            <ServiceBanner />
+                            <ServiceBanner noSignin={true} />
                             <Main
                                 pages={pages}
                                 showLogin={showLogin}
diff --git a/styles/sass/welshgov/_application.scss b/styles/sass/welshgov/_application.scss
index 5c60bce6..f82e9826 100644
--- a/styles/sass/welshgov/_application.scss
+++ b/styles/sass/welshgov/_application.scss
@@ -293,7 +293,7 @@ a.longLinkBreak {
             padding-right: 10px;
         }
 
-        @media screen and (max-width: 360px) {
+        @media screen and (max-width: 670px) {
             flex-direction: column-reverse;
             align-items: flex-start;
 
@@ -316,13 +316,13 @@ a.longLinkBreak {
         display: flex;
         justify-content: space-between;
 
-        @media screen and (max-width: 430px) {
+        @media screen and (max-width: 670px) {
             flex-direction: column;
         }
 
         h1 {
             img {
-                @media screen and (max-width: 414px) {
+                @media screen and (max-width: 670px) {
                     padding-bottom: 20px;
                 }
             }
@@ -344,6 +344,10 @@ a.longLinkBreak {
                 @media screen and (max-width: 414px) {
                     max-width: 41%;
                 }
+
+                @media screen and (max-width: 360px) {
+                    max-width: 50%;
+                }
             }
 
 
@@ -376,6 +380,7 @@ a.longLinkBreak {
 }
 
 
+
 .wgForm {
     background: $lightgrey_offwhite;
     padding: 20px;
@@ -453,6 +458,18 @@ a.longLinkBreak {
 
 }
 
+#signin.wgForm {
+
+
+    @media screen and (min-width: 1024px) {
+
+        padding: 40px;
+        width: 100%;
+        margin-left: 0px;
+
+    }
+}
+
 .newAppealForm {
     background: $lightgrey_offwhite;
     padding: 20px;