Skip to content

Open source personal finance application

feat (stat & ui): fixes

ilkome11ecd2d42c8f
diff --git a/assets/stylus/variables/colors-light.styl b/assets/stylus/variables/colors-light.styl
index ffb855a0..939e75e1 100644
--- a/assets/stylus/variables/colors-light.styl
+++ b/assets/stylus/variables/colors-light.styl
@@ -47,3 +47,5 @@ html
--color-bg-canvas #fff
--color-text-link #0366d6
--color-link-bg #eaeaea
+
+ --color-item-bg #f5f5f5
diff --git a/components/chart/MobileStatLines.vue b/components/chart/MobileStatLines.vue
index e26cff67..03762b0c 100644
--- a/components/chart/MobileStatLines.vue
+++ b/components/chart/MobileStatLines.vue
@@ -1,20 +1,15 @@
<script>
import { computed, useContext } from '@nuxtjs/composition-api'
import useFilter from '~/modules/filter/useFilter'
+import useStat from '~/modules/stat/useStat'
export default {
name: 'ChartMobileStatLines',
- props: {
- isEmptyStat: {
- type: Boolean,
- default: false
- }
- },
-
setup () {
const { store } = useContext()
const { filterPeriodNameAllReplacedToYear } = useFilter()
+ const { isEmptyStat } = useStat()
const activeTabStat = computed(() => store.state.ui.activeTabStat)
const periods = computed(() => store.state.chart.periods)
@@ -30,6 +25,7 @@ export default {
})
return {
+ isEmptyStat,
activeTabStat,
periods,
filterPeriod,
diff --git a/components/chart/Periods.vue b/components/chart/Periods.vue
index bd910471..b28ec0af 100644
--- a/components/chart/Periods.vue
+++ b/components/chart/Periods.vue
@@ -4,12 +4,14 @@ import useChart from '~/components/chart/useChart'
import usePeriods from '~/components/periods/usePeriods'
import useFilter from '~/modules/filter/useFilter'
import useUIView from '~/components/layout/useUIView'
+import useStat from '~/modules/stat/useStat'
export default {
name: 'ChartPeriods',
setup () {
const { store } = useContext()
+ const { isEmptyStat } = useStat()
// Filter
const { filterPeriodNameAllReplacedToYear } = useFilter()
@@ -48,6 +50,7 @@ export default {
const visibleContextMenu = ref(false)
return {
+ isEmptyStat,
isShowDataLabels,
toogleChartsView,
addPeriodOrGroup,
@@ -76,10 +79,12 @@ export default {
@onClickOpener="visibleContextMenu = !visibleContextMenu"
)
template(slot="opener")
- .periodItem {{ $t('settings.customize') }}
+ .periodItem._tune
+ .periodItem__icon: .mdi.mdi-tune
+ .periodItem__text {{ $t('settings.customize') }}
template(slot="content")
- template(v-if="!isEmptyData")
+ template(v-if="!isEmptyStat")
CustomizeMenu
.context-menu-sep
@@ -114,7 +119,7 @@ export default {
@click="addPeriodOrGroup"
): .mdi.mdi-plus
- .periods__group
+ .periods__group(v-if="!isEmptyStat")
.periodItem(@click="toogleChartsView")
.mdi.mdi-chart-line(v-if="periods[filterPeriodNameAllReplacedToYear].grouped")
.mdi.mdi-chart-bar(v-else)
@@ -158,7 +163,10 @@ export default {
border-radius $m3
anim()
- +media(800px)
+ +media(400px)
+ font-size 12px
+
+ +media(600px)
padding $m6 $m6
font-size 12px
@@ -183,4 +191,12 @@ export default {
+media(800px)
display flex
+
+ &._tune
+ color var(--c-font-3)
+
+ &__icon
+ padding-right $m5
+ .mdi
+ font-size 18px
</style>
diff --git a/components/chart/useChart.ts b/components/chart/useChart.ts
index f0ef3316..6d59aef6 100644
--- a/components/chart/useChart.ts
+++ b/components/chart/useChart.ts
@@ -3,7 +3,7 @@ import useFilter from '~/modules/filter/useFilter'
const isShowDataLabels = ref(false)
-export default function useMobileLayout () {
+export default function useChart () {
const { store } = useContext()
const { filterPeriodNameAllReplacedToYear } = useFilter()
diff --git a/components/layout/Mobile.vue b/components/layout/Base.vue
similarity index 97%
rename from components/layout/Mobile.vue
rename to components/layout/Base.vue
index d7256eac..ecf173a2 100644
--- a/components/layout/Mobile.vue
+++ b/components/layout/Base.vue
@@ -1,6 +1,6 @@
<script>
import { computed, useContext } from '@nuxtjs/composition-api'
-import useMobileLayout from '~/components/layout/useMobileLayout'
+import useBaseLayout from '~/components/layout/useBaseLayout'
import useUIView from '~/components/layout/useUIView'
export default {
@@ -10,7 +10,7 @@ export default {
const { store } = useContext()
// Layout
- const { isShowPeriodsNamesModal } = useMobileLayout()
+ const { isShowPeriodsNamesModal } = useBaseLayout()
// UI
const { ui } = useUIView()
@@ -55,7 +55,7 @@ export default {
//- Stat
.page(
v-if="isStatPage && $store.getters['trns/hasTrns']"
- ): StatMobile
+ ): StatDashboard
//- No trns
.page(
diff --git a/components/layout/mobile/StatMenu.vue b/components/layout/mobile/StatMenu.vue
index 31ba3757..24e09994 100644
--- a/components/layout/mobile/StatMenu.vue
+++ b/components/layout/mobile/StatMenu.vue
@@ -61,7 +61,6 @@ export default {
overflow-x auto
margin 0 auto
padding 0 $m6
- background var(--c-bg-3)
+media(600px)
overflow initial
diff --git a/components/layout/useMobileLayout.ts b/components/layout/useBaseLayout.ts
similarity index 88%
rename from components/layout/useMobileLayout.ts
rename to components/layout/useBaseLayout.ts
index 1c968f5c..1ceb715b 100644
--- a/components/layout/useMobileLayout.ts
+++ b/components/layout/useBaseLayout.ts
@@ -2,7 +2,7 @@ import { ref } from '@nuxtjs/composition-api'
const isShowPeriodsNamesModal = ref(false)
-export default function useMobileLayout () {
+export default function useBaseLayout () {
function showPeriodsNamesModal () {
isShowPeriodsNamesModal.value = true
}
diff --git a/components/shared/contextMenu/ContextMenu.vue b/components/shared/contextMenu/ContextMenu.vue
index d5621e41..85b7af7e 100644
--- a/components/shared/contextMenu/ContextMenu.vue
+++ b/components/shared/contextMenu/ContextMenu.vue
@@ -79,7 +79,7 @@ export default {
</template>
<style lang="stylus" scoped>
-@import '~assets/stylus/variables/margins'
+@import '~assets/stylus/variables'
.context-menu
z-index 6
@@ -96,23 +96,21 @@ export default {
left 0
width 100%
height 100%
- anim()
- // background rgba(0, 0, 0, .2)
- // backdrop-filter blur(2px)
+ // anim()
+ // background rgba(0, 0, 0, .4)
&__popup
overflow hidden
- z-index 20
+ z-index 10
position absolute
top 48px
min-width 200px
- background var(--c-bg-2)
- border 1px solid var(--c-bg-6)
+ background var(--c-bg-5)
+ border 1px solid var(--c-bg-1)
border-radius $m6
- box-shadow 0 10px 20px -5px var(--c-bg-1)
/.light-mode &
- background var(--c-bg-3)
+ background var(--c-bg-1)
border 1px solid var(--c-bg-5)
&._right
@@ -123,7 +121,7 @@ export default {
bottom 48px
&__content
- z-index 12
+ z-index 200
position relative
&__desc
diff --git a/components/shared/contextMenu/ContextMenuItem.vue b/components/shared/contextMenu/ContextMenuItem.vue
index 627f7281..d0c05960 100644
--- a/components/shared/contextMenu/ContextMenuItem.vue
+++ b/components/shared/contextMenu/ContextMenuItem.vue
@@ -63,10 +63,10 @@ export default {
+media-hover()
&:not(._selected)
- background var(--c-bg-3)
+ background var(--c-bg-5)
&._selected
- background var(--c-bg-5)
+ background var(--c-bg-2)
&__icon
opacity .85
diff --git a/components/stat/Mobile.vue b/components/stat/Dashboard.vue
similarity index 97%
rename from components/stat/Mobile.vue
rename to components/stat/Dashboard.vue
index d88aa862..418a2507 100644
--- a/components/stat/Mobile.vue
+++ b/components/stat/Dashboard.vue
@@ -31,7 +31,7 @@ export default {
const { ui, setUI } = useUIView()
// Stat
- const { moneyTypes } = useStat()
+ const { moneyTypes, isEmptyStat } = useStat()
// Last selected period
const isFirstPeriodSelected = computed(() => store.getters['stat/isFirstPeriodSelected'])
@@ -111,9 +111,6 @@ export default {
return stat
})
- // is empty stat
- const isEmptyStat = computed(() => statAverage.value.total === 0 && store.getters['trns/selectedTrnsIdsWithDate'].length === 0)
-
return {
isShowChart,
@@ -145,10 +142,7 @@ export default {
<template lang="pug">
.pageWrapScroll
.baseBox._chart(v-if="ui.showMainChart && isShowChart")
- LazyChartMobileStatLines(
- v-if="ui.showMainChart && isShowChart"
- :isEmptyStat="isEmptyStat"
- )
+ LazyChartMobileStatLines(v-if="ui.showMainChart && isShowChart")
.baseBox._date
DateMobilePrevNextArrow
diff --git a/components/stat/StatCustomizeMenuMobile.vue b/components/stat/StatCustomizeMenuMobile.vue
deleted file mode 100644
index c4603d5e..00000000
--- a/components/stat/StatCustomizeMenuMobile.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<script>
-export default {
- props: {
- icon: {
- type: String,
- default: null
- },
-
- position: {
- type: Object,
- default: () => ({
- left: true,
- bottom: true
- })
- }
- },
-
- data () {
- return {
- visibleCustomizeMenu: false
- }
- },
-
- computed: {
- positionStyles () {
- const styles = { ...this.position }
- return styles
- }
- }
-}
-</script>
-
-<template lang="pug">
-div
- SharedContextMenu(
- :position="position"
- :visible="visibleCustomizeMenu"
- @onClickOpener="visibleCustomizeMenu = !visibleCustomizeMenu"
- )
- template(slot="opener")
- template(v-if="icon")
- SharedButton._border._square(:icon="icon")
- template(v-else)
- SharedDropdown._inline(
- :active="visibleCustomizeMenu"
- :title="$t('settings.customize')"
- )
-
- ModalBottom(
- :show="visibleCustomizeMenu"
- :title="$t('settings.customize')"
- @onClose="visibleCustomizeMenu = !visibleCustomizeMenu"
- )
- SharedContextMenuItem(
- icon="mdi mdi-credit-card-multiple"
- title="Wallets"
- :showCheckbox="true"
- :checkboxValue="$store.state.ui.stat.walletsVisibility === 'visible'"
- @onClick="$store.dispatch('ui/toogleStatWalletsVisibility')"
- )
-
- SharedContextMenuItem(
- :checkboxValue="$store.state.ui.statGraphsVisibility === 'visible'"
- :showCheckbox="true"
- :title="$t('stat.customize.showPeriodsChart')"
- icon="mdi mdi-chart-bar-stacked"
- @onClick="$store.dispatch('ui/toogleShowStatGraphs')"
- )
-
- SharedContextMenuItem(
- :checkboxValue="$store.state.ui.catsChart === 'visible'"
- :showCheckbox="true"
- icon="mdi mdi-folder-star"
- title="Stat categories chart"
- @onClick="$store.dispatch('ui/toogleVisibleCatsChart')"
- )
-
- SharedContextMenuItem(
- :checkboxValue="$store.state.ui.statItems === 'visible'"
- :showCheckbox="true"
- icon="mdi mdi-history"
- title="Stat categories list"
- @onClick="$store.dispatch('ui/toogleVisibilityStatItems')"
- )
-
- .context-menu-sep
-
- SharedContextMenuItem(
- :title="$t('theme.change')"
- icon="mdi mdi-palette"
- @onClick="$store.dispatch('ui/changeTheme')"
- )
-</template>
diff --git a/components/trnForm/TrnForm.vue b/components/trnForm/TrnForm.vue
index 22810661..ef51ef32 100644
--- a/components/trnForm/TrnForm.vue
+++ b/components/trnForm/TrnForm.vue
@@ -382,6 +382,9 @@ export default {
width 10px
background var(--c-bg-10)
border-radius 4px
+
+ /.light-mode &
+ background var(--c-blue-1)
</style>
<style lang="stylus" scoped>
@@ -428,7 +431,7 @@ export default {
z-index 2
position absolute
left 50%
- bottom 0
+ bottom 1px
display flex
align-items center
justify-content center
@@ -438,4 +441,7 @@ export default {
border-radius $m5
backdrop-filter blur(12px)
transform translateX(-50%)
+
+ /.light-mode &
+ background var(--color-bg-canvas)
</style>
diff --git a/components/trnForm/TrnFormTrns.vue b/components/trnForm/TrnFormTrns.vue
index 5da22a77..6e84fa56 100644
--- a/components/trnForm/TrnFormTrns.vue
+++ b/components/trnForm/TrnFormTrns.vue
@@ -127,7 +127,7 @@ export default {
this.filterBy = filterBy
this.pageNumber = 1
setTimeout(() => {
- this.slider.slideTo(2, 0)
+ this.slider.slideTo(0, 0)
}, 100)
},
@@ -239,7 +239,9 @@ export default {
padding $m6
padding-top $m8
background alpha(#171717, .9)
- backdrop-filter blur(12px)
+
+ /.light-mode &
+ background var(--color-bg-canvas)
.menuItem
cursor pointer
diff --git a/layouts/error.vue b/layouts/error.vue
index 5ee4fcfb..1d078f94 100644
--- a/layouts/error.vue
+++ b/layouts/error.vue
@@ -6,9 +6,8 @@ export default {
props: ['error'],
fetch () {
- if (Object.keys(this.$route.query).length > 0) {
+ if (Object.keys(this.$route.query).length > 0)
this.$router.replace({ query: null })
- }
},
computed: {
@@ -23,7 +22,7 @@ export default {
.container
h1 Error
pre {{ error }}
- h1(@click="$router.push('/')") Index
+ h1(@click="$router.push('/')") Go to home
</template>
<style lang="stylus">
diff --git a/modules/stat/getStat.ts b/modules/stat/getStat.ts
index b309badb..7003ada0 100644
--- a/modules/stat/getStat.ts
+++ b/modules/stat/getStat.ts
@@ -29,17 +29,16 @@ export default function getStat () {
// count total in categories
const categoriesTotal = {}
- for (const categoryId in categoriesWithTrnsIds) {
+ for (const categoryId in categoriesWithTrnsIds)
categoriesTotal[categoryId] = store.getters['trns/getTotalOfTrnsIds'](categoriesWithTrnsIds[categoryId])
- }
// separate catgories by incomes and expenses
const statIncomes = {}
const statExpenses = {}
for (const categoryId in categoriesWithTrnsIds) {
const total = categoriesTotal[categoryId]
- if (total.incomes > 0) { statIncomes[categoryId] = total }
- if (total.expenses > 0) { statExpenses[categoryId] = total }
+ if (total.incomes > 0) statIncomes[categoryId] = total
+ if (total.expenses > 0) statExpenses[categoryId] = total
}
// sorted
diff --git a/modules/stat/useStat.ts b/modules/stat/useStat.ts
index f2d307ef..527f55bf 100644
--- a/modules/stat/useStat.ts
+++ b/modules/stat/useStat.ts
@@ -1,3 +1,5 @@
+import { computed, useContext } from '@nuxtjs/composition-api'
+
const moneyTypes = [{
id: 'expenses',
type: 0
@@ -7,7 +9,11 @@ const moneyTypes = [{
}]
export default function useStat () {
+ const { store } = useContext()
+ const isEmptyStat = computed(() => store.getters['stat/statAverage'].total === 0 && store.getters['trns/selectedTrnsIdsWithDate'].length === 0)
+
return {
- moneyTypes
+ moneyTypes,
+ isEmptyStat
}
}
diff --git a/pages/index.vue b/pages/index.vue
index 739b7ae8..97fd9a90 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -4,14 +4,13 @@ export default {
fetch () {
if (!this.$store.getters['wallets/hasWallets'] ||
- !this.$store.getters['categories/hasCategories']) {
+ !this.$store.getters['categories/hasCategories'])
this.$router.replace('/welcome')
- }
}
}
</script>
<template lang="pug">
.layout__wrap(v-if="$store.getters['user/userUid']")
- LayoutMobile
+ LayoutBase
</template>