diff --git a/src/DesktopApp.vue b/src/DesktopApp.vue index f2880ebb..96b4aa8d 100644 --- a/src/DesktopApp.vue +++ b/src/DesktopApp.vue @@ -54,6 +54,8 @@ export default { let localeDefaultSettings = self.$locale.initLocale(self.userStore.currentUserLanguage, self.settingsStore.appSettings.timeZone); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + setExpenseAndIncomeAmountColor(self.userStore.currentUserExpenseAmountColor, self.userStore.currentUserIncomeAmountColor); + if (self.$user.isUserLogined()) { if (!self.settingsStore.appSettings.applicationLock) { // refresh token if user is logined diff --git a/src/MobileApp.vue b/src/MobileApp.vue index 17f35312..d1df2df7 100644 --- a/src/MobileApp.vue +++ b/src/MobileApp.vue @@ -102,6 +102,8 @@ export default { let localeDefaultSettings = self.$locale.initLocale(self.userStore.currentUserLanguage, self.settingsStore.appSettings.timeZone); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + setExpenseAndIncomeAmountColor(self.userStore.currentUserExpenseAmountColor, self.userStore.currentUserIncomeAmountColor); + if (self.$user.isUserLogined()) { if (!self.settingsStore.appSettings.applicationLock) { // refresh token if user is logined diff --git a/src/views/desktop/LoginPage.vue b/src/views/desktop/LoginPage.vue index 14293556..a1316fcb 100644 --- a/src/views/desktop/LoginPage.vue +++ b/src/views/desktop/LoginPage.vue @@ -186,6 +186,7 @@ import { isUserForgetPasswordEnabled, isUserVerifyEmailEnabled } from '@/lib/server_settings.js'; +import { setExpenseAndIncomeAmountColor } from '@/lib/ui.js'; import { mdiEyeOutline, @@ -309,6 +310,8 @@ export default { if (authResponse.user) { const localeDefaultSettings = self.$locale.setLanguage(authResponse.user.language); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + + setExpenseAndIncomeAmountColor(authResponse.user.expenseAmountColor, authResponse.user.incomeAmountColor); } if (self.settingsStore.appSettings.autoUpdateExchangeRatesData) { @@ -356,6 +359,8 @@ export default { if (authResponse.user) { const localeDefaultSettings = self.$locale.setLanguage(authResponse.user.language); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + + setExpenseAndIncomeAmountColor(authResponse.user.expenseAmountColor, authResponse.user.incomeAmountColor); } if (self.settingsStore.appSettings.autoUpdateExchangeRatesData) { diff --git a/src/views/desktop/MainLayout.vue b/src/views/desktop/MainLayout.vue index cc9fadfe..dee7f619 100644 --- a/src/views/desktop/MainLayout.vue +++ b/src/views/desktop/MainLayout.vue @@ -187,7 +187,7 @@ import { useSettingsStore } from '@/stores/setting.js'; import { useUserStore } from '@/stores/user.js'; import assetConstants from '@/consts/asset.js'; -import { getSystemTheme } from '@/lib/ui.js'; +import { getSystemTheme, setExpenseAndIncomeAmountColor } from '@/lib/ui.js'; import { mdiMenu, @@ -306,6 +306,8 @@ export default { const localeDefaultSettings = self.$locale.initLocale(self.userStore.currentUserLanguage, self.settingsStore.appSettings.timeZone); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + setExpenseAndIncomeAmountColor(self.userStore.currentUserExpenseAmountColor, self.userStore.currentUserIncomeAmountColor); + this.$router.replace('/login'); }).catch(error => { self.logouting = false; diff --git a/src/views/desktop/SignupPage.vue b/src/views/desktop/SignupPage.vue index 6d28f25f..8bdbdb32 100644 --- a/src/views/desktop/SignupPage.vue +++ b/src/views/desktop/SignupPage.vue @@ -256,6 +256,7 @@ import { useExchangeRatesStore } from '@/stores/exchangeRates.js'; import assetConstants from '@/consts/asset.js'; import categoryConstants from '@/consts/category.js'; import { categorizedArrayToPlainArray } from '@/lib/common.js'; +import { setExpenseAndIncomeAmountColor } from '@/lib/ui.js'; import { mdiArrowLeft, @@ -469,6 +470,8 @@ export default { if (response.user) { const localeDefaultSettings = self.$locale.setLanguage(response.user.language); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + + setExpenseAndIncomeAmountColor(response.user.expenseAmountColor, response.user.incomeAmountColor); } if (self.settingsStore.appSettings.autoUpdateExchangeRatesData) { diff --git a/src/views/desktop/UnlockPage.vue b/src/views/desktop/UnlockPage.vue index d98cb238..70ad3231 100644 --- a/src/views/desktop/UnlockPage.vue +++ b/src/views/desktop/UnlockPage.vue @@ -119,6 +119,7 @@ import { useExchangeRatesStore } from '@/stores/exchangeRates.js'; import assetConstants from '@/consts/asset.js'; import logger from '@/lib/logger.js'; import webauthn from '@/lib/webauthn.js'; +import { setExpenseAndIncomeAmountColor } from '@/lib/ui.js'; export default { data() { @@ -184,6 +185,8 @@ export default { if (response.user) { const localeDefaultSettings = self.$locale.setLanguage(response.user.language); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + + setExpenseAndIncomeAmountColor(response.user.expenseAmountColor, response.user.incomeAmountColor); } }); @@ -227,6 +230,8 @@ export default { if (response.user) { const localeDefaultSettings = self.$locale.setLanguage(response.user.language); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + + setExpenseAndIncomeAmountColor(response.user.expenseAmountColor, response.user.incomeAmountColor); } }); @@ -250,6 +255,8 @@ export default { const localeDefaultSettings = self.$locale.initLocale(self.userStore.currentUserLanguage, self.settingsStore.appSettings.timeZone); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + setExpenseAndIncomeAmountColor(self.userStore.currentUserExpenseAmountColor, self.userStore.currentUserIncomeAmountColor); + self.$router.replace('/login'); }); }, diff --git a/src/views/mobile/LoginPage.vue b/src/views/mobile/LoginPage.vue index 8d0bd535..a3bbe0d1 100644 --- a/src/views/mobile/LoginPage.vue +++ b/src/views/mobile/LoginPage.vue @@ -190,6 +190,7 @@ import { isUserVerifyEmailEnabled } from '@/lib/server_settings.js'; import { getDesktopVersionPath } from '@/lib/version.js'; +import { setExpenseAndIncomeAmountColor } from '@/lib/ui.js'; import { isModalShowing } from '@/lib/ui.mobile.js'; export default { @@ -306,6 +307,8 @@ export default { if (authResponse.user) { const localeDefaultSettings = self.$locale.setLanguage(authResponse.user.language); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + + setExpenseAndIncomeAmountColor(authResponse.user.expenseAmountColor, authResponse.user.incomeAmountColor); } if (self.settingsStore.appSettings.autoUpdateExchangeRatesData) { @@ -367,6 +370,8 @@ export default { if (authResponse.user) { const localeDefaultSettings = self.$locale.setLanguage(authResponse.user.language); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + + setExpenseAndIncomeAmountColor(authResponse.user.expenseAmountColor, authResponse.user.incomeAmountColor); } if (self.settingsStore.appSettings.autoUpdateExchangeRatesData) { diff --git a/src/views/mobile/SettingsPage.vue b/src/views/mobile/SettingsPage.vue index 7c2cb9c9..6ed7f927 100644 --- a/src/views/mobile/SettingsPage.vue +++ b/src/views/mobile/SettingsPage.vue @@ -79,6 +79,7 @@ import { useStatisticsStore } from '@/stores/statistics.js'; import { useExchangeRatesStore } from '@/stores/exchangeRates.js'; import { getDesktopVersionPath } from '@/lib/version.js'; +import { setExpenseAndIncomeAmountColor } from '@/lib/ui.js'; export default { props: [ @@ -185,6 +186,8 @@ export default { const localeDefaultSettings = self.$locale.initLocale(self.userStore.currentUserLanguage, self.settingsStore.appSettings.timeZone); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + setExpenseAndIncomeAmountColor(self.userStore.currentUserExpenseAmountColor, self.userStore.currentUserIncomeAmountColor); + router.navigate('/'); }).catch(error => { self.logouting = false; diff --git a/src/views/mobile/SignupPage.vue b/src/views/mobile/SignupPage.vue index 3f079c2d..acecbcc0 100644 --- a/src/views/mobile/SignupPage.vue +++ b/src/views/mobile/SignupPage.vue @@ -183,6 +183,7 @@ import { useExchangeRatesStore } from '@/stores/exchangeRates.js'; import categoryConstants from '@/consts/category.js'; import { getNameByKeyValue, categorizedArrayToPlainArray } from '@/lib/common.js'; +import { setExpenseAndIncomeAmountColor } from '@/lib/ui.js'; export default { props: [ @@ -324,6 +325,8 @@ export default { if (response.user) { const localeDefaultSettings = self.$locale.setLanguage(response.user.language); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + + setExpenseAndIncomeAmountColor(response.user.expenseAmountColor, response.user.incomeAmountColor); } if (self.settingsStore.appSettings.autoUpdateExchangeRatesData) { diff --git a/src/views/mobile/UnlockPage.vue b/src/views/mobile/UnlockPage.vue index e8cf4e82..7c97c004 100644 --- a/src/views/mobile/UnlockPage.vue +++ b/src/views/mobile/UnlockPage.vue @@ -75,6 +75,7 @@ import { useExchangeRatesStore } from '@/stores/exchangeRates.js'; import assetConstants from '@/consts/asset.js'; import logger from '@/lib/logger.js'; import webauthn from '@/lib/webauthn.js'; +import { setExpenseAndIncomeAmountColor } from '@/lib/ui.js'; import { isModalShowing } from '@/lib/ui.mobile.js'; export default { @@ -137,6 +138,8 @@ export default { if (response.user) { const localeDefaultSettings = self.$locale.setLanguage(response.user.language); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + + setExpenseAndIncomeAmountColor(response.user.expenseAmountColor, response.user.incomeAmountColor); } }); @@ -185,6 +188,8 @@ export default { if (response.user) { const localeDefaultSettings = self.$locale.setLanguage(response.user.language); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + + setExpenseAndIncomeAmountColor(response.user.expenseAmountColor, response.user.incomeAmountColor); } }); @@ -209,6 +214,8 @@ export default { const localeDefaultSettings = self.$locale.initLocale(self.userStore.currentUserLanguage, self.settingsStore.appSettings.timeZone); self.settingsStore.updateLocalizedDefaultSettings(localeDefaultSettings); + setExpenseAndIncomeAmountColor(self.userStore.currentUserExpenseAmountColor, self.userStore.currentUserIncomeAmountColor); + router.navigate('/login', { clearPreviousHistory: true });