Open source personal finance application
add portal-vue, add nuxt-composition-api, refactor BaseModal
ilkome980a89b7ced0
diff --git a/components/layout/PeriodNavMobile.vue b/components/layout/PeriodNavMobile.vueindex e301090e..e140fb33 100644--- a/components/layout/PeriodNavMobile.vue+++ b/components/layout/PeriodNavMobile.vue@@ -20,43 +20,12 @@ export default {ContextMenu(:position="{ left: true, bottom: true }":visible="visiblePeriodMenu"- @onClickOpener="visiblePeriodMenu = !visiblePeriodMenu")+ @onClickOpener="visiblePeriodMenu = !visiblePeriodMenu"+ )template(slot="opener")Dropdown(:active="visiblePeriodMenu")template(slot="title"): Date- template(slot="content")- ContextMenuItem(- icon="mdi mdi-weather-sunset-up"- :title="$lang.dates.day.simple"- :selected="$store.state.filter.period === 'day'"- @onClick="$store.dispatch('filter/setPeriod', 'day')"- @onClose="visiblePeriodMenu = !visiblePeriodMenu")- ContextMenuItem(- icon="mdi mdi-calendar-week"- :title="$lang.dates.week.simple"- :selected="$store.state.filter.period === 'week'"- @onClick="$store.dispatch('filter/setPeriod', 'week')"- @onClose="visiblePeriodMenu = !visiblePeriodMenu")- ContextMenuItem(- icon="mdi mdi-calendar"- :title="$lang.dates.month.simple"- :selected="$store.state.filter.period === 'month'"- @onClick="$store.dispatch('filter/setPeriod', 'month')"- @onClose="visiblePeriodMenu = !visiblePeriodMenu")- ContextMenuItem(- icon="mdi mdi-calendar-star"- :title="$lang.dates.year.simple"- :selected="$store.state.filter.period === 'year'"- @onClick="$store.dispatch('filter/setPeriod', 'year')"- @onClose="visiblePeriodMenu = !visiblePeriodMenu")- ContextMenuItem(- icon="mdi mdi-database"- :title="$lang.dates.all"- :selected="$store.state.filter.period === 'all'"- @onClick="$store.dispatch('filter/setPeriod', 'all')"- @onClose="visiblePeriodMenu = !visiblePeriodMenu")-.customizeStatCustomizeMenuMobile(icon="mdi mdi-tune"@@ -67,6 +36,42 @@ export default {:class="{ _disable: $store.state.filter.period === 'all' || $store.getters['stat/isLastPeriodSelected'] }").mdi.mdi-chevron-right++ BaseModal(+ :show="visiblePeriodMenu"+ title="Select period"+ @onClose="visiblePeriodMenu = false"+ )+ ContextMenuItem(+ icon="mdi mdi-weather-sunset-up"+ :title="$lang.dates.day.simple"+ :selected="$store.state.filter.period === 'day'"+ @onClick="$store.dispatch('filter/setPeriod', 'day')"+ @onClose="visiblePeriodMenu = !visiblePeriodMenu")+ ContextMenuItem(+ icon="mdi mdi-calendar-week"+ :title="$lang.dates.week.simple"+ :selected="$store.state.filter.period === 'week'"+ @onClick="$store.dispatch('filter/setPeriod', 'week')"+ @onClose="visiblePeriodMenu = !visiblePeriodMenu")+ ContextMenuItem(+ icon="mdi mdi-calendar"+ :title="$lang.dates.month.simple"+ :selected="$store.state.filter.period === 'month'"+ @onClick="$store.dispatch('filter/setPeriod', 'month')"+ @onClose="visiblePeriodMenu = !visiblePeriodMenu")+ ContextMenuItem(+ icon="mdi mdi-calendar-star"+ :title="$lang.dates.year.simple"+ :selected="$store.state.filter.period === 'year'"+ @onClick="$store.dispatch('filter/setPeriod', 'year')"+ @onClose="visiblePeriodMenu = !visiblePeriodMenu")+ ContextMenuItem(+ icon="mdi mdi-database"+ :title="$lang.dates.all"+ :selected="$store.state.filter.period === 'all'"+ @onClick="$store.dispatch('filter/setPeriod', 'all')"+ @onClose="visiblePeriodMenu = !visiblePeriodMenu")</template><style lang="stylus" scoped>diff --git a/components/shared/BaseModal.vue b/components/shared/BaseModal.vuenew file mode 100644index 00000000..faf45ddc--- /dev/null+++ b/components/shared/BaseModal.vue@@ -0,0 +1,195 @@+<script>+import { ref } from 'nuxt-composition-api'+import useTouchClose from '~/composables/useTouchClose'++export default {+ props: {+ title: {+ type: String,+ default: null+ },+ show: {+ type: Boolean,+ required: true+ },+ position: {+ type: String,+ default: null+ }+ },++ setup (props, ctx) {+ const scrollContainer = ref(null)+ const scrollContent = ref(null)+ const scrollOverflow = ref(null)+ const scrollDragger = ref(null)++ useTouchClose({+ container: scrollContainer,+ content: scrollContent,+ overflow: scrollOverflow,+ dragger: scrollDragger,+ onClose: () => ctx.listeners.onClose && ctx.listeners.onClose()+ })++ return {+ scrollContainer,+ scrollContent,+ scrollOverflow,+ scrollDragger+ }+ },++ data () {+ return {+ headerHeight: 0+ }+ },++ computed: {+ modalStyle () {+ return {}+ }+ },++ methods: {+ afterClose () {+ if (this.$listeners.afterClose) {+ this.$listeners.afterClose()+ }+ },++ onClose () {+ this.$listeners.onClose()+ }+ }+}+</script>++<template lang="pug">+portal(to="default" v-if="show")+ .baseModal(+ ref="scrollContainer"+ :class="{ _opened: show }"+ )+ transition(name="fadeIn" appear)+ .baseModal__overflow(+ v-show="show"+ ref="scrollOverflow"+ @click="onClose"+ )++ transition(name="slide" appear @after-leave="afterClose")+ .baseModal__wrap(+ ref="scrollDragger"+ v-show="show"+ )+ .baseModal__header(+ @click="onClose"+ ref="header"+ )+ .baseModal__header__title(v-if="title") {{ title }}+ .baseModal__header__close: .mdi.mdi-close++ .baseModal__scroll(+ :style="modalStyle"+ ref="scrollContent"+ )+ slot()+</template>++<style lang="stylus" scoped>+@import "~assets/stylus/variables/animations"+@import "~assets/stylus/variables/fonts"+@import "~assets/stylus/variables/media"+@import "~assets/stylus/variables/margins"++.baseModal+ z-index 3+ position fixed+ left 0++ &._opened+ width 100%+ height 100%++ @media $media-phone+ bottom 0++ @media $media-laptop+ top 0+ left 0px++ &__overflow+ position absolute+ left 0+ bottom 0+ width 100%+ height 100%+ background var(--c-bg-overflow)+ anim()++ @media $media-laptop+ display none++ &__wrap+ z-index 2+ overflow hidden+ position absolute+ left 0+ bottom 0+ width 100%+ display flex+ flex-grow 1+ flex-flow column nowrap+ background var(--c-bg-4)+ border-radius $m6++ &._anim+ anim(400ms)++ @media $media-phone+ border-radius $m6 $m6 0 0++ /.light-mode &+ background var(--c-bg-2)++ &__scroll+ overflow hidden+ overflow-y auto+ max-height 100%+ padding $m7 0+ scrollbar()++ &__header+ cursor pointer+ position relative+ display flex+ align-items center+ justify-content space-between+ padding $m7+ color var(--c-font-3)+ font-size 22px+ font-weight 700+ letter-spacing 1px+ fontFamilyNunito()++ /.light-mode &+ color var(--c-font-4)++ &:hover+ &:active+ background var(--c-bg-5)++ &__title+ flex-grow 1++ &__close+ color var(--c-font-4)+ font-size 20px++ &__icon+ position absolute+ top -24px+ right $m7+</style>diff --git a/components/shared/contextMenu/ContextMenu.vue b/components/shared/contextMenu/ContextMenu.vueindex f951c58d..5fdc1a1d 100644--- a/components/shared/contextMenu/ContextMenu.vue+++ b/components/shared/contextMenu/ContextMenu.vue@@ -45,7 +45,7 @@ export default {<template lang="pug">.context-menutransition(name="slide2")- .context-menu__popup(:class="className", :style="positionStyles" v-show="visible")+ .context-menu__popup(v-if="$slots.content" :class="className", :style="positionStyles" v-show="visible").context-menu__overflow(@click="$emit('onClickOpener')").context-menu__contentslot(name="content")diff --git a/components/shared/contextMenu/ContextMenuItem.vue b/components/shared/contextMenu/ContextMenuItem.vueindex 0f29b50f..490aa27d 100644--- a/components/shared/contextMenu/ContextMenuItem.vue+++ b/components/shared/contextMenu/ContextMenuItem.vue@@ -52,15 +52,15 @@ export default {@import "~assets/stylus/variables/media".item+ cursor pointerdisplay flexalign-items centerpadding 0 $m6font-size 13pxwhite-space nowrap- cursor pointer@media $media-phone- height 46px+ height 56px@media $media-laptopheight 38pxdiff --git a/components/trnForm/TrnForm.vue b/components/trnForm/TrnForm.vueindex 3dedc3ca..2c739e9e 100644--- a/components/trnForm/TrnForm.vue+++ b/components/trnForm/TrnForm.vue@@ -1,14 +1,33 @@<script>import dayjs from 'dayjs'+import { ref, useContext } from 'nuxt-composition-api'import generateId from '~/utils/id'+import useTouchClose from '~/composables/useTouchClose'import { successEmo, random } from '~/assets/js/emo'export default {- data () {+ setup () {+ const scrollContainer = ref(null)+ const scrollContent = ref(null)+ const scrollOverflow = ref(null)+ const scrollDragger = ref(null)++ const { store } = useContext()++ useTouchClose({+ container: scrollContainer,+ content: scrollContent,+ overflow: scrollOverflow,+ dragger: scrollDragger,+ noDragClasss: '.noDrag',+ onClose: () => store.dispatch('trnForm/closeTrnForm')+ })+return {- initialY: 0,- currentY: 0,- isDragging: false+ scrollContainer,+ scrollContent,+ scrollOverflow,+ scrollDragger}},@@ -17,6 +36,10 @@ export default {return this.$store.state.trnForm.show},+ trnFormHeader () {+ return 'hey'+ },+isTransfer () {return this.$store.state.trnForm.values.amountType === 2},@@ -36,11 +59,6 @@ export default {show: {handler (show) {if (show) {- // this.initialY = 0- // this.currentY = 0- // this.isDragging = false- this.setTranslate()-this.$nextTick(() => {this.setTrnFormHeight()})@@ -56,10 +74,6 @@ export default {}},- mounted () {- this.adddListeners()- },-methods: {handleSubmitForm () {try {@@ -126,7 +140,7 @@ export default {setTrnFormHeight () {const trnFormHeight = this.$store.state.trnForm.height- const height = this.$refs.trnFormWrapRef.clientHeight+ const height = this.$refs.scrollContainer.clientHeightconst trnFormHeaderHeight = 0const newTrnFormHeight = height - trnFormHeaderHeight@@ -227,118 +241,7 @@ export default {})},- adddListeners () {- const modalContainer = this.$refs.trnForm- if (modalContainer) {- modalContainer.addEventListener('touchstart', this.onDragStart, false)- modalContainer.addEventListener('touchend', this.onDragEnd, false)- modalContainer.addEventListener('touchmove', this.onDragging, false)- modalContainer.addEventListener('mouseup', this.onDragEnd, false)- }- },-- onDragStart (e) {- // stop trnFormModal drag when content has scroll- // wait until content scroll up to top- const scrollBlock = this.$refs.trnForm.querySelector('.trnForm__scroll')- if (scrollBlock && scrollBlock.scrollTop > 0) {- return- }-- // same as above but for any block- // const swiperSlideActive = this.$el.querySelector('.trnFormActiveSlide')- // if (swiperSlideActive) {- // const sliderWithScroll = swiperSlideActive.querySelector('.waitForScroll')- // if (sliderWithScroll) {- // if (sliderWithScroll.scrollTop > 0) { return }- // }- // }-- const dragItem = this.$refs.trnForm.querySelector('.trnForm__wrap')- if (dragItem) {- dragItem.classList.remove('_anim')-- if (e.type === 'touchstart') {- this.initialY = e.touches[0].clientY- }- else {- this.initialY = e.clientY- }-- if (e.target.closest('.trnForm__wrap')) {- this.isDragging = true- }-- if (e.target.closest('.noDrag')) {- this.isDragging = false- }- }- },-- onDragging (e) {- if (this.isDragging) {- if (e.type === 'touchmove') {- this.currentY = e.touches[0].clientY - this.initialY- }- else {- this.currentY = e.clientY - this.initialY- }-- if ((Math.abs(this.currentY) < Math.abs(this.currentX))) {- return- }-- this.setTranslate()- }- },-- onDragEnd (e) {- const dragItem = this.$refs.trnForm.querySelector('.trnForm__wrap')-- // do not close- if (this.currentY >= 80) {- dragItem.classList.add('_anim')- this.currentY = this.$refs.trnForm.clientHeight- this.setTranslate()- this.onClose()- }- // close- else {- this.currentY = 0- this.currentX = 0- this.setTranslate()- if (this.isDragging) { dragItem.classList.add('_anim') }- }-- this.isDragging = false- },-- setTranslate () {- if (this.$refs.trnForm) {- const modalHeight = this.$refs.trnForm.clientHeight- const diff = (modalHeight - this.currentY) / (modalHeight / 100)- const diffTrunc = Math.trunc(diff)-- const modalContainer = this.$refs.trnForm- const dragItem = modalContainer.querySelector('.trnForm__wrap')- const overflow = modalContainer.querySelector('.trnForm__overflow')-- if (this.currentY === 0 && dragItem) {- dragItem.style.transform = ''- overflow.style.opacity = ''- }- else if (this.currentY > 0 && dragItem) {- dragItem.style.transform = `translate3d(0, ${this.currentY}px, 0)`- overflow.style.opacity = diffTrunc === 100 ? 1 : `0.${diffTrunc}`- }- }- },-onClose () {- this.initialY = 0- this.currentY = 0- this.isDragging = false-this.$store.dispatch('trnForm/closeTrnForm')}}@@ -348,11 +251,12 @@ export default {<template lang="pug">.trnForm(v-if="$store.getters['wallets/hasWallets'] && $store.getters['categories/hasCategories']"- ref="trnForm"+ ref="scrollContainer")//- overflowtransition(name="fadeIn").trnForm__overflow(+ ref="scrollOverflow"v-show="show"@click.prevent="onClose")@@ -361,12 +265,14 @@ export default {transition(name="trnFormAnimation").trnForm__wrap(v-show="show"- ref="trnFormWrapRef"+ ref="scrollDragger")//- content- .trnForm__scroll+ .trnForm__scroll(ref="scrollContent").trnForm__content+ //- .trnForm__header.noDrag {{ trnFormHeader }}+//- laptoptemplate(v-if="$store.state.ui.pc")TrnFormCalendar@@ -401,8 +307,13 @@ export default {@onFormSubmit="handleSubmitForm")- template(v-if="$store.state.ui.mobile")- TrnFormCalendar+ TrnFormCalendar(+ v-if="$store.state.ui.mobile"+ )+ LazyTrnFormCalculator(+ v-if="$store.state.ui.mobile"+ @onFormSubmit="handleSubmitForm"+ )//- pctemplate(v-if="$store.state.ui.pc")@@ -422,18 +333,16 @@ export default {:ids="$store.getters['categories/quickSelectorCategoriesIds']":noPaddingBottom="true"@onClick="categoryId => $store.commit('trnForm/setTrnFormValues', { categoryId })")- //- pc: end- //- mobile- template(v-if="$store.state.ui.mobile")- TrnFormCalculator(@onFormSubmit="handleSubmitForm")-- //- header- TrnFormHeaderTransfer(- v-if="$store.getters['wallets/walletsSortedIds'].length > 1"- v-show="isTransfer"- )- TrnFormHeader(v-show="!isTransfer")+ //- Header+ TrnFormHeaderTransfer(+ v-if="$store.state.ui.mobile && $store.getters['wallets/walletsSortedIds'].length > 1"+ v-show="isTransfer"+ )+ TrnFormHeader(+ v-if="$store.state.ui.mobile"+ v-show="!isTransfer"+ )//- ModalsTrnFormModalCatsdiff --git a/components/trnForm/TrnFormModal.vue b/components/trnForm/TrnFormModal.vueindex 111cd5eb..dcf575d2 100644--- a/components/trnForm/TrnFormModal.vue+++ b/components/trnForm/TrnFormModal.vue@@ -1,4 +1,7 @@<script>+import { ref } from 'nuxt-composition-api'+import useTouchClose from '~/composables/useTouchClose'+export default {props: {title: {@@ -15,13 +18,31 @@ export default {}},- data () {+ setup (props, ctx) {+ const scrollContainer = ref(null)+ const scrollContent = ref(null)+ const scrollOverflow = ref(null)+ const scrollDragger = ref(null)++ useTouchClose({+ container: scrollContainer,+ content: scrollContent,+ overflow: scrollOverflow,+ dragger: scrollDragger,+ onClose: () => ctx.listeners.onClose && ctx.listeners.onClose()+ })+return {- headerHeight: 0,+ scrollContainer,+ scrollContent,+ scrollOverflow,+ scrollDragger+ }+ },- initialY: 0,- currentY: 0,- isDragging: false+ data () {+ return {+ headerHeight: 0}},@@ -42,9 +63,6 @@ export default {height: `${this.$store.state.ui.height - this.headerHeight}px`}}- // }- // if (this.position === 'top') {- // }}},@@ -55,10 +73,6 @@ export default {}},- mounted () {- this.adddListeners()- },-methods: {afterClose () {if (this.$listeners.afterClose) {@@ -72,117 +86,7 @@ export default {})},- adddListeners () {- const modalContainer = this.$refs.trnFormModal- if (modalContainer) {- modalContainer.addEventListener('touchstart', this.onDragStart, false)- modalContainer.addEventListener('touchend', this.onDragEnd, false)- modalContainer.addEventListener('touchmove', this.onDragging, false)- modalContainer.addEventListener('mouseup', this.onDragEnd, false)- }- },-- onDragStart (e) {- // stop trnFormModal drag when content has scroll- // wait until content scroll up to top- const scrollBlock = this.$refs.trnFormModal.querySelector('.trnFormModal__scroll')- if (scrollBlock && scrollBlock.scrollTop > 0) {- return- }-- // same as above but for any block- // const swiperSlideActive = this.$el.querySelector('.trnFormActiveSlide')- // if (swiperSlideActive) {- // const sliderWithScroll = swiperSlideActive.querySelector('.waitForScroll')- // if (sliderWithScroll) {- // if (sliderWithScroll.scrollTop > 0) { return }- // }- // }-- const dragItem = this.$refs.trnFormModal.querySelector('.trnFormModal__wrap')- if (dragItem) {- dragItem.classList.remove('_anim')-- if (e.type === 'touchstart') {- this.initialY = e.touches[0].clientY- }- else {- this.initialY = e.clientY- }-- if (e.target.closest('.trnFormModal__wrap')) {- this.isDragging = true- }-- // if (e.target.closest('.noDrag')) {- // this.isDragging = false- // }- }- },-- onDragging (e) {- if (this.isDragging) {- if (e.type === 'touchmove') {- this.currentY = e.touches[0].clientY - this.initialY- }- else {- this.currentY = e.clientY - this.initialY- this.currentX = e.clientX - this.initialX- }-- if ((Math.abs(this.currentY) < Math.abs(this.currentX))) {- return- }-- this.setTranslate()- }- },-- onDragEnd (e) {- const dragItem = this.$refs.trnFormModal.querySelector('.trnFormModal__wrap')-- // do not close- if (this.currentY >= 80) {- dragItem.classList.add('_anim')- this.currentY = this.$refs.trnFormModal.clientHeight- this.setTranslate()- this.onClose()- }- // close- else {- this.currentY = 0- this.currentX = 0- this.setTranslate()- if (this.isDragging) { dragItem.classList.add('_anim') }- }-- this.isDragging = false- },-- setTranslate () {- const modalHeight = this.$refs.trnFormModal.clientHeight- const diff = (modalHeight - this.currentY) / (modalHeight / 100)- const diffTrunc = Math.trunc(diff)-- const modalContainer = this.$refs.trnFormModal- const dragItem = modalContainer.querySelector('.trnFormModal__wrap')- const overflow = modalContainer.querySelector('.trnFormModal__overflow')-- if (this.currentY === 0 && dragItem) {- dragItem.style.transform = ''- overflow.style.opacity = ''- }- else if (this.currentY > 0 && dragItem) {- dragItem.style.transform = `translate3d(0, ${this.currentY}px, 0)`- overflow.style.opacity = diffTrunc === 100 ? 1 : `0.${diffTrunc}`- }- },-onClose () {- this.initialY = 0- this.currentY = 0- this.isDragging = false-if (this.$listeners.onClose) {this.$listeners.onClose()}@@ -192,15 +96,19 @@ export default {</script><template lang="pug">-.trnFormModal.noDrag(ref="trnFormModal")+.trnFormModal.noDrag(ref="scrollContainer")transition(name="fadeIn" appear).trnFormModal__overflow(v-show="show"+ ref="scrollOverflow"@click="onClose")transition(name="slide" appear @after-leave="afterClose")- .trnFormModal__wrap(v-show="show")+ .trnFormModal__wrap(+ ref="scrollDragger"+ v-show="show"+ ).trnFormModal__header(@click="onClose"ref="header"@@ -208,7 +116,10 @@ export default {.trnFormModal__header__title(v-if="title") {{ title }}.trnFormModal__header__close: .mdi.mdi-close- .trnFormModal__scroll(:style="modalStyle")+ .trnFormModal__scroll(+ :style="modalStyle"+ ref="scrollContent"+ )slot()</template>diff --git a/components/trnForm/TrnFormModalCatsChild.vue b/components/trnForm/TrnFormModalCatsChild.vueindex 3eca1f9d..94a68e7e 100644--- a/components/trnForm/TrnFormModalCatsChild.vue+++ b/components/trnForm/TrnFormModalCatsChild.vue@@ -15,8 +15,8 @@ export default {methods: {handleCategoryClick (categoryId) {this.$store.commit('trnForm/closeTrnFormModal', 'categories')- this.$store.commit('trnForm/closeTrnFormModal', 'categoriesChild')this.$store.commit('trnForm/setTrnFormValues', { categoryId })+ this.onClose()},onClose () {diff --git a/components/trns/list/TrnsList.vue b/components/trns/list/TrnsList.vueindex ad24668e..4ea7b150 100644--- a/components/trns/list/TrnsList.vue+++ b/components/trns/list/TrnsList.vue@@ -38,7 +38,7 @@ export default {},computed: {- isShowAllTrns () {+ isShowedAllTrns () {return this.paginatedTrnsIds.length === this.trnsIds.length},@@ -73,7 +73,7 @@ export default {for (const trnId of trnsIds) {let dayDatethis.sortByEditDate- ? dayDate = dayjs(trns[trnId].editDate).startOf('day').valueOf()+ ? dayDate = dayjs(trns[trnId].edited).startOf('day').valueOf(): dayDate = dayjs(trns[trnId].date).startOf('day').valueOf()if (!trnsList[dayDate]) {@@ -97,9 +97,12 @@ export default {<template lang="pug">.trnsList- //- div(@click="sortByEditDate = !sortByEditDate" style="padding-bottom: 20px")- //- template(v-if="sortByEditDate") Sort by transaction date- //- template(v-else) Sort by edit date+ .trnsList__sort(+ v-if="$store.getters['user/isTester']"+ @click="sortByEditDate = !sortByEditDate"+ )+ template(v-if="sortByEditDate") Sort by transaction date+ template(v-else) Sort by edit date.trnsList__contenttemplate(v-if="trnsIds.length > 0")@@ -115,7 +118,8 @@ export default {:key="trnId":trn="$store.state.trns.items[trnId]":trnId="trnId"- :wallet="$store.state.wallets.items[$store.state.trns.items[trnId].walletId]")+ :wallet="$store.state.wallets.items[$store.state.trns.items[trnId].walletId]"+ )//- stat viewtemplate(v-else)@@ -126,13 +130,15 @@ export default {:trn="$store.state.trns.items[trnId]":trnId="trnId":ui="ui"- :wallet="$store.state.wallets.items[$store.state.trns.items[trnId].walletId]")+ :wallet="$store.state.wallets.items[$store.state.trns.items[trnId].walletId]"+ )- .trnsList__pages(v-if="!isShowAllTrns")+ .trnsList__pages(v-if="!isShowedAllTrns")Button(:class="['_text-center _border _inline']":title="$lang.trns.more"- @onClick="showMoreTrns")+ @onClick="showMoreTrns"+ )</template><style lang="stylus" scoped>@@ -186,11 +192,11 @@ export default {padding 0padding-top 20px-.statItem- .trnsList__pages- padding-top 10px- padding-left 68px- padding-bottom 20px- +media-laptop()- padding-left 62px+ &__sort+ padding 0+ padding-bottom $m8++ +media-laptop("less")+ padding $m7+ padding-bottom $m6</style>diff --git a/components/wallets/item/WalletItem.vue b/components/wallets/item/WalletItem.vueindex 11c90319..0fe4c688 100644--- a/components/wallets/item/WalletItem.vue+++ b/components/wallets/item/WalletItem.vue@@ -53,40 +53,47 @@ export default {div(:class="className":style="styles"- @click="handleClick")+ @click="handleClick"+)//- widget- template(v-if="ui === 'widget'")+ template(v-if="ui === 'widget'"+).walletItemWidget__name {{ wallet.name }}.walletItemWidget__amountAmount(:alwaysShowSymbol="true"+ :currency="wallet.currency"+ :showBase="false":value="wallet.total"- :currency="wallet.currency")+ )//- tile- template(v-else-if="ui === 'tile' || ui === 'line'")+ template(v-else-if="ui === 'tile' || ui === 'line'"+).walletItemTile__name {{ wallet.name }}.walletItemTile__amountAmount(:alwaysShowSymbol="true"+ :currency="wallet.currency":value="wallet.total"- :currency="wallet.currency")+ )//- listtemplate(v-else).walletItem__grid- .walletItem__icon(- @click.stop="handleIconClick")+ .walletItem__icon(@click.stop="handleIconClick")Icon(- :medium="true":abbr="wallet.name"- :background="wallet.color || $store.state.ui.defaultBgColor")+ :background="wallet.color || $store.state.ui.defaultBgColor"+ :medium="true"+ ).walletItem__name {{ wallet.name }}.walletItem__amountAmount(:alwaysShowSymbol="true"+ :currency="wallet.currency":value="wallet.total"- :currency="wallet.currency")+ ).walletItem__line</template>diff --git a/components/wallets/list/WalletsList.vue b/components/wallets/list/WalletsList.vueindex d3c2ba9b..a8cdfa55 100644--- a/components/wallets/list/WalletsList.vue+++ b/components/wallets/list/WalletsList.vue@@ -6,10 +6,12 @@ export default {type: String,default: null},+limit: {type: [Number, Boolean],default: null},+showToogle: {type: Boolean,default: false@@ -39,7 +41,7 @@ export default {}},- created () {+ mounted () {this.stateLimit = this.limit},@@ -61,10 +63,11 @@ export default {div(:class="className")WalletItem(v-for="walletId in walletsIds"- :key="walletId":id="walletId"+ :key="walletId":ui="ui"- v-on="$listeners")+ v-on="$listeners"+ ).walletsList__toogle(v-if="showToogle && $store.getters['wallets/walletsSortedIds'].length > limit" @click="toogleWallets")template(v-if="stateLimit > 0") {{ this.$lang.wallets.showAll }}diff --git a/composables/useTouchClose.js b/composables/useTouchClose.jsnew file mode 100644index 00000000..45af0bb3--- /dev/null+++ b/composables/useTouchClose.js@@ -0,0 +1,105 @@+import { ref, onMounted, onUnmounted } from 'nuxt-composition-api'++export default function useOnTouch ({ container, overflow, dragger, content, onClose, noDragClasss }) {+ const isDragging = ref(false)+ const initialY = ref(0)+ const currentY = ref(0)+ const currentX = ref(0)++ // setTranslate+ const setTranslate = () => {+ if (!dragger.value) { return }++ if (currentY.value === 0) {+ dragger.value.style.transform = ''+ overflow.value.style.opacity = ''+ }+ else if (currentY.value > 0) {+ const containerHeight = container.value.clientHeight+ const diff = (containerHeight - currentY.value) / (containerHeight / 100)+ const diffTrunc = Math.trunc(diff)++ dragger.value.style.transform = `translate3d(0, ${currentY.value}px, 0)`+ overflow.value.style.opacity = diffTrunc === 100 ? 1 : `0.${diffTrunc}`+ }+ }++ // onDragStart+ const onDragStart = (event) => {+ // stop trnFormModal drag when content has scroll+ // wait until content scroll up to top+ if (content.value && content.value.scrollTop > 0) { return }++ if (dragger.value) {+ dragger.value.classList.remove('_anim')++ event.type === 'touchstart'+ ? initialY.value = event.touches[0].clientY+ : initialY.value = event.clientY++ if (event.target.closest(`.${dragger.value.className}`)) { isDragging.value = true }+ if (noDragClasss && event.target.closest(noDragClasss)) { isDragging.value = false }+ }+ }++ // onDragging+ const onDragging = (event) => {+ if (isDragging.value) {+ event.type === 'touchmove'+ ? currentY.value = event.touches[0].clientY - initialY.value+ : currentY.value = event.clientY - initialY.value++ if ((Math.abs(currentY.value) < Math.abs(currentX.value))) { return }++ setTranslate()+ }+ }++ // onDragEnd+ const onDragEnd = () => {+ if (currentY.value >= 80) {+ dragger.value.classList.add('_anim')+ currentY.value = container.value.clientHeight+ setTranslate()+ resetPosition()+ }+ else {+ currentY.value = 0+ currentX.value = 0+ setTranslate()+ if (isDragging.value) { dragger.value.classList.add('_anim') }+ }++ isDragging.value = false+ }++ onMounted(() => {+ if (!container.value) { return }+ container.value.addEventListener('touchstart', onDragStart)+ container.value.addEventListener('touchmove', onDragging)+ container.value.addEventListener('touchend', onDragEnd)+ container.value.addEventListener('mouseup', onDragEnd)+ })++ onUnmounted(() => {+ if (!container.value) { return }+ container.value.removeEventListener('touchstart', onDragStart)+ container.value.removeEventListener('touchmove', onDragging)+ container.value.removeEventListener('touchend', onDragEnd)+ container.value.removeEventListener('mouseup', onDragEnd)+ })++ const resetPosition = () => {+ isDragging.value = false+ initialY.value = 0+ currentY.value = 0+ currentX.value = 0+ onClose && onClose()++ dragger.value.ontransitionend = () => {+ if (initialY.value === 0 && currentY.value === 0 && dragger.value.style.transform) {+ setTranslate()+ }+ }+ }+}diff --git a/layouts/default.vue b/layouts/default.vueindex 65d52476..ec2cb016 100644--- a/layouts/default.vue+++ b/layouts/default.vue@@ -77,6 +77,8 @@ export default {classes="notifications")+ PortalTarget(name="default")+Metrica</template>diff --git a/nuxt.config.js b/nuxt.config.jsindex e091f1fa..a5e3c98d 100644--- a/nuxt.config.js+++ b/nuxt.config.js@@ -59,7 +59,8 @@ export default {* Nuxt.js dev-modules*/buildModules: [- '@nuxtjs/color-mode'+ '@nuxtjs/color-mode',+ 'nuxt-composition-api'],/**@@ -74,7 +75,8 @@ export default {* Nuxt.js modules*/modules: [- '@nuxtjs/pwa'+ '@nuxtjs/pwa',+ 'portal-vue/nuxt'],/**diff --git a/package-lock.json b/package-lock.jsonindex caf2b9c0..47fca328 100644--- a/package-lock.json+++ b/package-lock.json@@ -1,6 +1,6 @@{"name": "finapp",- "version": "3.0.2",+ "version": "3.0.5","lockfileVersion": 1,"requires": true,"dependencies": {@@ -3308,6 +3308,21 @@}}},+ "@vue/composition-api": {+ "version": "0.6.7",+ "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-0.6.7.tgz",+ "integrity": "sha512-WAWEQK4urEsMNe3OyOp7VnMmegRZT2yRB3fDGLRXPMdfuo4+nM+uMEhUgDiUg9LFSXfLWhjwuFOJ2hnS2X7AUw==",+ "requires": {+ "tslib": "^2.0.0"+ },+ "dependencies": {+ "tslib": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz",+ "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g=="+ }+ }+ },"@webassemblyjs/ast": {"version": "1.9.0","resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",@@ -11007,6 +11022,15 @@"@nuxt/webpack": "2.13.2"}},+ "nuxt-composition-api": {+ "version": "0.10.3",+ "resolved": "https://registry.npmjs.org/nuxt-composition-api/-/nuxt-composition-api-0.10.3.tgz",+ "integrity": "sha512-FOjZtbG8a6VYLD/1Qe29GeCE530no8zbvej3I1XmEQs2TAW3EDe08TWq+LHfUsYpgdVWvU8RD4vOJx2s+fVWtg==",+ "requires": {+ "@vue/composition-api": "^0.6.7",+ "defu": "^2.0.4"+ }+ },"object-assign": {"version": "4.1.1","resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",@@ -11696,6 +11720,11 @@"integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==","dev": true},+ "portal-vue": {+ "version": "2.1.7",+ "resolved": "https://registry.npmjs.org/portal-vue/-/portal-vue-2.1.7.tgz",+ "integrity": "sha512-+yCno2oB3xA7irTt0EU5Ezw22L2J51uKAacE/6hMPMoO/mx3h4rXFkkBkT4GFsMDv/vEe8TNKC3ujJJ0PTwb6g=="+ },"posix-character-classes": {"version": "0.1.1","resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",diff --git a/package.json b/package.jsonindex b1e6acd3..44d4e6b2 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "finapp",- "version": "3.0.5",+ "version": "3.0.7","scripts": {"dev": "cross-env NUXT_HOST=0.0.0.0 nuxt","build": "nuxt build --modern",@@ -22,6 +22,8 @@"lodash": "^4.17.15","mathjs": "^7.0.2","nuxt": "^2.13.2",+ "nuxt-composition-api": "^0.10.3",+ "portal-vue": "^2.1.7","swiper": "^5.4.5","vue-cleave-component": "^2.1.3","vue-focus": "^2.1.0",diff --git a/pages/composition.vue b/pages/composition.vuenew file mode 100644index 00000000..aad4594d--- /dev/null+++ b/pages/composition.vue@@ -0,0 +1,57 @@+<script>+import { ref } from 'nuxt-composition-api'+import useTouchClose from '~/composables/useTouchClose'++export default {+ name: 'CompositionPage',++ setup () {+ const scrollContainer = ref(null)+ const scrollContent = ref(null)+ const scrollOverflow = ref(null)+ const scrollWrapper = ref(null)++ const { close } = useTouchClose({+ container: scrollContainer,+ content: scrollContent,+ overflow: scrollOverflow,+ wrapper: scrollWrapper+ })++ return {+ scrollContainer,+ scrollContent,+ scrollOverflow,+ scrollWrapper,+ closeModal: close+ }+ }+}+</script>++<template lang="pug">+div+ n-link(to="/") CompositionPage++ h1(@click="close") close++ div.scroll(ref="scrollContainer")+ .scroll__overflow(ref="scrollOverflow") overflow+ .scroll__wrapper(ref="scrollWrapper") wrapper+ .scroll__content(ref="scrollContent") content++</template>++<style lang="stylus" scoped>+.scroll+ height 400px+ background gray++ &__wrapper+ height 100px+ background blue++ &__content+ height 50px+ background red+</style>diff --git a/useEvent/useEvent.js b/useEvent/useEvent.jsnew file mode 100644index 00000000..5c91900e--- /dev/null+++ b/useEvent/useEvent.js@@ -0,0 +1,13 @@+import { onMounted, onUnmounted } from 'nuxt-composition-api'++export default function (el = window, name, handler) {+ console.log(el)+ console.log(name)+ console.log(handler)+ const remove = () => el && el.removeEventListener(name, handler)++ onMounted(() => el && el.addEventListener(name, handler))+ onUnmounted(remove)++ return remove+}