Skip to content

Open source personal finance application

feat (ui): update

ilkome9377963df8f8
diff --git a/components/amount/Amount.vue b/components/amount/Amount.vue
index 68e950c5..e8ad512f 100644
--- a/components/amount/Amount.vue
+++ b/components/amount/Amount.vue
@@ -205,7 +205,7 @@ export default {
~/._size_md &
font-size 16px
- font-weight 600
+ font-weight 500
~/._size_xl &
font-size 36px
diff --git a/components/base/BottomSheet.vue b/components/base/BottomSheet.vue
index 5fb199d8..552b12bb 100644
--- a/components/base/BottomSheet.vue
+++ b/components/base/BottomSheet.vue
@@ -362,6 +362,8 @@ export default defineComponent({
</template>
<style lang="stylus" scoped>
+@import '~assets/stylus/variables'
+
.info
padding 20px
@@ -408,13 +410,17 @@ export default defineComponent({
.drug
z-index 20
position absolute
- top 50%
+ left 50%
+ bottom 0
width 100%
height auto
- max-width 600px
- left 50%
- transform translateX(-50%) translateY(-50%)
- // max-height 90vh
+ max-width 480px
+ transform translateX(-50%) translateY(0)
+
+ +media(600px)
+ top 50%
+ bottom inherit
+ transform translateX(-50%) translateY(-50%)
&._anim
transition transform 150ms ease-out, opacity 150ms ease-out
diff --git a/components/chart/Periods.vue b/components/chart/Periods.vue
index 35cc414d..bf20f97e 100644
--- a/components/chart/Periods.vue
+++ b/components/chart/Periods.vue
@@ -65,7 +65,7 @@ export default {
<template lang="pug">
.periods
- .periods__group
+ .periods__group._custom
.periodItem(
@click="toogleView('showPieChart')"
): .mdi.mdi-chart-pie
@@ -119,7 +119,6 @@ export default {
display grid
grid-template-columns auto 1fr auto
grid-column-gap $m9
- grid-row-gap 60px
align-items center
+media(600px)
@@ -138,7 +137,7 @@ export default {
align-items center
justify-content center
min-width 20px
- padding 10px $m6
+ padding 10px $m5
color var(--c-font-5)
font-size 10px
border-radius $m3
diff --git a/components/date/MobileSelector.vue b/components/date/MobileSelector.vue
index 4216bfc7..f9363fc6 100644
--- a/components/date/MobileSelector.vue
+++ b/components/date/MobileSelector.vue
@@ -31,21 +31,17 @@ export default {
display flex
align-items center
justify-content center
- padding 0 $m4
- background var(--color-bg-canvas)
.menuDots
cursor pointer
display flex
align-items center
justify-content center
- padding $m5 $m8
- padding-right $m7
+ padding $m6 $m8
color var(--c-font-3)
- font-size 16px
- font-weight bold
- background var(--c-bg-4)
- border-radius $m4
+ font-size 22px
+ font-weight 500
+ border-radius $m8
anim()
+media(600px)
@@ -55,11 +51,7 @@ export default {
background none
+media-hover()
- color var(--c-font-2)
- background var(--c-blue-1)
- +media(600px)
- color var(--c-blue-1)
- background none
+ color var(--c-blue-1)
&__dots
margin-top -2px
diff --git a/components/layout/Mobile.vue b/components/layout/Mobile.vue
index 781661d9..61316ec1 100644
--- a/components/layout/Mobile.vue
+++ b/components/layout/Mobile.vue
@@ -74,7 +74,6 @@ export default {
//- Menu
//-----------------------------------
.layoutMobile__menu
- LayoutMobileStatMenu._bottom
LayoutMobileBottomMenu
//- Modals
@@ -240,7 +239,7 @@ export default {
background var(--color-bg-canvas)
+media(800px)
- padding 32px
+ padding 0 32px
+media(1000px)
padding 0 64px
diff --git a/components/layout/mobile/BottomMenu.vue b/components/layout/mobile/BottomMenu.vue
index 31fbf6fe..20990333 100644
--- a/components/layout/mobile/BottomMenu.vue
+++ b/components/layout/mobile/BottomMenu.vue
@@ -144,8 +144,8 @@ export default {
anim()
+media(600px)
- width 34px
- height 34px
+ width 24px
+ height 24px
.menu
background var(--c-bg-3)
diff --git a/components/layout/mobile/StatMenu.vue b/components/layout/mobile/StatMenu.vue
index 71bcefe0..0a63a0e7 100644
--- a/components/layout/mobile/StatMenu.vue
+++ b/components/layout/mobile/StatMenu.vue
@@ -56,25 +56,21 @@ export default {
z-index 10
display flex
align-items center
+ justify-content 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
+ display flex
+ align-items center
+ justify-content center
+ min-height 38px
margin 0 $m5
- padding $m6 $m8
+ padding $m6 $m6
color var(--c-font-5)
font-size 12px
font-weight 500
@@ -83,16 +79,21 @@ export default {
border-radius 50px
anim()
+ +media(400px)
+ padding-right $m7
+ padding-left $m7
+
+media(600px)
- flex-grow 0
+ padding-right $m9
+ padding-left $m9
+media-hover()
- cursor pointer
- color var(--c-font-3)
- background var(--c-bg-5)
+ &:not(._active)
+ cursor pointer
+ color var(--c-font-3)
+ background var(--c-bg-5)
&._active
+ cursor default
color var(--c-blue-1)
- +media-hover()
- background none
</style>
diff --git a/components/stat/Mobile.vue b/components/stat/Mobile.vue
index 083db28a..cfdc3f0f 100644
--- a/components/stat/Mobile.vue
+++ b/components/stat/Mobile.vue
@@ -139,10 +139,10 @@ export default {
<template lang="pug">
.pageWrapScroll
- .baseBox(v-if="ui.showMainChart && isShowChart")
+ .baseBox._chart(v-if="ui.showMainChart && isShowChart")
LazyChartMobileStatLines(v-if="ui.showMainChart && isShowChart")
- .baseBox._noBg
+ .baseBox._date
DateMobilePrevNextArrow
DateMobileSelector
@@ -154,7 +154,7 @@ export default {
template(v-if="activeTabStat !== 'history'")
//- Total
template(v-if="activeTabStat === 'details' && statAverage.incomes !== 0 && statAverage.expenses !== 0 && $store.state.filter.period !== 'all'")
- .baseBox
+ .baseBox._total
.baseBox__title {{ $t('money.total') }}
.boxSummary2
.boxSummary2__item
@@ -225,20 +225,6 @@ export default {
chartType="column"
)
- //- Cats horizontal list
- .statCategories(v-if="ui.showCatsHorizontalList && statCurrentPeriod[item.id].categoriesIds.length > 0")
- LazyStatItem(
- v-if="ui.showCatsHorizontalList && statCurrentPeriod[item.id].categoriesIds.length > 0"
- v-for="categoryId in statCurrentPeriod[item.id].categoriesIds"
- :key="categoryId"
- :biggest="statCurrentPeriod[item.id].biggest"
- :category="$store.state.categories.items[categoryId]"
- :categoryId="categoryId"
- :currency="$store.state.currencies.base"
- :total="statCurrentPeriod.categories[categoryId][item.id]"
- :type="item.type"
- )
-
//- Round cats list
.statItemsTiles(v-if="ui.showRoundCats && statWithLastPeriods[item.id].categoriesIds.length > 0")
LazyStatItemRound(
@@ -253,18 +239,32 @@ 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")
+ //- Cats horizontal list
+ .statCategories(v-if="ui.showCatsHorizontalList && statCurrentPeriod[item.id].categoriesIds.length > 0")
+ LazyStatItem(
+ v-if="ui.showCatsHorizontalList && statCurrentPeriod[item.id].categoriesIds.length > 0"
+ v-for="categoryId in statCurrentPeriod[item.id].categoriesIds"
+ :key="categoryId"
+ :biggest="statCurrentPeriod[item.id].biggest"
+ :category="$store.state.categories.items[categoryId]"
+ :categoryId="categoryId"
+ :currency="$store.state.currencies.base"
+ :total="statCurrentPeriod.categories[categoryId][item.id]"
+ :type="item.type"
+ )
+
+ template(v-if="(statAverage && (statAverage.incomes === 0 || statAverage.expenses === 0)) || (activeTabStat === 'incomes' || activeTabStat === 'expenses')")
+ .baseBox._mw(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"
+ :size="12"
)
//- history
- .history(v-if="statAverage && (statAverage.incomes !== 0 && statAverage.expenses !== 0) && ui.showHistory && $store.getters['trns/selectedTrnsIdsWithDate'].length > 0")
+ .history(v-if="statAverage && (statAverage.incomes !== 0 && statAverage.expenses !== 0) && ui.showHistory && $store.getters['trns/selectedTrnsIdsWithDate'].length > 0 && (activeTabStat !== 'incomes' && activeTabStat !== 'expenses')")
.baseBox__title {{ $t('trns.history') }}
TrnsList(:size="50")
@@ -314,8 +314,24 @@ export default {
@import '~assets/stylus/variables'
// ------------------------------------
.history
- .trnsList__day
- //
+ margin $m5 0
+ padding $m5 $m7
+ border-bottom 1px solid var(--c-bg-7)
+
+ +media(700px)
+ padding $m8 $m8
+ border-bottom 1px solid var(--c-bg-5)
+
+ .trnsList__content
+ .trnsList__grid
+ padding 0
+
+ .trnsList__day
+ padding-bottom 0
+
+ &:first-child
+ margin-top 0
+ padding-top $m5
.trnItem._history
margin 0
@@ -334,12 +350,17 @@ export default {
// ------------------------------------
.statMoneyTypes
+ align-items start
+
+media(700px)
display grid
grid-template-columns 1fr 1fr
- grid-column-gap 96px
+ grid-column-gap 0px
grid-row-gap 64px
+ +media(800px)
+ grid-column-gap 32px
+
.baseBox:last-child
border none
@@ -367,9 +388,12 @@ export default {
&._mw
max-width 480px
+ margin-top 0
&._noBdMedia
+media(700px)
+ position sticky
+ top 0
border none
&._noBg
@@ -388,6 +412,36 @@ export default {
+media(700px)
padding $m8 $m5
+ &._date
+ margin-top 0
+ margin-bottom 0
+ padding-top 0
+ padding-bottom $m5
+ background none
+ border none
+
+ +media(800px)
+ padding-bottom 0
+
+ &._chart
+ margin-top 0
+ margin-bottom 0
+ padding-top 0
+ padding-bottom 0
+ background none
+ border none
+
+ &._total
+ margin-top 0
+ padding-top $m4
+ background none
+
+ +media(800px)
+ margin-top 0
+ margin-bottom 0
+ padding-top 0
+ padding-bottom $m6
+
&__title
z-index 9
display flex
@@ -400,7 +454,8 @@ export default {
text-transform uppercase
+media(700px)
- padding-bottom $m7
+ padding-bottom $m6
+ padding-left $m5
font-secondary()
font-size 18px
@@ -433,6 +488,7 @@ export default {
grid-row-gap 0
.statCategories
+ max-width 400px
padding $m7 $m5
// ------------------------------------
diff --git a/components/stat/cats/PeriodCatsChartItem.vue b/components/stat/cats/PeriodCatsChartItem.vue
index 32fcca9b..78215ef2 100644
--- a/components/stat/cats/PeriodCatsChartItem.vue
+++ b/components/stat/cats/PeriodCatsChartItem.vue
@@ -85,7 +85,7 @@ export default {
margin-top 12px
margin-right 10px
background var(--c-bg-5)
- border-radius $m3
+ border-radius $m4
&:hover
@media $media-laptop
@@ -103,7 +103,7 @@ export default {
height 80px
margin 0 auto
margin-bottom -3px
- border-radius 3px
+ border-radius $m4
&__amount
position absolute
@@ -121,7 +121,7 @@ export default {
bottom 0px
width 100%
min-height 1px
- border-radius 3px 3px 0 0
+ border-radius $m4 $m4 0 0
&__icon
display none
diff --git a/components/trnForm/calculator/TrnFormCalculator.vue b/components/trnForm/calculator/TrnFormCalculator.vue
index c8e48dfe..b03497ba 100644
--- a/components/trnForm/calculator/TrnFormCalculator.vue
+++ b/components/trnForm/calculator/TrnFormCalculator.vue
@@ -58,54 +58,61 @@ div
)
.trnFormCalculator(v-if="!pc")
- .calcItem._act(@click="handleTouch('+')")
- .calcItem__in +
- .calcItem._num(@click="handleTouch('7')")
- .calcItem__in 7
- .calcItem._num(@click="handleTouch('8')")
- .calcItem__in 8
- .calcItem._num(@click="handleTouch('9')")
- .calcItem__in 9
-
- .calcItem._act(@click="handleTouch('-')")
- .calcItem__in -
- .calcItem._num(@click="handleTouch('4')")
- .calcItem__in 4
- .calcItem._num(@click="handleTouch('5')")
- .calcItem__in 5
- .calcItem._num(@click="handleTouch('6')")
- .calcItem__in 6
-
- .calcItem._act(@click="handleTouch('*')")
- .calcItem__in *
- .calcItem._num(@click="handleTouch('1')")
- .calcItem__in 1
- .calcItem._num(@click="handleTouch('2')")
- .calcItem__in 2
- .calcItem._num(@click="handleTouch('3')")
- .calcItem__in 3
-
- .calcItem._act(@click="handleTouch('/')")
- .calcItem__in /
- .calcItem._dot(@click="handleTouch('.')")
- .calcItem__in .
- .calcItem._num(@click="handleTouch('0')")
- .calcItem__in 0
- .calcItem._clear(
- ref="deleteRef"
- data-long-press-delay="300"
- @click="handleTouch('delete')"
- )
- .calcItem__in <
-
- .calcItem._sum(
- @click="isSum ? $emit('onSubmit') : handleTouch('=')"
- )
- .calcItem__in
- template(v-if="isSum")
- .mdi.mdi-check
- template(v-else)
- .mdi.mdi-equal
+ .trnFormCalculator__group
+ .trnFormCalculator__acts
+ .calcItem._act(@click="handleTouch('+')")
+ .calcItem__in: .mdi.mdi-plus
+ .calcItem._act(@click="handleTouch('-')")
+ .calcItem__in: .mdi.mdi-minus
+ .calcItem._act(@click="handleTouch('*')")
+ .calcItem__in: .mdi.mdi-plus(style="transform: rotate(45deg)")
+ .calcItem._act(@click="handleTouch('/')")
+ .calcItem__in: .mdi.mdi-slash-forward
+
+ .trnFormCalculator__group
+ .trnFormCalculator__numbers
+ .calcItem._num(@click="handleTouch('7')")
+ .calcItem__in 7
+ .calcItem._num(@click="handleTouch('8')")
+ .calcItem__in 8
+ .calcItem._num(@click="handleTouch('9')")
+ .calcItem__in 9
+
+ .calcItem._num(@click="handleTouch('4')")
+ .calcItem__in 4
+ .calcItem._num(@click="handleTouch('5')")
+ .calcItem__in 5
+ .calcItem._num(@click="handleTouch('6')")
+ .calcItem__in 6
+
+ .calcItem._num(@click="handleTouch('1')")
+ .calcItem__in 1
+ .calcItem._num(@click="handleTouch('2')")
+ .calcItem__in 2
+ .calcItem._num(@click="handleTouch('3')")
+ .calcItem__in 3
+
+ .calcItem._num._grey(@click="handleTouch('.')")
+ .calcItem__in .
+ .calcItem._num(@click="handleTouch('0')")
+ .calcItem__in 0
+ .calcItem._clear(
+ ref="deleteRef"
+ data-long-press-delay="300"
+ @click="handleTouch('delete')"
+ )
+ .calcItem__in C
+
+ .trnFormCalculator__group
+ .trnFormCalculator__action
+ .calcItem._sum(
+ @click="isSum ? $emit('onSubmit') : handleTouch('=')"
+ )
+ .calcItem__in
+ template(v-if="isSum")
+ .mdi.mdi-check
+ template(v-else)
+ .mdi.mdi-equal
</template>
<style lang="stylus" scoped>
@@ -116,25 +123,41 @@ div
.trnFormCalculator
display grid
- grid-template-columns repeat(5, minmax(10px, 1fr))
- grid-template-rows repeat(4, minmax(10px, 1fr))
- grid-column-gap 8px
- grid-row-gap 8px
+ grid-template-columns auto 1fr auto
+ align-items stretch
+ grid-column-gap $m8
+ grid-row-gap $m8
padding $m7
+ &__group
+ display flex
+ align-items stretch
+ justify-content center
+
+ &__action
+ display flex
+ align-items stretch
+
+ &__acts
+ display grid
+ grid-template-columns 1fr
+ grid-column-gap $m5
+ grid-row-gap $m5
+
+ &__numbers
+ flex-grow 1
+ display grid
+ grid-template-columns repeat(3, 1fr)
+ grid-column-gap $m5
+ grid-row-gap $m5
+ align-items space-between
+ justify-content space-between
+
.calcItem
display flex
align-items center
justify-content center
font-secondary()
- anim()
-
- ~/._sum
- grid-column 5 / 6
- grid-row 1 / -1
- align-items stretch
- padding-left 4px
- color var(--c-font-1)
~/._pc
padding 0 $m7
@@ -143,33 +166,32 @@ div
display flex
align-items center
justify-content center
- width 40px
- height 40px
- font-size 26px
+ width 58px
+ height 58px
+ padding $m7
+ color var(--c-font-3)
+ font-size 22px
border-bottom 0
border-right 0
background var(--c-bg-4)
border-radius 50%
user-select none
-
- @media $media-phone-normal
- padding $m8
+ anim()
~/._num &
- color var(--c-font-3)
- font-size 22px
background var(--c-bg-5)
- ~/._act &
- color var(--c-font-4)
+ ~/._grey &
+ background var(--c-bg-4)
~/._clear &
~/._dot &
- color var(--c-font-5)
+ color var(--c-font-4)
~/._sum &
width 100%
height 100%
+ color var(--c-font-1)
font-size 40px
background var(--c-blue-1)
border-radius 6px
@@ -181,6 +203,5 @@ div
background var(--c-incomes-1)
&:active
- background var(--c-bg-3)
transform scale(1.1)
</style>
diff --git a/components/trnForm/modal/TrnFormModalCalendar.vue b/components/trnForm/modal/TrnFormModalCalendar.vue
index 0e00a66f..971e1b97 100644
--- a/components/trnForm/modal/TrnFormModalCalendar.vue
+++ b/components/trnForm/modal/TrnFormModalCalendar.vue
@@ -87,6 +87,8 @@ TrnFormModal(@closed="afterClose")
</template>
<style lang="stylus">
+@import '~assets/stylus/variables'
+
.inlineCalendar
padding 0 $m7
padding-bottom $m7
diff --git a/components/trns/item/TrnItem.vue b/components/trns/item/TrnItem.vue
index 03269a0e..61fc3b3e 100644
--- a/components/trns/item/TrnItem.vue
+++ b/components/trns/item/TrnItem.vue
@@ -260,6 +260,7 @@ export default {
:currency="wallet.currency"
:value="trn.amount"
:type="trn.type"
+ size="md"
:isColorize="trn.type === 1"
isShowPrefix
)
diff --git a/components/trns/list/TrnsListDate.vue b/components/trns/list/TrnsListDate.vue
index 9eac4528..b1480004 100644
--- a/components/trns/list/TrnsListDate.vue
+++ b/components/trns/list/TrnsListDate.vue
@@ -27,7 +27,7 @@ export default {
</template>
<style lang="stylus" scoped>
-@import "~assets/stylus/variables/margins"
+@import '~assets/stylus/variables'
.trnsListDate
display grid
@@ -39,8 +39,9 @@ export default {
grid-row 1 / 3
padding-right 10px
align-self center
+ font-secondary()
font-size 32px
- font-weight 500
+ font-weight 400
&__weekday
padding-top 2px