Removed proxy and added api calls, has gov gateway auth

pages/newappeal/[appealtypes].js

@@ -1,49 +1,24 @@
-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 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 useTranslation from "next-translate/useTranslation";
+import Head from "next/head";
+import { useRouter } from "next/router";
 import { useEffect } from "react";
-import {
-    setLoggedInUserId,
-    setAccountDetails,
-} from "../../store/accountDetails/action";
-import {
-    setAppealType,
-    setAppealTypeTitle,
-    setAppealTypeID,
-    getAppealTypeObj,
-    setAppealLPA,
-    setCaseReference,
-} from "../../store/appealType/action";
-import { setForm, getFormObj } from "../../store/formData/action";
-import {
-    getToken,
-    getFormData,
-    getAppealsTypes,
-    getMandatoryFields,
-    createCase,
-    getPickLists,
-    updateCase,
-} from "../../actions";
-
+import { connect } from "react-redux";
 import xpath from "xpath";
-import { reduxForm, FormName } from "redux-form";
-
-import BuildSection from "../../components/newappeal/buildsection";
+import {
+    createCase,
+    getAppealsTypes,
+    getFormData,
+    getMandatoryFields,
+    getPickLists,
+} from "../../actions";
+import Breadcrumbs from "../../components/breadcrumbs";
+import CookieBanner from "../../components/cookieBanner";
+import Footer from "../../components/footer";
+import Header from "../../components/header";
 import BuildCheckSection from "../../components/newappeal/buildchecksection";
+import BuildSection from "../../components/newappeal/buildsection";
 import CompleteAppeal from "../../components/newappeal/complete";
-
 import AdvertsForm from "../../data/forms/adverts";
 import Callinss77Form from "../../data/forms/callinss77";
 import CommonLandForm from "../../data/forms/commonland";
@@ -69,6 +44,16 @@ import PlanningObligationAppeals106Form from "../../data/forms/planningobligatio
 import RowForm from "../../data/forms/row";
 import TransportAndWorkActForm from "../../data/forms/transportandworkact";
 import WayleaveForm from "../../data/forms/wayleave";
+import { setLoggedInUserId } from "../../store/accountDetails/action";
+import {
+    setAppealLPA,
+    setAppealType,
+    setAppealTypeID,
+    setAppealTypeTitle,
+    setCaseReference,
+} from "../../store/appealType/action";
+import { setForm } from "../../store/formData/action";
+import { wrapper } from "../../store/store";
 
 let Home = (props) => {
     const { footerLinks, pages, formData } = props;
@@ -331,8 +316,6 @@ export const getServerSideProps = wrapper.getServerSideProps(
         console.log("the query", query);
         let loggedInUser = cookies.pinsUser;
 
-        let token = await getToken();
-        token = token.access_token;
         const [
             caseReferenceData,
             appealTypeData,
@@ -340,11 +323,11 @@ export const getServerSideProps = wrapper.getServerSideProps(
             pickListData,
             formdata,
         ] = await Promise.all([
-            await createCase(token, query.apt, query.lpa, loggedInUser),
-            await getAppealsTypes(token),
-            await getMandatoryFields(token, query.appealtypes),
-            await getPickLists(token, query.appealtypes),
-            await getFormData(token, query.appealtypes),
+            await createCase(query.apt, query.lpa, loggedInUser),
+            await getAppealsTypes(),
+            await getMandatoryFields(query.appealtypes),
+            await getPickLists(query.appealtypes),
+            await getFormData(query.appealtypes),
         ]);
 
         let caseReference = caseReferenceData;

pages/newappeal/index.js

@@ -1,42 +1,17 @@
-import Link from "next/link";
-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 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 { useEffect, useState } from "react";
 import useTranslation from "next-translate/useTranslation";
-import jsonpath from "jsonpath";
-import { reduxForm, formValueSelector } from "redux-form";
-
+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 Footer from "../../components/footer";
+import Header from "../../components/header";
 import CreateCase from "../../components/newappeal/createCase";
-import xpath from "xpath";
-import {
-    setLoggedInUserId,
-    setAccountDetails,
-} from "../../store/accountDetails/action";
-import {
-    setAppealType,
-    setAppealTypeTitle,
-    setAppealTypeID,
-    setAppealLPA,
-    getAppealTypeObj,
-} from "../../store/appealType/action";
-import {
-    getAppealsTypes,
-    getLPA,
-    updateCase,
-    createCase,
-    getToken,
-} from "../../actions";
+import { setLoggedInUserId } from "../../store/accountDetails/action";
+import { setAppealType } from "../../store/appealType/action";
 import { setLPA } from "../../store/lpa/action";
+import { wrapper } from "../../store/store";
 
 const Home = (props) => {
     const { footerLinks, pages, formData } = props;
@@ -150,12 +125,9 @@ export const getServerSideProps = wrapper.getServerSideProps(
 
         let loggedInUser = cookies.pinsUser;
 
-        let token = await getToken();
-        token = token.access_token;
-
         const [appealTypeData, lpaData, caseData] = await Promise.all([
-            await getAppealsTypes(token),
-            await getLPA(token),
+            await getAppealsTypes(),
+            await getLPA(),
         ]);
 
         store.dispatch(setAppealType(appealTypeData));

pages/newappeal/planningappeal.js

@@ -1,18 +1,10 @@
-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 NewAppeal from "../../components/newappeal";
-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 CookieBanner from "../../components/cookieBanner";
+import Footer from "../../components/footer";
+import Header from "../../components/header";
+import NewAppeal from "../../components/newappeal";
 
 const Home = (props) => {
     const { footerLinks, pages } = props;
@@ -40,39 +32,4 @@ const Home = (props) => {
     );
 };
 
-// export const getServerSideProps = wrapper.getServerSideProps(
-//   async ({ locale, store, req, res }) => {
-//     let token = await getToken()
-//   token = token.access_token;
-//     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,
-//   };
-// };
-
 export default Home; //connect(mapStateToProps)(Home);

pages/newappeal/selectappeal.js

@@ -1,27 +1,19 @@
-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 Breadcrumbs from "../../components/breadcrumbs";
-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 { useState } from "react";
-import useTranslation from "next-translate/useTranslation";
-
+import { connect } from "react-redux";
+import { getAppealsTypes } from "../../actions";
+import Breadcrumbs from "../../components/breadcrumbs";
+import CookieBanner from "../../components/cookieBanner";
+import Footer from "../../components/footer";
+import Header from "../../components/header";
 import {
     setAppealType,
-    setAppealTypeTitle,
     setAppealTypeID,
-    getAppealTypeObj,
+    setAppealTypeTitle,
 } from "../../store/appealType/action";
-import { getAppealsTypes } from "../../actions";
-import xpath from "xpath";
+import { wrapper } from "../../store/store";
 
 const Home = (props) => {
     const { footerLinks, pages, formData } = props;