diff --git a/components/account/personaldetails.js b/components/account/personaldetails.js index e776ac70..8f2fb98f 100644 --- a/components/account/personaldetails.js +++ b/components/account/personaldetails.js @@ -63,6 +63,142 @@ const RenderTextfield = ({ ); }; +const RenderRadioList = ({ + datafieldname, + name, + label, + id, + errorMsg, + options, + input: { onChange, value }, + meta: { touched, error }, + ...custom +}) => { + const required = (value) => (value ? undefined : "Required"); + + return ( + <> +
+
+ + + + {touched && error && ( + + + Error: + {" "} + {errorMsg} + + )} +
+ {Object.keys(options).map((key, index) => ( +
+ + +
+ ))} +
+
+
+ + ); +}; + +const RenderPickList = ({ + datafieldname, + name, + label, + input, + optionsArr, + meta: { touched, error }, + errorMsg, +}) => { + let { t, lang } = useTranslation(); + optionsArr = [ + t("account:account-preferred-language-english") + ":846040001", + t("account:account-preferred-language-welsh") + ":846040000", + ]; + return ( + <> +
+ + {touched && error && ( + + Error:{" "} + {errorMsg} + + )} + +
+ +
+
+ + ); +}; + let PersonalDetails = (props) => { const { handleSubmit, @@ -109,12 +245,12 @@ let PersonalDetails = (props) => {

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

- Role:{" "} + {t("account:account-role-label")}:{" "} { props.props.accountDetails .accountDetails[ @@ -123,6 +259,20 @@ let PersonalDetails = (props) => { }
+ + + { type="text" className="govuk-input govuk-input--width-20" validate={[required]} - label="First name" + label={t("account:account-first-name-label")} errorMsg="Is required" /> { type="text" className="govuk-input govuk-input--width-20" validate={[required]} - label="Last name" + label={t("account:account-last-name-label")} errorMsg="Is required" /> { type="email" className="govuk-input govuk-input--width-20" validate={[required, email]} - label="Email address" + label={t("account:account-email-address-label")} disabled /> { type="number" className="govuk-input govuk-input--width-20" validate={[required, phoneNumber]} - label="Telephone" + label={t("account:account-telephone-label")} /> { component={RenderTextfield} type="text" className="govuk-input govuk-input--width-20" - label="Company/Group" + label={t("account:account-company-group-label")} errorMsg="Is required" />

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

@@ -186,7 +336,9 @@ let PersonalDetails = (props) => { component={RenderTextfield} type="text" className="govuk-input govuk-input--width-20" - label="Address line 1" + label={t( + "account:account-address-line-1-label" + )} validate={[required]} errorMsg="Is required" /> @@ -196,7 +348,9 @@ let PersonalDetails = (props) => { component={RenderTextfield} type="text" className="govuk-input govuk-input--width-20" - label="Address line 2" + label={t( + "account:account-address-line-2-label" + )} errorMsg="Is required" /> { component={RenderTextfield} type="text" className="govuk-input govuk-input--width-10" - label="Town/City" + label={t("account:account-town-city-label")} validate={[required]} errorMsg="Is required" /> @@ -215,7 +369,7 @@ let PersonalDetails = (props) => { component={RenderTextfield} type="text" className="govuk-input govuk-input--width-10" - label="County" + label={t("account:account-county-label")} validate={[required]} errorMsg="Is required" /> @@ -225,7 +379,7 @@ let PersonalDetails = (props) => { component={RenderTextfield} type="text" className="govuk-input govuk-input--width-5" - label="Postcode" + label={t("account:account-postcode-label")} validate={[required]} errorMsg="Is required" /> @@ -236,7 +390,7 @@ let PersonalDetails = (props) => { className="govuk-button" data-module="govuk-button" > - Continue + {t("common:continue-button")} { props.props.accountDetails.loggedinUserId } > - Cancel + + {t("common:cancel-link")} + diff --git a/components/account/personaldetailsCheck.js b/components/account/personaldetailsCheck.js index dddeea69..1818a6b7 100644 --- a/components/account/personaldetailsCheck.js +++ b/components/account/personaldetailsCheck.js @@ -25,12 +25,22 @@ const BuildCheckPersonalDetails = (props) => { const router = useRouter(); const { locale } = router; + const getPreferredLanguageLabel = (id) => { + return id == 846040001 + ? t("account:account-preferred-language-english") + : t("account:account-preferred-language-welsh"); + }; + return ( <> -

About you

+

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

-
First name
+
+ {t("account:account-first-name-label")} +
{ props.props.props.form.personalDetailsForm.values @@ -45,15 +55,18 @@ const BuildCheckPersonalDetails = (props) => { setPersonalDetailsComplete(false); }} > - Change + {t("common:change-link-label")} - first name + {t("account:account-first-name-label")}{" "}
-
Last name
+
+ {" "} + {t("account:account-last-name-label")} +
{ props.props.props.form.personalDetailsForm.values @@ -68,16 +81,19 @@ const BuildCheckPersonalDetails = (props) => { setPersonalDetailsComplete(false); }} > - Change + {t("common:change-link-label")} {" "} - last name + {t("account:account-last-name-label")}
-
Email address
+
+ {" "} + {t("account:account-email-address-label")} +
{ props.props.props.form.personalDetailsForm.values @@ -92,16 +108,18 @@ const BuildCheckPersonalDetails = (props) => { setPersonalDetailsComplete(false); }} > - Change + {t("common:change-link-label")} {" "} - email address + {t("account:account-email-address-label")}
-
Telephone
+
+ {t("account:account-telephone-label")} +
{ props.props.props.form.personalDetailsForm.values @@ -116,15 +134,18 @@ const BuildCheckPersonalDetails = (props) => { setPersonalDetailsComplete(false); }} > - Change + {t("common:change-link-label")} - telephone + {t("account:account-telephone-label")}
-
Company/Group
+
+ {" "} + {t("account:account-company-group-label")} +
{ props.props.props.form.personalDetailsForm.values @@ -139,20 +160,50 @@ const BuildCheckPersonalDetails = (props) => { setPersonalDetailsComplete(false); }} > - Change + {t("common:change-link-label")} {" "} - company/group + {t("account:account-company-group-label")} + + +
+
+
+
+ {t("account:account-preferred-language-label")} +
+
+ {getPreferredLanguageLabel( + props.props.props.form.personalDetailsForm.values + .pinswg_preferredlanguage + )} +
+
+ { + setPersonalDetailsComplete(false); + }} + > + {t("common:change-link-label")} + + {" "} + {t("account:account-preferred-language-label")}
+

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

-

Your address

-
-
Address Line 1
+
+ {t("account:account-address-line-1-label")} +
{ props.props.props.form.personalDetailsForm.values @@ -167,16 +218,18 @@ const BuildCheckPersonalDetails = (props) => { setPersonalDetailsComplete(false); }} > - Change + {t("common:change-link-label")} {" "} - address line 1 + {t("account:account-address-line-1-label")}
-
Address line 2
+
+ {t("account:account-address-line-2-label")} +
{ props.props.props.form.personalDetailsForm.values @@ -191,16 +244,18 @@ const BuildCheckPersonalDetails = (props) => { setPersonalDetailsComplete(false); }} > - Change + {t("common:change-link-label")} {" "} - address line 2 + {t("account:account-address-line-2-label")}
-
Town/City
+
+ {t("account:account-town-city-label")} +
{ props.props.props.form.personalDetailsForm.values @@ -215,16 +270,19 @@ const BuildCheckPersonalDetails = (props) => { setPersonalDetailsComplete(false); }} > - Change + {t("common:change-link-label")} {" "} - town/city + {t("account:account-town-city-label")}
-
County
+
+ {" "} + {t("account:account-county-label")} +
{ props.props.props.form.personalDetailsForm.values @@ -239,16 +297,19 @@ const BuildCheckPersonalDetails = (props) => { setPersonalDetailsComplete(false); }} > - Change + {t("common:change-link-label")} {" "} - county + {t("account:account-county-label")}
-
Postcode
+
+ {" "} + {t("account:account-postcode-label")} +
{ props.props.props.form.personalDetailsForm.values @@ -263,10 +324,10 @@ const BuildCheckPersonalDetails = (props) => { setPersonalDetailsComplete(false); }} > - Change + {t("common:change-link-label")} {" "} - postcode + {t("account:account-postcode-label")}
@@ -281,12 +342,12 @@ const BuildCheckPersonalDetails = (props) => { setAccountUpdatedComplete(true); }} > - Continue + {t("common:continue-button")} - Cancel + {t("common:back-link")}
diff --git a/components/account/personaldetailsComplete.js b/components/account/personaldetailsComplete.js index 2740f5a8..1819ef94 100644 --- a/components/account/personaldetailsComplete.js +++ b/components/account/personaldetailsComplete.js @@ -42,19 +42,18 @@ const PersonalDetailsComplete = (props) => { return ( <> -

Your details have been updated

+

{t("account:account-complete-para-1")}

-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a - metus non quam mollis egestas. Integer ac leo cursus, laoreet - nulla sed, tempus tellus. Mauris condimentum erat arcu. -

+

{t("account:account-complete-para-2")}

- Return to My Portal + + {" "} + {t("account:account-complete-return-to-portal-link")} +

diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index ea7d02f5..0f2623e7 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -125,7 +125,6 @@ const Breadcrumbs = (props) => { {router.pathname == "/myportal/advancedsearch" ? ( <>
  • - www {
  • - Your account + {t("account:account-title")}
  • ) : ( diff --git a/components/search/advancedsearch.js b/components/search/advancedsearch.js index 278eae31..f1d03441 100644 --- a/components/search/advancedsearch.js +++ b/components/search/advancedsearch.js @@ -512,7 +512,9 @@ let AdvancedSearch = (props) => { }, ]} //validate={[required]} - label={"Case Status"} + label={t( + "search:case-status-label" + )} errormsg="Local authority is required" /> {/*
    diff --git a/i18n.js b/i18n.js index 515e0334..3d40e7c4 100644 --- a/i18n.js +++ b/i18n.js @@ -44,7 +44,7 @@ module.exports = { "/dnsdetails": ["case", "search", "dnsCommon", "dnsApplications"], "/help/cookies": ["common", "cookies"], "/account/register": ["common", "account"], - "/account/personaldetails": ["common", "search"], + "/account/personaldetails": ["common", "search", "account"], "/details-about-cookies": ["common", "cookies"], "/terms-and-conditions": ["common"], "/account/passwordreset": ["common", "home"], diff --git a/locales/cy/account.json b/locales/cy/account.json index bcb31768..ec0be5ad 100644 --- a/locales/cy/account.json +++ b/locales/cy/account.json @@ -37,5 +37,25 @@ "register-new-account-sub-heading-what-next": "Beth sy'n digwydd nesaf", "register-new-account-paragraph-what-next": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a metus non quam mollis egestas. Integer ac leo cursus, laoreet nulla sed, tempus tellus. Mauris condimentum erat arcu.", "register-new-account-my-portal-link": "Mewngofnodi i'm Porth", - "register-new-account-account-failed": "Rhowch gynnig arall arni gyda chyfeiriad e-bost gwahanol" + "register-new-account-account-failed": "Rhowch gynnig arall arni gyda chyfeiriad e-bost gwahanol", + "account-title": "Eich cyfrif", + "account-about-you-label": "Amdanat ti", + "account-role-label": "Rôl", + "account-preferred-language-label": "Hoff iaith", + "account-preferred-language-english": "Saesneg", + "account-preferred-language-welsh": "Cymraeg", + "account-first-name-label": "Enw cyntaf", + "account-last-name-label": "Enw olaf", + "account-email-address-label": "Cyfeiriad ebost", + "account-telephone-label": "Ffon", + "account-company-group-label": "Cwmni/Grŵp", + "account-your-address-label": "Beth yw eich cyfeiriad?", + "account-address-line-1-label": "Llinell Cyfeiriad 1", + "account-address-line-2-label": "Llinell cyfeiriad 2", + "account-town-city-label": "Tref/Dinas", + "account-county-label": "Sir", + "account-postcode-label": "Côd post", + "account-complete-para-1": "Mae eich manylion wedi'u diweddaru", + "account-complete-para-2": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a metus non quam mollis egestas. Integer ac leo cursus, laoreet nulla sed, tempus tellus. Mauris condimentum erat arcu.", + "account-complete-return-to-portal-link": "Dychwelyd i Fy mhorth" } \ No newline at end of file diff --git a/locales/cy/common.json b/locales/cy/common.json index 8cae052f..9b509311 100644 --- a/locales/cy/common.json +++ b/locales/cy/common.json @@ -17,6 +17,7 @@ "search-button": "Chwilio", "submit-button": "Cyflwyno", "back-link": "Yn ol", + "cancel-link": "Canslo", "save-exit-button": "Cadw a gadael", "submit-and-start": "Cyflwyno a dechrau'r cwrs", "footer-terms-conditions-link-label": "Telerau ac amodau", diff --git a/locales/cy/search.json b/locales/cy/search.json index 6ffd9cfc..6ad735c1 100644 --- a/locales/cy/search.json +++ b/locales/cy/search.json @@ -10,6 +10,7 @@ "lpa-label": "Awdurdod Cynllunio Lleol", "lpa-reference-label": "Cyfeirnod yr Awdurdod Cynllunio Lleol", "appealtype-label": "Dewiswch fath o achos", + "case-status-label": "Statws Achos", "case-type-label": "Math o Achos", "case-type-option-1": "--Dewiswch--", "case-type-option-2": "Unrhyw fath/Pob math", diff --git a/locales/en/account.json b/locales/en/account.json index 6ec50ee2..676b3db5 100644 --- a/locales/en/account.json +++ b/locales/en/account.json @@ -37,5 +37,25 @@ "register-new-account-sub-heading-what-next": "What happens next", "register-new-account-paragraph-what-next": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a metus non quam mollis egestas. Integer ac leo cursus, laoreet nulla sed, tempus tellus. Mauris condimentum erat arcu.", "register-new-account-my-portal-link": "Login to My Portal", - "register-new-account-account-failed": "Please try again with a different email address" + "register-new-account-account-failed": "Please try again with a different email address", + "account-title": "Your account", + "account-about-you-label": "About you", + "account-role-label": "Role", + "account-preferred-language-label": "Prefered language", + "account-preferred-language-english": "English", + "account-preferred-language-welsh": "Welsh", + "account-first-name-label": "First name", + "account-last-name-label": "Last name", + "account-email-address-label": "Email address", + "account-telephone-label": "Telephone", + "account-company-group-label": "Company/Group", + "account-your-address-label": "What is your address?", + "account-address-line-1-label": "Address line 1", + "account-address-line-2-label": "Address line 2", + "account-town-city-label": "Town/City", + "account-county-label": "County", + "account-postcode-label": "Postcode", + "account-complete-para-1": "Your details have been updated", + "account-complete-para-2": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi a metus non quam mollis egestas. Integer ac leo cursus, laoreet nulla sed, tempus tellus. Mauris condimentum erat arcu.", + "account-complete-return-to-portal-link": "Return to My portal" } \ No newline at end of file diff --git a/locales/en/common.json b/locales/en/common.json index 27079f86..ae4e7255 100644 --- a/locales/en/common.json +++ b/locales/en/common.json @@ -17,6 +17,7 @@ "search-button": "Search", "submit-button": "Submit", "back-link": "Back", + "cancel-link": "Cancel", "save-exit-button": "Save and exit", "submit-and-start": "Submit and start course", "footer-terms-conditions-link-label": "Terms and conditions", diff --git a/locales/en/search.json b/locales/en/search.json index 600d20ac..d42f5bc3 100644 --- a/locales/en/search.json +++ b/locales/en/search.json @@ -10,6 +10,7 @@ "lpa-label": "Local Planning Authority", "lpa-reference-label": "LPA reference number", "appealtype-label": "Select a case type", + "case-status-label": "Case Status", "case-type-label": "Case type", "case-type-option-1": "-- Select --", "case-type-option-2": "Any/All", diff --git a/pages/account/personaldetails.js b/pages/account/personaldetails.js index d856a799..0002d1ea 100644 --- a/pages/account/personaldetails.js +++ b/pages/account/personaldetails.js @@ -58,7 +58,7 @@ const Home = (props) => { >
    -

    Your account

    +

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

    0 diff --git a/pages/api/endpoint/updateaccount_api.js b/pages/api/endpoint/updateaccount_api.js index a4a65ddb..f1555a7b 100644 --- a/pages/api/endpoint/updateaccount_api.js +++ b/pages/api/endpoint/updateaccount_api.js @@ -12,7 +12,7 @@ import axios from "axios"; import CryptoJS from "crypto-js"; -import { getToken } from "../../../actions"; +import { getToken, consoleLogger } from "../../../actions"; const WORDKEY = process.env.HASHKEY; @@ -52,6 +52,8 @@ export default async function ApiProxy(req, res) { data: data, }; + console.log(config); + return axios(config) .then(({ data }) => { res.status(200).json(data);