diff --git a/actions/index.js b/actions/index.js index ab392034..481ee577 100644 --- a/actions/index.js +++ b/actions/index.js @@ -301,7 +301,7 @@ export const getBasicDNSURLSearch = (searchString) => { }); }; -export const getSIPSEvents = (caseid) => { +export const getSIPSEvents = async (caseid) => { return axios .get(BASE_URL + "/api/endpoint/getsipsevents_api?caseid=" + caseid) .then((res) => { @@ -389,7 +389,7 @@ export const getDNSCoords = () => { }); }; -export const getDNSList = (searchString) => { +export const getDNSList = async (searchString) => { return axios .get(BASE_URL + "/api/endpoint/getdnslist_api") .then((res) => res.data) 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/components/search/dnssearchresults.js b/components/search/dnssearchresults.js index c0c03d2e..ed2f6354 100644 --- a/components/search/dnssearchresults.js +++ b/components/search/dnssearchresults.js @@ -686,22 +686,35 @@ const DNSSearchResults = (props) => {

{t("dnsApplications:page-intro-paragraph-1")}

- +

+ {t("dnsApplications:page-intro-list-item-2")} + + {t( + "dnsApplications:page-intro-list-item-2-link" + )} + +

{showMap == "true" && ( diff --git a/locales/cy/dnsApplications.json b/locales/cy/dnsApplications.json index c16a4255..40160df5 100644 --- a/locales/cy/dnsApplications.json +++ b/locales/cy/dnsApplications.json @@ -1,8 +1,10 @@ { - "page-title": "Ceisiadau Datblygiadau o Arwyddocâd Cenedlaethol", - "page-intro-paragraph-1": "Y ceisiadau a restrir yw’r rhai:", - "page-intro-list-item-1": "Lle mae’r datblygwr wedi hysbysu Penderfyniadau Cynllunio ac Amgylchedd Cymru yn ysgrifenedig ei fod yn bwriadu cyflwyno cais i ni yn y dyfodol", - "page-intro-list-item-2": "Lle mae cais eisoes wedi cael ei wneud i Benderfyniadau Cynllunio ac Amgylchedd Cymru ac mae’n mynd drwy’r broses archwilio", + "page-title": "Prosiectau Isadeiledd", + "page-intro-paragraph-1": "Mae dau fath gwahanol o gais ar gyfer prosiectau seilwaith, sef Datblygiadau o Arwyddocâd Cenedlaethol a Phrosiectau Seilwaith Arwyddocaol.", + "page-intro-list-item-1 ": " Datblygiadau o Arwyddocâd Cenedlaethol yw datblygiadau a ddiffinnir yn ", + "page-intro-list-item-1-link": "https://www.llyw.cymru/datblygiadau-o-arwyddocad-cenedlaethol-dns-ceisiadau", + "page-intro-list-item-2 ": "Mae Prosiectau Seilwaith Arwyddocaol yn ddatblygiadau sydd wedi'u diffinio (YMA)", + "page-intro-list-item-2-link": "https://www.llyw.cymru/datblygiadau-o-arwyddocad-cenedlaethol-dns-ceisiadau", "page-intro-list-item-3": "Lle penderfynwyd ar gynnig.", "page-intro-paragraph-2": "Defnyddiwch y tabl isod i ddod o hyd i geisiadau fesul cam neu fath. Fel arall, defnyddiwch y map trwy glicio ar y marcwyr i fynd i’r dudalen geisiadau. Mae rhestr o ddigwyddiadau a therfynau amser allweddol ar gyfer pob cais ar gael ar ein ", "page-intro-paragraph-2-link": "tudalen galendr", diff --git a/locales/cy/home.json b/locales/cy/home.json index 940d1667..b0105c58 100644 --- a/locales/cy/home.json +++ b/locales/cy/home.json @@ -24,8 +24,8 @@ "login-card-forgotten-link": "Cliciwch yma", "login-via-gov-gateway-label": "Mewngofnodwch drwy Borth y Llywodraeth", "login-via-nextuth-label": "Mewngofnodwch gyda'ch cyfeiriad e-bost", - "casesearch-card-title": "Chwilio apeliadau a Datblygiadau o Arwyddocâd Cenedlaethol", - "casesearch-card-search-hint": "Defnyddiwch gyfeirnod yr achos neu deitl y Datblygiad o Arwyddocâd Cenedlaethol i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:", + "casesearch-card-title ": "Chwilio am achos", + "casesearch-card-search-hint ": "Defnyddiwch gyfeirnod yr achos neu deitl y prosiect Infrastructure i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:", "casesearch-card-search-example-label-1": "APP-A12345-A-21-1234567", "casesearch-card-search-example-label-2": "CAS-12345-A1B2C3", "casesearch-card-button": "Cyflwyno chwiliad", diff --git a/locales/cy/myportal.json b/locales/cy/myportal.json index dd3254c6..396ff7ad 100644 --- a/locales/cy/myportal.json +++ b/locales/cy/myportal.json @@ -15,8 +15,8 @@ "makenewappeal-card-guidance-link": "https://www.llyw.cymru/arweiniad-ar-apeliadau-cheisiadau", "makenewappeal-card-button-label": "Gwneud apêl newydd", "mycases-card-title": "Fy achosion", - "searchcases-card-title": "Chwilio apeliadau a Datblygiadau o Arwyddocâd Cenedlaethol", - "searchcases-card-search-hint": "Defnyddiwch gyfeirnod yr achos neu deitl y Datblygiad o Arwyddocâd Cenedlaethol i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:", + "searchcases-card-title ": "Chwilio am achos", + "searchcases-card-search-hint ": "Defnyddiwch gyfeirnod yr achos neu deitl y prosiect Infrastructure i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:", "searchcases-card-search-example-label-1": "APP-A12345-A-21-1234567", "searchcases-card-search-example-label-2": "CAS-12345-A1B2C3", "searchcases-card-button": "Cyflwyno Chwiliad", 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/locales/en/dnsApplications.json b/locales/en/dnsApplications.json index 4191565d..55f8d1b5 100644 --- a/locales/en/dnsApplications.json +++ b/locales/en/dnsApplications.json @@ -1,8 +1,10 @@ { - "page-title": "Developments of National Significance Applications", - "page-intro-paragraph-1": "The applications listed are those:", - "page-intro-list-item-1": "Where the developer has advised Planning and Environment Decisions Wales in writing that they intend to submit an application to us in the future", - "page-intro-list-item-2": "Where an application has already been made to Planning and Environment Decisions Wales and is undergoing the examination process", + "page-title": "Infrastructure Projects", + "page-intro-paragraph-1": "There are two different types of application for infrastructure projects, Developments of National Significance and Significant Infrastructure Projects.", + "page-intro-list-item-1": "Developments of National Significance are developments that are defined at", + "page-intro-list-item-1-link": "https://www.gov.wales/developments-national-significance-dns-applications", + "page-intro-list-item-2": "Significant Infrastructure Projects are developments that are defined at ", + "page-intro-list-item-2-link": "https://www.gov.wales/significant-infrastructure-projects-applications", "page-intro-list-item-3": "Where a proposal has been decided.", "page-intro-paragraph-2": "Use the table below to find applications by stage or type. Alternatively, use the map by clicking on the markers to go to the applications page. A list of key events and deadlines for all applications is available on our ", "page-intro-paragraph-2-link": "calendar page", diff --git a/locales/en/dnsCommon.json b/locales/en/dnsCommon.json index 44cd86d6..c7cda17e 100644 --- a/locales/en/dnsCommon.json +++ b/locales/en/dnsCommon.json @@ -1,5 +1,5 @@ { - "service-name": "Developments of National Significance", + "service-name": "Infrastructure Projects", "result-list-show-label": "Show", "result-list-entries-label": "entries", "result-list-showing-label": "Showing {{recordIndex}} to {{pagingIndex}} of {{totalRecords}} entries", diff --git a/locales/en/home.json b/locales/en/home.json index dff84144..777193cd 100644 --- a/locales/en/home.json +++ b/locales/en/home.json @@ -24,8 +24,8 @@ "login-card-forgotten-link": "Click here", "login-via-gov-gateway-label": "Log in via Government Gateway", "login-via-nextuth-label": "Sign in with your email address", - "casesearch-card-title": "Search appeals and Developments of National Significance", - "casesearch-card-search-hint": "Use the case reference or DNS title to search. Case reference will be similar to one of the following:", + "casesearch-card-title": "Search for a case", + "casesearch-card-search-hint": "Use the case reference or Infrastructure project title to search. Case reference will be similar to one of the following:", "casesearch-card-search-example-label-1": "APP-A12345-A-21-1234567", "casesearch-card-search-example-label-2": "CAS-12345-A1B2C3", "casesearch-card-button": "Submit search", diff --git a/locales/en/myportal.json b/locales/en/myportal.json index 9a9fe897..0d48f908 100644 --- a/locales/en/myportal.json +++ b/locales/en/myportal.json @@ -15,8 +15,8 @@ "makenewappeal-card-guidance-link": "https://www.gov.wales/planning-appeals-guidance", "makenewappeal-card-button-label": "Make a new appeal", "mycases-card-title": "My cases", - "searchcases-card-title": "Search appeals and Developments of National Significance", - "searchcases-card-search-hint": "Use the case reference or DNS title to search. Case reference will be similar to one of the following:", + "searchcases-card-title": "Search for a case", + "searchcases-card-search-hint": "Use the case reference or Infrastructure project title to search. Case reference will be similar to one of the following:", "searchcases-card-search-example-label-1": "APP-A12345-A-21-1234567", "searchcases-card-search-example-label-2": "CAS-12345-A1B2C3", "searchcases-card-button": "Submit Search", 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/pages/dns/index.js b/pages/dns/index.js index 26f4caf7..0bd340aa 100644 --- a/pages/dns/index.js +++ b/pages/dns/index.js @@ -92,6 +92,13 @@ export const getServerSideProps = wrapper.getServerSideProps( store.dispatch(setSearchDetails(searchDetailsObj)); store.dispatch(setSearch("DNS")); } + return { + props: { + searchResultsObj: { + searchResultsObj: searchResultsObj, + }, + }, + }; } ); @@ -99,7 +106,7 @@ const mapStateToProps = (state) => { return { currentView: state.currentView, search: state.search, - searchResultsObj: state.searchResultsObj, + //searchResultsObj: state.searchResultsObj, formData: state.formData, appealType: state.appealType, form: state.form, 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