Dmirano/3786 activities restructure (#3958)

* layout restructure

* updated tests

* dashboard refactor

* update tests

* added login refactor

* updated tests

* added admin refactor

* updated tests

* route refactor

* route refactor to /pages/

* updated tests (not finishes yet)

* apd components refactor

* updated tests (route still causing issues)

* updated tests

* update tests, all pass now

* fixed merge conflicts

* relocated apd overview components

* updated tests and renamed to ApdOverview

* key state refactor

* updated tests

* previous activity restructure

* updated tests

* schedule summary refactor

* update tests

* executive summary restructure

* updated tests

* proposed budget refactor

* updated tests

* assurance and compliance restructure

* updated tests

* update tests after merge with proposed budget refactor

* export refactor

* updated tests

* activities refactor

* update tests

* updated failing tests

web/src/containers/activity/EntryPage.js

@@ -4,15 +4,16 @@ import { connect } from 'react-redux';
 import { useParams } from 'react-router-dom';
 
 import AlertMissingFFY from '../../components/AlertMissingFFY';
-import ActivityRoutes from './ActivityRoutes';
+import ActivityRoutes from '../../pages/apd/activities/ActivityRoutes';
 
 const EntryPage = ({ activityNames }) => {
   const activityIndex = +useParams().activityIndex;
 
   return (
     <div className="remove-clearfix" id="activity-entry-page">
       <h2>
-        Activity {activityIndex + 1}: {activityNames[activityIndex] || "Untitled"}
+        Activity {activityIndex + 1}:{' '}
+        {activityNames[activityIndex] || 'Untitled'}
       </h2>
       <AlertMissingFFY />
       <ActivityRoutes activityIndex={activityIndex} />

web/src/containers/activity/ActivityRoutes.js → web/src/pages/apd/activities/ActivityRoutes.js

@@ -6,15 +6,15 @@ import {
   useRouteMatch as actualUseRouteMatch
 } from 'react-router-dom';
 
-import ContractorResources from './ContractorResources';
-import CostAllocation from './CostAllocation';
-import FFP from './CostAllocateFFP';
-import Costs from './Costs';
-import Milestones from './Milestones';
-import Overview from './Overview';
-import Outcomes from './Outcomes';
-import StandardsAndConditions from './StandardsAndConditions';
-import { Section } from '../../components/Section';
+import ContractorResources from '../../../containers/activity/ContractorResources';
+import CostAllocation from '../../../containers/activity/CostAllocation';
+import FFP from '../../../containers/activity/CostAllocateFFP';
+import Costs from '../../../containers/activity/Costs';
+import Milestones from '../../../containers/activity/Milestones';
+import Overview from '../../../containers/activity/Overview';
+import Outcomes from '../../../containers/activity/Outcomes';
+import StandardsAndConditions from '../../../containers/activity/StandardsAndConditions';
+import { Section } from '../../../components/Section';
 
 const ActivityRoutes = ({ activityIndex, useRouteMatch }) => {
   const { path } = useRouteMatch();