Open source personal finance application
chore: refactor
ilkome74dbeb220fbc
diff --git a/components/base/BottomSheetHandler.vue b/components/base/BottomSheetHandler.vueindex bfc0b29e..0d30ef67 100644--- a/components/base/BottomSheetHandler.vue+++ b/components/base/BottomSheetHandler.vue@@ -1,7 +1,3 @@-<script>-export default {}-</script>-<template lang="pug">.handler</template>@@ -26,4 +22,3 @@ export default {}background var(--c-bg-8)border-radius 4px</style>-</style>diff --git a/components/currencies/List.vue b/components/currencies/List.vueindex 2b1f173c..14b9034c 100644--- a/components/currencies/List.vue+++ b/components/currencies/List.vue@@ -1,15 +1,15 @@<script setup lang="ts">import { currencies } from '~/components/currencies/currencies'import useWallets from '~/components/wallets/useWallets'-const { walletsCurrencies } = useWallets()const props = defineProps<{active: string}>()-const { active } = toRefs(props)-const emit = defineEmits(['onSelect'])+const { walletsCurrencies } = useWallets()+const { active } = toRefs(props)+const searchInput = ref('')const list = computed(() => {if (searchInput.value) {diff --git a/store/categories/getters.js b/store/categories/getters.jsindex f236e93b..c616a58b 100644--- a/store/categories/getters.js+++ b/store/categories/getters.js@@ -9,18 +9,22 @@ export default {},categoriesIds(state, getters) {- if (!getters.hasCategories) return []+ if (!getters.hasCategories)+ return []return Object.keys(state.items)},categoriesRootIds(state, getters) {- if (!getters.hasCategories) return []+ if (!getters.hasCategories)+ return []return Object.keys(state.items).filter(id => state.items[id].parentId === 0).sort((a, b) => {- if (state.items[a].order < state.items[b].order) return -1- if (state.items[a].order > state.items[b].order) return 1+ if (state.items[a].order < state.items[b].order)+ return -1+ if (state.items[a].order > state.items[b].order)+ return 1return 0})},@@ -39,7 +43,8 @@ export default {break}}- if (!hasTrnsIn && categoryId !== 'transfer' && categories[categoryId].name.toLowerCase() !== 'перевод' && categories[categoryId].name.toLowerCase() !== 'trnasfer')+ // TODO: use new getTransferCatgoriesIds+ if (!hasTrnsIn && categoryId !== 'transfer' && categories[categoryId].name.toLowerCase() !== 'перевод' && categories[categoryId].name.toLowerCase() !== 'transfer')categoriesForBeParent.push(categoryId)}@@ -47,25 +52,30 @@ export default {},isCategoryHasChildren: (state, getters) => (categoryId) => {- if (!getters.hasCategories) return []+ if (!getters.hasCategories)+ return []return state.items[categoryId].childIds?.length > 0},getChildCategoriesIds: (state, getters) => (categoryId) => {- if (!getters.hasCategories) return []+ if (!getters.hasCategories)+ return []const category = state.items[categoryId]return category?.childIds || []},lastUsedCategoriesIdsByDate(state, getters, rootState, rootGetters) {- if (!getters.hasCategories) return []+ if (!getters.hasCategories)+ return []const trnsItems = rootState.trns.itemsconst trnsIds = Object.keys(trnsItems).filter(trnId => trnsItems[trnId].type !== 2).sort((a, b) => {- if (trnsItems[a].date > trnsItems[b].date) return -1- if (trnsItems[a].date < trnsItems[b].date) return 1+ if (trnsItems[a].date > trnsItems[b].date)+ return -1+ if (trnsItems[a].date < trnsItems[b].date)+ return 1return 0})@@ -88,8 +98,10 @@ export default {return lastCategoriesIds.sort((a, b) => {if (state.items[a] && state.items[b]) {- if (state.items[a].name < state.items[b].name) return -1- if (state.items[a].name > state.items[b].name) return 1+ if (state.items[a].name < state.items[b].name)+ return -1+ if (state.items[a].name > state.items[b].name)+ return 1}return 0})@@ -97,21 +109,26 @@ export default {},quickSelectorCategoriesIds(state, getters) {- if (!getters.hasCategories) return []+ if (!getters.hasCategories)+ return []return Object.keys(state.items).filter(key => state.items[key].showInQuickSelector).sort((a, b) => {- if (state.items[a].name < state.items[b].name) return -1- if (state.items[a].name > state.items[b].name) return 1+ if (state.items[a].name < state.items[b].name)+ return -1+ if (state.items[a].name > state.items[b].name)+ return 1return 0})},transferCategoryId(state, getters) {- if (!getters.hasCategories) return null+ if (!getters.hasCategories)+ return null+ // TODO: use new getTransferCatgoriesIdsreturn Object.keys(state.items)- .find(id => state.items[id].name === 'Перевод' || state.items[id].name === 'Transfer') || state.items.transfer || false+ .find(id => state.items[id].name === 'Перевод' || state.items[id].name === 'Transfer') || state.items.transfer},}diff --git a/store/chart/actions.js b/store/chart/actions.jsindex 56fd3423..95281b9d 100644--- a/store/chart/actions.js+++ b/store/chart/actions.js@@ -5,21 +5,23 @@ export default {const localPeriods = await localforage.getItem('finapp.chart.periods')let showedPeriods- if (!localPeriods) return+ if (!localPeriods)+ returnfor (const periodName in localPeriods) {- if (!localPeriods[periodName]) return-- Number.isInteger(localPeriods[periodName].showedPeriods)- ? showedPeriods = localPeriods[periodName].showedPeriods- : showedPeriods = rootState.chart.periods[periodName].showedPeriods+ showedPeriods = Number.isInteger(localPeriods[periodName].showedPeriods)+ ? localPeriods[periodName].showedPeriods+ : rootState.chart.periods[periodName].showedPeriodsconst periodValues = {...localPeriods[periodName],showedPeriods,}- commit('chart/setPeriodValues', { periodName, values: periodValues }, { root: true })+ commit('chart/setPeriodValues', {+ periodName,+ values: periodValues,+ }, { root: true })}},}diff --git a/store/chart/mutations.js b/store/chart/mutations.jsindex 6f0e7404..d576c78a 100644--- a/store/chart/mutations.js+++ b/store/chart/mutations.js@@ -21,14 +21,4 @@ export default {setElementsToChart(state, { period, value }) {state.periods[period].showedPeriods = value},-- setHoveredPeriodValues(state, { values, offset }) {- if (values) state.hoveredPeriod.values = values- if (offset) state.hoveredPeriod.offset = offset- },-- clearHoveredPeriodValues(state) {- state.hoveredPeriod.values = null- state.hoveredPeriod.offset = null- },}diff --git a/store/trns/getters.js b/store/trns/getters.jsindex ca87206b..07cc7a75 100644--- a/store/trns/getters.js+++ b/store/trns/getters.js@@ -22,7 +22,7 @@ export default {* @return {String} return.incomes* @return {String} return.total*/- getTotalOfTrnsIds: (_state, _getters, rootState) => (trnsIds, inculdeTrnasfers = false, isConvertToBase = true, walletId) => {+ getTotalOfTrnsIds: (_state, _getters, rootState) => (trnsIds, inculdeTransfers = false, isConvertToBase = true, walletId) => {const trnsItems = rootState.trns.itemsconst rates = rootState.currencies.ratesconst walletsItems = rootState.wallets.items@@ -51,7 +51,7 @@ export default {total: total.sumTransactions + total.sumTransfers,}}- else if (inculdeTrnasfers && isConvertToBase) {+ else if (inculdeTransfers && isConvertToBase) {total = getTotal({baseRate,rates,@@ -71,7 +71,7 @@ export default {total: total.sumTransactions + total.sumTransfers,}}- else if (inculdeTrnasfers && !isConvertToBase) {+ else if (inculdeTransfers && !isConvertToBase) {total = getTotal({transferCategoriesIds,trnsIds,@@ -90,7 +90,7 @@ export default {total: total.sumTransactions + total.sumTransfers,}}- else if (!inculdeTrnasfers) {+ else if (!inculdeTransfers) {total = getTotal({baseRate,rates,