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

updated translations and oauth

Browse Source
This commit is contained in:
robbond
2021-11-19 09:30:04 +00:00
parent 3c38da1400
commit f9f7b777e7
91 changed files with 2519 additions and 1275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.local
+26 -5
View File
@@ -1,9 +1,24 @@
// dev
RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
RELAYURI = "dev-pedw-ns.servicebus.windows.net"
RELAYPATH = "dev-pedw-hc"
SASKEY = "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y="
SASKEYNAME = "devpedwnspolicy"
//RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
//RELAYURI = "dev-pedw-ns.servicebus.windows.net"
//RELAYPATH = "dev-pedw-hc"
//SASKEY = "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y="
//SASKEYNAME = "devpedwnspolicy"
ACCESS_TOKEN_ENDPOINT = https://login.microsoftonline.com/
TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502
GRANT_TYPE = "client_credentials"
//Dev oauth
CLIENT_ID = e082def0-3453-461f-9a5e-f4ab127dc015
CLIENT_SECRET = qW.7Q~TSr3sZmLEnJQJPXEdOckb_yo2t1yJmY
//Test Oauth
//CLIENT_ID = e082def0-3453-461f-9a5e-f4ab127dc015
//CLIENT_SECRET = qW.7Q~TSr3sZmLEnJQJPXEdOckb_yo2t1yJmY
PORT= "3000"
@@ -32,3 +47,9 @@ I18N_DOMAIN = "cymru.local"
GOOGLE_TAG_MANAGER = GTM-T78CBC3
SHOWLOGIN = "true"
SHOWREPRESENTATIONS = "false"
BASIC_AUTH_CREDENTIALS,, = pinswg:password|pinswg2:password2
HASHKEY = "028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c"
NEXT_PUBLIC_HASHKEY = "028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c"
actions/index.js
+355 -353
View File
File diff suppressed because it is too large Load Diff
components/accessibility.js
+31
View File
@@ -0,0 +1,31 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
const AccessibilityStatement = (props) => {
let { t } = useTranslation();
const { whichError } = props;
const router = useRouter();
const { locale } = router;
return (
<main
className="govuk-main-wrapper govuk-!-padding-top-9 govuk-main-wrapper--auto-spacing"
id="main-content"
role="main"
>
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<h1 className="govuk-heading-l govuk-!-margin-bottom-7">
Accessibility Statement
</h1>
<p>bkah blah</p>
</div>
</div>
</main>
);
};
export default AccessibilityStatement;
components/account/personaldetailsComplete.js
+4 -1
View File
@@ -35,7 +35,10 @@ const PersonalDetailsComplete = (props) => {
let contactid = props.accountDetails.loggedinUserId;
let updateBody = props.props.props.form.personalDetailsForm.values;
updateAccount(contactid, updateBody);
}, []);
}, [
props.accountDetails.loggedinUserId,
props.props.props.form.personalDetailsForm.values,
]);
return (
<>
components/account/registerform.js
+4 -3
View File
@@ -77,11 +77,12 @@ const RegisterForm = (props) => {
let errorsobj = {};
const emailRegex =
/(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/gi;
const required = (value) => (value ? undefined : "Is required");
const email = (value) =>
value && !/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i.test(value)
? "Invalid email address"
: undefined;
value && !emailRegex.test(value) ? "Invalid email address" : undefined;
const phoneNumber = (value) =>
value &&
!/^(?:(?:\(?(?:0(?:0|11)\)?[\s-]?\(?|\+)44\)?[\s-]?(?:\(?0\)?[\s-]?)?)|(?:\(?0))(?:(?:\d{5}\)?[\s-]?\d{4,5})|(?:\d{4}\)?[\s-]?(?:\d{5}|\d{3}[\s-]?\d{3}))|(?:\d{3}\)?[\s-]?\d{3}[\s-]?\d{3,4})|(?:\d{2}\)?[\s-]?\d{4}[\s-]?\d{4}))(?:[\s-]?(?:x|ext\.?|\#)\d{3,4})?$/i.test(
components/breadcrumbs.js
+38 -9
View File
@@ -38,13 +38,13 @@ const Breadcrumbs = (props) => {
}
}
const [showSpinnerState, setShowSpinnerState] = useState(false);
// const [showSpinnerState, setShowSpinnerState] = useState(false);
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
};
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
return (
<>
<nav
@@ -313,7 +313,7 @@ const Breadcrumbs = (props) => {
>
<a
onClick={() => {
spinnerState();
// spinnerState();
router.back();
}}
className="govuk-breadcrumbs__link"
@@ -542,6 +542,35 @@ const Breadcrumbs = (props) => {
) : (
""
)}
{router.pathname == "/privacy" ? (
<>
<li className="govuk-breadcrumbs__list-item">
{t("common:footer-privacy-link-label")}
</li>
</>
) : (
""
)}
{router.pathname == "/accessibility" ? (
<>
<li className="govuk-breadcrumbs__list-item">
{t(
"common:footer-accessibility-link-label"
)}
</li>
</>
) : (
""
)}
{router.pathname == "/details-about-cookies" ? (
<>
<li className="govuk-breadcrumbs__list-item">
{t("cookies:cookie-policy-title-heading")}
</li>
</>
) : (
""
)}
{!_.isEmpty(slug) ? (
<>
<li className="govuk-breadcrumbs__list-item">
@@ -582,11 +611,11 @@ const Breadcrumbs = (props) => {
</ol>
</div>
</nav>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</>
);
};
components/case.js
+12 -4
View File
@@ -6,7 +6,8 @@ import Summary from "./case/summary";
import Documents from "./case/documents";
import RepresentationList from "./case/representationList";
const CaseSummary = (props) => {
const Case = (props) => {
const { showRepresentations } = props;
let { t } = useTranslation();
const router = useRouter();
@@ -43,12 +44,19 @@ const CaseSummary = (props) => {
documentDetailsObj={props.documentDetailsObj}
documentHistoryObj={props.documentHistoryObj}
/>
<RepresentationList />
{showRepresentations == "true" && (
<RepresentationList
incidentid={props.incidentid}
caseReference={props.caseReference}
representationsObj={props.representationsObj}
documentDetailsObj={props.documentDetailsObj}
documentHistoryObj={props.documentHistoryObj}
/>
)}
</div>
</div>
</main>
);
};
export default CaseSummary;
export default Case;
components/case/documents.js
+28 -14
View File
@@ -7,6 +7,7 @@ import { useDispatch, useSelector, shallowEqual, connect } from "react-redux";
import transLookup from "../../data/lookuptranslations.json";
import PaginationControl from "./pagination";
import LoadingOverlay from "react-loading-overlay";
import CryptoJS from "crypto-js";
import {
getBasicSearch,
@@ -15,7 +16,7 @@ import {
getSearchDocumentHistory1,
getSearchDocumentHistory1Paged,
getSearchDocumentDetails1Paged,
getSASToken,
getToken,
} from "../../actions";
import {
@@ -104,10 +105,9 @@ const DocumentDetails = (props) => {
>
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<a
href={
"/api/proxy/documents/download/" +
href={encryptDocReference(
detailsObj.pinswg_isharedocumentreference
}
)}
>
<span className="results-visually-hidden">
{t(
@@ -184,13 +184,27 @@ const DocumentDetails = (props) => {
<PaginationControl
currentPage={currentPage}
searchResultsObj={documentDetailsObj}
spinnerState={spinnerState}
// spinnerState={spinnerState}
getDocumentResults={getDocumentResults}
/>
</>
);
};
const WORDKEY = process.env.NEXT_PUBLIC_HASHKEY;
const encryptDocReference = (documentRef) => {
var hashlink = CryptoJS.HmacSHA256(
"documents/download/" + documentRef,
CryptoJS.enc.Hex.parse(WORDKEY)
);
hashlink = hashlink.toString(CryptoJS.enc.Hex);
return (
"/api/proxy/documents/download/" + documentRef + "?hash=" + hashlink
);
};
useEffect(() => {
const docDetailsObj = async () => {
let docObj = await getSearchDocumentDetails1(incidentid)
@@ -249,7 +263,7 @@ const DocumentDetails = (props) => {
//console.log("getting details", data);
return getDocumentHistory(data.value).then((data) => {
setDocumentHistory(data);
setShowSpinnerState(false);
//setShowSpinnerState(false);
});
});
};
@@ -330,13 +344,13 @@ const DocumentDetails = (props) => {
)
: pagesCount;
const [showSpinnerState, setShowSpinnerState] = useState(false);
//const [showSpinnerState, setShowSpinnerState] = useState(false);
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
};
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
const [showDocumentSearchState, setDocumentSearchState] = useState(false);
@@ -370,11 +384,11 @@ const DocumentDetails = (props) => {
</div>
</div>
</div>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</>
);
};
components/case/pagination.js
+5 -5
View File
@@ -81,8 +81,8 @@ const PaginationControl = (props) => {
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem leftTextButton"
onClick={() => {
spinnerState(),
getDocumentResults(currentPage - 1);
// spinnerState(),
getDocumentResults(currentPage - 1);
}}
>
{t("common:previous-link-button")}
@@ -114,7 +114,7 @@ const PaginationControl = (props) => {
className="govuk-body govuk-link govuk-!-padding-2 govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem"
key={i}
onClick={() => {
spinnerState();
// spinnerState();
console.log(i + 1);
getDocumentResults(i + 1);
}}
@@ -129,8 +129,8 @@ const PaginationControl = (props) => {
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem rightTextButton"
onClick={() => {
spinnerState(),
getDocumentResults(currentPage + 1);
// spinnerState(),
getDocumentResults(currentPage + 1);
}}
>
{t("common:next-link-button")}
components/case/representationList.js
+224 -10
View File
@@ -7,35 +7,249 @@ import jsonpath from "jsonpath";
import _ from "lodash";
import transLookup from "../../data/lookuptranslations.json";
import LoadingOverlay from "react-loading-overlay";
import { getRepresentations } from "../../actions";
import { setRepresentations } from "../../store/searchOutput/action";
import PaginationControl from "./pagination";
const RepresentationList = (props) => {
const { incidentid, representationsObj, setRepresentations } = props;
let { t } = useTranslation();
const router = useRouter();
const { locale } = router;
const [showSpinnerState, setShowSpinnerState] = useState(false);
// const [showSpinnerState, setShowSpinnerState] = useState(false);
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
var representationsArr = representationsObj || [];
const RepresentationsView = (representationsArr) => {
//console.log(documentDetailsArr);
representationsArr = representationsArr.value;
return (
<>
<p>
{representationsObj["@odata.count"] > 1
? t("case:documents-count-label-1")
: t("case:documents-count-label-1a")}{" "}
{representationsObj["@odata.count"]}{" "}
{
representationsObj["@odata.count"] > 1
? "representations " //t("case:documents-count-label-2")
: "representations " //t("case:documents-count-label-2a")
}
</p>
<dl className="documentList govuk-summary-list govuk-!-margin-bottom-9 results">
<div className="govuk-summary-list__row results-headings">
<dd className="govuk-summary-list__key govuk-!-font-size-16 ">
{
"Type of representation" //t("case:documents-name-label")
}
</dd>
<dd className="govuk-summary-list__key govuk-!-font-size-16">
{t("case:documents-doc-type-label")}
</dd>
<dd className="govuk-summary-list__key govuk-!-font-size-16">
{t("case:documents-date-published-label")}
</dd>
</div>
{representationsArr.map((item, key) => {
let detailsObj = jsonpath.query(
item,
"$..[?(@.pinswg_representationsid=='" +
incidentid +
"')]"
);
detailsObj = item;
console.log(detailsObj);
return (
<div className="govuk-summary-list__row" key={key}>
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<a
href={
"/api/proxy/documents/download/" +
detailsObj.pinswg_isharedocumentreference
}
>
<span className="results-visually-hidden">
{t("case:documents-name-label")}:
</span>
{
detailsObj[
"pinswg_whatkind@OData.Community.Display.V1.FormattedValue"
]
}
</a>
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t("case:documents-doc-type-label")}:
</span>
{router.locale == "cy"
? jsonpath.query(
transLookup,
'$..[?(@.value=="' +
detailsObj[
"pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
] +
'")].value_cy'
)
: detailsObj[
"pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue"
] ||
t(
"case:summary-no-date-entered-label"
)}
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"case:documents-date-published-label"
)}
:
</span>
{formatDates(
detailsObj[
"createdon@OData.Community.Display.V1.FormattedValue"
]
)}
</dd>
{/* <dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t("case:documents-size-label")}:
</span>
92
</dd> */}
</div>
);
})}
</dl>
{/* <PaginationControl
currentPage={currentPage}
searchResultsObj={documentDetailsObj}
// spinnerState={spinnerState}
getDocumentResults={getDocumentResults}
/> */}
</>
);
};
useEffect(() => {
const representationDetailsObj = async () => {
let docObj = await getRepresentations(incidentid).then((data) => {
console.log(data);
setRepresentationSearchState(true);
setRepresentations(data);
return data;
});
return docObj;
};
const representationResultsObj = representationDetailsObj();
}, [incidentid, setRepresentations]);
function formatDates(dateObj) {
var dateObj = new Date(dateObj);
var dd = String(dateObj.getDate()).padStart(2, "0");
var mm = String(dateObj.getMonth() + 1).padStart(2, "0"); //January is 0!
var yyyy = dateObj.getFullYear();
return dd + "/" + mm + "/" + yyyy;
}
const pagesCount = Math.ceil(representationsObj["@odata.count"] / 10);
let currentPage = 0;
currentPage = decodeURI(representationsObj["@odata.nextLink"]).split(
"skiptoken="
)[1];
currentPage =
typeof currentPage != "undefined"
? parseInt(
decodeURI(currentPage)
.split('pagenumber="')[1]
.slice(
0,
decodeURI(currentPage)
.split('pagenumber="')[1]
.indexOf('"')
) - 1
)
: pagesCount;
//const [showSpinnerState, setShowSpinnerState] = useState(false);
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
const [showReperesentationSearchState, setRepresentationSearchState] =
useState(false);
let representationSearchState = () => {
showReperesentationSearchState == true
? setRepresentationSearchState(false)
: setRepresentationSearchState(true);
};
return (
<>
<div>
<div className="govuk-grid-row">
<div className="card">
<div className="govuk-grid-row card-body">
<div className="govuk-grid-column-full">
<h2>Representations</h2>
{_.isEmpty(representationsObj) ? (
<div className="govuk-grid-row">
<div className="govuk-grid-column-two-thirds">
<h3>
{showReperesentationSearchState == false
? "Checking for representations "
: t(
"case:documents-non-available-label"
)}
</h3>
</div>
</div>
) : (
RepresentationsView(representationsArr)
)}
</div>
</div>
</div>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</>
);
};
export default RepresentationList;
const mapStateToProps = (state) => {
return {
...state,
};
};
const mapDispatchToProps = (dispatch) => {
return {
setRepresentations: (representationObj) => {
dispatch(setRepresentations(representationObj));
},
};
};
export default connect(mapStateToProps, mapDispatchToProps)(RepresentationList);
components/case/summary.js
+12 -12
View File
@@ -215,15 +215,15 @@ const CaseSummary = (props) => {
</Link>
)}
<a
{/* <a
onClick={() => {
spinnerState();
//spinnerState();
router.back();
}}
className="govuk-button govuk-button--secondary"
>
{t("case:summary-back-button-label")}
</a>
</a> */}
</div>
</div>
</div>
@@ -257,7 +257,7 @@ const CaseSummary = (props) => {
<a
onClick={() => {
spinnerState();
// spinnerState();
router.back();
}}
className="govuk-button govuk-button--secondary"
@@ -570,13 +570,13 @@ const CaseSummary = (props) => {
const linkedCases = linkCaseObj();
}, [incidentid, setCurrentLinkedCases]);
const [showSpinnerState, setShowSpinnerState] = useState(false);
// const [showSpinnerState, setShowSpinnerState] = useState(false);
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
};
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
function formatDates(dateObj) {
var dateObj = new Date(dateObj);
@@ -631,11 +631,11 @@ const CaseSummary = (props) => {
return (
<>
{showDetailsBlock}
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>{" "}
/> */}
</>
);
};
components/case/summaryTypes/pinswg_advertsid.js
+23 -21
View File
@@ -148,29 +148,31 @@ const Pinswg_advertsid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
components/case/summaryTypes/pinswg_callinss77id.js
+25 -28
View File
@@ -148,29 +148,31 @@ const Pinswg_callinss77id = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -232,7 +234,6 @@ const Pinswg_callinss77id = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
@@ -258,7 +259,6 @@ const Pinswg_callinss77id = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
@@ -284,7 +284,6 @@ const Pinswg_callinss77id = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
@@ -323,7 +322,6 @@ const Pinswg_callinss77id = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
@@ -349,7 +347,7 @@ const Pinswg_callinss77id = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -373,7 +371,7 @@ const Pinswg_callinss77id = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
@@ -397,7 +395,6 @@ const Pinswg_callinss77id = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-decision-date-label")}
components/case/summaryTypes/pinswg_commonlandid.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_commonlandid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -369,7 +371,7 @@ const Pinswg_commonlandid = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -393,7 +395,7 @@ const Pinswg_commonlandid = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_communityinfrastructurelevyid.js
+23 -21
View File
@@ -148,29 +148,31 @@ const Pinswg_communityinfrastructurelevyid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
components/case/summaryTypes/pinswg_compulsorypurchaseordersid.js
+25 -23
View File
@@ -130,29 +130,31 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -351,7 +353,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -375,7 +377,7 @@ const Pinswg_compulsorypurchaseordersid = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_dnsid.js
+36 -22
View File
@@ -189,29 +189,31 @@ const Pinswg_dnsid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -263,7 +265,19 @@ const Pinswg_dnsid = (props) => {
detailsObj.pinswg_webaddress +
'")].value_cy'
)
: detailsObj.pinswg_webaddress ||
: (
<a
target="_blank"
rel="noreferrer"
href={
detailsObj.pinswg_webaddress
}
>
{
detailsObj.pinswg_webaddress
}
</a>
) ||
t(
"case:summary-no-date-entered-label"
)}
components/case/summaryTypes/pinswg_electricityactid.js
+23 -21
View File
@@ -188,29 +188,31 @@ const Pinswg_electricityactid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
components/case/summaryTypes/pinswg_enforcementlistedbuildingconseid.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -349,7 +351,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -373,7 +375,7 @@ const Pinswg_enforcementlistedbuildingconseid = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_enforcementnoticeappeals174id.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -349,7 +351,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -373,7 +375,7 @@ const Pinswg_enforcementnoticeappeals174id = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_environmentalpermittingid.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_environmentalpermittingid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -369,7 +371,7 @@ const Pinswg_environmentalpermittingid = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -393,7 +395,7 @@ const Pinswg_environmentalpermittingid = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_harbourrevisionorderid.js
+23 -21
View File
@@ -188,29 +188,31 @@ const Pinswg_harbourrevisionorderid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
components/case/summaryTypes/pinswg_hedgeshedgerowstreepreservatioid.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -369,7 +371,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -393,7 +395,7 @@ const Pinswg_hedgeshedgerowstreepreservatioid = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_householderappealhasid.js
+23 -21
View File
@@ -148,29 +148,31 @@ const Pinswg_householderappealhasid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
components/case/summaryTypes/pinswg_lawfuldevelopmentcertificatappid.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -349,7 +351,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -373,7 +375,7 @@ const Pinswg_lawfuldevelopmentcertificatappid = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_ldpid.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_ldpid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -349,7 +351,7 @@ const Pinswg_ldpid = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -373,7 +375,7 @@ const Pinswg_ldpid = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_listedbuildingandconservationrid.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -349,7 +351,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -373,7 +375,7 @@ const Pinswg_listedbuildingandconservationrid = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_maintenanceoflands217id.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_maintenanceoflands217id = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -349,7 +351,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -373,7 +375,7 @@ const Pinswg_maintenanceoflands217id = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_miscellaneouscasewordid.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_miscellaneouscasewordid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -369,7 +371,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -393,7 +395,7 @@ const Pinswg_miscellaneouscasewordid = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_planningappeals78id.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_planningappeals78id = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -349,7 +351,7 @@ const Pinswg_planningappeals78id = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -373,7 +375,7 @@ const Pinswg_planningappeals78id = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_planningconditionss73s79id.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_planningconditionss73s79id = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -349,7 +351,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -373,7 +375,7 @@ const Pinswg_planningconditionss73s79id = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_planningobligationappeals106id.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_planningobligationappeals106id = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -349,7 +351,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -373,7 +375,7 @@ const Pinswg_planningobligationappeals106id = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_rowid.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_rowid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -369,7 +371,7 @@ const Pinswg_rowid = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -393,7 +395,7 @@ const Pinswg_rowid = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/case/summaryTypes/pinswg_wayleaveid.js
+25 -23
View File
@@ -148,29 +148,31 @@ const Pinswg_wayleaveid = (props) => {
</Link> */}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
{casesObj.numberofchildincidents > 0 && (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-case-link-status-label"
)}
</dt>
<dd className="govuk-summary-list__value">
{_.has(casesObj, [
"numberofchildincidents",
])
? casesObj.numberofchildincidents >
0
? t(
"case:summary-case-link-status-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)
: t(
"case:summary-case-link-status-not-linked"
)}
</dd>
</div>
)}
</dd>
</div>
)}
{casesObj.numberofchildincidents > 0 ? (
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
@@ -369,7 +371,7 @@ const Pinswg_wayleaveid = (props) => {
)}
</dd>
</div>
<div className="govuk-summary-list__row">
{/* <div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t(
"case:summary-inquiry-evidence-date-label"
@@ -393,7 +395,7 @@ const Pinswg_wayleaveid = (props) => {
"case:summary-no-date-entered-label"
)}
</dd>
</div>
</div> */}
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-event-date-label")}
components/cookieBanner.js
+13 -2
View File
@@ -17,11 +17,22 @@ const CookieBanner = () => {
let expDate = new Date(now);
expDate.setDate(now.getDate() + 365);
console.log(expDate);
cookie.set("planning_casework", true, {
expires: expDate,
});
let cookieStr = {
"essential": "accepted",
"usage": "accepted",
"communications": "accepted",
"settings": "accepted",
};
cookie.set("CookiePolicy", JSON.stringify(cookieStr).toString(), {
expires: expDate,
path: "/",
});
setBannerVisible(false);
};
components/cookiePolicy.js
+192
View File
@@ -0,0 +1,192 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
const CookiePolicy = (props) => {
let { t } = useTranslation();
const { whichError } = props;
const router = useRouter();
const { locale } = router;
return (
<main
className="govuk-main-wrapper govuk-!-padding-top-9 govuk-main-wrapper--auto-spacing"
id="main-content"
role="main"
>
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<h1 className="govuk-heading-xl govuk-!-margin-bottom-7">
{t("cookies:cookie-policy-title-heading")}
</h1>
<p className="govuk-body">
{t("cookies:cookie-policy-intro-paragraph")}
</p>
<h2 className="govuk-heading-l ">
{t("cookies:cookie-policy-sub-heading-one")}
</h2>
<p className="govuk-body">
{t("cookies:cookie-policy-paragraph-one")}
</p>
<dl className="govuk-summary-list govuk-!-margin-bottom-9 results">
<div className="govuk-summary-list__row results-headings">
<dd className="govuk-summary-list__key govuk-!-font-size-16 results_wider ">
{t("cookies:cookie-policy-list-heading-one")}
</dd>
<dd className="govuk-summary-list__key govuk-!-font-size-16">
{t("cookies:cookie-policy-list-heading-two")}
</dd>
<dd className="govuk-summary-list__key govuk-!-font-size-16">
{t("cookies:cookie-policy-list-heading-three")}
</dd>
<dd className="govuk-summary-list__key govuk-!-font-size-16">
{t("cookies:cookie-policy-list-heading-four")}
</dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"cookies:cookie-policy-list-heading-one"
)}
:
</span>
{t(
"cookies:cookie-policy-list-row-one-item-one"
)}
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"cookies:cookie-policy-list-heading-two"
)}
:
</span>
{t(
"cookies:cookie-policy-list-row-one-item-two"
)}
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"cookies:cookie-policy-list-heading-three"
)}
:
</span>
{t(
"cookies:cookie-policy-list-row-one-item-three"
)}
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"cookies:cookie-policy-list-heading-four"
)}
:
</span>
{t(
"cookies:cookie-policy-list-row-one-item-four"
)}
</dd>
</div>
<div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
<span className="results-visually-hidden">
{t(
"cookies:cookie-policy-list-heading-one"
)}
:
</span>
{t(
"cookies:cookie-policy-list-row-two-item-one"
)}
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"cookies:cookie-policy-list-heading-two"
)}
:
</span>
{t(
"cookies:cookie-policy-list-row-two-item-two"
)}{" "}
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"cookies:cookie-policy-list-heading-three"
)}
:
</span>
{t(
"cookies:cookie-policy-list-row-two-item-three"
)}
</dd>
<dd className="govuk-summary-list__value govuk-!-font-size-16">
<span className="results-visually-hidden">
{t(
"cookies:cookie-policy-list-heading-four"
)}
:
</span>
{t(
"cookies:cookie-policy-list-row-two-item-four"
)}
</dd>
</div>
</dl>
<p className="govuk-body">
{t("cookies:cookie-policy-browser-find-out-more")}{" "}
<a
href={t(
"cookies:cookie-policy-browser-find-out-more"
)}
>
{t(
"cookies:cookie-policy-browser-find-out-more-link"
)}
</a>
.
</p>
<h2 className="govuk-heading-l ">
{t("cookies:cookie-policy-sub-heading-two")}
</h2>
<p className="govuk-body">
{t("cookies:cookie-policy-paragraph-two")}
</p>
<p className="govuk-body">
{t("cookies:cookie-policy-paragraph-three")}
<a href="https://policies.google.com/privacy">
{t("cookies:cookie-policy-paragraph-three-link-a")}
</a>
, {t("cookies:cookie-policy-paragraph-three-a")}{" "}
<a href="https://policies.google.com/terms">
{t("cookies:cookie-policy-paragraph-three-link-b")}
</a>{" "}
{t("cookies:cookie-policy-paragraph-three-b")}
</p>
<p className="govuk-body">
{t("cookies:cookie-policy-paragraph-four")}
</p>
<p className="govuk-body">
{t("cookies:cookie-policy-paragraph-five")}
</p>
</div>
</div>
</main>
);
};
export default CookiePolicy;
components/cookiemanager/index.js
+35 -21
View File
@@ -28,33 +28,47 @@ const CookieManagementMain = (props) => {
let expDate = new Date(now);
expDate.setDate(now.getDate() + 365);
cookie.set("pinsCookiePolicy", JSON.stringify(values).toString(), {
cookie.set("CookiePolicy", JSON.stringify(values).toString(), {
expires: expDate,
path: "/",
});
function delete_cookie(name, path, domain) {
document.cookie =
name +
"=" +
(path ? ";path=" + path : "") +
(domain ? ";domain=" + domain : "") +
";expires=Thu, 01 Jan 1970 00:00:01 GMT";
}
usageState == "revoked" && delete_cookie("CookiePolicy", "/"),
delete_cookie("_ga", "/"),
delete_cookie("_gid", "/");
cookie.set("planning_casework", true, {
expires: expDate,
path: "/",
});
};
let cookieCheck = parseCookies();
let cookieObj =
typeof cookieCheck.pinsCookiePolicy == "undefined"
typeof cookieCheck.CookiePolicy == "undefined"
? {}
: JSON.parse(cookieCheck.pinsCookiePolicy);
: JSON.parse(cookieCheck.CookiePolicy);
const [usageState, setUsageState] = useState(
typeof cookieCheck.pinsCookiePolicy == "undefined"
? null
: cookieObj.usage
typeof cookieCheck.CookiePolicy == "undefined" ? null : cookieObj.usage
);
const [communicationsState, setCommunicationsState] = useState(
typeof cookieCheck.pinsCookiePolicy == "undefined"
typeof cookieCheck.CookiePolicy == "undefined"
? null
: cookieObj.communications
);
const [settingsState, setSettingsState] = useState(
typeof cookieCheck.pinsCookiePolicy == "undefined"
typeof cookieCheck.CookiePolicy == "undefined"
? null
: cookieObj.settings
);
@@ -78,17 +92,17 @@ const CookieManagementMain = (props) => {
const CookieForm = () => {
return (
<main
className="govuk-main-wrapper govuk-!-padding-top-4 govuk-main-wrapper--auto-spacing"
className="govuk-main-wrapper govuk-!-padding-top-9 govuk-main-wrapper--auto-spacing"
id="main-content"
role="main"
>
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<h1 className="govuk-heading-xl govuk-!-margin-bottom-5">
<h1 className="govuk-heading-l govuk-!-margin-bottom-5">
{t("cookies:cookie-title-heading")}
</h1>
<hr className="govuk-section-break govuk-section-break--visible" />
{typeof cookieCheck.pinsCookiePolicy == "undefined" ? (
{typeof cookieCheck.CookiePolicy == "undefined" ? (
<>
<div className="govuk-inset-text paragraph--type--call-out-message">
<h2 className="govuk-heading-l">
@@ -107,8 +121,7 @@ const CookieManagementMain = (props) => {
<div
className={
typeof cookieCheck.pinsCookiePolicy !=
"undefined"
typeof cookieCheck.CookiePolicy != "undefined"
? "govuk-body govuk-!-margin-top-5"
: "govuk-body"
}
@@ -226,7 +239,7 @@ const CookieManagementMain = (props) => {
</div>
</legend>
</fieldset>
<fieldset className="govuk-fieldset">
{/* <fieldset className="govuk-fieldset">
<legend className="govuk-fieldset__legend">
<h4 className="govuk-!-font-size-27">
{t(
@@ -297,7 +310,7 @@ const CookieManagementMain = (props) => {
</label>
</div>
</div>
</fieldset>
</fieldset> */}
<fieldset className="govuk-fieldset">
<legend className="govuk-fieldset__legend">
@@ -399,16 +412,17 @@ const CookieManagementMain = (props) => {
)}
</p>
<p className="govuk-body">
<a
className="govuk-link govuk-link--no-underline govuk-!-font-weight-bold"
<Link
href={t(
"cookies:cookie-settings-essential-link"
)}
>
{t(
"cookies:cookie-settings-essential-link-label"
)}
</a>
<a className="govuk-link govuk-link--no-underline govuk-!-font-weight-bold">
{t(
"cookies:cookie-settings-essential-link-label"
)}
</a>
</Link>
</p>
</legend>
</fieldset>
components/footer.js
+46 -31
View File
@@ -167,17 +167,22 @@ export default function Footer(props) {
id="footer_links"
>
<li className="govuk-footer__inline-list-item">
<a
href={t(
"common:footer-accessibility-link"
)}
className="govuk-footer__link"
id="aAccess"
<Link
href={
router.locale == "cy"
? "/hygyrchedd"
: "/accessibility"
}
>
{t(
"common:footer-accessibility-link-label"
)}
</a>
<a
className="govuk-footer__link"
id="aAccess"
>
{t(
"common:footer-accessibility-link-label"
)}
</a>
</Link>
</li>
<li className="govuk-footer__inline-list-item">
@@ -204,7 +209,7 @@ export default function Footer(props) {
"common:footer-copyright-link"
)}
className="govuk-footer__link"
id="aAccess"
id="Access"
>
{t(
"common:footer-copyright-link-label"
@@ -213,31 +218,41 @@ export default function Footer(props) {
</li>
<li className="govuk-footer__inline-list-item">
<a
href={t(
"common:footer-privacy-link"
)}
id="aPrivacy"
className="govuk-footer__link"
<Link
href={
router.locale == "cy"
? "/preifatrwydd"
: "/privacy"
}
>
{t(
"common:footer-privacy-link-label"
)}
</a>
<a
id="aPrivacy"
className="govuk-footer__link"
>
{t(
"common:footer-privacy-link-label"
)}
</a>
</Link>
</li>
<li className="govuk-footer__inline-list-item">
<a
href={t(
"common:footer-terms-conditions-link"
)}
id="aTermsConds"
className="govuk-footer__link"
<Link
href={
router.locale == "cy"
? "/telerau-ac-amodau"
: "/terms-and-conditions"
}
>
{t(
"common:footer-terms-conditions-link-label"
)}
</a>
<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
components/homepage/casesearch.js
+10 -10
View File
@@ -76,22 +76,22 @@ let CaseSearch = (props) => {
const router = useRouter();
const { locale } = router;
const [showSpinnerState, setShowSpinnerState] = useState(false);
//const [showSpinnerState, setShowSpinnerState] = useState(false);
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
};
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
const onHandleSubmit = (values) => {
spinnerState();
// spinnerState();
router.replace({
pathname:
router.locale == "cy"
? "/canlyniadauchwilio"
: "/searchresults",
query: { q: values.basicSearch },
query: { q: values.basicSearch.trim() },
shallow: true,
});
};
@@ -151,11 +151,11 @@ let CaseSearch = (props) => {
</Link>
</div>
</form>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</div>
</>
);
components/homepage/dns.js
+11 -11
View File
@@ -6,16 +6,16 @@ import LoadingOverlay from "react-loading-overlay";
export default function Dns() {
let { t } = useTranslation();
const [showSpinnerState, setShowSpinnerState] = useState(false);
//const [showSpinnerState, setShowSpinnerState] = useState(false);
const router = useRouter();
const { locale } = router;
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
};
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
return (
<div className="card" id="casesearch-card">
<div className="card-body">
@@ -37,20 +37,20 @@ export default function Dns() {
>
<a
className="govuk-button withChevron govuk-button-cta"
onClick={() => {
spinnerState();
}}
// onClick={() => {
// spinnerState();
// }}
>
{t("home:dns-card-button")}
</a>
</Link>
</div>
</div>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-loading")}
/>
/> */}
</div>
);
}
components/homepage/login.js
+21 -14
View File
@@ -114,17 +114,22 @@ let Login = (props) => {
const router = useRouter();
const { locale } = router;
const [showSpinnerState, setShowSpinnerState] = useState(false);
// const [showSpinnerState, setShowSpinnerState] = useState(false);
const [validLoginID, setValidLoginID] = useState(null);
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
};
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
const onHandleSubmit = (values) => {
spinnerState();
//spinnerState();
let now = new Date();
let expDate = new Date(now);
expDate.setDate(now.getDate() + 1);
getLogin(values.loginUserID, values.loginUserPassword).then((data) => {
data.value.length != 0
@@ -132,14 +137,16 @@ let Login = (props) => {
setLoggedInUserId(data.value[0].contactid),
setCookie(null, "pinsUser", data.value[0].contactid, {
path: "/",
expires: expDate,
}),
spinnerState(),
// spinnerState(),
router.replace({
pathname:
router.locale == "cy" ? "/fymhorth" : "/myportal",
shallow: true,
}))
: (setShowSpinnerState(false), setValidLoginID(false));
: //setShowSpinnerState(false),
setValidLoginID(false);
});
};
@@ -147,12 +154,12 @@ let Login = (props) => {
useEffect(() => {
cookies.pinsUser != null || typeof cookies.pinsUser != "undefined"
? (spinnerState(),
? // spinnerState(),
router.replace("/myportal", null, {
shallow: true,
}))
})
: "";
}, []);
}, [cookies.pinsUser, router]);
return (
<div className="card" id="login-card">
@@ -243,11 +250,11 @@ let Login = (props) => {
</div>
</div>
</form>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text="Logging in"
/>
/> */}
</div>
);
};
components/myportal/searchcases.js
+9 -9
View File
@@ -71,16 +71,16 @@ let CaseSearch = (props) => {
const router = useRouter();
const { locale } = router;
const [showSpinnerState, setShowSpinnerState] = useState(false);
//const [showSpinnerState, setShowSpinnerState] = useState(false);
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
};
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
const onHandleSubmit = (values) => {
spinnerState();
//spinnerState();
router.push({
pathname:
router.locale == "cy"
@@ -143,11 +143,11 @@ let CaseSearch = (props) => {
</Link>
</div>
</form>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</div>
</>
);
components/myportal/topthree.js
+2 -2
View File
@@ -6,7 +6,7 @@ import { setCurrentReference } from "../../store/currentView/action";
import { connect } from "react-redux";
import { parseCookies } from "nookies";
import {
getSASToken,
getToken,
getWatchedCasesProxy,
getPortalModuleDetailsProxy,
deleteWatchedCases,
@@ -37,7 +37,7 @@ const TopThree = (props) => {
let showTopThreeArr = showTopThree.value;
const deleteItem = (caseID, topThreeType) => {
let token = getSASToken();
let token = getToken();
let cookies = parseCookies();
topThreeType == "watchedCases" &&
deleteWatchedCases(caseID)
components/newappeal/complete.js
+1
View File
@@ -56,6 +56,7 @@ let CompleteAppeal = (props) => {
props.props.form.appealForm.values,
props.appealType.appealLPA,
props.props.accountDetails.loggedinUserId,
props.appealType.appealTypeID,
]);
const getFormCollection = (formtype) => {
components/privacy.js
+31
View File
@@ -0,0 +1,31 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
const PrivacyStatement = (props) => {
let { t } = useTranslation();
const { whichError } = props;
const router = useRouter();
const { locale } = router;
return (
<main
className="govuk-main-wrapper govuk-!-padding-top-9 govuk-main-wrapper--auto-spacing"
id="main-content"
role="main"
>
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<h1 className="govuk-heading-l govuk-!-margin-bottom-7">
Privacy Statement
</h1>
<p>bkah blah</p>
</div>
</div>
</main>
);
};
export default PrivacyStatement;
components/search/advancedsearch.js
+11 -13
View File
@@ -218,21 +218,22 @@ let AdvancedSearch = (props) => {
const required = (value) => (value ? undefined : "Required");
const [showSpinnerState, setShowSpinnerState] = useState(false);
// const [showSpinnerState, setShowSpinnerState] = useState(false);
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
};
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
const onHandleSubmit = (values) => {
event.preventDefault();
spinnerState();
//spinnerState();
var searchString = "";
searchString += values.caseRef != null ? "?q=" + values.caseRef : "";
searchString +=
values.caseRef != null ? "?q=" + values.caseRef.trim() : "";
searchString +=
values.lpaTypes != null
? (typeof values.caseRef == "undefined" ? "?" : "&") +
@@ -411,14 +412,11 @@ let AdvancedSearch = (props) => {
</div>
</form>
</div>
{/* <div id="" className="spinnermodal">
</div> */}
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</>
);
};
components/search/dnssearchresults.js
+10 -10
View File
@@ -38,13 +38,13 @@ const DNSSearchResults = (props) => {
var resultsArr = searchResultsObj.value || [];
const [showSpinnerState, setShowSpinnerState] = useState(false);
//const [showSpinnerState, setShowSpinnerState] = useState(false);
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
};
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
const ResultsView = (resultsArr) => {
return (
@@ -226,7 +226,7 @@ const DNSSearchResults = (props) => {
<PaginationControl
currentPage={currentPage}
searchResultsObj={searchResultsObj}
spinnerState={spinnerState}
// spinnerState={spinnerState}
getSearchPageResults={getSearchPageResults}
/>
</div>
@@ -268,7 +268,7 @@ const DNSSearchResults = (props) => {
//console.log("getting details", data);
return getSearchDetailsPaged(data).then((data) => {
setSearchDetails(data);
setShowSpinnerState(false);
//setShowSpinnerState(false);
});
});
};
@@ -301,11 +301,11 @@ const DNSSearchResults = (props) => {
</div>
</div>
)}
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</>
);
};
components/search/pagination.js
+6 -6
View File
@@ -7,7 +7,7 @@ const PaginationControl = (props) => {
searchString,
searchResultsObj,
currentPage,
spinnerState,
// spinnerState,
getSearchPageResults,
} = props;
let { t } = useTranslation();
@@ -81,8 +81,8 @@ const PaginationControl = (props) => {
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem leftTextButton"
onClick={() => {
spinnerState(),
getSearchPageResults(currentPage - 1);
// spinnerState(),
getSearchPageResults(currentPage - 1);
}}
>
{t("common:previous-link-button")}
@@ -114,7 +114,7 @@ const PaginationControl = (props) => {
className="govuk-body govuk-link govuk-!-padding-2 govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem"
key={i}
onClick={() => {
spinnerState();
// spinnerState();
console.log(i + 1);
getSearchPageResults(i + 1);
}}
@@ -129,8 +129,8 @@ const PaginationControl = (props) => {
<span
className="govuk-body govuk-link govuk-!-font-weight-bold govuk-link--no-underline activePaginationItem rightTextButton"
onClick={() => {
spinnerState(),
getSearchPageResults(currentPage + 1);
// spinnerState(),
getSearchPageResults(currentPage + 1);
}}
>
{t("common:next-link-button")}
components/search/searchresults.js
+14 -14
View File
@@ -39,7 +39,7 @@ import {
import {
createWatchedCases,
getSASToken,
getToken,
getWatchedCasesProxy,
getPortalModuleDetailsProxy,
deleteWatchedCases,
@@ -66,18 +66,18 @@ const SearchResults = (props) => {
var resultsArr = searchResultsObj.value || [];
const [showSpinnerState, setShowSpinnerState] = useState(false);
// const [showSpinnerState, setShowSpinnerState] = useState(false);
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
};
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
const cookies = parseCookies();
const selectWatchedCase = (loggedInUser, incidentID, appealType) => {
let token = getSASToken();
let token = getToken();
let updateBody = {
"pinswg_WatchedCase@odata.bind": "/incidents(" + incidentID + ")",
@@ -109,7 +109,7 @@ const SearchResults = (props) => {
};
const deleteItem = (caseID, topThreeType) => {
let token = getSASToken();
let token = getToken();
let cookies = parseCookies();
topThreeType == "watchedCases" &&
deleteWatchedCases(caseID)
@@ -430,7 +430,7 @@ const SearchResults = (props) => {
<PaginationControl
currentPage={currentPage}
searchResultsObj={searchResultsObj}
spinnerState={spinnerState}
// spinnerState={spinnerState}
getSearchPageResults={getSearchPageResults}
/>
</>
@@ -476,7 +476,7 @@ const SearchResults = (props) => {
//console.log("getting details", data);
return getSearchDetailsPaged(data).then((data) => {
setSearchDetails(data);
setShowSpinnerState(false);
//setShowSpinnerState(false);
});
});
} else {
@@ -490,7 +490,7 @@ const SearchResults = (props) => {
//console.log("getting details", data);
return getSearchDetailsPaged(data).then((data) => {
setSearchDetails(data);
setShowSpinnerState(false);
//setShowSpinnerState(false);
});
});
}
@@ -535,11 +535,11 @@ const SearchResults = (props) => {
)}
</div>
</div>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text={t("common:spinner-searching")}
/>
/> */}
</>
);
};
components/tandc.js
+31
View File
@@ -0,0 +1,31 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
const TermsAndConditionsStatement = (props) => {
let { t } = useTranslation();
const { whichError } = props;
const router = useRouter();
const { locale } = router;
return (
<main
className="govuk-main-wrapper govuk-!-padding-top-9 govuk-main-wrapper--auto-spacing"
id="main-content"
role="main"
>
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<h1 className="govuk-heading-l govuk-!-margin-bottom-7">
{t("common:footer-terms-conditions-link-label")}
</h1>
<p>bkah blah</p>
</div>
</div>
</main>
);
};
export default TermsAndConditionsStatement;
data/lookuptranslations.json
-5
View File
@@ -375,11 +375,6 @@
"value": "Snowdonia National Park Authority",
"value_cy": "Parc Cenedlaethol Eryri",
"pinswg_lpa": 0
},
{
"value": "Developments of National Significance",
"value_cy": "Datblygiad o Arwyddocâd Cenedlaethol",
"pinswg_lpa": 0
}
],
"pinswg_procedure": [
i18n.js
+2
View File
@@ -33,5 +33,7 @@ module.exports = {
"/dnsdetails": ["case", "search", "dnsCommon", "dnsApplications"],
"/help/cookies": ["common", "cookies"],
"/account/register": ["common", "account"],
"/details-about-cookies": ["common", "cookies"],
"/terms-and-conditions": ["common"],
},
};
locales/cy/common.json
+6 -6
View File
@@ -4,7 +4,7 @@
"gov-wales-link": "https://llyw.cymru",
"gov-wales-label": "LLYW.CYMRU",
"service-description": "Mae'r gwasanaeth hwn yn cael ei ddatblygu i gefnogi apeliadau a cheisiadau ar-lein.",
"service-name": "Gwaith achos cynllunio",
"service-name": "Gwaith Achos",
"service-name-breadcrumb": "Hafan",
"new-service-beta": "Mae hwn yn wasanaeth newydd",
"breadcrumb-back-link": "Yn ôl",
@@ -16,21 +16,21 @@
"search-button": "Chwilio",
"submit-and-start": "Cyflwyno a dechrau'r cwrs",
"footer-terms-conditions-link-label": "Telerau ac amodau",
"footer-terms-conditions-link": "https://llyw.cymru/telerau-ac-amodau",
"footer-terms-conditions-link": "/telerau-ac-amodau",
"footer-privacy-link-label": "Preifatrwydd",
"footer-privacy-link": "https://llyw.cymru/help/polisi-preifatrwydd-wefan",
"footer-privacy-link": "/preifatrwydd",
"footer-cookies-link": "Cwcis",
"footer-accessibility-link-label": "Hygyrchedd",
"footer-accessibility-link": "https://llyw.cymru/datganiad-hygyrchedd-llywcymru",
"footer-accessibility-link": "/hygyrchedd",
"footer-feedback-link": "Adborth",
"footer-contact-us-link-label": "Cysylltu â ni",
"footer-contact-us-link": "https://llyw.cymru/cysylltu-ni",
"footer-contact-us-link": "https://llyw.cymru/penderfyndiadau-cynllunio-ac-amgylchedd-cymru/cysylltwch-ni",
"footer-copyright-link-label": "Datganiad hawlfraint",
"footer-copyright-link": "https://llyw.cymru/datganiad-hawlfraint",
"footer-alternative-languages-link-label": "Ieithoedd amgen",
"footer-alternative-languages-link": "https://llyw.cymru/ieithoedd-amgen",
"footer-guidance-link-label": "Canllawiau a gwasanaethau Penderfyniadau Cynllunio ac Amgylchedd Cymru",
"footer-guidance-link": "https://gov.wales/planning-and-environment-decisions-wales/guidance-services",
"footer-guidance-link": "https://llyw.cymru/penderfyndiadau-cynllunio-ac-amgylchedd-cymru/canllawiau-gwasanaethau",
"mobile-nav-label": "Dewislen",
"signout-label": "Allgofnodwch",
"back-to-top-link": "Nôl i dop y dudalen",
locales/cy/cookies.json
+35 -8
View File
@@ -1,22 +1,22 @@
{
"cookie-breadcrumb": "Cwcis",
"cookie-title-heading": "Cwcis ar LLYW.CYMRU",
"cookie-title-heading": "Cwcis ar cynllunio gwaith achos",
"cookie-not-saved-heading": "Nid yw eich dewisiadau cwcis wedi eu cadw eto",
"cookie-not-saved-paragraph": "Mae LLYW.CYMRU yn gosod cwcis pan fyddwch yn ymweld â'n gwefan. Gallwch newid y gosodiadau hyn i'ch dewis chi. Mae angen i chi gadw'r dudalen hon gyda'ch dewisiadau newydd.",
"cookie-not-saved-paragraph": "Mae y gwasanaeth gwaith achos cynllunio yn gosod cwcis pan fyddwch yn ymweld â'n gwefan. Gallwch newid y gosodiadau hyn i'ch dewis chi. Mae angen i chi gadw'r dudalen hon gyda'ch dewisiadau newydd.",
"cookie-intro-paragraph-1": "Ffeiliau sy'n cael eu cadw ar eich ffôn, tabled neu gyfrifiadur pan fyddwch yn ymweld â gwefan yw cwcis.",
"cookie-intro-paragraph-2": "Rydym yn defnyddio cwcis i storio gwybodaeth ynghylch sut yr ydych yn defnyddio gwefan LLYW.CYMRU, megis y tudalennau yr ydych yn ymweld â nhw. Nid yw'r cwcis hyn yn cael eu defnyddio i'ch adnabod chi'n bersonol.",
"cookie-intro-paragraph-2": "Rydym yn defnyddio cwcis i storio gwybodaeth ynghylch sut yr ydych yn defnyddio gwefan y gwasanaeth gwaith achos cynllunio, megis y tudalennau yr ydych yn ymweld â nhw. Nid yw'r cwcis hyn yn cael eu defnyddio i'ch adnabod chi'n bersonol.",
"cookie-intro-paragraph-3": "Rydym yn defnyddio 4 cwci gwahanol. Gallwch ddewis pa fath o gwcis rydych yn hapus i ni eu defnyddio.",
"cookie-settings-heading": "Gosodiadau cwcis",
"cookie-settings-usage-heading": "Cwcis sy'n mesur defnydd o'r wefan",
"cookie-settings-usage-paragraph-1": "Rydym yn defnyddio Google Analytics i fesur sut rydych yn defnyddio’r wefan er mwyn i ni ei gwella yn seiliedig ar anghenion defnyddwyr. Mae Google Analytics yn gosod cwcis sy’n storio gwybodaeth wedi’i hanonymeiddio ynghylch:",
"cookie-settings-usage-list-item-1": "sut daethoch chi i’r safle",
"cookie-settings-usage-list-item-2": "y tudalennau yr ydych yn ymweld â nhw ar LLYW.CYMRU a gwasanaethau digidol y llywodraeth, a pha mor hir yr ydych chi'n treulio ar bob tudalen",
"cookie-settings-usage-list-item-2": "y tudalennau yr ydych yn ymweld â nhw ar y gwasanaeth gwaith achos cynllunio a gwasanaethau digidol y llywodraeth, a pha mor hir yr ydych chi'n treulio ar bob tudalen",
"cookie-settings-usage-list-item-3": "beth ydych chi'n clicio arno wrth ymweld â'r safle",
"cookie-settings-usage-list-item-4": "Nid ydym yn caniatâu i Google ddefnyddio na rhannu'r data ynghylch sut yr ydych yn defnyddio'r safle.",
"cookie-settings-usage-radio-1-label": "Peidiwch â defnyddio cwcis sy'n mesur fy nefnydd o'r wefan",
"cookie-settings-usage-radio-2-label": "Defnyddiwch gwcis sy’n mesur fy nefnydd o’r wefan",
"cookie-settings-communications-heading": "Cwcis sy'n helpu gyda chyfathrebu a marchnata",
"cookie-settings-communications-paragraph-1": "Gall y cwcis hyn gael eu gosod gan wefannau trydydd parti a gwneud pethau fel mesur sut rydych yn gwylio fideos YouTube ar LLYW.CYMRU.",
"cookie-settings-communications-paragraph-1": "Gall y cwcis hyn gael eu gosod gan wefannau trydydd parti a gwneud pethau fel mesur sut rydych yn gwylio fideos YouTube ar y gwasanaeth gwaith achos cynllunio.",
"cookie-settings-communications-radio-1-label": "Peidiwch â defnyddio cwcis sy'n helpu gyda chyfathrebu a marchnata",
"cookie-settings-communications-radio-2-label": "Defnyddiwch gwcis sy’n helpu gyda chyfathrebu a marchnata",
"cookie-settings-settings-heading": "Cwcis sy'n cofio'ch gosodiadau",
@@ -28,7 +28,34 @@
"cookie-settings-essential-list-item-1": "cofio'r hysbysiadau yr ydych wedi eu gweld fel ein bod ni ddim yn eu dangos i chi eto",
"cookie-settings-essential-list-item-2": "cofio eich lle mewn ffurflen (er enghraifft cais am drwydded)",
"cookie-settings-essential-paragraph-2": "Bydd angen i'r cwcis yma fod ymlaen drwy'r amser.",
"cookie-settings-essential-link": "https://llyw.cymru/manylion-am-gwcis-ar-llywcymru",
"cookie-settings-essential-link-label": "Mwy o wybodaeth am cwcis ar LLYW.CYMRU.",
"cookie-settings-save-button-label": "Cadw newidiadau"
"cookie-settings-essential-link": "/manylion-am-gwcis",
"cookie-settings-essential-link-label": "Mwy o wybodaeth am cwcis ar y gwasanaeth gwaith achos cynllunio.",
"cookie-settings-save-button-label": "Cadw newidiadau",
"cookie-policy-title-heading": "Manylion am gwcis ar y gwasanaeth gwaith achos Cynllunio",
"cookie-policy-intro-paragraph": "Yn rhestru'r cwcis ar y gwasanaeth gwaith achos cynllunio ac yn egluro eu pwrpas.",
"cookie-policy-sub-heading-one": "Defnydd o gwcis gan y gwasanaeth gwaith achos Cynllunio",
"cookie-policy-paragraph-one": "Ffeiliau testun bach yw cwcis a anfonir at eich cyfrifiadur neu ddyfais symudol gan y gwefannau rydych chi'n ymweld â nhw. Maent yn helpu i wneud i wefannau weithio'n well a darparu gwybodaeth i berchnogion y wefan. Er enghraifft cwcis Google Analytics i olrhain ymddygiad defnyddwyr tra ar y wefan. Trwy ddeall sut mae pobl yn defnyddio ein gwefan, gallwn wella'r llywio a'r cynnwys i ddiwallu anghenion pobl yn well. Mae'r wybodaeth a gasglwyd gan & nbsp; Cynllunio Gwaith Achos & nbsp; yn cynnwys cyfeiriad IP, tudalennau yr ymwelwyd â hwy, porwr a system weithredu. Ni fydd y data'n cael ei ddefnyddio i adnabod unrhyw ddefnyddiwr yn bersonol. Y cwcis rydyn ni'n eu defnyddio ar ein gwefan yw:",
"cookie-policy-list-heading-one": "Cwcis",
"cookie-policy-list-heading-two": "Enw",
"cookie-policy-list-heading-three": "Pwrpas",
"cookie-policy-list-heading-four": "Yn dod i ben",
"cookie-policy-list-row-one-item-one": "GoogleAnalytics",
"cookie-policy-list-row-one-item-two": "_ga,_gid",
"cookie-policy-list-row-one-item-three": "Defnyddir y cwci hwn i ddarganfod sut mae ymwelwyr yn defnyddio ein gwefan. Rydym yn defnyddio'r wybodaeth i'n helpu i wella'r wefan. Mae'r cwci yn casglu gwybodaeth ar ffurf anhysbys, gan gynnwys gwybodaeth ddemograffig, nifer yr ymwelwyr â'r wefan, p'un a ydynt wedi ymweld o'r blaen a'r tudalennau y maent yn ymweld â hwy.",
"cookie-policy-list-row-one-item-four": "2 flynedd",
"cookie-policy-list-row-two-item-one": "CookieControl",
"cookie-policy-list-row-two-item-two": "planning_casework, CookiePolicy",
"cookie-policy-list-row-two-item-three": "Mae'r cwci hwn yn cofnodi a yw defnyddiwr wedi derbyn y defnydd o gwcis ar ein gwefan,",
"cookie-policy-list-row-two-item-four": "10 awr",
"cookie-policy-browser-find-out-more": "Mae porwyr gwe yn caniatáu rhywfaint o reolaeth ar gwcis trwy osodiadau porwr. I ddarganfod mwy am gwcis a sut i'w rheoli, ewch i ",
"cookie-policy-browser-find-out-more-link": "http://www.allaboutcookies.org/",
"cookie-policy-sub-heading-two": "Pa wybodaeth ydyn ni'n ei chasglu?",
"cookie-policy-paragraph-two": "Rydym yn defnyddio cwcis Google Analytics i helpu i fonitro gweithgaredd defnyddwyr, ac i nodi lle y gellir gwneud gwelliannau i'r wefan. Nid ydym yn casglu unrhyw wybodaeth bersonol (e.e. eich enw neu gyfeiriad) a fyddai’n gallu eich adnabod chi.",
"cookie-policy-paragraph-three": "Mae cwcis Google Analytics yn wasanaeth gwe a ddarperir gan Google Inc. (‘Google’) ac maent yn helpu i gasglu a dadansoddi gweithgaredd defnyddwyr. Bydd y wybodaeth a gesglir am eich defnydd o'r wefan (gan gynnwys eich cyfeiriad IP dienw) yn cael ei throsglwyddo i weinyddion Google yn yr Unol Daleithiau, a'i storio arni. Gweler polisi preifatrwydd Google, a Thelerau Gwasanaeth Google i gael gwybodaeth fanwl.",
"cookie-policy-paragraph-three-link-a": "Polisi preifatrwydd Google",
"cookie-policy-paragraph-three-a": "y",
"cookie-policy-paragraph-three-link-b": "Telerau Gwasanaeth Google",
"cookie-policy-paragraph-three-b": "am wybodaeth fanwl.",
"cookie-policy-paragraph-four": "Bydd Google yn defnyddio'r wybodaeth hon i gynhyrchu adroddiadau gweithgaredd defnyddwyr ar gyfer y wefan hon. Gall Google hefyd drosglwyddo'r wybodaeth hon i drydydd partïon lle mae'n ofynnol iddynt wneud hynny yn ôl y gyfraith, neu lle mae trydydd partïon o'r fath yn prosesu'r wybodaeth ar ran Google.",
"cookie-policy-paragraph-five": "Ni fydd Google yn cysylltu eich cyfeiriad IP ag unrhyw ddata arall a gedwir yn flaenorol. Gallwch wrthod defnyddio cwcis trwy ddewis y gosodiadau priodol ar eich porwr. Sylwch, os yw cwcis yn anabl, efallai na fyddwch yn gallu defnyddio swyddogaeth lawn y wefan hon. Trwy ddefnyddio'r wefan hon, rydych yn cydsynio i Google brosesu data amdanoch yn y modd ac at y dibenion a nodir uchod."
}
locales/cy/dnsApplications.json
+2 -2
View File
@@ -1,8 +1,8 @@
{
"page-title": "Ceisiadau Datblygiadau o Arwyddocâd Cenedlaethol",
"page-intro-paragraph-1": "Y ceisiadau a restrir yw’r rhai:",
"page-intro-list-item-1": "Lle mae’r datblygwr wedi hysbysu’r Arolygiaeth Gynllunio yn ysgrifenedig ei fod yn bwriadu cyflwyno cais i ni yn y dyfodol",
"page-intro-list-item-2": "Lle cafodd cais ei wneud eisoes i’r Arolygiaeth Gynllunio ac mae’n mynd drwy’r broses archwilio",
"page-intro-list-item-1": "Lle mae’r datblygwr wedi hysbysu’r Penderfyniadau Cynllunio ac Amgylchedd Cymru yn ysgrifenedig ei fod yn bwriadu cyflwyno cais i ni yn y dyfodol",
"page-intro-list-item-2": "Lle cafodd cais ei wneud eisoes i’r Penderfyniadau Cynllunio ac Amgylchedd Cymru ac mae’n mynd drwy’r broses archwilio",
"page-intro-list-item-3": "Lle penderfynwyd ar y cynnig.",
"page-intro-paragraph-2": "Defnyddiwch y tabl isod i ddod o hyd i geisiadau fesul cam neu fath. Fel arall, defnyddiwch y map trwy glicio ar y marcwyr i fynd i’r dudalen geisiadau. Mae rhestr o ddigwyddiadau a therfynau amser allweddol ar gyfer pob cais ar gael ar ein ",
"page-intro-paragraph-2-link": "tudalen galendr",
locales/cy/home.json
+2 -2
View File
@@ -22,7 +22,7 @@
"login-card-forgotten-label": "Rwyf wedi anghofio fy nghyfrinair",
"login-card-forgotten-link": "Cliciwch yma",
"casesearch-card-title": "Chwilio apeliadau a Datblygiadau o Arwyddocâd Cenedlaethol",
"casesearch-card-search-hint": "Rhaid i chi ddefnyddio cyfeirnod yr achos i chwilio. Bydd hyn yn debyg i un o'r canlynol:",
"casesearch-card-search-hint": "Defnyddiwch gyfeimod yr achos neu deitl DAC i chwilio. Bydd cyfeirnod yr achos yn debyg i un o'r canlynol:",
"casesearch-card-search-example-label-1": "APP-A12345-A-21-1234567",
"casesearch-card-search-example-label-2": "CAS-12345-A1B2C3",
"casesearch-card-button": "Cyflwyno chwiliad",
@@ -30,7 +30,7 @@
"casesearch-search-validation-required": "Angenrheidiol",
"casesearch-search-validation-minlength": "Rhaid bod yn 4 nod neu fwy",
"casescomment-card-title": "Rhowch sylwadau ar apêl",
"casescomment-card-paragraph-one": "Rhowch sylwadau ar apêl trwy e-bostio ",
"casescomment-card-paragraph-one": "Rhowch sylwadau ar apêl (gan eithrio deiliad tai a masnachol) drwy ebostio",
"casescomment-card-paragraph-two": "Ar gyfer apeliadau deiliaid tai a masnachol, ni all partïon â buddiant wneud sylwadau yn ystod y cam apelio. Bydd unrhyw sylwadau a wneir yn ystod y cam ymgeisio yn cael eu darparu gan yr awdurdod cynllunio lleol a'u hystyried gan yr arolygydd.",
"inspectorate-card-visit-label": "Ymweld Yr Arolygiaeth Gynllunio",
"inspectorate-card-visit-link": "Hafan",
locales/cy/newappeal.json
+2 -2
View File
@@ -4,8 +4,8 @@
"page-title": "Apêl newydd",
"select-lpa-label": "Dewiswch eich awdurdod cynllunio lleol",
"select-lpa-label-error-msg": "Mae angen awdurdod lleol",
"select-appeal-type-label": "Dewiswch fath o apêl",
"select-appeal-type-label-error-msg": "Mae angen math o apêl",
"select-appeal-type-label": "Dewiswch fath o achos",
"select-appeal-type-label-error-msg": "Mae angen math o achos",
"select-default": "Dewiswch...",
"change-link-label": "Newid",
"submit-appeal-button": "Cyflwyno apêl"
locales/cy/search.json
+1 -1
View File
@@ -9,7 +9,7 @@
"postcode-label": "Cod Post",
"lpa-label": "Awdurdod Cynllunio Lleol",
"lpa-reference-label": "Cyfeirnod yr Awdurdod Cynllunio Lleol",
"appealtype-label": "Dewiswch fath o apêl",
"appealtype-label": "Dewiswch fath o achos",
"case-type-label": "Math o Achos",
"case-type-option-1": "--Dewiswch--",
"case-type-option-2": "Unrhyw fath/Pob math",
locales/en/common.json
+5 -5
View File
@@ -4,7 +4,7 @@
"gov-wales-link": "https://www.gov.wales",
"gov-wales-label": "GOV.WALES",
"service-description": "This service is being developed to support online appeals and applications.",
"service-name": "Planning casework",
"service-name": "Casework",
"service-name-breadcrumb": "Home",
"new-service-beta": "This is a new service",
"breadcrumb-back-link": "Back",
@@ -16,15 +16,15 @@
"search-button": "Search",
"submit-and-start": "Submit and start course",
"footer-terms-conditions-link-label": "Terms and conditions",
"footer-terms-conditions-link": "https://gov.wales/terms-and-conditions",
"footer-terms-conditions-link": "/terms-and-conditions",
"footer-privacy-link-label": "Privacy",
"footer-privacy-link": "https://gov.wales/website-privacy-policy",
"footer-privacy-link": "/privacy",
"footer-cookies-link": "Cookies",
"footer-accessibility-link-label": "Accessibility",
"footer-accessibility-link": "https://gov.wales/accessibility-statement-govwales",
"footer-accessibility-link": "/accessibility",
"footer-feedback-link": "Give feedback about this page",
"footer-contact-us-link-label": "Contact us",
"footer-contact-us-link": "https://gov.wales/contact-us",
"footer-contact-us-link": "https://gov.wales/planning-and-environment-decisions-wales/contact-us",
"footer-copyright-link-label": "Copyright statement",
"footer-copyright-link": "https://gov.wales/copyright-statement",
"footer-alternative-languages-link-label": "Alternative languages",
locales/en/cookies.json
+35 -8
View File
@@ -1,22 +1,22 @@
{
"cookie-breadcrumb": "Cookies",
"cookie-title-heading": "Cookies on GOV.WALES",
"cookie-title-heading": "Cookies on planning casework",
"cookie-not-saved-heading": "Your cookie settings have not yet been saved",
"cookie-not-saved-paragraph": "GOV.WALES sets cookies when you visit our website. You can choose to change these settings to your own preferences. You need to save this page with your new choices.",
"cookie-not-saved-paragraph": "The planning casework service sets cookies when you visit our website. You can choose to change these settings to your own preferences. You need to save this page with your new choices.",
"cookie-intro-paragraph-1": "Cookies are files saved on your phone, tablet or computer when you visit a website.",
"cookie-intro-paragraph-2": "We use cookies to store information about how you use the GOV.WALES website, such as the pages you visit. These cookies are not used to identify you personally.",
"cookie-intro-paragraph-2": "We use cookies to store information about how you use the the planning casework service website, such as the pages you visit. These cookies are not used to identify you personally.",
"cookie-intro-paragraph-3": "We use 4 types of cookie. You can choose which cookies you're happy for us to use.",
"cookie-settings-heading": "Cookie settings",
"cookie-settings-usage-heading": "Cookies that measure website use",
"cookie-settings-usage-paragraph-1": "We use Google Analytics to measure how you use the website so we can improve it based on user needs. Google Analytics sets cookies that store anonymised information about",
"cookie-settings-usage-list-item-1": "how you got to the site",
"cookie-settings-usage-list-item-2": "the pages you visit on GOV.WALES and government digital services, and how long you spend on each page",
"cookie-settings-usage-list-item-2": "the pages you visit on the planning casework service and government digital services, and how long you spend on each page",
"cookie-settings-usage-list-item-3": "what you click on while you're visiting the site",
"cookie-settings-usage-list-item-4": "We do not allow Google to use or share the data about how you use this site.",
"cookie-settings-usage-radio-1-label": "Do not use cookies that measure my website use",
"cookie-settings-usage-radio-2-label": "Use cookies that measure my website use",
"cookie-settings-communications-heading": "Cookies that help with communications and marketing",
"cookie-settings-communications-paragraph-1": "These cookies may be set by thirdparty websites and do things like measure how you view YouTube videos that are on GOV.WALES.",
"cookie-settings-communications-paragraph-1": "These cookies may be set by thirdparty websites and do things like measure how you view YouTube videos that are on the planning casework service.",
"cookie-settings-communications-radio-1-label": "Do not use cookies that help with communications and marketing",
"cookie-settings-communications-radio-2-label": "Use cookies that help with communications and marketing",
"cookie-settings-settings-heading": "Cookies that remember your settings",
@@ -28,7 +28,34 @@
"cookie-settings-essential-list-item-1": "remember the notifications you've seen so we do not show them to you again",
"cookie-settings-essential-list-item-2": "remember your progress through a form (for example a licence application)",
"cookie-settings-essential-paragraph-2": " These cookies always need to be on.",
"cookie-settings-essential-link": "https:gov.wales/details-about-cookies-govwales",
"cookie-settings-essential-link-label": "Find out more about cookies on GOV.WALES.",
"cookie-settings-save-button-label": "Save changes"
"cookie-settings-essential-link": "/details-about-cookies",
"cookie-settings-essential-link-label": "Find out more about cookies on the planning casework service.",
"cookie-settings-save-button-label": "Save changes",
"cookie-policy-title-heading": "Details about cookies on the Planning casework service",
"cookie-policy-intro-paragraph": "Lists the cookies on the planning casework service aand explains their purpose.",
"cookie-policy-sub-heading-one": "Use of cookies by the Planning casework service",
"cookie-policy-paragraph-one": "Cookies are small text files sent to your computer or mobile device by the websites that you visit. They help make websites work better and provide information to the owners of the site. For instance Google Analytics cookies to track users’ behaviour whilst on the site. By understanding how people use our site, we can improve the navigation and content to better meet people’s needs. The information collected by&nbsp;Planning Casework&nbsp;includes IP address, pages visited, browser and operating system. The data will not be used to identify any user personally. The cookies we use on our site are:",
"cookie-policy-list-heading-one": "Cookie",
"cookie-policy-list-heading-two": "Name",
"cookie-policy-list-heading-three": "Purpose",
"cookie-policy-list-heading-four": "Expires",
"cookie-policy-list-row-one-item-one": "GoogleAnalytics",
"cookie-policy-list-row-one-item-two": "_ga,_gid",
"cookie-policy-list-row-one-item-three": "This cookie is used to find out how visitors use our site. We use the information to help us improve the site. The cookie collects information in an anonymous form, including demographic information, the number of visitors to the site, whether they have visited before and the pages they visit.",
"cookie-policy-list-row-one-item-four": "2 years",
"cookie-policy-list-row-two-item-one": "CookieControl",
"cookie-policy-list-row-two-item-two": "planning_casework, CookiePolicy",
"cookie-policy-list-row-two-item-three": "This cookie records whether a user has accepted the use of cookies on our site.",
"cookie-policy-list-row-two-item-four": "10 hours",
"cookie-policy-browser-find-out-more": "Web browsers allow some control of cookies through browser settings. To find out more about cookies and how to manage them, visit ",
"cookie-policy-browser-find-out-more-link": "http://www.allaboutcookies.org/",
"cookie-policy-sub-heading-two": "What information do we collect?",
"cookie-policy-paragraph-two": "We use Google Analytics cookies to help monitor user activity, and to identify where improvements can be made to the site. We do not collect any personal information (e.g. your name or address) that would be able to identify you.",
"cookie-policy-paragraph-three": "Google Analytics cookies are a web service provided by Google Inc. (‘Google’) and help to gather and analyse user activity. The information gathered about your use of the web site (including your anonymised IP address) will be transmitted to, and stored on Google servers in the United States. Please see the Google privacy policy, and Google's Terms of Service for detailed information.",
"cookie-policy-paragraph-three-link-a": "Google privacy policy",
"cookie-policy-paragraph-three-a": "and",
"cookie-policy-paragraph-three-link-b": "Google's Terms of Service",
"cookie-policy-paragraph-three-b": "for detailed information.",
"cookie-policy-paragraph-four": "Google will use this information to produce user activity reports for this website. Google may also transfer this information to third parties where required to do so by law, or where such third parties process the information on Google's behalf.",
"cookie-policy-paragraph-five": "Google will not associate your IP address with any other data previously held. You may refuse the use of cookies by selecting the appropriate settings on your browser. Please note that if cookies are disabled, you may not be able to use the full functionality of this website. By using this website, you consent to the processing of data about you by Google in the manner and for the purposes set out above."
}
locales/en/dnsApplications.json
+2 -2
View File
@@ -1,8 +1,8 @@
{
"page-title": "Developments of National Significance Applications",
"page-intro-paragraph-1": "The applications listed are those:",
"page-intro-list-item-1": "Where the developer has advised the Planning Inspectorate in writing that they intend to submit an application to us in the future",
"page-intro-list-item-2": "Where an application has already been made to the Planning Inspectorate and is undergoing the examination process",
"page-intro-list-item-1": "Where the developer has advised Planning and Environment Decisions Wales in writing that they intend to submit an application to us in the future",
"page-intro-list-item-2": "Where an application has already been made to Planning and Environment Decisions Wales and is undergoing the examination process",
"page-intro-list-item-3": "Where a proposal has been decided.",
"page-intro-paragraph-2": "Use the table below to find applications by stage or type. Alternatively, use the map by clicking on the markers to go to the applications page. A list of key events and deadlines for all applications is available on our ",
"page-intro-paragraph-2-link": "calendar page",
locales/en/home.json
+3 -3
View File
@@ -1,7 +1,7 @@
{
"login-card-title-temp": "New appeals or applications",
"login-comingsoon-temp-1": "This service is being developed to support online appeals and applications.",
"login-comingsoon-temp-2": "While we develop the online service find:",
"login-comingsoon-temp-2": "While we develop the online service, find:",
"login-comingsoon-forms-link-1": "https://gov.wales/planning-appeal-forms",
"login-comingsoon-forms-label-1": "planning appeal and application forms",
"login-comingsoon-forms-link-2": "https://gov.wales/environmental-permits",
@@ -22,7 +22,7 @@
"login-card-forgotten-label": "I have forgotten my password",
"login-card-forgotten-link": "Click here",
"casesearch-card-title": "Search appeals and Developments of National Significance",
"casesearch-card-search-hint": "You must use the case reference number to search. This will be similar to one of the following:",
"casesearch-card-search-hint": "Use the case reference or DNS title to search. Case reference will be similar to one of the following:",
"casesearch-card-search-example-label-1": "APP-A12345-A-21-1234567",
"casesearch-card-search-example-label-2": "CAS-12345-A1B2C3",
"casesearch-card-button": "Submit search",
@@ -30,7 +30,7 @@
"casesearch-search-validation-required": "Required",
"casesearch-search-validation-minlength": "Must be 4 characters or more",
"casescomment-card-title": "Comment on an appeal ",
"casescomment-card-paragraph-one": "Comment on an appeal by emailing ",
"casescomment-card-paragraph-one": "Comment on an appeal (excluding householder or commercial) by emailing ",
"casescomment-card-paragraph-two": "For householder and commercial appeals, interested parties are unable to comment at appeal stage. Any comments made at application stage will be provided by the local planning authority and considered by the inspector.",
"inspectorate-card-visit-label": "Visit the Planning Inspectorate",
"inspectorate-card-visit-link": "Home",
locales/en/newappeal.json
+1 -1
View File
@@ -4,7 +4,7 @@
"page-title": "New appeal",
"select-lpa-label": "Select your local planning authority",
"select-lpa-label-error-msg": "Local authority is required",
"select-appeal-type-label": "Select an appeal type",
"select-appeal-type-label": "Select a case type",
"select-appeal-type-label-error-msg": "Appeal type is required",
"select-default": "Select...",
"change-link-label": "Change",
locales/en/search.json
+1 -1
View File
@@ -9,7 +9,7 @@
"postcode-label": "Postcode",
"lpa-label": "Local Planning Authority",
"lpa-reference-label": "LPA reference number",
"appealtype-label": "Select an appeal type",
"appealtype-label": "Select a case type",
"case-type-label": "Case type",
"case-type-option-1": "-- Select --",
"case-type-option-2": "Any/All",
next.config.js
+45
View File
@@ -17,7 +17,36 @@ module.exports = withStyles({
},
},
});
const securityHeaders = [
{
key: "X-DNS-Prefetch-Control",
value: "on",
},
{
key: "X-Frame-Options",
value: "SAMEORIGIN",
},
{
key: "Strict-Transport-Security",
value: "max-age=63072000; includeSubDomains; preload",
},
{
key: "Content-Security-Policy",
value: "frame-src 'self'; child-src 'self'",
},
];
module.exports = {
async headers() {
return [
{
// Apply these headers to all routes in your application.
source: "/(.*)",
headers: securityHeaders,
},
];
},
generateBuildId: async () => {
// You can, for example, get the latest git commit hash here
return "pinswg-build-id";
@@ -89,6 +118,22 @@ module.exports = {
source: "/help/cwcis",
destination: "/help/cookies",
},
{
source: "/hygyrchedd",
destination: "/accessibility",
},
{
source: "/preifatrwydd",
destination: "/privacy",
},
{
source: "/manylion-am-gwcis",
destination: "/details-about-cookies",
},
{
source: "/telerau-ac-amodau",
destination: "/terms-and-conditions",
},
// {
// source: "/cy:path*",
package.json
+2
View File
@@ -14,6 +14,7 @@
"axios": "^0.21.1",
"compression": "^1.7.4",
"cookie-cutter": "^0.2.0",
"cookies": "^0.8.0",
"crypto-js": "^4.1.1",
"date-fns": "^2.25.0",
"dom": "^0.0.3",
@@ -29,6 +30,7 @@
"next": "^11.0.1",
"next-redux-wrapper": "^7.0.2",
"next-translate": "^1.0.7",
"nextjs-basic-auth-middleware": "^0.2.1",
"nookies": "^2.5.2",
"path": "^0.12.7",
"pm2": "^5.1.0",
pages/_document.js
+40 -19
View File
@@ -1,35 +1,56 @@
import Document, { Html, Head, Main, NextScript } from "next/document";
import SkipLink from "../components/skiplink";
import { Tracking, TrackingNoScript } from "../components/tracking";
//import basicAuthMiddleware from "nextjs-basic-auth-middleware";
import basicAuthMiddleware from "nextjs-basic-auth-middleware";
class MyDocument extends Document {
// static async getInitialProps(ctx) {
// const initialProps = await Document.getInitialProps(ctx);
// if (ctx.req && ctx.res) {
// await basicAuthMiddleware(ctx.req, ctx.res, {
// users: [
// {
// name: "rehab",
// password: "preventTesting",
// },
// ],
// });
// }
// return { ...initialProps };
// }
static async getInitialProps(ctx) {
const initialProps = await Document.getInitialProps(ctx);
let useGATracking = false;
// remove this block when not need after softlaunch
let hasBasicAuth =
typeof process.env.BASIC_AUTH_CREDENTIALS != "undefined";
console.log(hasBasicAuth);
if (ctx.req && ctx.res) {
hasBasicAuth &&
(await basicAuthMiddleware(ctx.req, ctx.res, {
users: process.env.BASIC_AUTH_CREDENTIALS,
}));
}
if (ctx.req && ctx.req.headers.cookie) {
typeof ctx.req.cookies.CookiePolicy != "undefined"
? JSON.parse(ctx.req.cookies.CookiePolicy).usage == "accepted"
? (useGATracking = true)
: (useGATracking = false)
: (useGATracking = true);
} else {
useGATracking = false;
}
return { ...initialProps, useGATracking };
}
render() {
const googleTagManagerID = process.env.GOOGLE_TAG_MANAGER || null;
const { useGATracking } = this.props;
return (
<Html lang="en">
<Head>
<Tracking googleTagManagerID={googleTagManagerID} />
{useGATracking && (
<Tracking googleTagManagerID={googleTagManagerID} />
)}
</Head>
<body className="js-enabled">
<TrackingNoScript googleTagManagerID={googleTagManagerID} />
{useGATracking && (
<TrackingNoScript
googleTagManagerID={googleTagManagerID}
/>
)}
{!process.browser && (
<script>
window.switchDomain = `{process.env.I18N_DOMAIN}`
pages/accessibility.js
+91
View File
@@ -0,0 +1,91 @@
import _ from "lodash";
import { useState, useEffect, useRef } from "react";
import Head from "next/head";
import Header from "../components/header";
import ServiceBanner from "../components/servicebanner";
import CookieBanner from "../components/cookieBanner";
import Breadcrumbs from "../components/breadcrumbs";
import Main from "../components/main";
import Footer from "../components/footer";
import Errorpage from "../components/errorpage";
import styles from "../styles/Home.module.css";
import { useSelector, shallowEqual, connect } from "react-redux";
import { wrapper } from "../store/store";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { getIncidents } from "../actions";
import { parseCookies } from "nookies";
import AccessibilityStatement from "../components/accessibility";
const Accessibility = (props) => {
const { footerLinks, pages, showLogin } = props;
let { t, lang } = useTranslation();
const router = useRouter();
const { locale } = router;
return (
<div>
<Head>
<title>{t("common:service-name")}</title>
{/* Language by default is EN, if multilingual site this will need updated */}
<meta
key="og:locale"
property="og:locale"
content={router.locale}
/>
{/* If they have a Twitter Handle, include the meta details below */}
<meta
key="og:site_name"
property="og:site_name"
content={t("common:service-name")}
/>
<meta
key="twitter:site"
property="twitter:site"
content="@UKGovWales"
/>
<meta
name="description"
content={t("common:service-description")}
/>
<meta
property="og:site_name"
content={t("common:gov-wales-label")}
/>
<meta property="og:type" content="website" />
<meta property="og:url" content={t("common:gov-wales-link")} />
<meta
property="og:image"
content="https://gov.wales/themes/custom/govwales/images/content/og-global-1200.png"
/>
<meta name="twitter:card" content="summary" />
<meta
name="twitter:title"
content={t("common:gov-wales-label")}
/>
<meta
name="twitter:url"
content={t("common:gov-wales-link") + router.pathname}
/>
<meta
name="twitter:image"
content="https://gov.wales/themes/custom/govwales/images/content/og-global-120.png"
/>
</Head>
<div id="page_wrapper">
<CookieBanner />
<Header courseName="Appeals Casework Portal" />
<div className="govuk-width-container">
<Breadcrumbs />
<ServiceBanner />
<AccessibilityStatement />
</div>
<Footer footerLinks={footerLinks} />
</div>
</div>
);
};
export default Accessibility; //connect(mapStateToProps)(Home);
pages/advancedsearch.js
+3 -2
View File
@@ -28,7 +28,7 @@ import {
getLPA,
updateCase,
createCase,
getSASToken,
getToken,
} from "../actions";
import { setLPA } from "../store/lpa/action";
@@ -139,7 +139,8 @@ const Home = (props) => {
export const getServerSideProps = wrapper.getServerSideProps(
(store) =>
async ({ query, req, res }) => {
const token = await getSASToken();
let token = await getToken();
token = token.access_token;
const [appealTypeData, lpaData] = await Promise.all([
await getAppealsTypes(token),
pages/advancedsearchresults.js
+3 -6
View File
@@ -22,11 +22,7 @@ import {
setSearchDetails,
getSearchResultsObj,
} from "../store/searchOutput/action";
import {
getAdvancedSearch,
getBasicSearchDetails,
getSASToken,
} from "../actions";
import { getAdvancedSearch, getBasicSearchDetails, getToken } from "../actions";
const Home = (props) => {
const { footerLinks, pages } = props;
@@ -127,7 +123,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
console.log("query-", query);
//console.log("search array:", Object.entries(query));
const token = await getSASToken();
let token = await getToken();
token = token.access_token;
const searchResultsObj = await getAdvancedSearch(token, query);
const searchDetailsObj = await getSearchDetails(
pages/api/proxy/[...route].js
+127 -86
View File
@@ -1,7 +1,8 @@
import axios from "axios";
import https from "https";
import CryptoJS from "crypto-js";
import { response } from "express";
import HmacSHA256 from "crypto-js/hmac-sha256";
import { rest } from "lodash";
const PROXY_RELAY_URL =
"https://" +
@@ -10,74 +11,111 @@ const PROXY_RELAY_URL =
(process.env.RELAYPATH || "dev-pedw-hc") +
"/";
const getSASToken = () => {
var m_ResourceURI =
process.env.RELAYURI || "dev-pedw-ns.servicebus.windows.net";
var m_Path = process.env.RELAYPATH || "dev-pedw-hc";
var m_SasKey =
process.env.SASKEY || "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y=";
var m_SasKeyName = process.env.SASKEYNAME || "devpedwnspolicy";
const accessTokenEndpoint = process.env.ACCESS_TOKEN_ENDPOINT;
const tenantId = process.env.TENANT;
var encodedResourceUri = encodeURIComponent(
"https://" + m_ResourceURI + "/" + m_Path + "/"
);
const tokenBody =
"grant_type=" +
process.env.GRANT_TYPE +
"&client_id=" +
process.env.CLIENT_ID +
"&client_secret=" +
process.env.CLIENT_SECRET +
"&scope=" +
"https://" +
process.env.RELAYURI +
"/.default";
var t0 = new Date(1970, 1, 1, 0, 0, 0, 0);
var t1 = new Date();
var expireInSeconds =
+(31 * 24 * 3600) + 3600 + (((t1.getTime() - t0.getTime()) / 1000) | 0);
//the line below is a hack that converts to UTF8
var plainSignature = JSON.parse(
JSON.stringify(encodedResourceUri + "\n" + expireInSeconds)
);
var hash = CryptoJS.HmacSHA256(plainSignature, m_SasKey);
var base64HashValue = CryptoJS.enc.Base64.stringify(hash);
var token =
"SharedAccessSignature sr=" +
encodedResourceUri +
"&sig=" +
encodeURIComponent(base64HashValue) +
"&se=" +
expireInSeconds +
"&skn=" +
m_SasKeyName;
return token;
const tokenConfig = {
headers: {
"Content-Type": "application/x-www-form-urlencoded",
"Cache-Control": "no-cache",
},
};
export default async function ApiProxy(req, res) {
//console.log(req.method);
export const getToken = () => {
return axios
.post(
`${accessTokenEndpoint}${tenantId}/oauth2/v2.0/token`,
tokenBody,
tokenConfig
)
.then((res) => res.data)
.then((data) => {
return data;
})
.catch((error) => {
console.log("error :", error.response);
// return error;
});
};
function checkProxyPath(queryPath) {
const WORDKEY = process.env.NEXT_PUBLIC_HASHKEY;
var hashPath =
queryPath.indexOf("/api/proxy/") == -1
? queryPath
: queryPath.split("/api/proxy/")[1];
const wordKey = WORDKEY;
var hashlink = CryptoJS.HmacSHA256(
decodeURI(hashPath),
CryptoJS.enc.Hex.parse(wordKey)
);
hashlink = hashlink.toString(CryptoJS.enc.Hex);
return hashlink;
}
export default async function ApiProxy(req, res) {
var data = JSON.stringify(req.body);
const SASToken = getSASToken();
var accessToken = await getToken();
accessToken = accessToken.access_token;
const isDocument = req.url.indexOf("/documents/download") > -1;
let hashCheckPath = isDocument
? req.url.split("?hash=")[0]
: req.url.split("&hash=")[0];
let hashCheckValue = isDocument
? req.url.split("?hash=")[1]
: req.url.split("&hash=")[1];
let hashFromRequest = checkProxyPath(hashCheckPath);
var configNoData = {
method: req.method,
//url: PROXY_RELAY_URL + updateFormCollection + "(" + incidentId + ")",
url: PROXY_RELAY_URL + req.url.split("/api/proxy/")[1],
url:
PROXY_RELAY_URL +
req.url.split("&hash=")[0].split("/api/proxy/")[1] +
"&hash=" +
req.url.split("&hash=")[1],
headers: {
"OData-MaxVersion": "4.0",
"OData-Version": "4.0",
"Accept": "application/json",
"Prefer":
'odata.include-annotations="*",return=representation,odata.maxpagesize=10',
"Authorization": SASToken,
"Authorization": "Bearer " + accessToken,
"Content-Type": "application/json",
},
};
var config = {
method: req.method,
url: PROXY_RELAY_URL + req.query.route[0],
url:
PROXY_RELAY_URL +
req.query.route[0] +
"&hash=" +
req.url.split("&hash=")[1],
headers: {
"OData-MaxVersion": "4.0",
"OData-Version": "4.0",
"Accept": "application/json",
"Prefer": 'odata.include-annotations="*",return=representation',
"Authorization": SASToken,
"Authorization": "Bearer " + accessToken,
"Content-Type": "application/json",
},
data: data,
@@ -85,58 +123,61 @@ export default async function ApiProxy(req, res) {
var configDocument = {
method: req.method,
url: PROXY_RELAY_URL + req.url.split("/api/proxy/")[1],
url:
PROXY_RELAY_URL +
req.url.split("?hash=")[0].split("/api/proxy/")[1] +
"?hash=" +
req.url.split("?hash=")[1],
headers: {
"OData-MaxVersion": "4.0",
"OData-Version": "4.0",
"Accept": "application/json",
"Prefer": 'odata.include-annotations="*",return=representation',
"Authorization": SASToken,
"Authorization": "Bearer " + accessToken,
"Content-Type": "application/json",
},
responseType: "arraybuffer",
};
return new Promise((resolve, reject) => {
let apiPath = req.url.split("/api/proxy/")[1];
let hasDocument = apiPath.indexOf("/download") > 0 ? true : false;
// console.log(
// "//////////////",
// req.url.split("/api/proxy/")[1],
// PROXY_RELAY_URL + req.query.route[0],
// req.method,
// hasDocument
// );
axios(
req.method == "GET"
? hasDocument
? configDocument
: configNoData
: config
)
.then((response) => {
res.statusCode = 200;
if (hasDocument) {
res.setHeader(
"Content-disposition",
"attachment; filename=" +
response.headers["content-disposition"].split(
"filename="
)[1]
);
res.end(response.data);
} else {
res.setHeader("Content-Type", "application/json");
// res.setHeader("Cache-Control", "max-age=1800000");
res.end(JSON.stringify(response.data));
}
resolve();
})
.catch((error) => {
console.log("proxy response error", error);
res.json(error);
res.status(405).end();
return resolve();
});
});
if (hashCheckValue == hashFromRequest) {
return new Promise((resolve, reject) => {
let hasDocument =
hashCheckPath.indexOf("/download") > 0 ? true : false;
axios(
req.method == "GET"
? hasDocument
? configDocument
: configNoData
: config
)
.then((response) => {
res.statusCode = 200;
if (hasDocument) {
res.setHeader(
"Content-disposition",
"attachment; filename=" +
response.headers["content-disposition"].split(
"filename="
)[1]
);
res.end(response.data);
} else {
res.setHeader("Content-Type", "application/json");
// res.setHeader("Cache-Control", "max-age=1800000");
res.end(JSON.stringify(response.data));
}
resolve();
})
.catch((error) => {
console.log("proxy response error", error);
//res.json(error);
res.status(405).end();
return resolve();
});
});
} else {
res.status(405).end();
return resolve();
}
}
pages/case/index.js
+3
View File
@@ -70,6 +70,9 @@ const Home = (props) => {
props.currentView.caseReference.appealType
}
incidentid={props.currentView.caseReference.incidentid}
representationsObj={
props.searchResultsObj.representationsObj
}
/>
</div>
<Footer footerLinks={footerLinks} />
pages/details-about-cookies.js
+91
View File
@@ -0,0 +1,91 @@
import _ from "lodash";
import { useState, useEffect, useRef } from "react";
import Head from "next/head";
import Header from "../components/header";
import ServiceBanner from "../components/servicebanner";
import CookieBanner from "../components/cookieBanner";
import Breadcrumbs from "../components/breadcrumbs";
import Main from "../components/main";
import Footer from "../components/footer";
import Errorpage from "../components/errorpage";
import styles from "../styles/Home.module.css";
import { useSelector, shallowEqual, connect } from "react-redux";
import { wrapper } from "../store/store";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { getIncidents } from "../actions";
import { parseCookies } from "nookies";
import CookiePolicy from "../components/cookiePolicy";
const CookieDetails = (props) => {
const { footerLinks, pages, showLogin } = props;
let { t, lang } = useTranslation();
const router = useRouter();
const { locale } = router;
return (
<div>
<Head>
<title>{t("common:service-name")}</title>
{/* Language by default is EN, if multilingual site this will need updated */}
<meta
key="og:locale"
property="og:locale"
content={router.locale}
/>
{/* If they have a Twitter Handle, include the meta details below */}
<meta
key="og:site_name"
property="og:site_name"
content={t("common:service-name")}
/>
<meta
key="twitter:site"
property="twitter:site"
content="@UKGovWales"
/>
<meta
name="description"
content={t("common:service-description")}
/>
<meta
property="og:site_name"
content={t("common:gov-wales-label")}
/>
<meta property="og:type" content="website" />
<meta property="og:url" content={t("common:gov-wales-link")} />
<meta
property="og:image"
content="https://gov.wales/themes/custom/govwales/images/content/og-global-1200.png"
/>
<meta name="twitter:card" content="summary" />
<meta
name="twitter:title"
content={t("common:gov-wales-label")}
/>
<meta
name="twitter:url"
content={t("common:gov-wales-link") + router.pathname}
/>
<meta
name="twitter:image"
content="https://gov.wales/themes/custom/govwales/images/content/og-global-120.png"
/>
</Head>
<div id="page_wrapper">
<CookieBanner />
<Header courseName="Appeals Casework Portal" />
<div className="govuk-width-container">
<Breadcrumbs />
<ServiceBanner />
<CookiePolicy />
</div>
<Footer footerLinks={footerLinks} />
</div>
</div>
);
};
export default CookieDetails; //connect(mapStateToProps)(Home);
pages/dnsapplications.js
+3 -6
View File
@@ -24,11 +24,7 @@ import {
setSearchDetails,
getSearchResultsObj,
} from "../store/searchOutput/action";
import {
getBasicDNSSearch,
getBasicSearchDetails,
getSASToken,
} from "../actions";
import { getBasicDNSSearch, getBasicSearchDetails, getToken } from "../actions";
const Home = (props) => {
const { footerLinks, pages } = props;
@@ -127,7 +123,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
async ({ query, req, res }) => {
console.log("query-", query);
const token = await getSASToken();
let token = await getToken();
token = token.access_token;
let searchResultsObj = await getBasicDNSSearch(token);
searchResultsObj =
pages/help/cookies.js
+1
View File
@@ -32,6 +32,7 @@ const CookieManagement = (props) => {
<Header courseName="Appeals Casework Portal" />
<div className="govuk-width-container">
<Breadcrumbs />
<ServiceBanner />
<CookieManagementMain />
</div>
<Footer footerLinks={footerLinks} />
pages/myportal/advancedsearch.js
+3 -2
View File
@@ -28,7 +28,7 @@ import {
getLPA,
updateCase,
createCase,
getSASToken,
getToken,
} from "../../actions";
import { setLPA } from "../../store/lpa/action";
@@ -77,7 +77,8 @@ const Home = (props) => {
export const getServerSideProps = wrapper.getServerSideProps(
(store) =>
async ({ query, req, res }) => {
const token = await getSASToken();
let token = await getToken();
token = token.access_token;
const [appealTypeData, lpaData] = await Promise.all([
await getAppealsTypes(token),
pages/myportal/advancedsearchresults.js
+3 -2
View File
@@ -22,7 +22,7 @@ import {
setSearchResults,
setSearchDetails,
} from "../../store/searchOutput/action";
import { getAdvancedSearch, getSASToken } from "../../actions";
import { getAdvancedSearch, getToken } from "../../actions";
const Home = (props) => {
const { footerLinks, pages } = props;
@@ -62,7 +62,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
console.log("query-", query);
//console.log("search array:", Object.entries(query));
const token = await getSASToken();
let token = await getToken();
token = token.access_token;
const searchResultsObj = await getAdvancedSearch(token, query);
const searchDetailsObj = await getSearchDetails(
pages/myportal/case.js
+20 -1
View File
@@ -16,7 +16,7 @@ import useTranslation from "next-translate/useTranslation";
import Case from "../../components/case";
const Home = (props) => {
const { footerLinks, pages } = props;
const { footerLinks, pages, showRepresentations } = props;
let { t, lang } = useTranslation();
const router = useRouter();
@@ -73,6 +73,10 @@ const Home = (props) => {
props.currentView.caseReference.appealType
}
incidentid={props.currentView.caseReference.incidentid}
representationsObj={
props.searchResultsObj.representationsObj
}
showRepresentations={showRepresentations}
/>
</div>
<Footer footerLinks={footerLinks} />
@@ -81,6 +85,21 @@ const Home = (props) => {
);
};
export const getServerSideProps = wrapper.getServerSideProps(
(store) => async (ctx) => {
const { query, req, res } = ctx;
const showRepresentationsCheck =
process.env.SHOWREPRESENTATIONS || false;
console.log("Show representation module: ", showRepresentationsCheck);
return {
props: { showRepresentations: showRepresentationsCheck },
};
}
);
const mapStateToProps = (state) => {
//console.log(state);
pages/myportal/index.js
+7 -3
View File
@@ -35,7 +35,7 @@ import {
setAwaitingSubmissionDetails,
} from "../../store/awaitingSubmission/action";
import {
getSASToken,
getToken,
getPersonalAccount,
getMyCases,
getMyRepresentations,
@@ -152,7 +152,10 @@ export const getServerSideProps = wrapper.getServerSideProps(
const { cookies } = req;
const token = await getSASToken();
console.log("the cookoies", cookies);
let token = await getToken();
token = token.access_token;
let loggedInUser = cookies.pinsUser;
@@ -171,6 +174,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
]);
//const cookiesMaker = nookies.get(ctx)
console.log(accountDetails);
const [
myCasesDetails,
myRepresentationsDetails,
@@ -199,7 +203,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
);
const getDetails = (token, resultsObj, detailsType) => {
//console.log(resultsObj);
console.log(resultsObj);
let detailsArr = [];
resultsObj = resultsObj.value;
const detailsObj = resultsObj.map((searchDetail, index) => {
pages/myportal/searchresults.js
+3 -2
View File
@@ -39,7 +39,7 @@ import {
getSearchDocumentHistory,
getWatchedCases,
getPortalModuleDetails,
getSASToken,
getToken,
} from "../../actions";
const Home = (props) => {
@@ -82,7 +82,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
const { cookies } = req;
const token = await getSASToken();
let token = await getToken();
token = token.access_token;
let loggedInUser = cookies.pinsUser;
pages/newappeal/[appealtypes].js
+3 -2
View File
@@ -28,7 +28,7 @@ import {
} from "../../store/appealType/action";
import { setForm, getFormObj } from "../../store/formData/action";
import {
getSASToken,
getToken,
getFormData,
getAppealsTypes,
getMandatoryFields,
@@ -331,7 +331,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
console.log("the query", query);
let loggedInUser = cookies.pinsUser;
const token = await getSASToken();
let token = await getToken();
token = token.access_token;
const [
caseReferenceData,
appealTypeData,
pages/newappeal/index.js
+3 -2
View File
@@ -34,7 +34,7 @@ import {
getLPA,
updateCase,
createCase,
getSASToken,
getToken,
} from "../../actions";
import { setLPA } from "../../store/lpa/action";
@@ -150,7 +150,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
let loggedInUser = cookies.pinsUser;
const token = await getSASToken();
let token = await getToken();
token = token.access_token;
const [appealTypeData, lpaData, caseData] = await Promise.all([
await getAppealsTypes(token),
pages/newappeal/planningappeal.js
+2 -1
View File
@@ -42,7 +42,8 @@ const Home = (props) => {
// export const getServerSideProps = wrapper.getServerSideProps(
// async ({ locale, store, req, res }) => {
// const token = await getToken();
// let token = await getToken()
// token = token.access_token;
// let accessToken = token.access_token;
// const apiRoot = process.browser ? window.API_ROOT : process.env.API_ROOT;
pages/privacy.js
+91
View File
@@ -0,0 +1,91 @@
import _ from "lodash";
import { useState, useEffect, useRef } from "react";
import Head from "next/head";
import Header from "../components/header";
import ServiceBanner from "../components/servicebanner";
import CookieBanner from "../components/cookieBanner";
import Breadcrumbs from "../components/breadcrumbs";
import Main from "../components/main";
import Footer from "../components/footer";
import Errorpage from "../components/errorpage";
import styles from "../styles/Home.module.css";
import { useSelector, shallowEqual, connect } from "react-redux";
import { wrapper } from "../store/store";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { getIncidents } from "../actions";
import { parseCookies } from "nookies";
import PrivacyStatement from "../components/privacy";
const Privacy = (props) => {
const { footerLinks, pages, showLogin } = props;
let { t, lang } = useTranslation();
const router = useRouter();
const { locale } = router;
return (
<div>
<Head>
<title>{t("common:service-name")}</title>
{/* Language by default is EN, if multilingual site this will need updated */}
<meta
key="og:locale"
property="og:locale"
content={router.locale}
/>
{/* If they have a Twitter Handle, include the meta details below */}
<meta
key="og:site_name"
property="og:site_name"
content={t("common:service-name")}
/>
<meta
key="twitter:site"
property="twitter:site"
content="@UKGovWales"
/>
<meta
name="description"
content={t("common:service-description")}
/>
<meta
property="og:site_name"
content={t("common:gov-wales-label")}
/>
<meta property="og:type" content="website" />
<meta property="og:url" content={t("common:gov-wales-link")} />
<meta
property="og:image"
content="https://gov.wales/themes/custom/govwales/images/content/og-global-1200.png"
/>
<meta name="twitter:card" content="summary" />
<meta
name="twitter:title"
content={t("common:gov-wales-label")}
/>
<meta
name="twitter:url"
content={t("common:gov-wales-link") + router.pathname}
/>
<meta
name="twitter:image"
content="https://gov.wales/themes/custom/govwales/images/content/og-global-120.png"
/>
</Head>
<div id="page_wrapper">
<CookieBanner />
<Header courseName="Appeals Casework Portal" />
<div className="govuk-width-container">
<Breadcrumbs />
<ServiceBanner />
<PrivacyStatement />
</div>
<Footer footerLinks={footerLinks} />
</div>
</div>
);
};
export default Privacy; //connect(mapStateToProps)(Home);
pages/searchresults.js
+3 -2
View File
@@ -21,7 +21,7 @@ import {
setSearchDetails,
getSearchResultsObj,
} from "../store/searchOutput/action";
import { getBasicSearch, getBasicSearchDetails, getSASToken } from "../actions";
import { getBasicSearch, getBasicSearchDetails, getToken } from "../actions";
import { getSearchDetails } from "../components/utils";
const Home = (props) => {
@@ -121,7 +121,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
async ({ query, req, res }) => {
console.log("query-", query);
const token = await getSASToken();
let token = await getToken();
token = token.access_token;
let searchResultsObj = await getBasicSearch(token, query.q);
pages/terms-and-conditions.js
+91
View File
@@ -0,0 +1,91 @@
import _ from "lodash";
import { useState, useEffect, useRef } from "react";
import Head from "next/head";
import Header from "../components/header";
import ServiceBanner from "../components/servicebanner";
import CookieBanner from "../components/cookieBanner";
import Breadcrumbs from "../components/breadcrumbs";
import Main from "../components/main";
import Footer from "../components/footer";
import Errorpage from "../components/errorpage";
import styles from "../styles/Home.module.css";
import { useSelector, shallowEqual, connect } from "react-redux";
import { wrapper } from "../store/store";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import { getIncidents } from "../actions";
import { parseCookies } from "nookies";
import TermsAndConditionsStatement from "../components/tandc";
const TandC = (props) => {
const { footerLinks, pages, showLogin } = props;
let { t, lang } = useTranslation();
const router = useRouter();
const { locale } = router;
return (
<div>
<Head>
<title>{t("common:service-name")}</title>
{/* Language by default is EN, if multilingual site this will need updated */}
<meta
key="og:locale"
property="og:locale"
content={router.locale}
/>
{/* If they have a Twitter Handle, include the meta details below */}
<meta
key="og:site_name"
property="og:site_name"
content={t("common:service-name")}
/>
<meta
key="twitter:site"
property="twitter:site"
content="@UKGovWales"
/>
<meta
name="description"
content={t("common:service-description")}
/>
<meta
property="og:site_name"
content={t("common:gov-wales-label")}
/>
<meta property="og:type" content="website" />
<meta property="og:url" content={t("common:gov-wales-link")} />
<meta
property="og:image"
content="https://gov.wales/themes/custom/govwales/images/content/og-global-1200.png"
/>
<meta name="twitter:card" content="summary" />
<meta
name="twitter:title"
content={t("common:gov-wales-label")}
/>
<meta
name="twitter:url"
content={t("common:gov-wales-link") + router.pathname}
/>
<meta
name="twitter:image"
content="https://gov.wales/themes/custom/govwales/images/content/og-global-120.png"
/>
</Head>
<div id="page_wrapper">
<CookieBanner />
<Header courseName="Appeals Casework Portal" />
<div className="govuk-width-container">
<Breadcrumbs />
<ServiceBanner />
<TermsAndConditionsStatement />
</div>
<Footer footerLinks={footerLinks} />
</div>
</div>
);
};
export default TandC; //connect(mapStateToProps)(Home);
public/assets/images/planning-casework-cy.svg
+4 -4
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="279px" height="24px" viewBox="0 0 279 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Cynllunio gwaith ach</title>
<svg width="163px" height="19px" viewBox="0 0 163 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Gwaith Achos</title>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" font-family="Rockwell-Bold, Rockwell" font-size="24" font-weight="bold" letter-spacing="-0.75">
<text id="Cynllunio-gwaith-ach" fill="#000000">
<tspan x="-1" y="18">Cynllunio gwaith achos</tspan>
<text id="Gwaith-Achos" fill="#000000">
<tspan x="-1" y="18">Gwaith Achos</tspan>
</text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 555 B

After

Width:  |  Height:  |  Size: 529 B

public/assets/images/planning-casework-en.svg
+4 -4
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="227px" height="24px" viewBox="0 0 227 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Planning casework</title>
<svg width="118px" height="19px" viewBox="0 0 118 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Casework</title>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" font-family="Rockwell-Bold, Rockwell" font-size="24" font-weight="bold" letter-spacing="-0.75">
<text id="Planning-casework" fill="#000000">
<tspan x="0" y="18">Planning casework</tspan>
<text id="Casework" fill="#000000">
<tspan x="-1" y="18">Casework</tspan>
</text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 543 B

After

Width:  |  Height:  |  Size: 517 B

store/searchOutput/action.js
+8
View File
@@ -5,6 +5,7 @@ export const searchResultsActionTypes = {
SETSEARCHDETAILS: "SETSEARCHDETAILS",
SETDOCUMENTDETAILS: "SETDOCUMENTDETAILS",
SETDOCUMENTHISTORY: "SETDOCUMENTHISTORY",
SETREPRESENTATIONS: "SETREPRESENTATIONS",
};
export const getSearchResultshObj = () => (dispatch) => {
@@ -39,3 +40,10 @@ export const setDocumentHistory = (documentHistory) => (dispatch) => {
documentHistoryObj: documentHistory,
});
};
export const setRepresentations = (representations) => (dispatch) => {
return dispatch({
type: searchResultsActionTypes.SETREPRESENTATIONS,
representationsObj: representations,
});
};
store/searchOutput/reducer.js
+6
View File
@@ -5,6 +5,7 @@ const searchResultsInitialState = {
searchDetailsObj: {},
documentDetailsObj: {},
documentHistoryObj: {},
representationsObj: {},
};
export default function reducer(state = searchResultsInitialState, action) {
@@ -29,6 +30,11 @@ export default function reducer(state = searchResultsInitialState, action) {
...state,
documentHistoryObj: action.documentHistoryObj,
};
case searchResultsActionTypes.SETREPRESENTATIONS:
return {
...state,
representationsObj: action.representationsObj,
};
default:
return state;
}
styles/sass/welshgov/_application.scss
+4 -3
View File
@@ -202,6 +202,7 @@ a.longLinkBreak {
.servicebanner {
h1 {
margin-bottom: 0px;
margin-top: 0px;
display: flex;
justify-content: space-between;
@@ -231,7 +232,7 @@ a.longLinkBreak {
textarea,
.react-datepicker__input-container input {
border: 1px solid $darkgrey;
padding: 10px 15px;
padding: 7px 15px;
}
.govuk-radios__label:before {
@@ -314,7 +315,7 @@ textarea,
background-repeat: no-repeat;
background-position: 98% 15px;
background-color: #fff;
padding: 10px 15px;
padding: 7px 15px;
border: 1px solid #666666;
&:focus {
@@ -338,7 +339,7 @@ textarea,
max-width: 1000px;
margin-left: auto;
margin-right: auto;
padding-left: 60px;
padding-left: 30px;
padding-right: 20px;
@media screen and (max-width: 1024px) {