Skip to content

Open source personal finance application

refactor

ilkome74df9e8b569b
diff --git a/assets/stylus/variables/colors-dark.styl b/assets/stylus/variables/colors-dark.styl
index 833dccca..7c2809a1 100644
--- a/assets/stylus/variables/colors-dark.styl
+++ b/assets/stylus/variables/colors-dark.styl
@@ -45,6 +45,7 @@ html.dark-mode
--color-link-bg #1c1f24
--c-item-bg-main #1e1e1e
+ --c-item-bd-main #3f3f3f
--c-item-bg-hover #232323
--c-item-bd-hover #3f3f3f
diff --git a/components/chart/Periods.vue b/components/chart/Periods.vue
index 3c55d6bc..b40c739e 100644
--- a/components/chart/Periods.vue
+++ b/components/chart/Periods.vue
@@ -108,7 +108,7 @@ export default {
)
.periodItem__name {{ periodItem.name }}
- .periods__group(v-if="!isEmptyStat")
+ .periods__group
.periodItem(
@click="removePeriodOrGroup"
): .mdi.mdi-minus
diff --git a/components/trnForm/TrnForm.vue b/components/trnForm/TrnForm.vue
index 3c2e7239..58a85c94 100644
--- a/components/trnForm/TrnForm.vue
+++ b/components/trnForm/TrnForm.vue
@@ -210,12 +210,14 @@ export default {
.trnForm
.swiper-container(ref="slider")
.swiper-wrapper
+ //- History
.swiper-slide(:style="{ height: maxHeight }")
TrnFormTrns(
v-if="sliderObj"
:slider="sliderObj"
)
+ //- Main
.swiper-slide.getHeight
.scroll.scrollerBlock(:style="{ maxHeight: `${$store.state.ui.height}px` }")
.trnForm__title(v-if="$store.state.trnForm.values.trnId") {{ $t('trnForm.titleEditTrn') }}
@@ -228,9 +230,11 @@ export default {
TrnFormHeader
TrnFormHeaderTransfer(v-show="isTransfer")
+ //- Quick selector
.swiper-slide(:style="{ height: maxHeight }")
.scroll.scrollerBlock
div(style="paddingBottom: 16px")
+ //- Wallets
div(style="padding: 20px 0 26px 0")
WalletsList3(
:activeItemId="$store.state.trnForm.values.walletId"
@@ -240,6 +244,7 @@ export default {
@onClick="onClickWallet"
)
+ //- Favorite categories
div(style="padding: 0 0 26px 0")
.subTitle {{ $t('categories.favoriteTitle') }} {{ $t('categories.title') }}
CategoriesView(
@@ -250,6 +255,7 @@ export default {
@onClick="onCategoryClick"
)
+ //- Last used categories
div(style="padding: 0 0 10px 0")
.subTitle {{ $t('categories.lastUsedTitle') }} {{ $t('categories.title') }}
CategoriesView(
@@ -261,8 +267,8 @@ export default {
)
.buttons
- .button(@click="$store.commit('trnForm/showTrnFormModal', 'categories')") {{ $t('categories.title') }}
.button(@click="$store.commit('trnForm/showTrnFormModal', 'wallets')") {{ $t('wallets.title') }}
+ .button(@click="$store.commit('trnForm/showTrnFormModal', 'categories')") {{ $t('categories.title') }}
.trnForm__pagination
@@ -285,97 +291,25 @@ export default {
grid-column-gap $m6 !important
grid-row-gap $m6 !important
-.formTitle
- padding $m7
- fontFamilyNunito()
- color var(--c-font-4)
- font-size 18px
- font-weight 700
-
-.formCategories
- padding 0
- padding-bottom $m7
-
-.formWallets
- padding-bottom $m4
-
- &__input
- position relative
-
- &__value
- z-index 2
- position relative
- width 100%
- padding $m8 $m9
- color var(--c-font-2)
- font-header-1()
- font-size 36px
- font-weight 500
- text-align right
- background 0
- border 0
-
.trnForm
- &__handler
+ &__pagination
z-index 2
position absolute
- top 0
- left 0
- display flex
- align-items center
- justify-content center
- width 100%
- height 16px
-
- &:after
- content ''
- display block
- width 32px
- height 4px
- background var(--c-bg-8)
- border-radius 4px
-
- &__closure
- z-index 3
- cursor pointer
- position absolute
- top 4px
- right 4px
+ left 50%
+ bottom 1px
display flex
align-items center
justify-content center
- width 40px
- height 40px
- border-radius 50%
- anim()
-
- +media-hover()
- background var(--c-blue-1)
-
- svg
- anim()
- width 12px
- height 12px
- stroke var(--c-font-4)
-
- +media-hover()
- svg
- width 18px
- height 18px
- stroke var(--c-font-1)
+ width auto
+ padding $m5
+ background alpha(#171717, .9)
+ border-radius $m5
+ backdrop-filter blur(12px)
+ transform translateX(-50%)
- &__title
- padding 0 $m8
- padding-top $m9
- padding-bottom $m7
- color var(--c-font-3)
- font-size 22px
- font-weight 700
- letter-spacing 1px
- text-align center
- fontFamilyNunito()
+ /.light-mode &
+ background var(--color-bg-canvas)
- &__pagination
.swiper-pagination-bullet
opacity 1
width 6px
@@ -397,34 +331,6 @@ export default {
<style lang="stylus" scoped>
@import '~assets/stylus/variables'
-.buttons
- display flex
- align-items center
- justify-content center
- gap $m8
- padding 0 $m7
- padding-top $m4
- padding-bottom $m9
-
-.button
- button-base-1()
-
-.subTitle
- padding 0 $m8
- padding-bottom $m6
- color var(--c-font-4)
- font-size 10px
- letter-spacing 0px
- font-weight 600
- text-align center
- text-transform uppercase
-
-.scroll
- overflow hidden
- overflow-y auto
- height 100%
- scrollbar()
-
.trnForm
overflow hidden
overflow hidden
@@ -456,21 +362,42 @@ export default {
&__scroll
background var(--color-bg-canvas)
- &__pagination
- z-index 2
- position absolute
- left 50%
- bottom 1px
- display flex
- align-items center
- justify-content center
- width auto
- padding $m5
- background alpha(#171717, .9)
- border-radius $m5
- backdrop-filter blur(12px)
- transform translateX(-50%)
+ &__title
+ padding 0 $m8
+ padding-top $m9
+ padding-bottom $m7
+ color var(--c-font-3)
+ font-size 22px
+ font-weight 700
+ letter-spacing 1px
+ text-align center
+ fontFamilyNunito()
- /.light-mode &
- background var(--color-bg-canvas)
+.buttons
+ display flex
+ align-items center
+ justify-content center
+ gap $m8
+ padding 0 $m7
+ padding-top $m4
+ padding-bottom $m9
+
+.button
+ button-base-1()
+
+.subTitle
+ padding 0 $m8
+ padding-bottom $m6
+ color var(--c-font-4)
+ font-size 10px
+ letter-spacing 0px
+ font-weight 600
+ text-align center
+ text-transform uppercase
+
+.scroll
+ overflow hidden
+ overflow-y auto
+ height 100%
+ scrollbar()
</style>
diff --git a/components/trnForm/TrnFormCalendar.vue b/components/trnForm/TrnFormCalendar.vue
index 9530c81c..c615ca2f 100644
--- a/components/trnForm/TrnFormCalendar.vue
+++ b/components/trnForm/TrnFormCalendar.vue
@@ -32,10 +32,10 @@ export default {
<template lang="pug">
.trnFormDate
- .trnFormDate__item._icon(@click="setPrevDay()"): .mdi.mdi-chevron-left
+ .trnFormDate__item._arrow(@click="setPrevDay()"): .mdi.mdi-chevron-left
.trnFormDate__item._date(@click="$store.commit('trnForm/showTrnFormModal', 'calendar')") {{ formatedDate }}
.flex
- .trnFormDate__item._icon(
+ .trnFormDate__item._arrow(
v-if="!isToday" @click="setNextDay()"
style="marginRight: 16px"
): .mdi.mdi-chevron-right
@@ -70,7 +70,6 @@ export default {
border 1px solid transparent
border-radius $borderRadiusMd
user-select none
- anim()
+media(400px)
width 58px
@@ -86,6 +85,8 @@ export default {
flex-grow 1
color var(--c-font-3)
font-size 12px
+ border-radius 50px
+ border-color transparent
&._desc .mdi
color var(--c-blue-1)
@@ -93,12 +94,19 @@ export default {
&._icon
color var(--c-font-4)
font-size 28px
- background var(--c-bg-4)
- border-radius 50%
-
+ background var(--c-item-bg-main)
+ // border-radius 50%
.mdi
font-size 18px
+ &._arrow
+ color var(--c-font-4)
+ font-size 28px
+ background var(--c-item-bg-main)
+ // border-radius 50%
+ .mdi
+ font-size 24px
+
&._disable
opacity .4
diff --git a/components/trnForm/TrnFormTypes.vue b/components/trnForm/TrnFormTypes.vue
index 4376d794..15b939e9 100644
--- a/components/trnForm/TrnFormTypes.vue
+++ b/components/trnForm/TrnFormTypes.vue
@@ -53,14 +53,17 @@ export default {
.menuItem
cursor pointer
margin 0 $m5
- padding $m6 $m8
+ padding $m7 $m8
color var(--c-font-5)
font-size 12px
font-weight 500
font-roboto()
text-align center
+ background var(--c-item2-bg-main)
border 1px solid transparent
- anim()
+
+ +media(600px)
+ padding $m7 $m9
&._active
cursor default
@@ -69,6 +72,7 @@ export default {
+media-hover()
&:not(._active)
color var(--c-font-2)
- background var(--c-bg-5)
+ background var(--c-item-bg-hover)
+ border-color var(--c-item-bd-hover)
border-radius 50px
</style>
diff --git a/components/trnForm/calculator/TrnFormCalculator.vue b/components/trnForm/calculator/TrnFormCalculator.vue
index 6d1f2f36..614d6f0d 100644
--- a/components/trnForm/calculator/TrnFormCalculator.vue
+++ b/components/trnForm/calculator/TrnFormCalculator.vue
@@ -1,5 +1,5 @@
<script lang="ts">
-import { ref, onMounted, onUnmounted } from '@nuxtjs/composition-api'
+import { ref, computed, onMounted, onUnmounted, useContext } from '@nuxtjs/composition-api'
import useCalculator from './useCalculator'
import './long-press-event'
@@ -7,6 +7,9 @@ export default {
name: 'TrnFormCalculator',
setup () {
+ const { store } = useContext()
+ const amountType = computed(() => store.state.trnForm.values.amountType)
+
const deleteRef = ref(document.createElement('div'))
const {
@@ -31,6 +34,8 @@ export default {
})
return {
+ amountType,
+
isSum,
deleteRef,
handleTouch
@@ -54,32 +59,32 @@ export default {
.trnFormCalculator__group
.trnFormCalculator__numbers
- .calcItem._num(@click="handleTouch('7')")
+ .calcItem(@click="handleTouch('7')")
.calcItem__in 7
- .calcItem._num(@click="handleTouch('8')")
+ .calcItem(@click="handleTouch('8')")
.calcItem__in 8
- .calcItem._num(@click="handleTouch('9')")
+ .calcItem(@click="handleTouch('9')")
.calcItem__in 9
- .calcItem._num(@click="handleTouch('4')")
+ .calcItem(@click="handleTouch('4')")
.calcItem__in 4
- .calcItem._num(@click="handleTouch('5')")
+ .calcItem(@click="handleTouch('5')")
.calcItem__in 5
- .calcItem._num(@click="handleTouch('6')")
+ .calcItem(@click="handleTouch('6')")
.calcItem__in 6
- .calcItem._num(@click="handleTouch('1')")
+ .calcItem(@click="handleTouch('1')")
.calcItem__in 1
- .calcItem._num(@click="handleTouch('2')")
+ .calcItem(@click="handleTouch('2')")
.calcItem__in 2
- .calcItem._num(@click="handleTouch('3')")
+ .calcItem(@click="handleTouch('3')")
.calcItem__in 3
- .calcItem._num._grey(@click="handleTouch('.')")
+ .calcItem(@click="handleTouch('.')")
.calcItem__in .
- .calcItem._num(@click="handleTouch('0')")
+ .calcItem(@click="handleTouch('0')")
.calcItem__in 0
- .calcItem._clear(
+ .calcItem(
ref="deleteRef"
data-long-press-delay="300"
@click="handleTouch('delete')"
@@ -88,9 +93,7 @@ export default {
.trnFormCalculator__group
.trnFormCalculator__action
- .calcItem._sum(
- @click="isSum ? $emit('onSubmit') : handleTouch('=')"
- )
+ .calcItem._sum(@click="isSum ? $emit('onSubmit') : handleTouch('=')")
.calcItem__in
template(v-if="isSum")
.mdi.mdi-check
@@ -100,6 +103,7 @@ export default {
<style lang="stylus" scoped>
@import '~assets/stylus/variables'
+
.trnFormButton
padding $m7
@@ -134,6 +138,7 @@ export default {
grid-row-gap $m5
align-items space-between
justify-content space-between
+ max-width 240px
.calcItem
display flex
@@ -155,39 +160,27 @@ export default {
font-size 22px
border-bottom 0
border-right 0
- background var(--c-bg-4)
+ background var(--c-item-bg-main)
+ border 1px solid var(--c-item-bd-main)
border-radius 50%
user-select none
- anim()
+ anim(100ms)
+media(400px)
width 58px
height 58px
- ~/._num &
- background var(--c-bg-5)
-
- ~/._grey &
- background var(--c-bg-4)
-
- ~/._clear &
- ~/._dot &
- color var(--c-font-4)
-
~/._sum &
width 100%
height 100%
color var(--c-font-1)
font-size 40px
background var(--c-blue-1)
+ border-color transparent !important
+ border none
border-radius 6px
- ~/._expenses &
- background var(--c-expenses-1)
-
- ~/._incomes &
- background var(--c-incomes-1)
-
- &:active
- transform scale(1.1)
+ +media-hover()
+ background var(--c-bg-7)
+ border 1px solid var(--c-bg-8)
</style>
diff --git a/layouts/default.vue b/layouts/default.vue
index 4f1ea5da..c9bcfb96 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -221,7 +221,7 @@ export default {
&__menu
background var(--c-bg-3)
- +media(1100px)
+ +media(1200px)
display none
.handler