robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

14244 GEL updates and rework

Browse Source
This commit is contained in:
robbond
2025-02-21 09:19:31 +00:00
parent baa1f7c4f3
commit 8d3d356815
8 changed files with 376 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/account/personaldetails.js
+16 -5
View File
@@ -246,6 +246,7 @@ let PersonalDetails = (props) => {
return ( return (
<> <>
<div className="govuk-form-group">
{props.accountUpdatedComplete == false ? ( {props.accountUpdatedComplete == false ? (
props.personalDetailsComplete == false ? ( props.personalDetailsComplete == false ? (
<form onSubmit={handleSubmit(onHandleSubmit)}> <form onSubmit={handleSubmit(onHandleSubmit)}>
@@ -286,7 +287,9 @@ let PersonalDetails = (props) => {
type="text" type="text"
className="govuk-input govuk-input--width-20" className="govuk-input govuk-input--width-20"
validate={[required]} validate={[required]}
label={t("account:account-first-name-label")} label={t(
"account:account-first-name-label"
)}
errorMsg={t("account:is-required-label")} errorMsg={t("account:is-required-label")}
/> />
<Field <Field
@@ -306,7 +309,9 @@ let PersonalDetails = (props) => {
type="email" type="email"
className="govuk-input govuk-input--width-20" className="govuk-input govuk-input--width-20"
validate={[required, email]} validate={[required, email]}
label={t("account:account-email-address-label")} label={t(
"account:account-email-address-label"
)}
disabled disabled
/> />
<Field <Field
@@ -324,14 +329,18 @@ let PersonalDetails = (props) => {
component={RenderTextfield} component={RenderTextfield}
type="text" type="text"
className="govuk-input govuk-input--width-20" className="govuk-input govuk-input--width-20"
label={t("account:account-company-group-label")} label={t(
"account:account-company-group-label"
)}
errorMsg={t("account:is-required-label")} errorMsg={t("account:is-required-label")}
/> />
</fieldset> </fieldset>
<fieldset className="govuk-fieldset"> <fieldset className="govuk-fieldset">
<legend className="govuk-fieldset__legend govuk-fieldset__legend--m"> <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
<h2 className="govuk-fieldset__heading"> <h2 className="govuk-fieldset__heading">
{t("account:account-your-address-label")} {t(
"account:account-your-address-label"
)}
</h2> </h2>
</legend> </legend>
@@ -399,7 +408,8 @@ let PersonalDetails = (props) => {
<Link <Link
href={ href={
"/myportal?q=" + "/myportal?q=" +
props.props.accountDetails.loggedinUserId props.props.accountDetails
.loggedinUserId
} }
className="govuk-link" className="govuk-link"
> >
@@ -423,6 +433,7 @@ let PersonalDetails = (props) => {
) : ( ) : (
<PersonalDetailsComplete props={props} /> <PersonalDetailsComplete props={props} />
)} )}
</div>
</> </>
); );
}; };
components/account/registerform.js
+4
View File
@@ -137,6 +137,8 @@ const RegisterForm = (props) => {
{props.accountCreatedComplete != true ? ( {props.accountCreatedComplete != true ? (
props.registerFormComplete == false ? ( props.registerFormComplete == false ? (
<form onSubmit={handleSubmit(onHandleSubmit)}> <form onSubmit={handleSubmit(onHandleSubmit)}>
<div className="card" id="personalDetailsCard">
<div className="card-body">
<fieldset className="govuk-fieldset"> <fieldset className="govuk-fieldset">
<legend className="govuk-fieldset__legend govuk-fieldset__legend--m"> <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
<h2 className="govuk-fieldset__heading"> <h2 className="govuk-fieldset__heading">
@@ -281,6 +283,8 @@ const RegisterForm = (props) => {
{t("common:continue-button")} {t("common:continue-button")}
</button> </button>
</div> </div>
</div>
</div>
</form> </form>
) : ( ) : (
<RegisterFormCheck <RegisterFormCheck
components/header.js
+3
View File
@@ -53,6 +53,9 @@ const Header = (props) => {
"/myportal/advancedsearch", "/myportal/advancedsearch",
"/myportal/advancedsearchresults", "/myportal/advancedsearchresults",
"/myportal/case/[ticketnumber]", "/myportal/case/[ticketnumber]",
"/account/personaldetails",
"/register",
"/myportal/searchresults",
]; ];
const hasContactLink = [ const hasContactLink = [
components/myportal/servicebanner.js
+1 -1
View File
@@ -73,7 +73,7 @@ const ServiceBanner = (props) => {
<div className="serviceBanner_userDetails_name"> <div className="serviceBanner_userDetails_name">
<Link <Link
href="/account/personaldetails" href="/account/personaldetails"
className="govuk-button-secondary govuk-link" className="govuk-button-secondary govuk-link--no-underline"
> >
{props.accountDetails.accountDetails.firstname}{" "} {props.accountDetails.accountDetails.firstname}{" "}
{props.accountDetails.accountDetails.lastname} {props.accountDetails.accountDetails.lastname}
locales/en/account.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"register-new-account-heading": "Create a new account", "register-new-account-heading": "Create a new account",
"register-new-account-status-created-label": "Your account has created", "register-new-account-status-created-label": "Your account has been created",
"register-new-account-status-not-created-label": "Your account has not been created", "register-new-account-status-not-created-label": "Your account has not been created",
"register-new-account-checking-label": "Checking for account...", "register-new-account-checking-label": "Checking for account...",
"help-heading": "Help", "help-heading": "Help",
pages/account/personaldetails.js
+17 -1
View File
@@ -6,6 +6,7 @@ import Banner from "../../components/banner";
import CookieBanner from "../../components/cookieBanner"; import CookieBanner from "../../components/cookieBanner";
import Breadcrumbs from "../../components/breadcrumbs"; import Breadcrumbs from "../../components/breadcrumbs";
import Footer from "../../components/footer"; import Footer from "../../components/footer";
import ServiceBanner from "../../components/myportal/servicebanner";
import { useSelector, shallowEqual, connect } from "react-redux"; import { useSelector, shallowEqual, connect } from "react-redux";
import { wrapper } from "../../store/store"; import { wrapper } from "../../store/store";
@@ -64,6 +65,8 @@ const Home = (props) => {
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<div className="govuk-width-container"> <div className="govuk-width-container">
<Breadcrumbs slug={appealtypes} props={props} /> <Breadcrumbs slug={appealtypes} props={props} />
<ServiceBanner props={props} />
<main <main
className="govuk-main-wrapper--auto-spacing" className="govuk-main-wrapper--auto-spacing"
id="main-content" id="main-content"
@@ -71,7 +74,17 @@ const Home = (props) => {
> >
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-two-thirds"> <div className="govuk-grid-column-two-thirds">
<h1>{t("account:account-title")}</h1> <div className="govuk-form-group">
<div
className="card"
id="personalDetailsCard"
>
<div className="card-body">
<h1>
{t(
"account:account-title"
)}
</h1>{" "}
<PersonalDetails <PersonalDetails
props={props} props={props}
accountUpdatedComplete={ accountUpdatedComplete={
@@ -89,6 +102,9 @@ const Home = (props) => {
/> />
</div> </div>
</div> </div>
</div>
</div>
</div>
</main> </main>
</div> </div>
</div> </div>
pages/account/register.js
+3 -2
View File
@@ -6,7 +6,7 @@ import Banner from "../../components/banner";
import CookieBanner from "../../components/cookieBanner"; import CookieBanner from "../../components/cookieBanner";
import Breadcrumbs from "../../components/breadcrumbs"; import Breadcrumbs from "../../components/breadcrumbs";
import Footer from "../../components/footer"; import Footer from "../../components/footer";
import ServiceBanner from "../../components/servicebanner";
import { useSelector, shallowEqual, connect } from "react-redux"; import { useSelector, shallowEqual, connect } from "react-redux";
import { wrapper } from "../../store/store"; import { wrapper } from "../../store/store";
@@ -47,6 +47,7 @@ const Home = (props) => {
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<div className="govuk-width-container"> <div className="govuk-width-container">
<Breadcrumbs slug={appealtypes} /> <Breadcrumbs slug={appealtypes} />
<ServiceBanner props={props} noSignin={true} />
<main <main
className="govuk-main-wrapper--auto-spacing" className="govuk-main-wrapper--auto-spacing"
id="main-content" id="main-content"
@@ -107,7 +108,7 @@ const Home = (props) => {
{registerFormComplete != true || {registerFormComplete != true ||
accountCreatedComplete != true ? ( accountCreatedComplete != true ? (
<div className="govuk-grid-column-one-third"> <div className="govuk-grid-column-one-third">
<h2 className="govuk-heading-m"> <h2 className="">
{t("account:help-heading")} {t("account:help-heading")}
</h2> </h2>
styles/sass/welshgov/_application.scss
+8 -1
View File
@@ -102,6 +102,7 @@ body {
&:hover { &:hover {
background-color: $blue; background-color: $blue;
color: #eeeeee; color: #eeeeee;
text-decoration: none;
} }
} }
@@ -533,7 +534,7 @@ a.longLinkBreak {
label { label {
margin-top: 0px; margin-top: 0px;
background-color: $lightgrey_semi; background-color: $lightgrey_semi;
padding: 20px 20px 20px 50px; padding: 20px 20px 20px 20px;
&:before { &:before {
top: 18px; top: 18px;
@@ -2957,3 +2958,9 @@ ul.subFieldList {
} }
#personalDetailsCard {
.govuk-fieldset {
margin-bottom: 20px;
}
}