move files

This commit is contained in:
MaysWind
2023-08-05 16:51:34 +08:00
parent 7e24492ce8
commit 395bd31898
22 changed files with 48 additions and 41 deletions
+20 -13
View File
@@ -8,14 +8,21 @@ import SignUpPage from '@/views/desktop/SignupPage.vue';
import UnlockPage from '@/views/desktop/UnlockPage.vue'; import UnlockPage from '@/views/desktop/UnlockPage.vue';
import HomePage from '@/views/desktop/HomePage.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 StatisticsTransactionPage from '@/views/desktop/statistics/TransactionPage.vue';
import AccountsPage from '@/views/desktop/AccountsPage.vue';
import TransactionCategoriesPage from '@/views/desktop/TransactionCategoriesPage.vue'; import AccountListPage from '@/views/desktop/accounts/ListPage.vue';
import TransactionTagsPage from '@/views/desktop/TransactionTagsPage.vue';
import ExchangeRatesPage from '@/views/desktop/ExchangeRatesPage.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 UserSettingsPage from '@/views/desktop/user/UserSettingsPage.vue';
import AppSettingsPage from '@/views/desktop/app/AppSettingsPage.vue'; import AppSettingsPage from '@/views/desktop/app/AppSettingsPage.vue';
import ExchangeRatesPage from '@/views/desktop/ExchangeRatesPage.vue';
import AboutPage from '@/views/desktop/AboutPage.vue'; import AboutPage from '@/views/desktop/AboutPage.vue';
function checkLogin() { function checkLogin() {
@@ -80,8 +87,8 @@ const router = createRouter({
beforeEnter: checkLogin beforeEnter: checkLogin
}, },
{ {
path: '/transactions', path: '/transaction/list',
component: TransactionsPage, component: TransactionListPage,
beforeEnter: checkLogin, beforeEnter: checkLogin,
props: route => ({ props: route => ({
initDateType: route.query.dateType, initDateType: route.query.dateType,
@@ -98,18 +105,18 @@ const router = createRouter({
beforeEnter: checkLogin beforeEnter: checkLogin
}, },
{ {
path: '/accounts', path: '/account/list',
component: AccountsPage, component: AccountListPage,
beforeEnter: checkLogin beforeEnter: checkLogin
}, },
{ {
path: '/categories', path: '/category/list',
component: TransactionCategoriesPage, component: TransactionCategoryListPage,
beforeEnter: checkLogin beforeEnter: checkLogin
}, },
{ {
path: '/tags', path: '/tag/list',
component: TransactionTagsPage, component: TransactionTagListPage,
beforeEnter: checkLogin beforeEnter: checkLogin
}, },
{ {
+9 -9
View File
@@ -33,7 +33,7 @@
<span v-if="!loadingOverview || (transactionOverview && transactionOverview.thisMonth && transactionOverview.thisMonth.valid)">{{ transactionOverview && transactionOverview.thisMonth ? getDisplayIncomeAmount(transactionOverview.thisMonth) : '-' }}</span> <span v-if="!loadingOverview || (transactionOverview && transactionOverview.thisMonth && transactionOverview.thisMonth.valid)">{{ transactionOverview && transactionOverview.thisMonth ? getDisplayIncomeAmount(transactionOverview.thisMonth) : '-' }}</span>
<v-skeleton-loader class="d-inline-block overview-card-skeleton" width="120px" type="text" :loading="true" v-else-if="loadingOverview && (!transactionOverview || !transactionOverview.thisMonth || !transactionOverview.thisMonth.valid)"></v-skeleton-loader> <v-skeleton-loader class="d-inline-block overview-card-skeleton" width="120px" type="text" :loading="true" v-else-if="loadingOverview && (!transactionOverview || !transactionOverview.thisMonth || !transactionOverview.thisMonth.valid)"></v-skeleton-loader>
</div> </div>
<v-btn size="small" to="/transactions?dateType=7">{{ $t('View Details') }}</v-btn> <v-btn size="small" to="/transaction/list?dateType=7">{{ $t('View Details') }}</v-btn>
<v-img class="overview-card-background" src="img/desktop/card-background.png"/> <v-img class="overview-card-background" src="img/desktop/card-background.png"/>
<v-img class="overview-card-background-image" width="116px" src="img/desktop/document.svg"/> <v-img class="overview-card-background-image" width="116px" src="img/desktop/document.svg"/>
</v-card-text> </v-card-text>
@@ -115,7 +115,7 @@
:datetime="displayDateRange.today.displayTime" :datetime="displayDateRange.today.displayTime"
> >
<template #menus> <template #menus>
<v-list-item :prepend-icon="icons.viewDetails" :to="'/transactions?dateType=' + allDateRanges.Today.type"> <v-list-item :prepend-icon="icons.viewDetails" :to="'/transaction/list?dateType=' + allDateRanges.Today.type">
<v-list-item-title>{{ $t('View Details') }}</v-list-item-title> <v-list-item-title>{{ $t('View Details') }}</v-list-item-title>
</v-list-item> </v-list-item>
</template> </template>
@@ -131,7 +131,7 @@
:datetime="displayDateRange.thisWeek.startTime + '-' + displayDateRange.thisWeek.endTime" :datetime="displayDateRange.thisWeek.startTime + '-' + displayDateRange.thisWeek.endTime"
> >
<template #menus> <template #menus>
<v-list-item :prepend-icon="icons.viewDetails" :to="'/transactions?dateType=' + allDateRanges.ThisWeek.type"> <v-list-item :prepend-icon="icons.viewDetails" :to="'/transaction/list?dateType=' + allDateRanges.ThisWeek.type">
<v-list-item-title>{{ $t('View Details') }}</v-list-item-title> <v-list-item-title>{{ $t('View Details') }}</v-list-item-title>
</v-list-item> </v-list-item>
</template> </template>
@@ -147,7 +147,7 @@
:datetime="displayDateRange.thisMonth.startTime + '-' + displayDateRange.thisMonth.endTime" :datetime="displayDateRange.thisMonth.startTime + '-' + displayDateRange.thisMonth.endTime"
> >
<template #menus> <template #menus>
<v-list-item :prepend-icon="icons.viewDetails" :to="'/transactions?dateType=' + allDateRanges.ThisMonth.type"> <v-list-item :prepend-icon="icons.viewDetails" :to="'/transaction/list?dateType=' + allDateRanges.ThisMonth.type">
<v-list-item-title>{{ $t('View Details') }}</v-list-item-title> <v-list-item-title>{{ $t('View Details') }}</v-list-item-title>
</v-list-item> </v-list-item>
</template> </template>
@@ -163,7 +163,7 @@
:datetime="displayDateRange.thisYear.displayTime" :datetime="displayDateRange.thisYear.displayTime"
> >
<template #menus> <template #menus>
<v-list-item :prepend-icon="icons.viewDetails" :to="'/transactions?dateType=' + allDateRanges.ThisYear.type"> <v-list-item :prepend-icon="icons.viewDetails" :to="'/transaction/list?dateType=' + allDateRanges.ThisYear.type">
<v-list-item-title>{{ $t('View Details') }}</v-list-item-title> <v-list-item-title>{{ $t('View Details') }}</v-list-item-title>
</v-list-item> </v-list-item>
</template> </template>
@@ -185,8 +185,8 @@
<script> <script>
import { useTheme } from 'vuetify'; import { useTheme } from 'vuetify';
import IncomeExpenseOverviewCard from './overview/IncomeExpenseOverviewCard.vue'; import IncomeExpenseOverviewCard from './overview/cards/IncomeExpenseOverviewCard.vue';
import MonthlyIncomeAndExpenseCard from './overview/MonthlyIncomeAndExpenseCard.vue'; import MonthlyIncomeAndExpenseCard from './overview/cards/MonthlyIncomeAndExpenseCard.vue';
import { mapStores } from 'pinia'; import { mapStores } from 'pinia';
import { useSettingsStore } from '@/stores/setting.js'; import { useSettingsStore } from '@/stores/setting.js';
@@ -385,8 +385,8 @@ export default {
const minTime = e.monthStartTime; const minTime = e.monthStartTime;
const maxTime = getUnixTimeBeforeUnixTime(getUnixTimeAfterUnixTime(minTime, 1, 'months'), 1, 'seconds'); const maxTime = getUnixTimeBeforeUnixTime(getUnixTimeAfterUnixTime(minTime, 1, 'months'), 1, 'seconds');
const type = e.transactionType; const type = e.transactionType;
this.$router.push(`/transactions?type=${type}&dateType=${datetimeConstants.allDateRanges.Custom.type}&maxTime=${maxTime}&minTime=${minTime}`); this.$router.push(`/transaction/list?type=${type}&dateType=${datetimeConstants.allDateRanges.Custom.type}&maxTime=${maxTime}&minTime=${minTime}`);
}, },
getDisplayCurrency(value, currencyCode) { getDisplayCurrency(value, currencyCode) {
return this.$locale.getDisplayCurrency(value, currencyCode, { return this.$locale.getDisplayCurrency(value, currencyCode, {
+4 -4
View File
@@ -27,7 +27,7 @@
</div> </div>
</li> </li>
<li class="nav-link"> <li class="nav-link">
<router-link to="/transactions?dateType=7"> <router-link to="/transaction/list?dateType=7">
<v-icon class="nav-item-icon" :icon="icons.transactions"/> <v-icon class="nav-item-icon" :icon="icons.transactions"/>
<span class="nav-item-title">{{ $t('Transaction List') }}</span> <span class="nav-item-title">{{ $t('Transaction List') }}</span>
</router-link> </router-link>
@@ -44,19 +44,19 @@
</div> </div>
</li> </li>
<li class="nav-link"> <li class="nav-link">
<router-link to="/accounts"> <router-link to="/account/list">
<v-icon class="nav-item-icon" :icon="icons.accounts"/> <v-icon class="nav-item-icon" :icon="icons.accounts"/>
<span class="nav-item-title">{{ $t('Account List') }}</span> <span class="nav-item-title">{{ $t('Account List') }}</span>
</router-link> </router-link>
</li> </li>
<li class="nav-link"> <li class="nav-link">
<router-link to="/categories"> <router-link to="/category/list">
<v-icon class="nav-item-icon" :icon="icons.categories"/> <v-icon class="nav-item-icon" :icon="icons.categories"/>
<span class="nav-item-title">{{ $t('Transaction Categories') }}</span> <span class="nav-item-title">{{ $t('Transaction Categories') }}</span>
</router-link> </router-link>
</li> </li>
<li class="nav-link"> <li class="nav-link">
<router-link to="/tags"> <router-link to="/tag/list">
<v-icon class="nav-item-icon" :icon="icons.tags"/> <v-icon class="nav-item-icon" :icon="icons.tags"/>
<span class="nav-item-title">{{ $t('Transaction Tags') }}</span> <span class="nav-item-title">{{ $t('Transaction Tags') }}</span>
</router-link> </router-link>
@@ -166,7 +166,7 @@
<div class="d-flex account-toolbar align-center"> <div class="d-flex account-toolbar align-center">
<v-btn class="px-2" density="comfortable" color="default" variant="text" <v-btn class="px-2" density="comfortable" color="default" variant="text"
:disabled="loading" :prepend-icon="icons.transactions" :disabled="loading" :prepend-icon="icons.transactions"
:to="`/transactions?accountId=${accountOrSubAccountId(element)}`"> :to="`/transaction/list?accountId=${accountOrSubAccountId(element)}`">
{{ $t('Transaction List') }} {{ $t('Transaction List') }}
</v-btn> </v-btn>
<v-btn class="hover-display px-2 ml-2" density="comfortable" color="default" variant="text" <v-btn class="hover-display px-2 ml-2" density="comfortable" color="default" variant="text"
+3 -3
View File
@@ -32,9 +32,9 @@
</template> </template>
<script> <script>
import AppBasicSettingTab from './settings/AppBasicSettingTab.vue'; import AppBasicSettingTab from './settings/tabs/AppBasicSettingTab.vue';
import AppLockSettingTab from './settings/AppLockSettingTab.vue'; import AppLockSettingTab from './settings/tabs/AppLockSettingTab.vue';
import AppStatisticsSettingTab from './settings/AppStatisticsSettingTab.vue'; import AppStatisticsSettingTab from './settings/tabs/AppStatisticsSettingTab.vue';
import { import {
mdiCogOutline, mdiCogOutline,
@@ -77,8 +77,8 @@ import { useSettingsStore } from '@/stores/setting.js';
import statisticsConstants from '@/consts/statistics.js'; import statisticsConstants from '@/consts/statistics.js';
import AccountFilterSettingsCard from '@/views/desktop/statistics/AccountFilterSettingsCard.vue'; import AccountFilterSettingsCard from '@/views/desktop/statistics/settings/cards/AccountFilterSettingsCard.vue';
import CategoryFilterSettingsCard from '@/views/desktop/statistics/CategoryFilterSettingsCard.vue'; import CategoryFilterSettingsCard from '@/views/desktop/statistics/settings/cards/CategoryFilterSettingsCard.vue';
export default { export default {
components: { components: {
@@ -186,7 +186,7 @@
</template> </template>
<script> <script>
import PresetCategoryDialog from './categories/PresetCategoryDialog.vue'; import PresetCategoryDialog from './list/dialogs/PresetCategoryDialog.vue';
import { mapStores } from 'pinia'; import { mapStores } from 'pinia';
import { useTransactionCategoriesStore } from '@/stores/transactionCategory.js'; import { useTransactionCategoriesStore } from '@/stores/transactionCategory.js';
@@ -245,8 +245,8 @@ import {
mdiDotsVertical, mdiDotsVertical,
} from '@mdi/js'; } from '@mdi/js';
import AccountFilterSettingsCard from '@/views/desktop/statistics/AccountFilterSettingsCard.vue'; import AccountFilterSettingsCard from './settings/cards/AccountFilterSettingsCard.vue';
import CategoryFilterSettingsCard from '@/views/desktop/statistics/CategoryFilterSettingsCard.vue'; import CategoryFilterSettingsCard from './settings/cards/CategoryFilterSettingsCard.vue';
export default { export default {
components: { components: {
@@ -530,7 +530,7 @@ export default {
return formatPercent(value, precision, lowPrecisionValue); return formatPercent(value, precision, lowPrecisionValue);
}, },
getItemLinkUrl(item) { getItemLinkUrl(item) {
return `/transactions?${this.statisticsStore.getTransactionListPageParams(item)}`; return `/transaction/list?${this.statisticsStore.getTransactionListPageParams(item)}`;
} }
} }
} }
@@ -880,7 +880,7 @@ export default {
return []; return [];
}, },
getFilterLinkUrl() { getFilterLinkUrl() {
return `/transactions?${this.transactionsStore.getTransactionListPageParams()}`; return `/transaction/list?${this.transactionsStore.getTransactionListPageParams()}`;
} }
} }
}; };
+4 -4
View File
@@ -40,10 +40,10 @@
</template> </template>
<script> <script>
import UserBasicSettingTab from './settings/UserBasicSettingTab.vue'; import UserBasicSettingTab from './settings/tabs/UserBasicSettingTab.vue';
import UserSecuritySettingTab from './settings/UserSecuritySettingTab.vue'; import UserSecuritySettingTab from './settings/tabs/UserSecuritySettingTab.vue';
import UserTwoFactorAuthSettingTab from './settings/UserTwoFactorAuthSettingTab.vue'; import UserTwoFactorAuthSettingTab from './settings/tabs/UserTwoFactorAuthSettingTab.vue';
import UserDataManagementSettingTab from './settings/UserDataManagementSettingTab.vue'; import UserDataManagementSettingTab from './settings/tabs/UserDataManagementSettingTab.vue';
import { import {
mdiAccountOutline, mdiAccountOutline,