diff --git a/src/router/desktop.js b/src/router/desktop.js index b76b458e..20975728 100644 --- a/src/router/desktop.js +++ b/src/router/desktop.js @@ -8,14 +8,21 @@ import SignUpPage from '@/views/desktop/SignupPage.vue'; import UnlockPage from '@/views/desktop/UnlockPage.vue'; import HomePage from '@/views/desktop/HomePage.vue'; -import TransactionsPage from '@/views/desktop/TransactionsPage.vue'; + +import TransactionListPage from '@/views/desktop/transactions/ListPage.vue'; + import StatisticsTransactionPage from '@/views/desktop/statistics/TransactionPage.vue'; -import AccountsPage from '@/views/desktop/AccountsPage.vue'; -import TransactionCategoriesPage from '@/views/desktop/TransactionCategoriesPage.vue'; -import TransactionTagsPage from '@/views/desktop/TransactionTagsPage.vue'; -import ExchangeRatesPage from '@/views/desktop/ExchangeRatesPage.vue'; + +import AccountListPage from '@/views/desktop/accounts/ListPage.vue'; + +import TransactionCategoryListPage from '@/views/desktop/categories/ListPage.vue'; + +import TransactionTagListPage from '@/views/desktop/tags/ListPage.vue'; + import UserSettingsPage from '@/views/desktop/user/UserSettingsPage.vue'; import AppSettingsPage from '@/views/desktop/app/AppSettingsPage.vue'; + +import ExchangeRatesPage from '@/views/desktop/ExchangeRatesPage.vue'; import AboutPage from '@/views/desktop/AboutPage.vue'; function checkLogin() { @@ -80,8 +87,8 @@ const router = createRouter({ beforeEnter: checkLogin }, { - path: '/transactions', - component: TransactionsPage, + path: '/transaction/list', + component: TransactionListPage, beforeEnter: checkLogin, props: route => ({ initDateType: route.query.dateType, @@ -98,18 +105,18 @@ const router = createRouter({ beforeEnter: checkLogin }, { - path: '/accounts', - component: AccountsPage, + path: '/account/list', + component: AccountListPage, beforeEnter: checkLogin }, { - path: '/categories', - component: TransactionCategoriesPage, + path: '/category/list', + component: TransactionCategoryListPage, beforeEnter: checkLogin }, { - path: '/tags', - component: TransactionTagsPage, + path: '/tag/list', + component: TransactionTagListPage, beforeEnter: checkLogin }, { diff --git a/src/views/desktop/HomePage.vue b/src/views/desktop/HomePage.vue index e2628fc8..d35747cd 100644 --- a/src/views/desktop/HomePage.vue +++ b/src/views/desktop/HomePage.vue @@ -33,7 +33,7 @@ {{ transactionOverview && transactionOverview.thisMonth ? getDisplayIncomeAmount(transactionOverview.thisMonth) : '-' }} - {{ $t('View Details') }} + {{ $t('View Details') }} @@ -115,7 +115,7 @@ :datetime="displayDateRange.today.displayTime" > @@ -131,7 +131,7 @@ :datetime="displayDateRange.thisWeek.startTime + '-' + displayDateRange.thisWeek.endTime" > @@ -147,7 +147,7 @@ :datetime="displayDateRange.thisMonth.startTime + '-' + displayDateRange.thisMonth.endTime" > @@ -163,7 +163,7 @@ :datetime="displayDateRange.thisYear.displayTime" > @@ -185,8 +185,8 @@