add cookie consent manger & updated cookie banner
This commit is contained in:
@@ -88,15 +88,16 @@ const RegisterComplete = (props) => {
|
||||
</p>
|
||||
|
||||
<p className="govuk-body">
|
||||
<a
|
||||
href="/"
|
||||
className="govuk-link"
|
||||
onClick={() => {
|
||||
setLogout(), window.localStorage.clear();
|
||||
}}
|
||||
>
|
||||
Login to My Portal
|
||||
</a>
|
||||
<Link href="/">
|
||||
<a
|
||||
className="govuk-link"
|
||||
onClick={() => {
|
||||
setLogout(), window.localStorage.clear();
|
||||
}}
|
||||
>
|
||||
Login to My Portal
|
||||
</a>
|
||||
</Link>
|
||||
</p>
|
||||
</>
|
||||
) : (
|
||||
|
||||
@@ -533,6 +533,15 @@ const Breadcrumbs = (props) => {
|
||||
) : (
|
||||
""
|
||||
)}
|
||||
{router.pathname == "/help/cookies" ? (
|
||||
<>
|
||||
<li className="govuk-breadcrumbs__list-item">
|
||||
{t("cookies:cookie-breadcrumb")}
|
||||
</li>
|
||||
</>
|
||||
) : (
|
||||
""
|
||||
)}
|
||||
{!_.isEmpty(slug) ? (
|
||||
<>
|
||||
<li className="govuk-breadcrumbs__list-item">
|
||||
|
||||
+112
-59
@@ -1,74 +1,127 @@
|
||||
import CookieConsent from "react-cookie-consent";
|
||||
import Link from "next/link";
|
||||
import { useRouter } from "next/router";
|
||||
import useTranslation from "next-translate/useTranslation";
|
||||
import cookie from "cookie-cutter";
|
||||
import { useState, useEffect } from "react";
|
||||
|
||||
const CookieBanner = () => {
|
||||
let { t, lang } = useTranslation();
|
||||
const router = useRouter();
|
||||
const { locale } = router;
|
||||
|
||||
const [bannerVisible, setBannerVisible] = useState(true);
|
||||
|
||||
const accept = () => {
|
||||
let now = new Date();
|
||||
let expDate = new Date(now);
|
||||
|
||||
expDate.setDate(now.getDate() + 365);
|
||||
|
||||
console.log(expDate);
|
||||
cookie.set("planning_casework", true, {
|
||||
expires: expDate,
|
||||
});
|
||||
setBannerVisible(false);
|
||||
};
|
||||
|
||||
return (
|
||||
<CookieConsent
|
||||
style={{
|
||||
position: "inherit",
|
||||
background: "#eeeeee",
|
||||
display: "block",
|
||||
}}
|
||||
containerClasses="app-cookie-banner"
|
||||
buttonClasses="cookies-banner__button"
|
||||
buttonWrapperClasses="govuk-width-container consentBanner"
|
||||
declineButtonClasses="cookies-banner__button"
|
||||
buttonText={t("common:cookie-banner-accept")}
|
||||
declineButtonText={t("common:cookie-banner-decline")}
|
||||
disableStyles={true}
|
||||
enableDeclineButton={true}
|
||||
flipButtons={true}
|
||||
hideOnAccept={true}
|
||||
cookieName="planning_casework"
|
||||
>
|
||||
<div className="app-cookie-banner">
|
||||
<div
|
||||
id="global-cookie-message"
|
||||
className="govuk-clearfix"
|
||||
data-module="cookie-banner"
|
||||
role="region"
|
||||
aria-label="cookie banner"
|
||||
data-nosnippet=""
|
||||
<>
|
||||
{bannerVisible ? (
|
||||
<CookieConsent
|
||||
style={{
|
||||
position: "inherit",
|
||||
background: "#eeeeee",
|
||||
display: "block",
|
||||
}}
|
||||
containerClasses="app-cookie-banner"
|
||||
buttonClasses="cookies-banner__button"
|
||||
buttonWrapperClasses="govuk-width-container consentBanner hidden"
|
||||
declineButtonClasses="cookies-banner__button"
|
||||
buttonText={t("common:cookie-banner-accept")}
|
||||
declineButtonText={t("common:cookie-banner-decline")}
|
||||
disableStyles={true}
|
||||
enableDeclineButton={true}
|
||||
flipButtons={true}
|
||||
hideOnAccept={true}
|
||||
cookieName="planning_casework"
|
||||
>
|
||||
<div className="govuk-width-container">
|
||||
<div className="govuk-grid-row">
|
||||
<div className="govuk-grid-column-two-thirds">
|
||||
<div className="">
|
||||
<p className="cookies-banner__description">
|
||||
{t("common:cookie-banner-line-1")}
|
||||
</p>
|
||||
<ul className="cookies-banner__description">
|
||||
<li>
|
||||
{" "}
|
||||
{t(
|
||||
"common:cookie-banner-list-item-1"
|
||||
)}
|
||||
</li>
|
||||
</ul>
|
||||
<p className="cookies-banner__description">
|
||||
{t("common:cookie-banner-line-2")}
|
||||
</p>
|
||||
<ul className="cookies-banner__description">
|
||||
<li>
|
||||
{t(
|
||||
"common:cookie-banner-list-item-2"
|
||||
)}
|
||||
</li>
|
||||
<li>
|
||||
{t(
|
||||
"common:cookie-banner-list-item-3"
|
||||
)}
|
||||
</li>
|
||||
</ul>
|
||||
<div className="app-cookie-banner">
|
||||
<div
|
||||
id="global-cookie-message"
|
||||
className="govuk-clearfix"
|
||||
data-module="cookie-banner"
|
||||
role="region"
|
||||
aria-label="cookie banner"
|
||||
data-nosnippet=""
|
||||
>
|
||||
<div className="govuk-width-container">
|
||||
<div className="govuk-grid-row">
|
||||
<div className="govuk-grid-column-two-thirds">
|
||||
<div className="">
|
||||
<p className="cookies-banner__description">
|
||||
{t(
|
||||
"common:cookie-banner-line-1"
|
||||
)}
|
||||
</p>
|
||||
<ul className="cookies-banner__description">
|
||||
<li>
|
||||
{" "}
|
||||
{t(
|
||||
"common:cookie-banner-list-item-1"
|
||||
)}
|
||||
</li>
|
||||
</ul>
|
||||
<p className="cookies-banner__description">
|
||||
{t(
|
||||
"common:cookie-banner-line-2"
|
||||
)}
|
||||
</p>
|
||||
<ul className="cookies-banner__description">
|
||||
<li>
|
||||
{t(
|
||||
"common:cookie-banner-list-item-2"
|
||||
)}
|
||||
</li>
|
||||
<li>
|
||||
{t(
|
||||
"common:cookie-banner-list-item-3"
|
||||
)}
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div className="govuk-width-container consentBannerShow">
|
||||
<button
|
||||
className="cookies-banner__button"
|
||||
id="rcc-confirm-button"
|
||||
aria-label="Accept cookies"
|
||||
onClick={() => {
|
||||
accept();
|
||||
}}
|
||||
>
|
||||
{t("common:cookie-banner-accept")}
|
||||
</button>
|
||||
|
||||
<Link href="/help/cookies">
|
||||
<a
|
||||
className="cookies-banner__button govuk-link--no-underline"
|
||||
id="rcc-decline-button"
|
||||
aria-label="Decline cookies"
|
||||
>
|
||||
{t("common:cookie-banner-change-settings")}
|
||||
</a>
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</CookieConsent>
|
||||
</CookieConsent>
|
||||
) : (
|
||||
""
|
||||
)}
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,455 @@
|
||||
import Link from "next/link";
|
||||
import { useRouter } from "next/router";
|
||||
import { useContext, useEffect, useState } from "react";
|
||||
import useTranslation from "next-translate/useTranslation";
|
||||
import { Field, reduxForm } from "redux-form";
|
||||
import { parseCookies, setCookie, destroyCookie } from "nookies";
|
||||
import { connect } from "react-redux";
|
||||
|
||||
import cookie from "cookie-cutter";
|
||||
|
||||
const CookieManagementMain = (props) => {
|
||||
let { t } = useTranslation();
|
||||
|
||||
const router = useRouter();
|
||||
const { locale } = router;
|
||||
|
||||
const { handleSubmit } = props;
|
||||
|
||||
const onHandleSubmit = (values) => {
|
||||
Object.assign(values, {
|
||||
"essential": "accepted",
|
||||
"usage": usageState,
|
||||
"communications": communicationsState,
|
||||
"settings": settingsState,
|
||||
});
|
||||
|
||||
let now = new Date();
|
||||
let expDate = new Date(now);
|
||||
expDate.setDate(now.getDate() + 365);
|
||||
|
||||
cookie.set("pinsCookiePolicy", JSON.stringify(values).toString(), {
|
||||
expires: expDate,
|
||||
});
|
||||
cookie.set("planning_casework", true, {
|
||||
expires: expDate,
|
||||
});
|
||||
};
|
||||
|
||||
let cookieCheck = parseCookies();
|
||||
|
||||
let cookieObj =
|
||||
typeof cookieCheck.pinsCookiePolicy == "undefined"
|
||||
? {}
|
||||
: JSON.parse(cookieCheck.pinsCookiePolicy);
|
||||
|
||||
const [usageState, setUsageState] = useState(
|
||||
typeof cookieCheck.pinsCookiePolicy == "undefined"
|
||||
? null
|
||||
: cookieObj.usage
|
||||
);
|
||||
const [communicationsState, setCommunicationsState] = useState(
|
||||
typeof cookieCheck.pinsCookiePolicy == "undefined"
|
||||
? null
|
||||
: cookieObj.communications
|
||||
);
|
||||
const [settingsState, setSettingsState] = useState(
|
||||
typeof cookieCheck.pinsCookiePolicy == "undefined"
|
||||
? null
|
||||
: cookieObj.settings
|
||||
);
|
||||
|
||||
let updateObj = (key, value) => {
|
||||
switch (key) {
|
||||
case "usage":
|
||||
setUsageState(value);
|
||||
break;
|
||||
case "communications":
|
||||
setCommunicationsState(value);
|
||||
break;
|
||||
case "settings":
|
||||
setSettingsState(value);
|
||||
break;
|
||||
default:
|
||||
// code block
|
||||
}
|
||||
};
|
||||
|
||||
const CookieForm = () => {
|
||||
return (
|
||||
<main
|
||||
className="govuk-main-wrapper govuk-!-padding-top-4 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">
|
||||
{t("cookies:cookie-title-heading")}
|
||||
</h1>
|
||||
<hr className="govuk-section-break govuk-section-break--visible" />
|
||||
{typeof cookieCheck.pinsCookiePolicy == "undefined" ? (
|
||||
<>
|
||||
<div className="govuk-inset-text paragraph--type--call-out-message">
|
||||
<h2 className="govuk-heading-l">
|
||||
{t("cookies:cookie-not-saved-heading")}
|
||||
</h2>
|
||||
<p className="govuk-body">
|
||||
{t(
|
||||
"cookies:cookie-not-saved-paragraph"
|
||||
)}
|
||||
</p>
|
||||
</div>
|
||||
</>
|
||||
) : (
|
||||
""
|
||||
)}
|
||||
|
||||
<div
|
||||
className={
|
||||
typeof cookieCheck.pinsCookiePolicy !=
|
||||
"undefined"
|
||||
? "govuk-body govuk-!-margin-top-5"
|
||||
: "govuk-body"
|
||||
}
|
||||
>
|
||||
<p className="govuk-body">
|
||||
{t("cookies:cookie-intro-paragraph-1")}
|
||||
</p>
|
||||
<p className="govuk-body">
|
||||
{t("cookies:cookie-intro-paragraph-2")}
|
||||
</p>
|
||||
|
||||
<p className="govuk-body">
|
||||
{t("cookies:cookie-intro-paragraph-3")}
|
||||
</p>
|
||||
</div>
|
||||
<div id="cookies-js">
|
||||
<form onSubmit={handleSubmit(onHandleSubmit)}>
|
||||
<div>
|
||||
<h3 className="govuk-heading-l">
|
||||
{t("cookies:cookie-settings-heading")}
|
||||
</h3>
|
||||
</div>
|
||||
<fieldset className="govuk-fieldset">
|
||||
<legend className="govuk-fieldset__legend">
|
||||
<h4 className="govuk-!-font-size-27">
|
||||
{t(
|
||||
"cookies:cookie-settings-usage-heading"
|
||||
)}
|
||||
</h4>
|
||||
<p className="govuk-body">
|
||||
{t(
|
||||
"cookies:cookie-settings-usage-paragraph-1"
|
||||
)}
|
||||
</p>
|
||||
|
||||
<ul className="govuk-list govuk-list--bullet">
|
||||
<li>
|
||||
{t(
|
||||
"cookies:cookie-settings-usage-list-item-1"
|
||||
)}
|
||||
</li>
|
||||
<li>
|
||||
{t(
|
||||
"cookies:cookie-settings-usage-list-item-2"
|
||||
)}
|
||||
</li>
|
||||
|
||||
<li>
|
||||
{t(
|
||||
"cookies:cookie-settings-usage-list-item-3"
|
||||
)}
|
||||
</li>
|
||||
</ul>
|
||||
<p className="govuk-body">
|
||||
{t(
|
||||
"cookies:cookie-settings-usage-list-item-4"
|
||||
)}
|
||||
</p>
|
||||
<div className="govuk-radios govuk-radios--small">
|
||||
<div className="govuk-radios__item">
|
||||
<input
|
||||
name="usage"
|
||||
className="govuk-radios__input"
|
||||
id="usage-1"
|
||||
component="input"
|
||||
type="radio"
|
||||
value="revoked"
|
||||
checked={
|
||||
usageState === "revoked"
|
||||
}
|
||||
onChange={() => {
|
||||
updateObj(
|
||||
"usage",
|
||||
"revoked"
|
||||
);
|
||||
}}
|
||||
/>
|
||||
<label
|
||||
className="govuk-label govuk-radios__label"
|
||||
htmlFor="usage-1"
|
||||
>
|
||||
{t(
|
||||
"cookies:cookie-settings-usage-radio-1-label"
|
||||
)}
|
||||
</label>
|
||||
</div>
|
||||
<div className="govuk-radios__item">
|
||||
<input
|
||||
className="govuk-radios__input"
|
||||
id="usage-2"
|
||||
name="usage"
|
||||
type="radio"
|
||||
value="accepted"
|
||||
component="input"
|
||||
checked={
|
||||
usageState ===
|
||||
"accepted"
|
||||
}
|
||||
onChange={() => {
|
||||
updateObj(
|
||||
"usage",
|
||||
"accepted"
|
||||
);
|
||||
}}
|
||||
/>
|
||||
<label
|
||||
className="govuk-label govuk-radios__label"
|
||||
htmlFor="usage-2"
|
||||
>
|
||||
{t(
|
||||
"cookies:cookie-settings-usage-radio-2-label"
|
||||
)}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</legend>
|
||||
</fieldset>
|
||||
<fieldset className="govuk-fieldset">
|
||||
<legend className="govuk-fieldset__legend">
|
||||
<h4 className="govuk-!-font-size-27">
|
||||
{t(
|
||||
"cookies:cookie-settings-communications-heading"
|
||||
)}
|
||||
</h4>
|
||||
<p className="govuk-body">
|
||||
{t(
|
||||
"cookies:cookie-settings-communications-paragraph-1"
|
||||
)}
|
||||
</p>
|
||||
</legend>
|
||||
<div className="govuk-radios govuk-radios--small">
|
||||
<div className="govuk-radios__item">
|
||||
<input
|
||||
className="govuk-radios__input"
|
||||
id="communications-1"
|
||||
name="communications"
|
||||
type="radio"
|
||||
value="revoked"
|
||||
component="input"
|
||||
checked={
|
||||
communicationsState ===
|
||||
"revoked"
|
||||
}
|
||||
onChange={() => {
|
||||
updateObj(
|
||||
"communications",
|
||||
"revoked"
|
||||
);
|
||||
}}
|
||||
/>
|
||||
<label
|
||||
className="govuk-label govuk-radios__label"
|
||||
htmlFor="communications-1"
|
||||
>
|
||||
{t(
|
||||
"cookies:cookie-settings-communications-radio-1-label"
|
||||
)}
|
||||
</label>
|
||||
</div>
|
||||
<div className="govuk-radios__item">
|
||||
<input
|
||||
className="govuk-radios__input"
|
||||
id="communications-2"
|
||||
name="communications"
|
||||
type="radio"
|
||||
value="accepted"
|
||||
component="input"
|
||||
checked={
|
||||
communicationsState ===
|
||||
"accepted"
|
||||
}
|
||||
onChange={() => {
|
||||
updateObj(
|
||||
"communications",
|
||||
"accepted"
|
||||
);
|
||||
}}
|
||||
/>
|
||||
<label
|
||||
className="govuk-label govuk-radios__label"
|
||||
htmlFor="communications-2"
|
||||
>
|
||||
{t(
|
||||
"cookies:cookie-settings-communications-radio-2-label"
|
||||
)}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<fieldset className="govuk-fieldset">
|
||||
<legend className="govuk-fieldset__legend">
|
||||
<h4 className="govuk-!-font-size-27">
|
||||
{t(
|
||||
"cookies:cookie-settings-settings-heading"
|
||||
)}
|
||||
</h4>
|
||||
<p className="govuk-body">
|
||||
{t(
|
||||
"cookies:cookie-settings-settings-paragraph-1"
|
||||
)}
|
||||
</p>
|
||||
</legend>
|
||||
<div className="govuk-radios govuk-radios--small">
|
||||
<div className="govuk-radios__item">
|
||||
<input
|
||||
className="govuk-radios__input"
|
||||
id="settings-1"
|
||||
name="settings"
|
||||
type="radio"
|
||||
value="revoked"
|
||||
component="input"
|
||||
checked={
|
||||
settingsState === "revoked"
|
||||
}
|
||||
onChange={() => {
|
||||
updateObj(
|
||||
"settings",
|
||||
"revoked"
|
||||
);
|
||||
}}
|
||||
/>
|
||||
<label
|
||||
className="govuk-label govuk-radios__label"
|
||||
htmlFor="settings-1"
|
||||
>
|
||||
{t(
|
||||
"cookies:cookie-settings-settings-radio-1-label"
|
||||
)}
|
||||
</label>
|
||||
</div>
|
||||
<div className="govuk-radios__item">
|
||||
<input
|
||||
className="govuk-radios__input"
|
||||
id="settings-2"
|
||||
name="settings"
|
||||
type="radio"
|
||||
value="accepted"
|
||||
component="input"
|
||||
checked={
|
||||
settingsState === "accepted"
|
||||
}
|
||||
onChange={() => {
|
||||
updateObj(
|
||||
"settings",
|
||||
"accepted"
|
||||
);
|
||||
}}
|
||||
/>
|
||||
<label
|
||||
className="govuk-label govuk-radios__label"
|
||||
htmlFor="settings-2"
|
||||
>
|
||||
{t(
|
||||
"cookies:cookie-settings-settings-radio-2-label"
|
||||
)}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset className="govuk-fieldset">
|
||||
<legend className="govuk-fieldset__legend">
|
||||
<h4 className="govuk-!-font-size-27">
|
||||
{t(
|
||||
"cookies:cookie-settings-essential-heading"
|
||||
)}
|
||||
</h4>
|
||||
<p className="govuk-body">
|
||||
{t(
|
||||
"cookies:cookie-settings-essential-paragraph-1"
|
||||
)}
|
||||
</p>
|
||||
<ul className="govuk-list govuk-list--bullet">
|
||||
<li>
|
||||
{t(
|
||||
"cookies:cookie-settings-essential-list-item-1"
|
||||
)}
|
||||
</li>
|
||||
<li>
|
||||
{t(
|
||||
"cookies:cookie-settings-essential-list-item-2"
|
||||
)}
|
||||
</li>
|
||||
</ul>
|
||||
<p className="govuk-body">
|
||||
{t(
|
||||
"cookies:cookie-settings-essential-paragraph-2"
|
||||
)}
|
||||
</p>
|
||||
<p className="govuk-body">
|
||||
<a
|
||||
className="govuk-link govuk-link--no-underline govuk-!-font-weight-bold"
|
||||
href={t(
|
||||
"cookies:cookie-settings-essential-link"
|
||||
)}
|
||||
>
|
||||
{t(
|
||||
"cookies:cookie-settings-essential-link-label"
|
||||
)}
|
||||
</a>
|
||||
</p>
|
||||
</legend>
|
||||
</fieldset>
|
||||
<div>
|
||||
<button
|
||||
type="submit"
|
||||
className="govuk-button "
|
||||
>
|
||||
{t(
|
||||
"cookies:cookie-settings-save-button-label"
|
||||
)}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
);
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<CookieForm />
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
const mapStateToProps = (state) => {
|
||||
return {
|
||||
initialValues: {
|
||||
usage: state.accountDetails.cookieObj.usage,
|
||||
communications: state.accountDetails.cookieObj.communications,
|
||||
settings: state.accountDetails.cookieObj.settings,
|
||||
},
|
||||
};
|
||||
};
|
||||
|
||||
export default connect(mapStateToProps)(
|
||||
reduxForm({
|
||||
form: "CookieManagementForm",
|
||||
enableReinitialize: true,
|
||||
})(CookieManagementMain)
|
||||
);
|
||||
+10
-9
@@ -175,15 +175,16 @@ export default function Footer(props) {
|
||||
</a>
|
||||
</li>
|
||||
<li className="govuk-footer__inline-list-item">
|
||||
<a
|
||||
href="https://gov.wales/help/cookies"
|
||||
id="aCookies"
|
||||
className="govuk-footer__link"
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
>
|
||||
{t("common:footer-cookies-link")}
|
||||
</a>
|
||||
<Link href="/help/cookies">
|
||||
<a
|
||||
id="aCookies"
|
||||
className="govuk-footer__link"
|
||||
>
|
||||
{t(
|
||||
"common:footer-cookies-link"
|
||||
)}
|
||||
</a>
|
||||
</Link>
|
||||
</li>
|
||||
|
||||
<li className="govuk-footer__inline-list-item">
|
||||
|
||||
@@ -7,7 +7,6 @@ import { Field, reduxForm } from "redux-form";
|
||||
import LoadingOverlay from "react-loading-overlay";
|
||||
import { getLogin } from "../../actions";
|
||||
import { setLoggedInUserId } from "../../store/accountDetails/action";
|
||||
import Cookies from "cookies";
|
||||
|
||||
const required = (errorMsg) => (value) =>
|
||||
value || typeof value === "number" ? undefined : errorMsg;
|
||||
|
||||
+2
-2
@@ -28,8 +28,8 @@ export default function Home({ children, pages }) {
|
||||
<CaseSearch />
|
||||
<CaseComment />
|
||||
<Dns />
|
||||
<Login />
|
||||
{/* <Inspectorate /> */}
|
||||
{/* <Login />
|
||||
<Inspectorate /> */}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -55,7 +55,6 @@ const SearchResults = (props) => {
|
||||
return (
|
||||
<div className="govuk-summary-list__row" key={key}>
|
||||
<dd className="govuk-summary-list__value govuk-!-font-size-16 ">
|
||||
{router.pathname.indexOf("myportal")}
|
||||
<Link
|
||||
href={
|
||||
router.locale == "cy"
|
||||
|
||||
Reference in New Issue
Block a user