diff --git a/packages/client/src/arpa_reporter/router/index.js b/packages/client/src/arpa_reporter/router/index.js index 1be516a96..29fd0802f 100644 --- a/packages/client/src/arpa_reporter/router/index.js +++ b/packages/client/src/arpa_reporter/router/index.js @@ -5,6 +5,10 @@ import AgenciesView from '@/arpa_reporter/views/AgenciesView.vue'; import AgencyView from '@/arpa_reporter/views/AgencyView.vue'; import HomeView from '@/arpa_reporter/views/HomeView.vue'; import LoginView from '@/arpa_reporter/views/LoginView.vue'; +import NewTemplateView from '@/arpa_reporter/views/NewTemplateView.vue'; +import NewUploadView from '@/arpa_reporter/views/NewUploadView.vue'; +import ReportingPeriodView from '@/arpa_reporter/views/ReportingPeriodView.vue'; +import ReportingPeriodsView from '@/arpa_reporter/views/ReportingPeriodsView.vue'; import SubrecipientView from '@/arpa_reporter/views/SubrecipientView.vue'; import SubrecipientsView from '@/arpa_reporter/views/SubrecipientsView.vue'; import UserView from '@/arpa_reporter/views/UserView.vue'; @@ -12,11 +16,7 @@ import UsersView from '@/arpa_reporter/views/UsersView.vue'; import ValidationView from '@/arpa_reporter/views/ValidationView.vue'; import UploadView from '@/arpa_reporter/views/UploadView.vue'; import UploadsView from '@/arpa_reporter/views/UploadsView.vue'; -import NewTemplate from '../views/NewTemplate.vue'; -import NewUpload from '../views/NewUpload.vue'; -import ReportingPeriod from '../views/ReportingPeriod.vue'; -import ReportingPeriods from '../views/ReportingPeriods.vue'; -import store from '../store/index'; +import store from '@/arpa_reporter/store'; Vue.use(VueRouter); @@ -31,13 +31,13 @@ const routes = [ { path: '/new_upload', name: 'NewUpload', - component: NewUpload, + component: NewUploadView, meta: { requiresLogin: true }, }, { path: '/new_template/:id', name: 'NewTemplate', - component: NewTemplate, + component: NewTemplateView, meta: { requiresLogin: true }, }, { @@ -67,13 +67,13 @@ const routes = [ { path: '/reporting_periods', name: 'ReportingPeriods', - component: ReportingPeriods, + component: ReportingPeriodsView, meta: { requiresLogin: true }, }, { path: '/reporting_periods/:id', name: 'ReportingPeriod', - component: ReportingPeriod, + component: ReportingPeriodView, meta: { requiresLogin: true }, }, { diff --git a/packages/client/src/arpa_reporter/views/NewTemplate.vue b/packages/client/src/arpa_reporter/views/NewTemplateView.vue similarity index 99% rename from packages/client/src/arpa_reporter/views/NewTemplate.vue rename to packages/client/src/arpa_reporter/views/NewTemplateView.vue index dcaed9426..f53597fcf 100644 --- a/packages/client/src/arpa_reporter/views/NewTemplate.vue +++ b/packages/client/src/arpa_reporter/views/NewTemplateView.vue @@ -45,7 +45,6 @@ import { postForm } from '../store'; export default { - name: 'NewTemplate', data() { return { reportingPeriodId: this.$route.params.id, diff --git a/packages/client/src/arpa_reporter/views/NewUpload.vue b/packages/client/src/arpa_reporter/views/NewUploadView.vue similarity index 100% rename from packages/client/src/arpa_reporter/views/NewUpload.vue rename to packages/client/src/arpa_reporter/views/NewUploadView.vue diff --git a/packages/client/src/arpa_reporter/views/ReportingPeriod.vue b/packages/client/src/arpa_reporter/views/ReportingPeriodView.vue similarity index 98% rename from packages/client/src/arpa_reporter/views/ReportingPeriod.vue rename to packages/client/src/arpa_reporter/views/ReportingPeriodView.vue index 0236382ac..470a8c3ee 100644 --- a/packages/client/src/arpa_reporter/views/ReportingPeriod.vue +++ b/packages/client/src/arpa_reporter/views/ReportingPeriodView.vue @@ -28,7 +28,6 @@ import StandardForm from '../components/StandardForm.vue'; import { post } from '../store/index'; export default { - name: 'ReportingPeriod', components: { StandardForm, }, diff --git a/packages/client/src/arpa_reporter/views/ReportingPeriods.vue b/packages/client/src/arpa_reporter/views/ReportingPeriodsView.vue similarity index 99% rename from packages/client/src/arpa_reporter/views/ReportingPeriods.vue rename to packages/client/src/arpa_reporter/views/ReportingPeriodsView.vue index d31833bc5..87719dfc8 100644 --- a/packages/client/src/arpa_reporter/views/ReportingPeriods.vue +++ b/packages/client/src/arpa_reporter/views/ReportingPeriodsView.vue @@ -123,7 +123,6 @@ const moment = require('moment'); const _ = require('lodash'); export default { - name: 'ReportingPeriods', data() { return { certifying: false, diff --git a/packages/client/src/router/index.js b/packages/client/src/router/index.js index 33d694768..05e0d68cd 100644 --- a/packages/client/src/router/index.js +++ b/packages/client/src/router/index.js @@ -1,9 +1,8 @@ import VueRouter from 'vue-router'; +import BaseLayout from '@/components/BaseLayout.vue'; import { newTerminologyEnabled, newGrantsDetailPageEnabled } from '@/helpers/featureFlags'; import LoginView from '@/views/LoginView.vue'; -import BaseLayout from '@/components/BaseLayout.vue'; -import ArpaAnnualPerformanceReporter from '../views/ArpaAnnualPerformanceReporter.vue'; import store from '../store'; @@ -16,7 +15,7 @@ export const routes = [ { path: '/arpa-annual-performance-reporter', name: 'annualReporter', - component: ArpaAnnualPerformanceReporter, + component: () => import('@/views/ArpaAnnualPerformanceReporterView.vue'), meta: { requiresAuth: true, }, @@ -145,7 +144,7 @@ export const routes = [ { path: '/my-profile', name: 'myProfile', - component: () => import('../views/MyProfile.vue'), + component: () => import('../views/MyProfileView.vue'), meta: { requiresAuth: true, hideLayoutTabs: true, diff --git a/packages/client/src/views/ArpaAnnualPerformanceReporter.vue b/packages/client/src/views/ArpaAnnualPerformanceReporterView.vue similarity index 99% rename from packages/client/src/views/ArpaAnnualPerformanceReporter.vue rename to packages/client/src/views/ArpaAnnualPerformanceReporterView.vue index 2ee9d95d2..ea257fb76 100644 --- a/packages/client/src/views/ArpaAnnualPerformanceReporter.vue +++ b/packages/client/src/views/ArpaAnnualPerformanceReporterView.vue @@ -94,7 +94,6 @@ import { apiURL } from '@/helpers/fetchApi'; export default { - name: 'AnnualRollup', data() { return { // easier dupe checking diff --git a/packages/client/src/views/MyProfile.vue b/packages/client/src/views/MyProfileView.vue similarity index 100% rename from packages/client/src/views/MyProfile.vue rename to packages/client/src/views/MyProfileView.vue