Skip to content

Open source personal finance application

Update TrnForm

ilkome8f36bf135c44
diff --git a/src/components/trnForm/TrnForm.vue b/src/components/trnForm/TrnForm.vue
index 0893c86a..647074bd 100644
--- a/src/components/trnForm/TrnForm.vue
+++ b/src/components/trnForm/TrnForm.vue
@@ -348,13 +348,4 @@ export default {
color var(--c-font-4)
text-align center
border-left 1px solid var(--c-bg-1)
-
- &-date
- &-desc
- &:hover
- @media $media-laptop
- background var(--c-bg-5)
-
- &:active
- background var(--c-bg-5)
</style>
diff --git a/src/components/trnForm/TrnFormAmount.vue b/src/components/trnForm/TrnFormAmount.vue
index d5d11f75..8ef489da 100644
--- a/src/components/trnForm/TrnFormAmount.vue
+++ b/src/components/trnForm/TrnFormAmount.vue
@@ -157,12 +157,12 @@ export default {
.action
template(v-if="!amountValue")
Button(
- className="_grey _center"
+ className="_grey _text-center"
title="Write amount"
v-on:onClick="handleMath")
template(v-else-if="amounIsNumber")
Button(
- className="_blue"
+ className="_blue _text-center"
:title="$store.state.trnForm.values.amountType === 2 ? 'Create transfer' : 'Create transaction'"
v-on:onClick="handleSubmit")
template(v-else)
diff --git a/src/components/trnForm/TrnFormCalendar.vue b/src/components/trnForm/TrnFormCalendar.vue
index b660c50a..1f7abc9f 100644
--- a/src/components/trnForm/TrnFormCalendar.vue
+++ b/src/components/trnForm/TrnFormCalendar.vue
@@ -1,4 +1,6 @@
<script>
+import moment from 'moment'
+
import { formatDate } from '@/utils/formatDate'
export default {
@@ -6,30 +8,66 @@ export default {
formatedDate () {
const date = formatDate(this.$store.state.trnForm.values.date, 'full')
return `${date.weekday}, ${date.day} ${date.month}`
+ },
+
+ isToday () {
+ return moment().isSame(this.$store.state.trnForm.values.date, 'day')
}
},
methods: {
- handleChangeAmountType () {
+ setPrevDay () {
+ this.$store.commit('setTrnFormValues', {
+ date: moment(this.$store.state.trnForm.values.date).subtract(1, 'day').valueOf()
+ })
+ },
+ setNextDay () {
+ if (!this.isToday) {
+ this.$store.commit('setTrnFormValues', {
+ date: moment(this.$store.state.trnForm.values.date).add(1, 'day').valueOf()
+ })
+ }
}
}
}
</script>
<template lang="pug">
-.trnFormDate(@click="$store.commit('toogleTrnFormModal', 'calendar')") {{ formatedDate }}
+.trnFormDate
+ .trnFormDate__item._icon(@click="setPrevDay()"): .mdi.mdi-chevron-left
+ .trnFormDate__item(@click="$store.commit('toogleTrnFormModal', 'calendar')") {{ formatedDate }}
+ .trnFormDate__item._icon(:class="{ _disable: isToday }" @click="setNextDay()"): .mdi.mdi-chevron-right
</template>
<style lang="stylus" scoped>
-@import "~@/stylus/variables/margins"
-@import "~@/stylus/variables/media"
+@import "~@/stylus/variables"
.trnFormDate
display flex
align-items center
- justify-content center
flex-grow 1
- padding $m8 $m9
+ height 100%
font-medium()
text-align center
+
+ &__item
+ display flex
+ align-items center
+ justify-content center
+ flex-grow 1
+ height 100%
+
+ &:hover
+ @media $media-laptop
+ background var(--c-bg-5)
+
+ &:active
+ background var(--c-bg-5)
+
+ &._icon
+ font-size 22px
+ color var(--c-font-4)
+
+ &._disable
+ opacity .3
</style>
diff --git a/src/components/trnForm/TrnFormHeader.vue b/src/components/trnForm/TrnFormHeader.vue
index d993970a..ad9c0703 100644
--- a/src/components/trnForm/TrnFormHeader.vue
+++ b/src/components/trnForm/TrnFormHeader.vue
@@ -37,47 +37,47 @@ export default {
<template lang="pug">
.trnFormHeader
//- Wallet
- template(v-if="wallet")
- .trnFormHeader__item(
- :style="{ background: wallet.color || $store.state.ui.defaultBgColor }"
- @click="$store.commit('toogleTrnFormModal', 'wallets')"
- )
- transition(name="slide")
- .trnFormHeader__icon(v-show="showIcon")
- Icon(
- :big="true"
- :color="wallet.color || $store.state.ui.defaultBgColor"
- :invert="true"
- icon="mdi mdi-credit-card-multiple"
- )
- div
- .trnFormHeader__name {{ wallet.name }}
- .trnFormHeader__total
- template(v-if="$store.getters.walletsTotal[values.walletId]")
- Amount(
- :value="$store.getters.walletsTotal[values.walletId].base"
- :currency="wallet.currency")
- template(v-else)
- Amount(
- :value="0"
- :currency="$store.state.currencies.base"
+ transition(name="fadeIn")
+ template(v-if="wallet")
+ .trnFormHeader__item(
+ :style="{ background: wallet.color || $store.state.ui.defaultBgColor }"
+ @click="$store.commit('toogleTrnFormModal', 'wallets')")
+
+ transition(name="slide")
+ .trnFormHeader__icon(v-show="showIcon")
+ Icon(
+ :big="true"
+ :color="wallet.color || $store.state.ui.defaultBgColor"
+ :invert="true"
+ icon="mdi mdi-credit-card-multiple"
)
+ div
+ .trnFormHeader__name {{ wallet.name }}
+ .trnFormHeader__total
+ template(v-if="$store.getters.walletsTotal[values.walletId]")
+ Amount(
+ :value="$store.getters.walletsTotal[values.walletId].base"
+ :currency="wallet.currency")
+ template(v-else)
+ Amount(
+ :value="0"
+ :currency="$store.state.currencies.base")
//- Category
template(v-if="category")
.trnFormHeader__item(
:style="{ background: category.color || $store.state.ui.defaultBgColor }"
- @click="$store.commit('toogleTrnFormModal', 'categories')"
- )
+ @click="$store.commit('toogleTrnFormModal', 'categories')")
+
transition(name="slide")
- .trnFormHeader__icon(v-show="showIcon")
+ .trnFormHeader__icon(v-show="showIcon" :key="category.icon")
Icon(
:big="true"
:color="category.color || $store.state.ui.defaultBgColor"
:icon="category.icon"
:invert="true"
- :round="true"
- )
+ :round="true")
+
.trnFormHeader__name {{ category.name }}
</template>
@@ -88,7 +88,6 @@ export default {
.trnFormHeader
display flex
justify-content space-between
- min-height 75px
background var(--c-bg-8)
@media $media-laptop
@@ -100,11 +99,11 @@ export default {
align-items center
flex-grow 1
width 50%
- padding $m8 $m8
+ padding 16px 16px
color var(--c-bg-5)
@media $media-laptop
- min-height 81px
+ min-height 61px
&:last-child
border-left-color var(--c-bg-5)
@@ -125,16 +124,6 @@ export default {
display none
&__name
- font-size 18px
+ font-size 14px
color var(--c-font-1)
-
- &__transfer
- display flex
- align-items center
- justify-content center
- padding 0 $m6
- font-size 22px
- border 1px solid var(--c-bg-5)
- border-right-color transparent
- border-top-color transparent
</style>
diff --git a/src/components/trnForm/TrnFormModalCats.vue b/src/components/trnForm/TrnFormModalCats.vue
index 9d446d84..a01febac 100644
--- a/src/components/trnForm/TrnFormModalCats.vue
+++ b/src/components/trnForm/TrnFormModalCats.vue
@@ -12,23 +12,6 @@ export default {
Slider
},
- data () {
- return {
- slideTo: 0
- }
- },
-
- computed: {
- catsCount () {
- return this.$store.getters.categoriesRootIds.length
- },
-
- slidesCount () {
- if (this.catsCount > 12) return Math.ceil(this.catsCount / 12)
- return 1
- }
- },
-
methods: {
handleCategoryClick (categoryId) {
if (this.$store.getters.getChildCategoriesIds(categoryId).length > 0) {
@@ -51,7 +34,7 @@ TrnFormModal(
)
template(slot="header")
.trnFormModal__header__back: .mdi.mdi-chevron-left
- .trnFormModal__header__title {{ $lang.categories.title }}
+ .trnFormModal__header__title {{ $lang.categories.name }}
.trnFormModal__icon
Icon(
icon="mdi mdi-chart-bubble"
@@ -84,26 +67,20 @@ TrnFormModal(
Slider(
:slidesPerColumn="1"
:slidesPerView="1"
- :autoHeight="false"
- :slideTo="slideTo"
- )
+ :autoHeight="true")
template(v-if="$store.state.ui.lastUsedCatsInTrnForm === 'visible'")
- .swiper-slide
- CategoriesView(
- :ids="$store.getters.lastUsedCategoriesIdsByDate"
- :noPaddingBottom="true"
- v-on:onClick="handleCategoryClick"
- )
-
- template(v-for="index in slidesCount")
- .swiper-slide
- CategoriesView(
- :ids="$store.getters.categoriesRootIds.slice((index - 1) * 12, (index - 1) * 12 + 12)"
- :noPaddingBottom="true"
- v-on:onClick="handleCategoryClick"
- )
+ template(v-if="$store.getters.lastUsedCategoriesIdsByDate.length > 0")
+ .swiper-slide
+ CategoriesView(
+ :ids="$store.getters.lastUsedCategoriesIdsByDate"
+ :noPaddingBottom="true"
+ v-on:onClick="handleCategoryClick")
- .categories__desc Slide left or right
+ .swiper-slide
+ CategoriesView(
+ :ids="$store.getters.categoriesRootIds"
+ :noPaddingBottom="true"
+ v-on:onClick="handleCategoryClick")
</template>
<style lang="stylus" scoped>
diff --git a/src/components/trnForm/TrnFormModalDescription.vue b/src/components/trnForm/TrnFormModalDescription.vue
index ea742d53..4c1859ec 100644
--- a/src/components/trnForm/TrnFormModalDescription.vue
+++ b/src/components/trnForm/TrnFormModalDescription.vue
@@ -51,24 +51,26 @@ export default {
<template lang="pug">
TrnFormModal(
:show="show"
- title="Description"
- v-on:onClose="$store.commit('toogleTrnFormModal', 'description')"
-)
+ :title="$lang.trnForm.description.title"
+ v-on:onClose="$store.commit('toogleTrnFormModal', 'description')")
.description
.description__filed
- textarea.textarea(v-focus="show" v-model="description" placeholder="Write trn description")
+ textarea.textarea(
+ v-focus="$store.state.ui.pc && show"
+ v-model="description"
+ :placeholder="$lang.trnForm.description.placeholder")
.description__action
.description__action-ok
Button(
className="_blue _inline"
- title="Save"
+ :title="$lang.base.save"
v-on:onClick="handleSave"
)
.description__action-cancel
Button(
className="_grey _inline"
- title="Cancel"
+ :title="$lang.base.cancel"
v-on:onClick="handleCancel"
)
</template>