Skip to content

Open source personal finance application

Refactor dashboard nav and filter

ilkome89f587320fab
diff --git a/src/components/dashboard/DashboardFilter.vue b/src/components/dashboard/DashboardFilter.vue
index 6a0daedd..48c144da 100644
--- a/src/components/dashboard/DashboardFilter.vue
+++ b/src/components/dashboard/DashboardFilter.vue
@@ -6,6 +6,13 @@ export default {
FilterItem
},
+ props: {
+ showTittle: {
+ type: Boolean,
+ default: false
+ }
+ },
+
computed: {
filterCategory () {
return this.$store.state.categories.items[this.$store.state.filter.categoryId]
@@ -42,43 +49,76 @@ export default {
<template lang="pug">
.filter(v-if="$store.state.filter.categoryId || $store.state.filter.walletId")
- //- wallet
- template(v-if="$store.state.filter.walletId")
- FilterItem(
- :color="filterWallet.color || $store.state.ui.defaultBgColor"
- :name="filterWallet.name"
- icon="mdi mdi-credit-card-multiple"
- v-on:onClick="clearWalletFilter")
-
- //- categories
- template(v-if="$store.state.filter.categoryId")
- //- parent category
- template(v-if="filterCategory.parentId !== 0")
+ .filter__in
+ .filter__title(v-if="showTittle") Filter
+ //- wallet
+ template(v-if="$store.state.filter.walletId")
FilterItem(
- :color="filterCategoryParent.color || $store.state.ui.defaultBgColor"
- :icon="filterCategoryParent.icon"
- :name="filterCategoryParent.name"
- v-on:onClick="clearParentCategoryFilter")
-
- //- category
- FilterItem(
- :color="filterCategory.color || $store.state.ui.defaultBgColor"
- :icon="filterCategory.icon"
- :name="filterCategory.name"
- v-on:onClick="clearCategoryFilter")
-
- //- clear
- FilterItem._clear(
- icon="mdi mdi-filter-remove-outline"
- name="Clear filter"
- v-on:onClick="clearAllFilters")
+ :color="filterWallet.color || $store.state.ui.defaultBgColor"
+ :name="filterWallet.name"
+ icon="mdi mdi-credit-card-multiple"
+ v-on:onClick="clearWalletFilter")
+
+ //- categories
+ template(v-if="$store.state.filter.categoryId")
+ //- parent category
+ template(v-if="filterCategory.parentId !== 0")
+ FilterItem(
+ :color="filterCategoryParent.color || $store.state.ui.defaultBgColor"
+ :icon="filterCategoryParent.icon"
+ :name="filterCategoryParent.name"
+ v-on:onClick="clearParentCategoryFilter")
+
+ //- category
+ FilterItem(
+ :color="filterCategory.color || $store.state.ui.defaultBgColor"
+ :icon="filterCategory.icon"
+ :name="filterCategory.name"
+ v-on:onClick="clearCategoryFilter")
+
+ //- clear
+ FilterItem._clear(
+ icon="mdi mdi-filter-remove-outline"
+ name="Clear filter"
+ v-on:onClick="clearAllFilters")
</template>
<style lang="stylus" scoped>
+@import "~@/stylus/variables/fonts"
@import "~@/stylus/variables/margins"
+@import "~@/stylus/variables/media"
.filter
- display flex
- padding $m7 $mb2
background var(--c-bg-4)
+
+ &__in
+ display flex
+ position relative
+ max-width 1100px
+ padding 12px $mb2
+
+ @media $media-laptop
+ padding 12px $m9
+
+ @media $media-pc
+ padding 12px $mb2
+
+ ^[0]._sidebar &
+ padding 20px
+ display block
+ background var(--c-bg-3)
+ border-top 1px solid var(--c-bg-6)
+ border-bottom 1px solid var(--c-bg-6)
+
+ .filterItem
+ margin 0
+ margin-bottom 10px
+ &._clear
+ margin-top 20px
+ margin-bottom 0
+
+ &__title
+ font-header-1()
+ font-size 22px
+ padding-bottom 20px
</style>
diff --git a/src/components/dashboard/DashboardNav.vue b/src/components/dashboard/DashboardNav.vue
index 13b9f39f..d47f673b 100644
--- a/src/components/dashboard/DashboardNav.vue
+++ b/src/components/dashboard/DashboardNav.vue
@@ -1,4 +1,5 @@
<script>
+import ChartMenu from '@/components/stat/chart/ChartMenu'
import ContextMenu from '@/components/shared/contextMenu/ContextMenu'
import ContextMenuItem from '@/components/shared/contextMenu/ContextMenuItem'
import Date from '@/components/shared/date/Date'
@@ -6,6 +7,7 @@ import Dropdown from '@/components/shared/dropdown/Dropdown'
export default {
components: {
+ ChartMenu,
ContextMenu,
ContextMenuItem,
Date,
@@ -22,88 +24,95 @@ export default {
</script>
<template lang="pug">
-.period-nav
- .period-nav__group
- .period-nav__item
+.periodNav
+ .periodNav__wrap
+ .periodNav__group
ContextMenu._dark(
- :position="{ left: true, top: true }"
+ :position="{ left: '-12px', top: true }"
:visible="visiblePeriodMenu"
v-on:onClickOpener="visiblePeriodMenu = !visiblePeriodMenu")
template(slot="opener")
- .dateSelecror
- .dateSelecror__date: Date
- .dateSelecror__arrow: .mdi.mdi-chevron-down
+ Dropdown._noBd(
+ :active="visiblePeriodMenu")
+ template(slot="title"): Date.dateSelecror
+
template(slot="content")
ContextMenuItem(
icon="mdi mdi-weather-sunset-up"
- title="Day"
+ :title="$lang.dates.day.simple"
:selected="$store.state.filter.period === 'day'"
v-on:onClick="$store.dispatch('setPeriod', 'day')"
v-on:onClose="visiblePeriodMenu = !visiblePeriodMenu")
ContextMenuItem(
icon="mdi mdi-calendar-week"
- title="Week"
+ :title="$lang.dates.week.simple"
:selected="$store.state.filter.period === 'week'"
v-on:onClick="$store.dispatch('setPeriod', 'week')"
v-on:onClose="visiblePeriodMenu = !visiblePeriodMenu")
ContextMenuItem(
icon="mdi mdi-calendar"
- title="Month"
+ :title="$lang.dates.month.simple"
:selected="$store.state.filter.period === 'month'"
v-on:onClick="$store.dispatch('setPeriod', 'month')"
v-on:onClose="visiblePeriodMenu = !visiblePeriodMenu")
ContextMenuItem(
icon="mdi mdi-calendar-star"
- title="Year"
+ :title="$lang.dates.year.simple"
:selected="$store.state.filter.period === 'year'"
v-on:onClick="$store.dispatch('setPeriod', 'year')"
v-on:onClose="visiblePeriodMenu = !visiblePeriodMenu")
ContextMenuItem(
icon="mdi mdi-database"
- title="Show all"
+ :title="$lang.dates.all"
:selected="$store.state.filter.period === 'all'"
v-on:onClick="$store.dispatch('setPeriod', 'all')"
v-on:onClose="visiblePeriodMenu = !visiblePeriodMenu")
- .period-nav__group
- ._align-right
- ContextMenu(
- :position="{ right: true, top: true }"
- :visible="visibleContextMenu"
- v-on:onClickOpener="visibleContextMenu = !visibleContextMenu")
- template(slot="opener")
- Dropdown(
- :active="visibleContextMenu"
- title="Customize")
- template(slot="content")
- ContextMenuItem(
- icon="mdi mdi-chart-bar-stacked"
- title="Periods chart"
- :showCheckbox="true"
- :checkboxValue="$store.state.ui.statGraphsVisible"
- v-on:onClick="$store.dispatch('toogleShowStatGraphs')")
- ContextMenuItem(
- icon="mdi mdi-chart-bubble"
- title="Cats chart"
- :showCheckbox="true"
- :checkboxValue="$store.state.ui.catsChart === 'visible'"
- v-on:onClick="$store.dispatch('toogleVisibleCatsChart')")
- ContextMenuItem(
- icon="mdi mdi-chart-gantt"
- title="Cats stat"
- :showCheckbox="true"
- :checkboxValue="$store.state.ui.statItems === 'visible'"
- v-on:onClick="$store.dispatch('toogleVisibilityStatItems')")
- .context-menu-sep
- ContextMenuItem(
- icon="mdi mdi-currency-usd"
- title="Change base currency"
- v-on:onClick="$store.commit('showBaseCurrenciesModal')"
- v-on:onClose="visibleContextMenu = !visibleContextMenu")
- ContextMenuItem(
- icon="mdi mdi-palette"
- title="Change theme"
- v-on:onClick="$store.dispatch('changeTheme')")
+ .periodNav__group
+ ._align-right
+ //- all stat chart
+ .periodNav__item(v-show="$store.state.ui.statGraphsVisibility === 'visible'")
+ ChartMenu(:showDropdown="true")
+
+ //- customize
+ .periodNav__item
+ ContextMenu(
+ :position="{ right: '-12px', top: true }"
+ :visible="visibleContextMenu"
+ v-on:onClickOpener="visibleContextMenu = !visibleContextMenu")
+ template(slot="opener")
+ Dropdown._noBd(
+ :active="visibleContextMenu"
+ :title="$lang.settings.customize")
+ template(slot="content")
+ ContextMenuItem(
+ icon="mdi mdi-chart-bar-stacked"
+ title="Periods chart"
+ :showCheckbox="true"
+ :checkboxValue="$store.state.ui.statGraphsVisibility === 'visible'"
+ v-on:onClick="$store.dispatch('toogleShowStatGraphs')")
+ ContextMenuItem(
+ icon="mdi mdi-chart-bubble"
+ title="Cats chart"
+ :showCheckbox="true"
+ :checkboxValue="$store.state.ui.catsChart === 'visible'"
+ v-on:onClick="$store.dispatch('toogleVisibleCatsChart')")
+ ContextMenuItem(
+ icon="mdi mdi-chart-gantt"
+ title="Cats stat"
+ :showCheckbox="true"
+ :checkboxValue="$store.state.ui.statItems === 'visible'"
+ v-on:onClick="$store.dispatch('toogleVisibilityStatItems')")
+ .context-menu-sep
+ ContextMenuItem(
+ icon="mdi mdi-currency-usd"
+ title="Change base currency"
+ v-on:onClick="$store.commit('showBaseCurrenciesModal')"
+ v-on:onClose="visibleContextMenu = !visibleContextMenu")
+ ContextMenuItem(
+ icon="mdi mdi-palette"
+ title="Change theme"
+ v-on:onClick="$store.dispatch('changeTheme')")
</template>
<style lang="stylus" scoped>
@@ -115,6 +124,7 @@ export default {
._align-right
margin-left auto
flex 0
+ display flex
._nav
margin-right $m7
@@ -124,20 +134,13 @@ export default {
.dateSelecror
display flex
align-items center
-
- &__date
- flex-grow 0
- display flex
- justify-content center
- align-items center
- font-header-1()
- color var(--c-font-4)
- font-size 28px
-
- &__arrow
- margin-left $m5
- color var(--c-font-5)
- font-size 32px
+ cursor pointer
+ border 1px solid transparent
+ height 40px
+ padding 8px 12px
+ margin -8px -12px
+ font-header-1()
+ font-size 22px
.d-button
display inline-flex
@@ -147,10 +150,15 @@ export default {
font-header-1()
color var(--c-font-4)
-.period-nav
- display flex
- align-items center
- padding-bottom $m9
+.periodNav
+ background var(--c-bg-4)
+
+ &__wrap
+ display flex
+ align-items center
+ max-width 1100px
+ padding 5px $mb2
+ padding-bottom 6px
&__group
display flex
@@ -160,7 +168,7 @@ export default {
&__item
display flex
align-items center
- padding-right $m10
+ padding-right 50px
&:last-child
padding-right 0