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

updated

Browse Source
This commit is contained in:
robbond
2023-11-08 13:20:43 +00:00
parent e7afa582ff
commit ef1f773022
74 changed files with 3390 additions and 3540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.eslintrc
+24 -23
View File
@@ -3,30 +3,31 @@
"rules": { "rules": {
"@next/next/no-img-element": "off", "@next/next/no-img-element": "off",
"react/no-unknown-property": "error" "react/no-unknown-property": "error"
},
}//,
//...your configuration //...your configuration
"overrides": [ // "overrides": [
//...your overrides // //...your overrides
{ // {
// Force the setting of a swagger description on each api endpoint // // Force the setting of a swagger description on each api endpoint
"files": ["pages/api/**/*.js"], // "files": ["pages/api/**/*.js"],
"plugins": ["jsdoc"], // "plugins": ["jsdoc"],
"rules": { // "rules": {
"jsdoc/no-missing-syntax": [ // "jsdoc/no-missing-syntax": [
"error", // "error",
{ // {
"contexts": [ // "contexts": [
{ // {
"comment": "JsdocBlock:has(JsdocTag[tag=swagger])", // "comment": "JsdocBlock:has(JsdocTag[tag=swagger])",
"context": "any", // "context": "any",
"message": "@swagger documentation is required on each API. Check this out for syntax info: https://github.com/jellydn/next-swagger-doc" // "message": "@swagger documentation is required on each API. Check this out for syntax info: https://github.com/jellydn/next-swagger-doc"
} // }
] // ]
} // }
] // ]
} // }
} // }
] // ]
} }
actions/index.js
+2
View File
@@ -12,6 +12,8 @@ if (process.browser) {
} else { } else {
BASE_URL = process.env.API_ROOT || `http://localhost:${port}`; BASE_URL = process.env.API_ROOT || `http://localhost:${port}`;
} }
BASE_URL = process.env.API_ROOT;
const WORDKEY = process.env.HASHKEY; const WORDKEY = process.env.HASHKEY;
const cache = {}; const cache = {};
components/account/changepassword.js
+6 -8
View File
@@ -95,8 +95,7 @@ const ChangePassword = (props) => {
const [hasErrors, setHasErrors] = useState(""); const [hasErrors, setHasErrors] = useState("");
return ( return <>
<>
{passwordUpdated != true ? ( {passwordUpdated != true ? (
<form onSubmit={handleSubmit(onHandleSubmit)}> <form onSubmit={handleSubmit(onHandleSubmit)}>
<fieldset className="govuk-fieldset"> <fieldset className="govuk-fieldset">
@@ -133,8 +132,8 @@ const ChangePassword = (props) => {
"/myportal?q=" + "/myportal?q=" +
props.accountDetails.loggedinUserId props.accountDetails.loggedinUserId
} }
> className="govuk-link">
<a className="govuk-link">Cancel</a> Cancel
</Link> </Link>
</div> </div>
</form> </form>
@@ -146,14 +145,13 @@ const ChangePassword = (props) => {
"/myportal?q=" + "/myportal?q=" +
props.accountDetails.loggedinUserId props.accountDetails.loggedinUserId
} }
> className="govuk-link">
<a className="govuk-link">Go to My Portal</a> Go to My Portal
</Link> </Link>
</p> </p>
</> </>
)} )}
</> </>;
);
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
components/account/personaldetails.js
+5 -7
View File
@@ -237,8 +237,7 @@ let PersonalDetails = (props) => {
setPersonalDetailsComplete(true); setPersonalDetailsComplete(true);
}; };
return ( return <>
<>
{props.accountUpdatedComplete == false ? ( {props.accountUpdatedComplete == false ? (
props.personalDetailsComplete == false ? ( props.personalDetailsComplete == false ? (
<form onSubmit={handleSubmit(onHandleSubmit)}> <form onSubmit={handleSubmit(onHandleSubmit)}>
@@ -397,10 +396,10 @@ let PersonalDetails = (props) => {
"/myportal?q=" + "/myportal?q=" +
props.props.accountDetails.loggedinUserId props.props.accountDetails.loggedinUserId
} }
> className="govuk-link">
<a className="govuk-link">
{t("common:cancel-link")} {t("common:cancel-link")}
</a>
</Link> </Link>
</div> </div>
</form> </form>
@@ -420,8 +419,7 @@ let PersonalDetails = (props) => {
) : ( ) : (
<PersonalDetailsComplete props={props} /> <PersonalDetailsComplete props={props} />
)} )}
</> </>;
);
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
components/account/personaldetailsCheck.js
+4 -6
View File
@@ -31,8 +31,7 @@ const BuildCheckPersonalDetails = (props) => {
: t("account:account-preferred-language-welsh"); : t("account:account-preferred-language-welsh");
}; };
return ( return <>
<>
<h2 className="govuk-heading-m"> <h2 className="govuk-heading-m">
{t("account:account-about-you-label")} {t("account:account-about-you-label")}
</h2> </h2>
@@ -346,12 +345,11 @@ const BuildCheckPersonalDetails = (props) => {
</button> </button>
<Link <Link
href={"/myportal?q=" + props.accountDetails.loggedinUserId} href={"/myportal?q=" + props.accountDetails.loggedinUserId}
> className="govuk-link">
<a className="govuk-link"> {t("common:back-link")}</a> {t("common:back-link")}
</Link> </Link>
</div> </div>
</> </>;
);
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
components/account/personaldetailsComplete.js
+5 -7
View File
@@ -40,8 +40,7 @@ const PersonalDetailsComplete = (props) => {
props.props.props.form.personalDetailsForm.values, props.props.props.form.personalDetailsForm.values,
]); ]);
return ( return <>
<>
<p className="govuk-body">{t("account:account-complete-para-1")}</p> <p className="govuk-body">{t("account:account-complete-para-1")}</p>
<p className="govuk-body">{t("account:account-complete-para-2")}</p> <p className="govuk-body">{t("account:account-complete-para-2")}</p>
@@ -49,15 +48,14 @@ const PersonalDetailsComplete = (props) => {
<p className="govuk-body"> <p className="govuk-body">
<Link <Link
href={"/myportal?q=" + props.accountDetails.loggedinUserId} href={"/myportal?q=" + props.accountDetails.loggedinUserId}
> className="govuk-link">
<a className="govuk-link">
{" "} {" "}
{t("account:account-complete-return-to-portal-link")} {t("account:account-complete-return-to-portal-link")}
</a>
</Link> </Link>
</p> </p>
</> </>;
);
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
components/account/registerComplete.js
+7 -7
View File
@@ -78,7 +78,7 @@ const RegisterComplete = (props) => {
var registerBody = ""; var registerBody = "";
switch (props.accountDetails.accCr) { switch (props.accountDetails.accCr) {
case "created": case "created":
return (registerBody = ( return registerBody = (
<> <>
<p className="govuk-body"> <p className="govuk-body">
{t("account:register-new-account-confirmation-email")} {t("account:register-new-account-confirmation-email")}
@@ -95,8 +95,8 @@ const RegisterComplete = (props) => {
</p> </p>
<p className="govuk-body"> <p className="govuk-body">
<Link href="/"> <Link
<a href="/"
className="govuk-link" className="govuk-link"
onClick={() => { onClick={() => {
setLogout(), setLogout(),
@@ -112,16 +112,16 @@ const RegisterComplete = (props) => {
destroyCookie(null, "pedw_locale"), destroyCookie(null, "pedw_locale"),
destroyCookie(null, "pinsUser"), destroyCookie(null, "pinsUser"),
signOut({ callbackUrl: "/logout" }); signOut({ callbackUrl: "/logout" });
}} }}>
>
{t( {t(
"account:register-new-account-my-portal-link" "account:register-new-account-my-portal-link"
)} )}
</a>
</Link> </Link>
</p> </p>
</> </>
)); );
break; break;
components/breadcrumbs.js
+77 -81
View File
@@ -49,8 +49,7 @@ const Breadcrumbs = (props) => {
const { data: session, status } = useSession(); const { data: session, status } = useSession();
return ( return <>
<>
<nav <nav
aria-label={ aria-label={
"Breadcrumb for " + _.startCase(_.toLower(appealType)) "Breadcrumb for " + _.startCase(_.toLower(appealType))
@@ -68,10 +67,10 @@ const Breadcrumbs = (props) => {
</Link> </Link>
</li> */} </li> */}
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href={"/"}> <Link href={"/"} className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("common:service-name-breadcrumb")} {t("common:service-name-breadcrumb")}
</a>
</Link> </Link>
</li> </li>
{router.pathname == "/myportal" ? ( {router.pathname == "/myportal" ? (
@@ -133,10 +132,10 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -157,12 +156,12 @@ const Breadcrumbs = (props) => {
"/advancedsearch" "/advancedsearch"
: "/advancedsearch" : "/advancedsearch"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t( {t(
"common:breadcrumb-advanced-search" "common:breadcrumb-advanced-search"
)} )}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -186,10 +185,10 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -200,12 +199,12 @@ const Breadcrumbs = (props) => {
"/myportal/advancedsearch" "/myportal/advancedsearch"
: "/myportal/advancedsearch" : "/myportal/advancedsearch"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t( {t(
"common:breadcrumb-advanced-search" "common:breadcrumb-advanced-search"
)} )}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -228,10 +227,10 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("newappeal:parent-page-title")} {t("newappeal:parent-page-title")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -252,10 +251,10 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("newappeal:parent-page-title")} {t("newappeal:parent-page-title")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -276,10 +275,10 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("newappeal:parent-page-title")} {t("newappeal:parent-page-title")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -303,10 +302,10 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("newappeal:parent-page-title")} {t("newappeal:parent-page-title")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -318,10 +317,10 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("newappeal:page-title")} {t("newappeal:page-title")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -342,10 +341,10 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -366,10 +365,10 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -403,10 +402,10 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -418,10 +417,10 @@ const Breadcrumbs = (props) => {
"/fymhorth/gweldpopeth" "/fymhorth/gweldpopeth"
: "/myportal/viewall" : "/myportal/viewall"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-your-cases")} {t("common:breadcrumb-your-cases")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -448,10 +447,10 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -472,17 +471,17 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
<Link href={"/myportal/dnsapplications"}> <Link href={"/myportal/dnsapplications"} className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("dnsCommon:service-name")} {t("dnsCommon:service-name")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -511,18 +510,16 @@ const Breadcrumbs = (props) => {
props.props.search props.props.search
.searchString .searchString
} }
>
<a
onClick={() => { onClick={() => {
// spinnerState(); // spinnerState();
router.back(); router.back();
}} }}
className="govuk-breadcrumbs__link" className="govuk-breadcrumbs__link">
>
{t( {t(
"common:breadcrumb-search-results" "common:breadcrumb-search-results"
)} )}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -547,12 +544,12 @@ const Breadcrumbs = (props) => {
"/myportal" "/myportal"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t( {t(
"common:breadcrumb-my-portal" "common:breadcrumb-my-portal"
)} )}
</a>
</Link> </Link>
</li> </li>
)} )}
@@ -563,14 +560,14 @@ const Breadcrumbs = (props) => {
? router.locale + "/case" ? router.locale + "/case"
: "/case" : "/case"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{ {
props.props.currentView props.props.currentView
.caseReference .caseReference
.currentReference .currentReference
} }
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -597,10 +594,10 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -630,10 +627,10 @@ const Breadcrumbs = (props) => {
"/fymhorth" "/fymhorth"
: "/myportal" : "/myportal"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("common:breadcrumb-my-portal")} {t("common:breadcrumb-my-portal")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -661,10 +658,10 @@ const Breadcrumbs = (props) => {
? router.locale + "/../../dns" ? router.locale + "/../../dns"
: "/../../dns" : "/../../dns"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("dnsCommon:service-name")} {t("dnsCommon:service-name")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -697,10 +694,10 @@ const Breadcrumbs = (props) => {
"/dnsapplications" "/dnsapplications"
: "/dnsapplications" : "/dnsapplications"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t("dnsCommon:service-name")} {t("dnsCommon:service-name")}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -760,12 +757,12 @@ const Breadcrumbs = (props) => {
"/dns/applications" "/dns/applications"
: "/dns/applications" : "/dns/applications"
} }
> className="govuk-breadcrumbs__link">
<a className="govuk-breadcrumbs__link">
{t( {t(
"dnsApplicationView:page-parent-title" "dnsApplicationView:page-parent-title"
)} )}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
@@ -880,7 +877,6 @@ const Breadcrumbs = (props) => {
</ol> </ol>
</div> </div>
</nav> </nav>
</> </>;
);
}; };
export default Breadcrumbs; export default Breadcrumbs;
components/case/documents.js
+44 -53
View File
@@ -255,26 +255,18 @@ const DocumentDetails = (props) => {
<Link <Link
scroll={false} scroll={false}
href={detailsObj.pinswg_hashlink} href={detailsObj.pinswg_hashlink}
>
<a
key={key} key={key}
onClick={() => { onClick={() => {
toggleDownLoadLink(key); toggleDownLoadLink(key);
}} }}
> >
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t("case:documents-name-label")}
"case:documents-name-label"
)}
: :
</span> </span>
{_.has( {_.has(detailsObj, "pinswg_name")
detailsObj,
"pinswg_name"
)
? detailsObj.pinswg_name ? detailsObj.pinswg_name
: ""} : ""}
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -340,49 +332,6 @@ const DocumentDetails = (props) => {
); );
}; };
useEffect(() => {
getDocumentTypes();
if (selectedOption) {
setShowSpinnerState(true);
getDocumentResults(1, orderByState, fieldSortState);
}
if (selectedDocumentType) {
setShowSpinnerState(true);
getDocumentResults(
1,
orderByState,
fieldSortState,
selectedDocumentType
);
}
const docDetailsObj = async () => {
let docObj = await getSearchDocumentDetails(incidentid).then(
(data) => {
//console.log(data);
setDocumentDetails(data);
setDocumentSearchState(true);
return data;
}
);
return docObj;
};
const searchDocumentResultsObj = docDetailsObj();
}, [
incidentid,
setDocumentDetails,
selectedOption,
selectedDocumentType,
fieldSortState,
orderByState,
getDocumentTypes,
getDocumentResults,
]);
const getDocumentTypes = useCallback(() => { const getDocumentTypes = useCallback(() => {
getSearchDocumentTypes(props.incidentid).then((data) => { getSearchDocumentTypes(props.incidentid).then((data) => {
setDocumentTypes(data); setDocumentTypes(data);
@@ -495,6 +444,48 @@ const DocumentDetails = (props) => {
setShowSpinnerState(true); setShowSpinnerState(true);
}; };
useEffect(() => {
getDocumentTypes();
if (selectedOption) {
setShowSpinnerState(true);
getDocumentResults(1, orderByState, fieldSortState);
}
if (selectedDocumentType) {
setShowSpinnerState(true);
getDocumentResults(
1,
orderByState,
fieldSortState,
selectedDocumentType
);
}
const docDetailsObj = async () => {
let docObj = await getSearchDocumentDetails(incidentid).then(
(data) => {
//console.log(data);
setDocumentDetails(data);
setDocumentSearchState(true);
return data;
}
);
return docObj;
};
const searchDocumentResultsObj = docDetailsObj();
}, [
incidentid,
setDocumentDetails,
selectedOption,
selectedDocumentType,
fieldSortState,
orderByState,
getDocumentTypes,
getDocumentResults,
]);
return ( return (
<> <>
<div> <div>
components/case/representation/index.js
+1 -1
View File
@@ -394,7 +394,7 @@ let MakeRepresentation = (props) => {
let year = repDate.getFullYear(); let year = repDate.getFullYear();
let time = repDate.getTime(); let time = repDate.getTime();
const repType = ""; let repType = "";
switch (values.representationCapacity) { switch (values.representationCapacity) {
case t("myrepresentations:capacity-options-arr-appellant"): case t("myrepresentations:capacity-options-arr-appellant"):
repType = "APPELLANT"; repType = "APPELLANT";
components/case/representation/representationComplete.js
+5 -5
View File
@@ -66,13 +66,13 @@ const RepComplete = (props) => {
</div> </div>
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-button-group"> <div className="govuk-button-group">
<Link href="/myportal"> <Link
<a href="/myportal"
onClick={() => setRepresentationReset()} onClick={() => setRepresentationReset()}
className="govuk-button" className="govuk-button">
>
{t("common:continue-button")} {t("common:continue-button")}
</a>
</Link> </Link>
</div> </div>
</div> </div>
components/case/representation/representationElements.js
+5 -8
View File
@@ -871,8 +871,7 @@ export const RenderFileUpload = (field) => {
}); });
}; };
return ( return <>
<>
<Dropzone <Dropzone
accept="application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,image/tiff,image/jpeg,application/zip" accept="application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,image/tiff,image/jpeg,application/zip"
onDrop={(filesToUpload, e) => { onDrop={(filesToUpload, e) => {
@@ -975,15 +974,13 @@ export const RenderFileUpload = (field) => {
blob.name + blob.name +
blob.hashedfilepath blob.hashedfilepath
} }
> className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link">
<a className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link">
{blob.name} ({bytesToSize(blob.contentLength)}) {blob.name}({bytesToSize(blob.contentLength)})
</a>
</Link> </Link>
</div> </div>
))}{" "} ))}{" "}
</> </>;
);
}; };
export function FileUploadField(props) { export function FileUploadField(props) {
components/case/representation/representationLPA.js
+2 -2
View File
@@ -25,8 +25,8 @@ import jsonpath from "jsonpath";
import { useState } from "react"; import { useState } from "react";
import Enforcement_Questionnaire from "./representationQuestionnaires/representationLPAQuestionnaire_enforcement"; import Enforcement_Questionnaire from "./representationQuestionnaires/representationLPAQuestionnaire_enforcement";
import S78_Qquestionnaire from "./representationQuestionnaires/representationLPAQuestionnaire_s78"; import S78_Qquestionnaire from "./representationQuestionnaires/representationLPAQuestionnaire_s78";
import { RepresentationProgress_s78 } from "./representationProgress/representationProgress_s78"; import RepresentationProgress_s78 from "./representationProgress/representationProgress_s78";
import { RepresentationProgress_enforcement } from "./representationProgress/representationProgress_enforcement"; import RepresentationProgress_enforcement from "./representationProgress/representationProgress_enforcement";
import transLookup from "../../../data/lookuptranslations.json"; import transLookup from "../../../data/lookuptranslations.json";
let RepLPA = (props) => { let RepLPA = (props) => {
components/case/summary.js
+10 -9
View File
@@ -432,12 +432,11 @@ const CaseSummary = (props) => {
: casesObj.reference, : casesObj.reference,
}, },
}} }}
className="govuk-button"
> >
<a className="govuk-button">
{t( {t(
"case:summary-make-representation-label" "case:summary-make-representation-label"
)} )}
</a>
</Link> </Link>
<a <a
@@ -535,7 +534,7 @@ const CaseSummary = (props) => {
}} }}
title={t("case:watch-this-case-link")} title={t("case:watch-this-case-link")}
> >
{t("case:watch-this-case-link")} dd {t("case:watch-this-case-link")}
</span> </span>
)} )}
</div> </div>
@@ -624,12 +623,13 @@ const CaseSummary = (props) => {
true ? ( true ? (
"" ""
) : ( ) : (
<Link href="/representation"> <Link
<a className="govuk-button"> href="/representation"
className="govuk-button"
>
{t( {t(
"case:summary-make-representation-label" "case:summary-make-representation-label"
)} )}
</a>
</Link> </Link>
)} )}
@@ -996,8 +996,9 @@ const CaseSummary = (props) => {
item.title + item.title +
"&lk=1" "&lk=1"
} }
className=""
> >
<a className="">{item.title}</a> {item.title}
</Link> </Link>
</li> </li>
); );
@@ -1009,7 +1010,7 @@ const CaseSummary = (props) => {
} }
function showReps(startDate, endDate) { function showReps(startDate, endDate) {
const date = new Date(); let date = new Date();
date = new Date(date.toDateString()); date = new Date(date.toDateString());
const start = new Date(startDate); const start = new Date(startDate);
const end = new Date(endDate); const end = new Date(endDate);
@@ -1018,7 +1019,7 @@ const CaseSummary = (props) => {
} }
function showRepsEnded(startDate, endDate) { function showRepsEnded(startDate, endDate) {
const date = new Date(); let date = new Date();
date = new Date(date.toDateString()); date = new Date(date.toDateString());
const start = new Date(startDate); const start = new Date(startDate);
const end = new Date(endDate); const end = new Date(endDate);
components/case/summaryTypes/pinswg_dnsid.js
+2 -2
View File
@@ -18,8 +18,8 @@ const Pinswg_dnsid = (props) => {
const router = useRouter(); const router = useRouter();
const { locale } = router; const { locale } = router;
const point = {}; let point = {};
const siteCoords = {}; let siteCoords = {};
let center = {}; let center = {};
point = new OSPoint( point = new OSPoint(
components/caseresults.js
+6 -6
View File
@@ -25,17 +25,17 @@ export default function Search({ children, pages }) {
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<div className="govuk-button-group"> <div className="govuk-button-group">
<Link href="/advancedsearch"> <Link href="/advancedsearch" className="govuk-button">
<a className="govuk-button">
{t("search:searchresults-search-button-label")} {t("search:searchresults-search-button-label")}
</a>
</Link> </Link>
<Link href="/advancedsearch"> <Link href="/advancedsearch" className="govuk-button govuk-button--secondary">
<a className="govuk-button govuk-button--secondary">
{t( {t(
"search:searchresults-new-search-button-label" "search:searchresults-new-search-button-label"
)} )}
</a>
</Link> </Link>
</div> </div>
</div> </div>
components/cookieBanner.js
+7 -9
View File
@@ -36,8 +36,7 @@ const CookieBanner = () => {
setBannerVisible(false); setBannerVisible(false);
}; };
return ( return <>
<>
{bannerVisible ? ( {bannerVisible ? (
<CookieConsent <CookieConsent
style={{ style={{
@@ -117,14 +116,14 @@ const CookieBanner = () => {
{t("common:cookie-banner-accept")} {t("common:cookie-banner-accept")}
</button> </button>
<Link href="/help/cookies"> <Link
<a href="/help/cookies"
className="cookies-banner__button govuk-link--no-underline" className="cookies-banner__button govuk-link--no-underline"
id="rcc-decline-button" id="rcc-decline-button"
aria-label="Decline cookies" aria-label="Decline cookies">
>
{t("common:cookie-banner-change-settings")} {t("common:cookie-banner-change-settings")}
</a>
</Link> </Link>
</div> </div>
</div> </div>
@@ -132,8 +131,7 @@ const CookieBanner = () => {
) : ( ) : (
"" ""
)} )}
</> </>;
);
}; };
export default CookieBanner; export default CookieBanner;
components/cookiemanager/index.js
+3 -3
View File
@@ -431,12 +431,12 @@ const CookieManagementMain = (props) => {
href={t( href={t(
"cookies:cookie-settings-essential-link" "cookies:cookie-settings-essential-link"
)} )}
> className="govuk-link govuk-link--no-underline govuk-!-font-weight-bold">
<a className="govuk-link govuk-link--no-underline govuk-!-font-weight-bold">
{t( {t(
"cookies:cookie-settings-essential-link-label" "cookies:cookie-settings-essential-link-label"
)} )}
</a>
</Link> </Link>
</p> </p>
</legend> </legend>
components/dns/applications/applicationsIntro.js
+3 -3
View File
@@ -27,10 +27,10 @@ const ApplicationIntro = (props) => {
</ul> </ul>
<p className="govuk-body"> <p className="govuk-body">
{t("dnsApplications:page-intro-paragraph-2")}{" "} {t("dnsApplications:page-intro-paragraph-2")}{" "}
<Link href="/dns/calendar"> <Link href="/dns/calendar" className="govuk-link">
<a className="govuk-link">
{t("dnsApplications:page-intro-paragraph-2-link")} {t("dnsApplications:page-intro-paragraph-2-link")}
</a>
</Link> </Link>
. .
</p> </p>
components/dns/applications/applicationsList.js
+19 -37
View File
@@ -9,8 +9,7 @@ const ApplicationList = (props) => {
const router = useRouter(); const router = useRouter();
const { locale } = router; const { locale } = router;
return ( return <>
<>
<div className="govuk-grid-row govuk-!-margin-top-9"> <div className="govuk-grid-row govuk-!-margin-top-9">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<div className="govuk-form-group"> <div className="govuk-form-group">
@@ -84,15 +83,13 @@ const ApplicationList = (props) => {
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view"> <Link href="/dns/application-view">
<a>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-application" "dnsApplications:result-list-heading-label-application"
)} )}
:{" "} :{" "}
</span> </span>TWA - Morlais Demonstration Zone
TWA - Morlais Demonstration Zone
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -135,15 +132,13 @@ const ApplicationList = (props) => {
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view"> <Link href="/dns/application-view">
<a>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-application" "dnsApplications:result-list-heading-label-application"
)} )}
:{" "} :{" "}
</span> </span>TWA - Morlais Demonstration Zone
TWA - Morlais Demonstration Zone
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -186,15 +181,13 @@ const ApplicationList = (props) => {
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view"> <Link href="/dns/application-view">
<a>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-application" "dnsApplications:result-list-heading-label-application"
)} )}
:{" "} :{" "}
</span> </span>TWA - Morlais Demonstration Zone
TWA - Morlais Demonstration Zone
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -237,15 +230,13 @@ const ApplicationList = (props) => {
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view"> <Link href="/dns/application-view">
<a>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-application" "dnsApplications:result-list-heading-label-application"
)} )}
:{" "} :{" "}
</span> </span>TWA - Morlais Demonstration Zone
TWA - Morlais Demonstration Zone
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -288,15 +279,13 @@ const ApplicationList = (props) => {
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view"> <Link href="/dns/application-view">
<a>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-application" "dnsApplications:result-list-heading-label-application"
)} )}
:{" "} :{" "}
</span> </span>TWA - Morlais Demonstration Zone
TWA - Morlais Demonstration Zone
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -339,15 +328,13 @@ const ApplicationList = (props) => {
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view"> <Link href="/dns/application-view">
<a>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-application" "dnsApplications:result-list-heading-label-application"
)} )}
:{" "} :{" "}
</span> </span>TWA - Morlais Demonstration Zone
TWA - Morlais Demonstration Zone
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -390,15 +377,13 @@ const ApplicationList = (props) => {
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view"> <Link href="/dns/application-view">
<a>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-application" "dnsApplications:result-list-heading-label-application"
)} )}
:{" "} :{" "}
</span> </span>TWA - Morlais Demonstration Zone
TWA - Morlais Demonstration Zone
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -441,15 +426,13 @@ const ApplicationList = (props) => {
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view"> <Link href="/dns/application-view">
<a>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-application" "dnsApplications:result-list-heading-label-application"
)} )}
:{" "} :{" "}
</span> </span>TWA - Morlais Demonstration Zone
TWA - Morlais Demonstration Zone
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -500,14 +483,13 @@ const ApplicationList = (props) => {
<span> <span>
<Link href="#">5</Link> <Link href="#">5</Link>
</span>{" "} </span>{" "}
<Link href="#"> <Link href="#" legacyBehavior>
{t("dnsCommon:result-list-next-label")} {t("dnsCommon:result-list-next-label")}
</Link> </Link>
</p> </p>
</div> </div>
</div> </div>
</> </>;
);
}; };
export default ApplicationList; export default ApplicationList;
components/dns/homepage/applicationsForComment.js
+3 -3
View File
@@ -15,10 +15,10 @@ const ApplicationsForComment = (props) => {
<div className="govuk-panel__body"> <div className="govuk-panel__body">
<ul className="govuk-list"> <ul className="govuk-list">
<li> <li>
<Link href="/dns/application-view"> <Link href="/dns/application-view" className="govuk-body-s ">
<a className="govuk-body-s ">
Holyhead Harbour Revision Order Holyhead Harbour Revision Order
</a>
</Link> </Link>
</li> </li>
</ul> </ul>
components/dns/homepage/dnsLinks.js
+8 -6
View File
@@ -13,10 +13,10 @@ const DNSLinks = (props) => {
<ul className="govuk-list"> <ul className="govuk-list">
<li> <li>
<h3 className="govuk-heading-l govuk-!-font-size-27"> <h3 className="govuk-heading-l govuk-!-font-size-27">
<Link href="/dnsapplications"> <Link href="/dnsapplications" className="govuk-link govuk-link--no-underline">
<a className="govuk-link govuk-link--no-underline">
{t("dnsHome:links-applications-title")} {t("dnsHome:links-applications-title")}
</a>
</Link> </Link>
<p className="govuk-body-s govuk-!-padding-top-2"> <p className="govuk-body-s govuk-!-padding-top-2">
{t( {t(
@@ -43,10 +43,12 @@ const DNSLinks = (props) => {
<ul className="govuk-list"> <ul className="govuk-list">
<li> <li>
<h3 className="govuk-heading-l govuk-!-font-size-27"> <h3 className="govuk-heading-l govuk-!-font-size-27">
<Link href="https://gov.wales/developments-national-significance-dns-guidance"> <Link
<a className="govuk-link govuk-link--no-underline "> href="https://gov.wales/developments-national-significance-dns-guidance"
className="govuk-link govuk-link--no-underline ">
{t("dnsHome:links-help-title")} {t("dnsHome:links-help-title")}
</a>
</Link> </Link>
<p className="govuk-body-s govuk-!-padding-top-2"> <p className="govuk-body-s govuk-!-padding-top-2">
{t("dnsHome:links-guidance-intro-paragraph")} {t("dnsHome:links-guidance-intro-paragraph")}
components/dns/homepage/latestApplications.js
+2 -2
View File
@@ -4,7 +4,7 @@ import useTranslation from "next-translate/useTranslation";
const LatestApplications = (props) => { const LatestApplications = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
const { dnsList } = props; let { dnsList } = props;
dnsList = dnsList.value; dnsList = dnsList.value;
let dnsListArr = dnsList.slice(0, 3); let dnsListArr = dnsList.slice(0, 3);
@@ -33,7 +33,7 @@ const LatestApplications = (props) => {
.join("-")) .join("-"))
} }
> >
<a>{dnsList[key].title}</a> {dnsList[key].title}
</Link> </Link>
</li> </li>
); );
components/dns/homepage/titleContent.js
+3 -3
View File
@@ -72,10 +72,10 @@ const TitleContent = (props) => {
? value.split(" - ")[1].split(" ").join("-") ? value.split(" - ")[1].split(" ").join("-")
: value) : value)
} }
> className="govuk-button govuk-!-margin-bottom-0 ">
<a className="govuk-button govuk-!-margin-bottom-0 ">
{t("dnsHome:title-application-search-button")} {t("dnsHome:title-application-search-button")}
</a>
</Link> </Link>
</div> </div>
</div> </div>
components/elements/index.js
+5 -9
View File
@@ -1431,8 +1431,7 @@ const RenderFileUpload = (field) => {
}); });
}; };
return ( return <>
<>
<Dropzone <Dropzone
accept="application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,image/tiff,image/jpeg,application/zip" accept="application/pdf,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,image/tiff,image/jpeg,application/zip"
onDrop={(filesToUpload, e) => { onDrop={(filesToUpload, e) => {
@@ -1542,14 +1541,11 @@ const RenderFileUpload = (field) => {
blob.name + blob.name +
blob.hashedfilepath blob.hashedfilepath
} }
> className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link">
<a className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link">
{blob.name.slice(blob.name.indexOf("_") + 1)} ( {blob.name.slice(blob.name.indexOf("_") + 1)}({bytesToSize(blob.contentLength)})
{bytesToSize(blob.contentLength)})
</a>
</Link> </Link>
</div> </div>
))}{" "} ))}{" "}
</> </>;
);
}; };
components/errorpage.js
+5 -5
View File
@@ -35,15 +35,15 @@ const Errorpage = () => {
Unfortunately something has gone wrong! Unfortunately something has gone wrong!
</p> </p>
<p className="govuk-body govuk-!-margin-top-9">{dateString}</p> <p className="govuk-body govuk-!-margin-top-9">{dateString}</p>
<Link href="/"> <Link
<a href="/"
role="button" role="button"
draggable="false" draggable="false"
className="govuk-button govuk-button--start govuk-!-margin-top-2 govuk-!-margin-bottom-8" className="govuk-button govuk-button--start govuk-!-margin-top-2 govuk-!-margin-bottom-8"
data-module="govuk-button" data-module="govuk-button">
>
Try again Try again
</a>
</Link> </Link>
<br /> <br />
</div> </div>
components/footer.js
+16 -26
View File
@@ -13,8 +13,8 @@ export default function Footer(props) {
const linksBlock = Object.keys(linksArr).map((key) => ( const linksBlock = Object.keys(linksArr).map((key) => (
<li className="govuk-footer__inline-list-item" key={key}> <li className="govuk-footer__inline-list-item" key={key}>
<Link href={linksArr[key].path || "/"}> <Link href={linksArr[key].path || "/"} className="govuk-footer__link">
<a className="govuk-footer__link">{linksArr[key].title}</a> {linksArr[key].title}
</Link> </Link>
</li> </li>
)); ));
@@ -34,8 +34,7 @@ export default function Footer(props) {
" " + " " +
t("common:gov-wales-label").toLowerCase(); t("common:gov-wales-label").toLowerCase();
return ( return <>
<>
<div className="sharebar" id="sharebar"> <div className="sharebar" id="sharebar">
<div className="sharebar__components container-fluid"> <div className="sharebar__components container-fluid">
<div className="main__sharebar"> <div className="main__sharebar">
@@ -173,15 +172,13 @@ export default function Footer(props) {
? "/hygyrchedd" ? "/hygyrchedd"
: "/accessibility" : "/accessibility"
} }
>
<a
className="govuk-footer__link" className="govuk-footer__link"
id="aAccessibility" id="aAccessibility">
>
{t( {t(
"common:footer-accessibility-link-label" "common:footer-accessibility-link-label"
)} )}
</a>
</Link> </Link>
</li> </li>
@@ -192,15 +189,13 @@ export default function Footer(props) {
? "/help/cwcis" ? "/help/cwcis"
: "/help/cookies" : "/help/cookies"
} }
>
<a
id="aCookies" id="aCookies"
className="govuk-footer__link" className="govuk-footer__link">
>
{t( {t(
"common:footer-cookies-link" "common:footer-cookies-link"
)} )}
</a>
</Link> </Link>
</li> </li>
<li className="govuk-footer__inline-list-item"> <li className="govuk-footer__inline-list-item">
@@ -222,15 +217,13 @@ export default function Footer(props) {
href={t( href={t(
"common:footer-privacy-link" "common:footer-privacy-link"
)} )}
>
<a
id="aPrivacy" id="aPrivacy"
className="govuk-footer__link" className="govuk-footer__link">
>
{t( {t(
"common:footer-privacy-link-label" "common:footer-privacy-link-label"
)} )}
</a>
</Link> </Link>
</li> </li>
@@ -239,15 +232,13 @@ export default function Footer(props) {
href={t( href={t(
"common:footer-terms-conditions-link" "common:footer-terms-conditions-link"
)} )}
>
<a
id="aTermsConds" id="aTermsConds"
className="govuk-footer__link" className="govuk-footer__link">
>
{t( {t(
"common:footer-terms-conditions-link-label" "common:footer-terms-conditions-link-label"
)} )}
</a>
</Link> </Link>
</li> </li>
{/* <li className="govuk-footer__inline-list-item"> {/* <li className="govuk-footer__inline-list-item">
@@ -285,6 +276,5 @@ export default function Footer(props) {
</div> </div>
</div> </div>
</footer> </footer>
</> </>;
);
} }
components/header.js
+18 -18
View File
@@ -74,15 +74,17 @@ const Header = (props) => {
> >
<div className="govuk-header__container govuk-width-container"> <div className="govuk-header__container govuk-width-container">
<div className="govuk-header__logo govuk-!-width-one-quarter"> <div className="govuk-header__logo govuk-!-width-one-quarter">
<Link href={t("common:gov-wales-link")}> <Link
<a className="govuk-header__link govuk-link--no-underline govuk-header__link--homepage"> href={t("common:gov-wales-link")}
className="govuk-header__link govuk-link--no-underline govuk-header__link--homepage">
<span className="govuk-header__logotype header__logo"> <span className="govuk-header__logotype header__logo">
<img <img
alt="gov.wales" alt="gov.wales"
src="/assets/images/cymru.svg" src="/assets/images/cymru.svg"
/> />
</span> </span>
</a>
</Link> </Link>
</div> </div>
@@ -209,10 +211,12 @@ const Header = (props) => {
</div> */} </div> */}
<div className="fullNavs"> <div className="fullNavs">
{hasContactLink.includes(router.pathname) == true ? ( {hasContactLink.includes(router.pathname) == true ? (
<Link href="/dns/contact-us"> <Link
<a className="govuk-header__link govuk-!-margin-right-3"> href="/dns/contact-us"
className="govuk-header__link govuk-!-margin-right-3">
Contact Contact
</a>
</Link> </Link>
) : ( ) : (
"" ""
@@ -220,22 +224,20 @@ const Header = (props) => {
{noSignoutLink.includes(router.pathname) == true ? ( {noSignoutLink.includes(router.pathname) == true ? (
"" ""
) : ( ) : (
<Link (<Link
href={ href={
router.locale == "cy" router.locale == "cy"
? "/allgofnodi" ? "/allgofnodi"
: "/logout" : "/logout"
} }
>
<a
onClick={() => { onClick={() => {
handleLogout(); handleLogout();
}} }}
className="govuk-header__link govuk-!-margin-right-3" className="govuk-header__link govuk-!-margin-right-3">
>
{t("common:signout-label")} {t("common:signout-label")}
</a>
</Link> </Link>)
)} )}
<Link <Link
@@ -265,8 +267,6 @@ const Header = (props) => {
: router.asPath : router.asPath
} }
locale={locale == "en" ? "cy" : "en"} locale={locale == "en" ? "cy" : "en"}
>
<a
className="govuk-header__link " className="govuk-header__link "
lang={locale == "en" ? "cy" : "en"} lang={locale == "en" ? "cy" : "en"}
hrefLang={locale == "en" ? "cy" : "en"} hrefLang={locale == "en" ? "cy" : "en"}
@@ -289,11 +289,11 @@ const Header = (props) => {
path: "/", path: "/",
} }
); );
}} }}>
>
{" "} {" "}
{t("common:available-in")} {t("common:available-in")}
</a>
</Link> </Link>
</div> </div>
</div> </div>
components/homepage/casesearch.js
+5 -7
View File
@@ -94,8 +94,7 @@ let CaseSearch = (props) => {
}); });
}; };
return ( return <>
<>
<div className="card" id="casesearch-card"> <div className="card" id="casesearch-card">
<form onSubmit={handleSubmit(onHandleSubmit)}> <form onSubmit={handleSubmit(onHandleSubmit)}>
<div className="card-body"> <div className="card-body">
@@ -142,16 +141,15 @@ let CaseSearch = (props) => {
? "/chwiliouwch" ? "/chwiliouwch"
: "/advancedsearch" : "/advancedsearch"
} }
> className="govuk-link--no-underline">
<a className="govuk-link--no-underline">
{t("home:casesearch-card-advanced-link")} {t("home:casesearch-card-advanced-link")}
</a>
</Link> </Link>
</div> </div>
</form> </form>
</div> </div>
</> </>;
);
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
components/homepage/dns.js
+3 -5
View File
@@ -33,15 +33,13 @@ export default function Dns() {
? "/ceisiadaudns" ? "/ceisiadaudns"
: "/dnsapplications" : "/dnsapplications"
} }
>
<a
className="govuk-button withChevron govuk-button-cta"
// onClick={() => { // onClick={() => {
// spinnerState(); // spinnerState();
// }} // }}
> className="govuk-button withChevron govuk-button-cta">
{t("home:dns-card-button")} {t("home:dns-card-button")}
</a>
</Link> </Link>
</div> </div>
</div> </div>
components/homepage/inspectorate.js
+1 -1
View File
@@ -21,7 +21,7 @@ export default function Inspectorate() {
<p className="govuk-body-s"> <p className="govuk-body-s">
{t("home:inspectorate-card-visit-label")}:{" "} {t("home:inspectorate-card-visit-label")}:{" "}
<Link href="/"> <Link href="/">
<a>{t("home:inspectorate-card-visit-link")}</a> {t("home:inspectorate-card-visit-link")}
</Link> </Link>
</p> </p>
</div> </div>
components/myportal.js
+8 -12
View File
@@ -39,8 +39,7 @@ const MyPortal = (props) => {
? true ? true
: false; : false;
return ( return <>
<>
<main className="" id="main-content" role="main"> <main className="" id="main-content" role="main">
<div className="servicebanner myportal govuk-!-margin-bottom-4"> <div className="servicebanner myportal govuk-!-margin-bottom-4">
<h1> <h1>
@@ -65,8 +64,8 @@ const MyPortal = (props) => {
alt={router.locale == "cy" ? "Defnyddiwr" : "User"} alt={router.locale == "cy" ? "Defnyddiwr" : "User"}
/>{" "} />{" "}
<div className="serviceBanner_userDetails_name"> <div className="serviceBanner_userDetails_name">
<Link href="/account/personaldetails"> <Link href="/account/personaldetails" className="govuk-button-secondary">
<a className="govuk-button-secondary">
{ {
props.accountDetails.accountDetails props.accountDetails.accountDetails
.firstname .firstname
@@ -81,7 +80,7 @@ const MyPortal = (props) => {
"pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue" "pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue"
] ]
} }
</a>
</Link> </Link>
</div> </div>
<div> <div>
@@ -91,15 +90,13 @@ const MyPortal = (props) => {
? "/allgofnodi" ? "/allgofnodi"
: "/logout" : "/logout"
} }
>
<a
onClick={() => { onClick={() => {
handleLogout(); handleLogout();
}} }}
className="govuk-header__link govuk-!-margin-right-3" className="govuk-header__link govuk-!-margin-right-3">
>
{t("common:signout-label")} {t("common:signout-label")}
</a>
</Link> </Link>
</div> </div>
</div> </div>
@@ -173,8 +170,7 @@ const MyPortal = (props) => {
</div> </div>
</main> </main>
<TimeOut /> <TimeOut />
</> </>;
);
}; };
export default MyPortal; export default MyPortal;
components/myportal/advancedsearch.js
+2 -4
View File
@@ -179,8 +179,7 @@ let AdvancedSearch = (props) => {
label, label,
errormsg, errormsg,
}) => { }) => {
return ( return <>
<>
<div <div
className={ className={
touched && error touched && error
@@ -269,8 +268,7 @@ let AdvancedSearch = (props) => {
</select> </select>
</div> </div>
</div> </div>
</> </>;
);
}; };
// const [showSpinnerState, setShowSpinnerState] = useState(false); // const [showSpinnerState, setShowSpinnerState] = useState(false);
components/myportal/awaitingsubmission.js
+3 -5
View File
@@ -40,18 +40,16 @@ const AwaitingSubmission = (props) => {
"/fymhorth/gweldpopeth" "/fymhorth/gweldpopeth"
: "/myportal/viewall" : "/myportal/viewall"
} }
>
<a
className="govuk-link--no-underline" className="govuk-link--no-underline"
onClick={() => { onClick={() => {
setCurrentView({ setCurrentView({
"viewName": "Awaiting Submission", "viewName": "Awaiting Submission",
"viewKey": "awaitingSubmission", "viewKey": "awaitingSubmission",
}); });
}} }}>
>
{t("myportal:viewall-link")} {t("myportal:viewall-link")}
</a>
</Link> </Link>
</div> </div>
)} )}
components/myportal/awaitingsubmissionfromblob.js
+6 -10
View File
@@ -76,8 +76,6 @@ const AwaitingSubmissionFromBlob = (props) => {
"&inid=" + "&inid=" +
showTopThreeArr[key].incidentid showTopThreeArr[key].incidentid
} }
>
<a
className="govuk-link--no-underline" className="govuk-link--no-underline"
data-id={index} data-id={index}
onClick={() => { onClick={() => {
@@ -94,10 +92,10 @@ const AwaitingSubmissionFromBlob = (props) => {
showTopThreeArr[key] showTopThreeArr[key]
.pinswg_appealcasetype, .pinswg_appealcasetype,
}); });
}} }}>
>
{showTopThreeArr[index].pinswg_name} {showTopThreeArr[index].pinswg_name}
</a>
</Link> </Link>
</div> </div>
<div> <div>
@@ -222,18 +220,16 @@ const AwaitingSubmissionFromBlob = (props) => {
"/fymhorth/gweldpopeth" "/fymhorth/gweldpopeth"
: "/myportal/viewall" : "/myportal/viewall"
} }
>
<a
className="govuk-link--no-underline" className="govuk-link--no-underline"
onClick={() => { onClick={() => {
setCurrentView({ setCurrentView({
"viewName": "Awaiting Submission", "viewName": "Awaiting Submission",
"viewKey": "awaitingSubmissionDetails", "viewKey": "awaitingSubmissionDetails",
}); });
}} }}>
>
{t("myportal:viewall-link")} {t("myportal:viewall-link")}
</a>
</Link> </Link>
</div> </div>
)} )}
components/myportal/dns.js
+3 -5
View File
@@ -33,15 +33,13 @@ export default function Dns() {
? "/fymhorth/ceisiadaudns" ? "/fymhorth/ceisiadaudns"
: "/myportal/dnsapplications" : "/myportal/dnsapplications"
} }
>
<a
className="govuk-button withChevron govuk-button-cta"
// onClick={() => { // onClick={() => {
// spinnerState(); // spinnerState();
// }} // }}
> className="govuk-button withChevron govuk-button-cta">
{t("home:dns-card-button")} {t("home:dns-card-button")}
</a>
</Link> </Link>
</div> </div>
</div> </div>
components/myportal/makenewappeal.js
+3 -3
View File
@@ -20,10 +20,10 @@ export default function MakeNewAppeal() {
{t("myportal:makenewappeal-card-paragraph-two")} {t("myportal:makenewappeal-card-paragraph-two")}
</p> </p>
<div> <div>
<Link href={"/newappeal"}> <Link href={"/newappeal"} className="govuk-button">
<a className="govuk-button">
{t("myportal:makenewappeal-card-button-label")} {t("myportal:makenewappeal-card-button-label")}
</a>
</Link> </Link>
</div> </div>
</div> </div>
components/myportal/mycases.js
+3 -5
View File
@@ -34,21 +34,19 @@ const MyCases = (props) => {
"/fymhorth/gweldpopeth" "/fymhorth/gweldpopeth"
: "/myportal/viewall" : "/myportal/viewall"
} }
>
<a
className="govuk-link--no-underline" className="govuk-link--no-underline"
onClick={() => { onClick={() => {
setCurrentView({ setCurrentView({
"viewName": "My Cases", "viewName": "My Cases",
"viewKey": "myCases", "viewKey": "myCases",
}); });
}} }}>
>
{t("myportal:viewall-link")}{" "} {t("myportal:viewall-link")}{" "}
{props.isLPA && {props.isLPA &&
props.myCases.myCases["@odata.count"] + props.myCases.myCases["@odata.count"] +
" appeals"} " appeals"}
</a>
</Link> </Link>
</div> </div>
)} )}
components/myportal/myrepresentations.js
+3 -5
View File
@@ -40,18 +40,16 @@ const MyRepresentations = (props) => {
: "/myportal/viewall" : "/myportal/viewall"
} }
shallow shallow
>
<a
className="govuk-link--no-underline" className="govuk-link--no-underline"
onClick={() => { onClick={() => {
setCurrentView({ setCurrentView({
"viewName": "My Representations", "viewName": "My Representations",
"viewKey": "myRepresentations", "viewKey": "myRepresentations",
}); });
}} }}>
>
{t("myportal:viewall-link")} {t("myportal:viewall-link")}
</a>
</Link> </Link>
</div> </div>
)} )}
components/myportal/myrepresentationsfromblob.js
+3 -5
View File
@@ -40,18 +40,16 @@ const MyRepresentations = (props) => {
: "/myportal/viewall" : "/myportal/viewall"
} }
shallow shallow
>
<a
className="govuk-link--no-underline" className="govuk-link--no-underline"
onClick={() => { onClick={() => {
setCurrentView({ setCurrentView({
"viewName": "My Representations", "viewName": "My Representations",
"viewKey": "myRepresentations", "viewKey": "myRepresentations",
}); });
}} }}>
>
{t("myportal:viewall-link")} {t("myportal:viewall-link")}
</a>
</Link> </Link>
</div> </div>
)} )}
components/myportal/searchcases.js
+4 -6
View File
@@ -95,8 +95,7 @@ let CaseSearch = (props) => {
}); });
}; };
return ( return <>
<>
<div className="card" id="casesearch-card"> <div className="card" id="casesearch-card">
<form onSubmit={handleSubmit(onHandleSubmit)}> <form onSubmit={handleSubmit(onHandleSubmit)}>
<div className="card-body"> <div className="card-body">
@@ -144,15 +143,14 @@ let CaseSearch = (props) => {
: "/myportal/advancedsearch" : "/myportal/advancedsearch"
} }
> >
<a>
{t("myportal:searchcases-card-advanced-link")} {t("myportal:searchcases-card-advanced-link")}
</a>
</Link> </Link>
</div> </div>
</form> </form>
</div> </div>
</> </>;
);
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
components/myportal/topthree.js
+3 -5
View File
@@ -167,8 +167,6 @@ const TopThree = (props) => {
? "/fymhorth/achos" ? "/fymhorth/achos"
: "/myportal/case" : "/myportal/case"
} }
>
<a
className="govuk-link--no-underline" className="govuk-link--no-underline"
data-id={index} data-id={index}
onClick={() => { onClick={() => {
@@ -196,8 +194,8 @@ const TopThree = (props) => {
showTopThreeArr[key] showTopThreeArr[key]
.pinswg_appealcasetype, .pinswg_appealcasetype,
}); });
}} }}>
>
{topThreeType != "watchedCases" {topThreeType != "watchedCases"
? topThreeType != "myRepresentations" ? topThreeType != "myRepresentations"
? showTopThreeArr[key].ticketnumber ? showTopThreeArr[key].ticketnumber
@@ -207,7 +205,7 @@ const TopThree = (props) => {
: showTopThreeArr[key][ : showTopThreeArr[key][
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
]}{" "} ]}{" "}
</a>
</Link> </Link>
</div> </div>
{/* {(topThreeType == "awaitingSubmission" || {/* {(topThreeType == "awaitingSubmission" ||
components/myportal/topthree_reps.js
+4 -6
View File
@@ -156,6 +156,7 @@ const TopThree = (props) => {
<div className="cardModuleReference"> <div className="cardModuleReference">
<b>{t("myportal:case-reference")}:</b>{" "} <b>{t("myportal:case-reference")}:</b>{" "}
<Link <Link
// href="#"
href={{ href={{
pathname: "/myportal/representation", pathname: "/myportal/representation",
query: { query: {
@@ -163,9 +164,6 @@ const TopThree = (props) => {
state: "edit", state: "edit",
}, },
}} }}
// href="#"
>
<a
className="govuk-link--no-underline" className="govuk-link--no-underline"
data-id={index} data-id={index}
onClick={() => { onClick={() => {
@@ -179,10 +177,10 @@ const TopThree = (props) => {
showTopThreeArr[key].appealType, showTopThreeArr[key].appealType,
"repDetails": showTopThreeArr[key], "repDetails": showTopThreeArr[key],
}); });
}} }}>
>
{showTopThreeArr[key].pinswg_name} {showTopThreeArr[key].pinswg_name}
</a>
</Link> </Link>
</div> </div>
<div className="cardModuleReference"> <div className="cardModuleReference">
components/myportal/viewall.js
+3 -5
View File
@@ -100,8 +100,6 @@ const ViewAllResults = (props) => {
? "/myportal/case" ? "/myportal/case"
: "/case" : "/case"
} }
>
<a
onClick={() => { onClick={() => {
setCurrentReference({ setCurrentReference({
"currentReference": "currentReference":
@@ -129,8 +127,8 @@ const ViewAllResults = (props) => {
"myRepresentations" && "myRepresentations" &&
resultsArr[key], resultsArr[key],
}); });
}} }}>
>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t("search:searchresults-case-reference-label")} {t("search:searchresults-case-reference-label")}
: :
@@ -142,7 +140,7 @@ const ViewAllResults = (props) => {
: resultsArr[key][ : resultsArr[key][
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
]} ]}
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
components/myportal/watchedcases.js
+3 -5
View File
@@ -37,18 +37,16 @@ const WatchedCases = (props) => {
: "/myportal/viewall" : "/myportal/viewall"
} }
shallow shallow
>
<a
className="govuk-link--no-underline" className="govuk-link--no-underline"
onClick={() => { onClick={() => {
setCurrentView({ setCurrentView({
"viewName": "Watched Cases", "viewName": "Watched Cases",
"viewKey": "watchedCases", "viewKey": "watchedCases",
}); });
}} }}>
>
{t("myportal:viewall-link")} {t("myportal:viewall-link")}
</a>
</Link> </Link>
</div> </div>
)} )}
components/myportal/youraccount.js
+5 -7
View File
@@ -7,8 +7,7 @@ export default function YourAccount() {
const router = useRouter(); const router = useRouter();
const { locale } = router; const { locale } = router;
return ( return <>
<>
<div className="card" id="casescomment-card"> <div className="card" id="casescomment-card">
<div className="card-body"> <div className="card-body">
<h3 className="heading-small card-heading"> <h3 className="heading-small card-heading">
@@ -19,10 +18,10 @@ export default function YourAccount() {
</p> </p>
<div> <div>
<Link href="/account/personaldetails"> <Link href="/account/personaldetails" className="govuk-button-secondary">
<a className="govuk-button-secondary">
{t("myportal:yourdetails-card-link")} {t("myportal:yourdetails-card-link")}
</a>
</Link> </Link>
</div> </div>
</div> </div>
@@ -45,6 +44,5 @@ export default function YourAccount() {
</div> </div>
</div> */} </div> */}
</div> </div>
</> </>;
);
} }
components/newappeal/buildsection.js
+1 -1
View File
@@ -79,7 +79,7 @@ let BuildSection = (props) => {
); );
const isProgressComplete = (progObj) => { const isProgressComplete = (progObj) => {
const progressCount = 0; let progressCount = 0;
for (let key in progObj) { for (let key in progObj) {
progObj[key].allFieldsComplete === true && progressCount++; progObj[key].allFieldsComplete === true && progressCount++;
components/newappeal/complete.js
+2 -2
View File
@@ -138,8 +138,8 @@ let CompleteAppeal = (props) => {
</p> </p>
<p className="govuk-body"> <p className="govuk-body">
<Link href="/myportal"> <Link href="/myportal" className="govuk-link">
<a className="govuk-link">Back to My Portal</a> Back to My Portal
</Link> </Link>
</p> </p>
</div> </div>
components/nosession.js
+1 -1
View File
@@ -7,7 +7,7 @@ import Footer from "../components/footer";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
const NoSessionWarning = (props) => { const NoSessionWarning = (props) => {
const { footerLinks, loading } = props; let { footerLinks, loading } = props;
let { t, lang } = useTranslation(); let { t, lang } = useTranslation();
components/pdftemplates/enforcement_pdf.js
+2
View File
@@ -131,6 +131,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
<Image <Image
style={styles.logoImage} style={styles.logoImage}
src="public/assets/images/pedw_logo.png" src="public/assets/images/pedw_logo.png"
alt="PEDW Logo"
/> />
</View> </View>
@@ -1540,6 +1541,7 @@ export const EnforcementQuestionnaire_pdf = ({ docProps }) => {
values.filesList.map(function (p) { values.filesList.map(function (p) {
return ( return (
<View <View
key={p.name}
style={{ style={{
flexDirection: flexDirection:
"row", "row",
components/pdftemplates/finalComments_pdf.js
+2
View File
@@ -137,6 +137,7 @@ export const finalComments_pdf = ({ docProps }) => {
<Image <Image
style={styles.logoImage} style={styles.logoImage}
src="public/assets/images/pedw_logo.png" src="public/assets/images/pedw_logo.png"
alt="PEDW Logo"
/> />
</View> </View>
@@ -278,6 +279,7 @@ export const finalComments_pdf = ({ docProps }) => {
values.filesList.map(function (p) { values.filesList.map(function (p) {
return ( return (
<View <View
key={p.name}
style={{ style={{
flexDirection: "row", flexDirection: "row",
marginBottom: 4, marginBottom: 4,
components/pdftemplates/lpaQuestionnaire_pdf.js
+2
View File
@@ -152,6 +152,7 @@ export const lpaQuestionnaire_pdf = ({ docProps }) => {
<Image <Image
style={styles.logoImage} style={styles.logoImage}
src="public/assets/images/pedw_logo.png" src="public/assets/images/pedw_logo.png"
alt="PEDW Logo"
/> />
</View> </View>
@@ -1424,6 +1425,7 @@ export const lpaQuestionnaire_pdf = ({ docProps }) => {
values.filesList.map(function (p) { values.filesList.map(function (p) {
return ( return (
<View <View
key={p.name}
style={{ style={{
flexDirection: flexDirection:
"row", "row",
components/pdftemplates/other_pdf.js
+2
View File
@@ -141,6 +141,7 @@ export const other_pdf = ({ docProps }) => {
<Image <Image
style={styles.logoImage} style={styles.logoImage}
src="public/assets/images/pedw_logo.png" src="public/assets/images/pedw_logo.png"
alt="PEDW Logo"
/> />
</View> </View>
@@ -285,6 +286,7 @@ export const other_pdf = ({ docProps }) => {
values.filesList.map(function (p) { values.filesList.map(function (p) {
return ( return (
<View <View
key={p.name}
style={{ style={{
flexDirection: "row", flexDirection: "row",
marginBottom: 4, marginBottom: 4,
components/pdftemplates/planningappeals78_pdf.js
+2
View File
@@ -173,6 +173,7 @@ export const planningappeals78_pdf = ({ docProps }) => {
<Image <Image
style={styles.logoImage} style={styles.logoImage}
src="public/assets/images/pedw_logo.png" src="public/assets/images/pedw_logo.png"
alt="PEDW Logo"
/> />
</View> </View>
@@ -317,6 +318,7 @@ export const planningappeals78_pdf = ({ docProps }) => {
values.filesList.map(function (p) { values.filesList.map(function (p) {
return ( return (
<View <View
key={p.name}
style={{ style={{
flexDirection: "row", flexDirection: "row",
marginBottom: 4, marginBottom: 4,
components/pdftemplates/statement_pdf.js
+2
View File
@@ -137,6 +137,7 @@ export const statement_pdf = ({ docProps }) => {
<Image <Image
style={styles.logoImage} style={styles.logoImage}
src="public/assets/images/pedw_logo.png" src="public/assets/images/pedw_logo.png"
alt="PEDW Logo"
/> />
</View> </View>
@@ -278,6 +279,7 @@ export const statement_pdf = ({ docProps }) => {
values.filesList.map(function (p) { values.filesList.map(function (p) {
return ( return (
<View <View
key={p.name}
style={{ style={{
flexDirection: "row", flexDirection: "row",
marginBottom: 4, marginBottom: 4,
components/pdftemplates/writtenStatement_pdf.js
+2
View File
@@ -137,6 +137,7 @@ export const writtenStatement_pdf = ({ docProps }) => {
<Image <Image
style={styles.logoImage} style={styles.logoImage}
src="public/assets/images/pedw_logo.png" src="public/assets/images/pedw_logo.png"
alt="PEDW Logo"
/> />
</View> </View>
@@ -278,6 +279,7 @@ export const writtenStatement_pdf = ({ docProps }) => {
values.filesList.map(function (p) { values.filesList.map(function (p) {
return ( return (
<View <View
key={p.name}
style={{ style={{
flexDirection: "row", flexDirection: "row",
marginBottom: 4, marginBottom: 4,
components/search/advancedsearch.js
+2 -4
View File
@@ -275,8 +275,7 @@ let AdvancedSearch = (props) => {
label, label,
errormsg, errormsg,
}) => { }) => {
return ( return <>
<>
<div <div
className={ className={
touched && error touched && error
@@ -365,8 +364,7 @@ let AdvancedSearch = (props) => {
</select> </select>
</div> </div>
</div> </div>
</> </>;
);
}; };
// const [showSpinnerState, setShowSpinnerState] = useState(false); // const [showSpinnerState, setShowSpinnerState] = useState(false);
components/search/dnssearchresults.js
+3 -5
View File
@@ -356,8 +356,6 @@ const DNSSearchResults = (props) => {
: "") + : "") +
"/dnsdetails" "/dnsdetails"
} }
>
<a
className="govuk-link--no-underline" className="govuk-link--no-underline"
onClick={() => { onClick={() => {
setCurrentReference({ setCurrentReference({
@@ -371,8 +369,8 @@ const DNSSearchResults = (props) => {
item.pinswg_appealcasetype, item.pinswg_appealcasetype,
"showMap": showMap, "showMap": showMap,
}); });
}} }}>
>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"search:searchresults-case-reference-label" "search:searchresults-case-reference-label"
@@ -380,7 +378,7 @@ const DNSSearchResults = (props) => {
: :
</span> </span>
{item.title} {item.title}
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
components/search/searchresults.js
+27 -24
View File
@@ -86,27 +86,6 @@ const SearchResults = (props) => {
const cookies = parseCookies(); const cookies = parseCookies();
const selectWatchedCase = (loggedInUser, incidentID, appealType) => {
let updateBody = {
"pinswg_WatchedCase@odata.bind": "/incidents(" + incidentID + ")",
"pinswg_Contact@odata.bind": "/contacts(" + loggedInUser + ")",
"pinswg_appealcasetype": +appealType,
};
createWatchedCases(updateBody)
.then((data) => data)
.then(() => {
getWatchedCasesProxy(props.accountDetails.loggedinUserId).then(
(data) => {
setWatchedCases(data),
getDetails(data, "myWatchedCases").then((data) => {
setWatchedCasesDetails(data);
});
}
);
});
};
const isWatchedCase = (whichIncident) => { const isWatchedCase = (whichIncident) => {
let isWatched = jsonpath.query( let isWatched = jsonpath.query(
watchedCases, watchedCases,
@@ -298,8 +277,6 @@ const SearchResults = (props) => {
? "/myportal/case" ? "/myportal/case"
: "/case" : "/case"
} }
>
<a
className="govuk-link--no-underline" className="govuk-link--no-underline"
onClick={() => { onClick={() => {
setCurrentReference({ setCurrentReference({
@@ -321,7 +298,6 @@ const SearchResults = (props) => {
: :
</span> </span>
{item.title} {item.title}
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -687,6 +663,28 @@ const SearchResults = (props) => {
}; };
useEffect(() => { useEffect(() => {
const selectWatchedCase = (loggedInUser, incidentID, appealType) => {
let updateBody = {
"pinswg_WatchedCase@odata.bind":
"/incidents(" + incidentID + ")",
"pinswg_Contact@odata.bind": "/contacts(" + loggedInUser + ")",
"pinswg_appealcasetype": +appealType,
};
createWatchedCases(updateBody)
.then((data) => data)
.then(() => {
getWatchedCasesProxy(
props.accountDetails.loggedinUserId
).then((data) => {
setWatchedCases(data),
getDetails(data, "myWatchedCases").then((data) => {
setWatchedCasesDetails(data);
});
});
});
};
if (searchLoaded) { if (searchLoaded) {
if (selectedOption) { if (selectedOption) {
setShowSpinnerState(true); setShowSpinnerState(true);
@@ -724,7 +722,12 @@ const SearchResults = (props) => {
fieldSortState, fieldSortState,
orderByState, orderByState,
searchLoaded, searchLoaded,
loginToWatch,
setWatchedCases,
getSearchPageResults, getSearchPageResults,
setWatchedCasesDetails,
props.accountDetails.loggedinUserId,
router.query,
]); ]);
// console.log( // console.log(
// "page is here ", // "page is here ",
components/search/viewall.js
+4 -4
View File
@@ -14,12 +14,12 @@ export default function ViewAllResults(props) {
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 govuk-!-padding-left-2"> <dd className="govuk-summary-list__value govuk-!-font-size-16 govuk-!-padding-left-2">
<Link href={router.locale == "cy" ? "/achos" : "/case"}> <Link href={router.locale == "cy" ? "/achos" : "/case"}>
<a>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
Case Reference: Case Reference:
</span> </span>
{resultsArr[key].title} {resultsArr[key].title}
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
@@ -90,12 +90,12 @@ export default function ViewAllResults(props) {
: "/case" : "/case"
} }
> >
<a>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
Case Reference: Case Reference:
</span> </span>
{item.title} {item.title}
</a>
</Link> </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
components/searchresults.js
+3 -3
View File
@@ -58,12 +58,12 @@ export default function Search(props) {
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<div className="govuk-button-group"> <div className="govuk-button-group">
<Link href="/advancedsearch"> <Link href="/advancedsearch" className="govuk-button">
<a className="govuk-button">
{t( {t(
"search:searchresults-search-button-label" "search:searchresults-search-button-label"
)} )}
</a>
</Link> </Link>
{/* <a {/* <a
onClick={() => router.back()} onClick={() => router.back()}
components/viewall.js
+2 -2
View File
@@ -29,8 +29,8 @@ export default function ViewAll(props) {
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<div className="govuk-button-group"> <div className="govuk-button-group">
<Link href="/myportal"> <Link href="/myportal" className="govuk-button">
<a className="govuk-button">Back</a> Back
</Link> </Link>
</div> </div>
</div> </div>
package.json
+4 -4
View File
@@ -42,7 +42,7 @@
"multiparty": "^4.2.3", "multiparty": "^4.2.3",
"mysql": "^2.18.1", "mysql": "^2.18.1",
"nanoid": "^3.2.0", "nanoid": "^3.2.0",
"next": "^12.0.8", "next": "13.4",
"next-auth": "^4.22.1", "next-auth": "^4.22.1",
"next-connect": "^0.12.2", "next-connect": "^0.12.2",
"next-redux-wrapper": "^7.0.5", "next-redux-wrapper": "^7.0.5",
@@ -55,12 +55,12 @@
"path": "^0.12.7", "path": "^0.12.7",
"prop-types": "^15.8.1", "prop-types": "^15.8.1",
"raw-loader": "^4.0.2", "raw-loader": "^4.0.2",
"react": "17.0.2", "react": "^18.2.0",
"react-accessible-accordion": "^4.0.0", "react-accessible-accordion": "^4.0.0",
"react-autosuggest": "^10.1.0", "react-autosuggest": "^10.1.0",
"react-cookie-consent": "^7.2.1", "react-cookie-consent": "^7.2.1",
"react-datepicker": "4.10.0", "react-datepicker": "4.10.0",
"react-dom": "17.0.2", "react-dom": "^18.2.0",
"react-dropzone": "^11.5.1", "react-dropzone": "^11.5.1",
"react-idle-timer": "4.6.4", "react-idle-timer": "4.6.4",
"react-leaflet": "^3.2.5", "react-leaflet": "^3.2.5",
@@ -83,7 +83,7 @@
}, },
"devDependencies": { "devDependencies": {
"eslint": "^8.6.0", "eslint": "^8.6.0",
"eslint-config-next": "^13.1.6", "eslint-config-next": "^14.0.1",
"eslint-plugin-jsdoc": "^40.0.1", "eslint-plugin-jsdoc": "^40.0.1",
"prisma": "^5.0.0" "prisma": "^5.0.0"
} }
pages/404.js
+1 -1
View File
@@ -27,7 +27,7 @@ const FourOhFour = (props) => {
<div className="govuk-grid-column-two-thirds "> <div className="govuk-grid-column-two-thirds ">
<h1>{t("common:404-not-found-title")}</h1> <h1>{t("common:404-not-found-title")}</h1>
<Link href="/"> <Link href="/">
<a>{t("common:404-not-found-link")}</a> {t("common:404-not-found-link")}
</Link> </Link>
</div> </div>
</div> </div>
pages/_document.js
+12 -3
View File
@@ -3,6 +3,7 @@ import SkipLink from "../components/skiplink";
import { Tracking, TrackingNoScript } from "../components/tracking"; import { Tracking, TrackingNoScript } from "../components/tracking";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { setCookie } from "nookies"; import { setCookie } from "nookies";
import Script from "next/script";
class MyDocument extends Document { class MyDocument extends Document {
static async getInitialProps(ctx) { static async getInitialProps(ctx) {
@@ -64,11 +65,19 @@ class MyDocument extends Document {
{!process.browser && ( {!process.browser && (
<> <>
<script nonce={generatedNonce}> <script nonce={generatedNonce}>
window.switchDomain = `{process.env.I18N_DOMAIN} window.switchDomain = {process.env.I18N_DOMAIN}
`
</script> </script>
<script nonce={generatedNonce}> <script nonce={generatedNonce}>
window.apiRoot = `{process.env.API_ROOT}` window.apiRoot = {process.env.API_ROOT}
</script>
</>
)}
{typeof window !== "undefined" && (
<>
<div>hello</div>
<script nonce={generatedNonce}>
{`window.apiRoot = '${process.env.API_ROOT}'`}
</script> </script>
</> </>
)} )}
pages/api/email/index.js
-81
View File
@@ -1,81 +0,0 @@
import nodemailer from "nodemailer";
export default function handler(req, res) {
const { email, subject, emailcontenttitle, emailcontent } = req.body;
console.log(email);
//console.log(process.env);
const client = nodemailer.createTransport({
auth: {
user: process.env.EMAIL_SERVER_USER,
pass: process.env.EMAIL_SERVER_PASSWORD,
},
host: process.env.EMAIL_SERVER_HOST,
port: process.env.EMAIL_SERVER_PORT,
secure: true,
});
//console.log(client);
// Some simple styling options
const backgroundColor = "#ffffff";
const textColor = "#444444";
const mainBackgroundColor = "#ffffff";
const buttonBackgroundColor = "#aa1111";
const buttonBorderColor = "#aa1111";
const buttonTextColor = "#ffffff";
const headerBackgroundColor = "#000000";
const url = process.env.API_ROOT;
let emailBodyContent = ` <body style="background: ${backgroundColor};">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="center" style="padding: 10px 0px 20px 0px; font-size: 22px; font-family: Helvetica, Arial, sans-serif; color: #fff;background-color: ${headerBackgroundColor};border-bottom: 10px solid #ffd530;>
<strong>PEDW - Planning Casework</strong>
</td>
</tr>
</table>
<table width="100%" border="0" cellspacing="20" cellpadding="0" style="background: ${mainBackgroundColor}; max-width: 600px; margin: auto; border-radius: 10px;">
<tr>
<td align="left" style="padding: 10px 0px 0px 0px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; color: ${textColor};">
${emailcontenttitle}
</td>
<img src ="${url}/assets/images/planning-casework-en.svg"/>
</tr>
<tr>
<td align="left" style="padding: 10px 0px 0px 0px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; color: ${textColor};">
${emailcontent}
</td>
</tr>
<tr>
<td align="center" style="padding: 20px 0;">
</td>
</tr>
<tr>
<td align="center" style="padding: 0px 0px 10px 0px; font-size: 16px; line-height: 22px; font-family: Helvetica, Arial, sans-serif; color: ${textColor};">
If you did not request this email you can safely ignore it.
</td>
</tr>
</table>
</body>`;
const mailData = {
from: "no-reply@rdbdigital.com",
to: email,
subject: subject,
text: emailBodyContent,
html: emailBodyContent,
};
client.sendMail(mailData, (err, data) => {
if (err) {
console.log(err);
res.status(400);
} else {
console.log("mail sent");
res.status(200).json(data);
}
});
}
pages/auth/error.js
+1 -1
View File
@@ -58,7 +58,7 @@ const Error = (props) => {
</div> </div>
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-two-thirds govuk-body"> <div className="govuk-grid-column-two-thirds govuk-body">
<Link href="/"> <Link href="/" legacyBehavior>
{t("auth:auth-return-home-link-label")} {t("auth:auth-return-home-link-label")}
</Link> </Link>
</div> </div>
pages/auth/verify-request.js
+1 -1
View File
@@ -40,7 +40,7 @@ const SignIn = (props) => {
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-two-thirds govuk-body"> <div className="govuk-grid-column-two-thirds govuk-body">
{" "} {" "}
<Link href="/"> <Link href="/" legacyBehavior>
{t("auth:auth-return-home-link-label")} {t("auth:auth-return-home-link-label")}
</Link> </Link>
</div> </div>
pages/dns-not-found.js
+1 -1
View File
@@ -30,7 +30,7 @@ const FourOhFour = (props) => {
found found
</h1> </h1>
<Link href="/"> <Link href="/">
<a>{t("common:404-not-found-link")}</a> {t("common:404-not-found-link")}
</Link> </Link>
</div> </div>
</div> </div>
pages/dns/help.js
+17 -17
View File
@@ -42,8 +42,8 @@ const Home = (props) => {
contains the following: contains the following:
</p> </p>
<h2 className="govuk-heading-s"> <h2 className="govuk-heading-s">
<Link href="#"> <Link href="#" className="govuk-link">
<a className="govuk-link">Accessibility</a> Accessibility
</Link> </Link>
</h2> </h2>
<p> <p>
@@ -51,10 +51,10 @@ const Home = (props) => {
help using the site. help using the site.
</p> </p>
<h2 className="govuk-heading-s"> <h2 className="govuk-heading-s">
<Link href="#"> <Link href="#" className="govuk-link">
<a className="govuk-link">
Terms and conditions Terms and conditions
</a>
</Link> </Link>
</h2> </h2>
<p> <p>
@@ -62,8 +62,8 @@ const Home = (props) => {
site. site.
</p> </p>
<h2 className="govuk-heading-s"> <h2 className="govuk-heading-s">
<Link href="#"> <Link href="#" className="govuk-link">
<a className="govuk-link">Cookies</a> Cookies
</Link> </Link>
</h2> </h2>
<p> <p>
@@ -71,14 +71,14 @@ const Home = (props) => {
website uses them. website uses them.
</p> </p>
<h2 className="govuk-heading-s"> <h2 className="govuk-heading-s">
<Link href="#"> <Link href="#" className="govuk-link">
<a className="govuk-link">Privacy</a> Privacy
</Link> </Link>
</h2> </h2>
<p>View our Privacy Notice on GOV.UK.</p> <p>View our Privacy Notice on GOV.UK.</p>
<h2 className="govuk-heading-s"> <h2 className="govuk-heading-s">
<Link href="#"> <Link href="#" className="govuk-link">
<a className="govuk-link">Welsh language</a> Welsh language
</Link> </Link>
</h2> </h2>
<p> <p>
@@ -87,8 +87,8 @@ const Home = (props) => {
Scheme. Scheme.
</p> </p>
<h2 className="govuk-heading-s"> <h2 className="govuk-heading-s">
<Link href="#"> <Link href="#" className="govuk-link">
<a className="govuk-link">Sitemap</a> Sitemap
</Link> </Link>
</h2> </h2>
<p> <p>
@@ -96,16 +96,16 @@ const Home = (props) => {
heirarchy of the site. heirarchy of the site.
</p> </p>
<h2 className="govuk-heading-s"> <h2 className="govuk-heading-s">
<Link href="#"> <Link href="#" className="govuk-link">
<a className="govuk-link">Useful links</a> Useful links
</Link> </Link>
</h2> </h2>
<p> <p>
Links to other related websites and documents. Links to other related websites and documents.
</p> </p>
<h2 className="govuk-heading-s"> <h2 className="govuk-heading-s">
<Link href="#"> <Link href="#" className="govuk-link">
<a className="govuk-link">Contact</a> Contact
</Link> </Link>
</h2> </h2>
<p> <p>
pages/logout.js
+1 -1
View File
@@ -91,7 +91,7 @@ const LogOut = (props) => {
<div className="govuk-width-container"> <div className="govuk-width-container">
<h2>{t("common:logged-out-title")}</h2> <h2>{t("common:logged-out-title")}</h2>
<div className="govuk-!-margin-top-9 govuk-!-margin-bottom-9"> <div className="govuk-!-margin-top-9 govuk-!-margin-bottom-9">
<Link href={locale == "cy" ? "/cy" : "/"}> <Link href={locale == "cy" ? "/cy" : "/"} legacyBehavior>
{t("common:logged-out-link")} {t("common:logged-out-link")}
</Link> </Link>
</div> </div>
pages/myportal/error.js
+1 -1
View File
@@ -28,7 +28,7 @@ function Error({ statusCode }, props) {
A problem occured when trying to login A problem occured when trying to login
</p> </p>
<Link href="/"> <Link href="/">
<a>{t("common:404-not-found-link")}</a> {t("common:404-not-found-link")}
</Link> </Link>
</div> </div>
</div> </div>
pages/myportal/representation.js
+18 -21
View File
@@ -40,29 +40,26 @@ const Home = (props) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
useEffect(() => { // useEffect(() => {
const updateAccountStore = async () => { // const updateAccountStore = async () => {
const thisSession = await getSession(); // const thisSession = await getSession();
if (thisSession) { // if (thisSession) {
let [loggedInUser] = await Promise.all([ // let loggedInUser = await getPortalLogin(thisSession.user.email);
await getPortalLogin(thisSession.user.email), // dispatch(
]); // setAccountDetails(
// await getPersonalAccount(
// loggedInUser.value[0].contactid
// )
// )
// );
// dispatch(setContainerID(thisSession.user.id));
dispatch( // //dispatch(setRepresentationSubmit(true));
setAccountDetails( // }
await getPersonalAccount( // };
loggedInUser.value[0].contactid // updateAccountStore();
) // }, [dispatch]);
)
);
dispatch(setContainerID(thisSession.user.id));
//dispatch(setRepresentationSubmit(true));
}
};
updateAccountStore();
}, [dispatch]);
const { data: session, status } = useSession(); const { data: session, status } = useSession();
public/assets/javascript/govuk-frontend-3.13.0.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long