From 8d3d356815b172ebff60f4cf173d1133f2e207a6 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Fri, 21 Feb 2025 09:19:31 +0000 Subject: [PATCH] 14244 GEL updates and rework --- components/account/personaldetails.js | 355 +++++++++++++------------ components/account/registerform.js | 286 ++++++++++---------- components/header.js | 3 + components/myportal/servicebanner.js | 2 +- locales/en/account.json | 2 +- pages/account/personaldetails.js | 48 ++-- pages/account/register.js | 5 +- styles/sass/welshgov/_application.scss | 9 +- 8 files changed, 376 insertions(+), 334 deletions(-) diff --git a/components/account/personaldetails.js b/components/account/personaldetails.js index 42804df9..80b94de9 100644 --- a/components/account/personaldetails.js +++ b/components/account/personaldetails.js @@ -246,183 +246,194 @@ let PersonalDetails = (props) => { return ( <> - {props.accountUpdatedComplete == false ? ( - props.personalDetailsComplete == false ? ( -
-
- -

- {t("account:account-about-you-label")} -

- -
- - {t("account:account-role-label")}:{" "} - { +
+ {props.accountUpdatedComplete == false ? ( + props.personalDetailsComplete == false ? ( + +
+ +

+ {t("account:account-about-you-label")} +

+ +
+ + {t("account:account-role-label")}:{" "} + { + props.props.accountDetails + .accountDetails[ + "pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue" + ] + } + +
+ + + + + + + +
+
+ +

+ {t( + "account:account-your-address-label" + )} +

+ + + + + + + +
+
+ + + className="govuk-link" + > + {t("common:cancel-link")} +
- - - - - - - -
-
- -

- {t("account:account-your-address-label")} -

- - - - - - - -
-
- - - {t("common:cancel-link")} - -
-
+ setAccountUpdatedComplete={ + setAccountUpdatedComplete + } + /> + + ) ) : ( - <> - - - ) - ) : ( - - )} + + )} + ); }; diff --git a/components/account/registerform.js b/components/account/registerform.js index 10068ec4..be4cdac9 100644 --- a/components/account/registerform.js +++ b/components/account/registerform.js @@ -137,149 +137,153 @@ const RegisterForm = (props) => { {props.accountCreatedComplete != true ? ( props.registerFormComplete == false ? (
-
- -

- {t( - "account:register-new-account-sub-heading-1" - )}{" "} - {loggedInUserEmail} -

- - - - - -
-
- -

- {t( - "account:register-new-account-sub-heading-2" - )} -

- +
+
+
+ +

+ {t( + "account:register-new-account-sub-heading-1" + )}{" "} + {loggedInUserEmail} +

+ + + + + +
+
+ +

+ {t( + "account:register-new-account-sub-heading-2" + )} +

+ - - - - - -
+ + + + + +
-
- +
+ +
+
) : ( diff --git a/components/header.js b/components/header.js index fedc8d72..0d1791d8 100644 --- a/components/header.js +++ b/components/header.js @@ -53,6 +53,9 @@ const Header = (props) => { "/myportal/advancedsearch", "/myportal/advancedsearchresults", "/myportal/case/[ticketnumber]", + "/account/personaldetails", + "/register", + "/myportal/searchresults", ]; const hasContactLink = [ diff --git a/components/myportal/servicebanner.js b/components/myportal/servicebanner.js index dd3eee09..845b49b8 100644 --- a/components/myportal/servicebanner.js +++ b/components/myportal/servicebanner.js @@ -73,7 +73,7 @@ const ServiceBanner = (props) => {
{props.accountDetails.accountDetails.firstname}{" "} {props.accountDetails.accountDetails.lastname} diff --git a/locales/en/account.json b/locales/en/account.json index e7e6aa16..fa11a930 100644 --- a/locales/en/account.json +++ b/locales/en/account.json @@ -1,6 +1,6 @@ { "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-checking-label": "Checking for account...", "help-heading": "Help", diff --git a/pages/account/personaldetails.js b/pages/account/personaldetails.js index 2a3e496d..219a56f5 100644 --- a/pages/account/personaldetails.js +++ b/pages/account/personaldetails.js @@ -6,6 +6,7 @@ import Banner from "../../components/banner"; import CookieBanner from "../../components/cookieBanner"; import Breadcrumbs from "../../components/breadcrumbs"; import Footer from "../../components/footer"; +import ServiceBanner from "../../components/myportal/servicebanner"; import { useSelector, shallowEqual, connect } from "react-redux"; import { wrapper } from "../../store/store"; @@ -64,6 +65,8 @@ const Home = (props) => {
+ +
{ >
-

{t("account:account-title")}

- +
+
+
+

+ {t( + "account:account-title" + )} +

{" "} + +
+
+
diff --git a/pages/account/register.js b/pages/account/register.js index 109b4465..cfe416d7 100644 --- a/pages/account/register.js +++ b/pages/account/register.js @@ -6,7 +6,7 @@ import Banner from "../../components/banner"; import CookieBanner from "../../components/cookieBanner"; import Breadcrumbs from "../../components/breadcrumbs"; import Footer from "../../components/footer"; - +import ServiceBanner from "../../components/servicebanner"; import { useSelector, shallowEqual, connect } from "react-redux"; import { wrapper } from "../../store/store"; @@ -47,6 +47,7 @@ const Home = (props) => {
+
{ {registerFormComplete != true || accountCreatedComplete != true ? (
-

+

{t("account:help-heading")}

diff --git a/styles/sass/welshgov/_application.scss b/styles/sass/welshgov/_application.scss index 6ba07229..f87ddb5a 100644 --- a/styles/sass/welshgov/_application.scss +++ b/styles/sass/welshgov/_application.scss @@ -102,6 +102,7 @@ body { &:hover { background-color: $blue; color: #eeeeee; + text-decoration: none; } } @@ -533,7 +534,7 @@ a.longLinkBreak { label { margin-top: 0px; background-color: $lightgrey_semi; - padding: 20px 20px 20px 50px; + padding: 20px 20px 20px 20px; &:before { top: 18px; @@ -2956,4 +2957,10 @@ ul.subFieldList { +} + +#personalDetailsCard { + .govuk-fieldset { + margin-bottom: 20px; + } } \ No newline at end of file