From c0cc9b5247013a2764e49743fdf9c8f5d08de2fe Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sat, 6 Jul 2024 21:07:03 +0800 Subject: [PATCH] code refactor --- src/router/mobile.js | 24 +++++++++---------- .../settings/tabs/AppStatisticsSettingTab.vue | 4 ++-- .../cards/AccountFilterSettingsCard.vue | 0 .../cards/CategoryFilterSettingsCard.vue | 0 .../desktop/statistics/TransactionPage.vue | 4 ++-- .../AccountFilterSettingsPage.vue | 0 .../CategoryFilterSettingsPage.vue | 0 src/views/mobile/statistics/SettingsPage.vue | 4 ++-- .../mobile/statistics/TransactionPage.vue | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) rename src/views/desktop/{statistics/settings => common}/cards/AccountFilterSettingsCard.vue (100%) rename src/views/desktop/{statistics/settings => common}/cards/CategoryFilterSettingsCard.vue (100%) rename src/views/mobile/{statistics => settings}/AccountFilterSettingsPage.vue (100%) rename src/views/mobile/{statistics => settings}/CategoryFilterSettingsPage.vue (100%) diff --git a/src/router/mobile.js b/src/router/mobile.js index 411d3259..385b7939 100644 --- a/src/router/mobile.js +++ b/src/router/mobile.js @@ -14,11 +14,11 @@ import AccountEditPage from '@/views/mobile/accounts/EditPage.vue'; import StatisticsTransactionPage from '@/views/mobile/statistics/TransactionPage.vue'; import StatisticsSettingsPage from '@/views/mobile/statistics/SettingsPage.vue'; -import StatisticsAccountFilterSettingsPage from '@/views/mobile/statistics/AccountFilterSettingsPage.vue'; -import StatisticsCategoryFilterSettingsPage from '@/views/mobile/statistics/CategoryFilterSettingsPage.vue'; import TextSizeSettingsPage from '@/views/mobile/settings/TextSizeSettingsPage.vue'; import PageSettingsPage from '@/views/mobile/settings/PageSettingsPage.vue'; +import AccountFilterSettingsPage from '@/views/mobile/settings/AccountFilterSettingsPage.vue'; +import CategoryFilterSettingsPage from '@/views/mobile/settings/CategoryFilterSettingsPage.vue'; import SettingsPage from '@/views/mobile/SettingsPage.vue'; import ApplicationLockPage from '@/views/mobile/ApplicationLockPage.vue'; @@ -194,21 +194,21 @@ const routes = [ async: asyncResolve(StatisticsSettingsPage), beforeEnter: [checkLogin] }, - { - path: '/statistic/filter/account', - async: asyncResolve(StatisticsAccountFilterSettingsPage), - beforeEnter: [checkLogin] - }, - { - path: '/statistic/filter/category', - async: asyncResolve(StatisticsCategoryFilterSettingsPage), - beforeEnter: [checkLogin] - }, { path: '/settings/textsize', async: asyncResolve(TextSizeSettingsPage), beforeEnter: [checkLogin] }, + { + path: '/settings/filter/account', + async: asyncResolve(AccountFilterSettingsPage), + beforeEnter: [checkLogin] + }, + { + path: '/settings/filter/category', + async: asyncResolve(CategoryFilterSettingsPage), + beforeEnter: [checkLogin] + }, { path: '/settings/page', async: asyncResolve(PageSettingsPage), diff --git a/src/views/desktop/app/settings/tabs/AppStatisticsSettingTab.vue b/src/views/desktop/app/settings/tabs/AppStatisticsSettingTab.vue index 571adcb7..1447692d 100644 --- a/src/views/desktop/app/settings/tabs/AppStatisticsSettingTab.vue +++ b/src/views/desktop/app/settings/tabs/AppStatisticsSettingTab.vue @@ -130,8 +130,8 @@ import { useSettingsStore } from '@/stores/setting.js'; import datetimeConstants from '@/consts/datetime.js'; -import AccountFilterSettingsCard from '@/views/desktop/statistics/settings/cards/AccountFilterSettingsCard.vue'; -import CategoryFilterSettingsCard from '@/views/desktop/statistics/settings/cards/CategoryFilterSettingsCard.vue'; +import AccountFilterSettingsCard from '@/views/desktop/common/cards/AccountFilterSettingsCard.vue'; +import CategoryFilterSettingsCard from '@/views/desktop/common/cards/CategoryFilterSettingsCard.vue'; export default { components: { diff --git a/src/views/desktop/statistics/settings/cards/AccountFilterSettingsCard.vue b/src/views/desktop/common/cards/AccountFilterSettingsCard.vue similarity index 100% rename from src/views/desktop/statistics/settings/cards/AccountFilterSettingsCard.vue rename to src/views/desktop/common/cards/AccountFilterSettingsCard.vue diff --git a/src/views/desktop/statistics/settings/cards/CategoryFilterSettingsCard.vue b/src/views/desktop/common/cards/CategoryFilterSettingsCard.vue similarity index 100% rename from src/views/desktop/statistics/settings/cards/CategoryFilterSettingsCard.vue rename to src/views/desktop/common/cards/CategoryFilterSettingsCard.vue diff --git a/src/views/desktop/statistics/TransactionPage.vue b/src/views/desktop/statistics/TransactionPage.vue index 7b2ac229..100527fd 100644 --- a/src/views/desktop/statistics/TransactionPage.vue +++ b/src/views/desktop/statistics/TransactionPage.vue @@ -328,8 +328,8 @@ import { mdiDotsVertical } from '@mdi/js'; -import AccountFilterSettingsCard from './settings/cards/AccountFilterSettingsCard.vue'; -import CategoryFilterSettingsCard from './settings/cards/CategoryFilterSettingsCard.vue'; +import AccountFilterSettingsCard from '@/views/desktop/common/cards/AccountFilterSettingsCard.vue'; +import CategoryFilterSettingsCard from '@/views/desktop/common/cards/CategoryFilterSettingsCard.vue'; export default { components: { diff --git a/src/views/mobile/statistics/AccountFilterSettingsPage.vue b/src/views/mobile/settings/AccountFilterSettingsPage.vue similarity index 100% rename from src/views/mobile/statistics/AccountFilterSettingsPage.vue rename to src/views/mobile/settings/AccountFilterSettingsPage.vue diff --git a/src/views/mobile/statistics/CategoryFilterSettingsPage.vue b/src/views/mobile/settings/CategoryFilterSettingsPage.vue similarity index 100% rename from src/views/mobile/statistics/CategoryFilterSettingsPage.vue rename to src/views/mobile/settings/CategoryFilterSettingsPage.vue diff --git a/src/views/mobile/statistics/SettingsPage.vue b/src/views/mobile/statistics/SettingsPage.vue index 6daad57c..bd6418b7 100644 --- a/src/views/mobile/statistics/SettingsPage.vue +++ b/src/views/mobile/statistics/SettingsPage.vue @@ -24,9 +24,9 @@ - + - +