From d0b2fd0996fb2a6d7b26c8f756d88b15c3527436 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Tue, 29 Jul 2025 12:30:20 +0100 Subject: [PATCH] 17346 updated sips in line --- .vscode/launch.json | 2 +- components/elements/index.js | 3 +-- components/homepage/casecomment.js | 30 ++++++++++++++++++------------ components/homepage/casesearch.js | 2 ++ components/homepage/dns.js | 24 +++++++++++++++++++++++- components/homepage/login.js | 28 ++++++++++++---------------- components/main.js | 4 ++-- locales/cy/home.json | 8 +++++++- locales/en/home.json | 16 +++++++++++----- pages/index.js | 2 +- 10 files changed, 78 insertions(+), 41 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 39c6d864..8f9df645 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "name": "Next.js: debug server-side", "type": "node-terminal", "request": "launch", - "command": "yarn run dev" + "command": "npm run dev" }, {"name": "Launch Chrome against localhost", "type": "pwa-chrome", diff --git a/components/elements/index.js b/components/elements/index.js index 3fcdda03..98560a22 100644 --- a/components/elements/index.js +++ b/components/elements/index.js @@ -2179,8 +2179,7 @@ const RenderFileUpload = (field) => { ).then((data) => { console.log(data); let buildAppealFilesArray = []; - //let values = field.form.appealForm.values; - let values = field.props.form.appealForm.values; + let values = field.form.appealForm.values; let filesUploadObj = renamedAcceptedFiles; for (let key in filesUploadObj) { diff --git a/components/homepage/casecomment.js b/components/homepage/casecomment.js index 6435c52a..eace402d 100644 --- a/components/homepage/casecomment.js +++ b/components/homepage/casecomment.js @@ -1,6 +1,5 @@ import useTranslation from "next-translate/useTranslation"; import { useRouter } from "next/router"; -import Link from "next/link"; export default function CaseComment() { let { t } = useTranslation(); @@ -8,11 +7,18 @@ export default function CaseComment() { const router = useRouter(); const { locale } = router; return ( -
-
+
+

{t("home:casescomment-card-title")}

+ +

+ {t("home:casescomment-card-paragraph-three")} +

+

+ {t("home:casescomment-card-paragraph-four")} +

{t("home:casescomment-card-paragraph-one")}{" "} {t("home:casescomment-card-paragraph-two")}

- -
- - {t("common:footer-contact-us-link-label")} - -
+

+ {t("home:watch-case-card-title")} +

+

+ {t("home:watch-case-paragraph-one")} +

+ {/*

+ {t("home:casescomment-card-paragraph-two")} +

*/}
); diff --git a/components/homepage/casesearch.js b/components/homepage/casesearch.js index 70607037..40d54017 100644 --- a/components/homepage/casesearch.js +++ b/components/homepage/casesearch.js @@ -4,6 +4,7 @@ import { useRouter } from "next/router"; import { connect } from "react-redux"; import { Field, reduxForm, SubmissionError } from "redux-form"; import { sendGAEvent } from "@next/third-parties/google"; +import Dns from "./dns"; const required = (errorMsg) => (value) => value || typeof value === "number" ? undefined : errorMsg; @@ -175,6 +176,7 @@ let CaseSearch = (props) => {
+
); diff --git a/components/homepage/dns.js b/components/homepage/dns.js index 405bdb78..2c5b63a1 100644 --- a/components/homepage/dns.js +++ b/components/homepage/dns.js @@ -15,7 +15,7 @@ export default function Dns() { // : setShowSpinnerState(true); // }; return ( -
+

{t("home:dns-card-title")} @@ -40,6 +40,28 @@ export default function Dns() { {t("home:dns-card-button")}

+
+

Contact us

+
+

+ If you have any queries on an appeal, application or + anything else regarding Planning Caserwork you can + contact us. +

+
+
+ + Contact us + +
+
); diff --git a/components/homepage/login.js b/components/homepage/login.js index 51e0b91b..6c67dfcb 100644 --- a/components/homepage/login.js +++ b/components/homepage/login.js @@ -5,6 +5,7 @@ import { connect } from "react-redux"; import { parseCookies } from "nookies"; import { setLoggedInUserId } from "../../store/accountDetails/action"; import { signOut, useSession } from "next-auth/react"; +import CaseComment from "./casecomment"; const required = (errorMsg) => (value) => value || typeof value === "number" ? undefined : errorMsg; @@ -71,11 +72,17 @@ let Login = (props) => { <>
+

+ {t("home:signin-benefits-title")} +

+

+ {t("home:signin-benefits-paragraph")} +

{/* {t("home:login-card-title")} */} {t("home:login-card-title-temp")}

{" "} -
+ {/*
{session && "Signed in as " + session.user?.email}
@@ -107,15 +114,14 @@ let Login = (props) => { Magic Link Sign Out )} -
+
*/}

{t("home:login-comingsoon-temp-1")}{" "}

-

+ {/*

{t("home:login-comingsoon-temp-1a")}{" "} -

+

*/}
-

{t("home:login-comingsoon-temp-2")}

@@ -172,19 +178,9 @@ let Login = (props) => {
-
- -

- {t("home:login-comingsoon-email-link-label")}{" "} - - {t("home:login-contact-email")} - -

+
); diff --git a/components/main.js b/components/main.js index cd0eefe7..382ce73b 100644 --- a/components/main.js +++ b/components/main.js @@ -34,8 +34,8 @@ const MainHome = (props) => { )}{" "} - - + {/* */} + {/* */} diff --git a/locales/cy/home.json b/locales/cy/home.json index 2e037be8..e6742f8d 100644 --- a/locales/cy/home.json +++ b/locales/cy/home.json @@ -46,5 +46,11 @@ "uploading-files-progress-label": "Wrthi'n llwytho i fyny...", "uploading-files-label": "Wrthi'n uwchlwytho {{number}} ffeil", "completed-uploading-files-label": "{{number}} ffeil wedi'u huwchlwytho", - "remove-this-file-label": "Tynnu'r ffeil hon" + "remove-this-file-label": "Tynnu'r ffeil hon", + "watch-case-card-title": "Gwylio achos", + "watch-case-paragraph-one": "Os oes gennych ddiddordeb mewn achos, dewiswch ei wylio o'ch dangosfwrdd.", + "casescomment-card-paragraph-three": "Gallwch wneud sylwadau ar apeliadau a cheisiadau yn ystod y cyfnod cynrychioli neu gyflwyno datganiadau achos neu'r Holiadur LPA.", + "casescomment-card-paragraph-four": "Cyfeiriwch at y dyddiadau cau ar gyfer cynrychioli achosion unigol ar gyfer datganiadau a sylwadau.", + "signin-benefits-title": "Buddion mewngofnodi", + "signin-benefits-paragraph": "Mae cofrestru ar y porth Gwaith Achos Cynllunio yn caniatáu ichi:" } \ No newline at end of file diff --git a/locales/en/home.json b/locales/en/home.json index 777193cd..a83f95e1 100644 --- a/locales/en/home.json +++ b/locales/en/home.json @@ -1,6 +1,6 @@ { - "login-card-title-temp": "New appeals or applications", - "login-comingsoon-temp-1": "This service is being developed to support online appeals and applications.", + "login-card-title-temp": "Submit a new appeal", + "login-comingsoon-temp-1": "This service is being developed to support online appeals and applications. You can currently raise planning appeals.", "login-comingsoon-temp-1a": "You can currently raise Planning Appeals s78.", "login-comingsoon-temp-2": "While we develop the online service, find:", "login-comingsoon-forms-link-1": "https://gov.wales/planning-appeal-forms", @@ -32,8 +32,8 @@ "casesearch-card-advanced-link": "Advanced search", "casesearch-search-validation-required": "Required", "casesearch-search-validation-minlength": "Must be 4 characters or more", - "casescomment-card-title": "Comment on an appeal ", - "casescomment-card-paragraph-one": "Comment on an appeal (excluding householder or commercial) by emailing ", + "casescomment-card-title": "Comment on an appeal or application", + "casescomment-card-paragraph-one": "Alternatively you can comment on an appeal (excluding householder or commercial) by emailing ", "casescomment-card-paragraph-two": "For householder and commercial appeals, interested parties are unable to comment at appeal stage. Any comments made at application stage will be provided by the Local Planning Authority and considered by the inspector.", "inspectorate-card-visit-label": "Visit the Planning Inspectorate", "inspectorate-card-visit-link": "Home", @@ -46,5 +46,11 @@ "uploading-files-progress-label": "Uploading...", "uploading-files-label": "Uploading {{number}} files", "completed-uploading-files-label": "{{number}} files uploaded", - "remove-this-file-label": "Remove this file" + "remove-this-file-label": "Remove this file", + "watch-case-card-title": "Watch a case", + "watch-case-paragraph-one": "If you are interested in a case you can select to watch it from your dashboard.", + "casescomment-card-paragraph-three": "You can make comments on appeals and applications during the representation period or submit statements of case or the LPA Questionnaire.", + "casescomment-card-paragraph-four": "Please refer to the individual case representation deadlines for statements and comments.", + "signin-benefits-title": "Sign in benefits", + "signin-benefits-paragraph": "Registering on the Planning Casework portal allows you to:" } \ No newline at end of file diff --git a/pages/index.js b/pages/index.js index f75c0f7b..ad1ba3f9 100644 --- a/pages/index.js +++ b/pages/index.js @@ -128,7 +128,7 @@ const Home = (props) => { ) : ( <> - +