Skip to content

Open source personal finance application

Show filter on mobile when trns history selected, small refactor filter items

Ilya Komichevd5db91b08fef
diff --git a/src/components/filter/FilterItem.vue b/src/components/filter/FilterItem.vue
index 505c0b1a..f71a1152 100644
--- a/src/components/filter/FilterItem.vue
+++ b/src/components/filter/FilterItem.vue
@@ -42,18 +42,17 @@ export default {
.filterItem(
:class="className"
:style="{ background: color }"
- @click="$emit('onClick')"
-)
- .filterIcon
+ @click="$emit('onClick')")
+ .filterItem__icon
Icon(
:icon="icon"
- :background="color"
- )
- .filterName {{ name }}
- .filterCloseBtn: .mdi.mdi-close
+ :background="color")
+ .filterItem__name {{ name }}
+ .filterItem__close: .mdi.mdi-close
</template>
<style lang="stylus" scoped>
+@import "~@/stylus/variables/animations"
@import "~@/stylus/variables/margins"
@import "~@/stylus/variables/media"
@@ -62,16 +61,12 @@ export default {
display flex
flex-flow row
align-items center
- padding $m6 $m7
+ padding 0 $m7
+ height 40px
color var(--c-font-1)
border-radius $m3
cursor pointer
- &:hover:not(._clear)
- .filterCloseBtn
- @media $media-laptop
- opacity 1
-
&._pc
margin-right $m7
@@ -99,46 +94,39 @@ export default {
background var(--c-blue-1)
border-radius $m3
+ &__icon
+ opacity .8
+ padding-right $m6
+ color var(--c-font-1)
.icon
- @media $media-phone
- background var(--c-blue-1)
+ width auto
+ height auto
- @media $media-laptop
- opacity .8
- background transparent
+ &__name
+ overflow hidden
+ text-overflow ellipsis
+ text-align center
-.filterIcon
- opacity .8
- padding-right $m6
- color var(--c-font-1)
+ &__close
+ margin-left auto
+ color var(--c-font-1)
- .icon
@media $media-laptop
- width auto
- height auto
+ opacity 0
+ position absolute
+ right (- $m6)
+ top (- $m6)
+ padding $m4
+ background var(--c-bg-3)
+ border 1px solid var(--c-bg-1)
+ border-radius $m3
+ anim()
+
+ /.theme-light &
+ color var(--c-font-2)
+ background var(--c-bg-10)
-.filterName
- overflow hidden
- text-overflow ellipsis
- text-align center
-
- @media $media-phone
- font-size 18px
-
-.filterCloseBtn
- margin-left auto
- color var(--c-font-4)
-
- @media $media-phone
- font-size 22px
-
- @media $media-laptop
- opacity 0
- position absolute
- right (- $m6)
- top (- $m6)
- padding $m4
- background var(--c-bg-3)
- border 1px solid var(--c-bg-1)
- border-radius $m3
+ ^[0]:hover:not(._clear) &
+ @media $media-laptop
+ opacity 1
</style>
diff --git a/src/components/stat/StatMobile.vue b/src/components/stat/StatMobile.vue
index 512e1a0b..f6ab3f2b 100644
--- a/src/components/stat/StatMobile.vue
+++ b/src/components/stat/StatMobile.vue
@@ -77,6 +77,26 @@ export default {
.stat
StatSummaryMobile
+ .stat__filter(v-if="$store.state.filter.categoryId || $store.state.filter.walletId")
+ 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")
+ template(v-if="$store.state.filter.categoryId")
+ template(v-if="filterCategory.parentId !== 0")
+ FilterItem(
+ :color="filterCategoryParent.color || $store.state.ui.defaultBgColor"
+ :icon="filterCategoryParent.icon"
+ :name="filterCategoryParent.name"
+ v-on:onClick="clearParentCategoryFilter")
+ FilterItem(
+ :color="filterCategory.color || $store.state.ui.defaultBgColor"
+ :icon="filterCategory.icon"
+ :name="filterCategory.name"
+ v-on:onClick="clearCategoryFilter")
+
//- empty
//------------------------------------------------
EmptyData(
@@ -94,27 +114,6 @@ export default {
.stat__lastTrns(v-if="$store.state.ui.lastTrns === 'visible'")
TrnsListViewEasy
- .stat__filter(v-if="$store.state.filter.categoryId || $store.state.filter.walletId")
- .filter
- 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")
- template(v-if="$store.state.filter.categoryId")
- template(v-if="filterCategory.parentId !== 0")
- FilterItem(
- :color="filterCategoryParent.color || $store.state.ui.defaultBgColor"
- :icon="filterCategoryParent.icon"
- :name="filterCategoryParent.name"
- v-on:onClick="clearParentCategoryFilter")
- FilterItem(
- :color="filterCategory.color || $store.state.ui.defaultBgColor"
- :icon="filterCategory.icon"
- :name="filterCategory.name"
- v-on:onClick="clearCategoryFilter")
-
.stat__content
//- incomes
.statGroup(v-if="stat.incomes.categoriesIds.length")
@@ -236,6 +235,7 @@ export default {
<style lang="stylus" scoped>
@import "~@/stylus/variables/margins"
+@import "~@/stylus/variables/flex"
@import "~@/stylus/variables/fonts"
@import "~@/stylus/variables/scrollbar"
@@ -247,6 +247,7 @@ export default {
.stat
&__filter
padding $m8 $m7
+ background var(--c-bg-4)
&__charts
padding-bottom $m7
diff --git a/src/components/stat/StatSummaryPc.vue b/src/components/stat/StatSummaryPc.vue
index de56a529..1532000f 100644
--- a/src/components/stat/StatSummaryPc.vue
+++ b/src/components/stat/StatSummaryPc.vue
@@ -102,9 +102,9 @@ export default {
padding $m9 0
@media $media-pc
- flex-flow row
- align-items stretch
- justify-content space-between
+ display grid
+ grid-template-columns repeat(3, 1fr)
+ grid-column-gap $m9
padding 0
&__item
@@ -112,7 +112,7 @@ export default {
display flex
flex-flow column
justify-content center
- margin 0 $m7
+ margin $m5 $m7
padding $m3 $m8
padding-right 0
@media $media-phone