Merged PR 1215: removed duplicate signin button on new appeal

removed duplicate signin button on new appeal

Related work items: #11992
This commit is contained in:
Robert Bond
2024-08-14 11:47:35 +00:00
4 changed files with 95 additions and 52 deletions
+1
View File
@@ -44,6 +44,7 @@ const Header = (props) => {
"/auth/error",
"/myportal",
"/myportal/[appealtypes]",
"/newappeal/[appealtypes]",
"/newappeal",
"/myportal/dnsapplications",
"/myportal/dnsdetails",
+73 -48
View File
@@ -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>
+1 -1
View File
@@ -128,7 +128,7 @@ const Home = (props) => {
</div>
) : (
<>
<ServiceBanner />
<ServiceBanner noSignin={true} />
<Main
pages={pages}
showLogin={showLogin}
+20 -3
View File
@@ -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;