diff --git a/.env.local b/.env.local index df582cb5..dd47b0b2 100644 --- a/.env.local +++ b/.env.local @@ -10,19 +10,19 @@ NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459 //Dev oauth -CLIENT_ID = e082def0-3453-461f-9a5e-f4ab127dc015 -CLIENT_SECRET = qW.7Q~TSr3sZmLEnJQJPXEdOckb_yo2t1yJmY -RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/ -RELAYURI = "dev-pedw-ns.servicebus.windows.net" -RELAYPATH = "dev-pedw-hc" +//CLIENT_ID = e082def0-3453-461f-9a5e-f4ab127dc015 +//CLIENT_SECRET = qW.7Q~TSr3sZmLEnJQJPXEdOckb_yo2t1yJmY +//RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/ +//RELAYURI = "dev-pedw-ns.servicebus.windows.net" +//RELAYPATH = "dev-pedw-hc" //Test Oauth -//CLIENT_ID = 6619ad85-c908-490d-811b-de8c93c0f2aa -//CLIENT_SECRET = qKo7Q~5QvLEplbwnBbint_I5lXqx_-kDm8Vj- -//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/ -//RELAYURI = "test-pedw-ns.servicebus.windows.net" -//RELAYPATH = "test-pedw-hc" +CLIENT_ID = 6619ad85-c908-490d-811b-de8c93c0f2aa +CLIENT_SECRET = qKo7Q~5QvLEplbwnBbint_I5lXqx_-kDm8Vj- +RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/ +RELAYURI = "test-pedw-ns.servicebus.windows.net" +RELAYPATH = "test-pedw-hc" //Preprod Oauth @@ -35,11 +35,11 @@ RELAYPATH = "dev-pedw-hc" //Prod Oauth -CLIENT_ID = 01904c07-9035-4cf9-a535-3945f6e470d2 -CLIENT_SECRET = PRo7Q~GQoKSdARRqF-NOXQDx2Ka8UCINyvagk -RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/ -RELAYURI = "prod-pedw-ns.servicebus.windows.net" -RELAYPATH = "prod-pedw-hc" +//CLIENT_ID = 01904c07-9035-4cf9-a535-3945f6e470d2 +//CLIENT_SECRET = PRo7Q~GQoKSdARRqF-NOXQDx2Ka8UCINyvagk +//RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/ +//RELAYURI = "prod-pedw-ns.servicebus.windows.net" +//RELAYPATH = "prod-pedw-hc" GOOGLE_TAG_MANAGER = GTM-T78CBC3 diff --git a/actions/index.js b/actions/index.js index 13c1ba42..98e0e574 100644 --- a/actions/index.js +++ b/actions/index.js @@ -260,7 +260,7 @@ export const getSearchDocumentDetails = (incidentID) => { ) .then((res) => res.data) .catch((error) => { - console.log("thiserror", error); + console.log("API call error", error); }); }; @@ -274,7 +274,7 @@ export const getSearchDocumentDetailsPaged = (incidentID, pageNumber) => { ) .then((res) => res.data) .catch((error) => { - console.log("thiserror", error); + console.log("API call error", error); }); }; @@ -288,7 +288,7 @@ export const getSearchDocumentHistory = (documentID) => { return res.data; }) .catch((error) => { - console.log("thiserror", error); + console.log("API call error", error); }); }; @@ -304,14 +304,15 @@ export const getSearchDocumentHistoryPaged = (documentID, pageNumber) => { return res.data; }) .catch((error) => { - console.log("thiserror", error); + console.log("API call error", error); }); }; export const getLinkedCases = (parentIncidentid) => { return axios .get( - "/api/endpoint/getlinkedcases_api?parentincidentid=" + + BASE_URL + + "/api/endpoint/getlinkedcases_api?parentincidentid=" + parentIncidentid ) .then((res) => { @@ -319,7 +320,7 @@ export const getLinkedCases = (parentIncidentid) => { return res.data; }) .catch((error) => { - console.log("thiserror", error); + console.log("API call error", error); }); }; @@ -361,46 +362,56 @@ export const getLPA = () => { export const getFormData = (whichForm) => { return axios - .get("/api/endpoint/getformdata_api?whichForm=" + whichForm) + .get(BASE_URL + "/api/endpoint/getformdata_api?whichForm=" + whichForm) .then((res) => res.data) .catch((error) => { - console.log("thiserror", error); + console.log("API call error", error); }); }; export const getMandatoryFields = (whichForm) => { return axios - .get("/api/endpoint/getmandatoryfields_api?whichForm=" + whichForm) + .get( + BASE_URL + + "/api/endpoint/getmandatoryfields_api?whichForm=" + + whichForm + ) .then((res) => res.data) .catch((error) => { - console.log("thiserror", error); + console.log("API call error", error); }); }; export const getPickLists = (whichForm) => { return axios - .get("/api/endpoint/getpicklists_api?whichForm=" + whichForm) + .get(BASE_URL + "/api/endpoint/getpicklists_api?whichForm=" + whichForm) .then((res) => res.data) .catch((error) => { - console.log("thiserror", error); + console.log("API call error", error); }); }; export const getPersonalAccount = (contactid) => { + console.log(contactid); return axios - .get("/api/endpoint/getpersonalaccount_api?contactid=" + contactid) + .get( + BASE_URL + + "/api/endpoint/getpersonalaccount_api?contactid=" + + contactid + ) .then((res) => { console.log(res.data); return res.data; }) .catch((error) => { - let ErrResponse = { - value: [], - errorCode: error.response.status, - errorMsg: error.response.statusText, - }; + console.log("returned:", error); + // let ErrResponse = { + // value: [], + // errorCode: error.response.status, + // errorMsg: error.response.statusText, + // }; - return ErrResponse; + // return ErrResponse; }); }; @@ -423,7 +434,7 @@ export const getAppealID = ( return appealID; }) .catch((error) => { - console.log("thi serror", error); + console.log("API call error", error); }); }; @@ -437,7 +448,7 @@ export const getLogin = (emailAddress, pwd) => { ) .then((res) => res.data) .catch((error) => { - console.log("thiserror", error); + console.log("API call error", error); }); }; @@ -454,7 +465,7 @@ export const createCase = (appealTypeId, lpaID, contactid) => { var config = { method: "post", - url: queryUrl, + url: BASE_URL + queryUrl, }; return axios(config) @@ -477,7 +488,7 @@ export const getMyCases = (loggedInUserId) => { return res.data; }) .catch((error) => { - console.log("thi serror", error); + console.log("API call error", error); }); }; @@ -562,7 +573,7 @@ export const getAwaitingSubmission = () => { }) .then((res) => res.data) .catch((error) => { - console.log("thi serror", error); + console.log("API call error", error); }); }; @@ -577,7 +588,7 @@ export const getPortalModuleDetails = (appealType, caseReference) => { ) .then((res) => res.data) .catch((error) => { - console.log("thiserror", error); + console.log("API call error", error); }); }; @@ -592,7 +603,7 @@ export const getPortalModuleDetailsProxy = (appealType, caseReference) => { ) .then((res) => res.data) .catch((error) => { - console.log("thiserror", error); + console.log("API call error", error); }); }; @@ -605,7 +616,7 @@ export const getEmailAccountCheck = (emailAddress) => { ) .then((res) => res.data) .catch((error) => { - console.log("thiserror", error); + console.log("API call error", error); }); }; @@ -650,7 +661,6 @@ export const createWatchedCases = (formValues) => { var data = formValues; var queryUrl = window.apiRoot + "/api/endpoint/createwatchedcases_api"; - console.log(queryUrl); var config = { method: "post", url: queryUrl, @@ -698,7 +708,7 @@ export const updateCase = async ( return res.data; }) .catch((error) => { - console.log("thi serror", error); + console.log("API call error", error); }); }; diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 9a4e394b..d8f46e54 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -125,6 +125,28 @@ const Breadcrumbs = (props) => { ) : ( "" )} + {router.pathname == "/myportal/advancedsearch" ? ( + <> +
  • + + + {t("common:breadcrumb-my-portal")} + + +
    • +
  • + {t("common:breadcrumb-advanced-search")} +
    • + + ) : ( + "" + )} {router.pathname == "/advancedsearchresults" ? ( <> {" "} @@ -153,6 +175,47 @@ const Breadcrumbs = (props) => { ) : ( "" )} + {router.pathname == + "/myportal/advancedsearchresults" ? ( + <> +
  • + + + {t("common:breadcrumb-my-portal")} + + +
    • +
  • + + + {t( + "common:breadcrumb-advanced-search" + )} + + +
    • +
  • + {t( + "common:breadcrumb-advanced-search-results" + )} +
    • + + ) : ( + "" + )} {router.pathname == "/newappeal" ? ( <>
  • diff --git a/components/myportal.js b/components/myportal.js index fef66a90..1cefd9cf 100644 --- a/components/myportal.js +++ b/components/myportal.js @@ -22,8 +22,8 @@ const MyPortal = (props) => { const { locale } = router; const [showModal, setShowModal] = useState(false); - const inactiveTimeOut = 120; // in seconds - const reminderTimeout = 30; // in seconds + const inactiveTimeOut = 12000; // in seconds + const reminderTimeout = 60; // in seconds let idleTimer = null; let logoutTimer = null; diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js index f285b9a7..abea855a 100644 --- a/components/myportal/viewall.js +++ b/components/myportal/viewall.js @@ -29,10 +29,10 @@ const ViewAllResults = (props) => { { router.replace( (router.locale == "cy" - ? "/canlyniadauchwiliouwch" - : "/advancedsearchresults") + searchString, + ? "/fymhorth/canlyniadauchwiliouwch" + : "/myportal/advancedsearchresults") + searchString, null, { shallow: true, diff --git a/components/search/searchresults.js b/components/search/searchresults.js index abe02347..0436111d 100644 --- a/components/search/searchresults.js +++ b/components/search/searchresults.js @@ -174,7 +174,7 @@ const SearchResults = (props) => {
    {t("search:searchresults-status-label")}
    - {myportal == "true" && ( + {myportal == true && (
    )} @@ -191,10 +191,10 @@ const SearchResults = (props) => { { "statuscode@OData.Community.Display.V1.FormattedValue" ] || "N/A"} - {myportal == "true" && ( + {myportal == true && (
    {isWatchedCase(item.incidentid).length > 0 == diff --git a/pages/404.js b/pages/404.js index fdf40808..f9d320e8 100644 --- a/pages/404.js +++ b/pages/404.js @@ -1,11 +1,10 @@ // 404.js -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 Head from "next/head"; +import Link from "next/link"; +import CookieBanner from "../components/cookieBanner"; import Footer from "../components/footer"; +import Header from "../components/header"; const FourOhFour = (props) => { let { t, lang } = useTranslation(); diff --git a/pages/_document.js b/pages/_document.js index df801451..084b6f64 100644 --- a/pages/_document.js +++ b/pages/_document.js @@ -45,7 +45,7 @@ class MyDocument extends Document { let csp = ``; csp += `base-uri 'self';`; csp += `form-action 'self';`; - csp += `object-src 'none';`; + csp += `object-src 'self' data:;`; csp += `script-src 'self' https://www.googletagmanager.com 'nonce-${generatedNonce}' ${ process.env.NODE_ENV != "production" ? " 'unsafe-eval';" : " ;" }`; diff --git a/pages/_error.js b/pages/_error.js index 974cdb3d..a478361e 100644 --- a/pages/_error.js +++ b/pages/_error.js @@ -1,10 +1,9 @@ -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 Head from "next/head"; +import Link from "next/link"; +import CookieBanner from "../components/cookieBanner"; import Footer from "../components/footer"; +import Header from "../components/header"; function Error({ statusCode }, props) { let { t, lang } = useTranslation(); diff --git a/pages/accessibility.js b/pages/accessibility.js index 096d803d..18cacf99 100644 --- a/pages/accessibility.js +++ b/pages/accessibility.js @@ -1,26 +1,17 @@ -import _ from "lodash"; -import { useState, useEffect, useRef } from "react"; +import useTranslation from "next-translate/useTranslation"; import Head from "next/head"; +import { useRouter } from "next/router"; +import AccessibilityStatement from "../components/accessibility"; +import Breadcrumbs from "../components/breadcrumbs"; +import CookieBanner from "../components/cookieBanner"; +import Footer from "../components/footer"; import Header from "../components/header"; import ServiceBanner from "../components/servicebanner"; -import CookieBanner from "../components/cookieBanner"; -import Breadcrumbs from "../components/breadcrumbs"; -import Main from "../components/main"; -import Footer from "../components/footer"; -import Errorpage from "../components/errorpage"; -import styles from "../styles/Home.module.css"; -import { useSelector, shallowEqual, connect } from "react-redux"; -import { wrapper } from "../store/store"; -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; -import { getIncidents } from "../actions"; -import { parseCookies } from "nookies"; -import AccessibilityStatement from "../components/accessibility"; const Accessibility = (props) => { const { footerLinks, pages, showLogin } = props; let { t, lang } = useTranslation(); - + ß; const router = useRouter(); const { locale } = router; diff --git a/pages/advancedsearch.js b/pages/advancedsearch.js index 05656ab8..d2065015 100644 --- a/pages/advancedsearch.js +++ b/pages/advancedsearch.js @@ -1,36 +1,18 @@ import _ from "lodash"; -import { useState } from "react"; -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 Search from "../components/search"; -import Footer from "../components/footer"; -import Errorpage from "../components/errorpage"; -import styles from "../styles/Home.module.css"; -import { useSelector, shallowEqual, connect } from "react-redux"; -import { wrapper } from "../store/store"; - -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; +import Head from "next/head"; +import { useRouter } from "next/router"; +import { connect } from "react-redux"; +import { getAppealsTypes, getLPA } from "../actions"; +import Breadcrumbs from "../components/breadcrumbs"; +import CookieBanner from "../components/cookieBanner"; import CRMError from "../components/crmError"; - -import { - setAppealType, - setAppealTypeTitle, - setAppealTypeID, - setAppealLPA, - getAppealTypeObj, -} from "../store/appealType/action"; -import { - getAppealsTypes, - getLPA, - updateCase, - createCase, - getToken, -} from "../actions"; +import Footer from "../components/footer"; +import Header from "../components/header"; +import Search from "../components/search"; +import { setAppealType } from "../store/appealType/action"; import { setLPA } from "../store/lpa/action"; +import { wrapper } from "../store/store"; const Home = (props) => { const { footerLinks, pages } = props; @@ -40,7 +22,6 @@ const Home = (props) => { const { locale } = router; const { appealtypes } = router.query; - //console.log(props, props.LPAData); var hasError = _.has(props.LPAData.LPAData, "errorCode") || _.has(props.appealType.appealType, "errorCode") diff --git a/pages/advancedsearchresults.js b/pages/advancedsearchresults.js index 98cc2cc5..e50fa3a6 100644 --- a/pages/advancedsearchresults.js +++ b/pages/advancedsearchresults.js @@ -1,28 +1,20 @@ -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 SearchResults from "../components/searchresults"; -import Footer from "../components/footer"; -import Errorpage from "../components/errorpage"; -import styles from "../styles/Home.module.css"; -import { useSelector, shallowEqual, connect } from "react-redux"; -import { wrapper } from "../store/store"; - -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import jsonpath from "jsonpath"; -import data from "../data/collections.json"; +import Head from "next/head"; +import { useRouter } from "next/router"; +import { connect } from "react-redux"; +import { getAdvancedSearch } from "../actions"; +import Breadcrumbs from "../components/breadcrumbs"; +import CookieBanner from "../components/cookieBanner"; +import Footer from "../components/footer"; +import Header from "../components/header"; +import SearchResults from "../components/searchresults"; import { getSearchDetails } from "../components/utils"; -import { setSearch, getSearchObj } from "../store/search/action"; +import { setSearch } from "../store/search/action"; import { - setSearchResults, setSearchDetails, - getSearchResultsObj, + setSearchResults, } from "../store/searchOutput/action"; -import { getAdvancedSearch, getBasicSearchDetails, getToken } from "../actions"; +import { wrapper } from "../store/store"; const Home = (props) => { const { footerLinks, pages } = props; diff --git a/pages/api/endpoint/createaccount_api.js b/pages/api/endpoint/createaccount_api.js index 87cd8018..2d87ccc1 100644 --- a/pages/api/endpoint/createaccount_api.js +++ b/pages/api/endpoint/createaccount_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/createcase_api.js b/pages/api/endpoint/createcase_api.js index 7a1220ca..74d5fc86 100644 --- a/pages/api/endpoint/createcase_api.js +++ b/pages/api/endpoint/createcase_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; @@ -55,9 +54,12 @@ export default async function ApiProxy(req, res) { ? res.status(400).json() : axios(config) .then(({ data }) => { + console.log(data); res.status(200).json(data); }) .catch(({ err }) => { res.status(400).json(err); }); + + return apiResponse; } diff --git a/pages/api/endpoint/createwatchedcases_api.js b/pages/api/endpoint/createwatchedcases_api.js index 5517b2ef..b5d13835 100644 --- a/pages/api/endpoint/createwatchedcases_api.js +++ b/pages/api/endpoint/createwatchedcases_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeadersPaged } from "../../../actions"; @@ -26,11 +25,9 @@ export default async function ApiProxy(req, res) { var data = JSON.stringify(req.body); var queryUrl = "pinswg_watchlists"; - console.log("create case"); - var config = { method: "post", - url: queryUrl + hashAPIPath(queryUrl), + url: WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), headers: { "OData-MaxVersion": "4.0", "OData-Version": "4.0", diff --git a/pages/api/endpoint/deletemyrepresentations_api.js b/pages/api/endpoint/deletemyrepresentations_api.js index 40158d37..e2bd4586 100644 --- a/pages/api/endpoint/deletemyrepresentations_api.js +++ b/pages/api/endpoint/deletemyrepresentations_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/deletewatchedcases_api.js b/pages/api/endpoint/deletewatchedcases_api.js index 2707dfc1..836678d7 100644 --- a/pages/api/endpoint/deletewatchedcases_api.js +++ b/pages/api/endpoint/deletewatchedcases_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeadersPaged } from "../../../actions"; @@ -41,7 +40,7 @@ export default async function ApiProxy(req, res) { return axios(config) .then(({ data }) => { - console.log("deleted "); + //console.log("deleted watched case - " + watchedCaseID); res.status(200).json(data); }) .catch(({ err }) => { diff --git a/pages/api/endpoint/getadvancedsearch_api.js b/pages/api/endpoint/getadvancedsearch_api.js index 9e3da222..59b35ddd 100644 --- a/pages/api/endpoint/getadvancedsearch_api.js +++ b/pages/api/endpoint/getadvancedsearch_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getadvancedsearchpaged_api.js b/pages/api/endpoint/getadvancedsearchpaged_api.js index 26773cbd..8e979332 100644 --- a/pages/api/endpoint/getadvancedsearchpaged_api.js +++ b/pages/api/endpoint/getadvancedsearchpaged_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getappealid_api.js b/pages/api/endpoint/getappealid_api.js index 88bbc4c6..989c6ee6 100644 --- a/pages/api/endpoint/getappealid_api.js +++ b/pages/api/endpoint/getappealid_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getappealtypes_api.js b/pages/api/endpoint/getappealtypes_api.js index 55ec1d95..a809c7ca 100644 --- a/pages/api/endpoint/getappealtypes_api.js +++ b/pages/api/endpoint/getappealtypes_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeadersPaged, azureHeaders } from "../../../actions"; /** diff --git a/pages/api/endpoint/getbasicdnssearch_api.js b/pages/api/endpoint/getbasicdnssearch_api.js index 4453de5b..564e8609 100644 --- a/pages/api/endpoint/getbasicdnssearch_api.js +++ b/pages/api/endpoint/getbasicdnssearch_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeaders, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getbasicdnssearchdetails_api.js b/pages/api/endpoint/getbasicdnssearchdetails_api.js index d350307b..f07eaa41 100644 --- a/pages/api/endpoint/getbasicdnssearchdetails_api.js +++ b/pages/api/endpoint/getbasicdnssearchdetails_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js index 38f5b440..74b05bf5 100644 --- a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js +++ b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getbasicdnssearchpaged_api.js b/pages/api/endpoint/getbasicdnssearchpaged_api.js index 76fb3db5..da246154 100644 --- a/pages/api/endpoint/getbasicdnssearchpaged_api.js +++ b/pages/api/endpoint/getbasicdnssearchpaged_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getbasicsearch_api.js b/pages/api/endpoint/getbasicsearch_api.js index f2aa91c7..7f0df321 100644 --- a/pages/api/endpoint/getbasicsearch_api.js +++ b/pages/api/endpoint/getbasicsearch_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getbasicsearchdetails_api.js b/pages/api/endpoint/getbasicsearchdetails_api.js index db8acb04..7998860e 100644 --- a/pages/api/endpoint/getbasicsearchdetails_api.js +++ b/pages/api/endpoint/getbasicsearchdetails_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; import { getSelectQuery } from "../../../actions/selectQueryTypes"; diff --git a/pages/api/endpoint/getbasicsearchdetailspaged_api.js b/pages/api/endpoint/getbasicsearchdetailspaged_api.js index af12c794..561a5d6c 100644 --- a/pages/api/endpoint/getbasicsearchdetailspaged_api.js +++ b/pages/api/endpoint/getbasicsearchdetailspaged_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getbasicsearchpaged_api.js b/pages/api/endpoint/getbasicsearchpaged_api.js index a63e349a..5b43a393 100644 --- a/pages/api/endpoint/getbasicsearchpaged_api.js +++ b/pages/api/endpoint/getbasicsearchpaged_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getemailaccountcheck_api.js b/pages/api/endpoint/getemailaccountcheck_api.js index 05229ac8..8cb1cbba 100644 --- a/pages/api/endpoint/getemailaccountcheck_api.js +++ b/pages/api/endpoint/getemailaccountcheck_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getformdata_api.js b/pages/api/endpoint/getformdata_api.js index 3c559214..4efb97f6 100644 --- a/pages/api/endpoint/getformdata_api.js +++ b/pages/api/endpoint/getformdata_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeadersPaged, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getlinkedcases_api.js b/pages/api/endpoint/getlinkedcases_api.js index 4f22492b..dc2d370f 100644 --- a/pages/api/endpoint/getlinkedcases_api.js +++ b/pages/api/endpoint/getlinkedcases_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getlogin_api.js b/pages/api/endpoint/getlogin_api.js index f7fbc55e..1cb25461 100644 --- a/pages/api/endpoint/getlogin_api.js +++ b/pages/api/endpoint/getlogin_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getlpa_api.js b/pages/api/endpoint/getlpa_api.js index 6765fa92..a04bd51a 100644 --- a/pages/api/endpoint/getlpa_api.js +++ b/pages/api/endpoint/getlpa_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeadersPaged, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getmandatoryfields_api.js b/pages/api/endpoint/getmandatoryfields_api.js index 91ab4322..c363fc46 100644 --- a/pages/api/endpoint/getmandatoryfields_api.js +++ b/pages/api/endpoint/getmandatoryfields_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeadersPaged, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getmycases_api.js b/pages/api/endpoint/getmycases_api.js index 229b858d..9870fb5f 100644 --- a/pages/api/endpoint/getmycases_api.js +++ b/pages/api/endpoint/getmycases_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getmyrepresentations_api.js b/pages/api/endpoint/getmyrepresentations_api.js index 3a1cc3d7..398ea8dc 100644 --- a/pages/api/endpoint/getmyrepresentations_api.js +++ b/pages/api/endpoint/getmyrepresentations_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getmyrepresentationsproxy_api.js b/pages/api/endpoint/getmyrepresentationsproxy_api.js index 3a1cc3d7..398ea8dc 100644 --- a/pages/api/endpoint/getmyrepresentationsproxy_api.js +++ b/pages/api/endpoint/getmyrepresentationsproxy_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getpersonalaccount_api.js b/pages/api/endpoint/getpersonalaccount_api.js index f4980f4d..16743aae 100644 --- a/pages/api/endpoint/getpersonalaccount_api.js +++ b/pages/api/endpoint/getpersonalaccount_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; @@ -21,7 +20,6 @@ const hashAPIPath = (queryPath) => { export default async function ApiProxy(req, res) { var contactid = req.query.contactid; var token = await getToken(); - console.log(" eeee", contactid.length); var queryUrl = "contacts(" + diff --git a/pages/api/endpoint/getpicklists_api.js b/pages/api/endpoint/getpicklists_api.js index b8b5d696..5b54ff63 100644 --- a/pages/api/endpoint/getpicklists_api.js +++ b/pages/api/endpoint/getpicklists_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getportalmoduledetails_api.js b/pages/api/endpoint/getportalmoduledetails_api.js index 6887405f..943ab28b 100644 --- a/pages/api/endpoint/getportalmoduledetails_api.js +++ b/pages/api/endpoint/getportalmoduledetails_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getportalmoduledetailsproxy_api.js b/pages/api/endpoint/getportalmoduledetailsproxy_api.js index 6887405f..943ab28b 100644 --- a/pages/api/endpoint/getportalmoduledetailsproxy_api.js +++ b/pages/api/endpoint/getportalmoduledetailsproxy_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getrepresentations_api.js b/pages/api/endpoint/getrepresentations_api.js index e0b7533b..84653594 100644 --- a/pages/api/endpoint/getrepresentations_api.js +++ b/pages/api/endpoint/getrepresentations_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getrepresentationsproxy_api.js b/pages/api/endpoint/getrepresentationsproxy_api.js index cb3f3dd3..0367f052 100644 --- a/pages/api/endpoint/getrepresentationsproxy_api.js +++ b/pages/api/endpoint/getrepresentationsproxy_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getsearchdocumentdetails_api.js b/pages/api/endpoint/getsearchdocumentdetails_api.js index cfc71f4f..10039332 100644 --- a/pages/api/endpoint/getsearchdocumentdetails_api.js +++ b/pages/api/endpoint/getsearchdocumentdetails_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getsearchdocumentdetailspaged_api.js b/pages/api/endpoint/getsearchdocumentdetailspaged_api.js index bba24ae7..b95c4084 100644 --- a/pages/api/endpoint/getsearchdocumentdetailspaged_api.js +++ b/pages/api/endpoint/getsearchdocumentdetailspaged_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getsearchdocumenthistory_api.js b/pages/api/endpoint/getsearchdocumenthistory_api.js index 3c22cbbc..2f2c5a5b 100644 --- a/pages/api/endpoint/getsearchdocumenthistory_api.js +++ b/pages/api/endpoint/getsearchdocumenthistory_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getsearchdocumenthistorypaged_api.js b/pages/api/endpoint/getsearchdocumenthistorypaged_api.js index 4f47b85b..6d098214 100644 --- a/pages/api/endpoint/getsearchdocumenthistorypaged_api.js +++ b/pages/api/endpoint/getsearchdocumenthistorypaged_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeadersPaged } from "../../../actions"; diff --git a/pages/api/endpoint/getwatchedcases_api copy 2.js b/pages/api/endpoint/getwatchedcases_api copy 2.js index d841847c..a7763975 100644 --- a/pages/api/endpoint/getwatchedcases_api copy 2.js +++ b/pages/api/endpoint/getwatchedcases_api copy 2.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getwatchedcases_api.js b/pages/api/endpoint/getwatchedcases_api.js index d841847c..a7763975 100644 --- a/pages/api/endpoint/getwatchedcases_api.js +++ b/pages/api/endpoint/getwatchedcases_api.js @@ -1,5 +1,4 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; diff --git a/pages/api/endpoint/getwatchedcasesproxy_api.js b/pages/api/endpoint/getwatchedcasesproxy_api.js index d841847c..47106318 100644 --- a/pages/api/endpoint/getwatchedcasesproxy_api.js +++ b/pages/api/endpoint/getwatchedcasesproxy_api.js @@ -1,7 +1,6 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; -import { getToken, azureHeaders } from "../../../actions"; +import { azureHeaders, getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/updateaccount_api.js b/pages/api/endpoint/updateaccount_api.js index 2844199e..8eea133a 100644 --- a/pages/api/endpoint/updateaccount_api.js +++ b/pages/api/endpoint/updateaccount_api.js @@ -1,7 +1,6 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; -import { getToken, azureHeadersPaged } from "../../../actions"; +import { getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/updatecase_api.js b/pages/api/endpoint/updatecase_api.js index 5e97bcab..03074357 100644 --- a/pages/api/endpoint/updatecase_api.js +++ b/pages/api/endpoint/updatecase_api.js @@ -1,7 +1,6 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; -import { getToken, azureHeadersPaged } from "../../../actions"; +import { getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/api/endpoint/updatepassword_api.js b/pages/api/endpoint/updatepassword_api.js index 2844199e..8eea133a 100644 --- a/pages/api/endpoint/updatepassword_api.js +++ b/pages/api/endpoint/updatepassword_api.js @@ -1,7 +1,6 @@ import axios from "axios"; -import https from "https"; import CryptoJS from "crypto-js"; -import { getToken, azureHeadersPaged } from "../../../actions"; +import { getToken } from "../../../actions"; const WORDKEY = process.env.HASHKEY; diff --git a/pages/details-about-cookies.js b/pages/details-about-cookies.js index b88fd89d..25f4ceea 100644 --- a/pages/details-about-cookies.js +++ b/pages/details-about-cookies.js @@ -1,21 +1,12 @@ -import _ from "lodash"; -import { useState, useEffect, useRef } from "react"; +import useTranslation from "next-translate/useTranslation"; import Head from "next/head"; +import { useRouter } from "next/router"; +import Breadcrumbs from "../components/breadcrumbs"; +import CookieBanner from "../components/cookieBanner"; +import CookiePolicy from "../components/cookiePolicy"; +import Footer from "../components/footer"; import Header from "../components/header"; import ServiceBanner from "../components/servicebanner"; -import CookieBanner from "../components/cookieBanner"; -import Breadcrumbs from "../components/breadcrumbs"; -import Main from "../components/main"; -import Footer from "../components/footer"; -import Errorpage from "../components/errorpage"; -import styles from "../styles/Home.module.css"; -import { useSelector, shallowEqual, connect } from "react-redux"; -import { wrapper } from "../store/store"; -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; -import { getIncidents } from "../actions"; -import { parseCookies } from "nookies"; -import CookiePolicy from "../components/cookiePolicy"; const CookieDetails = (props) => { const { footerLinks, pages, showLogin } = props; diff --git a/pages/dnsapplications.js b/pages/dnsapplications.js index cffbed8d..7eae2e97 100644 --- a/pages/dnsapplications.js +++ b/pages/dnsapplications.js @@ -1,30 +1,20 @@ -import _ from "lodash"; +import useTranslation from "next-translate/useTranslation"; import Head from "next/head"; -import Header from "../components/header"; -import Banner from "../components/banner"; -import CookieBanner from "../components/cookieBanner"; +import { useRouter } from "next/router"; +import { connect } from "react-redux"; +import { getBasicDNSSearch } from "../actions"; import Breadcrumbs from "../components/breadcrumbs"; +import CookieBanner from "../components/cookieBanner"; import DNSSearchResults from "../components/dnssearchresults"; import Footer from "../components/footer"; -import Errorpage from "../components/errorpage"; -import styles from "../styles/Home.module.css"; -import { useSelector, shallowEqual, connect } from "react-redux"; -import { wrapper } from "../store/store"; - -import { useRouter } from "next/router"; -import useTranslation from "next-translate/useTranslation"; -import jsonpath from "jsonpath"; -import data from "../data/collections.json"; - +import Header from "../components/header"; import { getSearchDetails } from "../components/utils"; - -import { setSearch, getSearchObj } from "../store/search/action"; +import { setSearch } from "../store/search/action"; import { - setSearchResults, setSearchDetails, - getSearchResultsObj, + setSearchResults, } from "../store/searchOutput/action"; -import { getBasicDNSSearch, getBasicSearchDetails } from "../actions"; +import { wrapper } from "../store/store"; const Home = (props) => { const { footerLinks, pages } = props; diff --git a/pages/dnsdetails.js b/pages/dnsdetails.js index ebe94a33..38c29962 100644 --- a/pages/dnsdetails.js +++ b/pages/dnsdetails.js @@ -1,19 +1,12 @@ -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 { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; +import Head from "next/head"; +import { useRouter } from "next/router"; +import { connect } from "react-redux"; +import Breadcrumbs from "../components/breadcrumbs"; import Case from "../components/case"; +import CookieBanner from "../components/cookieBanner"; +import Footer from "../components/footer"; +import Header from "../components/header"; const Home = (props) => { const { footerLinks, pages } = props; diff --git a/pages/index.js b/pages/index.js index 37dcd31e..deb4674e 100644 --- a/pages/index.js +++ b/pages/index.js @@ -1,35 +1,24 @@ import _ from "lodash"; -import { useState, useEffect, useRef } from "react"; -import Head from "next/head"; -import Header from "../components/header"; -import ServiceBanner from "../components/servicebanner"; -import CookieBanner from "../components/cookieBanner"; -import Breadcrumbs from "../components/breadcrumbs"; -import Main from "../components/main"; -import Footer from "../components/footer"; -import Errorpage from "../components/errorpage"; -import styles from "../styles/Home.module.css"; -import { useSelector, shallowEqual, connect } from "react-redux"; -import { wrapper } from "../store/store"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { getIncidents, hashString } from "../actions"; -import CryptoJS from "crypto-js"; -import HmacSHA256 from "crypto-js/hmac-sha256"; - +import Head from "next/head"; +import { useRouter } from "next/router"; +import { setCookie } from "nookies"; +import { connect } from "react-redux"; +import { getToken, hashString } from "../actions"; import { - getProviderConfig, getGGToken, - getUserInfo, getPortalLogin, + getProviderConfig, + getUserInfo, } from "../actions/govgateway"; -import { getToken } from "../actions"; +import CookieBanner from "../components/cookieBanner"; +import Footer from "../components/footer"; +import Header from "../components/header"; +import Main from "../components/main"; +import ServiceBanner from "../components/servicebanner"; +import { setAccountDetails } from "../store/accountDetails/action"; import { getGovGatewayConfig } from "../store/govgateway/action"; -import { - setLoggedInUserId, - setAccountDetails, -} from "../store/accountDetails/action"; -import { parseCookies, setCookie, destroyCookie } from "nookies"; +import { wrapper } from "../store/store"; const Home = (props) => { const { diff --git a/pages/logout.js b/pages/logout.js index 3e802678..a2563358 100644 --- a/pages/logout.js +++ b/pages/logout.js @@ -1,16 +1,13 @@ -import _ from "lodash"; -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 Footer from "../components/footer"; -import { useSelector, shallowEqual, connect } from "react-redux"; -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import { setLogout } from "../store/accountDetails/action"; +import Head from "next/head"; +import Link from "next/link"; +import { useRouter } from "next/router"; import { useEffect } from "react"; +import { connect } from "react-redux"; +import CookieBanner from "../components/cookieBanner"; +import Footer from "../components/footer"; +import Header from "../components/header"; +import { setLogout } from "../store/accountDetails/action"; const LogOut = (props) => { const { footerLinks, pages, setLogout } = props; diff --git a/pages/myportal/advancedsearch.js b/pages/myportal/advancedsearch.js index a92a7d35..8564bee8 100644 --- a/pages/myportal/advancedsearch.js +++ b/pages/myportal/advancedsearch.js @@ -1,36 +1,18 @@ import _ from "lodash"; -import { useState } from "react"; -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 Search from "../../components/search"; -import Footer from "../../components/footer"; -import Errorpage from "../../components/errorpage"; -import styles from "../../styles/Home.module.css"; -import { useSelector, shallowEqual, connect } from "react-redux"; -import { wrapper } from "../../store/store"; - -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; +import Head from "next/head"; +import { useRouter } from "next/router"; +import { connect } from "react-redux"; +import { getAppealsTypes, getLPA } from "../../actions"; +import Breadcrumbs from "../../components/breadcrumbs"; +import CookieBanner from "../../components/cookieBanner"; import CRMError from "../../components/crmError"; - -import { - setAppealType, - setAppealTypeTitle, - setAppealTypeID, - setAppealLPA, - getAppealTypeObj, -} from "../../store/appealType/action"; -import { - getAppealsTypes, - getLPA, - updateCase, - createCase, - getToken, -} from "../../actions"; +import Footer from "../../components/footer"; +import Header from "../../components/header"; +import Search from "../../components/search"; +import { setAppealType } from "../../store/appealType/action"; import { setLPA } from "../../store/lpa/action"; +import { wrapper } from "../../store/store"; const Home = (props) => { const { footerLinks, pages } = props; @@ -40,7 +22,6 @@ const Home = (props) => { const { locale } = router; const { appealtypes } = router.query; - console.log(props, props.LPAData); var hasError = _.has(props.LPAData.LPAData, "errorCode") || _.has(props.appealType.appealType, "errorCode") diff --git a/pages/myportal/advancedsearchresults.js b/pages/myportal/advancedsearchresults.js index 24f5a15a..3dbfc3e4 100644 --- a/pages/myportal/advancedsearchresults.js +++ b/pages/myportal/advancedsearchresults.js @@ -1,31 +1,33 @@ -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 SearchResults from "../../components/searchresults"; -import Footer from "../../components/footer"; -import Errorpage from "../../components/errorpage"; -import styles from "../../styles/Home.module.css"; -import { useSelector, shallowEqual, connect } from "react-redux"; -import { wrapper } from "../../store/store"; - -import { useRouter } from "next/router"; import useTranslation from "next-translate/useTranslation"; -import jsonpath from "jsonpath"; -import data from "../../data/collections.json"; - -import { getSearchDetails } from "../../components/utils"; -import { setSearch, getSearchObj } from "../../store/search/action"; +import Head from "next/head"; +import { useRouter } from "next/router"; +import { connect } from "react-redux"; +import { + getAdvancedSearch, + getPortalModuleDetails, + getWatchedCases, +} from "../../actions"; +import Breadcrumbs from "../../components/breadcrumbs"; +import CookieBanner from "../../components/cookieBanner"; +import Footer from "../../components/footer"; +import Header from "../../components/header"; +import SearchResults from "../../components/searchresults"; +import { + getFormCollectionByID, + getSearchDetails, +} from "../../components/utils"; import { - setSearchResults, setSearchDetails, + setSearchResults, } from "../../store/searchOutput/action"; -import { getAdvancedSearch, getToken } from "../../actions"; +import { wrapper } from "../../store/store"; +import { + setWatchedCases, + setWatchedCasesDetails, +} from "../../store/watchedCases/action"; const Home = (props) => { - const { footerLinks, pages } = props; + const { footerLinks, pages, watchedCases } = props; let { t, lang } = useTranslation(); const router = useRouter(); @@ -48,6 +50,8 @@ const Home = (props) => { searchString={props.search.searchString} searchResultsObj={props.searchResultsObj} advancedSearch={true} + watchedCases={watchedCases} + myportal={true} />