Skip to content

Commit

Permalink
Clean up View naming conventions after eslint vue recommended migrati…
Browse files Browse the repository at this point in the history
…on (#2933)

* Rename ArpaAnnualPerformanceReporter with View postfix

* Dynamic loading of arpa annual performance reporter

This prevents this tool from getting included in the main webpack
bundle, so it doesn't have to get loaded for the main grant finder
tool

* Rename MyProfile with View postfix

* Rename NewTemplate with View postfix

* Rename NewUpload view with View postfix

* Rename ReportingPeriod with View postfix

* Rename ReportingPeriods with View postfix

* Root import alias conformity

---------

Co-authored-by: Tyler Hendrickson <[email protected]>
  • Loading branch information
jeffsmohan and TylerHendrickson authored Apr 23, 2024
1 parent d9a9f63 commit d1c3273
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 17 deletions.
18 changes: 9 additions & 9 deletions packages/client/src/arpa_reporter/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ 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';
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);

Expand All @@ -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 },
},
{
Expand Down Expand Up @@ -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 },
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import { postForm } from '../store';
export default {
name: 'NewTemplate',
data() {
return {
reportingPeriodId: this.$route.params.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import StandardForm from '../components/StandardForm.vue';
import { post } from '../store/index';
export default {
name: 'ReportingPeriod',
components: {
StandardForm,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ const moment = require('moment');
const _ = require('lodash');
export default {
name: 'ReportingPeriods',
data() {
return {
certifying: false,
Expand Down
7 changes: 3 additions & 4 deletions packages/client/src/router/index.js
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -16,7 +15,7 @@ export const routes = [
{
path: '/arpa-annual-performance-reporter',
name: 'annualReporter',
component: ArpaAnnualPerformanceReporter,
component: () => import('@/views/ArpaAnnualPerformanceReporterView.vue'),
meta: {
requiresAuth: true,
},
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
import { apiURL } from '@/helpers/fetchApi';
export default {
name: 'AnnualRollup',
data() {
return {
// easier dupe checking
Expand Down
File renamed without changes.

0 comments on commit d1c3273

Please sign in to comment.