Skip to content

Open source personal finance application

feat (ui): update

ilkomeb5936185395d
diff --git a/components/base/BottomSheet.vue b/components/base/BottomSheet.vue
index 2c24c115..5fb199d8 100644
--- a/components/base/BottomSheet.vue
+++ b/components/base/BottomSheet.vue
@@ -408,12 +408,12 @@ export default defineComponent({
.drug
z-index 20
position absolute
- bottom 0
+ top 50%
width 100%
height auto
max-width 600px
left 50%
- transform translateX(-50%)
+ transform translateX(-50%) translateY(-50%)
// max-height 90vh
&._anim
diff --git a/components/chart/MobileStatLines.vue b/components/chart/MobileStatLines.vue
index fca98965..1e8b5f44 100644
--- a/components/chart/MobileStatLines.vue
+++ b/components/chart/MobileStatLines.vue
@@ -39,6 +39,7 @@ export default {
:isShowIncomes="activeTabStat === 'incomes' || activeTabStat === 'details' || activeTabStat === 'history'"
:isShowExpenses="activeTabStat === 'expenses' || activeTabStat === 'details' || activeTabStat === 'history'"
:chartType="chartType"
+ :disableCategoryFilter="true"
)
ChartPeriods
diff --git a/components/chart/Periods.vue b/components/chart/Periods.vue
index 8a063f58..35cc414d 100644
--- a/components/chart/Periods.vue
+++ b/components/chart/Periods.vue
@@ -3,6 +3,7 @@ import { computed, useContext } from '@nuxtjs/composition-api'
import useChart from '~/components/chart/useChart'
import usePeriods from '~/components/periods/usePeriods'
import useFilter from '~/modules/filter/useFilter'
+import useUIView from '~/components/layout/useUIView'
export default {
name: 'ChartPeriods',
@@ -39,6 +40,11 @@ export default {
const periods = computed(() => store.state.chart.periods)
const { periodsNames } = usePeriods()
+ const { ui, setUI } = useUIView()
+ function toogleView (name) {
+ setUI({ name, value: !ui[name] })
+ }
+
return {
isShowDataLabels,
toogleChartsView,
@@ -48,7 +54,10 @@ export default {
periods,
periodsNames,
- filterPeriodNameAllReplacedToYear
+ filterPeriodNameAllReplacedToYear,
+
+ ui,
+ toogleView
}
}
}
@@ -56,31 +65,49 @@ export default {
<template lang="pug">
.periods
- .periodItem(
- @click="removePeriodOrGroup"
- ): .mdi.mdi-minus
-
- .periodItem(
- v-for="periodItem in periodsNames"
- :key="periodItem.slug"
- :class="{ _active: filterPeriodNameAllReplacedToYear === periodItem.slug }"
- @click="$store.dispatch('filter/setPeriod', periodItem.slug)"
- )
- .periodItem__name {{ periodItem.name }}
- .periodItem__count(
- v-if="filterPeriodNameAllReplacedToYear === periodItem.slug"
- ) {{ $store.state.chart.periods[periodItem.slug].showedPeriods }}
-
- .periodItem(
- @click="addPeriodOrGroup"
- ): .mdi.mdi-plus
-
- .periodItem(@click="toogleChartsView")
- .mdi.mdi-chart-bar(v-if="periods[filterPeriodNameAllReplacedToYear].grouped")
- .mdi.mdi-chart-line(v-else)
-
- .periodItem(@click="isShowDataLabels = !isShowDataLabels")
- .mdi.mdi-subtitles-outline
+ .periods__group
+ .periodItem(
+ @click="toogleView('showPieChart')"
+ ): .mdi.mdi-chart-pie
+ .periodItem(
+ @click="toogleView('showCatsVerticalChart')"
+ ): .mdi.mdi-poll
+ .periodItem(
+ @click="toogleView('showCatsHorizontalList')"
+ ): .mdi.mdi-chart-timeline
+ .periodItem(
+ @click="toogleView('showRoundCats')"
+ ): .mdi.mdi-chart-bubble
+ //- .periodItem(
+ //- @click="toogleView('showHistory')"
+ //- ): .mdi.mdi-jellyfish-outline
+
+ .periods__group
+ .periodItem(
+ @click="removePeriodOrGroup"
+ ): .mdi.mdi-minus
+
+ .periodItem(
+ v-for="periodItem in periodsNames"
+ :key="periodItem.slug"
+ :class="{ _active: filterPeriodNameAllReplacedToYear === periodItem.slug }"
+ @click="$store.dispatch('filter/setPeriod', periodItem.slug)"
+ )
+ .periodItem__name {{ periodItem.name }}
+ .periodItem__count(
+ v-if="filterPeriodNameAllReplacedToYear === periodItem.slug"
+ ) {{ $store.state.chart.periods[periodItem.slug].showedPeriods }}
+ .periodItem(
+ @click="addPeriodOrGroup"
+ ): .mdi.mdi-plus
+
+ .periods__group
+ .periodItem(@click="toogleChartsView")
+ .mdi.mdi-chart-line(v-if="periods[filterPeriodNameAllReplacedToYear].grouped")
+ .mdi.mdi-chart-bar(v-else)
+
+ .periodItem(@click="isShowDataLabels = !isShowDataLabels")
+ .mdi.mdi-subtitles-outline
</template>
<style lang="stylus" scoped>
@@ -89,28 +116,51 @@ export default {
.periods
z-index 2
position relative
- display flex
+ display grid
+ grid-template-columns auto 1fr auto
+ grid-column-gap $m9
+ grid-row-gap 60px
align-items center
+ +media(600px)
+ padding-top 8px
+
+ &__group
+ display flex
+ align-items center
+ justify-content center
+ justify-self center
+
.periodItem
cursor pointer
flex-grow 1
display flex
align-items center
justify-content center
- min-width 40px
+ min-width 20px
padding 10px $m6
color var(--c-font-5)
font-size 10px
border-radius $m3
+ anim()
+
+ +media(600px)
+ padding 10px 16px
+ font-size 12px
+media-hover()
- color var(--c-font-2)
- background var(--c-blue-1)
+ cursor pointer
+ color var(--c-font-3)
+ background var(--c-bg-5)
+ border-radius 50px
&._active
- color var(--c-font-3)
+ color var(--c-blue-1)
&__count
padding-left $m4
+
+ .mdi
+ +media(600px)
+ font-size 22px
</style>
diff --git a/components/date/MobilePrevNextArrow.vue b/components/date/MobilePrevNextArrow.vue
index 9708635b..cbaa812e 100644
--- a/components/date/MobilePrevNextArrow.vue
+++ b/components/date/MobilePrevNextArrow.vue
@@ -64,11 +64,13 @@ div
&._right
right 0px
justify-content flex-end
+ padding-right 4px
border-radius 32px 0 0 32px
+media(950px)
right 16px
justify-content center
+ padding-left 4px
border-radius 32px
svg
diff --git a/components/date/MobileSelector.vue b/components/date/MobileSelector.vue
index d1dde3e2..4216bfc7 100644
--- a/components/date/MobileSelector.vue
+++ b/components/date/MobileSelector.vue
@@ -46,10 +46,20 @@ export default {
font-weight bold
background var(--c-bg-4)
border-radius $m4
+ anim()
+
+ +media(600px)
+ font-size 26px
+ font-weight 600
+ fontFamilyNunito()
+ background none
+media-hover()
color var(--c-font-2)
background var(--c-blue-1)
+ +media(600px)
+ color var(--c-blue-1)
+ background none
&__dots
margin-top -2px
@@ -58,4 +68,8 @@ export default {
padding-left 4px
color var(--c-font-2)
font-size 16px
+
+ +media(600px)
+ padding-left 6px
+ font-size 22px
</style>
diff --git a/components/filter/FilterRow.vue b/components/filter/FilterRow.vue
index 726b92e2..b137a7a3 100644
--- a/components/filter/FilterRow.vue
+++ b/components/filter/FilterRow.vue
@@ -85,4 +85,7 @@ export default {
+media-tablet('less')
justify-content safe center
+
+ +media(600px)
+ justify-content center
</style>
diff --git a/components/layout/Mobile.vue b/components/layout/Mobile.vue
index e4eefcaf..781661d9 100644
--- a/components/layout/Mobile.vue
+++ b/components/layout/Mobile.vue
@@ -74,7 +74,7 @@ export default {
//- Menu
//-----------------------------------
.layoutMobile__menu
- LayoutMobileStatMenu
+ LayoutMobileStatMenu._bottom
LayoutMobileBottomMenu
//- Modals
@@ -215,30 +215,33 @@ export default {
.layoutMobile
flex-grow 1
display grid
+ grid-template-columns 1fr
+ grid-template-rows 1fr minmax(auto, auto)
height 100%
- padding-bottom 44px
-
- &._stat
- padding-bottom 80px
+ background var(--c-bg-2)
&__content
overflow hidden
&__menu
- z-index 10
- position fixed
- left 0
- bottom 0
- width 100%
- transition all .3s ease
+ background var(--c-bg-3)
+
+ +media(600px)
+ background var(--c-bg-2)
.page
overflow hidden
overflowScrollY()
display grid
height 100%
- max-width 900px
+ max-width 1100px
margin 0 auto
padding 0
background var(--color-bg-canvas)
+
+ +media(800px)
+ padding 32px
+
+ +media(1000px)
+ padding 0 64px
</style>
diff --git a/components/layout/mobile/BottomMenu.vue b/components/layout/mobile/BottomMenu.vue
index dee317ba..31fbf6fe 100644
--- a/components/layout/mobile/BottomMenu.vue
+++ b/components/layout/mobile/BottomMenu.vue
@@ -129,19 +129,33 @@ export default {
anim()
+media-hover()
- background var(--c-bg-1)
+ background var(--c-blue-1)
+
+ svg
+ fill var(--c-font-1)
+
+ +media(600px)
+ padding $m9 0
svg
width 24px
height 24px
fill var(--c-blue-1)
+ anim()
+
+ +media(600px)
+ width 34px
+ height 34px
.menu
background var(--c-bg-3)
+ +media(600px)
+ background var(--c-bg-2)
+
&__wrap
display grid
- max-width 620px
+ max-width 680px
margin 0 auto
/.light-mode &
@@ -153,6 +167,7 @@ export default {
justify-content center
&__item
+ cursor pointer
display flex
align-items center
justify-content center
@@ -160,9 +175,17 @@ export default {
flex-flow column
padding $m6 0
color var(--c-font-4)
- border-radius $m3
+ border-radius 8px
anim()
+ +media(600px)
+ padding $m9 0
+ border-radius 8px
+
+ +media-hover()
+ color var(--c-font-1)
+ background var(--c-blue-1)
+
&:active
color var(--c-font-2)
background var(--c-blue-1)
@@ -175,4 +198,7 @@ export default {
&__icon
font-size 22px
+
+ +media(800px)
+ font-size 36px
</style>
diff --git a/components/layout/mobile/StatMenu.vue b/components/layout/mobile/StatMenu.vue
index 22e46694..71bcefe0 100644
--- a/components/layout/mobile/StatMenu.vue
+++ b/components/layout/mobile/StatMenu.vue
@@ -56,11 +56,20 @@ export default {
z-index 10
display flex
align-items center
+ max-width 640px
overflow-x auto
+ margin 0 auto
padding 0 $m6
padding-top $m6
background var(--c-bg-3)
+ &._bottom
+ +media(600px)
+ background var(--c-bg-2)
+
+ +media(600px)
+ justify-content center
+
.menuItem
cursor pointer
flex-grow 1
@@ -71,14 +80,19 @@ export default {
font-weight 500
font-roboto()
text-align center
+ border-radius 50px
anim()
+ +media(600px)
+ flex-grow 0
+
+media-hover()
cursor pointer
- color var(--c-blue-1)
-
- &._active
color var(--c-font-3)
background var(--c-bg-5)
- border-radius 50px
+
+ &._active
+ color var(--c-blue-1)
+ +media-hover()
+ background none
</style>
diff --git a/components/stat/Mobile.vue b/components/stat/Mobile.vue
index 41d2ed2a..083db28a 100644
--- a/components/stat/Mobile.vue
+++ b/components/stat/Mobile.vue
@@ -120,6 +120,7 @@ export default {
statPage,
statCurrentPeriod,
statAverage,
+ filter,
filterPeriod,
isShowFilter,
periods,
@@ -145,6 +146,8 @@ export default {
DateMobilePrevNextArrow
DateMobileSelector
+ LayoutMobileStatMenu
+
.baseBox._noBg(v-if="isShowFilter")
LazyFilterRow(v-if="isShowFilter")
@@ -213,9 +216,18 @@ export default {
:type="item.id"
)
+ StatChartLines(
+ v-if="filter.categoryId && $store.getters['trns/hasTrns'] && filterPeriod !== 'all'"
+ :categoryId="filter.categoryId"
+ :chartColor="$store.state.categories.items[filter.categoryId].color"
+ :isShowExpenses="item.type === 0"
+ :isShowIncomes="item.type === 1"
+ chartType="column"
+ )
+
//- Cats horizontal list
.statCategories(v-if="ui.showCatsHorizontalList && statCurrentPeriod[item.id].categoriesIds.length > 0")
- LazyStatItemMobile(
+ LazyStatItem(
v-if="ui.showCatsHorizontalList && statCurrentPeriod[item.id].categoriesIds.length > 0"
v-for="categoryId in statCurrentPeriod[item.id].categoriesIds"
:key="categoryId"
@@ -241,16 +253,20 @@ export default {
:type="item.type"
)
+ template(v-if="statAverage && (statAverage.incomes === 0 || statAverage.expenses === 0)")
+ .baseBox(v-if="ui.showHistory && $store.getters['trns/selectedTrnsIdsWithDate'].length > 0")
+ .baseBox__title {{ $t('trns.history') }}
+ .baseBox__content
+ TrnsList3(
+ :incomes="activeTabStat === 'incomes'"
+ :expenses="activeTabStat === 'expenses'"
+ :size="activeTabStat === 'history' ? 30 : 8"
+ )
+
//- history
- .statMoneyTypes
- .baseBox(v-if="ui.showHistory && $store.getters['trns/selectedTrnsIdsWithDate'].length > 0")
- .baseBox__title {{ $t('trns.history') }}
- .baseBox__content
- TrnsList3(
- :incomes="activeTabStat === 'incomes'"
- :expenses="activeTabStat === 'expenses'"
- :size="activeTabStat === 'history' ? 30 : 8"
- )
+ .history(v-if="statAverage && (statAverage.incomes !== 0 && statAverage.expenses !== 0) && ui.showHistory && $store.getters['trns/selectedTrnsIdsWithDate'].length > 0")
+ .baseBox__title {{ $t('trns.history') }}
+ TrnsList(:size="50")
//- Analytics
//-----------------------------
@@ -294,6 +310,19 @@ export default {
)
</template>
+<style lang="stylus">
+@import '~assets/stylus/variables'
+// ------------------------------------
+.history
+ .trnsList__day
+ //
+
+ .trnItem._history
+ margin 0
+ padding-right $m7 !important
+ padding-left $m7 !important
+</style>
+
<style lang="stylus" scoped>
@import '~assets/stylus/variables'
@@ -334,6 +363,7 @@ export default {
+media(700px)
padding $m8 $m8
+ border-bottom 1px solid var(--c-bg-5)
&._mw
max-width 480px
diff --git a/components/stat/StatChartLines.vue b/components/stat/StatChartLines.vue
index c40e8f02..342a4c0f 100644
--- a/components/stat/StatChartLines.vue
+++ b/components/stat/StatChartLines.vue
@@ -17,6 +17,11 @@ export default {
default: true
},
+ disableCategoryFilter: {
+ type: Boolean,
+ default: false
+ },
+
isShowExpenses: {
type: Boolean,
default: true
@@ -77,7 +82,8 @@ export default {
const trnsIds = this.$store.getters['trns/getTrns']({
date: periodDate,
periodName,
- categoryId: this.categoryId
+ categoryId: null,
+ disableCategoryFilter: this.disableCategoryFilter
})
const periodTotal = this.$store.getters['trns/getTotalOfTrnsIds'](trnsIds)
diff --git a/components/stat/StatItemChildCatsItem.vue b/components/stat/StatItemChildCatsItem.vue
index 777fbbf4..5396dcba 100644
--- a/components/stat/StatItemChildCatsItem.vue
+++ b/components/stat/StatItemChildCatsItem.vue
@@ -87,11 +87,17 @@ export default {
)
</template>
+<style lang="stylus">
+.statItemChild
+ .trnItem._stat
+ padding-right 16px
+ padding-left 16px
+</style>
+
<style lang="stylus" scoped>
@import '~assets/stylus/variables'
.statItemChild
-
&._active
padding-bottom $m6
@@ -101,10 +107,7 @@ export default {
grid-template-rows repeat(2, minmax(10px, max-content))
grid-column-gap 20px
margin 0 0px
- padding $m6 0
-
- +media-tablet()
- padding $m6 $m6
+ padding $m6 $m6
&__trns
padding 0
diff --git a/components/trnForm/TrnForm.vue b/components/trnForm/TrnForm.vue
index 0b38a62f..dc3fbd1a 100644
--- a/components/trnForm/TrnForm.vue
+++ b/components/trnForm/TrnForm.vue
@@ -424,6 +424,9 @@ export default {
background var(--color-bg-canvas)
border-radius $m8 $m8 0 0
+ +media(600px)
+ border-radius 16px
+
&__quickCats
opacity .8
padding-bottom $m7
diff --git a/components/trnForm/modal/TrnFormModal.vue b/components/trnForm/modal/TrnFormModal.vue
index 570e7815..a4d15844 100644
--- a/components/trnForm/modal/TrnFormModal.vue
+++ b/components/trnForm/modal/TrnFormModal.vue
@@ -102,6 +102,9 @@ Portal(to="modal")
background var(--color-bg-canvas)
border-radius $m8 $m8 0 0
+ +media(600px)
+ border-radius 16px
+
.header
position relative
display flex
diff --git a/store/trns/getters.js b/store/trns/getters.js
index 3a687e1b..18e27da3 100644
--- a/store/trns/getters.js
+++ b/store/trns/getters.js
@@ -202,7 +202,7 @@ export default {
getTrns: (state, getters, rootState) => (props) => {
if (!getters.hasTrns) { return [] }
- const { date, periodName, description, categoryId, type } = props
+ const { date, periodName, description, categoryId, type, disableCategoryFilter } = props
const categories = rootState.categories.items
const categoriesIds = Object.keys(categories)
const filterCategoryId = rootState.filter.categoryId || categoryId
@@ -234,7 +234,7 @@ export default {
}
// filter category
- if (filterCategoryId) {
+ if (filterCategoryId && !disableCategoryFilter) {
const childCategoriesIds = categoriesIds.filter(id => categories[id].parentId === filterCategoryId)
if (childCategoriesIds.length) {
trnsIds = trnsIds.filter((trnId) => {