Dmirano/3782 proposed budget restructure

web/src/pages/apd/ApdPageRoutes.js

@@ -15,7 +15,7 @@ import Export from '../../containers/ApdExport';
 import ApdOverview from './apd-overview/ApdOverview';
 import ExecutiveSummary from './executive-summary/ExecutiveSummary';
 import PreviousActivities from './previous-activities/PreviousActivities';
-import ProposedBudget from '../../containers/ProposedBudget';
+import ProposedBudget from './proposed-budget/ProposedBudget';
 import ScheduleSummary from './schedule-summary/ScheduleSummary';
 import KeyStatePersonnel from './key-state-personnel/KeyStatePersonnel';
 

web/src/pages/apd/ApdReadOnly.js

@@ -17,7 +17,7 @@ import ApdSummary from '../../containers/viewOnly/ApdSummary';
 import PreviousActivities from './previous-activities/PreviousActivitiesReadOnly';
 import Activities from '../../containers/viewOnly/activities/All';
 import ScheduleSummary from './schedule-summary/ScheduleSummaryReadOnly';
-import ProposedBudget from '../../containers/viewOnly/ProposedBudget';
+import ProposedBudget from './proposed-budget/ProposedBudgetReadOnly';
 import AssuranceAndCompliance from '../../containers/viewOnly/AssurancesAndCompliance';
 import ExecutiveSummary from './executive-summary/ExecutiveSummaryReadOnly';
 import ExportInstructions from '../../containers/viewOnly/Export';

web/src/containers/BudgetSummary.js → web/src/pages/apd/proposed-budget/BudgetSummary.js

@@ -2,8 +2,8 @@ import PropTypes from 'prop-types';
 import React, { Fragment } from 'react';
 import { connect } from 'react-redux';
 
-import Dollars from '../components/Dollars';
-import { selectBudgetActivitiesByFundingSource } from '../reducers/budget.selectors';
+import Dollars from '../../../components/Dollars';
+import { selectBudgetActivitiesByFundingSource } from '../../../reducers/budget.selectors';
 
 const categories = [
   { category: 'statePersonnel', title: 'State Staff' },

web/src/containers/IncentivePayments.js → web/src/pages/apd/proposed-budget/IncentivePayments.js

@@ -7,17 +7,17 @@ import {
   setIncentiveEPCount,
   setIncentiveEHPayment,
   setIncentiveEPPayment
-} from '../actions/editApd';
-import DollarField from '../components/DollarField';
-import Dollars from '../components/Dollars';
-import NumberField from '../components/NumberField';
-import { t } from '../i18n';
+} from '../../../actions/editApd';
+import DollarField from '../../../components/DollarField';
+import Dollars from '../../../components/Dollars';
+import NumberField from '../../../components/NumberField';
+import { t } from '../../../i18n';
 import {
   selectApdYears,
   selectIncentivePayments,
   selectIncentivePaymentTotals
-} from '../reducers/apd.selectors';
-import { formatNum } from '../util/formats';
+} from '../../../reducers/apd.selectors';
+import { formatNum } from '../../../util/formats';
 
 const QUARTERS = [1, 2, 3, 4];
 

web/src/containers/IncentivePayments.test.js → web/src/pages/apd/proposed-budget/IncentivePayments.test.js

@@ -12,7 +12,7 @@ import {
   setIncentiveEPCount,
   setIncentiveEHPayment,
   setIncentiveEPPayment
-} from '../actions/editApd';
+} from '../../../actions/editApd';
 
 describe('incentive payments component', () => {
   const props = {

web/src/containers/ProposedBudget.js → web/src/pages/apd/proposed-budget/ProposedBudget.js

@@ -1,17 +1,17 @@
 import React from 'react';
 
-import { Section, Subsection } from '../components/Section';
+import { Section, Subsection } from '../../../components/Section';
 import SummaryBudgetByActivity from './SummaryBudgetByActivity';
 import BudgetSummary from './BudgetSummary';
-import Waypoint from './ConnectedWaypoint';
+import Waypoint from '../../../containers/ConnectedWaypoint';
 import IncentivePayments from './IncentivePayments';
 import QuarterlyBudgetSummary from './QuarterlyBudgetSummary';
-import AlertMissingFFY from '../components/AlertMissingFFY';
+import AlertMissingFFY from '../../../components/AlertMissingFFY';
 
 const ProposedBudget = () => (
   <React.Fragment>
     <Waypoint />
-    <AlertMissingFFY/>
+    <AlertMissingFFY />
     <Section resource="proposedBudget">
       <Waypoint id="summary-schedule-by-activity-table" />
       <Subsection

web/src/containers/viewOnly/ProposedBudget.js → web/src/pages/apd/proposed-budget/ProposedBudgetReadOnly.js

@@ -1,9 +1,9 @@
 import React from 'react';
 
-import SummaryBudgetByActivity from '../SummaryBudgetByActivity';
-import BudgetSummary from '../BudgetSummary';
-import IncentivePayments from '../IncentivePayments';
-import QuarterlyBudgetSummary from '../QuarterlyBudgetSummary';
+import SummaryBudgetByActivity from './SummaryBudgetByActivity';
+import BudgetSummary from './BudgetSummary';
+import IncentivePayments from './IncentivePayments';
+import QuarterlyBudgetSummary from './QuarterlyBudgetSummary';
 
 const ProposedBudget = () => (
   <div>

web/src/containers/QuarterlyBudgetSummary.js → web/src/pages/apd/proposed-budget/QuarterlyBudgetSummary.js

@@ -2,8 +2,8 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
 
-import Dollars from '../components/Dollars';
-import { t } from '../i18n';
+import Dollars from '../../../components/Dollars';
+import { t } from '../../../i18n';
 
 const FUNDING_SOURCES = [
   ['hitAndHie', 'HIT and HIE'],

web/src/containers/SummaryActivityBreakdown.js → web/src/pages/apd/proposed-budget/SummaryActivityBreakdown.js

@@ -4,8 +4,8 @@ import { connect } from 'react-redux';
 import {
   selectActivityCostSummary,
   selectActivityByIndex
-} from '../reducers/activities.selectors';
-import CostAllocationRows from './activity/CostAllocationRows';
+} from '../../../reducers/activities.selectors';
+import CostAllocationRows from '../../../containers/activity/CostAllocationRows';
 
 const SummaryActivityBreakdownTable = ({
   ffy,

web/src/containers/SummaryBudgetByActivity.js → web/src/pages/apd/proposed-budget/SummaryBudgetByActivity.js

@@ -1,9 +1,9 @@
 import PropTypes from 'prop-types';
 import React, { Fragment } from 'react';
 import { connect } from 'react-redux';
-import Instruction from '../components/Instruction';
+import Instruction from '../../../components/Instruction';
 import SummaryActivityBreakdownTable from './SummaryActivityBreakdown';
-import Dollars from '../components/Dollars';
+import Dollars from '../../../components/Dollars';
 
 const categories = [
   { category: 'statePersonnel', title: 'State Staff Total' },