Open source personal finance application
chore: refactor
ilkome2f2b5cf9eaa8
diff --git a/components/categories/Item.vue b/components/categories/Item.vueindex d9af6a8f..249c1d77 100644--- a/components/categories/Item.vue+++ b/components/categories/Item.vue@@ -1,5 +1,5 @@<script>-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'export default defineComponent({props: {diff --git a/components/categories/page/id/Index.vue b/components/categories/page/id/Index.vueindex 595f9195..0d4f239d 100644--- a/components/categories/page/id/Index.vue+++ b/components/categories/page/id/Index.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'import { getTrnsIds } from '~/components/trns/getTrns'const { $store } = useNuxtApp()diff --git a/components/chart/useChart.ts b/components/chart/useChart.tsindex 1042097a..5f3d4a47 100644--- a/components/chart/useChart.ts+++ b/components/chart/useChart.ts@@ -1,4 +1,4 @@-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'const isShowDataLabels = ref(false)diff --git a/components/date/Selector.vue b/components/date/Selector.vueindex bd473978..afa83cef 100644--- a/components/date/Selector.vue+++ b/components/date/Selector.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'import usePeriods from '~/components/periods/usePeriods'import { getMaxPeriodsToShow } from '~/components/date/helpers'import { getOldestTrnDate } from '~/components/trns/helpers'diff --git a/modules/filter/useFilter.ts b/components/filter/useFilter.tssimilarity index 100%rename from modules/filter/useFilter.tsrename to components/filter/useFilter.tsdiff --git a/components/layout/MenuBottom.vue b/components/layout/MenuBottom.vueindex 480c839a..87266c09 100644--- a/components/layout/MenuBottom.vue+++ b/components/layout/MenuBottom.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import useMenuData from '~/modules/menu/useMenuData'+import useMenuData from '~/components/menu/useMenuData'const { $store } = useNuxtApp()const { onClick, checkIsActive } = useMenuData()diff --git a/components/layout/Sidebar.vue b/components/layout/Sidebar.vueindex 65102af8..c04447ac 100644--- a/components/layout/Sidebar.vue+++ b/components/layout/Sidebar.vue@@ -1,6 +1,6 @@<script setup lang="ts">import type { WalletID } from '~/components/wallets/types'-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'const { $store } = useNuxtApp()const { setFilterWalletsId } = useFilter()diff --git a/components/layout/SidebarMenu.vue b/components/layout/SidebarMenu.vueindex 4baed51d..a256481f 100644--- a/components/layout/SidebarMenu.vue+++ b/components/layout/SidebarMenu.vue@@ -1,5 +1,5 @@<script lang="ts">-import useMenuData from '~/modules/menu/useMenuData'+import useMenuData from '~/components/menu/useMenuData'export default defineComponent({setup() {diff --git a/modules/menu/useMenuData.ts b/components/menu/useMenuData.tssimilarity index 100%rename from modules/menu/useMenuData.tsrename to components/menu/useMenuData.tsdiff --git a/components/stat/Empty.vue b/components/stat/Empty.vuedeleted file mode 100644index bd86c690..00000000--- a/components/stat/Empty.vue+++ /dev/null@@ -1,19 +0,0 @@-<script>-import useStat from '~/modules/stat/useStat'--export default defineComponent({- setup() {- const { isEmptyStat } = useStat()-- return {- isEmptyStat,- }- },-})-</script>--<template lang="pug">-.my-6.px-3.text-center(v-if="isEmptyStat")- .text-xl.text-skin-item-base {{ $t('stat.empty') }}- .text-sm.text-skin-item-base-down {{ $t('stat.emptyDesc') }}-</template>diff --git a/components/stat/View.vue b/components/stat/View.vueindex ae0853d7..cede0bdf 100644--- a/components/stat/View.vue+++ b/components/stat/View.vue@@ -1,6 +1,6 @@<script setup lang="ts">import { useWindowSize } from '@vueuse/core'-import useStat from '~/modules/stat/useStat'+import useStat from '~/components/stat/useStat'import useStatChart from '~/components/stat/useStatChart'import useStatPage from '~/components/stat/useStatPage'import useUIView from '~/components/layout/useUIView'diff --git a/components/stat/cats/PeriodCatsChartItem.vue b/components/stat/cats/PeriodCatsChartItem.vueindex e8bdd958..109888f8 100644--- a/components/stat/cats/PeriodCatsChartItem.vue+++ b/components/stat/cats/PeriodCatsChartItem.vue@@ -1,5 +1,5 @@<script lang="ts">-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'export default defineComponent({props: {diff --git a/components/stat/chart/Options.vue b/components/stat/chart/Options.vueindex 601e6065..48dc3aa6 100644--- a/components/stat/chart/Options.vue+++ b/components/stat/chart/Options.vue@@ -1,6 +1,6 @@<script setup lang="ts">import useChart from '~/components/chart/useChart'-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'import useStatChart from '~/components/stat/useStatChart'const { $store } = useNuxtApp()diff --git a/components/stat/chart/Periods.vue b/components/stat/chart/Periods.vueindex 1a893821..12725732 100644--- a/components/stat/chart/Periods.vue+++ b/components/stat/chart/Periods.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'import usePeriods from '~/components/periods/usePeriods'import { getMaxPeriodsToShow } from '~/components/date/helpers'import { getOldestTrnDate } from '~/components/trns/helpers'diff --git a/components/stat/chart/View.vue b/components/stat/chart/View.vueindex 97282aa9..3a762ec4 100644--- a/components/stat/chart/View.vue+++ b/components/stat/chart/View.vue@@ -4,9 +4,9 @@ import { getTrnsIds } from '~/components/trns/getTrns'import { getTotal } from '~/components/amount/getTotal'import { getCategoriesIds, getTransferCategoriesIds } from '~/components/categories/getCategories'import { formatAmount, getCurrencySymbol } from '~/components/amount/formatAmount'-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'import useChart from '~/components/chart/useChart'-import chartOptions from '~/components/stat/chart/chartOptions'+import chartConfig from '~/components/stat/chart/chartConfig'export default defineComponent({components: { Chart },@@ -217,7 +217,7 @@ export default defineComponent({let tooltip = { enabled: false }if (this.$store.state.ui.pc) {tooltip = {- ...chartOptions.tooltip,+ ...chartConfig.tooltip,formatter() {return this.points.reduce((s, point) => {return `${s}<br/>${point.series.name}: ${formatAmount(point.y, baseCurrencyCode)} ${getCurrencySymbol(baseCurrencyCode)}`@@ -250,33 +250,33 @@ export default defineComponent({}return {- ...chartOptions,+ ...chartConfig,legend: false,tooltip,series: data.series,xAxis: {- ...chartOptions.xAxis,+ ...chartConfig.xAxis,categories: data.categories,},yAxis: {- ...chartOptions.yAxis,+ ...chartConfig.yAxis,plotLines,},chart: {- ...chartOptions.chart,+ ...chartConfig.chart,height: '180',},plotOptions: {- ...chartOptions.plotOptions,+ ...chartConfig.plotOptions,series: {- ...chartOptions.plotOptions.series,+ ...chartConfig.plotOptions.series,dataLabels: {- ...chartOptions.plotOptions.series.dataLabels,+ ...chartConfig.plotOptions.series.dataLabels,enabled: this.isShowDataLabels,formatter() {return formatAmount(this.y, baseCurrencyCode)diff --git a/components/stat/chart/Wrap.vue b/components/stat/chart/Wrap.vueindex 0077514e..1a7a6838 100644--- a/components/stat/chart/Wrap.vue+++ b/components/stat/chart/Wrap.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'import useStatChart from '~/components/stat/useStatChart'const { $store } = useNuxtApp()diff --git a/components/stat/chart/chartOptions.js b/components/stat/chart/chartConfig.jssimilarity index 100%rename from components/stat/chart/chartOptions.jsrename to components/stat/chart/chartConfig.jsdiff --git a/components/stat/group/Horizontal.vue b/components/stat/group/Horizontal.vueindex aeec31d3..fc165634 100644--- a/components/stat/group/Horizontal.vue+++ b/components/stat/group/Horizontal.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import useStat from '~/modules/stat/useStat'+import useStat from '~/components/stat/useStat'import useStatPage from '~/components/stat/useStatPage'import useUIView from '~/components/layout/useUIView'diff --git a/components/stat/group/HorizontalItem.vue b/components/stat/group/HorizontalItem.vueindex aa0e172c..0957cefc 100644--- a/components/stat/group/HorizontalItem.vue+++ b/components/stat/group/HorizontalItem.vue@@ -1,6 +1,6 @@<script setup lang="ts">import type { CategoryID, CategoryItem } from '~/components/categories/types'-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'import type { TrnType } from '~/components/trns/types'import useStatPage from '~/components/stat/useStatPage'diff --git a/components/stat/group/HorizontalItemCatItem.vue b/components/stat/group/HorizontalItemCatItem.vueindex a8247f74..3de38c8f 100644--- a/components/stat/group/HorizontalItemCatItem.vue+++ b/components/stat/group/HorizontalItemCatItem.vue@@ -1,6 +1,6 @@<script setup lang="ts">import type { CategoryID, CategoryItem } from '~/components/categories/types'-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'import type { TrnType } from '~/components/trns/types'import useStatPage from '~/components/stat/useStatPage'diff --git a/components/stat/group/PieChart.vue b/components/stat/group/PieChart.vueindex b297ccb1..f73faeea 100644--- a/components/stat/group/PieChart.vue+++ b/components/stat/group/PieChart.vue@@ -1,6 +1,6 @@<script>import { Chart } from 'highcharts-vue'-import chartOptions from '~/components/stat/chart/chartOptions'+import chartConfig from '~/components/stat/chart/chartConfig'export default {components: { Chart },@@ -35,11 +35,11 @@ export default {}]return {- ...chartOptions,+ ...chartConfig,series,chart: {- ...chartOptions.chart,+ ...chartConfig.chart,spacing: [0, 0, 0, 0],height: '280',@@ -53,9 +53,9 @@ export default {},plotOptions: {- ...chartOptions.plotOptions,+ ...chartConfig.plotOptions,series: {- ...chartOptions.plotOptions.series,+ ...chartConfig.plotOptions.series,cursor: 'pointer',point: {events: {diff --git a/components/stat/group/Round.vue b/components/stat/group/Round.vueindex 30e20b7a..42d0bf55 100644--- a/components/stat/group/Round.vue+++ b/components/stat/group/Round.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import useStat from '~/modules/stat/useStat'+import useStat from '~/components/stat/useStat'import useStatPage from '~/components/stat/useStatPage'import useUIView from '~/components/layout/useUIView'diff --git a/components/stat/group/RoundItem.vue b/components/stat/group/RoundItem.vueindex f604a5f2..125c7e0a 100644--- a/components/stat/group/RoundItem.vue+++ b/components/stat/group/RoundItem.vue@@ -1,5 +1,5 @@<script lang="ts">-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'export default {props: {diff --git a/components/stat/sum/Group.vue b/components/stat/sum/Group.vueindex 736599cb..72caaef9 100644--- a/components/stat/sum/Group.vue+++ b/components/stat/sum/Group.vue@@ -1,6 +1,6 @@<script setup lang="ts">import useStatPage from '~/components/stat/useStatPage'-import useStat from '~/modules/stat/useStat'+import useStat from '~/components/stat/useStat'const props = defineProps<{typeText: 'income' | 'expense'diff --git a/components/stat/useStat.ts b/components/stat/useStat.tsnew file mode 100644index 00000000..7b136e24--- /dev/null+++ b/components/stat/useStat.ts@@ -0,0 +1,13 @@+const moneyTypes = [{+ id: 'expense',+ type: 0,+}, {+ id: 'income',+ type: 1,+}]++export default function useStat() {+ return {+ moneyTypes,+ }+}diff --git a/components/stat/useStatPage.ts b/components/stat/useStatPage.tsindex 79b6d22e..73aaa1c0 100644--- a/components/stat/useStatPage.ts+++ b/components/stat/useStatPage.ts@@ -26,10 +26,6 @@ export default function useStatPage() {idx: 3,id: 'trns',name: i18n.t('trns.shortTitle'),- }, {- idx: 4,- id: 'history',- name: i18n.t('trns.history'),}])return {diff --git a/components/trns/List.vue b/components/trns/List.vueindex cd9dc31f..885279dd 100644--- a/components/trns/List.vue+++ b/components/trns/List.vue@@ -2,7 +2,7 @@import dayjs from 'dayjs'import type { TrnID } from '~/components/trns/types'import useCalculator from '~/components/trnForm/calculator/useCalculator'-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'const props = withDefaults(defineProps<{limit: numberdiff --git a/components/trns/item/Base.vue b/components/trns/item/Base.vueindex 79edec4d..613c2adf 100644--- a/components/trns/item/Base.vue+++ b/components/trns/item/Base.vue@@ -1,7 +1,7 @@<script setup lang="ts">import type { TrnID } from '~/components/trns/types'import useCalculator from '~/components/trnForm/calculator/useCalculator'-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'import useTrn from '~/components/trns/item/useTrn'const props = defineProps<{diff --git a/components/trns/item/Modal.vue b/components/trns/item/Modal.vueindex 7518de9b..96c43afc 100644--- a/components/trns/item/Modal.vue+++ b/components/trns/item/Modal.vue@@ -1,5 +1,5 @@<script lang="ts">-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'import useCalculator from '~/components/trnForm/calculator/useCalculator'import useTrn from '~/components/trns/item/useTrn'diff --git a/components/wallets/page/id/Index.vue b/components/wallets/page/id/Index.vueindex 81b5a452..ccbf8d71 100644--- a/components/wallets/page/id/Index.vue+++ b/components/wallets/page/id/Index.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import useFilter from '~/modules/filter/useFilter'+import useFilter from '~/components/filter/useFilter'import { getTrnsIds } from '~/components/trns/getTrns'const { $store } = useNuxtApp()diff --git a/modules/stat/useStat.ts b/modules/stat/useStat.tsdeleted file mode 100644index d6c1b9d0..00000000--- a/modules/stat/useStat.ts+++ /dev/null@@ -1,26 +0,0 @@-const moneyTypes = [{- id: 'expense',- type: 0,-}, {- id: 'income',- type: 1,-}]--export default function useStat() {- const { $store } = useNuxtApp()-- const isEmptyStat = computed(() => {- const statCurrentPeriod = $store.getters['stat/statCurrentPeriod']- if ($store.state.ui.activeTabStat === 'details')- return statCurrentPeriod.total === 0- else if ($store.state.ui.activeTabStat === 'income')- return statCurrentPeriod.income.total === 0- else if ($store.state.ui.activeTabStat === 'expense')- return statCurrentPeriod.expense.total === 0- })-- return {- moneyTypes,- isEmptyStat,- }-}diff --git a/nuxt.config.js b/nuxt.config.jsindex 22c00dc0..d17a1c79 100644--- a/nuxt.config.js+++ b/nuxt.config.js@@ -48,14 +48,7 @@ export default defineNuxtConfig({stylus: ['~/assets/stylus/variables'],},- components: [{- path: '~/components/',- extensions: ['vue'],- }, {- path: '~/modules/',- extensions: ['vue'],- }],-+ components: true,loading: false,plugins: [diff --git a/pages/wallets/total.vue b/pages/wallets/total.vueindex 64d8319e..e78aca26 100644--- a/pages/wallets/total.vue+++ b/pages/wallets/total.vue@@ -120,7 +120,7 @@ const seriesTotal = computed(() => {/*** Chart options*/-const chartOptions = computed(() => ({+const chartConfig = computed(() => ({xAxis: {type: 'category',data: series.value.map(period => dayjs(period.date).format('DD MMMM')),@@ -178,7 +178,7 @@ const chartOptions = computed(() => ({/*** Chart data*/-const chartData = computed(() => _merge(JSON.parse(JSON.stringify(options)), chartOptions.value))+const chartData = computed(() => _merge(JSON.parse(JSON.stringify(options)), chartConfig.value))</script><template lang="pug">diff --git a/tailwind.config.js b/tailwind.config.jsindex 40423bdf..ec122bff 100644--- a/tailwind.config.js+++ b/tailwind.config.js@@ -7,7 +7,6 @@ module.exports = {content: ['./components/**/*.{js,ts,vue}','./layouts/**/*.{js,ts,vue}',- './modules/**/*.{js,ts,vue}','./pages/**/*.{js,ts,vue}',],