mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-16 07:57:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
MaysWind
2023-06-21 23:04:05 +08:00
parent 4036a71ee1
commit 1aff09598a
9 changed files with 280 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/mobile/LoginPage.vue
+8 -4
View File
@@ -111,6 +111,7 @@
<script>
import { mapStores } from 'pinia';
import { useRootStore } from '@/stores/index.js';
import { useSettingsStore } from '@/stores/setting.js';
import { useExchangeRatesStore } from '@/stores/exchangeRates.js';
import { isModalShowing } from '@/lib/ui.mobile.js';
@@ -133,7 +134,7 @@ export default {
};
},
computed: {
...mapStores(useRootStore, useExchangeRatesStore),
...mapStores(useRootStore, useSettingsStore, useExchangeRatesStore),
version() {
return 'v' + this.$version;
},
@@ -208,7 +209,8 @@ export default {
}
if (authResponse.user && authResponse.user.language) {
self.$locale.setLanguage(authResponse.user.language);
const localeDefaultSettings = self.$locale.setLanguage(authResponse.user.language);
self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
}
if (self.$settings.isAutoUpdateExchangeRatesData()) {
@@ -260,7 +262,8 @@ export default {
self.$hideLoading();
if (authResponse.user && authResponse.user.language) {
self.$locale.setLanguage(authResponse.user.language);
const localeDefaultSettings = self.$locale.setLanguage(authResponse.user.language);
self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
}
if (self.$settings.isAutoUpdateExchangeRatesData()) {
@@ -286,7 +289,8 @@ export default {
}
},
changeLanguage(locale) {
this.$locale.setLanguage(locale);
const localeDefaultSettings = this.$locale.setLanguage(locale);
this.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
}
}
};
src/views/mobile/SettingsPage.vue
+5 -2
View File
@@ -100,6 +100,7 @@
<script>
import { mapStores } from 'pinia';
import { useRootStore } from '@/stores/index.js';
import { useSettingsStore } from '@/stores/setting.js';
import { useUserStore } from '@/stores/user.js';
import { useExchangeRatesStore } from '@/stores/exchangeRates.js';
@@ -119,7 +120,7 @@ export default {
};
},
computed: {
...mapStores(useRootStore, useUserStore, useExchangeRatesStore),
...mapStores(useRootStore, useSettingsStore, useUserStore, useExchangeRatesStore),
version() {
return 'v' + this.$version;
},
@@ -241,7 +242,9 @@ export default {
self.$hideLoading();
self.$settings.clearSettings();
self.$locale.initLocale();
const localeDefaultSettings = self.$locale.initLocale(self.userStore.currentUserLanguage);
self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
router.navigate('/');
}).catch(error => {
src/views/mobile/SignupPage.vue
+5 -2
View File
@@ -235,7 +235,9 @@ export default {
const isFirstWeekDayDefault = this.user.firstDayOfWeek === (datetimeConstants.allWeekDays[this.$t('default.firstDayOfWeek')] ? datetimeConstants.allWeekDays[this.$t('default.firstDayOfWeek')].type : 0);
this.user.language = value;
this.$locale.setLanguage(value);
const localeDefaultSettings = this.$locale.setLanguage(value);
this.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
if (isCurrencyDefault) {
this.user.defaultCurrency = this.settingsStore.defaultSetting.currency;
@@ -354,7 +356,8 @@ export default {
}
if (response.user && response.user.language) {
self.$locale.setLanguage(response.user.language);
const localeDefaultSettings = self.$locale.setLanguage(response.user.language);
self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
}
if (self.$settings.isAutoUpdateExchangeRatesData()) {
src/views/mobile/UnlockPage.vue
+11 -5
View File
@@ -59,6 +59,7 @@
<script>
import { mapStores } from 'pinia';
import { useRootStore } from '@/stores/index.js';
import { useSettingsStore } from '@/stores/setting.js';
import { useUserStore } from '@/stores/user.js';
import { useTokensStore } from '@/stores/token.js';
import { useExchangeRatesStore } from '@/stores/exchangeRates.js';
@@ -77,7 +78,7 @@ export default {
}
},
computed: {
...mapStores(useRootStore, useUserStore, useTokensStore, useExchangeRatesStore),
...mapStores(useRootStore, useSettingsStore, useUserStore, useTokensStore, useExchangeRatesStore),
version() {
return 'v' + this.$version;
},
@@ -126,7 +127,8 @@ export default {
self.$user.unlockTokenByWebAuthn(id, userName, userSecret);
self.tokensStore.refreshTokenAndRevokeOldToken().then(response => {
if (response.user && response.user.language) {
self.$locale.setLanguage(response.user.language);
const localeDefaultSettings = self.$locale.setLanguage(response.user.language);
self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
}
});
@@ -173,7 +175,8 @@ export default {
self.$user.unlockTokenByPinCode(user.username, pinCode);
self.tokensStore.refreshTokenAndRevokeOldToken().then(response => {
if (response.user && response.user.language) {
self.$locale.setLanguage(response.user.language);
const localeDefaultSettings = self.$locale.setLanguage(response.user.language);
self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
}
});
@@ -194,7 +197,9 @@ export default {
self.$confirm('Are you sure you want to re-login?', () => {
self.rootStore.forceLogout();
self.$settings.clearSettings();
self.$locale.initLocale();
const localeDefaultSettings = self.$locale.initLocale(self.userStore.currentUserLanguage);
self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
router.navigate('/login', {
clearPreviousHistory: true
@@ -205,7 +210,8 @@ export default {
return pinCode && pinCode.length === 6;
},
changeLanguage(locale) {
this.$locale.setLanguage(locale);
const localeDefaultSettings = this.$locale.setLanguage(locale);
this.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
}
}
}
src/views/mobile/users/UserProfilePage.vue
+5 -2
View File
@@ -222,6 +222,7 @@
<script>
import { mapStores } from 'pinia';
import { useRootStore } from '@/stores/index.js';
import { useSettingsStore } from '@/stores/setting.js';
import { useUserStore } from '@/stores/user.js';
import { useAccountsStore } from '@/stores/account.js';
@@ -272,7 +273,7 @@ export default {
};
},
computed: {
...mapStores(useRootStore, useUserStore, useAccountsStore),
...mapStores(useRootStore, useSettingsStore, useUserStore, useAccountsStore),
allLanguages() {
const ret = [];
const allLanguageInfo = this.$locale.getAllLanguageInfos();
@@ -480,7 +481,9 @@ export default {
if (response.user) {
self.setCurrentUserProfile(response.user);
self.$locale.setLanguage(response.user.language);
const localeDefaultSettings = self.$locale.setLanguage(response.user.language);
self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings);
}
self.$toast('Your profile has been successfully updated');