code refactor

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),

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 AccountFilterSettingsCard from '@/views/desktop/common/cards/AccountFilterSettingsCard.vue';
-import CategoryFilterSettingsCard from '@/views/desktop/statistics/settings/cards/CategoryFilterSettingsCard.vue';
+import CategoryFilterSettingsCard from '@/views/desktop/common/cards/CategoryFilterSettingsCard.vue';
 
 export default {
     components: {

src/views/desktop/statistics/TransactionPage.vue

@@ -328,8 +328,8 @@ import {
     mdiDotsVertical
 } from '@mdi/js';
 
-import AccountFilterSettingsCard from './settings/cards/AccountFilterSettingsCard.vue';
+import AccountFilterSettingsCard from '@/views/desktop/common/cards/AccountFilterSettingsCard.vue';
-import CategoryFilterSettingsCard from './settings/cards/CategoryFilterSettingsCard.vue';
+import CategoryFilterSettingsCard from '@/views/desktop/common/cards/CategoryFilterSettingsCard.vue';
 
 export default {
     components: {

src/views/mobile/statistics/SettingsPage.vue

@@ -24,9 +24,9 @@
                 </select>
             </f7-list-item>
 
-            <f7-list-item :title="$t('Default Account Filter')" link="/statistic/filter/account?modifyDefault=1"></f7-list-item>
+            <f7-list-item :title="$t('Default Account Filter')" link="/settings/filter/account?modifyDefault=1"></f7-list-item>
 
-            <f7-list-item :title="$t('Default Transaction Category Filter')" link="/statistic/filter/category?modifyDefault=1"></f7-list-item>
+            <f7-list-item :title="$t('Default Transaction Category Filter')" link="/settings/filter/category?modifyDefault=1"></f7-list-item>
 
             <f7-list-item
                 :title="$t('Default Sort Order')"

src/views/mobile/statistics/TransactionPage.vue

@@ -534,10 +534,10 @@ export default {
             this.f7router.navigate(this.getItemLinkUrl(item));
         },
         filterAccounts() {
-            this.f7router.navigate('/statistic/filter/account');
+            this.f7router.navigate('/settings/filter/account');
         },
         filterCategories() {
-            this.f7router.navigate('/statistic/filter/category');
+            this.f7router.navigate('/settings/filter/category');
         },
         settings() {
             this.f7router.navigate('/statistic/settings');