From 95205d2f1d5e104d6475f93e99fba9604f4c1b3f Mon Sep 17 00:00:00 2001 From: MaysWind Date: Thu, 6 Feb 2025 23:29:08 +0800 Subject: [PATCH] code refactor --- src/components/desktop/ColorSelect.vue | 13 +- src/components/desktop/IconSelect.vue | 6 +- src/components/desktop/ItemIcon.vue | 6 +- src/views/desktop/ExchangeRatesPage.vue | 9 +- src/views/desktop/ForgetPasswordPage.vue | 6 +- src/views/desktop/HomePage.vue | 44 ++---- src/views/desktop/LoginPage.vue | 9 +- src/views/desktop/MainLayout.vue | 65 +++------ src/views/desktop/ResetPasswordPage.vue | 6 +- src/views/desktop/SignupPage.vue | 14 +- src/views/desktop/VerifyEmailPage.vue | 6 +- src/views/desktop/accounts/ListPage.vue | 43 ++---- .../accounts/list/dialogs/EditDialog.vue | 12 +- src/views/desktop/app/AppSettingsPage.vue | 12 +- src/views/desktop/categories/ListPage.vue | 29 ++-- .../cards/AccountFilterSettingsCard.vue | 33 ++--- .../cards/CategoryFilterSettingsCard.vue | 33 ++--- .../TransactionTagFilterSettingsCard.vue | 43 +++--- .../cards/IncomeExpenseOverviewCard.vue | 6 +- .../desktop/statistics/TransactionPage.vue | 41 ++---- src/views/desktop/tags/ListPage.vue | 55 +++----- src/views/desktop/templates/ListPage.vue | 40 ++---- .../list/dialogs/BatchReplaceDialog.vue | 8 +- .../transactions/list/dialogs/EditDialog.vue | 35 ++--- .../list/dialogs/ImportDialog.vue | 131 ++++++++---------- src/views/desktop/user/UserSettingsPage.vue | 15 +- .../settings/tabs/UserBasicSettingTab.vue | 11 +- .../tabs/UserDataManagementSettingTab.vue | 30 ++-- .../settings/tabs/UserSecuritySettingTab.vue | 6 +- .../tabs/UserTwoFactorAuthSettingTab.vue | 6 +- 30 files changed, 253 insertions(+), 520 deletions(-) diff --git a/src/components/desktop/ColorSelect.vue b/src/components/desktop/ColorSelect.vue index a58fc3d4..9c1134c9 100644 --- a/src/components/desktop/ColorSelect.vue +++ b/src/components/desktop/ColorSelect.vue @@ -11,7 +11,7 @@ > @@ -23,12 +23,12 @@
- +
@@ -64,11 +64,6 @@ const emit = defineEmits<{ (e: 'update:modelValue', value: ColorValue): void; }>(); -const icons = { - square: mdiSquareRounded, - checked: mdiCheck -}; - const dropdownMenu = useTemplateRef('dropdownMenu'); const itemPerRow = ref(props.columnCount || 7); diff --git a/src/components/desktop/IconSelect.vue b/src/components/desktop/IconSelect.vue index 8eebb25c..472f1e2c 100644 --- a/src/components/desktop/IconSelect.vue +++ b/src/components/desktop/IconSelect.vue @@ -24,7 +24,7 @@
@@ -63,10 +63,6 @@ const emit = defineEmits<{ (e: 'update:modelValue', value: string): void; }>(); -const icons = { - checked: mdiCheck -}; - const dropdownMenu = useTemplateRef('dropdownMenu'); const itemPerRow = ref(props.columnCount || 7); diff --git a/src/components/desktop/ItemIcon.vue b/src/components/desktop/ItemIcon.vue index c5cc143b..1f25a825 100644 --- a/src/components/desktop/ItemIcon.vue +++ b/src/components/desktop/ItemIcon.vue @@ -3,7 +3,7 @@ @@ -27,10 +27,6 @@ interface DesktopItemIconProps extends CommonIconProps { const props = defineProps(); const { style, getAccountIcon, getCategoryIcon } = useItemIconBase(props); -const icons = { - hide: mdiEyeOffOutline -}; - const classes = computed(() => { let allClasses = props.class ? (props.class + ' ') : ''; diff --git a/src/views/desktop/ExchangeRatesPage.vue b/src/views/desktop/ExchangeRatesPage.vue index 71c4e0d8..23460ef6 100644 --- a/src/views/desktop/ExchangeRatesPage.vue +++ b/src/views/desktop/ExchangeRatesPage.vue @@ -62,7 +62,7 @@
- + {{ tt('Exchange Rates Data') }} - + {{ tt('Refresh') }}
@@ -162,11 +162,6 @@ const { baseCurrency, baseAmount, exchangeRatesData, exchangeRatesDataUpdateTime const exchangeRatesStore = useExchangeRatesStore(); -const icons = { - refresh: mdiRefresh, - menu: mdiMenu -}; - const snackbar = useTemplateRef('snackbar'); const activeTab = ref('exchangeRatesPage'); diff --git a/src/views/desktop/ForgetPasswordPage.vue b/src/views/desktop/ForgetPasswordPage.vue index 75664cf6..36c10777 100644 --- a/src/views/desktop/ForgetPasswordPage.vue +++ b/src/views/desktop/ForgetPasswordPage.vue @@ -52,7 +52,7 @@ - + {{ tt('Back to login page') }} @@ -136,10 +136,6 @@ const { tt, getCurrentLanguageDisplayName, getAllLanguageOptions, setLanguage } const rootStore = useRootStore(); const settingsStore = useSettingsStore(); -const icons = { - left: mdiChevronLeft -}; - const version = `v${getVersion()}`; const confirmDialog = useTemplateRef('confirmDialog'); diff --git a/src/views/desktop/HomePage.vue b/src/views/desktop/HomePage.vue index 28558089..b6687b3f 100644 --- a/src/views/desktop/HomePage.vue +++ b/src/views/desktop/HomePage.vue @@ -14,7 +14,7 @@ - + {{ tt('Refresh') }}
@@ -26,7 +26,7 @@ - +
@@ -58,7 +58,7 @@
- +
@@ -74,7 +74,7 @@
- +
@@ -90,7 +90,7 @@
- +
@@ -110,14 +110,14 @@ @@ -126,14 +126,14 @@ @@ -142,14 +142,14 @@ @@ -158,14 +158,14 @@ @@ -217,8 +217,7 @@ import { mdiCalendarWeekOutline, mdiCalendarMonthOutline, mdiLayersTripleOutline, - mdiListBoxOutline, - mdiDotsVertical + mdiListBoxOutline } from '@mdi/js'; type SnackBarType = InstanceType; @@ -242,21 +241,6 @@ const { const accountsStore = useAccountsStore(); const overviewStore = useOverviewStore(); -const icons = { - refresh: mdiRefresh, - eye: mdiEyeOutline, - eyeSlash: mdiEyeOffOutline, - totalAssets: mdiBankOutline, - totalLiabilities: mdiCreditCardOutline, - netAssets: mdiPiggyBankOutline, - calendarToday: mdiCalendarTodayOutline, - calendarWeek: mdiCalendarWeekOutline, - calendarMonth: mdiCalendarMonthOutline, - calendarYear: mdiLayersTripleOutline, - viewDetails: mdiListBoxOutline, - more: mdiDotsVertical -}; - const snackbar = useTemplateRef('snackbar'); const loadingOverview = ref(true); diff --git a/src/views/desktop/LoginPage.vue b/src/views/desktop/LoginPage.vue index c09cfeca..6c89bbfa 100644 --- a/src/views/desktop/LoginPage.vue +++ b/src/views/desktop/LoginPage.vue @@ -66,7 +66,7 @@ :disabled="logining || verifying" :label="tt('Passcode')" :placeholder="tt('Passcode')" - :append-inner-icon="icons.backupCode" + :append-inner-icon="mdiHelpCircleOutline" v-model="passcode" @click:append-inner="twoFAVerifyType = 'backupcode'" @keyup.enter="verify" @@ -77,7 +77,7 @@ :disabled="logining || verifying" :label="tt('Backup Code')" :placeholder="tt('Backup Code')" - :append-inner-icon="icons.passcode" + :append-inner-icon="mdiOnepassword" v-model="backupCode" @click:append-inner="twoFAVerifyType = 'passcode'" @keyup.enter="verify" @@ -217,11 +217,6 @@ const { doAfterLogin } = useLoginPageBase(); -const icons = { - passcode: mdiOnepassword, - backupCode: mdiHelpCircleOutline -}; - const passwordInput = useTemplateRef('passwordInput'); const passcodeInput = useTemplateRef('passcodeInput'); const snackbar = useTemplateRef('snackbar'); diff --git a/src/views/desktop/MainLayout.vue b/src/views/desktop/MainLayout.vue index 1f41610e..ec93d867 100644 --- a/src/views/desktop/MainLayout.vue +++ b/src/views/desktop/MainLayout.vue @@ -17,7 +17,7 @@ > @@ -28,13 +28,13 @@ @@ -45,31 +45,31 @@ @@ -80,19 +80,19 @@ @@ -105,7 +105,7 @@
- +