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
+56 -58
View File
@@ -95,65 +95,63 @@ 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"> <Field
<Field name="newpassword"
name="newpassword" id="newpassword"
id="newpassword" component={RenderTextfield}
component={RenderTextfield} type="password"
type="password" className="govuk-input govuk-input--width-20"
className="govuk-input govuk-input--width-20" validate={[required, minLength(6)]}
validate={[required, minLength(6)]} label="New password"
label="New password" />
/> <Field
<Field name="confirmpassword"
name="confirmpassword" id="confirmpassword"
id="confirmpassword" component={RenderTextfield}
component={RenderTextfield} type="password"
type="password" className="govuk-input govuk-input--width-20"
className="govuk-input govuk-input--width-20" validate={[required, passwordsMustMatch]}
validate={[required, passwordsMustMatch]} label="Confirm new password"
label="Confirm new password" />
/> </fieldset>
</fieldset>
<div className="govuk-button-group"> <div className="govuk-button-group">
<button <button
type="submit" type="submit"
className="govuk-button" className="govuk-button"
data-module="govuk-button" data-module="govuk-button"
> >
Continue Continue
</button> </button>
<Link <Link
href={ href={
"/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>
) : ( ) : (
<> <>
<p className="govuk-body"> <p className="govuk-body">
<Link <Link
href={ href={
"/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
+179 -181
View File
@@ -237,191 +237,189 @@ 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)}> <fieldset className="govuk-fieldset">
<fieldset className="govuk-fieldset"> <legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
<legend className="govuk-fieldset__legend govuk-fieldset__legend--m"> <h2 className="govuk-fieldset__heading">
<h2 className="govuk-fieldset__heading"> {t("account:account-about-you-label")}
{t("account:account-about-you-label")} </h2>
</h2> </legend>
</legend> <div className="govuk-form-group ">
<div className="govuk-form-group "> <span className="govuk-label ">
<span className="govuk-label "> {t("account:account-role-label")}:{" "}
{t("account:account-role-label")}:{" "} {
{ props.props.accountDetails
props.props.accountDetails .accountDetails[
.accountDetails[ "pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue"
"pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue" ]
]
}
</span>
</div>
<Field
name="pinswg_preferredlanguage"
component={RenderPickList}
datafieldname="pinswg_preferredlanguage"
optionsArr={["English", "Welsh"]}
className="govuk-input govuk-input--width-20 govuk-radios--inline"
validate={[required]}
label={t(
"account:account-preferred-language-label"
)}
errorMsg="Is required"
/>
<Field
name="firstname"
id="firstname"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
validate={[required]}
label={t("account:account-first-name-label")}
errorMsg="Is required"
/>
<Field
name="lastname"
id="lastname"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
validate={[required]}
label={t("account:account-last-name-label")}
errorMsg="Is required"
/>
<Field
name="emailaddress1"
id="emailaddress1"
component={RenderTextfield}
type="email"
className="govuk-input govuk-input--width-20"
validate={[required, email]}
label={t("account:account-email-address-label")}
disabled
/>
<Field
name="telephone1"
id="telephone1"
component={RenderTextfield}
type="number"
className="govuk-input govuk-input--width-20"
validate={[required, phoneNumber]}
label={t("account:account-telephone-label")}
/>
<Field
name="company"
id="company"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
label={t("account:account-company-group-label")}
errorMsg="Is required"
/>
</fieldset>
<fieldset className="govuk-fieldset">
<legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
<h2 className="govuk-fieldset__heading">
{t("account:account-your-address-label")}
</h2>
</legend>
<Field
name="address1_line1"
id="address1_line1"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
label={t(
"account:account-address-line-1-label"
)}
validate={[required]}
errorMsg="Is required"
/>
<Field
name="address1_line2"
id="address1_line2"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
label={t(
"account:account-address-line-2-label"
)}
errorMsg="Is required"
/>
<Field
name="address1_city"
id="address1_city"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-10"
label={t("account:account-town-city-label")}
validate={[required]}
errorMsg="Is required"
/>
<Field
name="address1_county"
id="address1_county"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-10"
label={t("account:account-county-label")}
validate={[required]}
errorMsg="Is required"
/>
<Field
name="address1_postalcode"
id="address1_postalcode"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-5"
label={t("account:account-postcode-label")}
validate={[required]}
errorMsg="Is required"
/>
</fieldset>
<div className="govuk-button-group">
<button
type="submit"
className="govuk-button"
data-module="govuk-button"
>
{t("common:continue-button")}
</button>
<Link
href={
"/myportal?q=" +
props.props.accountDetails.loggedinUserId
} }
> </span>
<a className="govuk-link">
{t("common:cancel-link")}
</a>
</Link>
</div> </div>
</form>
) : ( <Field
<> name="pinswg_preferredlanguage"
<BuildCheckPersonalDetails component={RenderPickList}
props={props} datafieldname="pinswg_preferredlanguage"
setPersonalDetailsComplete={ optionsArr={["English", "Welsh"]}
setPersonalDetailsComplete className="govuk-input govuk-input--width-20 govuk-radios--inline"
} validate={[required]}
setAccountUpdatedComplete={ label={t(
setAccountUpdatedComplete "account:account-preferred-language-label"
} )}
errorMsg="Is required"
/> />
</>
) <Field
name="firstname"
id="firstname"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
validate={[required]}
label={t("account:account-first-name-label")}
errorMsg="Is required"
/>
<Field
name="lastname"
id="lastname"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
validate={[required]}
label={t("account:account-last-name-label")}
errorMsg="Is required"
/>
<Field
name="emailaddress1"
id="emailaddress1"
component={RenderTextfield}
type="email"
className="govuk-input govuk-input--width-20"
validate={[required, email]}
label={t("account:account-email-address-label")}
disabled
/>
<Field
name="telephone1"
id="telephone1"
component={RenderTextfield}
type="number"
className="govuk-input govuk-input--width-20"
validate={[required, phoneNumber]}
label={t("account:account-telephone-label")}
/>
<Field
name="company"
id="company"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
label={t("account:account-company-group-label")}
errorMsg="Is required"
/>
</fieldset>
<fieldset className="govuk-fieldset">
<legend className="govuk-fieldset__legend govuk-fieldset__legend--m">
<h2 className="govuk-fieldset__heading">
{t("account:account-your-address-label")}
</h2>
</legend>
<Field
name="address1_line1"
id="address1_line1"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
label={t(
"account:account-address-line-1-label"
)}
validate={[required]}
errorMsg="Is required"
/>
<Field
name="address1_line2"
id="address1_line2"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
label={t(
"account:account-address-line-2-label"
)}
errorMsg="Is required"
/>
<Field
name="address1_city"
id="address1_city"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-10"
label={t("account:account-town-city-label")}
validate={[required]}
errorMsg="Is required"
/>
<Field
name="address1_county"
id="address1_county"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-10"
label={t("account:account-county-label")}
validate={[required]}
errorMsg="Is required"
/>
<Field
name="address1_postalcode"
id="address1_postalcode"
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-5"
label={t("account:account-postcode-label")}
validate={[required]}
errorMsg="Is required"
/>
</fieldset>
<div className="govuk-button-group">
<button
type="submit"
className="govuk-button"
data-module="govuk-button"
>
{t("common:continue-button")}
</button>
<Link
href={
"/myportal?q=" +
props.props.accountDetails.loggedinUserId
}
className="govuk-link">
{t("common:cancel-link")}
</Link>
</div>
</form>
) : ( ) : (
<PersonalDetailsComplete props={props} /> <>
)} <BuildCheckPersonalDetails
</> props={props}
); setPersonalDetailsComplete={
setPersonalDetailsComplete
}
setAccountUpdatedComplete={
setAccountUpdatedComplete
}
/>
</>
)
) : (
<PersonalDetailsComplete props={props} />
)}
</>;
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
components/account/personaldetailsCheck.js
+318 -320
View File
@@ -31,327 +31,325 @@ 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> <dl className="govuk-summary-list govuk-!-margin-bottom-9">
<dl className="govuk-summary-list govuk-!-margin-bottom-9"> <div className="govuk-summary-list__row">
<div className="govuk-summary-list__row"> <dt className="govuk-summary-list__key">
<dt className="govuk-summary-list__key"> {t("account:account-first-name-label")}
{t("account:account-first-name-label")} </dt>
</dt> <dd className="govuk-summary-list__value">
<dd className="govuk-summary-list__value"> {
{ props.props.props.form.personalDetailsForm.values
props.props.props.form.personalDetailsForm.values .firstname
.firstname }
} </dd>
</dd> <dd className="govuk-summary-list__actions">
<dd className="govuk-summary-list__actions"> <a
<a className="govuk-link"
className="govuk-link" href="#firstname"
href="#firstname" onClick={() => {
onClick={() => { setPersonalDetailsComplete(false);
setPersonalDetailsComplete(false); }}
}} >
> {t("common:change-link-label")}
{t("common:change-link-label")} <span className="govuk-visually-hidden">
<span className="govuk-visually-hidden"> {t("account:account-first-name-label")}{" "}
{t("account:account-first-name-label")}{" "} </span>
</span> </a>
</a> </dd>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-last-name-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.lastname
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#lastname"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-last-name-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-email-address-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.emailaddress1
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#emailaddress1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-email-address-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-telephone-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.telephone1
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#telephone1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{t("account:account-telephone-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-company-group-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.company
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#company"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-company-group-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-preferred-language-label")}
</dt>
<dd className="govuk-summary-list__value">
{getPreferredLanguageLabel(
props.props.props.form.personalDetailsForm.values
.pinswg_preferredlanguage
)}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#company"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-preferred-language-label")}
</span>
</a>
</dd>
</div>
</dl>
<h2 className="govuk-heading-m">
{" "}
{t("account:account-your-address-label")}
</h2>
<dl className="govuk-summary-list govuk-!-margin-bottom-9">
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-address-line-1-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_line1
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_line1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-address-line-1-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-address-line-2-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_line2
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_line2"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-address-line-2-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-town-city-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_city
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_city"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-town-city-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-county-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_county
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_county"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-county-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-postcode-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_postalcode
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_postalcode"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-postcode-label")}
</span>
</a>
</dd>
</div>
</dl>
<div className="govuk-button-group">
<button
type="submit"
className="govuk-button"
data-module="govuk-button"
onClick={() => {
setAccountUpdatedComplete(true);
}}
>
{t("common:continue-button")}
</button>
<Link
href={"/myportal?q=" + props.accountDetails.loggedinUserId}
>
<a className="govuk-link"> {t("common:back-link")}</a>
</Link>
</div> </div>
</> <div className="govuk-summary-list__row">
); <dt className="govuk-summary-list__key">
{" "}
{t("account:account-last-name-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.lastname
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#lastname"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-last-name-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-email-address-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.emailaddress1
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#emailaddress1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-email-address-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-telephone-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.telephone1
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#telephone1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{t("account:account-telephone-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-company-group-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.company
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#company"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-company-group-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-preferred-language-label")}
</dt>
<dd className="govuk-summary-list__value">
{getPreferredLanguageLabel(
props.props.props.form.personalDetailsForm.values
.pinswg_preferredlanguage
)}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#company"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-preferred-language-label")}
</span>
</a>
</dd>
</div>
</dl>
<h2 className="govuk-heading-m">
{" "}
{t("account:account-your-address-label")}
</h2>
<dl className="govuk-summary-list govuk-!-margin-bottom-9">
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-address-line-1-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_line1
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_line1"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-address-line-1-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-address-line-2-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_line2
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_line2"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-address-line-2-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("account:account-town-city-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_city
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_city"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-town-city-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-county-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_county
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_county"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-county-label")}
</span>
</a>
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{" "}
{t("account:account-postcode-label")}
</dt>
<dd className="govuk-summary-list__value">
{
props.props.props.form.personalDetailsForm.values
.address1_postalcode
}
</dd>
<dd className="govuk-summary-list__actions">
<a
className="govuk-link"
href="#address1_postalcode"
onClick={() => {
setPersonalDetailsComplete(false);
}}
>
{t("common:change-link-label")}
<span className="govuk-visually-hidden">
{" "}
{t("account:account-postcode-label")}
</span>
</a>
</dd>
</div>
</dl>
<div className="govuk-button-group">
<button
type="submit"
className="govuk-button"
data-module="govuk-button"
onClick={() => {
setAccountUpdatedComplete(true);
}}
>
{t("common:continue-button")}
</button>
<Link
href={"/myportal?q=" + props.accountDetails.loggedinUserId}
className="govuk-link">
{t("common:back-link")}
</Link>
</div>
</>;
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
components/account/personaldetailsComplete.js
+14 -16
View File
@@ -40,24 +40,22 @@ 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>
<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
+25 -25
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,33 +95,33 @@ 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(),
window.localStorage.clear(), window.localStorage.clear(),
destroyCookie( destroyCookie(
null, null,
"next-auth.csrf-token" "next-auth.csrf-token"
), ),
destroyCookie( destroyCookie(
null, null,
"next-auth.callback-url" "next-auth.callback-url"
), ),
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
+816 -820
View File
File diff suppressed because it is too large Load Diff
components/case/documents.js
+69 -78
View File
@@ -204,8 +204,8 @@ const DocumentDetails = (props) => {
</button> </button>
</dd> </dd>
{/* <dd className="govuk-summary-list__key govuk-!-font-size-16"> {/* <dd className="govuk-summary-list__key govuk-!-font-size-16">
{t("case:documents-size-label")} {t("case:documents-size-label")}
</dd> */} </dd> */}
</div> </div>
{showSpinnerState == true ? ( {showSpinnerState == true ? (
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -240,41 +240,33 @@ const DocumentDetails = (props) => {
{showDownloadingState === key && ( {showDownloadingState === key && (
<div className="coverLoadingLink downloading"> <div className="coverLoadingLink downloading">
{/* <img {/* <img
className="data-loading-icon" className="data-loading-icon"
src="/assets/images/loading.gif" src="/assets/images/loading.gif"
alt={ alt={
router.locale == router.locale ==
"cy" "cy"
? "Nôl data" ? "Nôl data"
: "Fetching data" : "Fetching data"
} }
/> */} /> */}
</div> </div>
)} )}
<Link <Link
scroll={false} scroll={false}
href={detailsObj.pinswg_hashlink} href={detailsObj.pinswg_hashlink}
key={key}
onClick={() => {
toggleDownLoadLink(key);
}}
> >
<a <span className="results-visually-hidden">
key={key} {t("case:documents-name-label")}
onClick={() => { :
toggleDownLoadLink(key); </span>
}} {_.has(detailsObj, "pinswg_name")
> ? detailsObj.pinswg_name
<span className="results-visually-hidden"> : ""}
{t(
"case:documents-name-label"
)}
:
</span>
{_.has(
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">
@@ -317,11 +309,11 @@ const DocumentDetails = (props) => {
: ""} : ""}
</dd> </dd>
{/* <dd className="govuk-summary-list__value govuk-!-font-size-16"> {/* <dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t("case:documents-size-label")}: {t("case:documents-size-label")}:
</span> </span>
92 92
</dd> */} </dd> */}
</div> </div>
); );
}) })
@@ -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
+7 -7
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
+103 -106
View File
@@ -871,119 +871,116 @@ 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) => { const renamedAcceptedFiles = filesToUpload.map(
const renamedAcceptedFiles = filesToUpload.map( (file) =>
(file) => new File([file], `${file.name}`, {
new File([file], `${file.name}`, { type: file.type,
type: file.type, })
}) );
); field.input.onChange(renamedAcceptedFiles);
field.input.onChange(renamedAcceptedFiles); }}
}} >
> {({ getRootProps, getInputProps }) => (
{({ getRootProps, getInputProps }) => ( <>
<> {/* {field.hint != false && (
{/* {field.hint != false && ( <div className="govuk-hint">ss{t(field.hint)}</div>
<div className="govuk-hint">ss{t(field.hint)}</div> )}
)} <div className="govuk-form-group"></div> */}
<div className="govuk-form-group"></div> */} <section className="container">
<section className="container"> <div {...getRootProps({ style })}>
<div {...getRootProps({ style })}> {" "}
{" "} <input id={field.id} {...getInputProps()} />
<input id={field.id} {...getInputProps()} /> <div>
<div> {t(
{t( "newappeal:new-appeal-fileupload-drop-label"
"newappeal:new-appeal-fileupload-drop-label" )}
)}
</div>
<em>
(
{t(
"newappeal:new-appeal-fileupload-file-list-label"
)}
)
</em>
</div> </div>
<aside>{thumbs}</aside> <em>
</section> (
</> {t(
)} "newappeal:new-appeal-fileupload-file-list-label"
</Dropzone> )}
{field.meta.touched && field.meta.error && ( )
<span className="error">{field.meta.error}</span> </em>
)}
{files && Array.isArray(files) && (
<ul>
{files.map((file, i) => (
<div
key={file.name}
className="govuk-!-margin-bottom-5 fileThumb"
>
<img
src={getThumbnailIcon(file, file.type)}
alt={file.name}
width="50"
/>
<span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
{file.name} ({bytesToSize(file.size)})
</span>
</div> </div>
))} <aside>{thumbs}</aside>
</ul> </section>
</>
)} )}
{blobList.map((blob, i) => ( </Dropzone>
<div {field.meta.touched && field.meta.error && (
key={blob.name + "_" + i} <span className="error">{field.meta.error}</span>
className="govuk-!-margin-bottom-5 fileThumb govuk-!-margin-top-5" )}
> {files && Array.isArray(files) && (
<div className=""> <ul>
<span {files.map((file, i) => (
className="govuk-summary-list__actionLink watched_link govuk-!-margin-right-5 govuk-!-text-align-left" <div
onClick={() => { key={file.name}
deleteThisBlob( className="govuk-!-margin-bottom-5 fileThumb"
field.containerID, >
blob.name, <img
blob.hasheddeletepath, src={getThumbnailIcon(file, file.type)}
blob.hashgetblobs, alt={file.name}
field.ticketnumber width="50"
); />
}} <span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
title="Remove this file" {file.name} ({bytesToSize(file.size)})
>
&minus;
</span> </span>
</div> </div>
<img ))}
src={getThumbnailIconByExtension(blob.name)} </ul>
alt={blob.name} )}
width="50" {blobList.map((blob, i) => (
/> <div
key={blob.name + "_" + i}
<Link className="govuk-!-margin-bottom-5 fileThumb govuk-!-margin-top-5"
key={i} >
scroll={false} <div className="">
href={ <span
"/api/file/downloadblob?container=" + className="govuk-summary-list__actionLink watched_link govuk-!-margin-right-5 govuk-!-text-align-left"
field.containerID + onClick={() => {
"&casefolderID=" + deleteThisBlob(
field.ticketnumber + field.containerID,
"&blobname=" + blob.name,
blob.name + blob.hasheddeletepath,
blob.hashedfilepath blob.hashgetblobs,
} field.ticketnumber
);
}}
title="Remove this file"
> >
<a className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link"> &minus;
{blob.name} ({bytesToSize(blob.contentLength)}) </span>
</a>
</Link>
</div> </div>
))}{" "} <img
</> src={getThumbnailIconByExtension(blob.name)}
); alt={blob.name}
width="50"
/>
<Link
key={i}
scroll={false}
href={
"/api/file/downloadblob?container=" +
field.containerID +
"&casefolderID=" +
field.ticketnumber +
"&blobname=" +
blob.name +
blob.hashedfilepath
}
className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link">
{blob.name}({bytesToSize(blob.contentLength)})
</Link>
</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
+16 -15
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"
{t( className="govuk-button"
"case:summary-make-representation-label" >
)} {t(
</a> "case:summary-make-representation-label"
)}
</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
+10 -10
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
+87 -89
View File
@@ -36,104 +36,102 @@ const CookieBanner = () => {
setBannerVisible(false); setBannerVisible(false);
}; };
return ( return <>
<> {bannerVisible ? (
{bannerVisible ? ( <CookieConsent
<CookieConsent style={{
style={{ position: "inherit",
position: "inherit", background: "#eeeeee",
background: "#eeeeee", display: "block",
display: "block", }}
}} containerClasses="app-cookie-banner"
containerClasses="app-cookie-banner" buttonClasses="cookies-banner__button"
buttonClasses="cookies-banner__button" buttonWrapperClasses="govuk-width-container consentBanner hidden"
buttonWrapperClasses="govuk-width-container consentBanner hidden" declineButtonClasses="cookies-banner__button"
declineButtonClasses="cookies-banner__button" buttonText={t("common:cookie-banner-accept")}
buttonText={t("common:cookie-banner-accept")} declineButtonText={t("common:cookie-banner-decline")}
declineButtonText={t("common:cookie-banner-decline")} disableStyles={true}
disableStyles={true} enableDeclineButton={true}
enableDeclineButton={true} flipButtons={true}
flipButtons={true} hideOnAccept={true}
hideOnAccept={true} cookieName="planning_casework"
cookieName="planning_casework" >
> <div className="app-cookie-banner">
<div className="app-cookie-banner"> <div
<div id="global-cookie-message"
id="global-cookie-message" className="govuk-clearfix"
className="govuk-clearfix" data-module="cookie-banner"
data-module="cookie-banner" role="region"
role="region" aria-label="cookie banner"
aria-label="cookie banner" data-nosnippet=""
data-nosnippet="" >
> <div className="govuk-width-container">
<div className="govuk-width-container"> <div className="govuk-grid-row">
<div className="govuk-grid-row"> <div className="govuk-grid-column-two-thirds">
<div className="govuk-grid-column-two-thirds"> <div className="">
<div className=""> <p className="cookies-banner__description">
<p className="cookies-banner__description"> {t(
"common:cookie-banner-line-1"
)}
</p>
<ul className="cookies-banner__description">
<li>
{" "}
{t( {t(
"common:cookie-banner-line-1" "common:cookie-banner-list-item-1"
)} )}
</p> </li>
<ul className="cookies-banner__description"> </ul>
<li> <p className="cookies-banner__description">
{" "} {t(
{t( "common:cookie-banner-line-2"
"common:cookie-banner-list-item-1" )}
)} </p>
</li> <ul className="cookies-banner__description">
</ul> <li>
<p className="cookies-banner__description">
{t( {t(
"common:cookie-banner-line-2" "common:cookie-banner-list-item-2"
)} )}
</p> </li>
<ul className="cookies-banner__description"> <li>
<li> {t(
{t( "common:cookie-banner-list-item-3"
"common:cookie-banner-list-item-2" )}
)} </li>
</li> </ul>
<li>
{t(
"common:cookie-banner-list-item-3"
)}
</li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div className="govuk-width-container consentBannerShow">
<button
className="cookies-banner__button"
id="rcc-confirm-button"
aria-label="Accept cookies"
onClick={() => {
accept();
}}
>
{t("common:cookie-banner-accept")}
</button>
<Link href="/help/cookies">
<a
className="cookies-banner__button govuk-link--no-underline"
id="rcc-decline-button"
aria-label="Decline cookies"
>
{t("common:cookie-banner-change-settings")}
</a>
</Link>
</div>
</div> </div>
</CookieConsent> <div className="govuk-width-container consentBannerShow">
) : ( <button
"" className="cookies-banner__button"
)} id="rcc-confirm-button"
</> aria-label="Accept cookies"
); onClick={() => {
accept();
}}
>
{t("common:cookie-banner-accept")}
</button>
<Link
href="/help/cookies"
className="cookies-banner__button govuk-link--no-underline"
id="rcc-decline-button"
aria-label="Decline cookies">
{t("common:cookie-banner-change-settings")}
</Link>
</div>
</div>
</CookieConsent>
) : (
""
)}
</>;
}; };
export default CookieBanner; export default CookieBanner;
components/cookiemanager/index.js
+6 -6
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
+4 -4
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
+445 -463
View File
@@ -9,505 +9,487 @@ 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"> <label className="govuk-label-s " htmlFor="sort">
<label className="govuk-label-s " htmlFor="sort"> {t("dnsCommon:result-list-show-label")}{" "}
{t("dnsCommon:result-list-show-label")}{" "} <select
<select className="govuk-select"
className="govuk-select" id="showNo"
id="showNo" name="showNo"
name="showNo" >
> <option value="1">10</option>
<option value="1">10</option> <option value="1">25</option>
<option value="1">25</option> <option value="1">50</option>
<option value="1">50</option> <option value="1">100</option>
<option value="1">100</option> </select>{" "}
</select>{" "} {t("dnsCommon:result-list-entries-label")}
{t("dnsCommon:result-list-entries-label")} </label>
</label> </div>
</div>
</div>
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<p className="govuk-body-s">
{t("dnsCommon:result-list-showing-label", {
recordIndex: "1",
pagingIndex: "10",
totalRecords: "55",
})}
</p>
</div>
</div>
<div className="govuk-grid-row ">
<div className="govuk-grid-column-full">
<dl className="govuk-summary-list govuk-!-margin-bottom-0 results">
<div className="govuk-summary-list__row results-headings">
<dd className="govuk-summary-list__key govuk-!-font-size-16 results_wider ">
{t(
"dnsApplications:result-list-heading-label-reference"
)}
</dd>
<dd className="govuk-summary-list__key govuk-!-font-size-16">
{t(
"dnsApplications:result-list-heading-label-application"
)}
</dd>
<dd className="govuk-summary-list__key govuk-!-font-size-16">
{t(
"dnsApplications:result-list-heading-label-developer"
)}
</dd>
<dd className="govuk-summary-list__key govuk-!-font-size-16">
{t(
"dnsApplications:result-list-heading-label-type"
)}
</dd>
<dd className="govuk-summary-list__key govuk-!-font-size-16">
{t(
"dnsApplications:result-list-heading-label-status"
)}
</dd>
</div> </div>
</div> <div className="govuk-summary-list__row">
</div> <dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<div className="govuk-grid-row"> <span className="results-visually-hidden">
<div className="govuk-grid-column-full">
<p className="govuk-body-s">
{t("dnsCommon:result-list-showing-label", {
recordIndex: "1",
pagingIndex: "10",
totalRecords: "55",
})}
</p>
</div>
</div>
<div className="govuk-grid-row ">
<div className="govuk-grid-column-full">
<dl className="govuk-summary-list govuk-!-margin-bottom-0 results">
<div className="govuk-summary-list__row results-headings">
<dd className="govuk-summary-list__key govuk-!-font-size-16 results_wider ">
{t( {t(
"dnsApplications:result-list-heading-label-reference" "dnsApplications:result-list-heading-label-reference"
)} )}
</dd> :
<dd className="govuk-summary-list__key govuk-!-font-size-16"> </span>
{t( CAS-00009-W8N6W4
"dnsApplications:result-list-heading-label-application" </dd>
)} <dd className="govuk-summary-list__value govuk-!-font-size-16">
</dd> <Link href="/dns/application-view">
<dd className="govuk-summary-list__key govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>TWA - Morlais Demonstration Zone
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-developer" "dnsApplications:result-list-heading-label-developer"
)} )}
</dd> :
<dd className="govuk-summary-list__key govuk-!-font-size-16"> </span>
Menter Mon
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-type" "dnsApplications:result-list-heading-label-type"
)} )}
</dd> :
<dd className="govuk-summary-list__key govuk-!-font-size-16"> </span>
Energy
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-status" "dnsApplications:result-list-heading-label-status"
)} )}
</dd> :
</div> </span>
<div className="govuk-summary-list__row"> Recommendation
<dd className="govuk-summary-list__value govuk-!-font-size-16 "> </dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-reference"
)}
:
</span>
CAS-00009-W8N6W4
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-reference" "dnsApplications:result-list-heading-label-application"
)} )}
: :{" "}
</span> </span>TWA - Morlais Demonstration Zone
CAS-00009-W8N6W4 </Link>
</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"> <span className="results-visually-hidden">
<a> {t(
<span className="results-visually-hidden"> "dnsApplications:result-list-heading-label-developer"
{t( )}
"dnsApplications:result-list-heading-label-application" :
)} </span>
:{" "} Menter Mon
</span> </dd>
TWA - Morlais Demonstration Zone <dd className="govuk-summary-list__value govuk-!-font-size-16">
</a> <span className="results-visually-hidden">
</Link> {t(
</dd> "dnsApplications:result-list-heading-label-type"
<dd className="govuk-summary-list__value govuk-!-font-size-16"> )}
:
</span>
Energy
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-status"
)}
:
</span>
Recommendation
</dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-reference"
)}
:
</span>
CAS-00009-W8N6W4
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-developer" "dnsApplications:result-list-heading-label-application"
)} )}
: :{" "}
</span> </span>TWA - Morlais Demonstration Zone
Menter Mon </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-developer"
)}
:
</span>
Menter Mon
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-type"
)}
:
</span>
Energy
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-status"
)}
:
</span>
Recommendation
</dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-reference"
)}
:
</span>
CAS-00009-W8N6W4
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-type" "dnsApplications:result-list-heading-label-application"
)} )}
: :{" "}
</span> </span>TWA - Morlais Demonstration Zone
Energy </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-developer"
)}
:
</span>
Menter Mon
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-type"
)}
:
</span>
Energy
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-status"
)}
:
</span>
Recommendation
</dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-reference"
)}
:
</span>
CAS-00009-W8N6W4
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-status" "dnsApplications:result-list-heading-label-application"
)} )}
: :{" "}
</span> </span>TWA - Morlais Demonstration Zone
Recommendation </Link>
</dd> </dd>
</div> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<div className="govuk-summary-list__row"> <span className="results-visually-hidden">
<dd className="govuk-summary-list__value govuk-!-font-size-16 "> {t(
"dnsApplications:result-list-heading-label-developer"
)}
:
</span>
Menter Mon
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-type"
)}
:
</span>
Energy
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-status"
)}
:
</span>
Recommendation
</dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-reference"
)}
:
</span>
CAS-00009-W8N6W4
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-reference" "dnsApplications:result-list-heading-label-application"
)} )}
: :{" "}
</span> </span>TWA - Morlais Demonstration Zone
CAS-00009-W8N6W4 </Link>
</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"> <span className="results-visually-hidden">
<a> {t(
<span className="results-visually-hidden"> "dnsApplications:result-list-heading-label-developer"
{t( )}
"dnsApplications:result-list-heading-label-application" :
)} </span>
:{" "} Menter Mon
</span> </dd>
TWA - Morlais Demonstration Zone <dd className="govuk-summary-list__value govuk-!-font-size-16">
</a> <span className="results-visually-hidden">
</Link> {t(
</dd> "dnsApplications:result-list-heading-label-type"
<dd className="govuk-summary-list__value govuk-!-font-size-16"> )}
:
</span>
Energy
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-status"
)}
:
</span>
Recommendation
</dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-reference"
)}
:
</span>
CAS-00009-W8N6W4
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-developer" "dnsApplications:result-list-heading-label-application"
)} )}
: :{" "}
</span> </span>TWA - Morlais Demonstration Zone
Menter Mon </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-developer"
)}
:
</span>
Menter Mon
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-type"
)}
:
</span>
Energy
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-status"
)}
:
</span>
Recommendation
</dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-reference"
)}
:
</span>
CAS-00009-W8N6W4
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-type" "dnsApplications:result-list-heading-label-application"
)} )}
: :{" "}
</span> </span>TWA - Morlais Demonstration Zone
Energy </Link>
</dd> </dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16"> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden"> <span className="results-visually-hidden">
{t( {t(
"dnsApplications:result-list-heading-label-status" "dnsApplications:result-list-heading-label-developer"
)} )}
: :
</span> </span>
Recommendation Menter Mon
</dd> </dd>
</div> <dd className="govuk-summary-list__value govuk-!-font-size-16">
<div className="govuk-summary-list__row"> <span className="results-visually-hidden">
<dd className="govuk-summary-list__value govuk-!-font-size-16 "> {t(
<span className="results-visually-hidden"> "dnsApplications:result-list-heading-label-type"
{t( )}
"dnsApplications:result-list-heading-label-reference" :
)} </span>
: Energy
</span> </dd>
CAS-00009-W8N6W4 <dd className="govuk-summary-list__value govuk-!-font-size-16">
</dd> <span className="results-visually-hidden">
<dd className="govuk-summary-list__value govuk-!-font-size-16"> {t(
<Link href="/dns/application-view"> "dnsApplications:result-list-heading-label-status"
<a> )}
<span className="results-visually-hidden"> :
{t( </span>
"dnsApplications:result-list-heading-label-application" Recommendation
)} </dd>
:{" "} </div>
</span> </dl>
TWA - Morlais Demonstration Zone
</a>
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-developer"
)}
:
</span>
Menter Mon
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-type"
)}
:
</span>
Energy
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-status"
)}
:
</span>
Recommendation
</dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-reference"
)}
:
</span>
CAS-00009-W8N6W4
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<a>
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>
TWA - Morlais Demonstration Zone
</a>
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-developer"
)}
:
</span>
Menter Mon
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-type"
)}
:
</span>
Energy
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-status"
)}
:
</span>
Recommendation
</dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-reference"
)}
:
</span>
CAS-00009-W8N6W4
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<a>
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>
TWA - Morlais Demonstration Zone
</a>
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-developer"
)}
:
</span>
Menter Mon
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-type"
)}
:
</span>
Energy
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-status"
)}
:
</span>
Recommendation
</dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-reference"
)}
:
</span>
CAS-00009-W8N6W4
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<a>
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>
TWA - Morlais Demonstration Zone
</a>
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-developer"
)}
:
</span>
Menter Mon
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-type"
)}
:
</span>
Energy
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-status"
)}
:
</span>
Recommendation
</dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-reference"
)}
:
</span>
CAS-00009-W8N6W4
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<a>
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>
TWA - Morlais Demonstration Zone
</a>
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-developer"
)}
:
</span>
Menter Mon
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-type"
)}
:
</span>
Energy
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-status"
)}
:
</span>
Recommendation
</dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-reference"
)}
:
</span>
CAS-00009-W8N6W4
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<Link href="/dns/application-view">
<a>
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-application"
)}
:{" "}
</span>
TWA - Morlais Demonstration Zone
</a>
</Link>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-developer"
)}
:
</span>
Menter Mon
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-type"
)}
:
</span>
Energy
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"dnsApplications:result-list-heading-label-status"
)}
:
</span>
Recommendation
</dd>
</div>
</dl>
</div>
</div> </div>
<div className="govuk-grid-row "> </div>
<div className="govuk-grid-column-full"> <div className="govuk-grid-row ">
<p> <div className="govuk-grid-column-full">
{t("dnsCommon:result-list-previous-label")}{" "} <p>
<span>1</span>{" "} {t("dnsCommon:result-list-previous-label")}{" "}
<span> <span>1</span>{" "}
<Link href="#">2</Link> <span>
</span>{" "} <Link href="#">2</Link>
<span> </span>{" "}
<Link href="#">3</Link> <span>
</span>{" "} <Link href="#">3</Link>
<span> </span>{" "}
<Link href="#">4</Link> <span>
</span>{" "} <Link href="#">4</Link>
<span> </span>{" "}
<Link href="#">5</Link> <span>
</span>{" "} <Link href="#">5</Link>
<Link href="#"> </span>{" "}
{t("dnsCommon:result-list-next-label")} <Link href="#" legacyBehavior>
</Link> {t("dnsCommon:result-list-next-label")}
</p> </Link>
</div> </p>
</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
+10 -8
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"
{t("dnsHome:links-help-title")} className="govuk-link govuk-link--no-underline ">
</a>
{t("dnsHome:links-help-title")}
</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
+4 -4
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
+110 -114
View File
@@ -1431,125 +1431,121 @@ 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) => { const renamedAcceptedFiles = filesToUpload.map(
const renamedAcceptedFiles = filesToUpload.map( (file) =>
(file) => new File(
new File( [file],
[file], `${getDocumentType(field.documentTypeCode)}_${
`${getDocumentType(field.documentTypeCode)}_${ file.name
file.name }`,
}`, {
{ type: file.type,
type: file.type, }
} )
) );
); field.input.onChange(renamedAcceptedFiles);
field.input.onChange(renamedAcceptedFiles); }}
}} >
> {({ getRootProps, getInputProps }) => (
{({ getRootProps, getInputProps }) => ( <>
<> {/* {field.hint != false && (
{/* {field.hint != false && ( <div className="govuk-hint">ss{t(field.hint)}</div>
<div className="govuk-hint">ss{t(field.hint)}</div> )}
)} <div className="govuk-form-group"></div> */}
<div className="govuk-form-group"></div> */} <section className="container">
<section className="container"> <div {...getRootProps({ style })}>
<div {...getRootProps({ style })}> {" "}
{" "} <input id={field.id} {...getInputProps()} />
<input id={field.id} {...getInputProps()} /> <div>
<div> {t(
{t( "newappeal:new-appeal-fileupload-drop-label"
"newappeal:new-appeal-fileupload-drop-label" )}
)}
</div>
<em>
(
{t(
"newappeal:new-appeal-fileupload-file-list-label"
)}
)
</em>
</div> </div>
<aside>{thumbs}</aside> <em>
</section> (
</> {t(
)} "newappeal:new-appeal-fileupload-file-list-label"
</Dropzone> )}
{field.meta.touched && field.meta.error && ( )
<span className="error">{field.meta.error}</span> </em>
)}
{files && Array.isArray(files) && (
<ul>
{files.map((file, i) => (
<div
key={file.name}
className="govuk-!-margin-bottom-5 fileThumb"
>
<img
src={getThumbnailIcon(file, file.type)}
alt={file.name}
width="50"
/>
<span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
{/* {file.name.slice(file.name.indexOf("_") + 1)} ( */}{" "}
{file.name}( ({bytesToSize(file.size)})
</span>
</div> </div>
))} <aside>{thumbs}</aside>
</ul> </section>
</>
)} )}
{blobList.map((blob, i) => ( </Dropzone>
<div {field.meta.touched && field.meta.error && (
key={blob.name + "_" + i} <span className="error">{field.meta.error}</span>
className="govuk-!-margin-bottom-5 fileThumb govuk-!-margin-top-5" )}
> {files && Array.isArray(files) && (
<div className=""> <ul>
<span {files.map((file, i) => (
className="govuk-summary-list__actionLink watched_link govuk-!-margin-right-5 govuk-!-text-align-left" <div
onClick={() => { key={file.name}
deleteThisBlob( className="govuk-!-margin-bottom-5 fileThumb"
field.containerID, >
blob.name, <img
blob.hasheddeletepath, src={getThumbnailIcon(file, file.type)}
blob.hashgetblobs, alt={file.name}
field.ticketnumber width="50"
); />
}} <span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
title="Remove this file" {/* {file.name.slice(file.name.indexOf("_") + 1)} ( */}{" "}
> {file.name}( ({bytesToSize(file.size)})
&minus;
</span> </span>
</div> </div>
<img ))}
src={getThumbnailIconByExtension(blob.name)} </ul>
alt={blob.name} )}
width="50" {blobList.map((blob, i) => (
/> <div
key={blob.name + "_" + i}
<Link className="govuk-!-margin-bottom-5 fileThumb govuk-!-margin-top-5"
key={i} >
scroll={false} <div className="">
href={ <span
"/api/file/downloadblob?container=" + className="govuk-summary-list__actionLink watched_link govuk-!-margin-right-5 govuk-!-text-align-left"
field.containerID + onClick={() => {
"&casefolderID=" + deleteThisBlob(
field.ticketnumber + field.containerID,
"&blobname=" + blob.name,
blob.name + blob.hasheddeletepath,
blob.hashedfilepath blob.hashgetblobs,
} field.ticketnumber
);
}}
title="Remove this file"
> >
<a className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link"> &minus;
{blob.name.slice(blob.name.indexOf("_") + 1)} ( </span>
{bytesToSize(blob.contentLength)})
</a>
</Link>
</div> </div>
))}{" "} <img
</> src={getThumbnailIconByExtension(blob.name)}
); alt={blob.name}
width="50"
/>
<Link
key={i}
scroll={false}
href={
"/api/file/downloadblob?container=" +
field.containerID +
"&casefolderID=" +
field.ticketnumber +
"&blobname=" +
blob.name +
blob.hashedfilepath
}
className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5 govuk-link">
{blob.name.slice(blob.name.indexOf("_") + 1)}({bytesToSize(blob.contentLength)})
</Link>
</div>
))}{" "}
</>;
}; };
components/errorpage.js
+8 -8
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
+223 -233
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,257 +34,247 @@ 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"> <div
<div className={
showShareState
? "block-share active"
: "block-share"
}
>
<button
id="sharePage"
aria-controls="sharePageLinks"
aria-expanded="true"
onClick={() => {
shareState();
}}
>
{t("common:social-bar-share-link")}
</button>
<ul
className={ className={
showShareState showShareState
? "block-share active" ? "block-share active"
: "block-share" : "block-share"
} }
id="sharePageLinks"
aria-labelledby="sharePage"
> >
<button <li>
id="sharePage" <a
aria-controls="sharePageLinks" href={
aria-expanded="true" "https://twitter.com/intent/tweet?url=" +
onClick={() => { shareBodyStr
shareState(); }
}} className="twitter"
> >
{t("common:social-bar-share-link")} <span className="vo_hidden">
</button> {t(
<ul "common:social-bar-share-via-link"
className={ )}{" "}
showShareState </span>
? "block-share active" Twitter
: "block-share" </a>
} </li>
id="sharePageLinks" <li>
aria-labelledby="sharePage" <a
> href={
<li> "https://www.facebook.com/sharer/sharer.php?u=" +
shareBodyStr
}
className="facebook"
>
<span className="vo_hidden">
Share this page via{" "}
</span>
Facebook
</a>
</li>
<li>
<a
href={
"mailto:?body=" +
shareBodyStr +
"&subject=" +
shareSubjectStr
} //</li>https%3A//gov.wales/&amp;subject=Shared%20from%20gov.wales"
className="email"
>
<span className="vo_hidden">
Share this page via{" "}
</span>
Email
</a>
</li>
</ul>
</div>
<div
id="sharebar__backtotop"
className="btn--outlined btn--arrow-up"
>
<a href="#page_wrapper">
{t("common:back-to-top-link")}
</a>
</div>
</div>
</div>
</div>
<footer className="govuk-footer " role="contentinfo">
<div className="govuk-width-container ">
<div className="govuk-footer__meta">
<div className="govuk-footer__meta-item govuk-footer__meta-item--grow">
<h2 className="govuk-visually-hidden">
Support links
</h2>
<nav
role="navigation"
aria-labelledby="footer_links"
>
<ul className="govuk-footer__inline-list">
<li className="govuk-footer__inline-list-item govuk-!-font-weight-bold govuk-!-margin-right-7">
<a <a
href={ href={t(
"https://twitter.com/intent/tweet?url=" + "common:footer-guidance-link"
shareBodyStr )}
} className="nav-link"
className="twitter"
> >
<span className="vo_hidden"> {t(
{t( "common:footer-guidance-link-label"
"common:social-bar-share-via-link" )}
)}{" "}
</span>
Twitter
</a> </a>
</li> </li>
<li> <li className="govuk-footer__inline-list-item govuk-!-font-weight-bold">
<a <a
href={ href={t(
"https://www.facebook.com/sharer/sharer.php?u=" + "common:footer-contact-us-link"
shareBodyStr )}
} className="govuk-footer__link"
className="facebook" id="aContactUs"
> >
<span className="vo_hidden"> {t(
Share this page via{" "} "common:footer-contact-us-link-label"
</span> )}
Facebook
</a>
</li>
<li>
<a
href={
"mailto:?body=" +
shareBodyStr +
"&subject=" +
shareSubjectStr
} //</li>https%3A//gov.wales/&amp;subject=Shared%20from%20gov.wales"
className="email"
>
<span className="vo_hidden">
Share this page via{" "}
</span>
Email
</a> </a>
</li> </li>
</ul> </ul>
</div> <ul
className="govuk-footer__inline-list"
id="footer_links"
>
<li className="govuk-footer__inline-list-item">
<Link
href={
router.locale == "cy"
? "/hygyrchedd"
: "/accessibility"
}
className="govuk-footer__link"
id="aAccessibility">
{t(
"common:footer-accessibility-link-label"
)}
</Link>
</li>
<li className="govuk-footer__inline-list-item">
<Link
href={
router.locale == "cy"
? "/help/cwcis"
: "/help/cookies"
}
id="aCookies"
className="govuk-footer__link">
{t(
"common:footer-cookies-link"
)}
</Link>
</li>
<li className="govuk-footer__inline-list-item">
<a
href={t(
"common:footer-copyright-link"
)}
className="govuk-footer__link"
id="Access"
>
{t(
"common:footer-copyright-link-label"
)}
</a>
</li>
<li className="govuk-footer__inline-list-item">
<Link
href={t(
"common:footer-privacy-link"
)}
id="aPrivacy"
className="govuk-footer__link">
{t(
"common:footer-privacy-link-label"
)}
</Link>
</li>
<li className="govuk-footer__inline-list-item">
<Link
href={t(
"common:footer-terms-conditions-link"
)}
id="aTermsConds"
className="govuk-footer__link">
{t(
"common:footer-terms-conditions-link-label"
)}
</Link>
</li>
{/* <li className="govuk-footer__inline-list-item">
<a
href={t(
"common:footer-alternative-languages-link"
)}
id="aTermsConds"
className="govuk-footer__link"
target="_blank"
rel="noreferrer"
>
{t(
"common:footer-alternative-languages-link-label"
)}
</a>
</li> */}
</ul>
</nav>
<div <div
id="sharebar__backtotop" className="footer_logo container-fluid"
className="btn--outlined btn--arrow-up" id="footer_logo"
> >
<a href="#page_wrapper"> <a
{t("common:back-to-top-link")} href={t("common:gov-wales-link")}
className="footer__logo"
id="footerlogo"
>
<span className="visually-hidden">
{t("common:gov-wales-label")}
</span>
</a> </a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<footer className="govuk-footer " role="contentinfo"> </footer>
<div className="govuk-width-container "> </>;
<div className="govuk-footer__meta">
<div className="govuk-footer__meta-item govuk-footer__meta-item--grow">
<h2 className="govuk-visually-hidden">
Support links
</h2>
<nav
role="navigation"
aria-labelledby="footer_links"
>
<ul className="govuk-footer__inline-list">
<li className="govuk-footer__inline-list-item govuk-!-font-weight-bold govuk-!-margin-right-7">
<a
href={t(
"common:footer-guidance-link"
)}
className="nav-link"
>
{t(
"common:footer-guidance-link-label"
)}
</a>
</li>
<li className="govuk-footer__inline-list-item govuk-!-font-weight-bold">
<a
href={t(
"common:footer-contact-us-link"
)}
className="govuk-footer__link"
id="aContactUs"
>
{t(
"common:footer-contact-us-link-label"
)}
</a>
</li>
</ul>
<ul
className="govuk-footer__inline-list"
id="footer_links"
>
<li className="govuk-footer__inline-list-item">
<Link
href={
router.locale == "cy"
? "/hygyrchedd"
: "/accessibility"
}
>
<a
className="govuk-footer__link"
id="aAccessibility"
>
{t(
"common:footer-accessibility-link-label"
)}
</a>
</Link>
</li>
<li className="govuk-footer__inline-list-item">
<Link
href={
router.locale == "cy"
? "/help/cwcis"
: "/help/cookies"
}
>
<a
id="aCookies"
className="govuk-footer__link"
>
{t(
"common:footer-cookies-link"
)}
</a>
</Link>
</li>
<li className="govuk-footer__inline-list-item">
<a
href={t(
"common:footer-copyright-link"
)}
className="govuk-footer__link"
id="Access"
>
{t(
"common:footer-copyright-link-label"
)}
</a>
</li>
<li className="govuk-footer__inline-list-item">
<Link
href={t(
"common:footer-privacy-link"
)}
>
<a
id="aPrivacy"
className="govuk-footer__link"
>
{t(
"common:footer-privacy-link-label"
)}
</a>
</Link>
</li>
<li className="govuk-footer__inline-list-item">
<Link
href={t(
"common:footer-terms-conditions-link"
)}
>
<a
id="aTermsConds"
className="govuk-footer__link"
>
{t(
"common:footer-terms-conditions-link-label"
)}
</a>
</Link>
</li>
{/* <li className="govuk-footer__inline-list-item">
<a
href={t(
"common:footer-alternative-languages-link"
)}
id="aTermsConds"
className="govuk-footer__link"
target="_blank"
rel="noreferrer"
>
{t(
"common:footer-alternative-languages-link-label"
)}
</a>
</li> */}
</ul>
</nav>
<div
className="footer_logo container-fluid"
id="footer_logo"
>
<a
href={t("common:gov-wales-link")}
className="footer__logo"
id="footerlogo"
>
<span className="visually-hidden">
{t("common:gov-wales-label")}
</span>
</a>
</div>
</div>
</div>
</div>
</footer>
</>
);
} }
components/header.js
+52 -52
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")}
<span className="govuk-header__logotype header__logo"> className="govuk-header__link govuk-link--no-underline govuk-header__link--homepage">
<img
alt="gov.wales" <span className="govuk-header__logotype header__logo">
src="/assets/images/cymru.svg" <img
/> alt="gov.wales"
</span> src="/assets/images/cymru.svg"
</a> />
</span>
</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"
} }
> onClick={() => {
<a handleLogout();
onClick={() => { }}
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")} </Link>)
</a>
</Link>
)} )}
<Link <Link
@@ -265,35 +267,33 @@ const Header = (props) => {
: router.asPath : router.asPath
} }
locale={locale == "en" ? "cy" : "en"} locale={locale == "en" ? "cy" : "en"}
> className="govuk-header__link "
<a lang={locale == "en" ? "cy" : "en"}
className="govuk-header__link " hrefLang={locale == "en" ? "cy" : "en"}
lang={locale == "en" ? "cy" : "en"} data-journey-click={
hrefLang={locale == "en" ? "cy" : "en"} locale == "en"
data-journey-click={ ? "link - click:lang-select:Cymraeg"
locale == "en" : "link - click:lang-select:English"
? "link - click:lang-select:Cymraeg" }
: "link - click:lang-select:English" aria-label={
} locale == "en"
aria-label={ ? "Dewiswch Cymraeg"
locale == "en" : "Select English"
? "Dewiswch Cymraeg" }
: "Select English" onClick={() => {
} setCookie(
onClick={() => { null,
setCookie( "pedw_locale",
null, locale == "en" ? "cy" : "en",
"pedw_locale", {
locale == "en" ? "cy" : "en", path: "/",
{ }
path: "/", );
} }}>
);
}} {" "}
> {t("common:available-in")}
{" "}
{t("common:available-in")}
</a>
</Link> </Link>
</div> </div>
</div> </div>
components/homepage/casesearch.js
+53 -55
View File
@@ -94,64 +94,62 @@ 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"> <h3 className="heading-small card-heading">
<h3 className="heading-small card-heading"> {t("home:casesearch-card-title")}
{t("home:casesearch-card-title")} </h3>
</h3>
<Field <Field
validate={[ validate={[
required( required(
t( t(
"home:casesearch-search-validation-required" "home:casesearch-search-validation-required"
) )
), ),
minLength( minLength(
t( t(
"home:casesearch-search-validation-minlength" "home:casesearch-search-validation-minlength"
) )
), ),
]} ]}
className="govuk-input" className="govuk-input"
component={RenderTextfield} component={RenderTextfield}
id="basicSearch" id="basicSearch"
name="basicSearch" name="basicSearch"
type="text" type="text"
aria-describedby="basicSearch-hint" aria-describedby="basicSearch-hint"
hint1={t("home:casesearch-card-search-hint")} hint1={t("home:casesearch-card-search-hint")}
hint2={t( hint2={t(
"home:casesearch-card-search-example-label-1" "home:casesearch-card-search-example-label-1"
)} )}
hint3={t( hint3={t(
"home:casesearch-card-search-example-label-2" "home:casesearch-card-search-example-label-2"
)} )}
/> />
<div className="govuk-form-group"> <div className="govuk-form-group">
<button type="submit" className="govuk-button"> <button type="submit" className="govuk-button">
{t("home:casesearch-card-button")} {t("home:casesearch-card-button")}
</button> </button>
</div>
<Link
href={
router.locale == "cy"
? "/chwiliouwch"
: "/advancedsearch"
}
>
<a className="govuk-link--no-underline">
{t("home:casesearch-card-advanced-link")}
</a>
</Link>
</div> </div>
</form> <Link
</div> href={
</> router.locale == "cy"
); ? "/chwiliouwch"
: "/advancedsearch"
}
className="govuk-link--no-underline">
{t("home:casesearch-card-advanced-link")}
</Link>
</div>
</form>
</div>
</>;
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
components/homepage/dns.js
+7 -9
View File
@@ -33,15 +33,13 @@ export default function Dns() {
? "/ceisiadaudns" ? "/ceisiadaudns"
: "/dnsapplications" : "/dnsapplications"
} }
> // onClick={() => {
<a // spinnerState();
className="govuk-button withChevron govuk-button-cta" // }}
// onClick={() => { className="govuk-button withChevron govuk-button-cta">
// spinnerState();
// }} {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
+125 -129
View File
@@ -39,142 +39,138 @@ 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> <img
<img src={
src={ router.locale == "cy"
router.locale == "cy" ? "/assets/images/planning-casework-cy.svg"
? "/assets/images/planning-casework-cy.svg" : "/assets/images/planning-casework-en.svg"
: "/assets/images/planning-casework-en.svg" }
} alt={
alt={ router.locale == "cy"
router.locale == "cy" ? "Fy mhorth"
? "Fy mhorth" : "My Portal"
: "My Portal" }
} />
/> </h1>
</h1>
<div className="serviceBanner_userDetails"> <div className="serviceBanner_userDetails">
<img <img
className="user_logo" className="user_logo"
src="/assets/images/user.svg" src="/assets/images/user.svg"
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
}{" "} }{" "}
{ {
props.accountDetails.accountDetails props.accountDetails.accountDetails
.lastname .lastname
} }
{" - "} {" - "}
{
props.accountDetails.accountDetails[
"pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue"
]
}
</a>
</Link>
</div>
<div>
<Link
href={
router.locale == "cy"
? "/allgofnodi"
: "/logout"
}
>
<a
onClick={() => {
handleLogout();
}}
className="govuk-header__link govuk-!-margin-right-3"
>
{t("common:signout-label")}
</a>
</Link>
</div>
</div>
</div>
{isLPA && (
<div>
<h2 className="heading-small card-heading">
{ {
props.accountDetails.accountDetails[ props.accountDetails.accountDetails[
"pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue" "pinswg_typeofinvolvement@OData.Community.Display.V1.FormattedValue"
] ]
}{" "} }
LPA Portal
</h2>
</div>
)}
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<div className="flex-container grid-row govuk-body ">
{!isLPA && <MakeNewAppeal />}
<SearchCases />
{/* {props.awaitingSubmission.awaitingSubmission[
"@odata.count"
] > 0 && (
<AwaitingSubmission
awaitingSubmission={
props.awaitingSubmission
}
/>
)} */}
{isLPA
? ""
: props.awaitingSubmission
.awaitingSubmissionFromBlob[
"@odata.count"
] > 0 && (
<AwaitingSubmissionFromBlob
containerID={props.containerID}
awaitingSubmissionFromBlob={
props.awaitingSubmission
.awaitingSubmissionFromBlob
}
/>
)}
{props.myCases.myCases["@odata.count"] > 0 && (
<MyCases
myCases={props.myCases}
isLPA={isLPA}
/>
)}
{props.watchedCases.watchedCases["@odata.count"] >
0 && (
<WatchedCases
watchedCases={props.watchedCases}
isLPA={isLPA}
/>
)}
{props.myRepresentations.myRepresentations[
"@odata.count"
] > 0 && (
<MyRepresentations
myRepresentations={props.myRepresentations}
isLPA={isLPA}
/>
)}
{!isLPA && <Dns />}
{/* <YourAccount /> */} </Link>
</div> </div>
<div>
<Link
href={
router.locale == "cy"
? "/allgofnodi"
: "/logout"
}
onClick={() => {
handleLogout();
}}
className="govuk-header__link govuk-!-margin-right-3">
{t("common:signout-label")}
</Link>
</div> </div>
</div> </div>
</main> </div>
<TimeOut /> {isLPA && (
</> <div>
); <h2 className="heading-small card-heading">
{
props.accountDetails.accountDetails[
"pinswg_contact_associatedlpa@OData.Community.Display.V1.FormattedValue"
]
}{" "}
LPA Portal
</h2>
</div>
)}
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<div className="flex-container grid-row govuk-body ">
{!isLPA && <MakeNewAppeal />}
<SearchCases />
{/* {props.awaitingSubmission.awaitingSubmission[
"@odata.count"
] > 0 && (
<AwaitingSubmission
awaitingSubmission={
props.awaitingSubmission
}
/>
)} */}
{isLPA
? ""
: props.awaitingSubmission
.awaitingSubmissionFromBlob[
"@odata.count"
] > 0 && (
<AwaitingSubmissionFromBlob
containerID={props.containerID}
awaitingSubmissionFromBlob={
props.awaitingSubmission
.awaitingSubmissionFromBlob
}
/>
)}
{props.myCases.myCases["@odata.count"] > 0 && (
<MyCases
myCases={props.myCases}
isLPA={isLPA}
/>
)}
{props.watchedCases.watchedCases["@odata.count"] >
0 && (
<WatchedCases
watchedCases={props.watchedCases}
isLPA={isLPA}
/>
)}
{props.myRepresentations.myRepresentations[
"@odata.count"
] > 0 && (
<MyRepresentations
myRepresentations={props.myRepresentations}
isLPA={isLPA}
/>
)}
{!isLPA && <Dns />}
{/* <YourAccount /> */}
</div>
</div>
</div>
</main>
<TimeOut />
</>;
}; };
export default MyPortal; export default MyPortal;
components/myportal/advancedsearch.js
+84 -86
View File
@@ -179,98 +179,96 @@ let AdvancedSearch = (props) => {
label, label,
errormsg, errormsg,
}) => { }) => {
return ( return <>
<> <div
<div className={
className={ touched && error
touched && error ? "govuk-form-group govuk-form-group--error"
? "govuk-form-group govuk-form-group--error" : "govuk-form-group "
: "govuk-form-group " }
} >
> <label className="govuk-label" htmlFor={id}>
<label className="govuk-label" htmlFor={id}> {label}
{label} {name}
{name} </label>
</label> {touched && error && (
{touched && error && ( <span
<span id="passport-issued-error"
id="passport-issued-error" className="govuk-error-message"
className="govuk-error-message" >
> <span className="govuk-visually-hidden">
<span className="govuk-visually-hidden"> Error:
Error: </span>{" "}
</span>{" "} {errormsg}
{errormsg} </span>
</span> )}
)} <div>
<div> <select
<select {...input}
{...input} className="govuk-select"
className="govuk-select" id={id}
id={id} name={name}
name={name} //onChange={(e) => props.onChangeSelectAppealType(e)}
//onChange={(e) => props.onChangeSelectAppealType(e)} >
> <option value="" disabled defaultValue>
<option value="" disabled defaultValue> {t("common:drop-down-select")}
{t("common:drop-down-select")} </option>
</option> {_.isEmpty(optionsObj)
{_.isEmpty(optionsObj) ? ""
? "" : Object.keys(optionsObj).map((key, index) => {
: Object.keys(optionsObj).map((key, index) => { return (
return ( <option
<option key={key}
key={key} value={
value={ _.isEmpty(optionsObj[key])
_.isEmpty(optionsObj[key])
? ""
: _.isEmpty(
optionsObj[key]
)
? ""
: _.isEmpty(
optionsObj[key]
.value
)
? ""
: optionsObj[key]
.attributevalue +
"," +
optionsObj[key].value
.replace(
/(\band|[\s\-\+\(\)\,\&])/g,
""
)
.toLowerCase()
}
>
{_.isEmpty(optionsObj[key])
? ""
: _.isEmpty(optionsObj[key])
? "" ? ""
: _.isEmpty( : _.isEmpty(
optionsObj[key].value optionsObj[key]
) )
? "" ? ""
: router.locale == "cy" : _.isEmpty(
? jsonpath.query( optionsObj[key]
transLookup, .value
'$..[?(@.value=="' +
optionsObj[key]
.value +
'")].value_cy'
) )
: optionsObj[key].value || ? ""
t( : optionsObj[key]
"case:summary-no-date-entered-label" .attributevalue +
)} "," +
</option> optionsObj[key].value
); .replace(
})} /(\band|[\s\-\+\(\)\,\&])/g,
</select> ""
</div> )
.toLowerCase()
}
>
{_.isEmpty(optionsObj[key])
? ""
: _.isEmpty(optionsObj[key])
? ""
: _.isEmpty(
optionsObj[key].value
)
? ""
: router.locale == "cy"
? jsonpath.query(
transLookup,
'$..[?(@.value=="' +
optionsObj[key]
.value +
'")].value_cy'
)
: optionsObj[key].value ||
t(
"case:summary-no-date-entered-label"
)}
</option>
);
})}
</select>
</div> </div>
</> </div>
); </>;
}; };
// const [showSpinnerState, setShowSpinnerState] = useState(false); // const [showSpinnerState, setShowSpinnerState] = useState(false);
components/myportal/awaitingsubmission.js
+10 -12
View File
@@ -40,18 +40,16 @@ const AwaitingSubmission = (props) => {
"/fymhorth/gweldpopeth" "/fymhorth/gweldpopeth"
: "/myportal/viewall" : "/myportal/viewall"
} }
> className="govuk-link--no-underline"
<a onClick={() => {
className="govuk-link--no-underline" setCurrentView({
onClick={() => { "viewName": "Awaiting Submission",
setCurrentView({ "viewKey": "awaitingSubmission",
"viewName": "Awaiting Submission", });
"viewKey": "awaitingSubmission", }}>
});
}} {t("myportal:viewall-link")}
>
{t("myportal:viewall-link")}
</a>
</Link> </Link>
</div> </div>
)} )}
components/myportal/awaitingsubmissionfromblob.js
+27 -31
View File
@@ -76,28 +76,26 @@ const AwaitingSubmissionFromBlob = (props) => {
"&inid=" + "&inid=" +
showTopThreeArr[key].incidentid showTopThreeArr[key].incidentid
} }
> className="govuk-link--no-underline"
<a data-id={index}
className="govuk-link--no-underline" onClick={() => {
data-id={index} props.setCurrentReference({
onClick={() => { "currentReference":
props.setCurrentReference({ showTopThreeArr[key].ticketnumber,
"currentReference":
showTopThreeArr[key].ticketnumber,
"currentType": "awaitingSubmission", "currentType": "awaitingSubmission",
"incidentid": "incidentid":
showTopThreeArr[key].incidentid, showTopThreeArr[key].incidentid,
"appealType":
showTopThreeArr[key]
.pinswg_appealcasetype,
});
}}>
{showTopThreeArr[index].pinswg_name}
"appealType":
showTopThreeArr[key]
.pinswg_appealcasetype,
});
}}
>
{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"
} }
> className="govuk-link--no-underline"
<a onClick={() => {
className="govuk-link--no-underline" setCurrentView({
onClick={() => { "viewName": "Awaiting Submission",
setCurrentView({ "viewKey": "awaitingSubmissionDetails",
"viewName": "Awaiting Submission", });
"viewKey": "awaitingSubmissionDetails", }}>
});
}} {t("myportal:viewall-link")}
>
{t("myportal:viewall-link")}
</a>
</Link> </Link>
</div> </div>
)} )}
components/myportal/dns.js
+7 -9
View File
@@ -33,15 +33,13 @@ export default function Dns() {
? "/fymhorth/ceisiadaudns" ? "/fymhorth/ceisiadaudns"
: "/myportal/dnsapplications" : "/myportal/dnsapplications"
} }
> // onClick={() => {
<a // spinnerState();
className="govuk-button withChevron govuk-button-cta" // }}
// onClick={() => { className="govuk-button withChevron govuk-button-cta">
// spinnerState();
// }} {t("home:dns-card-button")}
>
{t("home:dns-card-button")}
</a>
</Link> </Link>
</div> </div>
</div> </div>
components/myportal/makenewappeal.js
+4 -4
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
+13 -15
View File
@@ -34,21 +34,19 @@ const MyCases = (props) => {
"/fymhorth/gweldpopeth" "/fymhorth/gweldpopeth"
: "/myportal/viewall" : "/myportal/viewall"
} }
> className="govuk-link--no-underline"
<a onClick={() => {
className="govuk-link--no-underline" setCurrentView({
onClick={() => { "viewName": "My Cases",
setCurrentView({ "viewKey": "myCases",
"viewName": "My Cases", });
"viewKey": "myCases", }}>
});
}} {t("myportal:viewall-link")}{" "}
> {props.isLPA &&
{t("myportal:viewall-link")}{" "} props.myCases.myCases["@odata.count"] +
{props.isLPA && " appeals"}
props.myCases.myCases["@odata.count"] +
" appeals"}
</a>
</Link> </Link>
</div> </div>
)} )}
components/myportal/myrepresentations.js
+10 -12
View File
@@ -40,18 +40,16 @@ const MyRepresentations = (props) => {
: "/myportal/viewall" : "/myportal/viewall"
} }
shallow shallow
> className="govuk-link--no-underline"
<a onClick={() => {
className="govuk-link--no-underline" setCurrentView({
onClick={() => { "viewName": "My Representations",
setCurrentView({ "viewKey": "myRepresentations",
"viewName": "My Representations", });
"viewKey": "myRepresentations", }}>
});
}} {t("myportal:viewall-link")}
>
{t("myportal:viewall-link")}
</a>
</Link> </Link>
</div> </div>
)} )}
components/myportal/myrepresentationsfromblob.js
+10 -12
View File
@@ -40,18 +40,16 @@ const MyRepresentations = (props) => {
: "/myportal/viewall" : "/myportal/viewall"
} }
shallow shallow
> className="govuk-link--no-underline"
<a onClick={() => {
className="govuk-link--no-underline" setCurrentView({
onClick={() => { "viewName": "My Representations",
setCurrentView({ "viewKey": "myRepresentations",
"viewName": "My Representations", });
"viewKey": "myRepresentations", }}>
});
}} {t("myportal:viewall-link")}
>
{t("myportal:viewall-link")}
</a>
</Link> </Link>
</div> </div>
)} )}
components/myportal/searchcases.js
+53 -55
View File
@@ -95,64 +95,62 @@ 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"> <h3 className="heading-small card-heading">
<h3 className="heading-small card-heading"> {t("myportal:searchcases-card-title")}
{t("myportal:searchcases-card-title")} </h3>
</h3>
<Field <Field
validate={[ validate={[
required( required(
t( t(
"myportal:searchcases-validation-required" "myportal:searchcases-validation-required"
) )
), ),
minLength( minLength(
t( t(
"myportal:searchcases-validation-minlength" "myportal:searchcases-validation-minlength"
) )
), ),
]} ]}
className="govuk-input" className="govuk-input"
component={RenderTextfield} component={RenderTextfield}
id="basicSearch" id="basicSearch"
name="basicSearch" name="basicSearch"
type="text" type="text"
aria-describedby="basicSearch-hint" aria-describedby="basicSearch-hint"
hint1={t("myportal:searchcases-card-search-hint")} hint1={t("myportal:searchcases-card-search-hint")}
hint2={t( hint2={t(
"myportal:searchcases-card-search-example-label-1" "myportal:searchcases-card-search-example-label-1"
)} )}
hint3={t( hint3={t(
"myportal:searchcases-card-search-example-label-2" "myportal:searchcases-card-search-example-label-2"
)} )}
/> />
<div className="govuk-form-group"> <div className="govuk-form-group">
<button type="submit" className="govuk-button"> <button type="submit" className="govuk-button">
{t("myportal:searchcases-card-button")} {t("myportal:searchcases-card-button")}
</button> </button>
</div>
<Link
href={
router.locale == "cy"
? "/fymhorth/chwiliouwch"
: "/myportal/advancedsearch"
}
>
<a>
{t("myportal:searchcases-card-advanced-link")}
</a>
</Link>
</div> </div>
</form> <Link
</div> href={
</> router.locale == "cy"
); ? "/fymhorth/chwiliouwch"
: "/myportal/advancedsearch"
}
>
{t("myportal:searchcases-card-advanced-link")}
</Link>
</div>
</form>
</div>
</>;
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
components/myportal/topthree.js
+35 -37
View File
@@ -167,47 +167,45 @@ const TopThree = (props) => {
? "/fymhorth/achos" ? "/fymhorth/achos"
: "/myportal/case" : "/myportal/case"
} }
> className="govuk-link--no-underline"
<a data-id={index}
className="govuk-link--no-underline" onClick={() => {
data-id={index} setCurrentReference({
onClick={() => { "currentReference":
setCurrentReference({ topThreeType != "watchedCases"
"currentReference": ? topThreeType !=
topThreeType != "watchedCases" "myRepresentations"
? topThreeType != ? showTopThreeArr[key]
"myRepresentations" .ticketnumber
? showTopThreeArr[key]
.ticketnumber
: showTopThreeArr[key][
"_pinswg_case_value@OData.Community.Display.V1.FormattedValue"
]
: showTopThreeArr[key][ : showTopThreeArr[key][
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" "_pinswg_case_value@OData.Community.Display.V1.FormattedValue"
], ]
"currentType": topThreeType, : showTopThreeArr[key][
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
],
"currentType": topThreeType,
"incidentid": getIncidentId( "incidentid": getIncidentId(
topThreeType, topThreeType,
showTopThreeArr[key] showTopThreeArr[key]
), ),
"appealType": "appealType":
showTopThreeArr[key] showTopThreeArr[key]
.pinswg_appealcasetype, .pinswg_appealcasetype,
}); });
}} }}>
>
{topThreeType != "watchedCases" {topThreeType != "watchedCases"
? topThreeType != "myRepresentations" ? topThreeType != "myRepresentations"
? showTopThreeArr[key].ticketnumber ? showTopThreeArr[key].ticketnumber
: showTopThreeArr[key][
"_pinswg_case_value@OData.Community.Display.V1.FormattedValue"
]
: showTopThreeArr[key][ : showTopThreeArr[key][
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue" "_pinswg_case_value@OData.Community.Display.V1.FormattedValue"
]}{" "} ]
</a> : showTopThreeArr[key][
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
]}{" "}
</Link> </Link>
</div> </div>
{/* {(topThreeType == "awaitingSubmission" || {/* {(topThreeType == "awaitingSubmission" ||
components/myportal/topthree_reps.js
+18 -20
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,26 +164,23 @@ const TopThree = (props) => {
state: "edit", state: "edit",
}, },
}} }}
// href="#" className="govuk-link--no-underline"
> data-id={index}
<a onClick={() => {
className="govuk-link--no-underline" setCurrentReference({
data-id={index} "currentReference":
onClick={() => { showTopThreeArr[key].caseRef,
setCurrentReference({ "currentType": topThreeType,
"currentReference": "incidentid":
showTopThreeArr[key].caseRef, showTopThreeArr[key].incidentID,
"currentType": topThreeType, "appealType":
"incidentid": showTopThreeArr[key].appealType,
showTopThreeArr[key].incidentID, "repDetails": showTopThreeArr[key],
"appealType": });
showTopThreeArr[key].appealType, }}>
"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
+39 -41
View File
@@ -100,49 +100,47 @@ const ViewAllResults = (props) => {
? "/myportal/case" ? "/myportal/case"
: "/case" : "/case"
} }
> onClick={() => {
<a setCurrentReference({
onClick={() => { "currentReference":
setCurrentReference({ currentView.viewKey != "watchedCases"
"currentReference": ? currentView.viewKey ==
currentView.viewKey != "watchedCases" "myRepresentations"
? currentView.viewKey == ? resultsArr[key].caseRef
"myRepresentations" : resultsArr[key].ticketnumber
? resultsArr[key].caseRef : resultsArr[key][
: resultsArr[key].ticketnumber "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
: resultsArr[key][ ],
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
],
"currentType": currentView.viewKey, "currentType": currentView.viewKey,
"incidentid": "incidentid":
currentView.viewKey != "watchedCases" currentView.viewKey != "watchedCases"
? resultsArr[key].incidentid ? resultsArr[key].incidentid
: resultsArr[key][ : resultsArr[key][
"_pinswg_watchedcase_value" "_pinswg_watchedcase_value"
], ],
"appealType":
resultsArr[key].pinswg_appealcasetype,
"repDetails":
currentView.viewKey ==
"myRepresentations" &&
resultsArr[key],
});
}}>
<span className="results-visually-hidden">
{t("search:searchresults-case-reference-label")}
:
</span>
{currentView.viewKey != "watchedCases"
? currentView.viewKey == "myRepresentations"
? resultsArr[key].caseRef
: resultsArr[key].ticketnumber
: resultsArr[key][
"_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
]}
"appealType":
resultsArr[key].pinswg_appealcasetype,
"repDetails":
currentView.viewKey ==
"myRepresentations" &&
resultsArr[key],
});
}}
>
<span className="results-visually-hidden">
{t("search:searchresults-case-reference-label")}
:
</span>
{currentView.viewKey != "watchedCases"
? currentView.viewKey == "myRepresentations"
? resultsArr[key].caseRef
: resultsArr[key].ticketnumber
: resultsArr[key][
"_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
+10 -12
View File
@@ -37,18 +37,16 @@ const WatchedCases = (props) => {
: "/myportal/viewall" : "/myportal/viewall"
} }
shallow shallow
> className="govuk-link--no-underline"
<a onClick={() => {
className="govuk-link--no-underline" setCurrentView({
onClick={() => { "viewName": "Watched Cases",
setCurrentView({ "viewKey": "watchedCases",
"viewName": "Watched Cases", });
"viewKey": "watchedCases", }}>
});
}} {t("myportal:viewall-link")}
>
{t("myportal:viewall-link")}
</a>
</Link> </Link>
</div> </div>
)} )}
components/myportal/youraccount.js
+35 -37
View File
@@ -7,44 +7,42 @@ 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"> {t("myportal:yourdetails-card-title")}
{t("myportal:yourdetails-card-title")} </h3>
</h3> <p className="govuk-body-s">
<p className="govuk-body-s"> {t("myportal:yourdetails-card-paragraph-one")}
{t("myportal:yourdetails-card-paragraph-one")} </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 className="card-body">
<h3 className="heading-small card-heading">
{t("myportal:changepassword-card-title")}
</h3>
<p className="govuk-body-s">
{" "}
{t("myportal:changepassword-card-paragraph-one")}
</p>
<div>
<Link href="/account/changepassword">
<a className="govuk-button-secondary">
{t("myportal:changepassword-card-link")}
</a>
</Link>
</div>
</div> */}
</div> </div>
</>
); {/* <div className="card-body">
<h3 className="heading-small card-heading">
{t("myportal:changepassword-card-title")}
</h3>
<p className="govuk-body-s">
{" "}
{t("myportal:changepassword-card-paragraph-one")}
</p>
<div>
<Link href="/account/changepassword">
<a className="govuk-button-secondary">
{t("myportal:changepassword-card-link")}
</a>
</Link>
</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
+84 -86
View File
@@ -275,98 +275,96 @@ let AdvancedSearch = (props) => {
label, label,
errormsg, errormsg,
}) => { }) => {
return ( return <>
<> <div
<div className={
className={ touched && error
touched && error ? "govuk-form-group govuk-form-group--error"
? "govuk-form-group govuk-form-group--error" : "govuk-form-group "
: "govuk-form-group " }
} >
> <label className="govuk-label" htmlFor={id}>
<label className="govuk-label" htmlFor={id}> {label}
{label} {name}
{name} </label>
</label> {touched && error && (
{touched && error && ( <span
<span id="passport-issued-error"
id="passport-issued-error" className="govuk-error-message"
className="govuk-error-message" >
> <span className="govuk-visually-hidden">
<span className="govuk-visually-hidden"> Error:
Error: </span>{" "}
</span>{" "} {errormsg}
{errormsg} </span>
</span> )}
)} <div>
<div> <select
<select {...input}
{...input} className="govuk-select"
className="govuk-select" id={id}
id={id} name={name}
name={name} //onChange={(e) => props.onChangeSelectAppealType(e)}
//onChange={(e) => props.onChangeSelectAppealType(e)} >
> <option value="" disabled defaultValue>
<option value="" disabled defaultValue> {t("common:drop-down-select")}
{t("common:drop-down-select")} </option>
</option> {_.isEmpty(optionsObj)
{_.isEmpty(optionsObj) ? ""
? "" : Object.keys(optionsObj).map((key, index) => {
: Object.keys(optionsObj).map((key, index) => { return (
return ( <option
<option key={key}
key={key} value={
value={ _.isEmpty(optionsObj[key])
_.isEmpty(optionsObj[key])
? ""
: _.isEmpty(
optionsObj[key]
)
? ""
: _.isEmpty(
optionsObj[key]
.value
)
? ""
: optionsObj[key]
.attributevalue +
"," +
optionsObj[key].value
.replace(
/(\band|[\s\-\+\(\)\,\&])/g,
""
)
.toLowerCase()
}
>
{_.isEmpty(optionsObj[key])
? ""
: _.isEmpty(optionsObj[key])
? "" ? ""
: _.isEmpty( : _.isEmpty(
optionsObj[key].value optionsObj[key]
) )
? "" ? ""
: router.locale == "cy" : _.isEmpty(
? jsonpath.query( optionsObj[key]
transLookup, .value
'$..[?(@.value=="' +
optionsObj[key]
.value +
'")].value_cy'
) )
: optionsObj[key].value || ? ""
t( : optionsObj[key]
"case:summary-no-date-entered-label" .attributevalue +
)} "," +
</option> optionsObj[key].value
); .replace(
})} /(\band|[\s\-\+\(\)\,\&])/g,
</select> ""
</div> )
.toLowerCase()
}
>
{_.isEmpty(optionsObj[key])
? ""
: _.isEmpty(optionsObj[key])
? ""
: _.isEmpty(
optionsObj[key].value
)
? ""
: router.locale == "cy"
? jsonpath.query(
transLookup,
'$..[?(@.value=="' +
optionsObj[key]
.value +
'")].value_cy'
)
: optionsObj[key].value ||
t(
"case:summary-no-date-entered-label"
)}
</option>
);
})}
</select>
</div> </div>
</> </div>
); </>;
}; };
// const [showSpinnerState, setShowSpinnerState] = useState(false); // const [showSpinnerState, setShowSpinnerState] = useState(false);
components/search/dnssearchresults.js
+23 -25
View File
@@ -356,31 +356,29 @@ const DNSSearchResults = (props) => {
: "") + : "") +
"/dnsdetails" "/dnsdetails"
} }
> className="govuk-link--no-underline"
<a onClick={() => {
className="govuk-link--no-underline" setCurrentReference({
onClick={() => { "currentReference":
setCurrentReference({ item.title,
"currentReference": "currentType":
item.title, "searchResultsObj",
"currentType": "incidentid":
"searchResultsObj", item.incidentid,
"incidentid": "appealType":
item.incidentid, item.pinswg_appealcasetype,
"appealType": "showMap": showMap,
item.pinswg_appealcasetype, });
"showMap": showMap, }}>
});
}} <span className="results-visually-hidden">
> {t(
<span className="results-visually-hidden"> "search:searchresults-case-reference-label"
{t( )}
"search:searchresults-case-reference-label" :
)} </span>
: {item.title}
</span>
{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
+48 -45
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,30 +277,27 @@ const SearchResults = (props) => {
? "/myportal/case" ? "/myportal/case"
: "/case" : "/case"
} }
className="govuk-link--no-underline"
onClick={() => {
setCurrentReference({
"currentReference":
item.title,
"currentType":
"searchResultsObj",
"incidentid":
item.incidentid,
"appealType":
item.pinswg_appealcasetype,
});
}}
> >
<a <span className="results-visually-hidden">
className="govuk-link--no-underline" {t(
onClick={() => { "search:searchresults-case-reference-label"
setCurrentReference({ )}
"currentReference": :
item.title, </span>
"currentType": {item.title}
"searchResultsObj",
"incidentid":
item.incidentid,
"appealType":
item.pinswg_appealcasetype,
});
}}
>
<span className="results-visually-hidden">
{t(
"search:searchresults-case-reference-label"
)}
:
</span>
{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">
@@ -358,7 +334,7 @@ const SearchResults = (props) => {
: ""} : ""}
{/* {detailsObj.pinswg_siteaddressline1 != {/* {detailsObj.pinswg_siteaddressline1 !=
null && <br />} */} null && <br />} */}
{_.has( {_.has(
detailsObj, detailsObj,
@@ -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
+12 -12
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
+6 -6
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