Open source personal finance application
update 3.2.1
ilkome87b5860b1cee
diff --git a/components/amount/Amount.vue b/components/amount/Amount.vueindex 00bed7d7..c21a5ee8 100644--- a/components/amount/Amount.vue+++ b/components/amount/Amount.vue@@ -97,6 +97,7 @@ export default {&._incomescolor var(--c-incomes-1)+&._expensescolor var(--c-expenses-1)@@ -123,13 +124,21 @@ export default {font-weight boldfont-secondary()- ^[0]._base &+ ~/._base &font-size 12px- ^[0]._size_md &+ ~/._size_md &font-size 16pxfont-weight 600+ ~/._size_xl &+ font-size 36px+ font-weight 500++ ~/._size_xl._base &+ padding-top $m6+ font-size 18px+&__symbolpadding-bottom 0pxpadding-left 2px@@ -144,6 +153,15 @@ export default {~/._size_lg &padding-bottom 3px+ ~/._size_xl &+ padding-bottom 4px+ font-size 18px+ font-weight 300++ ~/._size_xl._base &+ padding-bottom 0+ font-size 14px+.amount._size_lg.amountItem__valuefont-size 22pxdiff --git a/components/categories/modal/CategoryModal.vue b/components/categories/modal/CategoryModal.vueindex 3e3d438d..008c347d 100644--- a/components/categories/modal/CategoryModal.vue+++ b/components/categories/modal/CategoryModal.vue@@ -58,6 +58,7 @@ export default {handleEditClick () {const categoryId = this.categoryIdthis.$store.commit('categories/hideCategoryModal')+ this.$store.commit('categories/setCategoryModalId', null)this.$store.commit('categories/setCategoryEditId', categoryId)this.$store.dispatch('ui/setActiveTab', 'createCategory')},@@ -127,22 +128,26 @@ divModalButton(:name="$t('base.delete')"icon="mdi mdi-delete"- @onClick="handleDeleteClick")+ @onClick="handleDeleteClick"+ )ModalButton(:name="$t('base.edit')"icon="mdi mdi-pencil"- @onClick="handleEditClick")+ @onClick="handleEditClick"+ )ModalButton(:name="$t('base.filter')"icon="mdi mdi-filter-outline"- @onClick="handleSetFilterCategory")+ @onClick="handleSetFilterCategory"+ )template(v-if="childCategoriesIds.length")CategoriesView(:borderTop="true":ids="childCategoriesIds":noPadding="true"- @onClick="id => $store.dispatch('categories/showCategoryModal', id)")+ @onClick="id => $store.dispatch('categories/showCategoryModal', id)"+ )ModalBottomConfirm(:show="showModalConfirm"diff --git a/components/layout/LayoutPc.vue b/components/layout/LayoutPc.vueindex c45cba89..50d6e90d 100644--- a/components/layout/LayoutPc.vue+++ b/components/layout/LayoutPc.vue@@ -52,7 +52,8 @@ export default {template(slot="content")CategoriesList.dashboardItems(- @onClick="id => $store.dispatch('categories/showCategoryModal', id)")+ @onClick="id => $store.dispatch('categories/showCategoryModal', id)"+ )template(slot="bottom").coldiff --git a/components/stat/StatItem.vue b/components/stat/StatItem.vueindex 211a2cfd..91c7e4e0 100644--- a/components/stat/StatItem.vue+++ b/components/stat/StatItem.vue@@ -62,9 +62,7 @@ export default {methods: {toogleShowInside (categoryId) {- this.$store.commit('stat/setCategoryModalId', categoryId)- this.$store.commit('stat/setCategoryModalShow', true)- // this.showInside = !this.showInside+ this.showInside = !this.showInside}}}@@ -73,15 +71,17 @@ export default {<template lang="pug">.statItem(@click="toogleShowInside(categoryId)"- :class="{ _active: showInside }")+ :class="{ _active: showInside }"+).statItem__content.statItem__graph: .statItem__graph__in(:style="styles")- .statItem__icon(@click.stop="showInside = !showInside")+ .statItem__icon(@click.stop="() => $store.dispatch('filter/handleSetFilterCategory', categoryId)")Icon(:background="category.color":icon="category.icon"- :round="true")+ :round="true"+ ).statItem__name {{ category.name }}.statItem__amountdiff --git a/components/stat/StatItemChildCatsItem2.vue b/components/stat/StatItemChildCatsItem2.vueindex aa6f97a3..65a205d0 100644--- a/components/stat/StatItemChildCatsItem2.vue+++ b/components/stat/StatItemChildCatsItem2.vue@@ -25,7 +25,7 @@ export default {data () {return {- showTrns: false+ isShowInside: false}},@@ -39,9 +39,8 @@ export default {},methods: {- toogleShowTrnsInCategory (categoryId) {- this.$store.commit('stat/setCategoryModalId', categoryId)- this.$store.commit('stat/setCategoryModalShow', true)+ toogleShowInside () {+ this.isShowInside = !this.isShowInside}}}@@ -49,14 +48,13 @@ export default {<template lang="pug">.statItemChild(- @click="toogleShowTrnsInCategory(categoryId)"- :class="{ _active: showTrns }")-+ @click="toogleShowInside(categoryId)"+ :class="{ _active: isShowInside }"+).statItemChild__content.statItemChild__graph: .statItemChild__graph__in(:style="styles")- .statItemChild__icon(- @click.stop="showTrns = !showTrns")+ .statItemChild__icon(@click.stop="() => $store.dispatch('filter/handleSetFilterCategory', categoryId)")Icon(:background="category.color":icon="category.icon"@@ -69,7 +67,7 @@ export default {:currency="$store.state.currencies.base":value="total")- .statItemChild__trns(@click.stop="" v-if="showTrns")+ .statItemChild__trns(@click.stop="" v-if="isShowInside")TrnsList(ui="stat":incomes="type === 1"diff --git a/components/trns/item/TrnItem.vue b/components/trns/item/TrnItem.vueindex af5ab138..ba41d62f 100644--- a/components/trns/item/TrnItem.vue+++ b/components/trns/item/TrnItem.vue@@ -82,27 +82,36 @@ export default {)//- detailed view+ //---------------------------------------------------------------------------template(v-if="ui === 'detailed'").trnItem__categoryIcon(@click.stop="setTrnEdit")Icon(:background="category.color"+ :big="true":icon="category.icon"- :round="true")- .trnItem__date {{ formatedDate }}+ :round="true"+ ).trnItem__categoryName {{ category.name }}.trnItem__wallet.walletIconIcon(:abbr="wallet.name":background="wallet.color"- :small="true")+ small+ )+.walletName {{ wallet.name }}++ .trnItem__date {{ formatedDate }}.trnItem__amount(@click.stop="setTrnEdit")Amount(:currency="wallet.currency"+ :type="trn.type":value="trn.amount"- size="lg"- :type="trn.type")+ vertical="center"+ size="xl"+ )+.trnItem__desc(v-if="trn.description") {{ trn.description }}//- stat view@@ -211,15 +220,7 @@ export default {).trnItem__descdiv(v-if="trn.description") {{ trn.description }}- //- div- //- span Баланс- //- Amount(- //- :currency="wallet.currency"- //- :value="filterTrnsDate.total"- //- :type="3"- //- size="sm"- //- vertical="left"- //- )+.trnItem__line</template>@@ -232,19 +233,21 @@ export default {color var(--c-font-4)&._detailed- display grid- grid-template-columns minmax(10px, max-content) 1fr minmax(10px, max-content)- grid-column-gap 20px- grid-row-gap 10px- width 100%+ display flex+ flex-flow column+ align-items center+ justify-content center+ margin-top -38px+ margin-bottom -10px+ text-align center&._historydisplay gridgrid-template-columns minmax(10px, max-content) 1fr minmax(10px, max-content)grid-column-gap 28px+ margin-top -1pxpadding 0 16pxpadding-top 10px- margin-top -1px&:first-childmargin-top 0@@ -253,8 +256,8 @@ export default {&._lastTrnsmargin-top -1pxpadding-top 10px- padding-left 68pxpadding-right 10px+ padding-left 68px@media $media-laptoppadding-left 62px@@ -276,8 +279,7 @@ export default {align-self center^[0]._detailed &- grid-column 3 / 4- grid-row 1 / 3+ //^[0]._history &grid-column 3 / 4@@ -289,9 +291,7 @@ export default {&__categoryIcon^[0]._detailed &- grid-column 1 / 2- grid-row 1 / 3- align-self center+ padding-bottom 12px^[0]._lastTrns &flex 0 0 24px@@ -303,9 +303,10 @@ export default {text-overflow ellipsis^[0]._detailed &- grid-column 2 / 3- grid-row 2 / 3- font-size 16px+ padding-bottom $m6+ color var(--c-font-2)+ font-size 22px+ fontFamilyNunito()^[0]._history &grid-column 2 / 3@@ -319,7 +320,8 @@ export default {font-size 13px^[0]._detailed &- grid-row 1 / 2+ padding-bottom $m8+ font-size 14px^[0]._stat &^[0]._lastTrns &@@ -333,8 +335,7 @@ export default {font-size 14px^[0]._detailed &- grid-column 2- grid-row 4+ padding-top $m7^[0]._history &grid-column 2 / 4@@ -344,9 +345,9 @@ export default {^[0]._stat &^[0]._lastTrns &+ overflow hiddenpadding-right 10pxwhite-space nowrap- overflow hiddentext-overflow ellipsis&__line@@ -354,7 +355,6 @@ export default {grid-column 2 / 4grid-row 4 / 5padding-top 9px- // border-bottom 1px solid var(--c-bg-6)^[0]._history:hover &@media $media-laptop@@ -384,15 +384,19 @@ export default {^[0]._lastTrns &display flexalign-items center+.walletIconmargin-right 8px+.walletNamefont-size 14pxwhite-space nowrap^[0]._detailed &- grid-column 2 / 3- grid-row 3 / 4+ padding-bottom $m6++ .walletName+ font-size 16px^[0]._stat &padding-right 20px@@ -401,8 +405,8 @@ export default {&__walletFloatIconposition absolute- left 35pxtop 24px+ left 35px&__groups&__budgestdiff --git a/components/trns/list/TrnsList.vue b/components/trns/list/TrnsList.vueindex 71d1d1e2..15b0475b 100644--- a/components/trns/list/TrnsList.vue+++ b/components/trns/list/TrnsList.vue@@ -26,7 +26,7 @@ export default {size: {type: Number,required: false,- default: 10+ default: 30}},diff --git a/components/trns/modal/TrnModal.vue b/components/trns/modal/TrnModal.vueindex 7f7feb4e..37e02bcd 100644--- a/components/trns/modal/TrnModal.vue+++ b/components/trns/modal/TrnModal.vue@@ -32,12 +32,14 @@ export default {methods: {handleSetFilterCategory (id) {this.$store.commit('trns/hideTrnModal')+ this.$store.commit('trns/setTrnModalId', null)this.$store.dispatch('ui/setActiveTab', 'stat')this.$store.commit('filter/setFilterDateNow')this.$store.dispatch('filter/setFilterCategoryId', this.$store.state.trns.items[this.trnId].categoryId)},handleSetFilterWallet (id) {this.$store.commit('trns/hideTrnModal')+ this.$store.commit('trns/setTrnModalId', null)this.$store.dispatch('ui/setActiveTab', 'stat')this.$store.commit('filter/setFilterDateNow')this.$store.dispatch('filter/setFilterWalletId', this.$store.state.trns.items[this.trnId].walletId)@@ -45,11 +47,13 @@ export default {handleDublicateTrn () {const trnId = this.trnIdthis.$store.commit('trns/hideTrnModal')+ this.$store.commit('trns/setTrnModalId', null)this.$store.dispatch('trnForm/openTrnForm', { action: 'duplicate', trnId })},handleEditClick () {const trnId = this.trnIdthis.$store.commit('trns/hideTrnModal')+ this.$store.commit('trns/setTrnModalId', null)this.$store.dispatch('trnForm/openTrnForm', { action: 'edit', trnId })},handleDeleteClick () {@@ -94,24 +98,28 @@ Portal(:trn="$store.state.trns.items[trnId]":trnId="trnId":wallet="wallet"- ui="detailed")+ ui="detailed"+ )//- btnstemplate(slot="btns")ModalButton(name="Delete"icon="mdi mdi-delete"- @onClick="handleDeleteClick")+ @onClick="handleDeleteClick"+ )ModalButton(name="Edit"icon="mdi mdi-pencil"- @onClick="handleEditClick")+ @onClick="handleEditClick"+ )ModalButton(name="Dublicate"icon="mdi mdi-content-copy"- @onClick="handleDublicateTrn")+ @onClick="handleDublicateTrn"+ ).moreActionsButton.marginBottom(@@ -174,8 +182,8 @@ Portal(to="modal")ModalBottom(- paddinglesstitle="groups"+ paddingless@onClose="showModalGroups = false")template(v-for="(group, groupId) in groups")@@ -191,7 +199,8 @@ Portal(ModalBottomConfirm(:show="showModalConfirm"@onClose="showModalConfirm = false"- @onConfirm="handleDeleteConfirm")+ @onConfirm="handleDeleteConfirm"+ )</template><style lang="stylus" scoped>@@ -202,10 +211,10 @@ Portal(margin-bottom $m7.item+ cursor pointerdisplay flexwidth 100%flex-grow 1- cursor pointerpadding $m7 $m8border-bottom 1px solid var(--c-bg-6)diff --git a/components/wallets/item/WalletItem2.vue b/components/wallets/item/WalletItem2.vueindex 09fdf193..3a860a01 100644--- a/components/wallets/item/WalletItem2.vue+++ b/components/wallets/item/WalletItem2.vue@@ -11,6 +11,16 @@ export default {showBase: {type: Boolean,default: true+ },++ vertical: {+ type: String,+ default: 'left'+ },++ size: {+ type: String,+ default: null}},@@ -48,9 +58,10 @@ export default {Amount(:alwaysShowSymbol="true":currency="wallet.currency"- :value="wallet.total":showBase="showBase"- vertical="left"+ :size="size"+ :value="wallet.total"+ :vertical="vertical")</template>diff --git a/components/wallets/modal/WalletModal.vue b/components/wallets/modal/WalletModal.vueindex 73d23804..af1de7af 100644--- a/components/wallets/modal/WalletModal.vue+++ b/components/wallets/modal/WalletModal.vue@@ -51,6 +51,7 @@ export default {handleEditClick () {const walletId = this.walletIdthis.$store.commit('wallets/hideWalletModal')+ this.$store.commit('wallets/setWalletModalId', null)this.$store.commit('wallets/setWalletEditId', walletId)this.$store.dispatch('ui/setActiveTab', 'createWallet')},@@ -90,7 +91,11 @@ Portal()template(v-if="walletId")template(slot="emptyHeader")- WalletItem2(:id="walletId")+ WalletItem2(+ :id="walletId"+ vertical="center"+ size="xl"+ )template(slot="description")template(v-if="$store.state.wallets.items[walletId].desc")@@ -100,21 +105,25 @@ Portal(ModalButton(:name="$t('base.delete')"icon="mdi mdi-delete"- @onClick="handleDeleteClick")+ @onClick="handleDeleteClick"+ )ModalButton(:name="$t('base.edit')"icon="mdi mdi-pencil"- @onClick="handleEditClick")+ @onClick="handleEditClick"+ )ModalButton(:name="$t('base.filter')"icon="mdi mdi-filter-outline"- @onClick="handleSetFilterWallet")+ @onClick="handleSetFilterWallet"+ )ModalBottomConfirm(:show="showModalConfirm":description="deleteInfo"@onClose="showModalConfirm = false"- @onConfirm="handleDeleteConfirm")+ @onConfirm="handleDeleteConfirm"+ )</template><style lang="stylus">@@ -125,11 +134,16 @@ Portal(width 100%padding $m8padding-top 0+ padding-bottom $m6+ background var(--c-bg-2)border-radius $m6 $m6 0 0&__namepadding-bottom $m7+ color var(--c-font-2)font-size 22px+ text-align center+ fontFamilyNunito()&__lineheight 6pxdiff --git a/package.json b/package.jsonindex 3677b856..ce010b93 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "finapp",- "version": "3.2.0",+ "version": "3.2.1","scripts": {"dev": "cross-env NUXT_HOST=0.0.0.0 nuxt","build": "nuxt build",