Merged PR 602: created pages and gel amends

created pages and gel ammends

Related work items: #6628, #6629, #6630
This commit is contained in:
Robert Bond
2021-11-10 08:54:55 +00:00
15 changed files with 335 additions and 51 deletions
+10 -10
View File
@@ -1,9 +1,9 @@
// 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"
PORT= "3000"
@@ -15,11 +15,11 @@ I18N_DOMAIN = "cymru.local"
//I18N_DOMAIN ="gwaithcynllunio.gwasanaeth.llyw.cymru"
//test
RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
RELAYURI = "test-pedw-ns.servicebus.windows.net"
RELAYPATH = "test-pedw-hc"
SASKEY = "kTLrs9UHwuW9Msc9uNfjf+89qLYT6ly80lK0zdTYJW4="
SASKEYNAME = "testpedwhcpolicy"
//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
//RELAYURI = "test-pedw-ns.servicebus.windows.net"
//RELAYPATH = "test-pedw-hc"
//SASKEY = "kTLrs9UHwuW9Msc9uNfjf+89qLYT6ly80lK0zdTYJW4="
//SASKEYNAME = "testpedwhcpolicy"
//preprod
+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;
+20
View File
@@ -542,6 +542,26 @@ 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>
</>
) : (
""
)}
{!_.isEmpty(slug) ? (
<>
<li className="govuk-breadcrumbs__list-item">
+2 -2
View File
@@ -78,13 +78,13 @@ 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" />
+31 -21
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,17 +218,22 @@ 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">
+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;
+2 -2
View File
@@ -18,10 +18,10 @@
"footer-terms-conditions-link-label": "Telerau ac amodau",
"footer-terms-conditions-link": "https://llyw.cymru/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",
+6 -6
View File
@@ -1,22 +1,22 @@
{
"cookie-breadcrumb": "Cwcis",
"cookie-title-heading": "Cwcis ar LLYW.CYMRU",
"cookie-title-heading": "Cwcis ar Penderfyniadau Cynllunio a'r Amgylchedd Cymru",
"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 Penderfyniadau Cynllunio a'r Amgylchedd 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-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 Penderfyniadau Cynllunio a'r Amgylchedd 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-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 defnyddior wefan er mwyn i ni ei gwella yn seiliedig ar anghenion defnyddwyr. Mae Google Analytics yn gosod cwcis syn storio gwybodaeth wedii hanonymeiddio ynghylch:",
"cookie-settings-usage-list-item-1": "sut daethoch chi ir 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 Penderfyniadau Cynllunio a'r Amgylchedd Cymru 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 syn mesur fy nefnydd or 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 Penderfyniadau Cynllunio a'r Amgylchedd Cymru.",
"cookie-settings-communications-radio-1-label": "Peidiwch â defnyddio cwcis sy'n helpu gyda chyfathrebu a marchnata",
"cookie-settings-communications-radio-2-label": "Defnyddiwch gwcis syn helpu gyda chyfathrebu a marchnata",
"cookie-settings-settings-heading": "Cwcis sy'n cofio'ch gosodiadau",
@@ -29,6 +29,6 @@
"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-essential-link-label": "Mwy o wybodaeth am cwcis ar Penderfyniadau Cynllunio a'r Amgylchedd Cymru.",
"cookie-settings-save-button-label": "Cadw newidiadau"
}
+2 -2
View File
@@ -18,10 +18,10 @@
"footer-terms-conditions-link-label": "Terms and conditions",
"footer-terms-conditions-link": "https://gov.wales/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",
+7 -7
View File
@@ -1,22 +1,22 @@
{
"cookie-breadcrumb": "Cookies",
"cookie-title-heading": "Cookies on GOV.WALES",
"cookie-title-heading": "Cookies on Planning and Environment Decisions Wales",
"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": "Planning and Environment Decisions 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-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 Planning and Environment Decisions Wales 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 Planning and Environment Decisions Wales 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 Planning and Environment Decisions Wales.",
"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,7 @@
"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-essential-link": "https://gov.wales/details-about-cookies-govwales",
"cookie-settings-essential-link-label": "Find out more about cookies on Planning and Environment Decisions Wales.",
"cookie-settings-save-button-label": "Save changes"
}
+8
View File
@@ -89,6 +89,14 @@ module.exports = {
source: "/help/cwcis",
destination: "/help/cookies",
},
{
source: "/hygyrchedd",
destination: "/accessibility",
},
{
source: "/preifatrwydd",
destination: "/privacy",
},
// {
// source: "/cy:path*",
+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);
+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} />
+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);
+2 -1
View File
@@ -202,6 +202,7 @@ a.longLinkBreak {
.servicebanner {
h1 {
margin-bottom: 0px;
margin-top: 0px;
display: flex;
justify-content: space-between;
@@ -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) {