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

added representation, case flows

Browse Source
This commit is contained in:
robbond
2021-08-04 09:29:28 +01:00
parent 0083df2209
commit f13493ac46
37 changed files with 1928 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/breadcrumbs.js
+25 -1
View File
@@ -167,7 +167,31 @@ const Breadcrumbs = (props) => {
</Link> </Link>
</li> </li>
<li className="govuk-breadcrumbs__list-item"> <li className="govuk-breadcrumbs__list-item">
Case Reference: CAS-00010-J9W6L5 Case Reference:{" "}
{
props.props.currentView.caseReference
.currentReference
}
</li>
</>
) : (
""
)}
{router.pathname == "/representation" ? (
<>
<li className="govuk-breadcrumbs__list-item">
<Link href="/myportal">
<a className="govuk-breadcrumbs__link">
My Portal
</a>
</Link>
</li>
<li className="govuk-breadcrumbs__list-item">
Make representation for:{" "}
{
props.props.currentView.caseReference
.currentReference
}
</li> </li>
</> </>
) : ( ) : (
components/case.js
+14 -3
View File
@@ -5,7 +5,7 @@ import useTranslation from "next-translate/useTranslation";
import Summary from "./case/summary"; import Summary from "./case/summary";
import Documents from "./case/documents"; import Documents from "./case/documents";
export default function CaseSummary({ children, pages }) { const CaseSummary = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
const router = useRouter(); const router = useRouter();
@@ -19,10 +19,21 @@ export default function CaseSummary({ children, pages }) {
> >
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<Summary /> <Summary
myCases={props.myCases}
myRepresentations={props.myRepresentations}
watchedCases={props.watchedCases}
awaitingSubmission={props.awaitingSubmission}
caseReference={props.caseReference}
currentType={props.currentType}
searchResultsObj={props.searchResultsObj}
searchString={props.searchString}
/>
<Documents /> <Documents />
</div> </div>
</div> </div>
</main> </main>
); );
} };
export default CaseSummary;
components/case/representation/index.js
+473
View File
@@ -0,0 +1,473 @@
import Link from "next/link";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import jsonpath from "jsonpath";
import _ from "lodash";
import { Field, FieldArray, reduxForm, formValueSelector } from "redux-form";
import { connect } from "react-redux";
import { useDropzone } from "react-dropzone";
const MakeRepresentation = (props) => {
let { t } = useTranslation();
const { acceptedFiles, getRootProps, getInputProps } = useDropzone();
const files = acceptedFiles.map((file) => (
<li key={file.path}>
{file.path} - {file.size} bytes
</li>
));
const router = useRouter();
const { locale } = router;
const {
caseReference,
myCases,
myRepresentations,
watchedCases,
awaitingSubmission,
searchResultsObj,
currentType,
} = props;
const formObj = props.props.form;
let setCaseQueryObj = props[currentType];
var casesObj = {};
currentType == "searchResultsObj"
? (casesObj = jsonpath.query(
setCaseQueryObj,
'$..[?(@.title=="' + caseReference + '")]'
))
: (casesObj = jsonpath.query(
setCaseQueryObj,
'$..[?(@.reference=="' + caseReference + '")]'
));
casesObj = Object.assign({}, ...casesObj);
const RenderRepresentationCapacity = ({
datafieldname,
name,
label,
id,
errorMsg,
options,
input: { onChange, value },
meta: { touched, error },
...custom
}) => {
return (
<>
<div
className={
touched && error
? "govuk-form-group govuk-form-group--error"
: "govuk-form-group "
}
>
<fieldset
className="govuk-fieldset"
aria-describedby={name + "-hint"}
>
<legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
<label
className="govuk-fieldset__heading govuk-body-m"
id={id + "_label"}
>
{label}
</label>
</legend>
{touched && error && (
<span
id={id + "-error"}
className="govuk-error-message"
>
<span className="govuk-visually-hidden">
Error:
</span>{" "}
{errorMsg}
</span>
)}
<div className="govuk-radios govuk-radios--small">
{Object.keys(options).map((key, index) => (
<div
className="govuk-radios__item"
data-children-count={key}
key={key}
>
<Field
id={id + "_" + index}
name={id}
component="input"
type="radio"
className="govuk-radios__input"
value={options[key]}
/>
<label
className="govuk-label govuk-radios__label"
htmlFor={id + "_" + index}
>
{options[key]}
</label>
</div>
))}
</div>
</fieldset>
</div>
</>
);
};
const { name, label } = props;
const capacityOptionsArr = [
"Appellant",
"Agent",
"Interested Party / Person",
"Land Owner",
];
const required = (value) => (value ? undefined : "Required");
const RenderPickList = ({
datafieldname,
name,
label,
input,
meta: { touched, errorStr },
}) => {
const dropdownObj = ["Final Comments", "Other", "Proof of Evidence"];
return (
<div>
<select
{...input}
className="govuk-select "
id={name}
name={name}
>
<option>Select...</option>
{Object.keys(dropdownObj).map((key, index) => {
return (
<option key={key} value={dropdownObj[key]}>
{dropdownObj[key]}
</option>
);
})}
</select>
{touched && errorStr && <span>{errorStr}</span>}
</div>
);
};
const RenderTextfield = ({
id,
rows,
datafieldname,
name,
label,
input,
errorMsg,
type,
className,
meta: { touched, error },
...custom
}) => {
return (
<>
<label className="govuk-label " htmlFor={id} id={id + "_label"}>
{label}
</label>
{touched && error && (
<span id={id + "-error"} className="govuk-error-message">
<span className="govuk-visually-hidden">Error:</span>{" "}
{errorMsg}
</span>
)}
<input
{...input}
className={className}
name={name}
id={id}
type={type}
/>
</>
);
};
return (
<div>
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<h1 className="govuk-heading-xl govuk-!-margin-bottom-7">
Make a representation
</h1>
<dl className="govuk-summary-list govuk-!-margin-bottom-9">
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
Appeal Reference
</dt>
<dd className="govuk-summary-list__value">
{currentType == "searchResultsObj"
? casesObj.title
: casesObj.reference}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-applicant-label")}
</dt>
<dd className="govuk-summary-list__value">
{casesObj.appellantApplicant || ""}
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-agent-label")}
</dt>
<dd className="govuk-summary-list__value">
Mr A Agent
</dd>
</div>
<div className="govuk-summary-list__row">
<dt className="govuk-summary-list__key">
{t("case:summary-site-address-label")}
</dt>
<dd className="govuk-summary-list__value">
{casesObj.address1 || ""}
<br />
{casesObj.town || ""}
<br />
{casesObj.postcode || ""}
</dd>
</div>
</dl>
</div>
</div>
<div className="vo_hidden">
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m ">Your details</h2>
<Field
name="representationCapacity"
datafieldname="representationCapacity"
label="In what capacity do you wish to make representations on this case?"
options={capacityOptionsArr}
id="representationCapacity"
className="govuk-radios__input"
//validate={[required]}
errorMsg="Select and option"
component={RenderRepresentationCapacity}
/>
</div>
</div>
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<div className="govuk-button-group">
<Link href="/representation">
<a className="govuk-button">Continue</a>
</Link>
</div>
</div>
</div>
</div>
<div>
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<h2 className="govuk-heading-m ">Representation</h2>
<div className="govuk-form-group">
<label
className="govuk-label govuk-body-m"
htmlFor="representationType"
>
What kind of representation are you making?
</label>
<Field
name="representationType"
component={RenderPickList}
datafieldname="representationType"
/>
</div>
</div>
</div>
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<div className="govuk-form-group">
<p className="govuk-body">
You can enter your comments in the space
provided or attach a separate document.
</p>
<fieldset
className="govuk-fieldset"
aria-describedby="commentBox-hint"
>
<div
id="commentBox-hint"
className="govuk-hint"
>
My comments are set out in:*
</div>
<div
className="govuk-checkboxes"
data-module="govuk-checkboxes"
>
<div className="govuk-checkboxes__item">
<Field
className="govuk-checkboxes__input"
id="commentBox"
name="commentBox"
value="email"
data-aria-controls="commentBox"
type="checkbox"
component={RenderTextfield}
/>
<label
className="govuk-label govuk-checkboxes__label"
htmlFor="commentBox"
>
the box below{" "}
</label>
</div>
<div
className={
_.isEmpty(
formObj["representationForm"]
)
? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden rr"
: _.isEmpty(
formObj[
"representationForm"
].values
)
? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden q11 "
: _.isEmpty(
formObj[
"representationForm"
].values.commentBox
)
? formObj["representationForm"]
.values.commentBox ==
false
? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
: "govuk-checkboxes__conditional"
: "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden wwwaqqqq"
}
id="conditional-commentBox"
>
<div className="govuk-form-group">
<textarea
className="govuk-input govuk-!-width-two-thirds"
rows="5"
/>
</div>
</div>
<div className="govuk-checkboxes__item">
<Field
className="govuk-checkboxes__input"
id="documentBox"
name="documentBox"
value="email"
data-aria-controls="documentBox"
type="checkbox"
component={RenderTextfield}
/>
<label
className="govuk-label govuk-checkboxes__label"
htmlFfor="documentBox"
>
separate documents
</label>
</div>
<div
className={
_.isEmpty(
formObj["representationForm"]
)
? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden rr"
: _.isEmpty(
formObj[
"representationForm"
].values
)
? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
: _.isEmpty(
formObj[
"representationForm"
].values.documentBox
)
? formObj["representationForm"]
.values.documentBox ==
false
? "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden www"
: "govuk-checkboxes__conditional"
: "govuk-checkboxes__conditional govuk-checkboxes__conditional--hidden"
}
id="conditional-documentBox"
>
<div className="govuk-form-group">
<section className="container">
<div
{...getRootProps({
className: "dropzone",
})}
>
<input
{...getInputProps()}
/>
<p>
Drag and drop files here
or click to select files
</p>
</div>
<aside>
<h4>Files</h4>
<ul>{files}</ul>
</aside>
</section>
</div>
</div>
</div>
</fieldset>
</div>{" "}
</div>
</div>
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<div className="govuk-button-group">
<Link href="/representation">
<a className="govuk-button">Continue</a>
</Link>
</div>
</div>
</div>
</div>
</div>
);
};
const mapStateToProps = (state) => {
return {
search: state.search,
searchResultsObj: state.searchResultsObj,
formData: state.formData,
appealType: state.appealType,
//form: state.form,
};
};
const mapDispatchToProps = (dispatch) => {
return {};
};
const selector = formValueSelector("representationForm");
export default connect(
mapStateToProps,
mapDispatchToProps
)(
reduxForm({
form: "representationForm",
destroyOnUnmount: false,
})(MakeRepresentation)
);
components/case/summary.js
+88 -33
View File
@@ -1,18 +1,48 @@
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import jsonpath from "jsonpath";
import _ from "lodash";
export default function CaseSummary() { const CaseSummary = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
const router = useRouter(); const router = useRouter();
const { locale } = router; const { locale } = router;
const {
caseReference,
myCases,
myRepresentations,
watchedCases,
awaitingSubmission,
searchResultsObj,
currentType,
} = props;
let setCaseQueryObj = props[currentType];
var casesObj = {};
currentType == "searchResultsObj"
? (casesObj = jsonpath.query(
setCaseQueryObj,
'$..[?(@.title=="' + caseReference + '")]'
))
: (casesObj = jsonpath.query(
setCaseQueryObj,
'$..[?(@.reference=="' + caseReference + '")]'
));
casesObj = Object.assign({}, ...casesObj);
return ( return (
<div> <div>
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<h1 className="govuk-heading-xl govuk-!-margin-bottom-7"> <h1 className="govuk-heading-xl govuk-!-margin-bottom-7">
Reference: CAS-00010-J9W6L5 Reference:{" "}
{currentType == "searchResultsObj"
? casesObj.title
: casesObj.reference}
</h1> </h1>
<dl className="govuk-summary-list govuk-!-margin-bottom-9"> <dl className="govuk-summary-list govuk-!-margin-bottom-9">
@@ -21,7 +51,7 @@ export default function CaseSummary() {
{t("case:summary-applicant-label")} {t("case:summary-applicant-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
Mr J Pocknell {casesObj.appellantApplicant || ""}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -29,7 +59,7 @@ export default function CaseSummary() {
{t("case:summary-agent-label")} {t("case:summary-agent-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
Mr Cos Polito Mr A Agent
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -37,11 +67,12 @@ export default function CaseSummary() {
{t("case:summary-site-address-label")} {t("case:summary-site-address-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
72 Guild Street {casesObj.address1 || ""}
<br /> <br />
London {casesObj.town || ""}
<br /> <br />
SE23 6FH {casesObj.postcode || ""}
</dd> </dd>
</div> </div>
</dl> </dl>
@@ -50,16 +81,17 @@ export default function CaseSummary() {
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<div className="govuk-button-group"> <div className="govuk-button-group">
<Link href="/advancedsearch"> <Link href="/representation">
<a className="govuk-button"> <a className="govuk-button">
{t("case:summary-make-representation-label")} {t("case:summary-make-representation-label")}
</a> </a>
</Link> </Link>
<Link href="/advancedsearch"> <a
<a className="govuk-button govuk-button--secondary"> onClick={() => router.back()}
{t("case:summary-back-button-label")} className="govuk-button govuk-button--secondary"
</a> >
</Link> {t("case:summary-back-button-label")}
</a>
</div> </div>
</div> </div>
</div> </div>
@@ -78,7 +110,9 @@ export default function CaseSummary() {
{t("case:summary-case-type-label")} {t("case:summary-case-type-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
Planning Appeal (W){" "} {casesObj[
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
] || "N/A"}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -86,7 +120,7 @@ export default function CaseSummary() {
{t("case:summary-lpa-label")} {t("case:summary-lpa-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
Hastings Borough Council {casesObj.lpaname || ""}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -96,8 +130,8 @@ export default function CaseSummary() {
)} )}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
Erection of a two-storey chalet {casesObj.caseDetails.caseSummary ||
style detached dwelling ""}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -108,7 +142,8 @@ export default function CaseSummary() {
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
{" "} {" "}
Neale Oliver {casesObj.caseDetails.caseOfficer ||
""}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -116,7 +151,8 @@ export default function CaseSummary() {
{t("case:summary-procedure-label")} {t("case:summary-procedure-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
Written representations {casesObj.caseDetails.procedure ||
""}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -124,7 +160,9 @@ export default function CaseSummary() {
{t("case:summary-status-label")} {t("case:summary-status-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
In Progress {casesObj[
"statuscode@OData.Community.Display.V1.FormattedValue"
] || ""}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -132,10 +170,13 @@ export default function CaseSummary() {
{t("case:summary-decision-label")} {t("case:summary-decision-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
Allowed {casesObj.caseDetails.decision ||
""}
<br />
<Link href="/"> <Link href="/">
<a> <a>
3272770 Appeal Decision.pdf {casesObj.caseDetails
.outcome_document || ""}
</a> </a>
</Link> </Link>
</dd> </dd>
@@ -147,7 +188,8 @@ export default function CaseSummary() {
)} )}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
Not Linked {casesObj.caseDetails
.caseLinkStatus || ""}
</dd> </dd>
</div> </div>
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
@@ -157,7 +199,8 @@ export default function CaseSummary() {
)} )}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
0 {casesObj.caseDetails.linkedCases ||
""}
</dd> </dd>
</div> </div>
</dl> </dl>
@@ -176,7 +219,8 @@ export default function CaseSummary() {
{t("case:summary-start-date-label")} {t("case:summary-start-date-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
26-May-21 {casesObj.caseDates.start_date ||
"N/A"}
</dd> </dd>
</div> </div>
@@ -187,7 +231,8 @@ export default function CaseSummary() {
)} )}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
02-Jun-21 {casesObj.caseDates
.questionnaireDue || "N/A"}
</dd> </dd>
</div> </div>
@@ -198,7 +243,8 @@ export default function CaseSummary() {
)} )}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
30-Jun-21 {casesObj.caseDates.statementsDue ||
"N/A"}
</dd> </dd>
</div> </div>
@@ -209,7 +255,9 @@ export default function CaseSummary() {
)} )}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
30-Jun-21 {casesObj.caseDates
.interestedPartyCommentsdue ||
"N/A"}
</dd> </dd>
</div> </div>
@@ -220,7 +268,9 @@ export default function CaseSummary() {
)} )}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
14-Jul-21 {casesObj.caseDates
.appellantLPAFinalCommentsdue ||
"N/A"}
</dd> </dd>
</div> </div>
@@ -231,7 +281,8 @@ export default function CaseSummary() {
)} )}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
N/A {casesObj.caseDates
.inquiryEvidenceDue || "N/A"}
</dd> </dd>
</div> </div>
@@ -240,7 +291,8 @@ export default function CaseSummary() {
{t("case:summary-event-date-label")} {t("case:summary-event-date-label")}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
Date arranged {casesObj.caseDates.eventDate ||
"N/A"}
</dd> </dd>
</div> </div>
@@ -251,7 +303,8 @@ export default function CaseSummary() {
)} )}
</dt> </dt>
<dd className="govuk-summary-list__value"> <dd className="govuk-summary-list__value">
Not yet decided {casesObj.caseDates.decisionDate ||
"N/A"}
</dd> </dd>
</div> </div>
</dl> </dl>
@@ -273,4 +326,6 @@ export default function CaseSummary() {
</div> */} </div> */}
</div> </div>
); );
} };
export default CaseSummary;
components/footer.js
+160 -79
View File
@@ -1,6 +1,7 @@
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { useState } from "react";
export default function Footer(props) { export default function Footer(props) {
let { t } = useTranslation(); let { t } = useTranslation();
@@ -18,11 +19,80 @@ export default function Footer(props) {
</li> </li>
)); ));
const [showShareState, setShowShareState] = useState(false);
let shareState = () => {
showShareState == true
? setShowShareState(false)
: setShowShareState(true);
};
return ( return (
<footer className="govuk-footer " role="contentinfo"> <>
<div className="sharebar" id="sharebar"> <div className="sharebar" id="sharebar">
<div className="sharebar__components container-fluid"> <div className="sharebar__components container-fluid">
<div className="main__sharebar"> <div className="main__sharebar">
<div
className={
showShareState
? "block-share active"
: "block-share"
}
>
<button
id="sharePage"
aria-controls="sharePageLinks"
aria-expanded="true"
onClick={() => {
shareState();
}}
>
Share this page
</button>
<ul
className={
showShareState
? "block-share active"
: "block-share"
}
id="sharePageLinks"
aria-labelledby="sharePage"
>
<li>
<a
href="https://twitter.com/intent/tweet?url=https%3A//gov.wales/"
className="twitter"
>
<span className="vo_hidden">
Share this page via{" "}
</span>
Twitter
</a>
</li>
<li>
<a
href="https://www.facebook.com/sharer/sharer.php?u=https%3A//gov.wales/"
className="facebook"
>
<span className="vo_hidden">
Share this page via{" "}
</span>
Facebook
</a>
</li>
<li>
<a
href="mailto:?body=https%3A//gov.wales/&amp;subject=Shared%20from%20gov.wales"
className="email"
>
<span className="vo_hidden">
Share this page via{" "}
</span>
Email
</a>
</li>
</ul>
</div>
<div <div
id="sharebar__backtotop" id="sharebar__backtotop"
className="btn--outlined btn--arrow-up" className="btn--outlined btn--arrow-up"
@@ -32,88 +102,99 @@ export default function Footer(props) {
</div> </div>
</div> </div>
</div> </div>
<div className="govuk-width-container "> <footer className="govuk-footer " role="contentinfo">
<div className="govuk-footer__meta"> <div className="govuk-width-container ">
<div className="govuk-footer__meta-item govuk-footer__meta-item--grow"> <div className="govuk-footer__meta">
<h2 className="govuk-visually-hidden">Support links</h2> <div className="govuk-footer__meta-item govuk-footer__meta-item--grow">
<nav role="navigation" aria-labelledby="footer_links"> <h2 className="govuk-visually-hidden">
<ul Support links
className="govuk-footer__inline-list" </h2>
id="footer_links" <nav
role="navigation"
aria-labelledby="footer_links"
> >
<li className="govuk-footer__inline-list-item"> <ul
<a className="govuk-footer__inline-list"
href="http://www.gov.uk/government/publications/appeals-casework-portal-documentation" id="footer_links"
id="aTermsConds" >
className="govuk-footer__link" <li className="govuk-footer__inline-list-item">
target="_blank" <a
rel="noreferrer" href="http://www.gov.uk/government/publications/appeals-casework-portal-documentation"
> id="aTermsConds"
{t( className="govuk-footer__link"
"common:footer-terms-conditions-link" target="_blank"
)} rel="noreferrer"
</a> >
</li> {t(
<li className="govuk-footer__inline-list-item"> "common:footer-terms-conditions-link"
<a )}
href="https://www.gov.uk/government/publications/planning-inspectorate-privacy-notices" </a>
id="aPrivacy" </li>
className="govuk-footer__link" <li className="govuk-footer__inline-list-item">
target="_blank" <a
rel="noreferrer" href="https://www.gov.uk/government/publications/planning-inspectorate-privacy-notices"
> id="aPrivacy"
{t("common:footer-privacy-link")} className="govuk-footer__link"
</a> target="_blank"
</li> rel="noreferrer"
<li className="govuk-footer__inline-list-item"> >
<a {t("common:footer-privacy-link")}
href="https://www.gov.uk/guidance/appeals-casework-portal-privacy-cookies" </a>
id="aCookies" </li>
className="govuk-footer__link" <li className="govuk-footer__inline-list-item">
target="_blank" <a
rel="noreferrer" href="https://www.gov.uk/guidance/appeals-casework-portal-privacy-cookies"
> id="aCookies"
{t("common:footer-cookies-link")} className="govuk-footer__link"
</a> target="_blank"
</li> rel="noreferrer"
<li className="govuk-footer__inline-list-item"> >
<a {t("common:footer-cookies-link")}
href="http://www.gov.uk/government/publications/appeals-casework-portal-documentation" </a>
className="govuk-footer__link" </li>
id="aAccess" <li className="govuk-footer__inline-list-item">
target="_blank" <a
rel="noreferrer" href="http://www.gov.uk/government/publications/appeals-casework-portal-documentation"
> className="govuk-footer__link"
{t("common:footer-accessibility-link")} id="aAccess"
</a> target="_blank"
</li> rel="noreferrer"
<li className="govuk-footer__inline-list-item"> >
<a {t(
href="http://www.gov.uk/guidance/feedback" "common:footer-accessibility-link"
id="feedback" )}
target="_blank" </a>
rel="noreferrer" </li>
> <li className="govuk-footer__inline-list-item">
{t("common:footer-feedback-link")} <a
</a> href="http://www.gov.uk/guidance/feedback"
</li> id="feedback"
</ul> target="_blank"
</nav> rel="noreferrer"
<div >
className="footer_logo container-fluid" {t("common:footer-feedback-link")}
id="footer_logo" </a>
> </li>
<a </ul>
href="https://gov.wales/" </nav>
className="footer__logo" <div
id="footerlogo" className="footer_logo container-fluid"
id="footer_logo"
> >
<span className="visually-hidden">Home</span> <a
</a> href="https://gov.wales/"
className="footer__logo"
id="footerlogo"
>
<span className="visually-hidden">
Home
</span>
</a>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </footer>
</footer> </>
); );
} }
components/header.js
+6 -7
View File
@@ -9,6 +9,7 @@ const Header = (props) => {
const router = useRouter(); const router = useRouter();
const { locale } = router; const { locale } = router;
const { setLogout } = props; const { setLogout } = props;
const noSignoutLink = ["/", "/logout"];
return ( return (
<header <header
@@ -98,9 +99,8 @@ const Header = (props) => {
</div> </div>
<div className="content"> <div className="content">
<ul> <ul>
{router.pathname == "/logout" ? ( {noSignoutLink.includes(router.pathname) ==
"" true ? (
) : router.pathname == "/" ? (
"" ""
) : ( ) : (
<li> <li>
@@ -157,8 +157,9 @@ const Header = (props) => {
</div> </div>
</div> </div>
<div className="fullNav"> <div className="fullNav">
{router.pathname != "/" || {noSignoutLink.includes(router.pathname) == true ? (
router.pathname != "/logout" ? ( ""
) : (
<Link href="/logout"> <Link href="/logout">
<a <a
onClick={() => { onClick={() => {
@@ -169,8 +170,6 @@ const Header = (props) => {
{t("common:signout-label")} {t("common:signout-label")}
</a> </a>
</Link> </Link>
) : (
""
)} )}
<Link <Link
components/loading.js
+1 -1
View File
@@ -11,7 +11,7 @@ export default function SkipLink(props) {
</Head> </Head>
<div className=""> <div className="">
<Header courseName="Appeals Casework Portal" /> <Header courseName="Planning Casework Portal" />
<div className="govuk-width-container"> <div className="govuk-width-container">
<Banner /> <Banner />
<main <main
components/myportal/awaitingsubmission.js
+1
View File
@@ -23,6 +23,7 @@ const AwaitingSubmission = (props) => {
showTopThree={ showTopThree={
props.awaitingSubmission.awaitingSubmission props.awaitingSubmission.awaitingSubmission
} }
topThreeType={"awaitingSubmission"}
/> />
</div> </div>
<div className="cardVieAll"> <div className="cardVieAll">
components/myportal/mycases.js
+4 -1
View File
@@ -18,7 +18,10 @@ const MyCases = (props) => {
{t("myportal:mycases-card-title")} {t("myportal:mycases-card-title")}
</h3> </h3>
<div className="cardModuleContainer"> <div className="cardModuleContainer">
<TopThree showTopThree={props.myCases.myCases} /> <TopThree
showTopThree={props.myCases.myCases}
topThreeType={"myCases"}
/>
</div> </div>
<div className="cardVieAll"> <div className="cardVieAll">
components/myportal/myrepresentations.js
+1
View File
@@ -21,6 +21,7 @@ const MyRepresentations = (props) => {
<div className="cardModuleContainer"> <div className="cardModuleContainer">
<TopThree <TopThree
showTopThree={props.myRepresentations.myRepresentations} showTopThree={props.myRepresentations.myRepresentations}
topThreeType={"myRepresentations"}
/> />
</div> </div>
components/myportal/topthree.js
+55 -17
View File
@@ -1,35 +1,73 @@
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { setCurrentReference } from "../../store/currentView/action";
import { connect } from "react-redux";
const TopThree = (props) => { const TopThree = (props) => {
let { t } = useTranslation(); let { t } = useTranslation();
const { showTopThree } = props; const { showTopThree, setCurrentReference, topThreeType } = props;
const router = useRouter(); const router = useRouter();
const { locale } = router; const { locale } = router;
let topthreeRow = []; let topthreeRow = [];
for (var i = 0; i < 3; i++) for (var i = 0; i < 3; i++) {
topthreeRow.push( (function (i) {
<div className="cardModuleItem" key={i}> topthreeRow.push(
<div className="cardModuleDetails"> <div className="cardModuleItem" key={i}>
<div className="cardModuleReference"> <div className="cardModuleDetails">
<b>Case reference:</b>{" "} <div className="cardModuleReference">
<Link href="/case"> <b>Case reference:</b>{" "}
<a>{props.showTopThree.value[i].reference}</a> <Link href="/case">
</Link> <a
</div> data-id={i}
<div className="carModuleAddress"> onClick={() => {
<b>Address: </b> {props.showTopThree.value[i].address} setCurrentReference({
"currentReference":
showTopThree.value[i].reference,
"currentType": topThreeType,
});
}}
>
{showTopThree.value[i].reference}
</a>
</Link>
</div>
{topThreeType != "awaitingSubmission" ? (
<div className="carModuleAddress">
<b>Address: </b>
{showTopThree.value[i].address1}
</div>
) : (
""
)}
{topThreeType == "awaitingSubmission" ? (
<div className="carModuleAddress">
Make Representation on Case Incomplete, not
submitted
</div>
) : (
""
)}
</div> </div>
<div className="cardModuleRemoveCase"> &mdash;</div>
</div> </div>
<div className="cardModuleRemoveCase"> &mdash;</div> );
</div> })(i);
); }
return <>{topthreeRow}</>; return <>{topthreeRow}</>;
}; };
export default TopThree; const mapDispatchToProps = (dispatch) => {
return {
setCurrentReference: (currentReference) => {
dispatch(setCurrentReference(currentReference));
},
};
};
export default connect(null, mapDispatchToProps)(TopThree);
components/myportal/viewall.js
+32 -7
View File
@@ -1,9 +1,13 @@
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { setCurrentReference } from "../../store/currentView/action";
import { connect } from "react-redux";
const ViewAllResults = (props) => {
const { searchString, searchResultsObj, currentView, setCurrentReference } =
props;
export default function ViewAllResults(props) {
const { searchString, searchResultsObj, currentView } = props;
let { t } = useTranslation(); let { t } = useTranslation();
const router = useRouter(); const router = useRouter();
@@ -18,7 +22,15 @@ export default function ViewAllResults(props) {
<div className="govuk-summary-list__row" key={key}> <div className="govuk-summary-list__row" key={key}>
<dd className="govuk-summary-list__value govuk-!-font-size-14 govuk-!-padding-left-2"> <dd className="govuk-summary-list__value govuk-!-font-size-14 govuk-!-padding-left-2">
<Link href="/case"> <Link href="/case">
<a> <a
onClick={() => {
setCurrentReference({
"currentReference":
resultsArr[index].reference,
"currentType": currentView.viewKey,
});
}}
>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
Case Reference: Case Reference:
</span> </span>
@@ -102,12 +114,25 @@ export default function ViewAllResults(props) {
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<div className="govuk-button-group"> <div className="govuk-button-group">
<Link href="/myportal"> <a
<a className="govuk-button">Back</a> onClick={() => router.back()}
</Link> className="govuk-button"
>
Back
</a>
</div> </div>
</div> </div>
</div> </div>
</> </>
); );
} };
const mapDispatchToProps = (dispatch) => {
return {
setCurrentReference: (currentReference) => {
dispatch(setCurrentReference(currentReference));
},
};
};
export default connect(null, mapDispatchToProps)(ViewAllResults);
components/myportal/watchedcases.js
+4 -1
View File
@@ -19,7 +19,10 @@ const WatchedCases = (props) => {
{t("myportal:watchedcases-card-title")} {t("myportal:watchedcases-card-title")}
</h3> </h3>
<div className="cardModuleContainer"> <div className="cardModuleContainer">
<TopThree showTopThree={props.watchedCases.watchedCases} /> <TopThree
showTopThree={props.watchedCases.watchedCases}
topThreeType={"watchedCases"}
/>
</div> </div>
<div className="cardVieAll"> <div className="cardVieAll">
components/newappeal/createCase.js
+45 -10
View File
@@ -157,17 +157,52 @@ let CreateCase = (props) => {
return ( return (
<option <option
key={key} key={key}
value={optionsObj[ value={
key _.isEmpty(
].Label.LocalizedLabels[0].Label.replace( optionsObj[key].Label
/[\s\-\+\(\)\,]/g, )
"" ? ""
).toLowerCase()} : _.isEmpty(
> optionsObj[key]
{ .Label
optionsObj[key].Label .LocalizedLabels
.LocalizedLabels[0].Label )
? ""
: _.isEmpty(
optionsObj[key]
.Label
.LocalizedLabels[0]
.Label
)
? ""
: optionsObj[
key
].Label.LocalizedLabels[0].Label.replace(
/[\s\-\+\(\)\,]/g,
""
).toLowerCase()
} }
>
{_.isEmpty(optionsObj[key])
? ""
: _.isEmpty(
optionsObj[key].Label
)
? ""
: _.isEmpty(
optionsObj[key].Label
.LocalizedLabels
)
? ""
: _.isEmpty(
optionsObj[key].Label
.LocalizedLabels[0]
.Label
)
? ""
: optionsObj[key].Label
.LocalizedLabels[0]
.Label}
</option> </option>
); );
})} })}
components/representation.js
+38
View File
@@ -0,0 +1,38 @@
import Link from "next/link";
import { useRouter } from "next/router";
import { useContext } from "react";
import useTranslation from "next-translate/useTranslation";
import Summary from "./case/representation";
const CaseSummary = (props) => {
let { t } = useTranslation();
const router = useRouter();
const { locale } = router;
return (
<main
className="govuk-main-wrapper govuk-main-wrapper--auto-spacing"
id="main-content"
role="main"
>
<div className="govuk-grid-row">
<div className="govuk-grid-column-full">
<Summary
myCases={props.myCases}
myRepresentations={props.myRepresentations}
watchedCases={props.watchedCases}
awaitingSubmission={props.awaitingSubmission}
caseReference={props.caseReference}
currentType={props.currentType}
searchResultsObj={props.searchResultsObj}
searchString={props.searchString}
props={props.props}
/>
</div>
</div>
</main>
);
};
export default CaseSummary;
components/search/searchresults.js
+27 -8
View File
@@ -1,15 +1,17 @@
import Link from "next/link"; import Link from "next/link";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation"; import useTranslation from "next-translate/useTranslation";
import { setCurrentReference } from "../../store/currentView/action";
import { connect } from "react-redux";
export default function SearchResults(props) { const SearchResults = (props) => {
const { searchString, searchResultsObj } = props; const { searchString, searchResultsObj, setCurrentReference } = props;
let { t } = useTranslation(); let { t } = useTranslation();
const router = useRouter(); const router = useRouter();
const { locale } = router; const { locale } = router;
var resultsArr = props.searchResultsObj.searchResultsObj.value || [{}]; var resultsArr = searchResultsObj.value || [{}];
const resultRow = Object.keys(resultsArr).map((key, index) => { const resultRow = Object.keys(resultsArr).map((key, index) => {
<div className="govuk-summary-list__row"> <div className="govuk-summary-list__row">
<dd className="govuk-summary-list__value govuk-!-font-size-14 govuk-!-padding-left-2"> <dd className="govuk-summary-list__value govuk-!-font-size-14 govuk-!-padding-left-2">
@@ -58,9 +60,7 @@ export default function SearchResults(props) {
</h1> </h1>
<p className="govuk-body"> <p className="govuk-body">
{t("search:searchresults-count-label", { {t("search:searchresults-count-label", {
count: props.searchResultsObj.searchResultsObj[ count: searchResultsObj["@odata.count"].toString(),
"@odata.count"
].toString(),
})} })}
. You searched for <em>&quot;{searchString}&quot;</em> . You searched for <em>&quot;{searchString}&quot;</em>
</p> </p>
@@ -91,7 +91,16 @@ export default function SearchResults(props) {
<div className="govuk-summary-list__row" key={key}> <div className="govuk-summary-list__row" key={key}>
<dd className="govuk-summary-list__value govuk-!-font-size-14 govuk-!-padding-left-2"> <dd className="govuk-summary-list__value govuk-!-font-size-14 govuk-!-padding-left-2">
<Link href="/case"> <Link href="/case">
<a> <a
onClick={() => {
setCurrentReference({
"currentReference":
item.title,
"currentType":
"searchResultsObj",
});
}}
>
<span className="results-visually-hidden"> <span className="results-visually-hidden">
Case Reference: Case Reference:
</span> </span>
@@ -151,4 +160,14 @@ export default function SearchResults(props) {
</div> </div>
</div> </div>
); );
} };
const mapDispatchToProps = (dispatch) => {
return {
setCurrentReference: (currentReference) => {
dispatch(setCurrentReference(currentReference));
},
};
};
export default connect(null, mapDispatchToProps)(SearchResults);
components/searchresults.js
+10 -8
View File
@@ -20,7 +20,10 @@ export default function Search(props) {
> >
<div className="govuk-grid-row"> <div className="govuk-grid-row">
<div className="govuk-grid-column-full"> <div className="govuk-grid-column-full">
<SearchResults searchString={searchString} searchResultsObj={searchResultsObj}/> <SearchResults
searchString={searchString}
searchResultsObj={searchResultsObj.searchResultsObj}
/>
</div> </div>
</div> </div>
<div className="govuk-grid-row"> <div className="govuk-grid-row">
@@ -31,13 +34,12 @@ export default function Search(props) {
{t("search:searchresults-search-button-label")} {t("search:searchresults-search-button-label")}
</a> </a>
</Link> </Link>
<Link href="/advancedsearch"> <a
<a className="govuk-button govuk-button--secondary"> onClick={() => router.back()}
{t( className="govuk-button govuk-button--secondary"
"search:searchresults-new-search-button-label" >
)} {t("search:searchresults-new-search-button-label")}
</a> </a>
</Link>
</div> </div>
</div> </div>
</div> </div>
i18n.json
+3
View File
@@ -29,6 +29,9 @@
"/case": [ "/case": [
"case" "case"
], ],
"/representation": [
"case"
],
"/newappeal": [ "/newappeal": [
"newappeal" "newappeal"
], ],
locales/en/common.json
+1 -1
View File
@@ -14,4 +14,4 @@
"footer-feedback-link": "Feedback", "footer-feedback-link": "Feedback",
"mobile-nav-label": "Menu", "mobile-nav-label": "Menu",
"signout-label": "Sign out" "signout-label": "Sign out"
} }
package.json
+2 -1
View File
@@ -5,7 +5,7 @@
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",
"dev:app": "node ./server/server.js && yarn lint:js", "dev:app": "node ./server/server.js && yarn lint:js",
"build": "NODE_ENV=production node_modules/next/dist/bin/next build --debug", "build": "NODE_ENV=production node_modules/next/dist/bin/next build",
"start": "node_modules/next/dist/bin/next start" "start": "node_modules/next/dist/bin/next start"
}, },
"dependencies": { "dependencies": {
@@ -32,6 +32,7 @@
"react-cookie-consent": "^6.2.4", "react-cookie-consent": "^6.2.4",
"react-datepicker": "^4.1.1", "react-datepicker": "^4.1.1",
"react-dom": "17.0.2", "react-dom": "17.0.2",
"react-dropzone": "^11.3.4",
"react-redux": "^7.2.4", "react-redux": "^7.2.4",
"react-xml-parser": "^1.1.8", "react-xml-parser": "^1.1.8",
"redux-devtools-extension": "^2.13.9", "redux-devtools-extension": "^2.13.9",
pages/404.js
+37 -8
View File
@@ -1,13 +1,42 @@
// 404.js // 404.js
import Link from "next/link"; 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";
const FourOhFour = (props) => {
let { t, lang } = useTranslation();
const { footerLinks, pages } = props;
export default function FourOhFour() {
return ( return (
<> <div>
<h1>404 - Page Not Found</h1> <Head>
<Link href="/"> <title>
<a>Go back home</a> {t("case:page-title")} - {t("common:service-name")}
</Link> </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>404 - Page Not Found</h1>
<Link href="/">
<a>Go back home</a>
</Link>
</div>
</div>
</main>
</div>
<Footer footerLinks={footerLinks} />
</div>
</div>
); );
} };
export default FourOhFour;
pages/advancedsearch.js
-34
View File
@@ -41,40 +41,6 @@ const Home = (props) => {
); );
}; };
// export const getServerSideProps = wrapper.getServerSideProps(
// async ({ locale, store, req, res }) => {
// const token = await getToken();
// let accessToken = token.access_token;
// const apiRoot = process.browser ? window.API_ROOT : process.env.API_ROOT;
// const [pages, footerLinks, courseListContent] = await Promise.all([
// await getPages(accessToken, locale),
// await getFooterLinks(accessToken, locale),
// await getCourseList(accessToken, locale),
// ]);
// //const courseID = await getCourseID
// store.dispatch(setApiRoot(apiRoot));
// store.dispatch(setPages(pages));
// store.dispatch(setFooterLinks(footerLinks));
// store.dispatch(setCourseListContent(courseListContent));
// }
// );
// const mapStateToProps = (state) => {
// //console.log(state);
// return {
// apiroot: state.apiroot,
// courseListContent: state.courseListContent.courseListContent,
// pages: state.pages.pages,
// footerLinks: state.footerLinks.footerLinks,
// regions: state.regions,
// sectors: state.sectors,
// form: state.form,
// };
// };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
return { return {
search: state.search, search: state.search,
pages/api/lookups/awaitingSubmission.js
+111
View File
@@ -11,6 +11,33 @@ const ApiResponse = (req, res) => {
"postcode": "CF24 0JL", "postcode": "CF24 0JL",
"reference": "CAS-00017-B8X7N0", "reference": "CAS-00017-B8X7N0",
"appellantApplicant": "Mrs Denise Williams", "appellantApplicant": "Mrs Denise Williams",
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue":
"Planning Appeal - S78",
"pinswg_appealcasetype": "846040000",
"statuscode@OData.Community.Display.V1.FormattedValue": "",
"statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary": "",
"caseOfficer": "",
"procedure": "",
"status": "",
"decision": "",
"outcome_document": "",
"caseLinkStatus": "",
"linkedCases": "",
},
"caseDates": {
"start_date": "",
"questionnaireDue": "",
"statementsDue": "",
"interestedPartyCommentsdue": "",
"appellantLPAFinalCommentsdue": "",
"inquiryEvidenceDue": "",
"eventDate": "",
"decisionDate": "",
},
}, },
{ {
"@odata.etag": 'W/"547952"', "@odata.etag": 'W/"547952"',
@@ -21,6 +48,34 @@ const ApiResponse = (req, res) => {
"postcode": "CF24 0JL", "postcode": "CF24 0JL",
"reference": "CAS-00016-Y9K9Q0", "reference": "CAS-00016-Y9K9Q0",
"appellantApplicant": "Mrs Denise Williams", "appellantApplicant": "Mrs Denise Williams",
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue":
"Planning Appeal - S78",
"pinswg_appealcasetype": "846040000",
"statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress",
"statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary": "",
"caseOfficer": "",
"procedure": "",
"status": "",
"decision": "",
"outcome_document": "",
"caseLinkStatus": "",
"linkedCases": "",
},
"caseDates": {
"start_date": "",
"questionnaireDue": "",
"statementsDue": "",
"interestedPartyCommentsdue": "",
"appellantLPAFinalCommentsdue": "",
"inquiryEvidenceDue": "",
"eventDate": "",
"decisionDate": "",
},
}, },
{ {
"@odata.etag": 'W/"547952"', "@odata.etag": 'W/"547952"',
@@ -31,6 +86,34 @@ const ApiResponse = (req, res) => {
"postcode": "CF24 0JL", "postcode": "CF24 0JL",
"reference": "CAS-00011-K1N0J8", "reference": "CAS-00011-K1N0J8",
"appellantApplicant": "Mrs Denise Williams", "appellantApplicant": "Mrs Denise Williams",
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue":
"Planning Appeal - S78",
"pinswg_appealcasetype": "846040000",
"statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress",
"statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary": "",
"caseOfficer": "",
"procedure": "",
"status": "",
"decision": "",
"outcome_document": "",
"caseLinkStatus": "",
"linkedCases": "",
},
"caseDates": {
"start_date": "",
"questionnaireDue": "",
"statementsDue": "",
"interestedPartyCommentsdue": "",
"appellantLPAFinalCommentsdue": "",
"inquiryEvidenceDue": "",
"eventDate": "",
"decisionDate": "",
},
}, },
{ {
"@odata.etag": 'W/"547952"', "@odata.etag": 'W/"547952"',
@@ -41,6 +124,34 @@ const ApiResponse = (req, res) => {
"postcode": "CF24 0JL", "postcode": "CF24 0JL",
"reference": "CAS-00015-L7J9H1", "reference": "CAS-00015-L7J9H1",
"appellantApplicant": "Mrs Denise Williams", "appellantApplicant": "Mrs Denise Williams",
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue":
"Planning Appeal - S78",
"pinswg_appealcasetype": "846040000",
"statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress",
"statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary": "",
"caseOfficer": "",
"procedure": "",
"status": "",
"decision": "",
"outcome_document": "",
"caseLinkStatus": "",
"linkedCases": "",
},
"caseDates": {
"start_date": "",
"questionnaireDue": "",
"statementsDue": "",
"interestedPartyCommentsdue": "",
"appellantLPAFinalCommentsdue": "",
"inquiryEvidenceDue": "",
"eventDate": "",
"decisionDate": "",
},
}, },
], ],
}); });
pages/api/lookups/myCases.js
+98 -6
View File
@@ -3,7 +3,7 @@ const ApiResponse = (req, res) => {
res.json({ res.json({
"value": [ "value": [
{ {
"@odata.etag": 'W/"547952"', "@odata.etag": "W547952",
"lpaname": "Vale of Glamorgan Council", "lpaname": "Vale of Glamorgan Council",
"accountid": "56e7ef63-7e64-eb11-aaba-00224800be9c", "accountid": "56e7ef63-7e64-eb11-aaba-00224800be9c",
"address1": "21 Courtenay Road", "address1": "21 Courtenay Road",
@@ -17,9 +17,32 @@ const ApiResponse = (req, res) => {
"statuscode@OData.Community.Display.V1.FormattedValue": "statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress", "In Progress",
"statuscode": "1", "statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary":
"Erection of a two-storey chalet style detached dwelling",
"caseOfficer": "Neale Oliver",
"procedure": "Written representations",
"status": "In progress",
"decision": "Allowed",
"outcome_document": "23424Appeal Decision.pdf",
"caseLinkStatus": "not linked",
"linkedCases": "none",
},
"caseDates": {
"start_date": "26-May-21",
"questionnaireDue": "02-Jun-21",
"statementsDue": "30-Jun-21",
"interestedPartyCommentsdue": "30-Jun-21",
"appellantLPAFinalCommentsdue": "4-Jul-21",
"inquiryEvidenceDue": "N/A",
"eventDate": "Date arranged",
"decisionDate": "Not yet decided",
},
}, },
{ {
"@odata.etag": 'W/"547952"', "@odata.etag": "W547952",
"lpaname": "Bridgend CBC", "lpaname": "Bridgend CBC",
"accountid": "56e7ef63-7e64-eb11-aaba-00224800be9c", "accountid": "56e7ef63-7e64-eb11-aaba-00224800be9c",
"address1": "17 Colin Way", "address1": "17 Colin Way",
@@ -33,10 +56,33 @@ const ApiResponse = (req, res) => {
"statuscode@OData.Community.Display.V1.FormattedValue": "statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress", "In Progress",
"statuscode": "1", "statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary":
"Erection of a two-storey chalet style detached dwelling",
"caseOfficer": "Neale Oliver",
"procedure": "Written representations",
"status": "In progress",
"decision": "Allowed",
"outcome_document": "23424Appeal Decision.pdf",
"caseLinkStatus": "not linked",
"linkedCases": "none",
},
"caseDates": {
"start_date": "26-May-21",
"questionnaireDue": "02-Jun-21",
"statementsDue": "30-Jun-21",
"interestedPartyCommentsdue": "30-Jun-21",
"appellantLPAFinalCommentsdue": "4-Jul-21",
"inquiryEvidenceDue": "N/A",
"eventDate": "Date arranged",
"decisionDate": "Not yet decided",
},
}, },
{ {
"@odata.etag": 'W/"547952"', "@odata.etag": "W547952",
"lpaname": "Cardiff County Council Planning (A)", "lpaname": "Cardiff County Council Planning (A)",
"accountid": "56e7ef63-7e64-eb11-aaba-00224800be9c", "accountid": "56e7ef63-7e64-eb11-aaba-00224800be9c",
"address1": "120 Severn Grove", "address1": "120 Severn Grove",
"town": "Cardiff", "town": "Cardiff",
@@ -49,10 +95,33 @@ const ApiResponse = (req, res) => {
"statuscode@OData.Community.Display.V1.FormattedValue": "statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress", "In Progress",
"statuscode": "1", "statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary":
"Erection of a two-storey chalet style detached dwelling",
"caseOfficer": "Neale Oliver",
"procedure": "Written representations",
"status": "In progress",
"decision": "Allowed",
"outcome_document": "23424Appeal Decision.pdf",
"caseLinkStatus": "not linked",
"linkedCases": "none",
},
"caseDates": {
"start_date": "26-May-21",
"questionnaireDue": "02-Jun-21",
"statementsDue": "30-Jun-21",
"interestedPartyCommentsdue": "30-Jun-21",
"appellantLPAFinalCommentsdue": "4-Jul-21",
"inquiryEvidenceDue": "N/A",
"eventDate": "Date arranged",
"decisionDate": "Not yet decided",
},
}, },
{ {
"@odata.etag": 'W/"547952"', "@odata.etag": "W547952",
"lpaname": "Cardiff County Council Planning", "lpaname": "Cardiff County Council Planning",
"accountid": "56e7ef63-7e64-eb11-aaba-00224800be9c", "accountid": "56e7ef63-7e64-eb11-aaba-00224800be9c",
"address1": "25 Merches Gardens", "address1": "25 Merches Gardens",
"town": "Cardiff", "town": "Cardiff",
@@ -65,6 +134,29 @@ const ApiResponse = (req, res) => {
"statuscode@OData.Community.Display.V1.FormattedValue": "statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress", "In Progress",
"statuscode": "1", "statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary":
"Erection of a two-storey chalet style detached dwelling",
"caseOfficer": "Neale Oliver",
"procedure": "Written representations",
"status": "In progress",
"decision": "Allowed",
"outcome_document": "23424Appeal Decision.pdf",
"caseLinkStatus": "not linked",
"linkedCases": "none",
},
"caseDates": {
"start_date": "26-May-21",
"questionnaireDue": "02-Jun-21",
"statementsDue": "30-Jun-21",
"interestedPartyCommentsdue": "30-Jun-21",
"appellantLPAFinalCommentsdue": "4-Jul-21",
"inquiryEvidenceDue": "N/A",
"eventDate": "Date arranged",
"decisionDate": "Not yet decided",
},
}, },
], ],
}); });
pages/api/lookups/myRepresentations.js
+116
View File
@@ -11,6 +11,35 @@ const ApiResponse = (req, res) => {
"postcode": "CF24 0JL", "postcode": "CF24 0JL",
"reference": "CAS-00009-W8N6W4", "reference": "CAS-00009-W8N6W4",
"appellantApplicant": "Mrs Denise Williams", "appellantApplicant": "Mrs Denise Williams",
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue":
"Planning Appeal - S78",
"pinswg_appealcasetype": "846040000",
"statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress",
"statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary":
"Erection of a two-storey chalet style detached dwelling",
"caseOfficer": "Neale Oliver",
"procedure": "Written representations",
"status": "In progress",
"decision": "Allowed",
"outcome_document": "23424Appeal Decision.pdf",
"caseLinkStatus": "not linked",
"linkedCases": "none",
},
"caseDates": {
"start_date": "26-May-21",
"questionnaireDue": "02-Jun-21",
"statementsDue": "30-Jun-21",
"interestedPartyCommentsdue": "30-Jun-21",
"appellantLPAFinalCommentsdue": "4-Jul-21",
"inquiryEvidenceDue": "N/A",
"eventDate": "Date arranged",
"decisionDate": "Not yet decided",
},
}, },
{ {
"@odata.etag": 'W/"547952"', "@odata.etag": 'W/"547952"',
@@ -21,6 +50,35 @@ const ApiResponse = (req, res) => {
"postcode": "CF24 0JL", "postcode": "CF24 0JL",
"reference": "CAS-00010-J9W6L5", "reference": "CAS-00010-J9W6L5",
"appellantApplicant": "Mrs Denise Williams", "appellantApplicant": "Mrs Denise Williams",
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue":
"Planning Appeal - S78",
"pinswg_appealcasetype": "846040000",
"statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress",
"statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary":
"Erection of a two-storey chalet style detached dwelling",
"caseOfficer": "Neale Oliver",
"procedure": "Written representations",
"status": "In progress",
"decision": "Allowed",
"outcome_document": "23424Appeal Decision.pdf",
"caseLinkStatus": "not linked",
"linkedCases": "none",
},
"caseDates": {
"start_date": "26-May-21",
"questionnaireDue": "02-Jun-21",
"statementsDue": "30-Jun-21",
"interestedPartyCommentsdue": "30-Jun-21",
"appellantLPAFinalCommentsdue": "4-Jul-21",
"inquiryEvidenceDue": "N/A",
"eventDate": "Date arranged",
"decisionDate": "Not yet decided",
},
}, },
{ {
"@odata.etag": 'W/"547952"', "@odata.etag": 'W/"547952"',
@@ -31,6 +89,35 @@ const ApiResponse = (req, res) => {
"postcode": "CF24 0JL", "postcode": "CF24 0JL",
"reference": "CAS-00011-K1N0J8", "reference": "CAS-00011-K1N0J8",
"appellantApplicant": "Mrs Denise Williams", "appellantApplicant": "Mrs Denise Williams",
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue":
"Planning Appeal - S78",
"pinswg_appealcasetype": "846040000",
"statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress",
"statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary":
"Erection of a two-storey chalet style detached dwelling",
"caseOfficer": "Neale Oliver",
"procedure": "Written representations",
"status": "In progress",
"decision": "Allowed",
"outcome_document": "23424Appeal Decision.pdf",
"caseLinkStatus": "not linked",
"linkedCases": "none",
},
"caseDates": {
"start_date": "26-May-21",
"questionnaireDue": "02-Jun-21",
"statementsDue": "30-Jun-21",
"interestedPartyCommentsdue": "30-Jun-21",
"appellantLPAFinalCommentsdue": "4-Jul-21",
"inquiryEvidenceDue": "N/A",
"eventDate": "Date arranged",
"decisionDate": "Not yet decided",
},
}, },
{ {
"@odata.etag": 'W/"547952"', "@odata.etag": 'W/"547952"',
@@ -41,6 +128,35 @@ const ApiResponse = (req, res) => {
"postcode": "CF24 0JL", "postcode": "CF24 0JL",
"reference": "CAS-00012-D9W6S8", "reference": "CAS-00012-D9W6S8",
"appellantApplicant": "Mrs Denise Williams", "appellantApplicant": "Mrs Denise Williams",
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue":
"Planning Appeal - S78",
"pinswg_appealcasetype": "846040000",
"statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress",
"statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary":
"Erection of a two-storey chalet style detached dwelling",
"caseOfficer": "Neale Oliver",
"procedure": "Written representations",
"status": "In progress",
"decision": "Allowed",
"outcome_document": "23424Appeal Decision.pdf",
"caseLinkStatus": "not linked",
"linkedCases": "none",
},
"caseDates": {
"start_date": "26-May-21",
"questionnaireDue": "02-Jun-21",
"statementsDue": "30-Jun-21",
"interestedPartyCommentsdue": "30-Jun-21",
"appellantLPAFinalCommentsdue": "4-Jul-21",
"inquiryEvidenceDue": "N/A",
"eventDate": "Date arranged",
"decisionDate": "Not yet decided",
},
}, },
], ],
}); });
pages/api/lookups/watchedCases.js
+116
View File
@@ -11,6 +11,35 @@ const ApiResponse = (req, res) => {
"postcode": "CF24 0JL", "postcode": "CF24 0JL",
"reference": "CAS-00009-W8N6W4", "reference": "CAS-00009-W8N6W4",
"appellantApplicant": "Mrs Denise Williams", "appellantApplicant": "Mrs Denise Williams",
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue":
"Planning Appeal - S78",
"pinswg_appealcasetype": "846040000",
"statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress",
"statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary":
"Erection of a two-storey chalet style detached dwelling",
"caseOfficer": "Neale Oliver",
"procedure": "Written representations",
"status": "In progress",
"decision": "Allowed",
"outcome_document": "23424Appeal Decision.pdf",
"caseLinkStatus": "not linked",
"linkedCases": "none",
},
"caseDates": {
"start_date": "26-May-21",
"questionnaireDue": "02-Jun-21",
"statementsDue": "30-Jun-21",
"interestedPartyCommentsdue": "30-Jun-21",
"appellantLPAFinalCommentsdue": "4-Jul-21",
"inquiryEvidenceDue": "N/A",
"eventDate": "Date arranged",
"decisionDate": "Not yet decided",
},
}, },
{ {
"@odata.etag": 'W/"547952"', "@odata.etag": 'W/"547952"',
@@ -21,6 +50,35 @@ const ApiResponse = (req, res) => {
"postcode": "CF24 0JL", "postcode": "CF24 0JL",
"reference": "CAS-00010-J9W6L5", "reference": "CAS-00010-J9W6L5",
"appellantApplicant": "Mrs Denise Williams", "appellantApplicant": "Mrs Denise Williams",
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue":
"Planning Appeal - S78",
"pinswg_appealcasetype": "846040000",
"statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress",
"statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary":
"Erection of a two-storey chalet style detached dwelling",
"caseOfficer": "Neale Oliver",
"procedure": "Written representations",
"status": "In progress",
"decision": "Allowed",
"outcome_document": "23424Appeal Decision.pdf",
"caseLinkStatus": "not linked",
"linkedCases": "none",
},
"caseDates": {
"start_date": "26-May-21",
"questionnaireDue": "02-Jun-21",
"statementsDue": "30-Jun-21",
"interestedPartyCommentsdue": "30-Jun-21",
"appellantLPAFinalCommentsdue": "4-Jul-21",
"inquiryEvidenceDue": "N/A",
"eventDate": "Date arranged",
"decisionDate": "Not yet decided",
},
}, },
{ {
"@odata.etag": 'W/"547952"', "@odata.etag": 'W/"547952"',
@@ -31,6 +89,35 @@ const ApiResponse = (req, res) => {
"postcode": "CF24 0JL", "postcode": "CF24 0JL",
"reference": "CAS-00011-K1N0J8", "reference": "CAS-00011-K1N0J8",
"appellantApplicant": "Mrs Denise Williams", "appellantApplicant": "Mrs Denise Williams",
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue":
"Planning Appeal - S78",
"pinswg_appealcasetype": "846040000",
"statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress",
"statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary":
"Erection of a two-storey chalet style detached dwelling",
"caseOfficer": "Neale Oliver",
"procedure": "Written representations",
"status": "In progress",
"decision": "Allowed",
"outcome_document": "23424Appeal Decision.pdf",
"caseLinkStatus": "not linked",
"linkedCases": "none",
},
"caseDates": {
"start_date": "26-May-21",
"questionnaireDue": "02-Jun-21",
"statementsDue": "30-Jun-21",
"interestedPartyCommentsdue": "30-Jun-21",
"appellantLPAFinalCommentsdue": "4-Jul-21",
"inquiryEvidenceDue": "N/A",
"eventDate": "Date arranged",
"decisionDate": "Not yet decided",
},
}, },
{ {
"@odata.etag": 'W/"547952"', "@odata.etag": 'W/"547952"',
@@ -41,6 +128,35 @@ const ApiResponse = (req, res) => {
"postcode": "CF24 0JL", "postcode": "CF24 0JL",
"reference": "CAS-00012-D9W6S8", "reference": "CAS-00012-D9W6S8",
"appellantApplicant": "Mrs Denise Williams", "appellantApplicant": "Mrs Denise Williams",
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue":
"Planning Appeal - S78",
"pinswg_appealcasetype": "846040000",
"statuscode@OData.Community.Display.V1.FormattedValue":
"In Progress",
"statuscode": "1",
"caseDetails": {
"casetype": "",
"lpa": "",
"caseSummary":
"Erection of a two-storey chalet style detached dwelling",
"caseOfficer": "Neale Oliver",
"procedure": "Written representations",
"status": "In progress",
"decision": "Allowed",
"outcome_document": "23424Appeal Decision.pdf",
"caseLinkStatus": "not linked",
"linkedCases": "none",
},
"caseDates": {
"start_date": "26-May-21",
"questionnaireDue": "02-Jun-21",
"statementsDue": "30-Jun-21",
"interestedPartyCommentsdue": "30-Jun-21",
"appellantLPAFinalCommentsdue": "4-Jul-21",
"inquiryEvidenceDue": "N/A",
"eventDate": "Date arranged",
"decisionDate": "Not yet decided",
},
}, },
], ],
}); });
pages/case.js
+36 -35
View File
@@ -35,8 +35,26 @@ const Home = (props) => {
<Header courseName={t("common:service-name")} /> <Header courseName={t("common:service-name")} />
<div className="govuk-width-container"> <div className="govuk-width-container">
<Banner /> <Banner />
<Breadcrumbs slug={appealtypes} /> <Breadcrumbs slug={appealtypes} props={props} />
<Case /> <Case
myCases={props.myCases.myCases}
searchResultsObj={
props.searchResultsObj.searchResultsObj
}
myRepresentations={
props.myRepresentations.myRepresentations
}
watchedCases={props.watchedCases.watchedCases}
awaitingSubmission={
props.awaitingSubmission.awaitingSubmission
}
caseReference={
props.currentView.caseReference.currentReference
}
currentType={
props.currentView.caseReference.currentType
}
/>
</div> </div>
<Footer footerLinks={footerLinks} /> <Footer footerLinks={footerLinks} />
</div> </div>
@@ -44,38 +62,21 @@ const Home = (props) => {
); );
}; };
// export const getServerSideProps = wrapper.getServerSideProps( const mapStateToProps = (state) => {
// async ({ locale, store, req, res }) => { //console.log(state);
// const token = await getToken();
// let accessToken = token.access_token;
// const apiRoot = process.browser ? window.API_ROOT : process.env.API_ROOT; return {
currentView: state.currentView,
search: state.search,
searchResultsObj: state.searchResultsObj,
formData: state.formData,
appealType: state.appealType,
form: state.form,
myCases: state.myCases,
watchedCases: state.watchedCases,
myRepresentations: state.myRepresentations,
awaitingSubmission: state.awaitingSubmission,
};
};
// const [pages, footerLinks, courseListContent] = await Promise.all([ export default connect(mapStateToProps)(Home);
// await getPages(accessToken, locale),
// await getFooterLinks(accessToken, locale),
// await getCourseList(accessToken, locale),
// ]);
// //const courseID = await getCourseID
// store.dispatch(setApiRoot(apiRoot));
// store.dispatch(setPages(pages));
// store.dispatch(setFooterLinks(footerLinks));
// store.dispatch(setCourseListContent(courseListContent));
// }
// );
// const mapStateToProps = (state) => {
// //console.log(state);
// return {
// apiroot: state.apiroot,
// courseListContent: state.courseListContent.courseListContent,
// pages: state.pages.pages,
// footerLinks: state.footerLinks.footerLinks,
// regions: state.regions,
// sectors: state.sectors,
// form: state.form,
// };
// };
export default Home; //connect(mapStateToProps)(Home);
pages/index.js
-23
View File
@@ -40,27 +40,4 @@ const Home = (props) => {
); );
}; };
// export const getServerSideProps = wrapper.getServerSideProps(
// (store) =>
// async ({ query, req, res }) => {
// const incidents = await getIncidents;
// console.log(incidents);
// }
// );
// const mapStateToProps = (state) => {
// //console.log(state);
// return {
// apiroot: state.apiroot,
// courseListContent: state.courseListContent.courseListContent,
// pages: state.pages.pages,
// footerLinks: state.footerLinks.footerLinks,
// regions: state.regions,
// sectors: state.sectors,
// form: state.form,
// };
// };
export default Home; //connect(mapStateToProps)(Home); export default Home; //connect(mapStateToProps)(Home);
pages/myportal/index.js
+6
View File
@@ -70,6 +70,11 @@ export const getServerSideProps = wrapper.getServerSideProps(
async ({ query, req, res }) => { async ({ query, req, res }) => {
//console.log("the query", query); //console.log("the query", query);
res.setHeader(
"Cache-Control",
"public, s-maxage=604800, stale-while-revalidate"
);
const [ const [
myCases, myCases,
myRepresentations, myRepresentations,
@@ -93,6 +98,7 @@ const mapStateToProps = (state) => {
//console.log(state); //console.log(state);
return { return {
currentView: state.currentView,
search: state.search, search: state.search,
searchResultsObj: state.searchResultsObj, searchResultsObj: state.searchResultsObj,
formData: state.formData, formData: state.formData,
pages/newappeal/[appealtypes].js
+5 -3
View File
@@ -154,15 +154,17 @@ export const getServerSideProps = wrapper.getServerSideProps(
(store) => (store) =>
async ({ query, req, res }) => { async ({ query, req, res }) => {
//console.log("the query", query); //console.log("the query", query);
store.dispatch(setAppealTypeID(query.appealtypes)); const [appealTypeData, formdata] = await Promise.all([
const appealTypeData = await getAppealsTypes(); await getAppealsTypes(),
const formdata = (await getFormData(query.appealtypes)) || null; await getFormData(query.appealtypes),
]);
const caseReference = createCase("asasa", "asasa"); const caseReference = createCase("asasa", "asasa");
let xmlStr = formdata; let xmlStr = formdata;
xmlStr = formdata.value[0].formxml; xmlStr = formdata.value[0].formxml;
xmlStr = xmlStr.replace(/\\"/g, ""); xmlStr = xmlStr.replace(/\\"/g, "");
store.dispatch(setAppealTypeID(query.appealtypes));
store.dispatch(setCaseReference(caseReference)); store.dispatch(setCaseReference(caseReference));
store.dispatch(setForm(xmlStr)); store.dispatch(setForm(xmlStr));
store.dispatch(setAppealType(appealTypeData)); store.dispatch(setAppealType(appealTypeData));
pages/newappeal/index.js
+8 -4
View File
@@ -75,10 +75,14 @@ const Home = (props) => {
export const getServerSideProps = wrapper.getServerSideProps( export const getServerSideProps = wrapper.getServerSideProps(
(store) => (store) =>
async ({ query, req, res }) => { async ({ query, req, res }) => {
const appealTypeData = await getAppealsTypes(); res.setHeader(
const lpaData = await getLPA(); "Cache-Control",
console.log("appeal types", appealTypeData); "public, s-maxage=604800, stale-while-revalidate"
console.log("lpa typeswwwww", lpaData); );
const [appealTypeData, lpaData] = await Promise.all([
await getAppealsTypes(),
await getLPA(),
]);
store.dispatch(setAppealType(appealTypeData)); store.dispatch(setAppealType(appealTypeData));
store.dispatch(setLPA(lpaData)); store.dispatch(setLPA(lpaData));
} }
pages/representation.js
+83
View File
@@ -0,0 +1,83 @@
import _ from "lodash";
import Head from "next/head";
import Header from "../components/header";
import Banner from "../components/banner";
import CookieBanner from "../components/cookieBanner";
import Breadcrumbs from "../components/breadcrumbs";
import CaseSummary from "../components/case";
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 Cookies from "cookies";
import { useRouter } from "next/router";
import useTranslation from "next-translate/useTranslation";
import Case from "../components/representation";
const Home = (props) => {
const { footerLinks, pages } = props;
let { t, lang } = useTranslation();
const router = useRouter();
const { locale } = router;
const { appealtypes } = router.query;
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">
<Banner />
<Breadcrumbs slug={appealtypes} props={props} />
<Case
myCases={props.myCases.myCases}
searchResultsObj={
props.searchResultsObj.searchResultsObj
}
myRepresentations={
props.myRepresentations.myRepresentations
}
watchedCases={props.watchedCases.watchedCases}
awaitingSubmission={
props.awaitingSubmission.awaitingSubmission
}
caseReference={
props.currentView.caseReference.currentReference
}
currentType={
props.currentView.caseReference.currentType
}
props={props}
/>
</div>
<Footer footerLinks={footerLinks} />
</div>
</div>
);
};
const mapStateToProps = (state) => {
//console.log(state);
return {
currentView: state.currentView,
search: state.search,
searchResultsObj: state.searchResultsObj,
formData: state.formData,
appealType: state.appealType,
form: state.form,
myCases: state.myCases,
watchedCases: state.watchedCases,
myRepresentations: state.myRepresentations,
awaitingSubmission: state.awaitingSubmission,
};
};
export default connect(mapStateToProps)(Home);
pages/searchresults.js
+8 -29
View File
@@ -63,39 +63,18 @@ export const getServerSideProps = wrapper.getServerSideProps(
} }
); );
// export const getServerSideProps = wrapper.getServerSideProps(
// async ({ locale, store, query, req, res }) => {
// // const token = await getToken();
// // let accessToken = token.access_token;
// // const apiRoot = process.browser ? window.API_ROOT : process.env.API_ROOT;
// // const [pages, footerLinks, courseListContent] = await Promise.all([
// // await getPages(accessToken, locale),
// // await getFooterLinks(accessToken, locale),
// // await getCourseList(accessToken, locale),
// // ]);
// // //const courseID = await getCourseID
// // store.dispatch(setApiRoot(apiRoot));
// // store.dispatch(setPages(pages));
// // store.dispatch(setFooterLinks(footerLinks));
// // store.dispatch(setCourseListContent(courseListContent));
// console.log(query);
// //store.dispatch(setSearch(query.search));
// }
// );
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
return { return {
currentView: state.currentView,
search: state.search, search: state.search,
searchResultsObj: state.searchResultsObj, searchResultsObj: state.searchResultsObj,
// // apiroot: state.apiroot, formData: state.formData,
// // courseListContent: state.courseListContent.courseListContent, appealType: state.appealType,
// // pages: state.pages.pages, form: state.form,
// // footerLinks: state.footerLinks.footerLinks, myCases: state.myCases,
// // regions: state.regions, watchedCases: state.watchedCases,
// // sectors: state.sectors, myRepresentations: state.myRepresentations,
// // form: state.form, awaitingSubmission: state.awaitingSubmission,
}; };
}; };
pages/viewall.js
-22
View File
@@ -63,28 +63,6 @@ export const getServerSideProps = wrapper.getServerSideProps(
} }
); );
// export const getServerSideProps = wrapper.getServerSideProps(
// async ({ locale, store, query, req, res }) => {
// // const token = await getToken();
// // let accessToken = token.access_token;
// // const apiRoot = process.browser ? window.API_ROOT : process.env.API_ROOT;
// // const [pages, footerLinks, courseListContent] = await Promise.all([
// // await getPages(accessToken, locale),
// // await getFooterLinks(accessToken, locale),
// // await getCourseList(accessToken, locale),
// // ]);
// // //const courseID = await getCourseID
// // store.dispatch(setApiRoot(apiRoot));
// // store.dispatch(setPages(pages));
// // store.dispatch(setFooterLinks(footerLinks));
// // store.dispatch(setCourseListContent(courseListContent));
// console.log(query);
// //store.dispatch(setSearch(query.search));
// }
// );
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
return { return {
search: state.search, search: state.search,
store/currentView/action.js
+8
View File
@@ -1,6 +1,7 @@
export const currentViewActionTypes = { export const currentViewActionTypes = {
GETCURRENTVIEW: "GETCURRENTVIEW", GETCURRENTVIEW: "GETCURRENTVIEW",
SETCURRENTVIEW: "SETCURRENTVIEW", SETCURRENTVIEW: "SETCURRENTVIEW",
SETCURRENTREFERENCE: "SETCURRENTREFERENCE",
}; };
export const getCurrentViewObj = () => (dispatch) => { export const getCurrentViewObj = () => (dispatch) => {
@@ -15,3 +16,10 @@ export const setCurrentView = (currentView) => (dispatch) => {
currentView: currentView, currentView: currentView,
}); });
}; };
export const setCurrentReference = (caseReference) => (dispatch) => {
return dispatch({
type: currentViewActionTypes.SETCURRENTREFERENCE,
caseReference: caseReference,
});
};
store/currentView/reducer.js
+6
View File
@@ -2,6 +2,7 @@ import { currentViewActionTypes } from "./action";
const currentViewInitialState = { const currentViewInitialState = {
currentView: {}, currentView: {},
caseReference: {},
}; };
export default function reducer(state = currentViewInitialState, action) { export default function reducer(state = currentViewInitialState, action) {
@@ -11,6 +12,11 @@ export default function reducer(state = currentViewInitialState, action) {
...state, ...state,
currentView: action.currentView, currentView: action.currentView,
}; };
case currentViewActionTypes.SETCURRENTREFERENCE:
return {
...state,
caseReference: action.caseReference,
};
default: default:
return state; return state;
} }
styles/sass/welshgov/_application.scss
+300 -1
View File
@@ -6,10 +6,11 @@ html {
.govuk-body, .govuk-body,
.govuk-body-s, .govuk-body-s,
.govuk-body-m, .govuk-body-m,
.govuk-footer,
.govuk-heading-xl, .govuk-heading-xl,
.govuk-heading-l, .govuk-heading-l,
.govuk-heading-m, .govuk-heading-m,
s .govuk-header-l, .govuk-header-l,
.govuk-header-m, .govuk-header-m,
.govuk-header__link, .govuk-header__link,
.govuk-button, .govuk-button,
@@ -30,6 +31,14 @@ a {
background-color: #323232; background-color: #323232;
} }
.govuk-breadcrumbs__link:link,
.govuk-breadcrumbs__link:visited {
color: #0360a6;
font-weight: bold;
text-decoration: none;
font-size: 16px;
}
.govuk-grid-row { .govuk-grid-row {
@media screen and (max-width: 900px) { @media screen and (max-width: 900px) {
// margin-right: 0px; // margin-right: 0px;
@@ -37,6 +46,10 @@ a {
} }
} }
.govuk-checkboxes__conditional--hidden {
display: none;
}
.govuk-button { .govuk-button {
background-color: $red; background-color: $red;
@@ -69,6 +82,14 @@ a {
margin-right: auto; margin-right: auto;
padding-left: 60px; padding-left: 60px;
padding-right: 20px; padding-right: 20px;
@media screen and (max-width: 1024px) {
padding-left: 20px;
}
@media screen and (max-width: 376px) {
padding-left: 0px;
padding-right: 0px;
}
} }
.btn--arrow-up a { .btn--arrow-up a {
@@ -243,6 +264,8 @@ a {
.govuk-footer { .govuk-footer {
padding-top: 0px; padding-top: 0px;
padding: 70px 0 0 0;
border: none;
} }
#footer_logo { #footer_logo {
@@ -377,3 +400,279 @@ a {
font-size: 1.1875rem; font-size: 1.1875rem;
line-height: 1.3157894737; line-height: 1.3157894737;
} }
//sharebar
.btn--arrow-up a {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg id=%22Layer_1%22 data-name=%22Layer 1%22 xmlns=%22http://www.w3.org/2000/svg%22 width=%22159.5%22 height=%22102.4%22 viewBox=%220 0 159.5 102.4%22%3E%3Ctitle%3Eblack-arrow-up%3C/title%3E%3Cpath d=%22M159.5,79.8,79.8,0,0,79.8l22.6,22.6L79.7,45.3l57.1,57.1Z%22/%3E%3C/svg%3E");
background-size: 18px 13px;
background-position: 10px center;
background-repeat: no-repeat;
padding-left: 36px;
margin-top: 1px;
}
.btn--arrow-hero a:hover {
color: #fff !important;
}
ul#sharePageLinks {
display: none;
}
ul#sharePageLinks.active {
display: block;
border: none;
}
.block-share button,
.block-share h2 {
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
border: none;
padding: 12px 12px 12px 36px;
margin: 0;
color: #323232;
font-size: 16px;
font-size: 1rem;
line-height: 17px;
line-height: 1.0625rem;
letter-spacing: -0.0208333333rem;
font-weight: bold;
float: left;
z-index: 2;
position: relative;
background-color: inherit;
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg id=%22Layer_1%22 data-name=%22Layer 1%22 xmlns=%22http://www.w3.org/2000/svg%22 width=%2217.9%22 height=%2220%22 viewBox=%220 0 17.9 20%22%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill:%23333;%7D%3C/style%3E%3C/defs%3E%3Ctitle%3Eshare%3C/title%3E%3Cpath class=%22cls-1%22 d=%22M15.4,14.1a3,3,0,0,0-2,.8L6.2,10.7a1.7,1.7,0,0,0,.1-.7,1.7,1.7,0,0,0-.1-.7l7.1-4.1a3,3,0,0,0,5-2.2,3,3,0,0,0-6,0,1.7,1.7,0,0,0,.1.7l-7,4.1a2.79,2.79,0,0,0-2-.8,3,3,0,1,0,0,6,2.79,2.79,0,0,0,2-.8l7.1,4.2c0,.2-.1.4-.1.7a2.9,2.9,0,0,0,5.8,0,2.84,2.84,0,0,0-2.68-3Z%22 transform=%22translate%28-0.4 0%29%22/%3E%3C/svg%3E");
background-repeat: no-repeat;
background-position: 10px 10px;
background-size: 20px 20px;
}
.vo_hidden,
.page-node-type-global-keyword-search
.main__body-content
#block-govwales-content
.components__form
form
.form-item
label,
.header__components .components__form form .form-item label {
border: 0;
clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
overflow: hidden;
padding: 0;
width: 1px;
position: absolute;
}
.block-share {
position: relative;
float: left;
margin-right: 20px;
border: 1px solid #999999;
}
@media screen and (min-width: 480px) {
.main__sharebar > div {
margin-bottom: 0;
}
}
.block-share.active {
border: 1px solid #999999;
background-color: #cccccc;
@media screen and (max-width: 376px) {
margin-right: 0px;
margin-bottom: 20px;
}
}
.block-share ul {
margin: 0;
padding: 0;
float: left;
z-index: 1;
position: relative;
}
.block-share ul li {
display: inline-block;
margin: 10px 15px;
padding: 0;
}
.block-share ul li a {
font-size: 16px;
font-size: 1rem;
line-height: 20px;
line-height: 1.25rem;
display: block;
padding-top: 2px;
padding-left: 25px;
height: 24px;
color: #0360a6;
}
.block-share ul li a {
font-size: 16px;
font-size: 1rem;
line-height: 20px;
line-height: 1.25rem;
display: block;
padding-top: 2px;
padding-left: 25px;
height: 24px;
background-color: inherit;
color: #0360a6;
font-weight: bold;
text-decoration: none;
}
@media (min-width: 480px) {
.block-share ul li a {
background-size: 20px 20px;
background-position: 0 2px;
}
}
.block-share ul li a,
.block-share-top ul li a,
.page-header__block-share__list ul li a,
.page-header__block-share ul li a {
background-size: 20px 20px;
background-position: 0 6px;
height: 22px;
display: block;
@media (max-width: 376px) {
background-position: 0 2px;
}
}
.block-share ul li a:hover,
.block-share-top ul li a:hover,
.page-header__block-share__list ul li a:hover,
.page-header__block-share ul li a:hover {
background-size: 20px 20px;
background-position: 0 6px;
@media (max-width: 376px) {
background-position: 0 2px;
}
}
@media all and (min-width: 480px) {
.block-share ul li a,
.block-share-top ul li a,
.page-header__block-share__list ul li a,
.page-header__block-share ul li a {
background-size: 20px 20px;
background-position: 0 2px;
}
.block-share ul li a:hover,
.block-share-top ul li a:hover,
.page-header__block-share__list ul li a:hover,
.page-header__block-share ul li a:hover {
background-size: 20px 20px;
background-position: 0px 2px;
}
}
.block-share ul li a:focus,
.block-share-top ul li a:focus,
.page-header__block-share__list ul li a:focus,
.page-header__block-share ul li a:focus {
-webkit-box-shadow: 0 0 #ffd530, 0 2px #1f1f1f;
box-shadow: 0 0 #ffd530, 0 2px #1f1f1f;
}
.block-share ul li a.twitter,
.block-share-top ul li a.twitter,
.page-header__block-share__list ul li a.twitter,
.page-header__block-share ul li a.twitter {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2220%22 height=%2220%22 viewBox=%220 0 20 20%22%3E%3Ctitle%3EAsset 1%3C/title%3E%3Cpath d=%22M0,0V20H20V0ZM16,6.9v.4a8.79,8.79,0,0,1-8.7,8.8,9,9,0,0,1-4.8-1.4h.7A6.46,6.46,0,0,0,7,13.4a3.13,3.13,0,0,1-2.9-2.1c.2,0,.4.1.6.1a2.2,2.2,0,0,0,.8-.1A3.1,3.1,0,0,1,3,8.3H3a4,4,0,0,0,1.5.3,3.05,3.05,0,0,1-1-4.1A8.86,8.86,0,0,0,9.9,7.7,3,3,0,0,1,12.2,4a3.06,3.06,0,0,1,2.9.9,5,5,0,0,0,2-.8,2.91,2.91,0,0,1-1.4,1.7,6.07,6.07,0,0,0,1.8-.5A4.63,4.63,0,0,1,16,6.9Z%22 style=%22fill:%230360a6%22/%3E%3C/svg%3E");
background-repeat: no-repeat;
}
.block-share ul li a.twitter:hover,
.block-share-top ul li a.twitter:hover,
.page-header__block-share__list ul li a.twitter:hover,
.page-header__block-share ul li a.twitter:hover {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2220%22 height=%2220%22 viewBox=%220 0 20 20%22%3E%3Ctitle%3EAsset 1%3C/title%3E%3Cpath d=%22M0,0V20H20V0ZM16,6.9v.4a8.79,8.79,0,0,1-8.7,8.8,9,9,0,0,1-4.8-1.4h.7A6.46,6.46,0,0,0,7,13.4a3.13,3.13,0,0,1-2.9-2.1c.2,0,.4.1.6.1a2.2,2.2,0,0,0,.8-.1A3.1,3.1,0,0,1,3,8.3H3a4,4,0,0,0,1.5.3,3.05,3.05,0,0,1-1-4.1A8.86,8.86,0,0,0,9.9,7.7,3,3,0,0,1,12.2,4a3.06,3.06,0,0,1,2.9.9,5,5,0,0,0,2-.8,2.91,2.91,0,0,1-1.4,1.7,6.07,6.07,0,0,0,1.8-.5A4.63,4.63,0,0,1,16,6.9Z%22 style=%22fill:%233b7dc5%22/%3E%3C/svg%3E");
background-repeat: no-repeat;
}
.block-share ul li a.twitter:focus,
.block-share-top ul li a.twitter:focus,
.page-header__block-share__list ul li a.twitter:focus,
.page-header__block-share ul li a.twitter:focus {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2220%22 height=%2220%22 viewBox=%220 0 20 20%22%3E%3Ctitle%3EAsset 1%3C/title%3E%3Cpath d=%22M0,0V20H20V0ZM16,6.9v.4a8.79,8.79,0,0,1-8.7,8.8,9,9,0,0,1-4.8-1.4h.7A6.46,6.46,0,0,0,7,13.4a3.13,3.13,0,0,1-2.9-2.1c.2,0,.4.1.6.1a2.2,2.2,0,0,0,.8-.1A3.1,3.1,0,0,1,3,8.3H3a4,4,0,0,0,1.5.3,3.05,3.05,0,0,1-1-4.1A8.86,8.86,0,0,0,9.9,7.7,3,3,0,0,1,12.2,4a3.06,3.06,0,0,1,2.9.9,5,5,0,0,0,2-.8,2.91,2.91,0,0,1-1.4,1.7,6.07,6.07,0,0,0,1.8-.5A4.63,4.63,0,0,1,16,6.9Z%22 style=%22fill:%23111%22/%3E%3C/svg%3E ");
background-repeat: no-repeat;
}
.block-share ul li a.facebook,
.block-share-top ul li a.facebook,
.page-header__block-share__list ul li a.facebook,
.page-header__block-share ul li a.facebook {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2220%22 height=%2220%22 viewBox=%220 0 20 20%22%3E%3Ctitle%3Efacebook%3C/title%3E%3Cpath d=%22M0,0V20H20V0ZM15.6,5.1a.27.27,0,0,1-.3.3H14c-.9,0-1.1.3-1.1,1V7.9h2.3a.27.27,0,0,1,.3.3h0v2.5a.27.27,0,0,1-.3.3H12.9v6.2a.27.27,0,0,1-.3.3H10a.27.27,0,0,1-.3-.3V11h-2a.27.27,0,0,1-.3-.3h0V8.2a.27.27,0,0,1,.3-.3h2V6.2a3.45,3.45,0,0,1,3.1-3.7h2.4a.27.27,0,0,1,.3.3h0Z%22 style=%22fill:%230360a6%22/%3E%3C/svg%3E");
background-repeat: no-repeat;
}
.block-share ul li a.facebook:hover,
.block-share-top ul li a.facebook:hover,
.page-header__block-share__list ul li a.facebook:hover,
.page-header__block-share ul li a.facebook:hover {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2220%22 height=%2220%22 viewBox=%220 0 20 20%22%3E%3Ctitle%3Efacebook_on%3C/title%3E%3Cpath d=%22M0,0V20H20V0ZM15.6,5.1a.27.27,0,0,1-.3.3H14c-.9,0-1.1.3-1.1,1V7.9h2.3a.27.27,0,0,1,.3.3h0v2.5a.27.27,0,0,1-.3.3H12.9v6.2a.27.27,0,0,1-.3.3H10a.27.27,0,0,1-.3-.3V11h-2a.27.27,0,0,1-.3-.3h0V8.2a.27.27,0,0,1,.3-.3h2V6.2a3.45,3.45,0,0,1,3.1-3.7h2.4a.27.27,0,0,1,.3.3h0Z%22 style=%22fill:%233b7dc5%22/%3E%3C/svg%3E");
background-repeat: no-repeat;
}
.block-share ul li a.facebook:focus,
.block-share-top ul li a.facebook:focus,
.page-header__block-share__list ul li a.facebook:focus,
.page-header__block-share ul li a.facebook:focus {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2220%22 height=%2220%22 viewBox=%220 0 20 20%22%3E%3Ctitle%3Efacebook%3C/title%3E%3Cpath d=%22M0,0V20H20V0ZM15.6,5.1a.27.27,0,0,1-.3.3H14c-.9,0-1.1.3-1.1,1V7.9h2.3a.27.27,0,0,1,.3.3h0v2.5a.27.27,0,0,1-.3.3H12.9v6.2a.27.27,0,0,1-.3.3H10a.27.27,0,0,1-.3-.3V11h-2a.27.27,0,0,1-.3-.3h0V8.2a.27.27,0,0,1,.3-.3h2V6.2a3.45,3.45,0,0,1,3.1-3.7h2.4a.27.27,0,0,1,.3.3h0Z%22 style=%22fill:%23111%22/%3E%3C/svg%3E ");
background-repeat: no-repeat;
}
.block-share ul li a.email,
.block-share-top ul li a.email,
.page-header__block-share__list ul li a.email,
.page-header__block-share ul li a.email {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2220%22 height=%2220%22 viewBox=%220 0 20 20%22%3E%3Ctitle%3Eat%3C/title%3E%3Cpath d=%22M9.6,8.2a1.61,1.61,0,0,0-1.3.6,2.11,2.11,0,0,0-.5,1.3,1.75,1.75,0,0,0,.4,1.2,1.46,1.46,0,0,0,1.3.7,1.38,1.38,0,0,0,1.1-.6,2.39,2.39,0,0,0,.5-1.4,2,2,0,0,0-.6-1.5A2.39,2.39,0,0,0,9.6,8.2Z%22 style=%22fill:%230360a6%22/%3E%3Cpath d=%22M0,0V20H20V0ZM15.4,12.5l-.4.7H11.5l-.2-.6a2.73,2.73,0,0,1-1.9.8h0a2.66,2.66,0,0,1-2.2-1.1A3.46,3.46,0,0,1,7.2,8,2.87,2.87,0,0,1,9.4,7a3.55,3.55,0,0,1,1,.2c.2.1.5.2.6.4V6.8h1.5v5.3h1.6a5.75,5.75,0,0,0,.5-2.6,4,4,0,0,0-1.3-3A4.44,4.44,0,0,0,9.9,5.2,4.76,4.76,0,0,0,6.5,6.6,5.55,5.55,0,0,0,5.3,9.9a4.84,4.84,0,0,0,1.3,3.4A4.48,4.48,0,0,0,10,14.8h.2V16H10a5.62,5.62,0,0,1-4.4-1.9A6.26,6.26,0,0,1,4,9.9,5.91,5.91,0,0,1,9.9,4H10a6.56,6.56,0,0,1,4.4,1.7A5.46,5.46,0,0,1,16,9.5,8,8,0,0,1,15.4,12.5Z%22 style=%22fill:%230360a6%22/%3E%3C/svg%3E");
background-repeat: no-repeat;
}
.block-share ul li a.email:hover,
.block-share-top ul li a.email:hover,
.page-header__block-share__list ul li a.email:hover,
.page-header__block-share ul li a.email:hover {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2220%22 height=%2220%22 viewBox=%220 0 20 20%22%3E%3Ctitle%3Eat_on%3C/title%3E%3Cpath d=%22M9.6,8.2a1.61,1.61,0,0,0-1.3.6,2.11,2.11,0,0,0-.5,1.3,1.75,1.75,0,0,0,.4,1.2,1.46,1.46,0,0,0,1.3.7,1.38,1.38,0,0,0,1.1-.6,2.39,2.39,0,0,0,.5-1.4,2,2,0,0,0-.6-1.5A2.39,2.39,0,0,0,9.6,8.2Z%22 style=%22fill:%233b7dc5%22/%3E%3Cpath d=%22M0,0V20H20V0ZM15.4,12.5l-.4.7H11.5l-.2-.6a2.73,2.73,0,0,1-1.9.8h0a2.66,2.66,0,0,1-2.2-1.1A3.46,3.46,0,0,1,7.2,8,2.87,2.87,0,0,1,9.4,7a3.55,3.55,0,0,1,1,.2c.2.1.5.2.6.4V6.8h1.5v5.3h1.6a5.75,5.75,0,0,0,.5-2.6,4,4,0,0,0-1.3-3A4.44,4.44,0,0,0,9.9,5.2,4.76,4.76,0,0,0,6.5,6.6,5.55,5.55,0,0,0,5.3,9.9a4.84,4.84,0,0,0,1.3,3.4A4.48,4.48,0,0,0,10,14.8h.2V16H10a5.62,5.62,0,0,1-4.4-1.9A6.26,6.26,0,0,1,4,9.9,5.91,5.91,0,0,1,9.9,4H10a6.56,6.56,0,0,1,4.4,1.7A5.46,5.46,0,0,1,16,9.5,8,8,0,0,1,15.4,12.5Z%22 style=%22fill:%233b7dc5%22/%3E%3C/svg%3E");
background-repeat: no-repeat;
}
.block-share ul li a.email:focus,
.block-share-top ul li a.email:focus,
.page-header__block-share__list ul li a.email:focus,
.page-header__block-share ul li a.email:focus {
background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns=%22http://www.w3.org/2000/svg%22 width=%2220%22 height=%2220%22 viewBox=%220 0 20 20%22%3E%3Ctitle%3Eat%3C/title%3E%3Cpath d=%22M9.6,8.2a1.61,1.61,0,0,0-1.3.6,2.11,2.11,0,0,0-.5,1.3,1.75,1.75,0,0,0,.4,1.2,1.46,1.46,0,0,0,1.3.7,1.38,1.38,0,0,0,1.1-.6,2.39,2.39,0,0,0,.5-1.4,2,2,0,0,0-.6-1.5A2.39,2.39,0,0,0,9.6,8.2Z%22 style=%22fill:%23111%22/%3E%3Cpath d=%22M0,0V20H20V0ZM15.4,12.5l-.4.7H11.5l-.2-.6a2.73,2.73,0,0,1-1.9.8h0a2.66,2.66,0,0,1-2.2-1.1A3.46,3.46,0,0,1,7.2,8,2.87,2.87,0,0,1,9.4,7a3.55,3.55,0,0,1,1,.2c.2.1.5.2.6.4V6.8h1.5v5.3h1.6a5.75,5.75,0,0,0,.5-2.6,4,4,0,0,0-1.3-3A4.44,4.44,0,0,0,9.9,5.2,4.76,4.76,0,0,0,6.5,6.6,5.55,5.55,0,0,0,5.3,9.9a4.84,4.84,0,0,0,1.3,3.4A4.48,4.48,0,0,0,10,14.8h.2V16H10a5.62,5.62,0,0,1-4.4-1.9A6.26,6.26,0,0,1,4,9.9,5.91,5.91,0,0,1,9.9,4H10a6.56,6.56,0,0,1,4.4,1.7A5.46,5.46,0,0,1,16,9.5,8,8,0,0,1,15.4,12.5Z%22 style=%22fill:%23111%22/%3E%3C/svg%3E ");
background-repeat: no-repeat;
}
//dropzone
.dropzone {
flex: 1;
display: flex;
flex-direction: column;
align-items: center;
padding: 20px;
border-width: 2px;
border-radius: 2px;
border-color: #eeeeee;
border-style: dashed;
background-color: #fafafa;
color: #bdbdbd;
outline: none;
transition: border 0.24s ease-in-out;
}