Open source personal finance application
update 3.21.0
ilkome6748aadc2ed2
diff --git a/assets/stylus/colors-dark.styl b/assets/stylus/colors-dark.stylindex 48bdc1c5..4ca3dcfa 100644--- a/assets/stylus/colors-dark.styl+++ b/assets/stylus/colors-dark.styl@@ -1,4 +1,4 @@-html.dark-mode+html.dark// colors--c-red-1 rgba(184,20,20,1)--c-blue-1 rgba(58,125,255,1)diff --git a/components/amount/Amount.vue b/components/amount/Amount.vueindex f112e38f..fc1b14b5 100644--- a/components/amount/Amount.vue+++ b/components/amount/Amount.vue@@ -1,5 +1,6 @@<script>import currency from 'currency.js'+import useAmount from '~/components/amount/useAmount'const baseAmountFormat = (value, separator) =>currency(value, { symbol: '', precision: 0, pattern: '#', separator })@@ -20,6 +21,11 @@ export default {vertical: { type: String, default: null }},+ setup () {+ const { getAmountInBaseCurrency } = useAmount()+ return { getAmountInBaseCurrency }+ },+computed: {className () {return {@@ -32,15 +38,10 @@ export default {},amountInBaseCurrency () {- const baseValue = this.$store.getters['currencies/getAmountInBaseCurrency']({+ return this.getAmountInBaseCurrency({amount: this.value,currency: this.currency})-- if (baseValue)- return this.formatAmount(baseValue)-- return null}},diff --git a/components/amount/Amount2.vue b/components/amount/Amount2.vuenew file mode 100644index 00000000..4da491db--- /dev/null+++ b/components/amount/Amount2.vue@@ -0,0 +1,51 @@+<script lang="ts">+import { defineComponent } from '@nuxtjs/composition-api'+import useAmount from '~/components/amount/useAmount'++export default defineComponent({+ props: {+ amount: { type: Number, required: true },+ currency: { type: String, required: true },+ colorize: { type: String, default: 'none' },+ type: { type: Number, default: null }+ },++ setup ({ type }) {+ const { baseCurrency, formatAmount, getCurrencySymbol, getAmountInBaseCurrency } = useAmount()+ const sign = type === 0 ? '-' : '+'++ return {+ baseCurrency,+ sign,++ getCurrencySymbol,+ getAmountInBaseCurrency,+ formatAmount+ }+ }+})+</script>++<template lang="pug">+.font-unica.flex.flex-col.gap-1(+ @click="event => $emit('click', event)"+)+ //- Amount+ template(v-if="amount !== 0")+ div(:class="[{ 'text-green-600 dark:text-green-500': colorize === 'incomes' && type === 1 }]")+ //- Original+ .gap-1.flex.items-baseline+ .text-md.leading-none {{ sign }}+ .text-md.leading-none {{ formatAmount(amount) }}+ .text-xs.leading-none {{ getCurrencySymbol(currency) }}++ //- Base+ .text-neutral-400.gap-1.flex.items-baseline(v-if="currency !== baseCurrency")+ .text-md.leading-none {{ sign }}+ .text-md.leading-none {{ getAmountInBaseCurrency({ amount, currency }) }}+ .text-xs.leading-none {{ getCurrencySymbol(baseCurrency) }}++ //- 0+ template(v-else)+ .text-md.leading-none.flex.items-baseline 0+</template>diff --git a/components/amount/useAmount.ts b/components/amount/useAmount.tsnew file mode 100644index 00000000..5db47c46--- /dev/null+++ b/components/amount/useAmount.ts@@ -0,0 +1,49 @@+import { computed, useContext } from '@nuxtjs/composition-api'+import currency from 'currency.js'++function getCurrencySymbol (currency) {+ switch (currency) {+ case 'USD':+ return '$'+ case 'RUB':+ return '₽'+ case 'EUR':+ return '€'+ case 'IDR':+ return 'Rp'+ case 'THB':+ return '฿'+ default:+ return currency+ }+}++const formatAmount = (value, separator = ' ') =>+ currency(value, {+ symbol: '',+ precision: 0,+ pattern: '#',+ separator+ }).format()++export default function useAmount () {+ const { store } = useContext()++ function getAmountInBaseCurrency ({ amount, currency, noFormat }) {+ const fixed = store.state.currencies.base === 'RUB' ? 0 : 2+ const baseValue = (amount / store.state.currencies.rates[currency]).toFixed(fixed)+ if (!baseValue) return+ if (noFormat) return Number(baseValue)+ return formatAmount(Number(baseValue))+ }++ const baseCurrency = computed(() => store.state.currencies.base)++ return {+ baseCurrency,++ formatAmount,+ getCurrencySymbol,+ getAmountInBaseCurrency+ }+}diff --git a/components/icon/Icon2.vue b/components/icon/Icon2.vuenew file mode 100644index 00000000..c3dd1a08--- /dev/null+++ b/components/icon/Icon2.vue@@ -0,0 +1,15 @@+<script>+export default {+ props: {+ background: { type: String, required: true },+ icon: { type: String, required: true }+ }+}+</script>++<template lang="pug">+.text-neutral-50.text-xl.leading-none.w-8.h-8.rounded-full.justify-center.items-center.flex(+ :style="{ background: background }"+ @click="event => $emit('click', event)"+): div(:class="icon")+</template>diff --git a/components/layout/MenuModal.vue b/components/layout/MenuModal.vueindex 3475b98f..6329fc6d 100644--- a/components/layout/MenuModal.vue+++ b/components/layout/MenuModal.vue@@ -2,8 +2,6 @@import { computed, useContext } from '@nuxtjs/composition-api'export default {- name: 'LayoutMenuModal',-setup () {const { store } = useContext()const activeTab = computed(() => store.state.ui.activeTab)@@ -25,16 +23,12 @@ Portal(to="modal").handlerBaseBottomSheetClose(@onClick="close")- template(#header)- template(v-if="walletId")- .walletWrap- WalletsItemWalletItem2(- :id="walletId"- vertical="center"- size="xl"- )-.content(class="!overflow-hidden !pt-8 !pb-2")+ .mb-2.mx-6.pb-6.flex.items-center.justify-between.border-b.border-neutral-800+ .text-neutral-400+ .text-lg {{ $store.state.user.user.displayName }}+ .text-sm {{ $store.state.user.user.email }}+LayoutMenuModalItems</template>diff --git a/components/layout/MenuModalItems.vue b/components/layout/MenuModalItems.vueindex 261bc713..08c2fbb9 100644--- a/components/layout/MenuModalItems.vue+++ b/components/layout/MenuModalItems.vue@@ -4,12 +4,12 @@ import useMenuData from '~/modules/menu/useMenuData'export default defineComponent({setup () {- const { items, onClick, getClassNames, checkIsShow } = useMenuData()+ const { items, onClick, checkIsActive, checkIsShow } = useMenuData()return {items,onClick,- getClassNames,+ checkIsActive,checkIsShow}}@@ -22,11 +22,11 @@ divv-for="(item, menuId) in items":key="menuId"v-if="checkIsShow(item)"- :class="getClassNames(menuId)"+ class="hocus:bg-neutral-800"@click="onClick(menuId)")- .text-xl.text-neutral-400(:class="item.icon")- .text-sm.text-neutral-400 {{ item.name }}+ .text-xl.text-neutral-400(:class="[item.icon, { 'text-neutral-200': checkIsActive(menuId) }]")+ .text-sm.text-neutral-400(:class="{'text-neutral-200': checkIsActive(menuId)}") {{ item.name }}.flex.items-center.py-3.px-6.space-x-5(class="hocus:bg-neutral-800"diff --git a/components/layout/SidebarMenu.vue b/components/layout/SidebarMenu.vueindex 22cf5b0e..0e481692 100644--- a/components/layout/SidebarMenu.vue+++ b/components/layout/SidebarMenu.vue@@ -4,12 +4,12 @@ import useMenuData from '~/modules/menu/useMenuData'export default defineComponent({setup () {- const { items, onClick, getClassNames, checkIsShow } = useMenuData()+ const { items, onClick, checkIsActive, checkIsShow } = useMenuData()return {items,onClick,- getClassNames,+ checkIsActive,checkIsShow}}@@ -18,13 +18,13 @@ export default defineComponent({<template lang="pug">div- .flex.items-center.py-2.px-4.space-x-5(+ .flex.items-center.py-2.px-6.space-x-5(v-for="(item, menuId) in items"- :key="menuId"v-if="checkIsShow(item)"- :class="getClassNames(menuId)"+ :key="menuId"+ :class="['hocus:bg-neutral-800', { 'border-r-2 border-neutral-600': checkIsActive(menuId) }]"@click="onClick(menuId)")- .text-xl.text-neutral-400(:class="item.icon")- .text-sm.text-neutral-400 {{ item.name }}+ .text-xl.text-neutral-400(:class="[item.icon, { 'text-neutral-200': checkIsActive(menuId) }]")+ .text-sm.text-neutral-400(:class="{'text-neutral-200': checkIsActive(menuId)}") {{ item.name }}</template>diff --git a/components/stat/Index.vue b/components/stat/Index.vueindex c1b3e21b..4b8044d6 100644--- a/components/stat/Index.vue+++ b/components/stat/Index.vue@@ -52,44 +52,37 @@ export default {</script><template lang="pug">-.overflow-hidden.overflow-y-auto.scrollbar.snap-y.snap-proximity.pb-8+.overflow-hidden.overflow-y-auto.scrollbar.pb-8.js_scroll_pageStatPeriodArrowsStatDateStatViewConfigLazyStatChart(v-if="ui.showMainChart && statPage.isHasTrns")StatPeriods- .pt-3.px-3+ .pt-3.px-3(v-if="statPage.filter.isShow")LazyStatFilter(v-if="statPage.filter.isShow")- .snap-start.scroll-mt-12- StatSumTotal- StatMenu+ StatSumTotal+ StatMenu//- Loop throw incomes / expenses.w-100- .py-5.px-3+ .py-2.px-3.grid.grid-cols-1.gap-y-5(class="md:grid-cols-2 md:gap-x-20")div(v-for="item in moneyTypes"v-if="isShowGroup(item.id)":key="item.id")- .snap-start.scroll-mt-12- StatGroupSum(:typeText="item.id")- StatGroupEmpty(:typeText="item.id")+ StatGroupSum(:typeText="item.id")+ StatGroupEmpty(:typeText="item.id")StatGroupCatsPie(:typeText="item.id")StatGroupCatsVertical(:typeText="item.id")- .snap-start.scroll-mt-12- StatGroupCatsRound(:typeText="item.id")-+ StatGroupCatsRound(:typeText="item.id")StatGroupCatsHorizontal(:typeText="item.id")- .snap-start.scroll-mt-12- LazyStatGroupTrns(v-if="isShowGroupTrns")+ LazyStatGroupTrns(v-if="isShowGroupTrns")StatEmpty-- .snap-start.scroll-mt-12- LazyStatTrns(v-if="isShowTrns")+ LazyStatTrns(v-if="isShowTrns")</template>diff --git a/components/stat/Menu.vue b/components/stat/Menu.vueindex 57135619..977abefa 100644--- a/components/stat/Menu.vue+++ b/components/stat/Menu.vue@@ -22,7 +22,7 @@ export default {<template lang="pug">.overflow-hidden.overflow-x-auto.mx-3.scrollbar- .menu__wrap.flex.items-center.justify-between+ .menu__wrap.flex.items-center.space-x-8.menuItem.statTitle(:class="{ _active: activeTabStat === 'details' }"@click="onClickStatMenu('details')"@@ -49,16 +49,11 @@ export default {border-bottom 3px solid var(--c-item-bg-main).menuItem- margin-right 22pxmargin-bottom -3pxpadding 0 0padding-bottom 6pxcolor var(--c-font-5)border-bottom 3px solid var(--c-item-bg-main)- +media(400px)- margin-right 28px- +media(500px)- margin-right 32px+media-hover()&:not(._active)diff --git a/components/stat/Periods.vue b/components/stat/Periods.vueindex 3754e1b4..15901ad0 100644--- a/components/stat/Periods.vue+++ b/components/stat/Periods.vue@@ -57,10 +57,6 @@ export default {@click="$store.dispatch('filter/setPeriod', periodItem.slug)") {{ periodItem.name }}- //- .barItem.px-4.py-2.font5.text-xs(- //- @click="$store.dispatch('filter/setPeriod', { custom: true, name: 'days', num: 7 })"- //- ) 7days-.bar.overflow-hidden.flex.rounded-md.bar__btn.flex-grow.flex.items-center.justify-center.w-8(@click="removePeriodOrGroup"diff --git a/components/stat/StatItem.vue b/components/stat/StatItem.vueindex 677371ad..7350c39f 100644--- a/components/stat/StatItem.vue+++ b/components/stat/StatItem.vue@@ -1,9 +1,7 @@-<script>+<script lang="ts">import useFilter from '~/modules/filter/useFilter'export default {- name: 'StatItem',-props: {biggest: { type: Number, required: true },category: { type: Object, required: true },@@ -28,11 +26,13 @@ export default {},computed: {- showChildCategories () {- const childCategoriesIds = this.$store.getters['categories/getChildCategoriesIds'](this.categoryId)+ childCategoriesIds () {+ return this.$store.getters['categories/getChildCategoriesIds'](this.categoryId)+ },+ showChildCategories () {const childCatsIdsWithTrns = []- for (const childCategoryId of childCategoriesIds) {+ for (const childCategoryId of this.childCategoriesIds) {const trnsIds = this.$store.getters['trns/getTrnsIdsByFilter']({categoryId: childCategoryId,type: this.type@@ -52,6 +52,27 @@ export default {width: `${Math.abs(this.total) / Math.abs(this.biggest) * 100}%`,background: this.category.color}+ },++ getCatgoryName () {+ const cats = []+ const categoriesIds = this.$store.getters['categories/getChildCategoriesIds'](this.categoryId)++ const getTrnsByCategoryId = (categoryId) => {+ const trns = this.$store.state.trns.items+ let trnsIds = this.$store.getters['trns/selectedTrnsIdsWithDate']+ trnsIds = trnsIds.filter(id => trns[id].categoryId === categoryId)+ trnsIds = trnsIds.filter(id => trns[id].type === this.type)+ return trnsIds+ }++ for (const categoryId of categoriesIds) {+ const trnsIds = getTrnsByCategoryId(categoryId)+ if (trnsIds.length > 0)+ cats.push(this.$store.state.categories.items[categoryId]?.name)+ }++ return cats}},@@ -68,39 +89,49 @@ export default {:class="{ _active: isShowInside }"@click="toogleShowInside")- .statItem__content- .statItem__graph: .statItem__graph__in(:style="styles")- .statItem__icon(@click.stop="setCategoryFilter(categoryId)")- Icon(- :background="isShowInside ? category.color : 'var(--c-item-stat-bg)'"- :color="isShowInside ? 'var(--c-item-stat-icon)' : category.color"- :icon="category.icon"- round- )-- .statItem__name {{ category.name }} {{ showChildCategories ? '...' : '' }}- .statItem__amount- Amount(- :currency="currency"- :value="total"+ .z-10.ins.py-2.px-3.space-x-3.rounded-md.justify-between.items-center.flex.border(+ :class="{ _active: isShowInside, 'dark:border-neutral-800 cursor-n-resize shadow-xl': isShowInside, 'border-transparent cursor-s-resize shadow': !isShowInside }"+ )+ .cursor-pointer.statItem__icon(@click.stop="setCategoryFilter(categoryId)")+ .text-neutral-50.text-2xl.leading-none.w-8.h-8.rounded-full.justify-center.items-center.flex(+ ): div(:class="category.icon" :style="{ color: category.color }")++ .grow+ .space-x-3.flex+ .overflow-hidden.truncate.grow.space-x-2.flex.items-baseline.text-neutral-700(class="dark:text-neutral-400")+ .overflow-hidden.text-sm {{ category.name }}{{ showChildCategories ? '...' : '' }}+ //- pre {{ getCatgoryName }}+ //- .overflow-hidden.space-x-2.items-baseline.flex.truncate.text-xs+ //- .text-xs(v-for="name in getCatgoryName") {{ name }}++ .statItem__amount+ Amount(+ :currency="currency"+ :value="total"+ )+ .pt-1.statItem__graph.mt-1: .statItem__graph__in(:style="styles")++ //- pre {{ $store.state.categories.items }}+ //- Inside+ .overflow-hidden.ins2.mx-2.rounded-b-md.border.border-t-0(+ v-if="isShowInside"+ class="mt-[-1px] dark:border-neutral-800"+ @click.stop=""+ )+ template(v-if="showChildCategories")+ StatItemChildCats(+ :categoryId="categoryId"+ :type="type")- template(v-if="isShowInside")- .statItem__inside(@click.stop="")- template(v-if="showChildCategories")- StatItemChildCats(+ template(v-else)+ .statItem__trns+ TrnsList(+ :incomes="type === 1"+ :expenses="type === 0":categoryId="categoryId"- :type="type"+ ui="stat")-- template(v-else)- .statItem__trns- TrnsList(- :incomes="type === 1"- :expenses="type === 0"- :categoryId="categoryId"- ui="stat"- )</template><style lang="stylus">@@ -120,48 +151,23 @@ export default {</style><style lang="stylus" scoped>-.statItem- cursor pointer+.ins2position relative- padding $m5 $m5- border 1px solid transparent- border-radius $borderRadiusMd-- +media-hover()- &:not(._active)- z-index 2- background var(--c-item-bg-hover)-- &._active- margin-bottom $m5- background var(--c-item2-bg-hover)-- &:not(:first-child)- margin-top $m5+ background var(--c-item2-bg-hover)- &__content- display grid- grid-template-columns minmax(10px, max-content) 1fr minmax(10px, max-content)- grid-template-rows repeat(2, minmax(10px, max-content))- grid-column-gap 20px+.ins+ position relative+ background var(--c-item2-bg-hover)- &__inside- margin (- $m5)- margin-top $m3- padding 0+ +media-hover()+ background var(--c-item-bg-hover)+.statItem&__graph- overflow hidden- grid-column 2 / -1- grid-row 2 / -1- align-self center- margin-top $m3- background var(--c-bg-8)- border-radius 2px-&__inheight 4pxmin-width 2px+ border-radius 3px&__nameoverflow hidden@@ -171,27 +177,6 @@ export default {white-space nowraptext-overflow ellipsis- ^[0]._active &- color var(--c-font-2)-&__iconwidth 32px- grid-column 1 / 2- grid-row 1 / -1-- &:active- opacity .8-- @media $media-laptop- &:hover- transform scale(1.3)-- &__amount- align-self center-- &__arrow- padding-top $m2- color var(--c-font-5)- grid-column 4 / 5- grid-row 1 / 2</style>diff --git a/components/stat/StatItemChildCats.vue b/components/stat/StatItemChildCats.vueindex e41363e7..086d3d4b 100644--- a/components/stat/StatItemChildCats.vue+++ b/components/stat/StatItemChildCats.vue@@ -28,8 +28,8 @@ export default {}stat = stat.sort((a, b) => {- if (a[this.typeName] > b[this.typeName]) { return -1 }- if (a[this.typeName] < b[this.typeName]) { return 1 }+ if (a[this.typeName] > b[this.typeName]) return -1+ if (a[this.typeName] < b[this.typeName]) return 1return 0})diff --git a/components/stat/StatItemChildCatsItem.vue b/components/stat/StatItemChildCatsItem.vueindex 0817ced1..3a3eb6a5 100644--- a/components/stat/StatItemChildCatsItem.vue+++ b/components/stat/StatItemChildCatsItem.vue@@ -42,29 +42,29 @@ export default {</script><template lang="pug">-.statItemChild(+.statItem(:class="{ _active: isShowInside }"- @click="toogleShowInside(categoryId)"+ @click="toogleShowInside")- .statItemChild__content- .statItemChild__icon(@click.stop="setCategoryFilter(categoryId)")- Icon(- :background="isShowInside ? category.color : 'var(--c-item-stat-bg)'"- :color="isShowInside ? 'var(--c-item-stat-icon)' : category.color"- :icon="category.icon"- round- )-- .statItemChild__name {{ category.name }}-- .statItemChild__amount- Amount(- :currency="$store.state.currencies.base"- :value="total"- :type="type"- :isColorize="false"- isShowPrefix- )+ .ins.py-2.px-3.space-x-3.justify-between.items-center.flex.border-t(+ :class="[{ _active: isShowInside }, { 'border-b-0 cursor-n-resize': isShowInside }, { 'cursor-s-resize': !isShowInside }, 'dark:border-neutral-800']"+ )+ .cursor-pointer.statItem__icon(@click.stop="setCategoryFilter(categoryId)")+ .text-neutral-50.text-2xl.leading-none.w-8.h-8.rounded-full.justify-center.items-center.flex(+ ): div(:class="category.icon" :style="{ color: category.color }")++ .grow+ .space-x-3.flex+ .grow.statItem__name {{ category.name }}++ .statItem__amount+ Amount(+ :currency="$store.state.currencies.base"+ :value="total"+ :type="type"+ :isColorize="false"+ isShowPrefix+ ).statItemChild__trns(v-if="isShowInside"@@ -95,21 +95,24 @@ export default {</style><style lang="stylus" scoped>-.statItemChild- cursor default- border 1px solid transparent- border-radius $borderRadiusMd++.ins2+ position relative+ background var(--c-item2-bg-hover)++.ins+ position relative+ background var(--c-item2-bg-hover)+media-hover()- &:not(._active)- background var(--c-item-bg-hover)+ background var(--c-item-bg-hover)- &__content- display grid- grid-template-columns minmax(10px, max-content) 1fr minmax(10px, max-content)- grid-column-gap 20px- margin 0- padding $m5 $m5+.statItem+ &__graph+ &__in+ height 4px+ min-width 2px+ border-radius 3px&__nameoverflow hidden@@ -119,27 +122,6 @@ export default {white-space nowraptext-overflow ellipsis- ~/._active &- color var(--c-font-2)-&__iconwidth 32px- grid-column 1 / 2- grid-row 1 / -1-- &:active- opacity .8-- @media $media-laptop- &:hover- transform scale(1.3)-- &__amount- align-self center-- &__trns- padding 0-- ^[0]._active &- padding-bottom $m4</style>diff --git a/components/stat/filter/Index.vue b/components/stat/filter/Index.vueindex b1caebfd..c129f2fb 100644--- a/components/stat/filter/Index.vue+++ b/components/stat/filter/Index.vue@@ -57,14 +57,13 @@ export default {<template lang="pug">.overflow-hidden.rounded.py-2.pb-2- .flex.items-center- .statTitle {{ $t('base.filter') }}- .cursor-pointer.ml-6.text-xs.font5(@click="onClearFilter") {{ $t('filter.clear') }}+ .statTitle {{ $t('base.filter') }}- .safe.scrollbar.overflow-hidden.overflow-x-auto.flex(v-if="filterCategory || filterWallet")+ .safe.scrollbar.overflow-hidden.overflow-x-auto.flex.items-stretch(v-if="filterCategory || filterWallet")//- Wallettemplate(v-if="filterWallet").overflow-hidden.cursor-pointer.relative.flex.flex-col.items-center.mr-3.py-2.px-3.bg-4.rounded-md(+ class="hocus:bg-neutral-800"@click="clearWalletFilter").absolute.top-0.left-0.w-full(:style="{ height: '2px', background: filterWallet.color }")@@ -83,7 +82,8 @@ export default {//- Categorytemplate(v-if="filterCategory")- .overflow-hidden.cursor-pointer.relative.flex.items-center.py-2.px-3.bg-4.rounded-md(+ .overflow-hidden.cursor-pointer.relative.flex.items-center.mr-3.py-2.px-3.bg-4.rounded-md(+ class="hocus:bg-neutral-800"@click="onClearCategory").text-2xl(@@ -95,4 +95,10 @@ export default {.text-sm.font3 {{ filterCategory.name }}.absolute.top-1.right-1.text-sm.font5.mdi.mdi-close++ //- Clear+ .cursor-pointer.flex.items-center.px-4.text-xs.font3.bg-4.rounded-md(+ @click="onClearFilter"+ class="hocus:bg-neutral-800"+ ) {{ $t('filter.clear') }}</template>diff --git a/components/stat/group/cats/Horizontal.vue b/components/stat/group/cats/Horizontal.vueindex 7015dca4..2ec41a40 100644--- a/components/stat/group/cats/Horizontal.vue+++ b/components/stat/group/cats/Horizontal.vue@@ -28,7 +28,7 @@ export default defineComponent({</script><template lang="pug">-.pb-6(v-if="isShow")+.space-y-2.flex-col.flex.pb-6(v-if="isShow")LazyStatItem(v-if="isShow"v-for="categoryId in statPage.current[typeText].categoriesIds"diff --git a/components/trnForm/TrnFormHeaderItemCategory.vue b/components/trnForm/TrnFormHeaderItemCategory.vueindex 48df6f5c..44253951 100644--- a/components/trnForm/TrnFormHeaderItemCategory.vue+++ b/components/trnForm/TrnFormHeaderItemCategory.vue@@ -2,8 +2,6 @@export default {// TODO: add check for valid category- name: 'TrnFormHeaderItemCategory',-computed: {category () {const categoryId = this.$store.state.trnForm.values.categoryIddiff --git a/components/trns/Modal.vue b/components/trns/Modal.vueindex c368e4bc..7ff73023 100644--- a/components/trns/Modal.vue+++ b/components/trns/Modal.vue@@ -18,7 +18,6 @@ export default {return {setCategoryFilter,setWalletFilter,-closed}},diff --git a/components/trns/item/Details.vue b/components/trns/item/Details.vuenew file mode 100644index 00000000..ea9c50b9--- /dev/null+++ b/components/trns/item/Details.vue@@ -0,0 +1,98 @@+<script lang="ts">+import { defineComponent } from '@nuxtjs/composition-api'++export default defineComponent({+ props: {+ trnId: { type: String, required: true },+ trnItem: { type: Object, required: true }+ }+})+</script>++<template lang="pug">+div(class="hocus:bg-neutral-800")+ .flex.space-x-4.items-center+ div(class="basis-1/12")+ Icon(+ :icon="trnItem.category.icon"+ :background="trnItem.category.color"+ big+ round+ )++ .grow+ .flex.items-center+ .grow+ //- Category+ .pb-1.leading-none.text-sm.flex.items-baseline.space-x-2+ .text-neutral-300 {{ trnItem.category.name }}+ template(v-if="trnItem.category.parentId")+ .text-xs.text-neutral-400 •+ .text-xs.text-neutral-400 {{ trnItem.categoryParent.name }}++ //- Group+ .leading-none(v-if="trnItem.groups") In group++ //- Wallet+ template(v-if="trnItem.type !== 2")+ .leading-none.text-xs.text-neutral-400 {{ trnItem.wallet.name }}++ .leading-none.text-xs.text-neutral-400 {{ trnItem.dateFormated }}++ //- Description+ .pt-2.text-neutral-500.leading-none.text-xs(+ v-if="trnItem.description"+ ) {{ trnItem.description }}++ .pt-4+ //- Amount+ template(v-if="trnItem.type !== 2")+ Amount(+ :currency="trnItem.wallet.currency"+ :type="trnItem.type"+ :value="trnItem.amount"+ isColorize+ isShowPrefix+ size="xl"+ vertical="center"+ )++ //- Transfer Amount+ template(v-if="trnItem.type === 2")+ .gap-x-3.flex.items-center+ .grow.p-3.rounded-md(+ :style="{ background: trnItem.walletFrom.color }"+ )+ div+ .gap-x-1.flex.items-baseline+ .text-2xs.text-neutral-300 {{ $t('trnForm.transfer.from') }}:++ .pb-1.leading-none.text-xs.text-neutral-300 {{ trnItem.walletFrom.name }}+ Amount(+ :currency="trnItem.wallet.currency"+ :isColorize="trnItem.type === 1"+ :type="trnItem.type"+ :value="-trnItem.amount"+ size="lg"+ vertical="left"+ )++ .mdi.mdi-chevron-right.leading-none.text-3xl.text-neutral-400++ .grow.p-3.rounded-md(+ :style="{ background: trnItem.walletTo.color }"+ )+ div+ .gap-x-1.flex.items-baseline+ .text-2xs.text-neutral-300 {{ $t('trnForm.transfer.to') }}:+ .pb-1.leading-none.text-xs.text-neutral-300 {{ trnItem.walletTo.name }}+ Amount(+ :currency="trnItem.wallet.currency"+ :isColorize="trnItem.type === 1"+ :type="trnItem.type"+ :value="trnItem.amount"+ isShowPrefix+ size="lg"+ vertical="left"+ )+</template>diff --git a/components/trns/item/History.vue b/components/trns/item/History.vuenew file mode 100644index 00000000..df3e0af8--- /dev/null+++ b/components/trns/item/History.vue@@ -0,0 +1,78 @@+<script lang="ts">+import { defineComponent } from '@nuxtjs/composition-api'+import useTrn from '~/components/trns/item/useTrn'++export default defineComponent({+ props: {+ actions: { type: Object, required: false, default: () => ({}) },+ trnId: { type: String, required: true }+ },++ setup ({ trnId, actions }) {+ const { formatTrnItem } = useTrn()+ const trnItem = formatTrnItem(trnId)+ // @ts-ignore+ const { onOpenDetails, onOpenEdit, onSetFilter } = actions(trnItem)++ return {+ trnItem,+ onOpenDetails,+ onOpenEdit,+ onSetFilter+ }+ }+})+</script>++<template lang="pug">+.space-x-3.flex(+ class="hocus:bg-neutral-100 dark:hocus:bg-neutral-800"+ @click="onOpenDetails"+)+ .text-neutral-50.text-xl.leading-none.w-8.h-8.rounded-full.justify-center.items-center.flex(+ :style="{ background: trnItem.category.color }"+ @click="onSetFilter"+ ): div(:class="trnItem.category.icon")++ .grow+ .items-center.flex+ .text-neutral-500.grow(+ class="dark:text-neutral-400"+ )+ //- Category+ .pb-1.text-sm.space-x-2.items-baseline.flex+ .text-neutral-700(class="dark:text-neutral-300") {{ trnItem.category.name }}++ .text-xs.space-x-2.items-baseline.flex(v-if="trnItem.category.parentId")+ div •+ div {{ trnItem.categoryParent.name }}++ //- Group+ .text-xs.leading-none(v-if="trnItem.groups") In group++ //- Wallet+ .text-xs.leading-none(v-if="trnItem.type !== 2") {{ trnItem.wallet.name }}++ //- Transfer info+ .text-xs(v-if="trnItem.type === 2")+ .space-x-1.items-center.flex+ .text-neutral-600(class="dark:text-neutral-500") {{ $t('trnForm.transfer.from') }}:+ .text-neutral-500(class="dark:text-neutral-400") {{ trnItem.walletFrom.name }}+ .space-x-1.items-center.flex+ .text-neutral-600(class="dark:text-neutral-500") {{ $t('trnForm.transfer.to') }}:+ .text-neutral-500(class="dark:text-neutral-400") {{ trnItem.walletTo.name }}++ //- Amount+ Amount2(+ :amount="trnItem.amount"+ :currency="trnItem.wallet.currency"+ :type="trnItem.type"+ colorize="incomes"+ @click="onOpenEdit"+ )++ //- Description+ .pt-2.text-neutral-500.text-xs.leading-none(+ v-if="trnItem.description"+ ) {{ trnItem.description }}+</template>diff --git a/components/trns/item/TrnItem2.vue b/components/trns/item/TrnItem2.vuedeleted file mode 100644index 9a7539ce..00000000--- a/components/trns/item/TrnItem2.vue+++ /dev/null@@ -1,524 +0,0 @@--<script>-import useCalculator from '~/components/trnForm/calculator/useCalculator'-import { formatDate } from '~/utils/formatDate'--export default {- props: {- category: { type: Object, required: true },- isActive: { type: Boolean, default: false },- showCategory: { type: Boolean, default: false },- trn: { type: Object, required: true },- trnId: { type: String, required: true },- ui: { type: String, default: 'history' },- wallet: { type: Object, required: true }- },-- computed: {- className () {- return {- _active: this.isActive,- _detailed: this.ui === 'detailed',- _history: this.ui === 'history' || (this.ui === 'stat' && this.showCategory),- _stat: this.ui === 'stat'- }- },- formatedDate () {- const date = formatDate(this.trn.date, 'full')- return `${date.weekday}, ${date.day} ${date.month} ${date.year}`- },- formatedDateDay () {- return formatDate(this.trn.date, 'trnItem')- },- formatedDateDay2 () {- return formatDate(this.trn.date, 'trnItem')- },-- filterTrnsDate () {- const date = this.trn.date- const walletId = this.trn.walletId-- const trns = this.$store.state.trns.items- const trnsIds = Object.keys(trns)- .filter(id => trns[id].date <= date && trns[id].walletId === walletId)-- const total = this.$store.getters['trns/getTotalOfTrnsIds'](trnsIds, true)- return total- }- },-- methods: {- handleClick () {- if (!this.$store.state.trns.modal.show) {- this.$store.commit('categories/hideCategoryModal')- this.$store.commit('trns/showTrnModal')- this.$store.commit('trns/setTrnModalId', this.trnId)- }- },-- setTrnEdit () {- const trnId = this.trnId- const { setExpression } = useCalculator()- setExpression(this.trn.amount)- this.$store.dispatch('trnForm/openTrnForm', { action: 'edit', trnId })- this.$store.commit('stat/setCategoryModal', { id: null, type: null })- this.$emit('onClickEdit', this.trnId)- }- }-}-</script>--<template lang="pug">-.trnItem.relative.font4.py-3.px-3(- v-if="(category && wallet) || trn.type === 2"- :class="{ ...className, 'py-2.5': true }"- @click="handleClick"-)- .flex- Icon(- :color="category.color"- :icon="category.icon"- background="var(--c-item-stat-bg)"- round- )-- .text-sm {{ category.name }}-- //- .trnItem__left- //- .trnItem__categoryIcon- //- Icon(- //- :color="category.color"- //- :icon="category.icon"- //- background="var(--c-item-stat-bg)"- //- round- //- )-- //- .trnItem__center- //- .trnItem__categoryName- //- | {{ category.name }}- //- .trnItem__groups(v-if="trn.groups") In group-- //- .trnItem__wallet- //- .trnItem__walletIcon- //- Icon(- //- :abbr="wallet.name"- //- :background="wallet.color"- //- :small="true"- //- )- //- .trnItem__walletName {{ wallet.name }}-- //- .trnItem__desc(v-if="trn.description") {{ trn.description }}-- //- .trnItem__right- //- .trnItem__amount(@click.stop="setTrnEdit")- //- Amount(- //- :currency="wallet.currency"- //- :value="trn.amount"- //- :type="trn.type"- //- size="md"- //- :isColorize="trn.type === 1"- //- isShowPrefix- //- )- //- template(v-if="$store.state.wallets.items && $store.state.wallets.items[trn.walletFromId]")- //- Amount(- //- :currency="$store.state.wallets.items[trn.walletFromId].currency"- //- :isColorize="false"- //- :type="2"- //- :value="trn.amountFrom"- //- )-- //- .trnItem__left- //- .trnItem__categoryIcon- //- Icon(- //- :color="category.color"- //- :icon="category.icon"- //- background="var(--c-item-stat-bg)"- //- round- //- )-- //- .trnItem__center- //- .trnItem__categoryName- //- div {{ $t('trnForm.transferTitle') }}- //- .transfer- //- div- //- span {{ $t('trnForm.transfer.from') }}:- //- | {{ $store.state.wallets.items[trn.walletFromId].name }}- //- div- //- span {{ $t('trnForm.transfer.to') }}:- //- | {{ $store.state.wallets.items[trn.walletToId].name }}-- //- .trnItem__desc(v-if="trn.description") {{ trn.description }}-- //- .trnItem__right- //- .trnItem__amount(@click.stop="setTrnEdit")- //- Amount(- //- :currency="$store.state.wallets.items[trn.walletFromId].currency"- //- :isColorize="false"- //- :type="2"- //- :value="trn.amountFrom"- //- )--//- .trnItem__left- //- .trnItem__categoryIcon- //- Icon(- //- :color="category.color"- //- :icon="category.icon"- //- background="var(--c-item-stat-bg)"- //- round- //- )-- //- .trnItem__center- //- .trnItem__categoryName- //- div {{ $t('trnForm.transferTitle') }}- //- .transfer- //- div- //- span {{ $t('trnForm.transfer.from') }}:- //- | {{ $store.state.wallets.items[trn.walletFromId].name }}- //- div- //- span {{ $t('trnForm.transfer.to') }}:- //- | {{ $store.state.wallets.items[trn.walletToId].name }}-- //- .trnItem__desc(v-if="trn.description") {{ trn.description }}-- //- .trnItem__right- //- .trnItem__amount(@click.stop="setTrnEdit")- //- Amount(- //- :currency="$store.state.wallets.items[trn.walletFromId].currency"- //- :isColorize="false"- //- :type="2"- //- :value="trn.amountFrom"- //- )- h1 hello- //- //- Transfer- //- template(v-if="trn.type === 2")- //- //- Transfer: Detailed- //- template(v-if="ui === 'detailed'")- //- .trnItem__categoryIcon- //- Icon(- //- :background="category.color"- //- :icon="category.icon"- //- big- //- round- //- )- //- .trnItem__categoryName {{ $t('trnForm.transferTitle') }}- //- .trnItem__date {{ formatedDate }}- //- .trnItem__wallet- //- WalletsItemWalletItem(- //- :id="trn.walletFromId"- //- isAltColor- //- ui="tile"- //- )- //- .trnFormHeaderSeparator: .mdi.mdi-chevron-right- //- WalletsItemWalletItem(- //- :id="trn.walletToId"- //- isAltColor- //- ui="tile"- //- )- //- .trnItem__amount(@click.stop="setTrnEdit")- //- Amount(- //- :currency="$store.state.wallets.items[trn.walletFromId].currency"- //- :value="trn.amountFrom"- //- :type="2"- //- vertical="center"- //- size="xl"- //- )-- //- .trnItem__desc(v-if="trn.description") {{ trn.description }}-- //- //- Transfer: History- //- template(v-else)- //- .trnItem__left- //- .trnItem__categoryIcon- //- Icon(- //- :color="category.color"- //- :icon="category.icon"- //- background="var(--c-item-stat-bg)"- //- round- //- )-- //- .trnItem__center- //- .trnItem__categoryName- //- div {{ $t('trnForm.transferTitle') }}- //- .transfer- //- div- //- span {{ $t('trnForm.transfer.from') }}:- //- | {{ $store.state.wallets.items[trn.walletFromId].name }}- //- div- //- span {{ $t('trnForm.transfer.to') }}:- //- | {{ $store.state.wallets.items[trn.walletToId].name }}-- //- .trnItem__desc(v-if="trn.description") {{ trn.description }}-- //- .trnItem__right- //- .trnItem__amount(@click.stop="setTrnEdit")- //- Amount(- //- :currency="$store.state.wallets.items[trn.walletFromId].currency"- //- :isColorize="false"- //- :type="2"- //- :value="trn.amountFrom"- //- )-- //- //- Transaction- //- template(v-else)- //- //- Detailed- //- template(v-if="ui === 'detailed'")- //- .trnItem__categoryIcon- //- Icon(- //- :background="category.color"- //- :icon="category.icon"- //- big- //- round- //- )- //- .trnItem__categoryName {{ category.name }}- //- .trnItem__wallet- //- .walletIcon- //- Icon(- //- :abbr="wallet.name"- //- :background="wallet.color"- //- small- //- )-- //- .walletName {{ wallet.name }}-- //- .trnItem__date {{ formatedDate }}- //- .trnItem__amount(@click.stop="setTrnEdit")- //- Amount(- //- :currency="wallet.currency"- //- :type="trn.type"- //- :value="trn.amount"- //- vertical="center"- //- size="xl"- //- isShowPrefix- //- )-- //- .trnItem__desc(v-if="trn.description") {{ trn.description }}-- //- //- Stat no category- //- template(v-else-if="ui === 'stat' && !showCategory")- //- .trnItem__statWrap- //- .trnItem__date {{ $t(formatedDateDay) }}-- //- .trnItem__wallet- //- .walletIcon- //- Icon(- //- :abbr="wallet.name"- //- :background="wallet.color"- //- small- //- )- //- .walletName {{ wallet.name }}- //- .trnItem__desc(v-if="trn.description") {{ trn.description }}- //- .trnItem__amount(@click.stop="setTrnEdit")- //- Amount(- //- :currency="wallet.currency"- //- :value="trn.amount"- //- :type="trn.type"- //- isShowPrefix- //- )-- //- //- History- //- template(v-else)- //- .trnItem__left- //- .trnItem__categoryIcon- //- Icon(- //- :color="category.color"- //- :icon="category.icon"- //- background="var(--c-item-stat-bg)"- //- round- //- )-- //- .trnItem__center- //- .trnItem__categoryName- //- | {{ category.name }}- //- .trnItem__groups(v-if="trn.groups") In group-- //- .trnItem__wallet- //- .trnItem__walletIcon- //- Icon(- //- :abbr="wallet.name"- //- :background="wallet.color"- //- :small="true"- //- )- //- .trnItem__walletName {{ wallet.name }}-- //- .trnItem__desc(v-if="trn.description") {{ trn.description }}-- //- .trnItem__right- //- .trnItem__amount(@click.stop="setTrnEdit")- //- Amount(- //- :currency="wallet.currency"- //- :value="trn.amount"- //- :type="trn.type"- //- size="md"- //- :isColorize="trn.type === 1"- //- isShowPrefix- //- )-</template>--<style lang="stylus" scoped>-.transfer- padding-top $m5- font-size 14px-- span- padding-right 2px- color var(--c-font-3)- font-size 11px--.trnFormHeaderSeparator- color var(--c-font-1)- font-size 32px--.trnItem- &._detailed- display flex- flex-flow column- align-items center- justify-content center- margin-bottom -10px- text-align center-- &._stat- margin-top -1px- padding-top $m6- border-bottom $m2-- +media-hover(true)- &._history- &._stat- background var(--c-item-bg-hover)-- &__amount- align-self center- padding-top $m5-- ^[0]._stat &- margin-left auto- padding-top 0-- &__categoryIcon- ^[0]._detailed &- margin-top -38px- padding-bottom 12px-- &__categoryName- white-space nowrap- overflow hidden- text-overflow ellipsis-- ^[0]._detailed &- padding-bottom $m6- color var(--c-font-2)- font-size 22px- fontFamilyNunito()-- &__date- font-size 13px-- ^[0]._detailed &- padding-bottom $m8- font-size 14px-- ^[0]._stat &- padding-right $m7-- &__desc- color var(--c-font-2)- font-size 14px-- ^[0]._detailed &- padding-top $m7-- ^[0]._stat &- overflow hidden- padding-right 0- white-space nowrap- text-overflow ellipsis-- &__statWrap- display flex- align-items center- padding-bottom 10px- // border-bottom 1px solid var(--c-bg-6)-- ^[0]._stat:hover &- @media $media-laptop- border-color transparent-- ^[0]._stat:last-child &- border-color transparent-- &__wallet- ^[0]._detailed &- ^[0]._stat &- display flex- align-items center-- .walletIcon- margin-right 8px-- .walletName- font-size 14px- white-space nowrap-- ^[0]._detailed &- padding-bottom $m6-- .walletName- font-size 16px-- ^[0]._stat &- padding-right 20px-- &__groups- display inline-block- padding-left 10px- font-size 10px--// Stat-// -----------------------------------------------------------------------------.trnItem._stat._history- padding 0--// History-// -----------------------------------------------------------------------------.trnItem- &._history- display grid- grid-template-columns minmax(10px, max-content) 1fr minmax(10px, max-content)- grid-column-gap $m7-- &__wallet- display flex- align-items center- font-size 12px-- &__walletIcon- padding-right $m4-- &__walletName- font-size 12px-- &__desc- ^[0]._history &- padding-top $m6- color var(--c-font-3)- font-size 11px-- &__categoryName- ^[0]._history &- padding-bottom $m4- color var(--c-font-2)- font-size 14px-- &._active- &._trnForm- margin-right - ($m7)- margin-left - ($m7)- padding-right ($m7)- padding-left ($m7)-- &._active- background var(--c-bg-1)- border-top 1px solid var(--c-blue-1)- border-bottom 1px solid var(--c-blue-1)-</style>diff --git a/components/trns/item/WithoutCat.vue b/components/trns/item/WithoutCat.vuenew file mode 100644index 00000000..e63d91e5--- /dev/null+++ b/components/trns/item/WithoutCat.vue@@ -0,0 +1,68 @@++<script lang="ts">+import { defineComponent } from '@nuxtjs/composition-api'+import useTrn from '~/components/trns/item/useTrn'++export default defineComponent({+ props: {+ actions: { type: Object, required: false, default: () => ({}) },+ trnId: { type: String, required: true }+ },++ setup ({ trnId, actions }) {+ const { formatTrnItem, formatDate } = useTrn()+ const trnItem = formatTrnItem(trnId)+ // @ts-ignore+ const { onOpenDetails, onOpenEdit, onSetFilter } = actions(trnItem)++ return {+ trnItem,+ onOpenDetails,+ onOpenEdit,+ onSetFilter,++ formatDate+ }+ }+})+</script>++<template lang="pug">+.space-x-4.flex.text-neutral-500(+ class="dark:text-neutral-400 hocus:bg-neutral-100 dark:hocus:bg-neutral-800"+ @click="onOpenDetails"+)+ .truncate.shrink-0.text-xs.leading-none(class="pt-[1px] min-w-[32px]") {{ $t(formatDate(trnItem.date, 'trnItem')) }}++ .grow+ .items-center.flex+ .grow+ .space-x-2.items-baseline.flex+ //- Wallet+ .text-xs.leading-none(v-if="trnItem.type !== 2") {{ trnItem.wallet.name }}+ //- Group+ .text-neutral-500.text-xs.leading-none(v-if="trnItem.groups") In group++ //- Transfer info+ .text-sm(v-if="trnItem.type === 2")+ .space-x-1.items-center.flex+ .text-neutral-600(class="dark:text-neutral-500") {{ $t('trnForm.transfer.from') }}:+ .text-neutral-500(class="dark:text-neutral-400") {{ trnItem.walletFrom.name }}+ .space-x-1.items-center.flex+ .text-neutral-600(class="dark:text-neutral-500") {{ $t('trnForm.transfer.to') }}:+ .text-neutral-500(class="dark:text-neutral-400") {{ trnItem.walletTo.name }}++ //- Amount+ Amount2(+ :amount="trnItem.amount"+ :currency="trnItem.wallet.currency"+ :type="trnItem.type"+ colorize="incomes"+ @click="onOpenEdit"+ )++ //- Description+ .pt-1.text-neutral-500.text-xs(+ v-if="trnItem.description"+ ) {{ trnItem.description }}+</template>diff --git a/components/trns/item/useTrn.ts b/components/trns/item/useTrn.tsnew file mode 100644index 00000000..f1a96bc4--- /dev/null+++ b/components/trns/item/useTrn.ts@@ -0,0 +1,78 @@+import { useContext } from '@nuxtjs/composition-api'+import { formatDate } from '~/utils/formatDate'++export default function useTrn () {+ const { store } = useContext()++ function formatTrnItem (id) {+ try {+ const { trns, wallets, categories } = store.state++ if (!trns?.items || !wallets?.items || !categories?.items)+ return 'Something missing'++ // Trn+ const trn = trns.items[id]+ if (!trn)+ return 'Trn not found'++ // Wallet+ const wallet = wallets.items[trn.walletId]+ if (!wallet)+ return 'Wallet not found'++ // Category+ const category = categories.items[trn.categoryId]+ if (!category)+ return 'Category not found'++ // Parent category+ let categoryParent = null+ if (category.parentId) {+ categoryParent = categories.items[category.parentId]+ if (!categoryParent)+ return 'Parent Category not found'+ }++ // Transfer from+ let walletFrom = null+ if (trn.walletFromId) {+ walletFrom = wallets.items[trn.walletFromId]+ if (!walletFrom)+ return 'Transfer WalletFrom not found'+ }++ // Transfer to+ let walletTo = null+ if (trn.walletToId) {+ walletTo = wallets.items[trn.walletToId]+ if (!walletTo)+ return 'Transfer WalletTo not found'+ }++ // Date+ let dateFormated = formatDate(trn.date, 'full')+ // @ts-ignore+ dateFormated = `${dateFormated.weekday}, ${dateFormated.day} ${dateFormated.month} ${dateFormated.year}`++ return {+ id,+ ...trn,+ dateFormated,+ category,+ categoryParent,+ walletFrom,+ walletTo,+ wallet+ }+ }+ catch (error) {+ console.log(error)+ }+ }++ return {+ formatTrnItem,+ formatDate+ }+}diff --git a/components/trns/list/TrnsList.vue b/components/trns/list/TrnsList.vueindex db8fac17..edb1950b 100644--- a/components/trns/list/TrnsList.vue+++ b/components/trns/list/TrnsList.vue@@ -1,5 +1,9 @@-<script>-export default {+<script lang="ts">+import { useContext, defineComponent } from '@nuxtjs/composition-api'+import useCalculator from '~/components/trnForm/calculator/useCalculator'+import useFilter from '~/modules/filter/useFilter'++export default defineComponent({props: {categoryId: { type: String, default: null },expenses: { type: Boolean, default: false },@@ -11,6 +15,41 @@ export default {classNames: { type: String, default: 'md:grid-cols-2 md:gap-6 lg:grid-cols-3' }},+ setup () {+ const { store } = useContext()+ const { setExpression } = useCalculator()+ const { setCategoryFilter } = useFilter()++ const actions = trnItem => ({+ onOpenDetails: () => {+ if (!store.state.trns.modal.show) {+ store.commit('categories/hideCategoryModal')+ store.commit('trns/showTrnModal')+ store.commit('trns/setTrnModalId', trnItem.id)+ }+ },++ onOpenEdit: (event) => {+ event.stopPropagation()+ setExpression(trnItem.amount)+ store.dispatch('trnForm/openTrnForm', { action: 'edit', trnId: trnItem.id })+ store.commit('stat/setCategoryModal', { id: null, type: null })+ },++ onSetFilter: (event) => {+ event.stopPropagation()+ setCategoryFilter(trnItem.categoryId)+ store.commit('filter/setFilterDateNow')+ store.commit('trns/hideTrnModal')+ store.commit('trns/setTrnModalId', null)+ store.commit('stat/setCategoryModal', { id: null, type: null })+ store.dispatch('ui/setActiveTabStat', 'details')+ }+ })++ return { actions }+ },+data () {return {pageNumber: 1,@@ -85,7 +124,7 @@ export default {this.isShowTrnsWithDesc = !this.isShowTrnsWithDesc}}-}+})</script><template lang="pug">@@ -115,27 +154,32 @@ divTrnsListDate(:date="date").overflow-hidden.rounded-md- TrnsItemTrnItem(+ TrnsItemHistory.py-3.px-3.cursor-pointer(v-for="trnId in trnsIds"- :category="$store.state.categories.items[$store.state.trns.items[trnId].categoryId]":key="trnId"- :trn="$store.state.trns.items[trnId]"+ :actions="actions":trnId="trnId"- :wallet="$store.state.wallets.items[$store.state.trns.items[trnId].walletId]")//- Stat viewdiv(v-else)- TrnsItemTrnItem(- v-for="trnId of paginatedTrnsIds"+ TrnsItemWithoutCat.py-3.px-2.cursor-pointer(+ v-for="trnId in paginatedTrnsIds":key="trnId"- :category="$store.state.categories.items[$store.state.trns.items[trnId].categoryId]"- :trn="$store.state.trns.items[trnId]"+ :actions="actions":trnId="trnId"- :ui="ui"- :wallet="$store.state.wallets.items[$store.state.trns.items[trnId].walletId]")+ //- TrnsItemTrnItem(+ //- v-for="trnId of paginatedTrnsIds"+ //- :key="trnId"+ //- :category="$store.state.categories.items[$store.state.trns.items[trnId].categoryId]"+ //- :trn="$store.state.trns.items[trnId]"+ //- :trnId="trnId"+ //- :ui="ui"+ //- :wallet="$store.state.wallets.items[$store.state.trns.items[trnId].walletId]"+ //- )+.py-4(v-if="!isShowedAllTrns").button(@click="showMoreTrns") {{ $t('trns.more') }}</template>diff --git a/components/wallets/total/WalletsTotal.vue b/components/wallets/total/WalletsTotal.vueindex 3a91b3f2..2d802bcc 100644--- a/components/wallets/total/WalletsTotal.vue+++ b/components/wallets/total/WalletsTotal.vue@@ -1,10 +1,17 @@<script>+import useAmount from '~/components/amount/useAmount'+export default {props: {isShowCredits: { type: Boolean, default: false },isShowTotal: { type: Boolean, default: false }},+ setup () {+ const { getAmountInBaseCurrency } = useAmount()+ return { getAmountInBaseCurrency }+ },+computed: {totalInWallets () {const walletsItems = this.$store.state.wallets.items@@ -21,9 +28,10 @@ export default {walletTotal = walletsTotal[walletId].base}else {- walletTotal = this.$store.getters['currencies/getAmountInBaseCurrency']({+ walletTotal = this.getAmountInBaseCurrency({amount: walletsTotal[walletId].base,- currency: walletsItems[walletId].currency+ currency: walletsItems[walletId].currency,+ noFormat: true})}diff --git a/layouts/default.vue b/layouts/default.vueindex 755ba183..74b524bf 100644--- a/layouts/default.vue+++ b/layouts/default.vue@@ -91,7 +91,10 @@ export default {@onClose="isShowUpdateApp = false")- .layout__wrap+ .layout__wrap.overflow-hidden.flex-grow.h-full.grid(+ class=""+ )+ //- .div hello.layout__sidebarLayoutSidebar@@ -113,12 +116,8 @@ export default {<style lang="stylus" scoped>.layout&__wrap- flex-grow 1- overflow hidden- display gridgrid-template-columns 1frgrid-template-rows 1fr minmax(auto, auto)- height 100%+media(1200px)grid-template-rows 1fr autodiff --git a/locales/ru-RU.js b/locales/ru-RU.jsindex f7771164..ad1fd6ad 100644--- a/locales/ru-RU.js+++ b/locales/ru-RU.js@@ -72,7 +72,7 @@ export default {userLogout: 'Выход',loginWithGoogle: 'Войти через Google',- changeTheme: 'Сменить оформление',+ changeTheme: 'Сменить тему',createTrn: 'Создать транзакцию',base: {diff --git a/modules/filter/useFilter.ts b/modules/filter/useFilter.tsindex 9fd22709..b4bbb269 100644--- a/modules/filter/useFilter.ts+++ b/modules/filter/useFilter.ts@@ -8,7 +8,7 @@ export default function useFilter () {const isNeedToRedirect = computed(() => route.value.name !== 'index' && route.value.name !== 'history')function scrollTop () {- const page = document.querySelector('.pageWrapScroll')+ const page = document.querySelector('.js_scroll_page')if (page) page.scrollTop = 0}diff --git a/modules/menu/useMenuData.ts b/modules/menu/useMenuData.tsindex ffcfcc49..bb5d402b 100644--- a/modules/menu/useMenuData.ts+++ b/modules/menu/useMenuData.ts@@ -60,20 +60,18 @@ export default function useMenuData () {store.dispatch('ui/setActiveTab', null)}- function getClassNames (menuId: string) {- return ['hocus:bg-neutral-800', { 'border-r-2 bored-neutral-900': route.value.name === menuId }]+ function checkIsActive (menuId: string) {+ return route.value.name === menuId}function checkIsShow (item: MenuItem) {- console.log('item', item)-return !item.private || (item.private && store.getters['user/isTester'])}return {items,onClick,- getClassNames,- checkIsShow+ checkIsShow,+ checkIsActive}}diff --git a/modules/trns/use/formatTrn.ts b/modules/trns/use/formatTrn.tsnew file mode 100644index 00000000..5b7fef2d--- /dev/null+++ b/modules/trns/use/formatTrn.ts@@ -0,0 +1,77 @@+import { useContext } from '@nuxtjs/composition-api'+import { formatDate } from '~/utils/formatDate'++export default function useFormatTrnFullItem () {+ const { store } = useContext()++ function formatTrnFullItem (id) {+ try {+ const { trns, wallets, categories } = store.state++ if (!trns?.items || !wallets?.items || !categories?.items)+ return 'Something missing'++ // Trn+ const trn = trns.items[id]+ if (!trn)+ return 'Trn not found'++ // Wallet+ const wallet = wallets.items[trn.walletId]+ if (!wallet)+ return 'Wallet not found'++ // Category+ const category = categories.items[trn.categoryId]+ if (!category)+ return 'Category not found'++ // Parent category+ let categoryParent = null+ if (category.parentId) {+ categoryParent = categories.items[category.parentId]+ if (!categoryParent)+ return 'Parent Category not found'+ }++ // Transfer from+ let walletFrom = null+ if (trn.walletFromId) {+ walletFrom = wallets.items[trn.walletFromId]+ if (!walletFrom)+ return 'Transfer WalletFrom not found'+ }++ // Transfer to+ let walletTo = null+ if (trn.walletToId) {+ walletTo = wallets.items[trn.walletToId]+ if (!walletTo)+ return 'Transfer WalletTo not found'+ }++ // Date+ let dateFormated = formatDate(trn.date, 'full')+ // @ts-ignore+ dateFormated = `${dateFormated.weekday}, ${dateFormated.day} ${dateFormated.month} ${dateFormated.year}`++ return {+ id,+ ...trn,+ dateFormated,+ category,+ categoryParent,+ walletFrom,+ walletTo,+ wallet+ }+ }+ catch (error) {+ console.log(error)+ }+ }++ return {+ formatTrnFullItem+ }+}diff --git a/nuxt.config.js b/nuxt.config.jsindex 59171257..343e6710 100644--- a/nuxt.config.js+++ b/nuxt.config.js@@ -67,6 +67,7 @@ export default {// Color modecolorMode: {+ classSuffix: '',preference: 'dark' // default value of $colorMode.preference},diff --git a/package-lock.json b/package-lock.jsonindex 8cbb253a..35288877 100644--- a/package-lock.json+++ b/package-lock.json@@ -11,18 +11,18 @@"@nuxtjs/i18n": "^7.2.0","@simonwep/pickr": "1.8.2","@vueuse/core": "5.3.0",- "axios": "0.21.4",- "core-js": "3.18.0",+ "axios": "0.24.0",+ "core-js": "3.20.0","currency.js": "2.0.4","dayjs": "1.10.7",- "firebase": "9.1.0",- "highcharts": "9.2.2",+ "firebase": "9.6.1",+ "highcharts": "9.3.2","highcharts-vue": "1.4.0","localforage": "1.10.0","nuxt": "2.15.8","portal-vue": "2.1.7",- "swiper": "6.8.1",- "vue-notification": "1.3.20",+ "swiper": "^6.8.4",+ "vue-notification": "^1.3.20","vuedraggable": "2.24.3","vuejs-datepicker": "1.6.2"},@@ -30,13 +30,13 @@"@nuxt/types": "2.15.8","@nuxt/typescript-build": "2.1.0","@nuxtjs/color-mode": "2.1.1",- "@nuxtjs/composition-api": "0.29.2",+ "@nuxtjs/composition-api": "0.31.0","@nuxtjs/eslint-config-typescript": "6.0.1","@nuxtjs/pwa": "3.3.5","@nuxtjs/style-resources": "^1.2.1","@nuxtjs/tailwindcss": "^4.2.1","cross-env": "7.0.3",- "eslint": "7.32.0",+ "eslint": "^7.32.0","eslint-plugin-nuxt": "2.0.0","fancy-log": "1.3.3","gulp": "4.0.2",@@ -45,17 +45,29 @@"node-notifier": "10.0.0","pug": "3.0.2","pug-plain-loader": "1.1.0",- "style-loader": "2.0.0",- "stylelint": "13.13.1",+ "style-loader": "^2.0.0",+ "stylelint": "^13.13.1","stylelint-order": "4.1.0","stylelint-plugin-stylus": "0.11.0",- "stylus": "0.55.0",+ "stylus": "^0.55.0","stylus-loader": "3.0.2",- "tailwindcss": "^3.0.1",- "typescript": "4.4.3",+ "tailwindcss": "^3.0.7",+ "typescript": "4.5.4","vinyl-ftp": "0.6.1"}},+ "node_modules/@antfu/utils": {+ "version": "0.3.0",+ "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.3.0.tgz",+ "integrity": "sha512-UU8TLr/EoXdg7OjMp0h9oDoIAVr+Z/oW9cpOxQQyrsz6Qzd2ms/1CdWx8fl2OQdFpxGmq5Vc4TwfLHId6nAZjA==",+ "dev": true,+ "dependencies": {+ "@types/throttle-debounce": "^2.1.0"+ },+ "funding": {+ "url": "https://github.com/sponsors/antfu"+ }+ },"node_modules/@babel/code-frame": {"version": "7.16.0","resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",@@ -68,27 +80,27 @@}},"node_modules/@babel/compat-data": {- "version": "7.15.0",- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",- "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",+ "version": "7.16.4",+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",+ "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==","engines": {"node": ">=6.9.0"}},"node_modules/@babel/core": {- "version": "7.15.5",- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz",- "integrity": "sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==",+ "version": "7.16.5",+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.5.tgz",+ "integrity": "sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ==","dependencies": {- "@babel/code-frame": "^7.14.5",- "@babel/generator": "^7.15.4",- "@babel/helper-compilation-targets": "^7.15.4",- "@babel/helper-module-transforms": "^7.15.4",- "@babel/helpers": "^7.15.4",- "@babel/parser": "^7.15.5",- "@babel/template": "^7.15.4",- "@babel/traverse": "^7.15.4",- "@babel/types": "^7.15.4",+ "@babel/code-frame": "^7.16.0",+ "@babel/generator": "^7.16.5",+ "@babel/helper-compilation-targets": "^7.16.3",+ "@babel/helper-module-transforms": "^7.16.5",+ "@babel/helpers": "^7.16.5",+ "@babel/parser": "^7.16.5",+ "@babel/template": "^7.16.0",+ "@babel/traverse": "^7.16.5",+ "@babel/types": "^7.16.0","convert-source-map": "^1.7.0","debug": "^4.1.0","gensync": "^1.0.0-beta.2",@@ -140,9 +152,9 @@}},"node_modules/@babel/generator": {- "version": "7.16.0",- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz",- "integrity": "sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==",+ "version": "7.16.5",+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz",+ "integrity": "sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==","dependencies": {"@babel/types": "^7.16.0","jsesc": "^2.5.1",@@ -176,13 +188,13 @@}},"node_modules/@babel/helper-compilation-targets": {- "version": "7.15.4",- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",- "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",+ "version": "7.16.3",+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz",+ "integrity": "sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==","dependencies": {- "@babel/compat-data": "^7.15.0",+ "@babel/compat-data": "^7.16.0","@babel/helper-validator-option": "^7.14.5",- "browserslist": "^4.16.6",+ "browserslist": "^4.17.5","semver": "^6.3.0"},"engines": {@@ -260,6 +272,17 @@"semver": "bin/semver.js"}},+ "node_modules/@babel/helper-environment-visitor": {+ "version": "7.16.5",+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz",+ "integrity": "sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg==",+ "dependencies": {+ "@babel/types": "^7.16.0"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },"node_modules/@babel/helper-explode-assignable-expression": {"version": "7.15.4","resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz",@@ -318,29 +341,29 @@}},"node_modules/@babel/helper-module-imports": {- "version": "7.15.4",- "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz",- "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==",+ "version": "7.16.0",+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz",+ "integrity": "sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==","dependencies": {- "@babel/types": "^7.15.4"+ "@babel/types": "^7.16.0"},"engines": {"node": ">=6.9.0"}},"node_modules/@babel/helper-module-transforms": {- "version": "7.15.7",- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.7.tgz",- "integrity": "sha512-ZNqjjQG/AuFfekFTY+7nY4RgBSklgTu970c7Rj3m/JOhIu5KPBUuTA9AY6zaKcUvk4g6EbDXdBnhi35FAssdSw==",+ "version": "7.16.5",+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz",+ "integrity": "sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ==","dependencies": {- "@babel/helper-module-imports": "^7.15.4",- "@babel/helper-replace-supers": "^7.15.4",- "@babel/helper-simple-access": "^7.15.4",- "@babel/helper-split-export-declaration": "^7.15.4",+ "@babel/helper-environment-visitor": "^7.16.5",+ "@babel/helper-module-imports": "^7.16.0",+ "@babel/helper-simple-access": "^7.16.0",+ "@babel/helper-split-export-declaration": "^7.16.0","@babel/helper-validator-identifier": "^7.15.7",- "@babel/template": "^7.15.4",- "@babel/traverse": "^7.15.4",- "@babel/types": "^7.15.6"+ "@babel/template": "^7.16.0",+ "@babel/traverse": "^7.16.5",+ "@babel/types": "^7.16.0"},"engines": {"node": ">=6.9.0"@@ -393,11 +416,11 @@}},"node_modules/@babel/helper-simple-access": {- "version": "7.15.4",- "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz",- "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==",+ "version": "7.16.0",+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz",+ "integrity": "sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==","dependencies": {- "@babel/types": "^7.15.4"+ "@babel/types": "^7.16.0"},"engines": {"node": ">=6.9.0"@@ -456,13 +479,13 @@}},"node_modules/@babel/helpers": {- "version": "7.15.4",- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",- "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",+ "version": "7.16.5",+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.5.tgz",+ "integrity": "sha512-TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw==","dependencies": {- "@babel/template": "^7.15.4",- "@babel/traverse": "^7.15.4",- "@babel/types": "^7.15.4"+ "@babel/template": "^7.16.0",+ "@babel/traverse": "^7.16.5",+ "@babel/types": "^7.16.0"},"engines": {"node": ">=6.9.0"@@ -482,9 +505,9 @@}},"node_modules/@babel/parser": {- "version": "7.16.4",- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz",- "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==",+ "version": "7.16.6",+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",+ "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==","bin": {"parser": "bin/babel-parser.js"},@@ -1581,16 +1604,17 @@}},"node_modules/@babel/traverse": {- "version": "7.16.3",- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz",- "integrity": "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==",+ "version": "7.16.5",+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz",+ "integrity": "sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ==","dependencies": {"@babel/code-frame": "^7.16.0",- "@babel/generator": "^7.16.0",+ "@babel/generator": "^7.16.5",+ "@babel/helper-environment-visitor": "^7.16.5","@babel/helper-function-name": "^7.16.0","@babel/helper-hoist-variables": "^7.16.0","@babel/helper-split-export-declaration": "^7.16.0",- "@babel/parser": "^7.16.3",+ "@babel/parser": "^7.16.5","@babel/types": "^7.16.0","debug": "^4.1.0","globals": "^11.1.0"@@ -1667,14 +1691,14 @@}},"node_modules/@firebase/analytics": {- "version": "0.7.1",- "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.7.1.tgz",- "integrity": "sha512-fTUN47UK4obzIJwmgLMJU46dWZ7pzitCEO+80pQZC7mdLlVs/NW0+tMf6rETwMpKjGSgb25cKidpgEuioQtT7w==",- "dependencies": {- "@firebase/component": "0.5.7",- "@firebase/installations": "0.5.1",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "version": "0.7.4",+ "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.7.4.tgz",+ "integrity": "sha512-AU3XMwHW7SFGCNeUKKNW2wXGTdmS164ackt/Epu2bDXCT1OcauPE1AVd+ofULSIDCaDUAQVmvw3JrobgogEU7Q==",+ "dependencies": {+ "@firebase/component": "0.5.9",+ "@firebase/installations": "0.5.4",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"},"peerDependencies": {@@ -1682,14 +1706,14 @@}},"node_modules/@firebase/analytics-compat": {- "version": "0.1.2",- "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.1.2.tgz",- "integrity": "sha512-TpWpz0s8EgVt9aqyOCFktONqVkjyrNRR4esn3cEYrueH+XXSMDLWY9oFHuUJzntcoEOlOBWMvpsJCPG/1kthkg==",+ "version": "0.1.5",+ "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.1.5.tgz",+ "integrity": "sha512-5cfr0uWwlhoHQYAr6UtQCHwnGjs/3J/bWrfA3INNtzaN4/tTTLTD02iobbccRcM7dM5TR0sZFWS5orfAU3OBFg==","dependencies": {- "@firebase/analytics": "0.7.1",+ "@firebase/analytics": "0.7.4","@firebase/analytics-types": "0.7.0",- "@firebase/component": "0.5.7",- "@firebase/util": "1.4.0",+ "@firebase/component": "0.5.9",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"},"peerDependencies": {@@ -1702,24 +1726,24 @@"integrity": "sha512-DNE2Waiwy5+zZnCfintkDtBfaW6MjIG883474v6Z0K1XZIvl76cLND4iv0YUb48leyF+PJK1KO2XrgHb/KpmhQ=="},"node_modules/@firebase/app": {- "version": "0.7.1",- "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.1.tgz",- "integrity": "sha512-B4z6E1EPQc0mOjF35IPKdDRCFnT/fNQIHfM+v7F9obB7ItPhGILK3LxaQfuampSQpF6GG6TPFDbrWK6myXAq+g==",+ "version": "0.7.11",+ "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.11.tgz",+ "integrity": "sha512-GnG2XxlMrqd8zRa14Y3gvkPpr0tKTLZtxhUnShWkeSM5bQqk1DK2k9qDsf6D3cYfKCWv+JIg1zmL3oalxfhNNA==","dependencies": {- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},"node_modules/@firebase/app-check": {- "version": "0.4.1",- "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.4.1.tgz",- "integrity": "sha512-Kpqh0Y2zpx+acTL7eOVYIWBOmAwoconJpqOAlByGNXuxm/ccP00XREo+HsqaC7wapZRXh+h8BK0jZjvdV36qow==",+ "version": "0.5.2",+ "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.5.2.tgz",+ "integrity": "sha512-DJrvxcn5QPO5dU735GA9kYpf+GwmCmnd/oQdWVExrRG+yjaLnP0rSJ2HKQ4bZKGo8qig3P7fwQpdMOgP2BXFjQ==","dependencies": {- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"},"peerDependencies": {@@ -1727,14 +1751,14 @@}},"node_modules/@firebase/app-check-compat": {- "version": "0.1.2",- "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.1.2.tgz",- "integrity": "sha512-JB+OHk4Cp9ZgT+UfX0A+lwH1AoM5Y2X1rDhmhCsEXcKKwz1w9DpL9PjStciP8UYg1dpqbp5p9OMxmty+21EBsA==",+ "version": "0.2.2",+ "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.2.2.tgz",+ "integrity": "sha512-nX2Ou8Rwo+TMMNDecQOGH78kFw6sORLrsGyu0eC95M853JjisVxTngN1TU/RL5h83ElJ0HhNlz6C3FYAuGNqqA==","dependencies": {- "@firebase/app-check": "0.4.1",- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "@firebase/app-check": "0.5.2",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"},"peerDependencies": {@@ -1747,14 +1771,14 @@"integrity": "sha512-uZfn9s4uuRsaX5Lwx+gFP3B6YsyOKUE+Rqa6z9ojT4VSRAsZFko9FRn6OxQUA1z5t5d08fY4pf+/+Dkd5wbdbA=="},"node_modules/@firebase/app-compat": {- "version": "0.1.2",- "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.2.tgz",- "integrity": "sha512-kF1maoqA8bZqJ4v/ojVvA7kIyyXEPkJmL48otGrC8LIgdcen7xCx3JFDe0DGeQywg+qujvdkJz/TptFN1cvAgw==",- "dependencies": {- "@firebase/app": "0.7.1",- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "version": "0.1.12",+ "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.12.tgz",+ "integrity": "sha512-hRzCCFjwTwrFsAFcuUW2TPpyShJ/OaoA1Yxp4QJr6Xod8g+CQxTMZ4RJ51I5t9fErXvl65VxljhfqFEyB3ZmJA==",+ "dependencies": {+ "@firebase/app": "0.7.11",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},@@ -1764,14 +1788,14 @@"integrity": "sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg=="},"node_modules/@firebase/auth": {- "version": "0.18.0",- "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.18.0.tgz",- "integrity": "sha512-iK+VXkdDkum8SmJNgz9ZcOboRLrUN1VW7AHHkpZb76VJvoYRoCPD+A9O/v/ziI0LpwIZJwi1GFes9XjZTlfLiA==",- "dependencies": {- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",- "node-fetch": "2.6.2",+ "version": "0.19.4",+ "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.19.4.tgz",+ "integrity": "sha512-0FefLGnP0mbgvSSan7j2e25i3pllqF9+KYO5fwuAo3YcgjCyNMBJKaXPlz/J+z6jRHa2itjh4W48jD4Y/FCMqw==",+ "dependencies": {+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2",+ "node-fetch": "2.6.5","selenium-webdriver": "4.0.0-rc-1","tslib": "^2.1.0"},@@ -1780,15 +1804,15 @@}},"node_modules/@firebase/auth-compat": {- "version": "0.1.3",- "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.1.3.tgz",- "integrity": "sha512-eDDtY5If+ERJxalt+plvX6avZspuwo4/kPXssvV+csm414awhDzQBtSDPDajgbH3YB9V+O3LAFHeWcP3rrHS5w==",+ "version": "0.2.4",+ "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.2.4.tgz",+ "integrity": "sha512-2OpV6o8U33xiC98G9UrlhEMOOHfXmoum74VghP85BufLroi7erLKawBaDbYiHWK2QYudd8cbOPkk5GDocl1KNQ==","dependencies": {- "@firebase/auth": "0.18.0",+ "@firebase/auth": "0.19.4","@firebase/auth-types": "0.11.0",- "@firebase/component": "0.5.7",- "@firebase/util": "1.4.0",- "node-fetch": "2.6.2",+ "@firebase/component": "0.5.9",+ "@firebase/util": "1.4.2",+ "node-fetch": "2.6.5","selenium-webdriver": "^4.0.0-beta.2","tslib": "^2.1.0"},@@ -1796,14 +1820,6 @@"@firebase/app-compat": "0.x"}},- "node_modules/@firebase/auth-compat/node_modules/node-fetch": {- "version": "2.6.2",- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",- "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==",- "engines": {- "node": "4.x || >=6.0.0"- }- },"node_modules/@firebase/auth-interop-types": {"version": "0.1.6","resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz",@@ -1822,46 +1838,38 @@"@firebase/util": "1.x"}},- "node_modules/@firebase/auth/node_modules/node-fetch": {- "version": "2.6.2",- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",- "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==",- "engines": {- "node": "4.x || >=6.0.0"- }- },"node_modules/@firebase/component": {- "version": "0.5.7",- "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.7.tgz",- "integrity": "sha512-CiAHUPXh2hn/lpzMShNmfAxHNQhKQwmQUJSYMPCjf2bCCt4Z2vLGpS+UWEuNFm9Zf8LNmkS+Z+U/s4Obi5carg==",+ "version": "0.5.9",+ "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.9.tgz",+ "integrity": "sha512-oLCY3x9WbM5rn06qmUvbtJuPj4dIw/C9T4Th52IiHF5tiCRC5k6YthvhfUVcTwfoUhK0fOgtwuKJKA/LpCPjgA==","dependencies": {- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},"node_modules/@firebase/database": {- "version": "0.12.1",- "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.12.1.tgz",- "integrity": "sha512-Ethk0hc476qnkSKNBa+8Yc7iM8AO69HYWsaD+QUC983FZtnuMyNLHtEeSUbLQYvyHo7cOjcc52slop14WmfZeQ==",+ "version": "0.12.4",+ "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.12.4.tgz",+ "integrity": "sha512-XkrL1kXELRNkqKcltuT4hfG1gWmFiGvjFY+z7Lhb//12MqdkLjwa9YMK8c6Lo+Ro+IkWcJArQaOQYe3GkU5Wgg==","dependencies": {"@firebase/auth-interop-types": "0.1.6",- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","faye-websocket": "0.11.4","tslib": "^2.1.0"}},"node_modules/@firebase/database-compat": {- "version": "0.1.1",- "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.1.tgz",- "integrity": "sha512-K3DFWiw0YkLZtlfA9TOGPw6zVXKu5dQ1XqIGztUufFVRYW8IizReXVxzSSmJNR4Adr2LiU9j66Wenc6e5UfwaQ==",- "dependencies": {- "@firebase/component": "0.5.7",- "@firebase/database": "0.12.1",- "@firebase/database-types": "0.9.1",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.4.tgz",+ "integrity": "sha512-dIJiZLDFF3U+MoEwoPBy7zxWmBUro1KefmwSHlpOoxmPv76tuoPm85NumpW/HmMrtTcTkC2qowtb6NjGE8X7mw==",+ "dependencies": {+ "@firebase/component": "0.5.9",+ "@firebase/database": "0.12.4",+ "@firebase/database-types": "0.9.3",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"},"peerDependencies": {@@ -1869,44 +1877,44 @@}},"node_modules/@firebase/database-types": {- "version": "0.9.1",- "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.1.tgz",- "integrity": "sha512-RUixK/YrbpxbfdE+nYP0wMcEsz1xPTnafP0q3UlSS/+fW744OITKtR1J0cMRaXbvY7EH0wUVTNVkrtgxYY8IgQ==",+ "version": "0.9.3",+ "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.3.tgz",+ "integrity": "sha512-R+YXLWy/Q7mNUxiUYiMboTwvVoprrgfyvf1Viyevskw6IoH1q8HV1UjlkLSgmRsOT9HPWt7XZUEStVZJFknHwg==","dependencies": {"@firebase/app-types": "0.7.0",- "@firebase/util": "1.4.0"+ "@firebase/util": "1.4.2"}},"node_modules/@firebase/firestore": {- "version": "3.1.0",- "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-3.1.0.tgz",- "integrity": "sha512-vOXueHNRjlgBlKVCWuUDhr3dQW2hJwbcqcJaFiIV9V+PamfyhOHzX8pEQkrPort4YQQvoRmY9uiFhfOGj2hbeA==",- "dependencies": {- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",- "@firebase/webchannel-wrapper": "0.6.0",+ "version": "3.4.1",+ "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-3.4.1.tgz",+ "integrity": "sha512-KSXuaiavHUqk3+0qRe4U8QZ1vfpOc4PuesohLcjA824HexBzXd+6NoUmBs/F9pyS9Ka1rJeECXzXgpk0pInSBw==",+ "dependencies": {+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2",+ "@firebase/webchannel-wrapper": "0.6.1","@grpc/grpc-js": "^1.3.2","@grpc/proto-loader": "^0.6.0",- "node-fetch": "2.6.2",+ "node-fetch": "2.6.5","tslib": "^2.1.0"},"engines": {- "node": "^8.13.0 || >=10.10.0"+ "node": ">=10.10.0"},"peerDependencies": {"@firebase/app": "0.x"}},"node_modules/@firebase/firestore-compat": {- "version": "0.1.3",- "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.1.3.tgz",- "integrity": "sha512-tO3uAkIguKeFeKPu99GR7F7v1/Hc8nV1h7B1kdpkVRRBe+NfVYA3qAUictQ3OAA0oy7Ae9z4SfEURO/R1b6YlQ==",+ "version": "0.1.10",+ "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.1.10.tgz",+ "integrity": "sha512-wnyUzx5bHatnsP+3nX0FmA1jxfDxVW5gCdM59sXxd0PWf4oUOONRlqVstVAHVUH123huGaNdEXY6LUlP7H0EnA==","dependencies": {- "@firebase/component": "0.5.7",- "@firebase/firestore": "3.1.0",+ "@firebase/component": "0.5.9",+ "@firebase/firestore": "3.4.1","@firebase/firestore-types": "2.5.0",- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"},"peerDependencies": {@@ -1922,25 +1930,17 @@"@firebase/util": "1.x"}},- "node_modules/@firebase/firestore/node_modules/node-fetch": {- "version": "2.6.2",- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",- "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==",- "engines": {- "node": "4.x || >=6.0.0"- }- },"node_modules/@firebase/functions": {- "version": "0.7.2",- "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.7.2.tgz",- "integrity": "sha512-B+b57xXtpsRYD3UgVtteeyavXjXfBTtuv+sG8LA0vgJs6bhORswVlKZQqpfW9SDxCMBwzzytzn1m3ZZGfUw2Lg==",+ "version": "0.7.6",+ "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.7.6.tgz",+ "integrity": "sha512-Kl6a2PbRkOlSlOWJSgYuNp3e53G3cb+axF+r7rbWhJIHiaelG16GerBMxZTSxyiCz77C24LwiA2TKNwe85ObZg==","dependencies": {"@firebase/app-check-interop-types": "0.1.0","@firebase/auth-interop-types": "0.1.6",- "@firebase/component": "0.5.7",+ "@firebase/component": "0.5.9","@firebase/messaging-interop-types": "0.1.0",- "@firebase/util": "1.4.0",- "node-fetch": "2.6.2",+ "@firebase/util": "1.4.2",+ "node-fetch": "2.6.5","tslib": "^2.1.0"},"peerDependencies": {@@ -1948,14 +1948,14 @@}},"node_modules/@firebase/functions-compat": {- "version": "0.1.3",- "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.1.3.tgz",- "integrity": "sha512-NdobePNq5LUHCI1dJHUGlOTw+Qmq/FJre981/ELEMBdEs95kmKwnXB2UaLjAQYWkgkr4YS3lEnNpsiSTaEHFCg==",+ "version": "0.1.7",+ "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.1.7.tgz",+ "integrity": "sha512-Rv3mAUIhsLTxIgPWJSESUcmE1tzNHzUlqQStPnxHn6eFFgHVhkU2wg/NMrKZWTFlb51jpKTjh51AQDhRdT3n3A==","dependencies": {- "@firebase/component": "0.5.7",- "@firebase/functions": "0.7.2",+ "@firebase/component": "0.5.9",+ "@firebase/functions": "0.7.6","@firebase/functions-types": "0.5.0",- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"},"peerDependencies": {@@ -1967,21 +1967,13 @@"resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.5.0.tgz","integrity": "sha512-qza0M5EwX+Ocrl1cYI14zoipUX4gI/Shwqv0C1nB864INAD42Dgv4v94BCyxGHBg2kzlWy8PNafdP7zPO8aJQA=="},- "node_modules/@firebase/functions/node_modules/node-fetch": {- "version": "2.6.2",- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",- "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==",- "engines": {- "node": "4.x || >=6.0.0"- }- },"node_modules/@firebase/installations": {- "version": "0.5.1",- "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.5.1.tgz",- "integrity": "sha512-KZ1XHrEPmCx3Z70P9d8mHmYEZXA/uiLIkV0D8R45Q65c0DUxBDm5tSQs56QWofxB/wx16xmO3xAZw4BdJUBnlQ==",+ "version": "0.5.4",+ "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.5.4.tgz",+ "integrity": "sha512-rYb6Ju/tIBhojmM8FsgS96pErKl6gPgJFnffMO4bKH7HilXhOfgLfKU9k51ZDcps8N0npDx9+AJJ6pL1aYuYZQ==","dependencies": {- "@firebase/component": "0.5.7",- "@firebase/util": "1.4.0",+ "@firebase/component": "0.5.9",+ "@firebase/util": "1.4.2","idb": "3.0.2","tslib": "^2.1.0"},@@ -1990,22 +1982,22 @@}},"node_modules/@firebase/logger": {- "version": "0.3.0",- "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.3.0.tgz",- "integrity": "sha512-7oQ+TctqekfgZImWkKuda50JZfkmAKMgh5qY4aR4pwRyqZXuJXN1H/BKkHvN1y0S4XWtF0f/wiCLKHhyi1ppPA==",+ "version": "0.3.2",+ "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.3.2.tgz",+ "integrity": "sha512-lzLrcJp9QBWpo40OcOM9B8QEtBw2Fk1zOZQdvv+rWS6gKmhQBCEMc4SMABQfWdjsylBcDfniD1Q+fUX1dcBTXA==","dependencies": {"tslib": "^2.1.0"}},"node_modules/@firebase/messaging": {- "version": "0.9.1",- "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.9.1.tgz",- "integrity": "sha512-0g3JWTfkv0WHnu4xgx1zcChJXU2dLjWT0e2MI13Q7NbP3TgLu5CgQ/H/lad16j4Zb4RNqZbAUJurEAB6v2BJ/w==",+ "version": "0.9.4",+ "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.9.4.tgz",+ "integrity": "sha512-OvYV4MLPfDpdP/yltLqZXZRx6rXWz52bEilS2jL2B4sGiuTaXSkR6BIHB54EPTblu32nbyZYdlER4fssz4TfXw==","dependencies": {- "@firebase/component": "0.5.7",- "@firebase/installations": "0.5.1",+ "@firebase/component": "0.5.9",+ "@firebase/installations": "0.5.4","@firebase/messaging-interop-types": "0.1.0",- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","idb": "3.0.2","tslib": "^2.1.0"},@@ -2014,13 +2006,13 @@}},"node_modules/@firebase/messaging-compat": {- "version": "0.1.1",- "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.1.1.tgz",- "integrity": "sha512-8FxrQjJCOfP9HibFsymT3qB18rBBmMPxOV+k0n6B7L6KW6Idswq01hMW12d93ZnvlNNKdikCKwUtBNbITBd8FA==",+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.1.4.tgz",+ "integrity": "sha512-6477jBw7w7hk0uhnTUMsPoukalpcwbxTTo9kMguHVSXe0t3OdoxeXEaapaNJlOmU4Kgc8j3rsms8IDLdKVpvlA==","dependencies": {- "@firebase/component": "0.5.7",- "@firebase/messaging": "0.9.1",- "@firebase/util": "1.4.0",+ "@firebase/component": "0.5.9",+ "@firebase/messaging": "0.9.4",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"},"peerDependencies": {@@ -2033,14 +2025,14 @@"integrity": "sha512-DbvUl/rXAZpQeKBnwz0NYY5OCqr2nFA0Bj28Fmr3NXGqR4PAkfTOHuQlVtLO1Nudo3q0HxAYLa68ZDAcuv2uKQ=="},"node_modules/@firebase/performance": {- "version": "0.5.1",- "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.5.1.tgz",- "integrity": "sha512-O93Yry8KhAaFrhnmBaMkM0lpgVmpd7CRX0eq1S0IKLdE3MdF+oAtbQiZG/NuRl3Vz8vjoz96R6bPbCWaDuiy8Q==",- "dependencies": {- "@firebase/component": "0.5.7",- "@firebase/installations": "0.5.1",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "version": "0.5.4",+ "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.5.4.tgz",+ "integrity": "sha512-ES6aS4eoMhf9CczntBADDsXhaFea/3a0FADwy/VpWXXBxVb8tqc5tPcoTwd9L5M/aDeSiQMy344rhrSsTbIZEg==",+ "dependencies": {+ "@firebase/component": "0.5.9",+ "@firebase/installations": "0.5.4",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"},"peerDependencies": {@@ -2048,15 +2040,15 @@}},"node_modules/@firebase/performance-compat": {- "version": "0.1.1",- "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.1.1.tgz",- "integrity": "sha512-xN/TjU0hVNiJshZzrUvPYB+3sPS9SgaWrfxh3p0eGFVdwHp/3Z8HlT772bkHAEKXVc64v19ktpUVd+sF5aoJNQ==",+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.1.4.tgz",+ "integrity": "sha512-YuGfmpC0o+YvEBlEZCbPdNbT4Nn2qhi5uMXjqKnNIUepmXUsgOYDiAqM9nxHPoE/6IkvoFMdCj5nTUYVLCFXgg==","dependencies": {- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/performance": "0.5.1",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/performance": "0.5.4","@firebase/performance-types": "0.1.0",- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"},"peerDependencies": {@@ -2089,14 +2081,14 @@}},"node_modules/@firebase/remote-config": {- "version": "0.3.0",- "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.3.0.tgz",- "integrity": "sha512-Yf9/iXToC6Kbec1yOQ9mdTc1MP0mR2VCCR/n3Q+Ol3U+PML+ePXfqWiL2VHrUA86BeB2hpXF1BcTxvD4uOiDnA==",- "dependencies": {- "@firebase/component": "0.5.7",- "@firebase/installations": "0.5.1",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "version": "0.3.3",+ "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.3.3.tgz",+ "integrity": "sha512-9hZWfB3k3IYsjHbWeUfhv/SDCcOgv/JMJpLXlUbTppXPm1IZ3X9ZW4I9bS86gGYr7m/kSv99U0oxQ7N9PoR8Iw==",+ "dependencies": {+ "@firebase/component": "0.5.9",+ "@firebase/installations": "0.5.4",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"},"peerDependencies": {@@ -2104,15 +2096,15 @@}},"node_modules/@firebase/remote-config-compat": {- "version": "0.1.1",- "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.1.1.tgz",- "integrity": "sha512-ZHRHYTdDztXHxgYXzuuD6Goa6ScmAqtctXl2eC6D8vxA8fIGRQKHN+9AMwxm8b3JHzdVY/5XhAOmKCcFvPOgtw==",+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.1.4.tgz",+ "integrity": "sha512-6WeKR7E9KJ1RIF9GZiyle1uD4IsIPUBKUnUnFkQhj3FV6cGvQwbeG0rbh7QQLvd0IWuh9lABYjHXWp+rGHQk8A==","dependencies": {- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/remote-config": "0.3.0",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/remote-config": "0.3.3","@firebase/remote-config-types": "0.2.0",- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"},"peerDependencies": {@@ -2125,13 +2117,13 @@"integrity": "sha512-hqK5sCPeZvcHQ1D6VjJZdW6EexLTXNMJfPdTwbD8NrXUw6UjWC4KWhLK/TSlL0QPsQtcKRkaaoP+9QCgKfMFPw=="},"node_modules/@firebase/storage": {- "version": "0.8.3",- "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.8.3.tgz",- "integrity": "sha512-oraycQ787tEr6xu2Qc4nngLz1YEoEjZ+lrjThx0CJZB7VwdlkIJ24TkzJ9xoeWc+cpo34deg/If4w8AU5/WupQ==",+ "version": "0.9.0",+ "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.9.0.tgz",+ "integrity": "sha512-1gSYdrwP9kECmugH9L3tvNMvSjnNJGamj91rrESOFk2ZHDO93qKR90awc68NnhmzFAJOT/eJzVm35LKU6SqUNg==","dependencies": {- "@firebase/component": "0.5.7",- "@firebase/util": "1.4.0",- "node-fetch": "2.6.2",+ "@firebase/component": "0.5.9",+ "@firebase/util": "1.4.2",+ "node-fetch": "2.6.5","tslib": "^2.1.0"},"peerDependencies": {@@ -2139,14 +2131,14 @@}},"node_modules/@firebase/storage-compat": {- "version": "0.1.3",- "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.1.3.tgz",- "integrity": "sha512-m2htGJjCFlTONsqYRKXTfzkux3nbhpIpd72RK2iPkRPE69nQ0wiVplIE7bCaq3CSFMbkI3ETOtTTfW1wrOpF2g==",+ "version": "0.1.8",+ "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.1.8.tgz",+ "integrity": "sha512-L5R0DQoHCDKIgcBbqTx+6+RQ2533WFKeV3cfLAZCTGjyMUustj0eYDsr7fLhGexwsnpT3DaxhlbzT3icUWoDaA==","dependencies": {- "@firebase/component": "0.5.7",- "@firebase/storage": "0.8.3",+ "@firebase/component": "0.5.9",+ "@firebase/storage": "0.9.0","@firebase/storage-types": "0.6.0",- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"},"peerDependencies": {@@ -2162,26 +2154,18 @@"@firebase/util": "1.x"}},- "node_modules/@firebase/storage/node_modules/node-fetch": {- "version": "2.6.2",- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",- "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==",- "engines": {- "node": "4.x || >=6.0.0"- }- },"node_modules/@firebase/util": {- "version": "1.4.0",- "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.4.0.tgz",- "integrity": "sha512-Qn58d+DVi1nGn0bA9RV89zkz0zcbt6aUcRdyiuub/SuEvjKYstWmHcHwh1C0qmE1wPf9a3a+AuaRtduaGaRT7A==",+ "version": "1.4.2",+ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.4.2.tgz",+ "integrity": "sha512-JMiUo+9QE9lMBvEtBjqsOFdmJgObFvi7OL1A0uFGwTmlCI1ZeNPOEBrwXkgTOelVCdiMO15mAebtEyxFuQ6FsA==","dependencies": {"tslib": "^2.1.0"}},"node_modules/@firebase/webchannel-wrapper": {- "version": "0.6.0",- "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.6.0.tgz",- "integrity": "sha512-Pz4+7HPzKvOFI1ICQ6pyUv/VgStEWq9IGiVaaV1cQLi66NIA1mD5INnY4CDNoVAxlkuZvDEUZ+cVHLQ8iwA2hQ=="+ "version": "0.6.1",+ "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.6.1.tgz",+ "integrity": "sha512-9FqhNjKQWpQ3fGnSOCovHOm+yhhiorKEqYLAfd525jWavunDJcx8rOW6i6ozAh+FbwcYMkL7b+3j4UR/30MpoQ=="},"node_modules/@gar/promisify": {"version": "1.1.2",@@ -2189,10 +2173,11 @@"integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="},"node_modules/@grpc/grpc-js": {- "version": "1.3.7",- "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.7.tgz",- "integrity": "sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA==",+ "version": "1.4.5",+ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.4.5.tgz",+ "integrity": "sha512-A6cOzSu7dqXZ7rzvh/9JZf+Jg/MOpLEMP0IdT8pT8hrWJZ6TB4ydN/MRuqOtAugInJe/VQ9F8BPricUpYZSaZA==","dependencies": {+ "@grpc/proto-loader": "^0.6.4","@types/node": ">=12.12.47"},"engines": {@@ -2200,9 +2185,9 @@}},"node_modules/@grpc/proto-loader": {- "version": "0.6.5",- "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.5.tgz",- "integrity": "sha512-GZdzyVQI1Bln/kCzIYgTKu+rQJ5dno0gVrfmLe4jqQu7T2e7svSwJzpCBqVU5hhBSJP3peuPjOMWsj5GR61YmQ==",+ "version": "0.6.7",+ "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.7.tgz",+ "integrity": "sha512-QzTPIyJxU0u+r2qGe8VMl3j/W2ryhEvBv7hc42OjYfthSj370fUrb7na65rG6w3YLZS/fb8p89iTBobfWGDgdw==","dependencies": {"@types/long": "^4.0.1","lodash.camelcase": "^4.3.0",@@ -3482,18 +3467,18 @@}},"node_modules/@nuxtjs/composition-api": {- "version": "0.29.2",- "resolved": "https://registry.npmjs.org/@nuxtjs/composition-api/-/composition-api-0.29.2.tgz",- "integrity": "sha512-Dk2rh2xdcqGPBwmFhNs74wuCs7GWutpDylVuV8cGj/4RpxlwhXQXv8P4iWOp85Y3HEdxDYaXsb+JtMyEnXqxnw==",+ "version": "0.31.0",+ "resolved": "https://registry.npmjs.org/@nuxtjs/composition-api/-/composition-api-0.31.0.tgz",+ "integrity": "sha512-xplH/EJ17W/EjNP7M11URTOrQcjMYqQn1wXUkMOdMiSLKM58VWuCyt0uT9jNCHMUspeQ+SPzr9dxQkNBGvwfiA==","dev": true,"dependencies": {- "@vue/composition-api": "^1.2.1",+ "@vue/composition-api": "^1.4.1","defu": "^5.0.0","estree-walker": "^2.0.2","fs-extra": "^9.1.0","magic-string": "^0.25.7","ufo": "^0.7.9",- "unplugin-vue2-script-setup": "^0.6.4",+ "unplugin-vue2-script-setup": "^0.7.3","upath": "^2.0.1"},"engines": {@@ -4065,6 +4050,19 @@"resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz","integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="},+ "node_modules/@rollup/pluginutils": {+ "version": "4.1.2",+ "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.1.2.tgz",+ "integrity": "sha512-ROn4qvkxP9SyPeHaf7uQC/GPFY6L/OWy9+bd9AwcjOAWQwxRscoEyAUD8qCY5o5iL4jqQwoLk2kaTKJPb/HwzQ==",+ "dev": true,+ "dependencies": {+ "estree-walker": "^2.0.1",+ "picomatch": "^2.2.2"+ },+ "engines": {+ "node": ">= 8.0.0"+ }+ },"node_modules/@simonwep/pickr": {"version": "1.8.2","resolved": "https://registry.npmjs.org/@simonwep/pickr/-/pickr-1.8.2.tgz",@@ -4464,6 +4462,12 @@"terser": "^4.6.13"}},+ "node_modules/@types/throttle-debounce": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/@types/throttle-debounce/-/throttle-debounce-2.1.0.tgz",+ "integrity": "sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ==",+ "dev": true+ },"node_modules/@types/uglify-js": {"version": "3.13.1","resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz",@@ -4823,13 +4827,13 @@}},"node_modules/@vue/compiler-core": {- "version": "3.2.19",- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.19.tgz",- "integrity": "sha512-8dOPX0YOtaXol0Zf2cfLQ4NU/yHYl2H7DCKsLEZ7gdvPK6ZSEwGLJ7IdghhY2YEshEpC5RB9QKdC5I07z8Dtjg==",+ "version": "3.2.26",+ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.26.tgz",+ "integrity": "sha512-N5XNBobZbaASdzY9Lga2D9Lul5vdCIOXvUMd6ThcN8zgqQhPKfCV+wfAJNNJKQkSHudnYRO2gEB+lp0iN3g2Tw==","dev": true,"dependencies": {- "@babel/parser": "^7.15.0",- "@vue/shared": "3.2.19",+ "@babel/parser": "^7.16.4",+ "@vue/shared": "3.2.26","estree-walker": "^2.0.2","source-map": "^0.6.1"}@@ -4910,34 +4914,61 @@"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="},"node_modules/@vue/composition-api": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.2.2.tgz",- "integrity": "sha512-hnnock2l8Uawuzm/Nq8LqaztuOO70rpyX3Gz/Kpl/JtNalsG/EuuHuRQAWPiT3Is8NCB/8V5hiH7fmCmAc0+pQ==",+ "version": "1.4.2",+ "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.4.2.tgz",+ "integrity": "sha512-EqybqmMq835GISvlQXdDaV8dsbunpdmhClrnAqUJZLyxxV9pQXQYRtNDf+0e+fEwMfimLIsv7YmbKCbqxGRqXg==","devOptional": true,"dependencies": {- "tslib": "^2.3.0"+ "tslib": "^2.3.1"},"peerDependencies": {"vue": ">= 2.5 < 3"}},"node_modules/@vue/ref-transform": {- "version": "3.2.19",- "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.19.tgz",- "integrity": "sha512-03wwUnoIAeKti5IGGx6Vk/HEBJ+zUcm5wrUM3+PQsGf7IYnXTbeIfHHpx4HeSeWhnLAjqZjADQwW8uA4rBmVbg==",+ "version": "3.2.24",+ "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.24.tgz",+ "integrity": "sha512-j6oNbsGLvea2rF8GQB9w6q7UFL1So7J+t6ducaMeWPSyjYZ+slWpwPVK6mmyghg5oGqC41R+HC5BV036Y0KhXQ==","dev": true,"dependencies": {"@babel/parser": "^7.15.0",- "@vue/compiler-core": "3.2.19",- "@vue/shared": "3.2.19",+ "@vue/compiler-core": "3.2.24",+ "@vue/shared": "3.2.24","estree-walker": "^2.0.2","magic-string": "^0.25.7"}},+ "node_modules/@vue/ref-transform/node_modules/@vue/compiler-core": {+ "version": "3.2.24",+ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.24.tgz",+ "integrity": "sha512-A0SxB2HAggKzP57LDin5gfgWOTwFyGCtQ5MTMNBADnfQYALWnYuC8kMI0DhRSplGTWRvn9Z2DAnG8f35BnojuA==",+ "dev": true,+ "dependencies": {+ "@babel/parser": "^7.15.0",+ "@vue/shared": "3.2.24",+ "estree-walker": "^2.0.2",+ "source-map": "^0.6.1"+ }+ },+ "node_modules/@vue/ref-transform/node_modules/@vue/shared": {+ "version": "3.2.24",+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.24.tgz",+ "integrity": "sha512-BUgRiZCkCrqDps5aQ9av05xcge3rn092ztKIh17tHkeEFgP4zfXMQWBA2zfdoCdCEdBL26xtOv+FZYiOp9RUDA==",+ "dev": true+ },+ "node_modules/@vue/ref-transform/node_modules/source-map": {+ "version": "0.6.1",+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",+ "dev": true,+ "engines": {+ "node": ">=0.10.0"+ }+ },"node_modules/@vue/shared": {- "version": "3.2.19",- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.19.tgz",- "integrity": "sha512-Knqhx7WieLdVgwCAZgTVrDCXZ50uItuecLh9JdLC8O+a5ayaSyIQYveUK3hCRNC7ws5zalHmZwfdLMGaS8r4Ew==",+ "version": "3.2.26",+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.26.tgz",+ "integrity": "sha512-vPV6Cq+NIWbH5pZu+V+2QHE9y1qfuTq49uNWw4f7FDEeZaDU2H2cx5jcUZOAKW7qTrUS4k6qZPbMy1x4N96nbA==","dev": true},"node_modules/@vueuse/core": {@@ -5782,11 +5813,11 @@}},"node_modules/axios": {- "version": "0.21.4",- "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",- "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",+ "version": "0.24.0",+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",+ "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==","dependencies": {- "follow-redirects": "^1.14.0"+ "follow-redirects": "^1.14.4"}},"node_modules/babel-loader": {@@ -7310,9 +7341,9 @@}},"node_modules/core-js": {- "version": "3.18.0",- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.0.tgz",- "integrity": "sha512-WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w==",+ "version": "3.20.0",+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.0.tgz",+ "integrity": "sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ==","hasInstallScript": true,"funding": {"type": "opencollective",@@ -10540,36 +10571,36 @@}},"node_modules/firebase": {- "version": "9.1.0",- "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.1.0.tgz",- "integrity": "sha512-Pj9/FwNzT4pdSS6vpXZzm4mFscI73N+AH70gaWZPnZrQBvyMAPTuKXXscjrFePPlqs94b4Emq+2mSwLGcwod/A==",- "dependencies": {- "@firebase/analytics": "0.7.1",- "@firebase/analytics-compat": "0.1.2",- "@firebase/app": "0.7.1",- "@firebase/app-check": "0.4.1",- "@firebase/app-check-compat": "0.1.2",- "@firebase/app-compat": "0.1.2",+ "version": "9.6.1",+ "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.6.1.tgz",+ "integrity": "sha512-d4wbkVMRiSREa1jfFx2z/Kq3KueEKfNWApvdrEAxvzDRN4eiFLeZSZM/MOxj7TR01e/hANnw2lrYKMUpg21ukg==",+ "dependencies": {+ "@firebase/analytics": "0.7.4",+ "@firebase/analytics-compat": "0.1.5",+ "@firebase/app": "0.7.11",+ "@firebase/app-check": "0.5.2",+ "@firebase/app-check-compat": "0.2.2",+ "@firebase/app-compat": "0.1.12","@firebase/app-types": "0.7.0",- "@firebase/auth": "0.18.0",- "@firebase/auth-compat": "0.1.3",- "@firebase/database": "0.12.1",- "@firebase/database-compat": "0.1.1",- "@firebase/firestore": "3.1.0",- "@firebase/firestore-compat": "0.1.3",- "@firebase/functions": "0.7.2",- "@firebase/functions-compat": "0.1.3",- "@firebase/installations": "0.5.1",- "@firebase/messaging": "0.9.1",- "@firebase/messaging-compat": "0.1.1",- "@firebase/performance": "0.5.1",- "@firebase/performance-compat": "0.1.1",+ "@firebase/auth": "0.19.4",+ "@firebase/auth-compat": "0.2.4",+ "@firebase/database": "0.12.4",+ "@firebase/database-compat": "0.1.4",+ "@firebase/firestore": "3.4.1",+ "@firebase/firestore-compat": "0.1.10",+ "@firebase/functions": "0.7.6",+ "@firebase/functions-compat": "0.1.7",+ "@firebase/installations": "0.5.4",+ "@firebase/messaging": "0.9.4",+ "@firebase/messaging-compat": "0.1.4",+ "@firebase/performance": "0.5.4",+ "@firebase/performance-compat": "0.1.4","@firebase/polyfill": "0.3.36",- "@firebase/remote-config": "0.3.0",- "@firebase/remote-config-compat": "0.1.1",- "@firebase/storage": "0.8.3",- "@firebase/storage-compat": "0.1.3",- "@firebase/util": "1.4.0"+ "@firebase/remote-config": "0.3.3",+ "@firebase/remote-config-compat": "0.1.4",+ "@firebase/storage": "0.9.0",+ "@firebase/storage-compat": "0.1.8",+ "@firebase/util": "1.4.2"}},"node_modules/flagged-respawn": {@@ -12645,9 +12676,9 @@"integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="},"node_modules/highcharts": {- "version": "9.2.2",- "resolved": "https://registry.npmjs.org/highcharts/-/highcharts-9.2.2.tgz",- "integrity": "sha512-OMEdFCaG626ES1JEcKAvJTpxAOMuchy0XuAplmnOs0Yu7NMd2RMfTLFQ2fCJOxo3ubSdm/RVQwKAWC+5HYThnw=="+ "version": "9.3.2",+ "resolved": "https://registry.npmjs.org/highcharts/-/highcharts-9.3.2.tgz",+ "integrity": "sha512-I/48gNMvs3hZxZnPRUqLbnlrGZJJ7YPPVr1+fYeZ35p4pSZAOwTmAGbptrjBr7JlF52HmJH9zMbt/I4TPLu9Pg=="},"node_modules/highcharts-vue": {"version": "1.4.0",@@ -12875,9 +12906,9 @@}},"node_modules/http-parser-js": {- "version": "0.5.3",- "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",- "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="+ "version": "0.5.5",+ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz",+ "integrity": "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA=="},"node_modules/https-browserify": {"version": "1.0.0",@@ -19940,9 +19971,9 @@}},"node_modules/postcss-selector-parser": {- "version": "6.0.6",- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",- "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",+ "version": "6.0.8",+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz",+ "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==","dependencies": {"cssesc": "^3.0.0","util-deprecate": "^1.0.2"@@ -20382,9 +20413,9 @@}},"node_modules/protobufjs/node_modules/@types/node": {- "version": "16.10.1",- "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.1.tgz",- "integrity": "sha512-4/Z9DMPKFexZj/Gn3LylFgamNKHm4K3QDi0gz9B26Uk0c8izYf97B5fxfpspMNkWlFupblKM/nV8+NA9Ffvr+w=="+ "version": "17.0.2",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.2.tgz",+ "integrity": "sha512-JepeIUPFDARgIs0zD/SKPgFsJEAF0X5/qO80llx59gOxFTboS9Amv3S+QfB7lqBId5sFXJ99BN0J6zFRvL9dDA=="},"node_modules/protocols": {"version": "1.4.8",@@ -23538,9 +23569,9 @@}},"node_modules/swiper": {- "version": "6.8.1",- "resolved": "https://registry.npmjs.org/swiper/-/swiper-6.8.1.tgz",- "integrity": "sha512-Gc2rKe0XH3zoB0ogonlielduGM9DDQCJtXAeFeD2ujwzhEqw+5udwebCMNjhAcQ+xl9ygM5PnRoziAUol3Dx5w==",+ "version": "6.8.4",+ "resolved": "https://registry.npmjs.org/swiper/-/swiper-6.8.4.tgz",+ "integrity": "sha512-O+buF9Q+sMA0H7luMS8R59hCaJKlpo8PXhQ6ZYu6Rn2v9OsFd4d1jmrv14QvxtQpKAvL/ZiovEeANI/uDGet7g==","funding": [{"type": "patreon",@@ -23629,9 +23660,9 @@}},"node_modules/tailwindcss": {- "version": "3.0.1",- "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.1.tgz",- "integrity": "sha512-EVDXVZkcueZ77/zfOJw7XkzCuxe5TCiT/S9pw9P183oRzSuwMZ7WO+W/L76jbJQA5qxGeUBJOVOLVBuAUfeZ3g==",+ "version": "3.0.7",+ "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.7.tgz",+ "integrity": "sha512-rZdKNHtC64jcQncLoWOuCzj4lQDTAgLtgK3WmQS88tTdpHh9OwLqULTQxI3tw9AMJsqSpCKlmcjW/8CSnni6zQ==","dev": true,"dependencies": {"arg": "^5.0.1",@@ -23650,7 +23681,7 @@"postcss-js": "^3.0.3","postcss-load-config": "^3.1.0","postcss-nested": "5.0.6",- "postcss-selector-parser": "^6.0.6",+ "postcss-selector-parser": "^6.0.7","postcss-value-parser": "^4.2.0","quick-lru": "^5.1.1","resolve": "^1.20.0",@@ -24541,9 +24572,9 @@}},"node_modules/typescript": {- "version": "4.4.3",- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",- "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==",+ "version": "4.5.4",+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",+ "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==","dev": true,"bin": {"tsc": "bin/tsc",@@ -24824,85 +24855,92 @@"node": ">= 0.8"}},- "node_modules/unplugin": {- "version": "0.2.16",- "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-0.2.16.tgz",- "integrity": "sha512-KkXatHba0baJszSHW+2e8EQU/5Bz7rYwzYXu8wUeq97tE6K3wvub+7OWSuRv04LttvzNLsJ2jXEyR35gofv74Q==",+ "node_modules/unplugin-vue2-script-setup": {+ "version": "0.7.3",+ "resolved": "https://registry.npmjs.org/unplugin-vue2-script-setup/-/unplugin-vue2-script-setup-0.7.3.tgz",+ "integrity": "sha512-3C32JkCS7BsNsgUkVnCEIJynHy+N/xwqiaUiMkeTm3Rk+HfHMhEPQ5Gysg3tejWY7KJyk8CohUKswTChurI1ng==","dev": true,"dependencies": {- "webpack-virtual-modules": "^0.4.3"+ "@antfu/utils": "^0.3.0",+ "@babel/core": "^7.16.0",+ "@babel/generator": "^7.16.0",+ "@babel/parser": "^7.16.3",+ "@babel/traverse": "^7.16.3",+ "@babel/types": "^7.16.0",+ "@rollup/pluginutils": "^4.1.1",+ "@vue/compiler-core": "^3.2.23",+ "@vue/ref-transform": "^3.2.23",+ "@vue/shared": "^3.2.23",+ "defu": "^5.0.0",+ "htmlparser2": "5.0.1",+ "magic-string": "^0.25.7",+ "unplugin": "^0.2.21"+ },+ "funding": {+ "url": "https://github.com/sponsors/antfu"},"peerDependencies": {- "rollup": "^2.50.0",- "vite": "^2.3.0",- "webpack": "4 || 5"+ "pug": "^3.0.2"},"peerDependenciesMeta": {- "rollup": {- "optional": true- },- "vite": {- "optional": true- },- "webpack": {+ "pug": {"optional": true}}},- "node_modules/unplugin-vue2-script-setup": {- "version": "0.6.4",- "resolved": "https://registry.npmjs.org/unplugin-vue2-script-setup/-/unplugin-vue2-script-setup-0.6.4.tgz",- "integrity": "sha512-uKnf5KSx/8PHd+7HSE99Dw5J6TQrZ8nTdgly5wkIvV1Dwq948tuiAK37sCyQsTMkfstyigT2UwyRXX5g+hTtKQ==",+ "node_modules/unplugin-vue2-script-setup/node_modules/domhandler": {+ "version": "3.3.0",+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz",+ "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==","dev": true,"dependencies": {- "@babel/core": "^7.15.5",- "@babel/generator": "^7.15.4",- "@babel/parser": "^7.15.6",- "@babel/traverse": "^7.15.4",- "@babel/types": "^7.15.6",- "@vue/ref-transform": "^3.2.11",- "@vue/shared": "^3.2.11",- "defu": "^5.0.0",- "htmlparser2": "^7.1.2",- "magic-string": "^0.25.7",- "unplugin": "^0.2.11"+ "domelementtype": "^2.0.1"},- "funding": {- "url": "https://github.com/sponsors/antfu"+ "engines": {+ "node": ">= 4"},- "optionalDependencies": {- "pug": "^3.0.2"+ "funding": {+ "url": "https://github.com/fb55/domhandler?sponsor=1"}},- "node_modules/unplugin-vue2-script-setup/node_modules/entities": {- "version": "3.0.1",- "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",- "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",+ "node_modules/unplugin-vue2-script-setup/node_modules/htmlparser2": {+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-5.0.1.tgz",+ "integrity": "sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==","dev": true,- "engines": {- "node": ">=0.12"+ "dependencies": {+ "domelementtype": "^2.0.1",+ "domhandler": "^3.3.0",+ "domutils": "^2.4.2",+ "entities": "^2.0.0"},"funding": {- "url": "https://github.com/fb55/entities?sponsor=1"+ "url": "https://github.com/fb55/htmlparser2?sponsor=1"}},- "node_modules/unplugin-vue2-script-setup/node_modules/htmlparser2": {- "version": "7.1.2",- "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.1.2.tgz",- "integrity": "sha512-d6cqsbJba2nRdg8WW2okyD4ceonFHn9jLFxhwlNcLhQWcFPdxXeJulgOLjLKtAK9T6ahd+GQNZwG9fjmGW7lyg==",+ "node_modules/unplugin-vue2-script-setup/node_modules/unplugin": {+ "version": "0.2.21",+ "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-0.2.21.tgz",+ "integrity": "sha512-IJ15/L5XbhnV7J09Zjk0FT5HEkBjkXucWAXQWRsmEtUxmmxwh23yavrmDbCF6ZPxWiVB28+wnKIHePTRRpQPbQ==","dev": true,- "funding": [- "https://github.com/fb55/htmlparser2?sponsor=1",- {- "type": "github",- "url": "https://github.com/sponsors/fb55"- }- ],"dependencies": {- "domelementtype": "^2.0.1",- "domhandler": "^4.2.2",- "domutils": "^2.8.0",- "entities": "^3.0.1"+ "webpack-virtual-modules": "^0.4.3"+ },+ "peerDependencies": {+ "rollup": "^2.50.0",+ "vite": "^2.3.0",+ "webpack": "4 || 5"+ },+ "peerDependenciesMeta": {+ "rollup": {+ "optional": true+ },+ "vite": {+ "optional": true+ },+ "webpack": {+ "optional": true+ }}},"node_modules/unquote": {@@ -26932,9 +26970,9 @@}},"node_modules/ws": {- "version": "8.2.2",- "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.2.tgz",- "integrity": "sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw==",+ "version": "8.4.0",+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz",+ "integrity": "sha512-IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ==","engines": {"node": ">=10.0.0"},@@ -27081,6 +27119,15 @@}},"dependencies": {+ "@antfu/utils": {+ "version": "0.3.0",+ "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.3.0.tgz",+ "integrity": "sha512-UU8TLr/EoXdg7OjMp0h9oDoIAVr+Z/oW9cpOxQQyrsz6Qzd2ms/1CdWx8fl2OQdFpxGmq5Vc4TwfLHId6nAZjA==",+ "dev": true,+ "requires": {+ "@types/throttle-debounce": "^2.1.0"+ }+ },"@babel/code-frame": {"version": "7.16.0","resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",@@ -27090,24 +27137,24 @@}},"@babel/compat-data": {- "version": "7.15.0",- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",- "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="+ "version": "7.16.4",+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",+ "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q=="},"@babel/core": {- "version": "7.15.5",- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz",- "integrity": "sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==",+ "version": "7.16.5",+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.5.tgz",+ "integrity": "sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ==","requires": {- "@babel/code-frame": "^7.14.5",- "@babel/generator": "^7.15.4",- "@babel/helper-compilation-targets": "^7.15.4",- "@babel/helper-module-transforms": "^7.15.4",- "@babel/helpers": "^7.15.4",- "@babel/parser": "^7.15.5",- "@babel/template": "^7.15.4",- "@babel/traverse": "^7.15.4",- "@babel/types": "^7.15.4",+ "@babel/code-frame": "^7.16.0",+ "@babel/generator": "^7.16.5",+ "@babel/helper-compilation-targets": "^7.16.3",+ "@babel/helper-module-transforms": "^7.16.5",+ "@babel/helpers": "^7.16.5",+ "@babel/parser": "^7.16.5",+ "@babel/template": "^7.16.0",+ "@babel/traverse": "^7.16.5",+ "@babel/types": "^7.16.0","convert-source-map": "^1.7.0","debug": "^4.1.0","gensync": "^1.0.0-beta.2",@@ -27143,9 +27190,9 @@}},"@babel/generator": {- "version": "7.16.0",- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz",- "integrity": "sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==",+ "version": "7.16.5",+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz",+ "integrity": "sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==","requires": {"@babel/types": "^7.16.0","jsesc": "^2.5.1",@@ -27170,13 +27217,13 @@}},"@babel/helper-compilation-targets": {- "version": "7.15.4",- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",- "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",+ "version": "7.16.3",+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz",+ "integrity": "sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==","requires": {- "@babel/compat-data": "^7.15.0",+ "@babel/compat-data": "^7.16.0","@babel/helper-validator-option": "^7.14.5",- "browserslist": "^4.16.6",+ "browserslist": "^4.17.5","semver": "^6.3.0"},"dependencies": {@@ -27231,6 +27278,14 @@}}},+ "@babel/helper-environment-visitor": {+ "version": "7.16.5",+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz",+ "integrity": "sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg==",+ "requires": {+ "@babel/types": "^7.16.0"+ }+ },"@babel/helper-explode-assignable-expression": {"version": "7.15.4","resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz",@@ -27274,26 +27329,26 @@}},"@babel/helper-module-imports": {- "version": "7.15.4",- "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz",- "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==",+ "version": "7.16.0",+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz",+ "integrity": "sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==","requires": {- "@babel/types": "^7.15.4"+ "@babel/types": "^7.16.0"}},"@babel/helper-module-transforms": {- "version": "7.15.7",- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.7.tgz",- "integrity": "sha512-ZNqjjQG/AuFfekFTY+7nY4RgBSklgTu970c7Rj3m/JOhIu5KPBUuTA9AY6zaKcUvk4g6EbDXdBnhi35FAssdSw==",+ "version": "7.16.5",+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz",+ "integrity": "sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ==","requires": {- "@babel/helper-module-imports": "^7.15.4",- "@babel/helper-replace-supers": "^7.15.4",- "@babel/helper-simple-access": "^7.15.4",- "@babel/helper-split-export-declaration": "^7.15.4",+ "@babel/helper-environment-visitor": "^7.16.5",+ "@babel/helper-module-imports": "^7.16.0",+ "@babel/helper-simple-access": "^7.16.0",+ "@babel/helper-split-export-declaration": "^7.16.0","@babel/helper-validator-identifier": "^7.15.7",- "@babel/template": "^7.15.4",- "@babel/traverse": "^7.15.4",- "@babel/types": "^7.15.6"+ "@babel/template": "^7.16.0",+ "@babel/traverse": "^7.16.5",+ "@babel/types": "^7.16.0"}},"@babel/helper-optimise-call-expression": {@@ -27331,11 +27386,11 @@}},"@babel/helper-simple-access": {- "version": "7.15.4",- "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz",- "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==",+ "version": "7.16.0",+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz",+ "integrity": "sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==","requires": {- "@babel/types": "^7.15.4"+ "@babel/types": "^7.16.0"}},"@babel/helper-skip-transparent-expression-wrappers": {@@ -27376,13 +27431,13 @@}},"@babel/helpers": {- "version": "7.15.4",- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",- "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",+ "version": "7.16.5",+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.5.tgz",+ "integrity": "sha512-TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw==","requires": {- "@babel/template": "^7.15.4",- "@babel/traverse": "^7.15.4",- "@babel/types": "^7.15.4"+ "@babel/template": "^7.16.0",+ "@babel/traverse": "^7.16.5",+ "@babel/types": "^7.16.0"}},"@babel/highlight": {@@ -27396,9 +27451,9 @@}},"@babel/parser": {- "version": "7.16.4",- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz",- "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng=="+ "version": "7.16.6",+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz",+ "integrity": "sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ=="},"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {"version": "7.15.4",@@ -28109,16 +28164,17 @@}},"@babel/traverse": {- "version": "7.16.3",- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz",- "integrity": "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==",+ "version": "7.16.5",+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz",+ "integrity": "sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ==","requires": {"@babel/code-frame": "^7.16.0",- "@babel/generator": "^7.16.0",+ "@babel/generator": "^7.16.5",+ "@babel/helper-environment-visitor": "^7.16.5","@babel/helper-function-name": "^7.16.0","@babel/helper-hoist-variables": "^7.16.0","@babel/helper-split-export-declaration": "^7.16.0",- "@babel/parser": "^7.16.3",+ "@babel/parser": "^7.16.5","@babel/types": "^7.16.0","debug": "^4.1.0","globals": "^11.1.0"@@ -28173,26 +28229,26 @@}},"@firebase/analytics": {- "version": "0.7.1",- "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.7.1.tgz",- "integrity": "sha512-fTUN47UK4obzIJwmgLMJU46dWZ7pzitCEO+80pQZC7mdLlVs/NW0+tMf6rETwMpKjGSgb25cKidpgEuioQtT7w==",- "requires": {- "@firebase/component": "0.5.7",- "@firebase/installations": "0.5.1",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "version": "0.7.4",+ "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.7.4.tgz",+ "integrity": "sha512-AU3XMwHW7SFGCNeUKKNW2wXGTdmS164ackt/Epu2bDXCT1OcauPE1AVd+ofULSIDCaDUAQVmvw3JrobgogEU7Q==",+ "requires": {+ "@firebase/component": "0.5.9",+ "@firebase/installations": "0.5.4",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},"@firebase/analytics-compat": {- "version": "0.1.2",- "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.1.2.tgz",- "integrity": "sha512-TpWpz0s8EgVt9aqyOCFktONqVkjyrNRR4esn3cEYrueH+XXSMDLWY9oFHuUJzntcoEOlOBWMvpsJCPG/1kthkg==",+ "version": "0.1.5",+ "resolved": "https://registry.npmjs.org/@firebase/analytics-compat/-/analytics-compat-0.1.5.tgz",+ "integrity": "sha512-5cfr0uWwlhoHQYAr6UtQCHwnGjs/3J/bWrfA3INNtzaN4/tTTLTD02iobbccRcM7dM5TR0sZFWS5orfAU3OBFg==","requires": {- "@firebase/analytics": "0.7.1",+ "@firebase/analytics": "0.7.4","@firebase/analytics-types": "0.7.0",- "@firebase/component": "0.5.7",- "@firebase/util": "1.4.0",+ "@firebase/component": "0.5.9",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},@@ -28202,36 +28258,36 @@"integrity": "sha512-DNE2Waiwy5+zZnCfintkDtBfaW6MjIG883474v6Z0K1XZIvl76cLND4iv0YUb48leyF+PJK1KO2XrgHb/KpmhQ=="},"@firebase/app": {- "version": "0.7.1",- "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.1.tgz",- "integrity": "sha512-B4z6E1EPQc0mOjF35IPKdDRCFnT/fNQIHfM+v7F9obB7ItPhGILK3LxaQfuampSQpF6GG6TPFDbrWK6myXAq+g==",+ "version": "0.7.11",+ "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.11.tgz",+ "integrity": "sha512-GnG2XxlMrqd8zRa14Y3gvkPpr0tKTLZtxhUnShWkeSM5bQqk1DK2k9qDsf6D3cYfKCWv+JIg1zmL3oalxfhNNA==","requires": {- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},"@firebase/app-check": {- "version": "0.4.1",- "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.4.1.tgz",- "integrity": "sha512-Kpqh0Y2zpx+acTL7eOVYIWBOmAwoconJpqOAlByGNXuxm/ccP00XREo+HsqaC7wapZRXh+h8BK0jZjvdV36qow==",+ "version": "0.5.2",+ "resolved": "https://registry.npmjs.org/@firebase/app-check/-/app-check-0.5.2.tgz",+ "integrity": "sha512-DJrvxcn5QPO5dU735GA9kYpf+GwmCmnd/oQdWVExrRG+yjaLnP0rSJ2HKQ4bZKGo8qig3P7fwQpdMOgP2BXFjQ==","requires": {- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},"@firebase/app-check-compat": {- "version": "0.1.2",- "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.1.2.tgz",- "integrity": "sha512-JB+OHk4Cp9ZgT+UfX0A+lwH1AoM5Y2X1rDhmhCsEXcKKwz1w9DpL9PjStciP8UYg1dpqbp5p9OMxmty+21EBsA==",+ "version": "0.2.2",+ "resolved": "https://registry.npmjs.org/@firebase/app-check-compat/-/app-check-compat-0.2.2.tgz",+ "integrity": "sha512-nX2Ou8Rwo+TMMNDecQOGH78kFw6sORLrsGyu0eC95M853JjisVxTngN1TU/RL5h83ElJ0HhNlz6C3FYAuGNqqA==","requires": {- "@firebase/app-check": "0.4.1",- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "@firebase/app-check": "0.5.2",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},@@ -28241,14 +28297,14 @@"integrity": "sha512-uZfn9s4uuRsaX5Lwx+gFP3B6YsyOKUE+Rqa6z9ojT4VSRAsZFko9FRn6OxQUA1z5t5d08fY4pf+/+Dkd5wbdbA=="},"@firebase/app-compat": {- "version": "0.1.2",- "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.2.tgz",- "integrity": "sha512-kF1maoqA8bZqJ4v/ojVvA7kIyyXEPkJmL48otGrC8LIgdcen7xCx3JFDe0DGeQywg+qujvdkJz/TptFN1cvAgw==",- "requires": {- "@firebase/app": "0.7.1",- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "version": "0.1.12",+ "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.12.tgz",+ "integrity": "sha512-hRzCCFjwTwrFsAFcuUW2TPpyShJ/OaoA1Yxp4QJr6Xod8g+CQxTMZ4RJ51I5t9fErXvl65VxljhfqFEyB3ZmJA==",+ "requires": {+ "@firebase/app": "0.7.11",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},@@ -28258,44 +28314,30 @@"integrity": "sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg=="},"@firebase/auth": {- "version": "0.18.0",- "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.18.0.tgz",- "integrity": "sha512-iK+VXkdDkum8SmJNgz9ZcOboRLrUN1VW7AHHkpZb76VJvoYRoCPD+A9O/v/ziI0LpwIZJwi1GFes9XjZTlfLiA==",- "requires": {- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",- "node-fetch": "2.6.2",+ "version": "0.19.4",+ "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-0.19.4.tgz",+ "integrity": "sha512-0FefLGnP0mbgvSSan7j2e25i3pllqF9+KYO5fwuAo3YcgjCyNMBJKaXPlz/J+z6jRHa2itjh4W48jD4Y/FCMqw==",+ "requires": {+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2",+ "node-fetch": "2.6.5","selenium-webdriver": "4.0.0-rc-1","tslib": "^2.1.0"- },- "dependencies": {- "node-fetch": {- "version": "2.6.2",- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",- "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA=="- }}},"@firebase/auth-compat": {- "version": "0.1.3",- "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.1.3.tgz",- "integrity": "sha512-eDDtY5If+ERJxalt+plvX6avZspuwo4/kPXssvV+csm414awhDzQBtSDPDajgbH3YB9V+O3LAFHeWcP3rrHS5w==",+ "version": "0.2.4",+ "resolved": "https://registry.npmjs.org/@firebase/auth-compat/-/auth-compat-0.2.4.tgz",+ "integrity": "sha512-2OpV6o8U33xiC98G9UrlhEMOOHfXmoum74VghP85BufLroi7erLKawBaDbYiHWK2QYudd8cbOPkk5GDocl1KNQ==","requires": {- "@firebase/auth": "0.18.0",+ "@firebase/auth": "0.19.4","@firebase/auth-types": "0.11.0",- "@firebase/component": "0.5.7",- "@firebase/util": "1.4.0",- "node-fetch": "2.6.2",+ "@firebase/component": "0.5.9",+ "@firebase/util": "1.4.2",+ "node-fetch": "2.6.5","selenium-webdriver": "^4.0.0-beta.2","tslib": "^2.1.0"- },- "dependencies": {- "node-fetch": {- "version": "2.6.2",- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",- "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA=="- }}},"@firebase/auth-interop-types": {@@ -28311,80 +28353,73 @@"requires": {}},"@firebase/component": {- "version": "0.5.7",- "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.7.tgz",- "integrity": "sha512-CiAHUPXh2hn/lpzMShNmfAxHNQhKQwmQUJSYMPCjf2bCCt4Z2vLGpS+UWEuNFm9Zf8LNmkS+Z+U/s4Obi5carg==",+ "version": "0.5.9",+ "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.5.9.tgz",+ "integrity": "sha512-oLCY3x9WbM5rn06qmUvbtJuPj4dIw/C9T4Th52IiHF5tiCRC5k6YthvhfUVcTwfoUhK0fOgtwuKJKA/LpCPjgA==","requires": {- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},"@firebase/database": {- "version": "0.12.1",- "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.12.1.tgz",- "integrity": "sha512-Ethk0hc476qnkSKNBa+8Yc7iM8AO69HYWsaD+QUC983FZtnuMyNLHtEeSUbLQYvyHo7cOjcc52slop14WmfZeQ==",+ "version": "0.12.4",+ "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.12.4.tgz",+ "integrity": "sha512-XkrL1kXELRNkqKcltuT4hfG1gWmFiGvjFY+z7Lhb//12MqdkLjwa9YMK8c6Lo+Ro+IkWcJArQaOQYe3GkU5Wgg==","requires": {"@firebase/auth-interop-types": "0.1.6",- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","faye-websocket": "0.11.4","tslib": "^2.1.0"}},"@firebase/database-compat": {- "version": "0.1.1",- "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.1.tgz",- "integrity": "sha512-K3DFWiw0YkLZtlfA9TOGPw6zVXKu5dQ1XqIGztUufFVRYW8IizReXVxzSSmJNR4Adr2LiU9j66Wenc6e5UfwaQ==",- "requires": {- "@firebase/component": "0.5.7",- "@firebase/database": "0.12.1",- "@firebase/database-types": "0.9.1",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-0.1.4.tgz",+ "integrity": "sha512-dIJiZLDFF3U+MoEwoPBy7zxWmBUro1KefmwSHlpOoxmPv76tuoPm85NumpW/HmMrtTcTkC2qowtb6NjGE8X7mw==",+ "requires": {+ "@firebase/component": "0.5.9",+ "@firebase/database": "0.12.4",+ "@firebase/database-types": "0.9.3",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},"@firebase/database-types": {- "version": "0.9.1",- "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.1.tgz",- "integrity": "sha512-RUixK/YrbpxbfdE+nYP0wMcEsz1xPTnafP0q3UlSS/+fW744OITKtR1J0cMRaXbvY7EH0wUVTNVkrtgxYY8IgQ==",+ "version": "0.9.3",+ "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.9.3.tgz",+ "integrity": "sha512-R+YXLWy/Q7mNUxiUYiMboTwvVoprrgfyvf1Viyevskw6IoH1q8HV1UjlkLSgmRsOT9HPWt7XZUEStVZJFknHwg==","requires": {"@firebase/app-types": "0.7.0",- "@firebase/util": "1.4.0"+ "@firebase/util": "1.4.2"}},"@firebase/firestore": {- "version": "3.1.0",- "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-3.1.0.tgz",- "integrity": "sha512-vOXueHNRjlgBlKVCWuUDhr3dQW2hJwbcqcJaFiIV9V+PamfyhOHzX8pEQkrPort4YQQvoRmY9uiFhfOGj2hbeA==",- "requires": {- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",- "@firebase/webchannel-wrapper": "0.6.0",+ "version": "3.4.1",+ "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-3.4.1.tgz",+ "integrity": "sha512-KSXuaiavHUqk3+0qRe4U8QZ1vfpOc4PuesohLcjA824HexBzXd+6NoUmBs/F9pyS9Ka1rJeECXzXgpk0pInSBw==",+ "requires": {+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2",+ "@firebase/webchannel-wrapper": "0.6.1","@grpc/grpc-js": "^1.3.2","@grpc/proto-loader": "^0.6.0",- "node-fetch": "2.6.2",+ "node-fetch": "2.6.5","tslib": "^2.1.0"- },- "dependencies": {- "node-fetch": {- "version": "2.6.2",- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",- "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA=="- }}},"@firebase/firestore-compat": {- "version": "0.1.3",- "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.1.3.tgz",- "integrity": "sha512-tO3uAkIguKeFeKPu99GR7F7v1/Hc8nV1h7B1kdpkVRRBe+NfVYA3qAUictQ3OAA0oy7Ae9z4SfEURO/R1b6YlQ==",+ "version": "0.1.10",+ "resolved": "https://registry.npmjs.org/@firebase/firestore-compat/-/firestore-compat-0.1.10.tgz",+ "integrity": "sha512-wnyUzx5bHatnsP+3nX0FmA1jxfDxVW5gCdM59sXxd0PWf4oUOONRlqVstVAHVUH123huGaNdEXY6LUlP7H0EnA==","requires": {- "@firebase/component": "0.5.7",- "@firebase/firestore": "3.1.0",+ "@firebase/component": "0.5.9",+ "@firebase/firestore": "3.4.1","@firebase/firestore-types": "2.5.0",- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},@@ -28395,35 +28430,28 @@"requires": {}},"@firebase/functions": {- "version": "0.7.2",- "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.7.2.tgz",- "integrity": "sha512-B+b57xXtpsRYD3UgVtteeyavXjXfBTtuv+sG8LA0vgJs6bhORswVlKZQqpfW9SDxCMBwzzytzn1m3ZZGfUw2Lg==",+ "version": "0.7.6",+ "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.7.6.tgz",+ "integrity": "sha512-Kl6a2PbRkOlSlOWJSgYuNp3e53G3cb+axF+r7rbWhJIHiaelG16GerBMxZTSxyiCz77C24LwiA2TKNwe85ObZg==","requires": {"@firebase/app-check-interop-types": "0.1.0","@firebase/auth-interop-types": "0.1.6",- "@firebase/component": "0.5.7",+ "@firebase/component": "0.5.9","@firebase/messaging-interop-types": "0.1.0",- "@firebase/util": "1.4.0",- "node-fetch": "2.6.2",+ "@firebase/util": "1.4.2",+ "node-fetch": "2.6.5","tslib": "^2.1.0"- },- "dependencies": {- "node-fetch": {- "version": "2.6.2",- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",- "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA=="- }}},"@firebase/functions-compat": {- "version": "0.1.3",- "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.1.3.tgz",- "integrity": "sha512-NdobePNq5LUHCI1dJHUGlOTw+Qmq/FJre981/ELEMBdEs95kmKwnXB2UaLjAQYWkgkr4YS3lEnNpsiSTaEHFCg==",+ "version": "0.1.7",+ "resolved": "https://registry.npmjs.org/@firebase/functions-compat/-/functions-compat-0.1.7.tgz",+ "integrity": "sha512-Rv3mAUIhsLTxIgPWJSESUcmE1tzNHzUlqQStPnxHn6eFFgHVhkU2wg/NMrKZWTFlb51jpKTjh51AQDhRdT3n3A==","requires": {- "@firebase/component": "0.5.7",- "@firebase/functions": "0.7.2",+ "@firebase/component": "0.5.9",+ "@firebase/functions": "0.7.6","@firebase/functions-types": "0.5.0",- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},@@ -28433,45 +28461,45 @@"integrity": "sha512-qza0M5EwX+Ocrl1cYI14zoipUX4gI/Shwqv0C1nB864INAD42Dgv4v94BCyxGHBg2kzlWy8PNafdP7zPO8aJQA=="},"@firebase/installations": {- "version": "0.5.1",- "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.5.1.tgz",- "integrity": "sha512-KZ1XHrEPmCx3Z70P9d8mHmYEZXA/uiLIkV0D8R45Q65c0DUxBDm5tSQs56QWofxB/wx16xmO3xAZw4BdJUBnlQ==",+ "version": "0.5.4",+ "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.5.4.tgz",+ "integrity": "sha512-rYb6Ju/tIBhojmM8FsgS96pErKl6gPgJFnffMO4bKH7HilXhOfgLfKU9k51ZDcps8N0npDx9+AJJ6pL1aYuYZQ==","requires": {- "@firebase/component": "0.5.7",- "@firebase/util": "1.4.0",+ "@firebase/component": "0.5.9",+ "@firebase/util": "1.4.2","idb": "3.0.2","tslib": "^2.1.0"}},"@firebase/logger": {- "version": "0.3.0",- "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.3.0.tgz",- "integrity": "sha512-7oQ+TctqekfgZImWkKuda50JZfkmAKMgh5qY4aR4pwRyqZXuJXN1H/BKkHvN1y0S4XWtF0f/wiCLKHhyi1ppPA==",+ "version": "0.3.2",+ "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.3.2.tgz",+ "integrity": "sha512-lzLrcJp9QBWpo40OcOM9B8QEtBw2Fk1zOZQdvv+rWS6gKmhQBCEMc4SMABQfWdjsylBcDfniD1Q+fUX1dcBTXA==","requires": {"tslib": "^2.1.0"}},"@firebase/messaging": {- "version": "0.9.1",- "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.9.1.tgz",- "integrity": "sha512-0g3JWTfkv0WHnu4xgx1zcChJXU2dLjWT0e2MI13Q7NbP3TgLu5CgQ/H/lad16j4Zb4RNqZbAUJurEAB6v2BJ/w==",+ "version": "0.9.4",+ "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.9.4.tgz",+ "integrity": "sha512-OvYV4MLPfDpdP/yltLqZXZRx6rXWz52bEilS2jL2B4sGiuTaXSkR6BIHB54EPTblu32nbyZYdlER4fssz4TfXw==","requires": {- "@firebase/component": "0.5.7",- "@firebase/installations": "0.5.1",+ "@firebase/component": "0.5.9",+ "@firebase/installations": "0.5.4","@firebase/messaging-interop-types": "0.1.0",- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","idb": "3.0.2","tslib": "^2.1.0"}},"@firebase/messaging-compat": {- "version": "0.1.1",- "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.1.1.tgz",- "integrity": "sha512-8FxrQjJCOfP9HibFsymT3qB18rBBmMPxOV+k0n6B7L6KW6Idswq01hMW12d93ZnvlNNKdikCKwUtBNbITBd8FA==",+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.1.4.tgz",+ "integrity": "sha512-6477jBw7w7hk0uhnTUMsPoukalpcwbxTTo9kMguHVSXe0t3OdoxeXEaapaNJlOmU4Kgc8j3rsms8IDLdKVpvlA==","requires": {- "@firebase/component": "0.5.7",- "@firebase/messaging": "0.9.1",- "@firebase/util": "1.4.0",+ "@firebase/component": "0.5.9",+ "@firebase/messaging": "0.9.4",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},@@ -28481,27 +28509,27 @@"integrity": "sha512-DbvUl/rXAZpQeKBnwz0NYY5OCqr2nFA0Bj28Fmr3NXGqR4PAkfTOHuQlVtLO1Nudo3q0HxAYLa68ZDAcuv2uKQ=="},"@firebase/performance": {- "version": "0.5.1",- "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.5.1.tgz",- "integrity": "sha512-O93Yry8KhAaFrhnmBaMkM0lpgVmpd7CRX0eq1S0IKLdE3MdF+oAtbQiZG/NuRl3Vz8vjoz96R6bPbCWaDuiy8Q==",- "requires": {- "@firebase/component": "0.5.7",- "@firebase/installations": "0.5.1",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "version": "0.5.4",+ "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.5.4.tgz",+ "integrity": "sha512-ES6aS4eoMhf9CczntBADDsXhaFea/3a0FADwy/VpWXXBxVb8tqc5tPcoTwd9L5M/aDeSiQMy344rhrSsTbIZEg==",+ "requires": {+ "@firebase/component": "0.5.9",+ "@firebase/installations": "0.5.4",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},"@firebase/performance-compat": {- "version": "0.1.1",- "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.1.1.tgz",- "integrity": "sha512-xN/TjU0hVNiJshZzrUvPYB+3sPS9SgaWrfxh3p0eGFVdwHp/3Z8HlT772bkHAEKXVc64v19ktpUVd+sF5aoJNQ==",+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/@firebase/performance-compat/-/performance-compat-0.1.4.tgz",+ "integrity": "sha512-YuGfmpC0o+YvEBlEZCbPdNbT4Nn2qhi5uMXjqKnNIUepmXUsgOYDiAqM9nxHPoE/6IkvoFMdCj5nTUYVLCFXgg==","requires": {- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/performance": "0.5.1",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/performance": "0.5.4","@firebase/performance-types": "0.1.0",- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},@@ -28528,27 +28556,27 @@}},"@firebase/remote-config": {- "version": "0.3.0",- "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.3.0.tgz",- "integrity": "sha512-Yf9/iXToC6Kbec1yOQ9mdTc1MP0mR2VCCR/n3Q+Ol3U+PML+ePXfqWiL2VHrUA86BeB2hpXF1BcTxvD4uOiDnA==",- "requires": {- "@firebase/component": "0.5.7",- "@firebase/installations": "0.5.1",- "@firebase/logger": "0.3.0",- "@firebase/util": "1.4.0",+ "version": "0.3.3",+ "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.3.3.tgz",+ "integrity": "sha512-9hZWfB3k3IYsjHbWeUfhv/SDCcOgv/JMJpLXlUbTppXPm1IZ3X9ZW4I9bS86gGYr7m/kSv99U0oxQ7N9PoR8Iw==",+ "requires": {+ "@firebase/component": "0.5.9",+ "@firebase/installations": "0.5.4",+ "@firebase/logger": "0.3.2",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},"@firebase/remote-config-compat": {- "version": "0.1.1",- "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.1.1.tgz",- "integrity": "sha512-ZHRHYTdDztXHxgYXzuuD6Goa6ScmAqtctXl2eC6D8vxA8fIGRQKHN+9AMwxm8b3JHzdVY/5XhAOmKCcFvPOgtw==",+ "version": "0.1.4",+ "resolved": "https://registry.npmjs.org/@firebase/remote-config-compat/-/remote-config-compat-0.1.4.tgz",+ "integrity": "sha512-6WeKR7E9KJ1RIF9GZiyle1uD4IsIPUBKUnUnFkQhj3FV6cGvQwbeG0rbh7QQLvd0IWuh9lABYjHXWp+rGHQk8A==","requires": {- "@firebase/component": "0.5.7",- "@firebase/logger": "0.3.0",- "@firebase/remote-config": "0.3.0",+ "@firebase/component": "0.5.9",+ "@firebase/logger": "0.3.2",+ "@firebase/remote-config": "0.3.3","@firebase/remote-config-types": "0.2.0",- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},@@ -28558,32 +28586,25 @@"integrity": "sha512-hqK5sCPeZvcHQ1D6VjJZdW6EexLTXNMJfPdTwbD8NrXUw6UjWC4KWhLK/TSlL0QPsQtcKRkaaoP+9QCgKfMFPw=="},"@firebase/storage": {- "version": "0.8.3",- "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.8.3.tgz",- "integrity": "sha512-oraycQ787tEr6xu2Qc4nngLz1YEoEjZ+lrjThx0CJZB7VwdlkIJ24TkzJ9xoeWc+cpo34deg/If4w8AU5/WupQ==",+ "version": "0.9.0",+ "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.9.0.tgz",+ "integrity": "sha512-1gSYdrwP9kECmugH9L3tvNMvSjnNJGamj91rrESOFk2ZHDO93qKR90awc68NnhmzFAJOT/eJzVm35LKU6SqUNg==","requires": {- "@firebase/component": "0.5.7",- "@firebase/util": "1.4.0",- "node-fetch": "2.6.2",+ "@firebase/component": "0.5.9",+ "@firebase/util": "1.4.2",+ "node-fetch": "2.6.5","tslib": "^2.1.0"- },- "dependencies": {- "node-fetch": {- "version": "2.6.2",- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",- "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA=="- }}},"@firebase/storage-compat": {- "version": "0.1.3",- "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.1.3.tgz",- "integrity": "sha512-m2htGJjCFlTONsqYRKXTfzkux3nbhpIpd72RK2iPkRPE69nQ0wiVplIE7bCaq3CSFMbkI3ETOtTTfW1wrOpF2g==",+ "version": "0.1.8",+ "resolved": "https://registry.npmjs.org/@firebase/storage-compat/-/storage-compat-0.1.8.tgz",+ "integrity": "sha512-L5R0DQoHCDKIgcBbqTx+6+RQ2533WFKeV3cfLAZCTGjyMUustj0eYDsr7fLhGexwsnpT3DaxhlbzT3icUWoDaA==","requires": {- "@firebase/component": "0.5.7",- "@firebase/storage": "0.8.3",+ "@firebase/component": "0.5.9",+ "@firebase/storage": "0.9.0","@firebase/storage-types": "0.6.0",- "@firebase/util": "1.4.0",+ "@firebase/util": "1.4.2","tslib": "^2.1.0"}},@@ -28594,17 +28615,17 @@"requires": {}},"@firebase/util": {- "version": "1.4.0",- "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.4.0.tgz",- "integrity": "sha512-Qn58d+DVi1nGn0bA9RV89zkz0zcbt6aUcRdyiuub/SuEvjKYstWmHcHwh1C0qmE1wPf9a3a+AuaRtduaGaRT7A==",+ "version": "1.4.2",+ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.4.2.tgz",+ "integrity": "sha512-JMiUo+9QE9lMBvEtBjqsOFdmJgObFvi7OL1A0uFGwTmlCI1ZeNPOEBrwXkgTOelVCdiMO15mAebtEyxFuQ6FsA==","requires": {"tslib": "^2.1.0"}},"@firebase/webchannel-wrapper": {- "version": "0.6.0",- "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.6.0.tgz",- "integrity": "sha512-Pz4+7HPzKvOFI1ICQ6pyUv/VgStEWq9IGiVaaV1cQLi66NIA1mD5INnY4CDNoVAxlkuZvDEUZ+cVHLQ8iwA2hQ=="+ "version": "0.6.1",+ "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.6.1.tgz",+ "integrity": "sha512-9FqhNjKQWpQ3fGnSOCovHOm+yhhiorKEqYLAfd525jWavunDJcx8rOW6i6ozAh+FbwcYMkL7b+3j4UR/30MpoQ=="},"@gar/promisify": {"version": "1.1.2",@@ -28612,17 +28633,18 @@"integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="},"@grpc/grpc-js": {- "version": "1.3.7",- "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.7.tgz",- "integrity": "sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA==",+ "version": "1.4.5",+ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.4.5.tgz",+ "integrity": "sha512-A6cOzSu7dqXZ7rzvh/9JZf+Jg/MOpLEMP0IdT8pT8hrWJZ6TB4ydN/MRuqOtAugInJe/VQ9F8BPricUpYZSaZA==","requires": {+ "@grpc/proto-loader": "^0.6.4","@types/node": ">=12.12.47"}},"@grpc/proto-loader": {- "version": "0.6.5",- "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.5.tgz",- "integrity": "sha512-GZdzyVQI1Bln/kCzIYgTKu+rQJ5dno0gVrfmLe4jqQu7T2e7svSwJzpCBqVU5hhBSJP3peuPjOMWsj5GR61YmQ==",+ "version": "0.6.7",+ "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.7.tgz",+ "integrity": "sha512-QzTPIyJxU0u+r2qGe8VMl3j/W2ryhEvBv7hc42OjYfthSj370fUrb7na65rG6w3YLZS/fb8p89iTBobfWGDgdw==","requires": {"@types/long": "^4.0.1","lodash.camelcase": "^4.3.0",@@ -29635,18 +29657,18 @@}},"@nuxtjs/composition-api": {- "version": "0.29.2",- "resolved": "https://registry.npmjs.org/@nuxtjs/composition-api/-/composition-api-0.29.2.tgz",- "integrity": "sha512-Dk2rh2xdcqGPBwmFhNs74wuCs7GWutpDylVuV8cGj/4RpxlwhXQXv8P4iWOp85Y3HEdxDYaXsb+JtMyEnXqxnw==",+ "version": "0.31.0",+ "resolved": "https://registry.npmjs.org/@nuxtjs/composition-api/-/composition-api-0.31.0.tgz",+ "integrity": "sha512-xplH/EJ17W/EjNP7M11URTOrQcjMYqQn1wXUkMOdMiSLKM58VWuCyt0uT9jNCHMUspeQ+SPzr9dxQkNBGvwfiA==","dev": true,"requires": {- "@vue/composition-api": "^1.2.1",+ "@vue/composition-api": "^1.4.1","defu": "^5.0.0","estree-walker": "^2.0.2","fs-extra": "^9.1.0","magic-string": "^0.25.7","ufo": "^0.7.9",- "unplugin-vue2-script-setup": "^0.6.4",+ "unplugin-vue2-script-setup": "^0.7.3","upath": "^2.0.1"}},@@ -30093,6 +30115,16 @@"resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz","integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA="},+ "@rollup/pluginutils": {+ "version": "4.1.2",+ "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.1.2.tgz",+ "integrity": "sha512-ROn4qvkxP9SyPeHaf7uQC/GPFY6L/OWy9+bd9AwcjOAWQwxRscoEyAUD8qCY5o5iL4jqQwoLk2kaTKJPb/HwzQ==",+ "dev": true,+ "requires": {+ "estree-walker": "^2.0.1",+ "picomatch": "^2.2.2"+ }+ },"@simonwep/pickr": {"version": "1.8.2","resolved": "https://registry.npmjs.org/@simonwep/pickr/-/pickr-1.8.2.tgz",@@ -30473,6 +30505,12 @@"terser": "^4.6.13"}},+ "@types/throttle-debounce": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/@types/throttle-debounce/-/throttle-debounce-2.1.0.tgz",+ "integrity": "sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ==",+ "dev": true+ },"@types/uglify-js": {"version": "3.13.1","resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz",@@ -30731,13 +30769,13 @@}},"@vue/compiler-core": {- "version": "3.2.19",- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.19.tgz",- "integrity": "sha512-8dOPX0YOtaXol0Zf2cfLQ4NU/yHYl2H7DCKsLEZ7gdvPK6ZSEwGLJ7IdghhY2YEshEpC5RB9QKdC5I07z8Dtjg==",+ "version": "3.2.26",+ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.26.tgz",+ "integrity": "sha512-N5XNBobZbaASdzY9Lga2D9Lul5vdCIOXvUMd6ThcN8zgqQhPKfCV+wfAJNNJKQkSHudnYRO2gEB+lp0iN3g2Tw==","dev": true,"requires": {- "@babel/parser": "^7.15.0",- "@vue/shared": "3.2.19",+ "@babel/parser": "^7.16.4",+ "@vue/shared": "3.2.26","estree-walker": "^2.0.2","source-map": "^0.6.1"},@@ -30807,31 +30845,57 @@}},"@vue/composition-api": {- "version": "1.2.2",- "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.2.2.tgz",- "integrity": "sha512-hnnock2l8Uawuzm/Nq8LqaztuOO70rpyX3Gz/Kpl/JtNalsG/EuuHuRQAWPiT3Is8NCB/8V5hiH7fmCmAc0+pQ==",+ "version": "1.4.2",+ "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.4.2.tgz",+ "integrity": "sha512-EqybqmMq835GISvlQXdDaV8dsbunpdmhClrnAqUJZLyxxV9pQXQYRtNDf+0e+fEwMfimLIsv7YmbKCbqxGRqXg==","devOptional": true,"requires": {- "tslib": "^2.3.0"+ "tslib": "^2.3.1"}},"@vue/ref-transform": {- "version": "3.2.19",- "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.19.tgz",- "integrity": "sha512-03wwUnoIAeKti5IGGx6Vk/HEBJ+zUcm5wrUM3+PQsGf7IYnXTbeIfHHpx4HeSeWhnLAjqZjADQwW8uA4rBmVbg==",+ "version": "3.2.24",+ "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.24.tgz",+ "integrity": "sha512-j6oNbsGLvea2rF8GQB9w6q7UFL1So7J+t6ducaMeWPSyjYZ+slWpwPVK6mmyghg5oGqC41R+HC5BV036Y0KhXQ==","dev": true,"requires": {"@babel/parser": "^7.15.0",- "@vue/compiler-core": "3.2.19",- "@vue/shared": "3.2.19",+ "@vue/compiler-core": "3.2.24",+ "@vue/shared": "3.2.24","estree-walker": "^2.0.2","magic-string": "^0.25.7"+ },+ "dependencies": {+ "@vue/compiler-core": {+ "version": "3.2.24",+ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.24.tgz",+ "integrity": "sha512-A0SxB2HAggKzP57LDin5gfgWOTwFyGCtQ5MTMNBADnfQYALWnYuC8kMI0DhRSplGTWRvn9Z2DAnG8f35BnojuA==",+ "dev": true,+ "requires": {+ "@babel/parser": "^7.15.0",+ "@vue/shared": "3.2.24",+ "estree-walker": "^2.0.2",+ "source-map": "^0.6.1"+ }+ },+ "@vue/shared": {+ "version": "3.2.24",+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.24.tgz",+ "integrity": "sha512-BUgRiZCkCrqDps5aQ9av05xcge3rn092ztKIh17tHkeEFgP4zfXMQWBA2zfdoCdCEdBL26xtOv+FZYiOp9RUDA==",+ "dev": true+ },+ "source-map": {+ "version": "0.6.1",+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",+ "dev": true+ }}},"@vue/shared": {- "version": "3.2.19",- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.19.tgz",- "integrity": "sha512-Knqhx7WieLdVgwCAZgTVrDCXZ50uItuecLh9JdLC8O+a5ayaSyIQYveUK3hCRNC7ws5zalHmZwfdLMGaS8r4Ew==",+ "version": "3.2.26",+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.26.tgz",+ "integrity": "sha512-vPV6Cq+NIWbH5pZu+V+2QHE9y1qfuTq49uNWw4f7FDEeZaDU2H2cx5jcUZOAKW7qTrUS4k6qZPbMy1x4N96nbA==","dev": true},"@vueuse/core": {@@ -31510,11 +31574,11 @@}},"axios": {- "version": "0.21.4",- "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",- "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",+ "version": "0.24.0",+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",+ "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==","requires": {- "follow-redirects": "^1.14.0"+ "follow-redirects": "^1.14.4"}},"babel-loader": {@@ -32705,9 +32769,9 @@}},"core-js": {- "version": "3.18.0",- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.0.tgz",- "integrity": "sha512-WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w=="+ "version": "3.20.0",+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.0.tgz",+ "integrity": "sha512-KjbKU7UEfg4YPpskMtMXPhUKn7m/1OdTHTVjy09ScR2LVaoUXe8Jh0UdvN2EKUR6iKTJph52SJP95mAB0MnVLQ=="},"core-js-compat": {"version": "3.18.0",@@ -35194,36 +35258,36 @@}},"firebase": {- "version": "9.1.0",- "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.1.0.tgz",- "integrity": "sha512-Pj9/FwNzT4pdSS6vpXZzm4mFscI73N+AH70gaWZPnZrQBvyMAPTuKXXscjrFePPlqs94b4Emq+2mSwLGcwod/A==",- "requires": {- "@firebase/analytics": "0.7.1",- "@firebase/analytics-compat": "0.1.2",- "@firebase/app": "0.7.1",- "@firebase/app-check": "0.4.1",- "@firebase/app-check-compat": "0.1.2",- "@firebase/app-compat": "0.1.2",+ "version": "9.6.1",+ "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.6.1.tgz",+ "integrity": "sha512-d4wbkVMRiSREa1jfFx2z/Kq3KueEKfNWApvdrEAxvzDRN4eiFLeZSZM/MOxj7TR01e/hANnw2lrYKMUpg21ukg==",+ "requires": {+ "@firebase/analytics": "0.7.4",+ "@firebase/analytics-compat": "0.1.5",+ "@firebase/app": "0.7.11",+ "@firebase/app-check": "0.5.2",+ "@firebase/app-check-compat": "0.2.2",+ "@firebase/app-compat": "0.1.12","@firebase/app-types": "0.7.0",- "@firebase/auth": "0.18.0",- "@firebase/auth-compat": "0.1.3",- "@firebase/database": "0.12.1",- "@firebase/database-compat": "0.1.1",- "@firebase/firestore": "3.1.0",- "@firebase/firestore-compat": "0.1.3",- "@firebase/functions": "0.7.2",- "@firebase/functions-compat": "0.1.3",- "@firebase/installations": "0.5.1",- "@firebase/messaging": "0.9.1",- "@firebase/messaging-compat": "0.1.1",- "@firebase/performance": "0.5.1",- "@firebase/performance-compat": "0.1.1",+ "@firebase/auth": "0.19.4",+ "@firebase/auth-compat": "0.2.4",+ "@firebase/database": "0.12.4",+ "@firebase/database-compat": "0.1.4",+ "@firebase/firestore": "3.4.1",+ "@firebase/firestore-compat": "0.1.10",+ "@firebase/functions": "0.7.6",+ "@firebase/functions-compat": "0.1.7",+ "@firebase/installations": "0.5.4",+ "@firebase/messaging": "0.9.4",+ "@firebase/messaging-compat": "0.1.4",+ "@firebase/performance": "0.5.4",+ "@firebase/performance-compat": "0.1.4","@firebase/polyfill": "0.3.36",- "@firebase/remote-config": "0.3.0",- "@firebase/remote-config-compat": "0.1.1",- "@firebase/storage": "0.8.3",- "@firebase/storage-compat": "0.1.3",- "@firebase/util": "1.4.0"+ "@firebase/remote-config": "0.3.3",+ "@firebase/remote-config-compat": "0.1.4",+ "@firebase/storage": "0.9.0",+ "@firebase/storage-compat": "0.1.8",+ "@firebase/util": "1.4.2"}},"flagged-respawn": {@@ -36839,9 +36903,9 @@"integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="},"highcharts": {- "version": "9.2.2",- "resolved": "https://registry.npmjs.org/highcharts/-/highcharts-9.2.2.tgz",- "integrity": "sha512-OMEdFCaG626ES1JEcKAvJTpxAOMuchy0XuAplmnOs0Yu7NMd2RMfTLFQ2fCJOxo3ubSdm/RVQwKAWC+5HYThnw=="+ "version": "9.3.2",+ "resolved": "https://registry.npmjs.org/highcharts/-/highcharts-9.3.2.tgz",+ "integrity": "sha512-I/48gNMvs3hZxZnPRUqLbnlrGZJJ7YPPVr1+fYeZ35p4pSZAOwTmAGbptrjBr7JlF52HmJH9zMbt/I4TPLu9Pg=="},"highcharts-vue": {"version": "1.4.0",@@ -37024,9 +37088,9 @@}},"http-parser-js": {- "version": "0.5.3",- "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",- "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="+ "version": "0.5.5",+ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz",+ "integrity": "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA=="},"https-browserify": {"version": "1.0.0",@@ -42421,9 +42485,9 @@}},"postcss-selector-parser": {- "version": "6.0.6",- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",- "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",+ "version": "6.0.8",+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz",+ "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==","requires": {"cssesc": "^3.0.0","util-deprecate": "^1.0.2"@@ -42759,9 +42823,9 @@},"dependencies": {"@types/node": {- "version": "16.10.1",- "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.1.tgz",- "integrity": "sha512-4/Z9DMPKFexZj/Gn3LylFgamNKHm4K3QDi0gz9B26Uk0c8izYf97B5fxfpspMNkWlFupblKM/nV8+NA9Ffvr+w=="+ "version": "17.0.2",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.2.tgz",+ "integrity": "sha512-JepeIUPFDARgIs0zD/SKPgFsJEAF0X5/qO80llx59gOxFTboS9Amv3S+QfB7lqBId5sFXJ99BN0J6zFRvL9dDA=="}}},@@ -45287,9 +45351,9 @@}},"swiper": {- "version": "6.8.1",- "resolved": "https://registry.npmjs.org/swiper/-/swiper-6.8.1.tgz",- "integrity": "sha512-Gc2rKe0XH3zoB0ogonlielduGM9DDQCJtXAeFeD2ujwzhEqw+5udwebCMNjhAcQ+xl9ygM5PnRoziAUol3Dx5w==",+ "version": "6.8.4",+ "resolved": "https://registry.npmjs.org/swiper/-/swiper-6.8.4.tgz",+ "integrity": "sha512-O+buF9Q+sMA0H7luMS8R59hCaJKlpo8PXhQ6ZYu6Rn2v9OsFd4d1jmrv14QvxtQpKAvL/ZiovEeANI/uDGet7g==","requires": {"dom7": "^3.0.0","ssr-window": "^3.0.0"@@ -45353,9 +45417,9 @@}},"tailwindcss": {- "version": "3.0.1",- "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.1.tgz",- "integrity": "sha512-EVDXVZkcueZ77/zfOJw7XkzCuxe5TCiT/S9pw9P183oRzSuwMZ7WO+W/L76jbJQA5qxGeUBJOVOLVBuAUfeZ3g==",+ "version": "3.0.7",+ "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.7.tgz",+ "integrity": "sha512-rZdKNHtC64jcQncLoWOuCzj4lQDTAgLtgK3WmQS88tTdpHh9OwLqULTQxI3tw9AMJsqSpCKlmcjW/8CSnni6zQ==","dev": true,"requires": {"arg": "^5.0.1",@@ -45374,7 +45438,7 @@"postcss-js": "^3.0.3","postcss-load-config": "^3.1.0","postcss-nested": "5.0.6",- "postcss-selector-parser": "^6.0.6",+ "postcss-selector-parser": "^6.0.7","postcss-value-parser": "^4.2.0","quick-lru": "^5.1.1","resolve": "^1.20.0",@@ -46038,9 +46102,9 @@}},"typescript": {- "version": "4.4.3",- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz",- "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==",+ "version": "4.5.4",+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",+ "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==","dev": true},"ua-parser-js": {@@ -46246,51 +46310,56 @@"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz","integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="},- "unplugin": {- "version": "0.2.16",- "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-0.2.16.tgz",- "integrity": "sha512-KkXatHba0baJszSHW+2e8EQU/5Bz7rYwzYXu8wUeq97tE6K3wvub+7OWSuRv04LttvzNLsJ2jXEyR35gofv74Q==",- "dev": true,- "requires": {- "webpack-virtual-modules": "^0.4.3"- }- },"unplugin-vue2-script-setup": {- "version": "0.6.4",- "resolved": "https://registry.npmjs.org/unplugin-vue2-script-setup/-/unplugin-vue2-script-setup-0.6.4.tgz",- "integrity": "sha512-uKnf5KSx/8PHd+7HSE99Dw5J6TQrZ8nTdgly5wkIvV1Dwq948tuiAK37sCyQsTMkfstyigT2UwyRXX5g+hTtKQ==",+ "version": "0.7.3",+ "resolved": "https://registry.npmjs.org/unplugin-vue2-script-setup/-/unplugin-vue2-script-setup-0.7.3.tgz",+ "integrity": "sha512-3C32JkCS7BsNsgUkVnCEIJynHy+N/xwqiaUiMkeTm3Rk+HfHMhEPQ5Gysg3tejWY7KJyk8CohUKswTChurI1ng==","dev": true,"requires": {- "@babel/core": "^7.15.5",- "@babel/generator": "^7.15.4",- "@babel/parser": "^7.15.6",- "@babel/traverse": "^7.15.4",- "@babel/types": "^7.15.6",- "@vue/ref-transform": "^3.2.11",- "@vue/shared": "^3.2.11",+ "@antfu/utils": "^0.3.0",+ "@babel/core": "^7.16.0",+ "@babel/generator": "^7.16.0",+ "@babel/parser": "^7.16.3",+ "@babel/traverse": "^7.16.3",+ "@babel/types": "^7.16.0",+ "@rollup/pluginutils": "^4.1.1",+ "@vue/compiler-core": "^3.2.23",+ "@vue/ref-transform": "^3.2.23",+ "@vue/shared": "^3.2.23","defu": "^5.0.0",- "htmlparser2": "^7.1.2",+ "htmlparser2": "5.0.1","magic-string": "^0.25.7",- "pug": "^3.0.2",- "unplugin": "^0.2.11"+ "unplugin": "^0.2.21"},"dependencies": {- "entities": {- "version": "3.0.1",- "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",- "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",- "dev": true+ "domhandler": {+ "version": "3.3.0",+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz",+ "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==",+ "dev": true,+ "requires": {+ "domelementtype": "^2.0.1"+ }},"htmlparser2": {- "version": "7.1.2",- "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.1.2.tgz",- "integrity": "sha512-d6cqsbJba2nRdg8WW2okyD4ceonFHn9jLFxhwlNcLhQWcFPdxXeJulgOLjLKtAK9T6ahd+GQNZwG9fjmGW7lyg==",+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-5.0.1.tgz",+ "integrity": "sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==","dev": true,"requires": {"domelementtype": "^2.0.1",- "domhandler": "^4.2.2",- "domutils": "^2.8.0",- "entities": "^3.0.1"+ "domhandler": "^3.3.0",+ "domutils": "^2.4.2",+ "entities": "^2.0.0"+ }+ },+ "unplugin": {+ "version": "0.2.21",+ "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-0.2.21.tgz",+ "integrity": "sha512-IJ15/L5XbhnV7J09Zjk0FT5HEkBjkXucWAXQWRsmEtUxmmxwh23yavrmDbCF6ZPxWiVB28+wnKIHePTRRpQPbQ==",+ "dev": true,+ "requires": {+ "webpack-virtual-modules": "^0.4.3"}}}@@ -47889,9 +47958,9 @@}},"ws": {- "version": "8.2.2",- "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.2.tgz",- "integrity": "sha512-Q6B6H2oc8QY3llc3cB8kVmQ6pnJWVQbP7Q5algTcIxx7YEpc0oU4NBVHlztA7Ekzfhw2r0rPducMUiCGWKQRzw==",+ "version": "8.4.0",+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz",+ "integrity": "sha512-IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ==","requires": {}},"xregexp": {diff --git a/package.json b/package.jsonindex aa8b0b73..97128799 100644--- a/package.json+++ b/package.json@@ -16,18 +16,18 @@"@nuxtjs/i18n": "^7.2.0","@simonwep/pickr": "1.8.2","@vueuse/core": "5.3.0",- "axios": "0.21.4",- "core-js": "3.18.0",+ "axios": "0.24.0",+ "core-js": "3.20.0","currency.js": "2.0.4","dayjs": "1.10.7",- "firebase": "9.1.0",- "highcharts": "9.2.2",+ "firebase": "9.6.1",+ "highcharts": "9.3.2","highcharts-vue": "1.4.0","localforage": "1.10.0","nuxt": "2.15.8","portal-vue": "2.1.7",- "swiper": "6.8.1",- "vue-notification": "1.3.20",+ "swiper": "^6.8.4",+ "vue-notification": "^1.3.20","vuedraggable": "2.24.3","vuejs-datepicker": "1.6.2"},@@ -35,13 +35,13 @@"@nuxt/types": "2.15.8","@nuxt/typescript-build": "2.1.0","@nuxtjs/color-mode": "2.1.1",- "@nuxtjs/composition-api": "0.29.2",+ "@nuxtjs/composition-api": "0.31.0","@nuxtjs/eslint-config-typescript": "6.0.1","@nuxtjs/pwa": "3.3.5","@nuxtjs/style-resources": "^1.2.1","@nuxtjs/tailwindcss": "^4.2.1","cross-env": "7.0.3",- "eslint": "7.32.0",+ "eslint": "^7.32.0","eslint-plugin-nuxt": "2.0.0","fancy-log": "1.3.3","gulp": "4.0.2",@@ -50,14 +50,14 @@"node-notifier": "10.0.0","pug": "3.0.2","pug-plain-loader": "1.1.0",- "style-loader": "2.0.0",- "stylelint": "13.13.1",+ "style-loader": "^2.0.0",+ "stylelint": "^13.13.1","stylelint-order": "4.1.0","stylelint-plugin-stylus": "0.11.0",- "stylus": "0.55.0",+ "stylus": "^0.55.0","stylus-loader": "3.0.2",- "tailwindcss": "^3.0.1",- "typescript": "4.4.3",+ "tailwindcss": "^3.0.7",+ "typescript": "4.5.4","vinyl-ftp": "0.6.1"}}diff --git a/pages/api.vue b/pages/api.vueindex f1fa3ca4..4451f543 100644--- a/pages/api.vue+++ b/pages/api.vue@@ -1,6 +1,11 @@-<script>-import { computed, useContext, defineComponent } from '@nuxtjs/composition-api'+<script lang="ts">+import { reactive, computed, useContext, defineComponent } from '@nuxtjs/composition-api'+import Datepicker from 'vuejs-datepicker'import dayjs from 'dayjs'+import useCalculator from '~/components/trnForm/calculator/useCalculator'+import useFilter from '~/modules/filter/useFilter'++type PeriodNavDirection = 'prev' | 'next'const sortByDate = (trns, ids) => {return ids@@ -12,39 +17,69 @@ const sortByDate = (trns, ids) => {}const filterByDate = (trns, ids, date) => {+ console.log(date)return ids.filter(trnId =>- (trns[trnId].date >= date.after) &&- (trns[trnId].date <= date.before))+ (trns[trnId].date >= date.start) &&+ (trns[trnId].date <= date.end))}export default defineComponent({- name: '',+ components: { Datepicker },setup () {const { store } = useContext()+ const { setExpression } = useCalculator()+ const { setCategoryFilter } = useFilter()- const period = {- name: 'week',+ const period = reactive({+ name: 'month',value: 1- }+ })+// const today = dayjs().subtract(1, 'week').valueOf()const today = dayjs().valueOf()const date = {- after: dayjs(today).subtract(period.value, period.name).startOf(period.name).valueOf(),- before: dayjs(today).endOf(period.name).valueOf()+ // @ts-ignore+ end: dayjs(today).subtract(period.value, period.name).startOf(period.name).valueOf(),+ // @ts-ignore+ start: dayjs(today).endOf(period.name).valueOf()+ }++ // @ts-ignore+ const startDay = computed(() => dayjs().subtract(period.value, period.name).valueOf())+ const endDay = computed(() => dayjs().valueOf())++ const dateRange = reactive({+ start: dayjs(startDay.value).startOf('day').valueOf(),+ end: dayjs(endDay.value).endOf('day').valueOf(),+ // @ts-ignore+ count: computed(() => dayjs(dateRange.end).diff(dateRange.start, period.name) + 1)+ })++ function onSelectDay (date, type) {+ dateRange[type] = type === 'end' ? dayjs(date).endOf('day').valueOf() : dayjs(date).startOf('day').valueOf()}- const fromDay = dayjs('12.09.2021').valueOf()- const toDay = dayjs('12.10.2021').valueOf()+ function onChangePeriodName (name) {+ period.name = name+ selectPeriod()+ }- const dateRange = {- after: dayjs(fromDay).startOf('day').valueOf(),- before: dayjs(toDay).endOf('day').valueOf()+ function selectPeriod (direction?: PeriodNavDirection) {+ let selectedDate = dayjs(dateRange.end)+ if (direction === 'next')+ selectedDate = dayjs(selectedDate).add(1, period.name)+ if (direction === 'prev')+ selectedDate = dayjs(selectedDate).subtract(1, period.name)++ // @ts-ignore+ dateRange.start = dayjs(selectedDate).startOf(period.name).valueOf()+ // @ts-ignore+ dateRange.end = dayjs(selectedDate).endOf(period.name).valueOf()}- const categories = store.state.categories.itemsconst trns = computed(() => store.state.trns.items)const trnsIds = computed(() => Object.keys(trns.value))@@ -56,12 +91,49 @@ export default defineComponent({return ids})- const chartData = computed(() => {-+ const actions = trnItem => ({+ onOpenDetails: () => {+ if (!store.state.trns.modal.show) {+ store.commit('categories/hideCategoryModal')+ store.commit('trns/showTrnModal')+ store.commit('trns/setTrnModalId', trnItem.id)+ }+ },++ onOpenEdit: (event) => {+ event.stopPropagation()+ setExpression(trnItem.amount)+ store.dispatch('trnForm/openTrnForm', { action: 'edit', trnId: trnItem.id })+ store.commit('stat/setCategoryModal', { id: null, type: null })+ },++ onSetFilter: (event) => {+ event.stopPropagation()+ setCategoryFilter(trnItem.category.id)+ store.commit('filter/setFilterDateNow')+ store.commit('trns/hideTrnModal')+ store.commit('trns/setTrnModalId', null)+ store.commit('stat/setCategoryModal', { id: null, type: null })+ store.dispatch('ui/setActiveTabStat', 'details')+ }})+ const disabledDates = {+ from: new Date()+ }+return {- selectedTrnsIds+ actions,+ selectedTrnsIds,++ startDay,+ dateRange,+ onSelectDay,+ disabledDates,+ selectPeriod,+ onChangePeriodName,++ period}}})@@ -69,20 +141,57 @@ export default defineComponent({<template lang="pug">div- TrnsItemTrnItem(- v-for="trnId in selectedTrnsIds"- :key="trnId"- :category="$store.state.categories.items[$store.state.trns.items[trnId].categoryId]"- :trn="$store.state.trns.items[trnId]"- :trnId="trnId"- :wallet="$store.state.wallets.items[$store.state.trns.items[trnId].walletId]"- )-- pre {{ $store.state.trns.items[selectedTrnsIds[0]] }}-- Chart(- :options="chartData"+ pre {{ startDay }}+ pre {{ period }}+ pre {{ dateRange }}+ pre {{ $day(dateRange.start).format() }}+ pre {{ $day(dateRange.end).format() }}++ .p-2.text-lg(@click="selectPeriod('prev')") prev+ .p-2.text-lg(@click="selectPeriod('next')") next++ .p-3.flex+ .p-1(@click="onChangePeriodName('day')") day+ .p-1(@click="onChangePeriodName('week')") week+ .p-1(@click="onChangePeriodName('month')") month+ .p-1(@click="onChangePeriodName('year')") year++ .p-3.gap-4.flex+ .py-3.bg-neutral-800+ .px-3.pb-3.text-md.text-center Start Date+ Datepicker(+ :disabledDates="disabledDates"+ :monday-first="true"+ :value="dateRange.start"+ calendar-class="inlineCalendar__in"+ inline+ wrapper-class="inlineCalendar"+ @selected="date => onSelectDay(date, 'start')"+ )++ .py-3.bg-neutral-800+ .px-3.pb-3.text-md.text-center End date+ Datepicker(+ :disabledDates="disabledDates"+ :monday-first="true"+ :value="dateRange.end"+ calendar-class="inlineCalendar__in"+ inline+ wrapper-class="inlineCalendar"+ @selected="date => onSelectDay(date, 'end')"+ )++ .grid.gap-2(+ class="md:grid-cols-2 md:gap-0")+ .p-3+ pre {{ selectedTrnsIds.length }}+ TrnsItemHistory.py-3.px-2.rounded-md.cursor-pointer(+ v-for="trnId in selectedTrnsIds"+ :key="trnId"+ :actions="actions"+ :trnId="trnId"+ )</template><style lang="stylus" scoped>diff --git a/pages/login.vue b/pages/login.vueindex 8435cf29..96eae1e0 100644--- a/pages/login.vue+++ b/pages/login.vue@@ -55,8 +55,8 @@ export default {<template lang="pug">.tab- .tab__top- .absolute.flex.gap-3.top-3.left-5(+ .py-4.px-3.h-24.justify-between.items-start.flex+ .flex.gap-1.top-3.left-5(class="lg:top-7 lg:left-7").linkItem.py-2.px-3.rounded(@@ -68,7 +68,7 @@ export default {@click="onSetLocale('en')") English- .absolute.flex.gap-3.top-3.right-5(+ .flex.gap-3.top-3.right-5(class="lg:top-7 lg:right-7").linkItem.py-2.px-3.rounded(@click="$store.dispatch('ui/changeTheme')") {{ $t('changeTheme') }}@@ -77,7 +77,7 @@ export default {SharedAppNameSharedCopyright- .tab__bottom+ .tab__bottom.px-3.py-8.loginButton(:class="{ _loading: isLoading }"@click.prevent="signInWithGoogle"@@ -108,19 +108,15 @@ export default {align-items centerjustify-content centerflex-flow column- padding-top 100px&__bottomdisplay flexalign-items centerjustify-content centerflex-flow column- padding $mn1+media(600px)justify-content flex-start- padding $mb2- padding-top 0.linkItemcursor pointerdiff --git a/pages/settings.vue b/pages/settings.vueindex f2eeb46f..8f78f451 100644--- a/pages/settings.vue+++ b/pages/settings.vue@@ -54,6 +54,19 @@ LayoutBaseWrap(:contentPadding="false")@onClick="$store.commit('currencies/showBaseCurrenciesModal')")+ .settings__group+ .settings__subHeader {{ $t('user') }}+ .pb-3.text-neutral-400+ .text-lg {{ $store.state.user.user.displayName }}+ .text-sm {{ $store.state.user.user.email }}++ .settings__item+ SharedButton._bdb(+ :title="$t('userLogout')"+ icon="mdi mdi-logout"+ @onClick="$store.dispatch('user/signOut')"+ )+.settings__group.settings__subHeader {{ $t('settings.app') }}.settings__item@@ -65,13 +78,6 @@ LayoutBaseWrap(:contentPadding="false")@onClick="$store.dispatch('ui/changeTheme')")- .settings__item- SharedButton._bdb(- :title="$t('userLogout')"- icon="mdi mdi-logout"- @onClick="$store.dispatch('user/signOut')"- )-.settings__group.settings__subHeader {{ $t('settings.caution') }}.settings__desc {{ $t('alerts.willDeleteEverything') }}@@ -155,3 +161,15 @@ LayoutBaseWrap(:contentPadding="false")color var(--c-font-3)font-size 10px</style>++<i18n lang="json5">+{+ en: {+ user: 'User'+ },++ ru: {+ user: 'Пользователь'+ }+}+</i18n>diff --git a/store/currencies/api.js b/store/currencies/api.jsindex 2c5bceaf..11a67dfd 100644--- a/store/currencies/api.js+++ b/store/currencies/api.js@@ -16,9 +16,9 @@ export const getRatesOf = async (baseCurrency) => {const baseRate = ratesBasedOnUsd[baseCurrency]// Conver rates to base currency- for (const id in ratesBasedOnUsd) {+ for (const id in ratesBasedOnUsd)rates[id] = ratesBasedOnUsd[id] / baseRate- }+return rates}else {diff --git a/store/currencies/getters.js b/store/currencies/getters.jsdeleted file mode 100644index 09ad4b1d..00000000--- a/store/currencies/getters.js+++ /dev/null@@ -1,7 +0,0 @@-export default {- getAmountInBaseCurrency: (state, getters, rootState) => ({ amount, currency }) => {- const fixed = rootState.currencies.base === 'RUB' ? 0 : 2- const baseValue = (amount / rootState.currencies.rates[currency]).toFixed(fixed)- return Number(baseValue)- }-}diff --git a/store/filter/actions.js b/store/filter/actions.jsindex 9cd72db4..3b274a7c 100644--- a/store/filter/actions.js+++ b/store/filter/actions.js@@ -4,10 +4,10 @@ import localforage from 'localforage'export default {handleSetFilterCategory ({ rootState, dispatch }, categoryId) {const filterCategoryId = rootState.filter.categoryId- const filterCategory = rootState.categories.items[filterCategoryId]+ const filterCategory = rootState.categories.items[categoryId]if (filterCategoryId === categoryId) {- if (filterCategory.parentId !== 0) {+ if (filterCategory?.parentId !== 0) {dispatch('setFilterCategoryId', null)dispatch('setFilterCategoryId', filterCategory.parentId)}@@ -16,6 +16,7 @@ export default {}}else {+ console.log(11, categoryId)dispatch('setFilterCategoryId', categoryId)}},diff --git a/store/trns/actions.js b/store/trns/actions.jsindex 3894bff7..fb5e7f5b 100644--- a/store/trns/actions.js+++ b/store/trns/actions.js@@ -28,15 +28,13 @@ export default {},/**- * Create new trn- * and save it to local storage when Client offline- *- * @param {object}- * @param {string} {}.id- * @param {object} {}.values- * @param {string} {}.values.amount- * @param {string} {}.values.category- */+ * Create new trn+ * and save it to local storage when Client offline+ *+ * @param {object}+ * @param id+ * @param values+ */addTrn ({ commit, rootState }, { id, values }) {const uid = rootState.user.user.uidconst trns = rootState.trns.itemsdiff --git a/tailwind.config.js b/tailwind.config.jsindex 31ab4da8..b3b42e10 100644--- a/tailwind.config.js+++ b/tailwind.config.js@@ -1,6 +1,8 @@const plugin = require('tailwindcss/plugin')module.exports = {+ darkMode: 'class',+content: ['./components/**/*.{js,ts}','./layouts/**/*.{js,ts}',@@ -10,11 +12,14 @@ module.exports = {theme: {extend: {+ fontSize: {+ '2xs': '10px'+ },+ fontFamily: {+ unica: ['"Unica One"', '"Roboto Condensed"', 'sans-serif']+ },minWidth: {base: '320px'- },- height: {- 0: '0'}}},diff --git a/vue-shim.d.ts b/vue-shim.d.tsindex eb40980e..6b11577d 100644--- a/vue-shim.d.ts+++ b/vue-shim.d.ts@@ -1,4 +1,8 @@-declare module "*.vue" {+declare module '*.vue' {import Vue from 'vue'export default Vue}++interface Category {+ id: string+}