added in copy

components/footer.js

@@ -238,11 +238,9 @@ export default function Footer(props) {
 
                                     <li className="govuk-footer__inline-list-item">
                                         <Link
-                                            href={
+                                            href={t(
-                                                router.locale == "cy"
+                                                "common:footer-terms-conditions-link"
-                                                    ? "/telerau-ac-amodau"
+                                            )}
-                                                    : "/terms-and-conditions"
-                                            }
                                         >
                                             <a
                                                 id="aTermsConds"

components/footerDocs/privacy_en.js

@@ -49,8 +49,8 @@ export default function PrivacyEN() {
                         How we process any personal information including
                         special category data you have voluntarily provided to
                         us relating directly to you or any other third-party
-                        individual's information you may have provided relating
+                        individual's information you may have provided
-                        to PEDW casework.
+                        relating to PEDW casework.
                     </li>
                     <li>
                         Planning and Environment Decisions Wales handle a
@@ -207,7 +207,7 @@ export default function PrivacyEN() {
                     link:
                 </p>
                 <p>
-                    Information Commissioner's Office <br />
+                    Information Commissioner&apos;s Office <br />
                     1 Wycliffe House
                     <br />
                     Water Lane, Wilmslow <br />
@@ -757,20 +757,23 @@ export default function PrivacyEN() {
                         We provide your information to the relevant Welsh
                         Minister who make the final decision on the applications
                         and appeals we examine via:
-                    </li>
+                        <ul>
                             <li>
-                        The Department for Business, Energy, and Industrial
+                                The Department for Business, Energy, and
-                        Strategy
+                                Industrial Strategy
                             </li>
                             <li>The Department for Transport</li>
                             <li>
-                        The Department for Environment, Food and Rural Affairs
+                                The Department for Environment, Food and Rural
-                        and
+                                Affairs and
                             </li>
                             <li>
                                 The Ministry of Housing, Communities and Local
                                 Government.
                             </li>
+                        </ul>
+                    </li>
+
                     <li>
                         For fairness to the other parties interested in a case,
                         we need to share your representations as indicated
@@ -857,9 +860,7 @@ export default function PrivacyEN() {
                     This will normally be set out in our guidance, but if you
                     have specific queries or concerns in respect of a particular
                     case then please contact the case officer who, if necessary,
-                    will discuss the matter with … - process to be established,
+                    will discuss the matter with PEDW.
-                    can this be internal to PEDW or should it be sent up the
-                    line?.
                 </p>
                 <h3>10. Do we use any data processors? </h3>
                 <p>

components/myportal.js

@@ -9,6 +9,7 @@ import AwaitingSubmission from "./myportal/awaitingsubmission";
 import MyRepresentations from "./myportal/myrepresentations";
 import WatchedCases from "./myportal/watchedcases";
 import YourAccount from "./myportal/youraccount";
+import { parseCookies, setCookie, destroyCookie } from "nookies";
 
 const MyPortal = (props) => {
     let { t } = useTranslation();
@@ -18,26 +19,48 @@ const MyPortal = (props) => {
 
     return (
         <main className="" id="main-content" role="main">
-            <div className="servicebanner govuk-!-margin-bottom-4">
+            <div className="servicebanner myportal govuk-!-margin-bottom-4">
                 <h1>
                     <img
                         src={
                             router.locale == "cy"
-                                ? "/assets/images/my-portal-cy.svg"
+                                ? "/assets/images/planning-casework-cy.svg"
-                                : "/assets/images/my-portal-en.svg"
+                                : "/assets/images/planning-casework-en.svg"
                         }
                         alt={router.locale == "cy" ? "Fy mhorth" : "My Portal"}
                     />
-                    <img
-                        className="pedw_logo"
-                        src="/assets/images/pedw_logo.png"
-                        alt={
-                            router.locale == "cy"
-                                ? "Penderfyniadau Cynllunio ac Amgylchedd Cymru"
-                                : "Planning & Environment Decisions Wales"
-                        }
-                    />
                 </h1>
+
+                <div className="serviceBanner_userDetails">
+                    <img
+                        className="user_logo"
+                        src="/assets/images/user.svg"
+                        alt={router.locale == "cy" ? "Defnyddiwr" : "User"}
+                    />{" "}
+                    <div className="serviceBanner_userDetails_name">
+                        {props.accountDetails.accountDetails.firstname}{" "}
+                        {props.accountDetails.accountDetails.lastname}
+                    </div>
+                    <div>
+                        <Link
+                            href={
+                                router.locale == "cy"
+                                    ? "/allgofnodi"
+                                    : "/logout"
+                            }
+                        >
+                            <a
+                                onClick={() => {
+                                    destroyCookie({}, "pinsUser"),
+                                        window.localStorage.clear();
+                                }}
+                                className="govuk-header__link govuk-!-margin-right-3"
+                            >
+                                {t("common:signout-label")}
+                            </a>
+                        </Link>
+                    </div>
+                </div>
             </div>
             <div className="govuk-grid-row">
                 <div className="govuk-grid-column-full">

components/servicebanner.js

@@ -9,6 +9,7 @@ export default function ServiceBanner() {
         <div className="servicebanner">
             <h1>
                 <img
+                    className="govuk-!-margin-top-4"
                     src={
                         router.locale == "cy"
                             ? "/assets/images/planning-casework-cy.svg"
@@ -16,7 +17,7 @@ export default function ServiceBanner() {
                     }
                     alt="Planning casework"
                 />
-                <img
+                {/* <img
                     className="pedw_logo"
                     src="/assets/images/pedw_logo.png"
                     alt={
@@ -24,7 +25,7 @@ export default function ServiceBanner() {
                             ? "Penderfyniadau Cynllunio ac Amgylchedd Cymru"
                             : "Planning & Environment Decisions Wales"
                     }
-                />
+                /> */}
             </h1>
         </div>
     );

locales/cy/common.json

@@ -17,7 +17,7 @@
   "search-button": "Chwilio",
   "submit-and-start": "Cyflwyno a dechrau'r cwrs",
   "footer-terms-conditions-link-label": "Telerau ac amodau",
-  "footer-terms-conditions-link": "/telerau-ac-amodau",
+  "footer-terms-conditions-link": "https://llyw.cymru/telerau-ac-amodau",
   "footer-privacy-link-label": "Preifatrwydd",
   "footer-privacy-link": "/preifatrwydd",
   "footer-cookies-link": "Cwcis",

locales/en/common.json

@@ -17,7 +17,7 @@
   "search-button": "Search",
   "submit-and-start": "Submit and start course",
   "footer-terms-conditions-link-label": "Terms and conditions",
-  "footer-terms-conditions-link": "/terms-and-conditions",
+  "footer-terms-conditions-link": "https://gov.wales/terms-and-conditions",
   "footer-privacy-link-label": "Privacy",
   "footer-privacy-link": "/privacy",
   "footer-cookies-link": "Cookies",

pages/500.js

@@ -1,52 +0,0 @@
-import Link from "next/link";
-import Head from "next/head";
-import Header from "../components/header";
-import Banner from "../components/banner";
-import CookieBanner from "../components/cookieBanner";
-import useTranslation from "next-translate/useTranslation";
-import Footer from "../components/footer";
-
-function Error({ statusCode }, props) {
-    let { t, lang } = useTranslation();
-    const { footerLinks, pages } = props;
-
-    return (
-        <div>
-            <Head>
-                <title>
-                    {t("case:page-title")} - {t("common:service-name")}
-                </title>
-            </Head>
-            <div id="page_wrapper">
-                <CookieBanner />
-                <Header courseName={t("common:service-name")} />
-                <div className="govuk-width-container govuk-!-padding-bottom-9">
-                    <main className="govuk-main-wrapper govuk-!-padding-top-9 govuk-!-padding-bottom-9">
-                        <div className="govuk-grid-row">
-                            <div className="govuk-grid-column-two-thirds ">
-                                <h1>{t("common:error-page-title")}</h1>
-                                <p className="govuk-body">
-                                    {statusCode
-                                        ? `An error ${statusCode} occurred on server`
-                                        : t("common:error-page-message")}
-                                </p>
-                                <Link href="/">
-                                    <a>Go back home</a>
-                                </Link>
-                            </div>
-                        </div>
-                    </main>
-                </div>
-                <Footer footerLinks={footerLinks} />
-            </div>
-        </div>
-    );
-}
-
-Error.getInitialProps = ({ res, err }) => {
-    const statusCode = res ? res.statusCode : err ? err.statusCode : 404;
-    console.log(res, err);
-    return { statusCode };
-};
-
-export default Error;

pages/myportal/index.js

@@ -52,6 +52,7 @@ const Home = (props) => {
         myRepresentations,
         watchedCases,
         awaitingSubmission,
+        accountDetails,
     } = props;
     let { t, lang } = useTranslation();
 
@@ -137,6 +138,7 @@ const Home = (props) => {
                         myRepresentations={myRepresentations}
                         watchedCases={watchedCases}
                         awaitingSubmission={awaitingSubmission}
+                        accountDetails={accountDetails}
                     />
                 </div>
                 <Footer footerLinks={footerLinks} />

public/assets/images/user.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>global/icon/user</title>
+    <defs>
+        <circle id="path-1" cx="10" cy="10" r="10"></circle>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group-15">
+            <g id="Group-14">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <use id="Oval-2" fill="#0360A6" xlink:href="#path-1"></use>
+                <g id="Group" mask="url(#mask-2)" fill="#0360A6">
+                    <g id="colour/blue/$blue-#0360a6">
+                        <polygon id="#0360a6" points="-5.81730895e-14 1.15040252e-13 20 1.15040252e-13 20 20 -5.81730895e-14 20"></polygon>
+                    </g>
+                </g>
+            </g>
+            <path d="M10.0824634,10.3113192 C12.7982346,10.3113192 14.9978864,11.4111451 14.9978864,12.7690307 L14.9978864,13.9978864 L5.16704039,13.9978864 L5.16704039,12.7690307 C5.16704039,11.4111451 7.36669219,10.3113192 10.0824634,10.3113192" id="Path" fill="#FFFFFF"></path>
+            <path d="M10.0824634,4.16704039 C11.4397346,4.16704039 12.5401749,5.26748072 12.5401749,6.6247519 C12.5401749,7.98202308 11.4397346,9.0824634 10.0824634,9.0824634 C8.72519222,9.0824634 7.6247519,7.98202308 7.6247519,6.6247519 C7.6247519,5.26748072 8.72519222,4.16704039 10.0824634,4.16704039" id="Path" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>

styles/sass/welshgov/_application.scss

@@ -213,11 +213,65 @@ a.longLinkBreak {
 
         @media screen and (max-width: 360px) {
             flex-direction: column-reverse;
+            align-items: flex-start;
             .pedw_logo {
                 margin-bottom: 20px;
             }
         }
     }
+    &.myportal {
+        display: flex;
+        justify-content: space-between;
+        @media screen and (max-width: 414px) {
+            flex-direction: column;
+        }
+
+        h1 {
+            img {
+                @media screen and (max-width: 414px) {
+                    padding-bottom: 20px;
+                }
+            }
+        }
+
+        .serviceBanner_userDetails {
+            display: flex;
+            justify-content: space-between;
+            width: auto;
+            align-items: center;
+
+            .serviceBanner_userDetails_name {
+                padding-left: 8px;
+                padding-right: 20px;
+                color: $blue;
+                font-size: 16px;
+                font-weight: bold;
+                @media screen and (max-width: 414px) {
+                    max-width: 41%;
+                }
+            }
+            .govuk-header__link {
+                color: $blue;
+                font-weight: bold;
+                border: 1px solid $blue;
+                color: $blue;
+                font-size: 16px;
+                font-weight: bold;
+                padding: 10px 20px;
+                &:hover {
+                    background: $blue;
+                    border: 1px solid $blue;
+                    color: $white;
+                    font-size: 16px;
+                    padding: 10px 20px;
+                    text-decoration: none;
+                }
+                &:focus {
+                    box-shadow: none;
+                }
+            }
+        }
+    }
 }
 
 .govuk-grid-row {