Skip to content

Open source personal finance application

update 3.5.0

ilkomec3008deecb78
diff --git a/assets/css/tailwind.css b/assets/css/tailwind.css
index 8232accb..618bf3a3 100644
--- a/assets/css/tailwind.css
+++ b/assets/css/tailwind.css
@@ -16,7 +16,8 @@ body {
}
body {
- background: #171717
+ background: #171717;
+ user-select: none;
}
@media (prefers-color-scheme: light) {
body {
@@ -33,3 +34,21 @@ body,
#__layout {
height: 100%
}
+
+:root {
+ --height: 100vh
+}
+
+.flex-center {
+ @apply flex items-center justify-center;
+}
+.flex-center-col {
+ @apply flex flex-col items-center justify-center;
+}
+
+.absolute-center {
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%)
+}
diff --git a/assets/stylus/base/barItem.styl b/assets/stylus/base/barItem.styl
deleted file mode 100644
index 765e2884..00000000
--- a/assets/stylus/base/barItem.styl
+++ /dev/null
@@ -1,10 +0,0 @@
-.barItem
- +media-hover()
- &:not(._active)
- cursor pointer
- color var(--c-font-3)
- background var(--c-item2-bg-hover)
-
- &._active
- color var(--c-blue-1)
- background var(--c-item-bg-hover)
diff --git a/assets/stylus/base/colors.styl b/assets/stylus/base/colors.styl
deleted file mode 100644
index 6f29cd15..00000000
--- a/assets/stylus/base/colors.styl
+++ /dev/null
@@ -1,46 +0,0 @@
-// Bg
-.bg-1
- background var(--c-bg-1)
-
-.bg-2
- background var(--c-bg-2)
-
-.bg-3
- background var(--c-bg-3)
-
-.bg-4
- background var(--c-bg-4)
-
-.bg-5
- background var(--c-bg-5)
-
-.bg-6
- background var(--c-bg-6)
-
-.bg-8
- background var(--c-bg-8)
-
-.bg-9
- background var(--c-bg-9)
-
-.bg-10
- background var(--c-bg-10)
-
-.b17
- background var(--c-bg1)
-
-// Font
-.font1
- color var(--c-font-1)
-
-.font2
- color var(--c-font-2)
-
-.font3
- color var(--c-font-3)
-
-.font4
- color var(--c-font-4)
-
-.font5
- color var(--c-font-5)
diff --git a/assets/stylus/base/fonts.styl b/assets/stylus/base/fonts.styl
index 5e234673..64706b88 100644
--- a/assets/stylus/base/fonts.styl
+++ b/assets/stylus/base/fonts.styl
@@ -1,9 +1,5 @@
-.font5
- color var(--c-font-5)
-
.statTitle
padding-bottom 2px
- color var(--c-font-3)
font-size 18px
letter-spacing .2px
font-secondary()
diff --git a/assets/stylus/colors-dark.styl b/assets/stylus/colors-dark.styl
index 239a14d4..f8857b2a 100644
--- a/assets/stylus/colors-dark.styl
+++ b/assets/stylus/colors-dark.styl
@@ -3,8 +3,8 @@ html.dark
--c-red-1 rgba(184,20,20,1)
--c-blue-1 #3a7dff
--c-blue-3 #2c74ff
- --c-incomes-1 rgba(44,173,34,1)
- --c-expenses-1 rgba(249,33,52,1)
+ --c-incomes-1 #2cad22
+ --c-expenses-1 #f92134
--c-bg-1 rgba(10,10,10,.99)
--c-bg-2 rgba(17,17,17,1)
@@ -29,7 +29,7 @@ html.dark
--c-item-bg-main #1e1e1e
--c-item-bd-main rgba(44,44,44,1)
- --c-item-bg-hover rgba(35,35,35,1)
+ --c-item-bg-hover #232323
--c-item-bd-hover rgba(35,35,35,1)
--c-item-bg-active rgba(35,35,35,1)
diff --git a/assets/stylus/shame.styl b/assets/stylus/shame.styl
index 63712286..3d131e08 100644
--- a/assets/stylus/shame.styl
+++ b/assets/stylus/shame.styl
@@ -1,3 +1,6 @@
+.button
+ button-base-1()
+
.form-line
margin-bottom $m9
padding $m7 $m6
@@ -54,7 +57,6 @@
&__icon
&__label
padding-top 3px
- color var(--c-font-4)
font-weight 500
line-height 18px
diff --git a/assets/stylus/variables.styl b/assets/stylus/variables.styl
index d1d71434..d85f4ee2 100644
--- a/assets/stylus/variables.styl
+++ b/assets/stylus/variables.styl
@@ -1,10 +1,5 @@
@import 'variables/*'
-font-title-1()
- font-size 16px
- font-weight 500
- font-roboto()
-
button-base-1()
cursor pointer
display flex
@@ -15,7 +10,6 @@ button-base-1()
max-width 280px
margin 0 auto
padding 0 $m9
- color var(--c-text-4)
font-size 12px
text-decoration none
background var(--c-item-bg-main)
@@ -24,20 +18,9 @@ button-base-1()
anim()
+media-hover()
- color var(--c-text-1)
background var(--c-item-bg-hover)
border 1px solid var(--c-item-bd-hover)
+media(700px)
height 48px
max-width 280px
-
-header-title()
- padding 60px 0
- font-h1()
- font-size 22px
- font-weight 600
- text-align center
-
- +media-laptop()
- font-size 28px
diff --git a/components/amount/Amount2.vue b/components/amount/Amount2.vue
index ea12751b..dbe4aca4 100644
--- a/components/amount/Amount2.vue
+++ b/components/amount/Amount2.vue
@@ -31,7 +31,7 @@ export default defineComponent({
)
//- Amount
template(v-if="amount !== 0")
- div(:class="[{ 'text-green-600 dark:text-green-500': colorize === 'incomes' && type === 1 }]")
+ div(:class="[{ 'text-green-600 dark_text-green-500': colorize === 'incomes' && type === 1 }]")
//- Original
.gap-1.flex.items-baseline.justify-end
.text-md.leading-none {{ sign }}
diff --git a/components/amount/Amount3.vue b/components/amount/Amount3.vue
new file mode 100644
index 00000000..200f9425
--- /dev/null
+++ b/components/amount/Amount3.vue
@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import currency from 'currency.js'
+
+const props = defineProps<{
+ value: number
+}>()
+
+const separator = ' '
+
+const amount = computed(() =>
+ currency(props.value, {
+ symbol: '',
+ precision: 0,
+ pattern: '#',
+ separator,
+ }).format(),
+)
+</script>
+
+<template lang="pug">
+span.whitespace-nowrap {{ amount }}
+</template>
diff --git a/components/analytics/Analytics.vue b/components/analytics/Analytics.vue
deleted file mode 100644
index 77c4bf6b..00000000
--- a/components/analytics/Analytics.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-<script>
-export default {
- name: 'Analytics',
-
- props: {
- showCategoriesCharts: {
- type: Boolean,
- default: true,
- },
- showInside: {
- type: Boolean,
- default: false,
- },
- },
-
- computed: {
- statCurrentPeriod() {
- return this.$store.getters['stat/statCurrentPeriod']
- },
- },
-}
-</script>
-
-<template lang="pug">
-.wrap
-
- .block
- slot(name="expenses")
-
- StatCatsPeriodCatsChart(
- v-if="showCategoriesCharts"
- :key="categoryId"
- type="expenses"
- )
- .columns
- .item(
- v-for="categoryId in statCurrentPeriod.expenses.categoriesIds"
- :key="categoryId"
- )
- .categoryWrap
- .categoryIcon
- Icon(
- :icon="$store.state.categories.items[categoryId].icon"
- :background="$store.state.categories.items[categoryId].color || $store.state.ui.defaultBgColor"
- :round="true"
- :big="true"
- )
- .modalBottom__header__title {{ $store.state.categories.items[categoryId].name }}
-
- .item__chart
- AnalyticsChart(:categoryId="categoryId")
-
- .item__inside
- StatItem(
- :biggest="statCurrentPeriod.expenses.biggest"
- :category="$store.state.categories.items[categoryId]"
- :categoryId="categoryId"
- :currency="$store.state.currencies.base"
- :key="categoryId"
- :type="0"
- :total="statCurrentPeriod.categories[categoryId].expenses"
- )
-
- .block
- slot(name="incomes")
-
- StatCatsPeriodCatsChart(
- v-if="showCategoriesCharts"
- :key="categoryId"
- type="incomes"
- )
- .columns
- .item(
- v-for="categoryId in statCurrentPeriod.incomes.categoriesIds"
- :key="categoryId"
- )
- .categoryWrap
- .categoryIcon
- Icon(
- :icon="$store.state.categories.items[categoryId].icon"
- :background="$store.state.categories.items[categoryId].color || $store.state.ui.defaultBgColor"
- :round="true"
- :big="true"
- )
- .modalBottom__header__title {{ $store.state.categories.items[categoryId].name }}
-
- .item__chart
- AnalyticsChart(:categoryId="categoryId")
-
- .item__inside
- StatItem(
- :biggest="statCurrentPeriod.expenses.biggest"
- :category="$store.state.categories.items[categoryId]"
- :categoryId="categoryId"
- :currency="$store.state.currencies.base"
- :key="categoryId"
- :type="1"
- :total="statCurrentPeriod.categories[categoryId].expenses"
- )
-</template>
-
-<style lang="stylus" scoped>
-.block
- padding-bottom $m10
-
-.title
- padding-bottom $m8
- font-h1()
- font-size 22px
- font-weight 600
-
- +media-laptop()
- font-size 28px
-
-.wrap
- position relative
-
- +media-tablet()
- max-width 1100px
- padding 60px 60px
-
-.columns
- display grid
- grid-template-columns repeat(1, 1fr)
- grid-column-gap $m9
- grid-row-gap 60px
- padding-top 60px
- padding-bottom $m9
-
- +media-tablet()
- grid-template-columns repeat(auto-fill, minmax(360px, 47%))
-
-.item
- padding $m6
- color var(--c-font-1)
- background var(--c-bg-3)
- border-radius $m6
-
- &__name
- min-width 100px
- padding $m7
- padding-bottom $m8
- color var(--c-font-2)
- font-size 18px
- fontFamilyNunito()
-
- &__chart
- flex-grow 1
-
- &__inside
- padding-top $m6
-
-.categoryWrap
- flex-grow 1
- display flex
- align-items center
- justify-content center
- flex-flow column
- padding-bottom $m5
-
-.categoryIcon
- flex-grow 1
- display flex
- align-items center
- justify-content center
- margin-top -38px
- padding-bottom 12px
-</style>
diff --git a/components/analytics/AnalyticsChart.vue b/components/analytics/AnalyticsChart.vue
deleted file mode 100644
index e96e042f..00000000
--- a/components/analytics/AnalyticsChart.vue
+++ /dev/null
@@ -1,245 +0,0 @@
-<script>
-import currency from 'currency.js'
-import { Chart } from 'highcharts-vue'
-import chartOptions from '~/components/stat/chartOptions'
-
-const baseAmountFormat = (value, separator, precision) => currency(value, { symbol: null, precision, pattern: '#', separator }).format()
-
-export default {
- name: 'AnalyticsChart',
-
- components: {
- Chart,
- },
-
- props: {
- categoryId: {
- type: String,
- required: true,
- },
-
- chartType: {
- type: String,
- default: 'column',
- },
- },
-
- data() {
- return {
- average: 0,
- total: 0,
- date: this.$day().valueOf(),
- visiblePeriodMenu: false,
- dateStart: null,
- dateEnd: null,
- }
- },
-
- computed: {
- showedPeriods() {
- return this.$store.state.stat.showedPeriods
- },
-
- statCurrentPeriod() {
- return this.$store.getters['stat/statCurrentPeriod']
- },
-
- filterDate() {
- return this.$store.state.filter.date
- },
-
- periodName() {
- return this.$store.state.filter.period
- },
-
- chartData() {
- const vm = this
- const trns = this.$store.state.trns.items
- const periodName = this.periodName
-
- // diff periods from oldest trn and today
- const oldestTrnDate = this.$day(trns[this.$store.getters['trns/firstCreatedTrnId']].date).endOf(periodName)
- let periodsToShow = this.$day().endOf(periodName).diff(oldestTrnDate, periodName) + 1
- periodsToShow = periodsToShow > this.showedPeriods ? this.showedPeriods : periodsToShow
-
- const categories = []
- const categoryData = []
-
- let format = 'MMM'
- if (periodName === 'day') format = 'D.MM'
- if (periodName === 'week') format = 'D.MM'
- if (periodName === 'month') format = 'MMMM'
- if (periodName === 'year') format = 'YYYY'
-
- for (let index = 0; index < periodsToShow; index++) {
- // count total period
- const periodDate = this.$day().endOf(periodName).subtract(index, periodName).valueOf()
- const name = this.$day(periodDate).format(format)
- const trnsIds = this.$store.getters['trns/getTrns']({
- categoryId: this.categoryId,
- date: periodDate,
- periodName,
- })
- const periodTotal = this.$store.getters['trns/getTotalOfTrnsIds'](trnsIds)
-
- // return
- categoryData.unshift({
- date: periodDate,
- y: Math.abs(Number(`${periodTotal.incomes.toFixed() - periodTotal.expenses.toFixed()}`)),
- color: 'var(--c-font-1)',
- marker: {
- radius: 6,
- enabled: this.$day(periodDate).isSame(this.$store.state.filter.date, periodName),
- },
- })
- categories.unshift(name)
- }
-
- let periods = 0
- let periodsTotal = 0
- for (const iterator of categoryData) {
- if (iterator.y !== 0) {
- periods = periods + 1
- periodsTotal = periodsTotal + iterator.y
- }
- }
-
- this.average = Math.abs(Number(periodsTotal / periods).toFixed())
- this.total = categoryData[categoryData.length - 1].y
-
- const data = {
- series: [{
- visible: true,
- type: this.chartType,
- data: categoryData,
- }],
- categories,
- }
-
- return {
- ...chartOptions,
- legend: false,
- tooltip: {
- shared: true,
- animation: false,
- outside: true,
- positioner() {
- return { x: -1000, y: -1000 }
- },
- },
-
- series: data.series,
-
- xAxis: {
- ...chartOptions.xAxis,
- categories: data.categories,
- },
-
- yAxis: {
- ...chartOptions.yAxis,
- plotLines: [{
- color: 'var(--c-font-5)',
- value: this.average, // Insert your average here
- width: '2',
- height: 160,
- zIndex: 1,
- }],
- },
-
- chart: {
- ...chartOptions.chart,
- height: '120',
-
- events: {
- click(e) {
- const value = this.series[0].searchPoint(e, true) || this.series[1].searchPoint(e, true)
- vm.$store.dispatch('filter/setDate', parseInt(value.date))
- },
- },
- },
-
- plotOptions: {
- ...chartOptions.plotOptions,
- series: {
- ...chartOptions.plotOptions.series,
- dataLabels: {
- ...chartOptions.plotOptions.series.dataLabels,
- enabled: true,
- },
- cursor: 'pointer',
- point: {
- events: {
- click() {
- vm.$store.dispatch('filter/setDate', parseInt(this.date))
- },
- },
- },
- allowPointSelect: true,
- states: {
- select: {
- color: 'green',
- backgroundColor: 'var(--c-bg-14)',
- },
- },
- },
- },
- }
- },
- },
-
- methods: {
- formatAmount(amount) {
- const fixed = this.$store.state.currencies.base === 'RUB' ? 0 : 2
- return baseAmountFormat(amount, ' ', fixed)
- },
- },
-}
-</script>
-
-<template lang="pug">
-.chart(ref="chart")
- .columns
- .item
- .item__name {{ $t('stat.selectedPeriod') }}
- .item__price
- Amount(
- :currency="$store.state.currencies.base"
- :type="3"
- :value="total || 0"
- size="xl"
- vertical="center"
- )
-
- .item
- .item__name {{ $t('money.average.base') }}
- .item__price
- Amount(
- :currency="$store.state.currencies.base"
- :value="average || 0"
- size="xl"
- vertical="center"
- )
-
- Chart.swiper-no-swiping(:options="chartData")
-</template>
-
-<style lang="stylus" scoped>
-.chart
- z-index 3
- position relative
- padding 20px
-
-.item
- color var(--c-font-4)
- text-align center
-
- &__name
- padding-bottom $m5
-
-.columns
- display grid
- grid-template-columns repeat(2, 1fr)
- grid-column-gap $m7
- grid-row-gap $m7
- padding-bottom $m7
-</style>
diff --git a/components/analytics/AnalyticsChartTrns.vue b/components/analytics/AnalyticsChartTrns.vue
deleted file mode 100644
index 492fef0d..00000000
--- a/components/analytics/AnalyticsChartTrns.vue
+++ /dev/null
@@ -1,291 +0,0 @@
-<script>
-import currency from 'currency.js'
-import { Chart } from 'highcharts-vue'
-import chartOptions from '~/components/stat/chartOptions'
-
-const baseAmountFormat = (value, separator, precision) => currency(value, { symbol: null, precision, pattern: '#', separator }).format()
-
-export default {
- name: 'AnalyticsChartTrns',
-
- components: {
- Chart,
- },
-
- props: {
- periodName: {
- type: String,
- default: 'month',
- },
-
- isShowSummury: {
- type: Boolean,
- default: true,
- },
- },
-
- data() {
- return {
- biggest: 0,
- average: 0,
- date: this.$day().valueOf(),
- visiblePeriodMenu: false,
- dateStart: null,
- dateEnd: null,
- chartOptions: {
- ...chartOptions,
- legend: false,
- tooltip: false,
- },
- }
- },
-
- computed: {
- periods() {
- return this.$store.state.chart.periods
- },
-
- statCurrentPeriod() {
- return this.$store.getters['stat/statCurrentPeriod']
- },
-
- statAverage() {
- return this.$store.getters['stat/statAverage']
- },
-
- filterDate() {
- return this.$store.state.filter.date
- },
-
- filterCategory() {
- return this.$store.state.filter.categoryId
- },
- filterWallet() {
- return this.$store.state.filter.walletId
- },
- },
-
- watch: {
- showedPeriods() {
- this.init()
- },
-
- filterDate() {
- this.init()
- },
- filterCategory() {
- this.init()
- },
- filterWallet() {
- this.init()
- },
- periods() {
- this.init()
- },
- },
-
- mounted() {
- this.init()
- },
-
- methods: {
- init() {
- const data = this.generateData(this.periodName)
- const handlePerioSelect = (date) => {
- this.$store.dispatch('filter/setPeriod', this.periodName)
- this.$store.dispatch('filter/setDate', date)
- }
-
- this.chartOptions.series = data.series
- this.chartOptions.plotOptions.series = {
- cursor: 'pointer',
- point: {
- events: {
- click() {
- handlePerioSelect(this.date)
- },
- },
- },
- }
-
- this.chartOptions = {
- ...this.chartOptions,
- tooltip: false,
- xAxis: {
- categories: data.categories,
- },
-
- yAxis: {
- plotLines: [{
- color: 'var(--c-bg-8)',
- value: this.average, // Insert your average here
- width: '2',
- zIndex: 1,
- }],
- },
-
- chart: {
- backgroundColor: 'transparent',
- with: '100%',
- height: 160,
- spacing: [5, 0, 0, 0],
- type: 'column',
- panning: true,
- panKey: 'shift',
-
- events: {
- click(e) {
- // console.log(this.series[0].searchPoint(e, true))
- },
- },
- },
- }
- },
-
- formatAmount(amount) {
- const fixed = this.$store.state.currencies.base === 'RUB' ? 0 : 2
- return baseAmountFormat(amount, ' ', fixed)
- },
-
- generateData(periodName, oldSeries) {
- const categories = []
- const incomesData = []
-
- let format = 'MM'
- if (periodName === 'day') format = 'D.MM'
- if (periodName === 'week') format = 'D.MM'
- if (periodName === 'month') format = 'MMM'
- if (periodName === 'year') format = 'YYYY'
-
- for (let index = 0; index < this.$store.state.chart.periods[periodName].showedPeriods; index++) {
- // count total period
- const periodDate = this.$day().endOf(periodName).subtract(index, periodName).valueOf()
- const name = this.$day(periodDate).startOf(periodName).format(format)
- const trnsIds = this.$store.getters['trns/getTrns']({
- date: periodDate,
- periodName,
- })
- const periodTotal = this.$store.getters['trns/getTotalOfTrnsIds'](trnsIds)
-
- let amount = Math.floor(Number(`${periodTotal.incomes.toFixed() - periodTotal.expenses.toFixed()}`))
- if (!this.statAverage.total)
- amount = Math.abs(Number(`${periodTotal.incomes.toFixed() - periodTotal.expenses.toFixed()}`))
-
- // return
- incomesData.unshift({
- date: periodDate,
- y: amount,
- color: 'var(--c-font-1)',
- // marker: {
- // radius: 6,
- // color: this.$day(periodDate).isSame(this.$store.state.filter.date, periodName)
- // }
- })
- categories.unshift(name)
- }
-
- let biggest = 0
-
- let periods = 0
- let periodsTotal = 0
- for (const iterator of incomesData) {
- if (iterator.y !== 0) {
- periods = periods + 1
- periodsTotal = periodsTotal + iterator.y
- if (iterator.y > biggest)
- biggest = iterator.y
- }
- }
-
- this.biggest = biggest
-
- let amountAverage = Math.floor(Number(periodsTotal / periods).toFixed())
- if (this.statAverage.total !== 0)
- amountAverage = Math.abs(Number(periodsTotal / periods).toFixed())
-
- this.average = amountAverage
-
- let color = 'var(--c-blue-1)'
-
- if (this.statAverage.total === 0) {
- if (this.statAverage.incomes > 0)
- color = 'var(--c-incomes-1)'
-
- else if (this.statAverage.expenses > 0)
- color = 'var(--c-expenses-1)'
- }
-
- return {
- series: [{
- visible: true,
- type: 'spline',
- name: 'Data',
- color,
- data: incomesData,
- marker: {
- fillColor: 'var(--c-bg-4)',
- lineWidth: 2,
- lineColor: 'var(--c-blue-1)',
- symbol: 'circle',
- },
- }],
- categories,
- }
- },
- },
-}
-</script>
-
-<template lang="pug">
-.chart(ref="chart" :class="{ _height: isShowSummury }")
- .columns(v-if="isShowSummury")
- .item
- .item__name {{ $t('stat.selectedPeriod') }}
- .item__price
- Amount(
- v-if="chartOptions.series[0] && chartOptions.series[0].data.length"
- :currency="$store.state.currencies.base"
- :type="3"
- :value="chartOptions.series[0].data[chartOptions.series[0].data.length - 1].y"
- size="xl"
- vertical="center"
- )
-
- .item
- .item__name {{ $t('money.average.base') }}
- .item__price
- Amount(
- :currency="$store.state.currencies.base"
- :value="average || 0"
- size="xl"
- vertical="center"
- )
-
- Chart.swiper-no-swiping(:options="chartOptions")
-</template>
-
-<style lang="stylus" scoped>
-.chart
- z-index 3
- position relative
- height 166px
- padding $m5 0 0 0
-
- &._height
- height 236px
-
-.item
- color var(--c-font-4)
- font-size 12px
- text-align center
-
- &__name
- padding-bottom $m5
-
-.columns
- display grid
- grid-template-columns repeat(2, 1fr)
- grid-column-gap $m7
- grid-row-gap $m7
- padding-bottom $m7
-</style>
diff --git a/components/app/UpdateAppModal.vue b/components/app/UpdateAppModal.vue
index c12076af..722ed7e9 100644
--- a/components/app/UpdateAppModal.vue
+++ b/components/app/UpdateAppModal.vue
@@ -1,33 +1,20 @@
-<script>
+<script setup lang="ts">
import { random, updateEmo } from '~/assets/js/emo'
-
-export default {
- name: 'AppUpdateAppModal',
-
- setup() {
- const emo = computed(() => random(updateEmo))
- return {
- emo,
- }
- },
-}
+const emo = computed(() => random(updateEmo))
</script>
<template lang="pug">
TrnFormModal(@closed="$emit('onClose')")
- template(#default="{ close }")
- .py-5.text-center(
- class="lg:py-8"
+ .py-5.lg_py-8.text-center
+ .emo {{ emo }}
+ .header {{ $t('title') }}
+ .pb-10 {{ $t('text') }}
+
+ SharedButton(
+ className="_blue2 _text-center _maxWidth"
+ :title="$t('button')"
+ @onClick="$emit('onClose')"
)
- .emo {{ emo }}
- .header {{ $t('title') }}
- .pb-10 {{ $t('text') }}
-
- SharedButton(
- className="_blue2 _text-center _maxWidth"
- :title="$t('button')"
- @onClick="$emit('onClose')"
- )
</template>
<style lang="stylus" scoped>
@@ -57,7 +44,7 @@ TrnFormModal(@closed="$emit('onClose')")
"ru": {
"title": "Доступа новая версия",
- "text": "Перезагрузи приложение, чтобы использовать все новые фишки.",
+ "text": "Перезагрузите приложение, чтобы использовать все новые фишки.",
"button": "Оки, Ура!"
}
}
diff --git a/components/categories/EditModal.vue b/components/categories/EditModal.vue
index 026af5d5..644968b1 100644
--- a/components/categories/EditModal.vue
+++ b/components/categories/EditModal.vue
@@ -1,5 +1,5 @@
<script>
-import { saveData } from '~/services/firebaseHelpers'
+import { saveData } from '~/services/firebase/api'
import generateId from '~/utils/id'
import { allColors, popularColors } from '~/assets/js/colorsPopular'
import { random } from '~/assets/js/emo'
@@ -265,7 +265,7 @@ div
:style="{ background: category.color }"
@click.stop="handleIconClick"
): div(:class="category.icon")
- .text-sm.text-neutral-700(class="dark:text-neutral-300") {{ category.name || $t('categories.form.name.label') }}
+ .text-sm.text-neutral-700(class="dark_text-neutral-300") {{ category.name || $t('categories.form.name.label') }}
//-
//- Content
@@ -408,7 +408,7 @@ div
div(:class="icon")
//- Submit
- .col(style="padding-top: 16px; text-align: center")
+ .col.pt-2.pb-6
SharedButton(
:class="['_text-center _blue2 _ml-big', { _inline: $store.state.ui.pc }]"
:title="$t('categories.form.save')"
@@ -542,9 +542,6 @@ div
padding 0 $m8
padding-top $m6
-.button
- button-base-1()
-
.form
padding $m6
diff --git a/components/categories/Form.vue b/components/categories/Form.vue
index e61a5422..a9554c7f 100644
--- a/components/categories/Form.vue
+++ b/components/categories/Form.vue
@@ -1,5 +1,5 @@
<script>
-import { saveData } from '~/services/firebaseHelpers'
+import { saveData } from '~/services/firebase/api'
import generateId from '~/utils/id'
import colors from '~/assets/js/colors'
import icons from '~/assets/js/icons'
@@ -294,7 +294,7 @@ export default {
.header__title {{ $t('colors') }}
template(#default="{ close }")
- .p-3.bg-white(class="dark:bg-dark3")
+ .p-3.bg-white(class="dark_bg-dark3")
.inputText
.inputText__colors
.colors
@@ -322,7 +322,7 @@ export default {
.header__title {{ $t('categories.form.icons.label') }}
template(#default="{ close }")
- .p-3.bg-white(class="dark:bg-dark3")
+ .p-3.bg-white(class="dark_bg-dark3")
.icons
.icons__group(
v-for="iconGroup in icons"
diff --git a/components/categories/Modal.vue b/components/categories/Modal.vue
deleted file mode 100644
index ee8f5320..00000000
--- a/components/categories/Modal.vue
+++ /dev/null
@@ -1,262 +0,0 @@
-<script>
-import { removeData } from '~/services/firebaseHelpers'
-import useFilter from '~/modules/filter/useFilter'
-
-export default {
- setup() {
- const { $store } = useNuxtApp()
- const { setCategoryFilter } = useFilter()
-
- const closed = () => {
- $store.commit('categories/hideCategoryModal')
- $store.commit('categories/setCategoryModalId', null)
- }
-
- return {
- setCategoryFilter,
- closed,
- }
- },
-
- data() {
- return {
- showModalConfirm: false,
- }
- },
-
- computed: {
- categoryId() {
- return this.$store.state.categories.modal.id
- },
- category() {
- return this.$store.state.categories.items[this.categoryId]
- },
-
- deleteInfo() {
- if (this.trnsIds.length > 0)
- return `It's also will delete ${this.trnsIds.length} trns in this category`
-
- return null
- },
-
- childCategoriesIds() {
- return this.$store.getters['categories/getChildCategoriesIds'](this.categoryId)
- },
-
- trnsIds() {
- const trns = this.$store.state.trns.items
- const trnsIds = []
- for (const trnId in trns)
- if (trns[trnId].categoryId === this.categoryId) trnsIds.push(trnId)
-
- return trnsIds
- },
- },
-
- methods: {
- handleSetFilterCategory() {
- this.setCategoryFilter(this.categoryId)
- this.$store.commit('filter/setFilterDateNow')
-
- this.$store.commit('categories/hideCategoryModal')
- this.$store.commit('categories/setCategoryModalId', null)
-
- this.$store.dispatch('ui/setActiveTabStat', 'details')
- },
-
- handleEditClick() {
- const categoryId = this.categoryId
- this.$store.commit('categories/hideCategoryModal')
- this.$store.commit('categories/setCategoryModalId', null)
- this.$store.commit('categories/setCategoryEditId', categoryId)
- this.$store.dispatch('ui/setActiveTab', 'createCategory')
- },
-
- handleDeleteClick() {
- const categories = this.$store.state.categories.items
- const id = this.categoryId
- let isChildCategories = false
-
- for (const categoryId in categories) {
- if (categories[categoryId].parentId === id) {
- this.$notify({
- title: '👆',
- text: 'You can not delete category with child categories',
- })
- isChildCategories = true
- break
- }
- }
-
- if (!isChildCategories) this.showModalConfirm = true
- },
-
- handleDeleteConfirm() {
- const trnsIds = this.trnsIds
- const uid = this.$store.state.user.user.uid
- const id = this.categoryId
-
- this.showModalConfirm = false
- if (this.category.parentId !== 0) {
- this.$store.commit('categories/setCategoryModalId', this.category.parentId)
- }
- else {
- this.$store.commit('categories/hideCategoryModal')
- this.$store.commit('categories/setCategoryModalId', null)
- }
-
- setTimeout(async() => {
- await this.$store.dispatch('trns/deleteTrnsByIds', trnsIds)
- removeData(`users/${uid}/categories/${id}`)
- }, 200)
- },
- },
-}
-</script>
-
-<template lang="pug">
-Portal(
- v-if="$store.state.categories.modal.show"
- key="categoriesModal"
- to="modal"
-)
- LazyBaseBottomSheet(
- v-if="$store.state.categories.modal.id"
- :maxHeight="$store.state.ui.height"
- key="categoriesModal"
- @closed="closed()"
- )
- template(#handler="{ close }")
- BaseBottomSheetClose(@onClick="close")
-
- template(#header)
- .header
- .header__category
- .header__icon
- Icon(
- :icon="category.icon"
- :background="category.color || $store.state.ui.defaultBgColor"
- big
- round
- )
- .header__title {{ category.name }}
- .header__subCategory(v-if="category.parentId") {{ $store.state.categories.items[category.parentId].name }}
-
- template(#default="{ close }")
- .content
- .tools
- .modalLinks
- ModalButton(
- v-if="categoryId !== 'transfer'"
- :name="$t('base.delete')"
- icon="mdi mdi-delete-empty-outline"
- @onClick="handleDeleteClick"
- )
- ModalButton(
- :name="$t('base.edit')"
- icon="mdi mdi-pencil-outline"
- @onClick="handleEditClick"
- )
- ModalButton(
- :name="$t('base.filter')"
- icon="mdi mdi-filter-outline"
- @onClick="handleSetFilterCategory"
- )
-
- template(v-if="childCategoriesIds.length")
- .categoriesTitle {{ $t('categories.title') }}
- .categories
- CategoriesView(
- :ids="childCategoriesIds"
- borderTop
- noPadding
- @onClick="id => $store.dispatch('categories/showCategoryModal', id)"
- )
-
- .wrap
- .button(
- v-if="category.parentId"
- @click="$store.dispatch('categories/showCategoryModal', category.parentId)"
- ) {{ $t('backTo') }} {{ $store.state.categories.items[category.parentId].name }}
-
- .button(
- v-if="category.parentId === 0"
- @click="close()"
- ) {{ $t('close') }}
-
- ModalBottomConfirm(
- :description="deleteInfo"
- :show="showModalConfirm"
- @onClose="showModalConfirm = false"
- @onConfirm="handleDeleteConfirm"
- )
-</template>
-
-<style lang="stylus" scoped>
-.content
- padding 0
- padding-bottom $m6
- background var(--c-bg-3)
- +media(600px)
- border-radius 0 0 $m7 $m7
-
-.tools
- padding-top 0
-
-.categoriesTitle
- margin-bottom (- $m5)
- padding $m8
- padding-bottom 0
- color var(--c-font-3)
- font-size 10px
- letter-spacing 1px
- font-weight 600
- text-transform uppercase
-
-.categories
- padding $m6
- padding-bottom $m4
-
-.wrap
- padding 0 $m8
-
-.button
- button-base-1()
- margin $m8 auto $m5 auto
-
-.header
- flex-grow 1
- position relative
- display flex
- align-items center
- padding $m7
- padding-bottom $m8
- color var(--c-font-2)
- fontFamilyNunito()
- background var(--c-bg-3)
- border-radius $m7 $m7 0 0
-
- &__subCategory
- padding-top $m3
-
- &__title
- font-size 28px
- font-weight 700
- text-align center
- flex-grow 1
-
- &__category
- flex-grow 1
- display flex
- align-items center
- justify-content center
- flex-flow column
-
- &__icon
- flex-grow 1
- display flex
- align-items center
- justify-content center
- margin-top -36px
- padding-bottom 12px
-</style>
diff --git a/components/categories/item/CategoryItem.vue b/components/categories/item/CategoryItem.vue
index 9a5e98c7..8537c980 100644
--- a/components/categories/item/CategoryItem.vue
+++ b/components/categories/item/CategoryItem.vue
@@ -6,27 +6,31 @@ export default defineComponent({
activeItemId: { type: String, default: null },
category: { type: Object, required: true },
id: { type: String, required: true },
+ isHideParentCategory: { type: Boolean, default: false },
+ slider: { type: Object, required: true },
ui: { type: String, default: null },
},
- setup({ id, category }, { listeners }) {
+ setup(props, { listeners }) {
const { $store } = useNuxtApp()
+ const { setFilterCatsId } = useFilter()
- const { setCategoryFilter } = useFilter()
-
- const childCategoriesIds = computed(() => $store.getters['categories/getChildCategoriesIds'](id))
- const parentCategory = computed(() => $store.state.categories.items[category.parentId])
+ const childCategoriesIds = computed(() => $store.getters['categories/getChildCategoriesIds'](props.id))
+ const parentCategory = computed(() => $store.state.categories.items[props.category?.parentId])
function onClickItem() {
- if (listeners.onClick)
- listeners.onClick(id)
+ if (listeners.onClick) listeners.onClick(props.id)
}
function onClickIcon() {
- setCategoryFilter(id)
+ // Prevent filter when using in TrnForm
+ if (props.slider) {
+ onClickItem()
+ return
+ }
+
+ setFilterCatsId(props.id)
$store.commit('filter/setFilterDateNow')
- $store.commit('categories/hideCategoryModal')
- $store.commit('categories/setCategoryModalId', null)
$store.dispatch('ui/setActiveTabStat', 'details')
}
@@ -54,15 +58,15 @@ export default defineComponent({
.categoryItem__name.grow.truncate
.text-xs.text-neutral-500(
- v-if="parentCategory"
- class="dark:text-neutral-400"
+ v-if="parentCategory && !isHideParentCategory"
+ class="dark_text-neutral-400"
) {{ parentCategory.name }}
- .leading-none.text-sm.text-neutral-700(class="dark:text-neutral-300") {{ category.name }}
+ .leading-none.text-sm.text-neutral-700(class="dark_text-neutral-300") {{ category.name }}
.text-md.text-neutral-500(
v-if="childCategoriesIds.length > 0"
- class="dark:text-neutral-400"
+ class="dark_text-neutral-400"
) {{ childCategoriesIds.length }}
</template>
diff --git a/components/categories/list/CategoriesView.vue b/components/categories/list/CategoriesView.vue
index e37829c6..dbc53449 100644
--- a/components/categories/list/CategoriesView.vue
+++ b/components/categories/list/CategoriesView.vue
@@ -5,7 +5,9 @@ export default {
ids: { type: Array, required: true },
limit: { type: Number, default: null },
noPadding: { type: Boolean, default: false },
+ isHideParentCategory: { type: Boolean, default: false },
noPaddingBottom: { type: Boolean, default: false },
+ slider: { type: Object, required: true },
title: { type: String, default: null },
ui: { type: String, default: null },
},
@@ -32,6 +34,8 @@ export default {
:activeItemId="activeItemId"
:id="categoryId"
:key="categoryId"
+ :slider="slider"
+ :isHideParentCategory="isHideParentCategory"
:ui="ui"
v-on="$listeners"
)
diff --git a/components/categories/types.ts b/components/categories/types.ts
new file mode 100644
index 00000000..e71b3383
--- /dev/null
+++ b/components/categories/types.ts
@@ -0,0 +1,12 @@
+export type CategoryID = string
+
+export interface CategoryItem {
+ name: string
+ color: string
+ parentId?: CategoryID
+ childIds?: CategoryID[]
+}
+
+export interface CategoryStore {
+ items: Record<CategoryID, CategoryItem>
+}
diff --git a/components/chart/StatChartBalance.vue b/components/chart/StatChartBalance.vue
deleted file mode 100644
index d8df5e04..00000000
--- a/components/chart/StatChartBalance.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<script>
-import currency from 'currency.js'
-import { Chart } from 'highcharts-vue'
-import chartOptions from '~/components/stat/chartOptions'
-
-const baseAmountFormat = (value, separator, precision) => currency(value, { symbol: null, precision, pattern: '#', separator }).format()
-
-export default {
- name: 'StatChartBalance',
-
- components: {
- Chart,
- },
-
- data() {
- const vm = this
- return {
- date: this.$day().valueOf(),
- periodName: 'month',
- visiblePeriodMenu: false,
- dateStart: null,
- dateEnd: null,
- chartOptions: {
- ...chartOptions,
- chart: {
- events: {
- click(e) {
- const value = this.series[0].searchPoint(e, true) || this.series[1].searchPoint(e, true)
- vm.$store.dispatch('filter/setDate', parseInt(value.date))
- },
- },
- },
- },
- }
- },
-
- mounted() {
- const data = this.generateData(this.periodName)
- const handlePerioSelect = date => this.$store.dispatch('filter/setDate', parseInt(date))
- this.chartOptions.series = data.series
- this.chartOptions.plotOptions.series = {
- cursor: 'pointer',
- point: {
- events: {
- click() {
- handlePerioSelect(this.date)
- },
- },
- },
- }
-
- this.chartOptions = {
- ...this.chartOptions,
- xAxis: {
- categories: data.categories,
- },
-
- chart: {
- backgroundColor: 'transparent',
- with: 'auto',
- height: '300',
- spacing: [5, 0, 0, 0],
- type: 'column',
- panning: true,
- panKey: 'shift',
- },
- }
- },
-
- methods: {
- changePeriod(name) {
- if (this.periodName !== name) {
- this.periodName = name
- const data = this.generateData(this.periodName, this.chartOptions.series)
- this.chartOptions.series = data.series
- this.chartOptions.xAxis.categories = data.categories
- }
- },
-
- formatAmount(amount) {
- const fixed = this.$store.state.currencies.base === 'RUB' ? 0 : 2
- return baseAmountFormat(amount, ' ', fixed)
- },
-
- generateData(periodName) {
- const trns = this.$store.state.trns.items
- const allTrnsIds = Object.keys(trns)
-
- // diff periods from oldest trn and today
- const oldestTrnDate = this.$day(trns[this.$store.getters['trns/firstCreatedTrnId']].date).endOf(periodName)
- let periodsToShow = this.$day().endOf(periodName).diff(oldestTrnDate, periodName) + 1
- periodsToShow = periodsToShow > 12 ? 12 : periodsToShow
-
- // get balance for first period
- const dateStart = this.$day().endOf(periodName).subtract(periodsToShow, periodName).valueOf()
- const trnsIdsBeforeDate = allTrnsIds.filter(id => trns[id].date < dateStart)
- const totalStart = this.$store.getters['trns/getTotalOfTrnsIds'](trnsIdsBeforeDate, true)
-
- const categories = []
- const incomesData = []
- const expensesData = []
- const totalData = []
-
- for (let index = 0; index < periodsToShow; index++) {
- // count balance
- const balanceDateStart = this.$day().endOf(periodName).subtract(index, periodName).valueOf()
- const balanceTrnsIds = allTrnsIds.filter(id => trns[id].date > dateStart && trns[id].date < balanceDateStart)
- const balanceTotal = this.$store.getters['trns/getTotalOfTrnsIds'](balanceTrnsIds, true)
-
- // count total period
- const periodDate = this.$day().endOf(periodName).subtract(index, periodName).valueOf()
- const name = this.$day(periodDate).format('MMM YY')
- const trnsIds = this.$store.getters['trns/getTrns']({ date: periodDate, periodName })
- const periodTotal = this.$store.getters['trns/getTotalOfTrnsIds'](trnsIds)
-
- // return
- incomesData.unshift({
- date: periodDate,
- y: Number(`${periodTotal.incomes.toFixed()}`),
- })
- expensesData.unshift({
- date: periodDate,
- y: Number(`${periodTotal.expenses.toFixed()}`),
- })
- totalData.unshift({
- date: periodDate,
- y: Number(`${(totalStart.total + balanceTotal.total).toFixed()}`),
- })
- categories.unshift(name)
- }
-
- return {
- series: [{
- visible: false,
- type: 'spline',
- name: 'Incomes',
- color: 'var(--c-incomes-1)',
- data: incomesData,
- marker: {
- lineColor: 'var(--c-incomes-1)',
- },
- }, {
- visible: false,
- type: 'spline',
- name: 'Expenses',
- color: 'var(--c-expenses-1)',
- data: expensesData,
- marker: {
- lineColor: 'var(--c-expenses-1)',
- },
- }, {
- visible: true,
- type: 'areaspline',
- name: 'Balance',
- color: '#c1c1c1',
- data: totalData,
- marker: {
- lineColor: '#c1c1c1',
- },
- }],
- categories,
- }
- },
- },
-}
-</script>
-
-<template lang="pug">
-.chart(ref="chart")
- .chart__nav
- .chart__navItem(
- @click="changePeriod('month')"
- ) Months
- .chart__navItem(
- @click="changePeriod('year')"
- ) Years
- .chart__content
- Chart(:options="chartOptions")
-</template>
-
-<style lang="stylus" scoped>
-$background = var(--c-bg-4)
-$border = var(--c-bg-1)
-
-.chart
- z-index 3
- position relative
- width 100%
- // height 300px
- background var(--c-bg-2)
- anim()
-
- &__nav
- z-index 10
- position absolute
- top $m6
- right 50%
- display flex
- background var(--c-bg-2)
- border 1px solid $border
- transform translateX(50%)
-
- &__navItem
- padding $m6 $m8
-
- +media-hover()
- background var(--c-bg-1)
-
- &__content
- padding 30px 40px
-</style>
diff --git a/components/date/Selector.vue b/components/date/Selector.vue
new file mode 100644
index 00000000..f44711e6
--- /dev/null
+++ b/components/date/Selector.vue
@@ -0,0 +1,118 @@
+<script setup lang="ts">
+import useFilter from '~/modules/filter/useFilter'
+import usePeriods from '~/components/periods/usePeriods'
+
+const { $store } = useNuxtApp()
+const { periodsNames } = usePeriods()
+const { filterPeriodNameAllReplacedToYear } = useFilter()
+const filterPeriod = computed(() => $store.state.filter.period)
+
+const onSelectPeriod = (period) => {
+ $store.dispatch('filter/setPeriod', period)
+}
+
+const periodCounts = {
+ items: [1, 3, 6, 7, 12, 14, 16, 24, 30, 36, 48, 60],
+ onSelect: (value) => {
+ $store.commit('chart/setElementsToChart', {
+ period: filterPeriod.value,
+ value,
+ })
+ },
+}
+</script>
+
+<template lang="pug">
+Portal(to="modal")
+ LazyBaseBottomSheet(
+ @closed="$emit('close')"
+ )
+ template(#handler="{ close }")
+ BaseBottomSheetHandler
+ BaseBottomSheetClose(@onClick="close")
+
+ template(#default="{ close }")
+ .title {{ $t('dates.period') }}
+
+ .content
+ //- Periods
+ .modalLinks
+ ModalButton(
+ v-for="periodItem in periodsNames"
+ :key="periodItem.slug"
+ :icon="periodItem.icon"
+ :isActive="filterPeriod === periodItem.slug"
+ :name="$t(`dates.${periodItem.slug}.simple`)"
+ @onClick="onSelectPeriod(periodItem.slug)"
+ )
+
+ ModalButton(
+ :isActive="filterPeriod === 'all'"
+ :name="$t('dates.all.simple')"
+ icon="mdi mdi-database"
+ @onClick="onSelectPeriod('all')"
+ )
+
+ //- Counts
+ .title {{ $t('dates.count') }}
+ .counts.flex.items-center.justify-center
+ .countsItem(
+ v-for="periodCount in periodCounts.items"
+ :key="periodCount"
+ :class="{ _active: periodCount === $store.state.chart.periods[filterPeriodNameAllReplacedToYear].showedPeriods }"
+ @click="periodCounts.onSelect(periodCount)"
+ ) {{ periodCount }}
+
+ .flex.py-3.px-3
+ .button(
+ @click="close()"
+ ) {{ $t('close') }}
+</template>
+
+<style lang="stylus" scoped>
+.counts
+ flex-flow row wrap
+ gap $m7
+ padding $m6 $m9
+
+ &Item
+ cursor pointer
+ display flex
+ align-items center
+ justify-content center
+ width 48px
+ height 48px
+ padding $m8 $m7
+ font-secondary()
+ font-size 18px
+ text-align center
+ background #1c1c1c
+ border 1px solid transparent
+ border-radius 50%
+
+ +media-hover()
+ &:not(._active)
+ color var(--c-text-1)
+ background var(--c-item-bg-hover)
+ border-color var(--c-item-bd-hover)
+
+ &._active
+ background var(--c-item-bg-active)
+ border-color var(--c-item-bd-main)
+
+.content
+ background var(--c-bg-3)
+ +media(600px)
+ border-radius 0 0 $m7 $m7
+
+.title
+ padding $m9
+ padding-bottom $m6
+ color var(--c-font-2)
+ fontFamilyNunito()
+ font-size 28px
+ font-weight 700
+ text-align center
+ background var(--c-bg-3)
+ border-radius $m7 $m7 0 0
+</style>
diff --git a/components/icon/Icon2.vue b/components/icon/Icon2.vue
deleted file mode 100644
index 2ee94e9f..00000000
--- a/components/icon/Icon2.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<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/lang/LangDropdown.vue b/components/lang/LangDropdown.vue
index 7422d03b..9a9fe408 100644
--- a/components/lang/LangDropdown.vue
+++ b/components/lang/LangDropdown.vue
@@ -10,7 +10,7 @@ export default {
currentLanguageName() {
switch (this.$i18n.locale) {
case 'ru':
- return '🇷🇺 Russian - Русский'
+ return '🇷🇺 Русский - Russian'
default:
return '🇺🇸 English - Английский'
}
@@ -31,28 +31,23 @@ export default {
</script>
<template lang="pug">
-div
- SharedContextMenu(
- :position="{ left: true, top: true }"
- :visible="visibleDropdown"
- @onClickOpener="onClickOpener"
- )
-
- template(slot="opener")
- SharedDropdown(
- :active="visibleDropdown"
- :title="currentLanguageName"
- )
- template(slot="content")
- SharedContextMenuItem(
- title="🇷🇺 Russian - Русский (Не полный)"
- @onClick="changeLang('ru')")
-
- SharedContextMenuItem(
- title="🇺🇸 English - Английский"
- @onClick="changeLang('en')")
+SharedContextMenu(
+ :position="{ left: true, top: true }"
+ :visible="visibleDropdown"
+ @onClickOpener="onClickOpener"
+)
+
+ template(slot="opener")
+ SharedDropdown(
+ :active="visibleDropdown"
+ :title="currentLanguageName"
+ )
+ template(slot="content")
+ SharedContextMenuItem(
+ title="🇷🇺 Русский - Russian"
+ @onClick="changeLang('ru')")
+
+ SharedContextMenuItem(
+ title="🇺🇸 English - Английский"
+ @onClick="changeLang('en')")
</template>
-
-<style lang="stylus" scoped>
-
-</style>
diff --git a/components/layout/BaseWrap.vue b/components/layout/BaseWrap.vue
deleted file mode 100644
index 3e6e3aa3..00000000
--- a/components/layout/BaseWrap.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<script>
-export default {
- props: {
- contentPadding: {
- type: Boolean,
- default: true,
- },
- },
-}
-</script>
-
-<template lang="pug">
-.component(:class="{ _padding: contentPadding }")
- //------------------------------------------------
- //- header
- //------------------------------------------------
- .component__header(v-if="$slots.header || $slots.headerLeft || $slots.headerRight")
- .component__header-wrap(:class="{ _spaceBetween: $slots.headerLeft || $slots.headerRight }")
- slot(name="header")
-
- .component__header-left(v-if="$slots.headerLeft")
- slot(name="headerLeft")
-
- .component__header-right(v-if="$slots.headerRight")
- slot(name="headerRight")
-
- .component__header(v-else)
-
- //------------------------------------------------
- //- content
- //------------------------------------------------
- .component__content(:class="{ _scroll: $slots.bottom }")
- .component__content-main(v-if="$slots.content")
- slot(name="content")
-
- .component__content-left(v-if="$slots.contentLeft")
- slot(name="contentLeft")
-
- .component__content-right(v-if="$slots.contentRight")
- slot(name="contentRight")
-
- .component__content-bottom(v-if="$slots.bottom")
- .component__content-bottom-in
- slot(name="bottom")
-</template>
-
-<style lang="stylus" scoped>
-.component
- display grid
- grid-template-columns 1fr
- grid-template-rows minmax(auto, auto) 1fr minmax(auto, auto)
- height 100%
-
- &__header
- +media-laptop()
- background 0
- border-bottom 0
-
- +media(600px)
- padding-top $m8
-
- &-wrap
- max-width 1100px
- padding 12px 16px
-
- &._spaceBetween
- display flex
- align-items center
- justify-content space-between
-
- +media-laptop()
- padding 32px 60px
- padding-bottom 0
-
- &-left
- font-h1()
- font-size 22px
- font-weight 600
-
- +media-laptop()
- font-size 28px
-
- &__content
- overflow hidden
- overflow-y auto
- max-width 1100px
- scrollbar()
-
- ~/._padding &
- padding 16px
-
- +media-laptop()
- padding 32px 60px
-
- &._scroll
- display grid
- grid-template-rows minmax(min-content, auto) minmax(50px, min-content)
-
- &-main
- overflow hidden
- overflow-y auto
- display flex
- flex-flow column
- justify-content center
- height 100%
- scrollbar()
-
- +media(1100px)
- justify-content start
-
- &-left
- margin-bottom 16px
-
- &-right
- margin-bottom 16px
-
- &-bottom
- +media(600px)
- padding-bottom $m7
-
- &-in
- padding 16px
-
- ~/._padding &
- padding 0px
-</style>
diff --git a/components/layout/BottomMenu.vue b/components/layout/BottomMenu.vue
index ea87b8b1..baf7b44e 100644
--- a/components/layout/BottomMenu.vue
+++ b/components/layout/BottomMenu.vue
@@ -14,7 +14,7 @@ export default {
stat: {
icon: 'mdi mdi-poll',
id: 'stat',
- name: i18n.t('stat.shortTitle'),
+ name: i18n.t('stat.title'),
},
wallets: {
icon: 'mdi mdi-credit-card-multiple',
@@ -39,13 +39,13 @@ export default {
return
}
- router.push(tabName)
+ router.push(`/${tabName}`)
}
- function getClassName(tabName) {
- if (route.name === tabName)
+ function getClassName(id) {
+ if (route.name.includes(id))
return true
- else if (tabName === 'stat' && route.name === 'index')
+ else if (id === 'stat' && route.name === 'index')
return true
}
diff --git a/components/layout/MenuModal.vue b/components/layout/BottomMenuModal.vue
similarity index 78%
rename from components/layout/MenuModal.vue
rename to components/layout/BottomMenuModal.vue
index eeed42eb..21de4936 100644
--- a/components/layout/MenuModal.vue
+++ b/components/layout/BottomMenuModal.vue
@@ -21,24 +21,24 @@ Portal(to="modal")
.handler
BaseBottomSheetClose(@onClick="close")
- .content(class="content !overflow-hidden !pt-8 !pb-2")
+ .content(class="!overflow-hidden !pt-8 !pb-2")
.mb-4.pb-4.border-b(
- class="border-neutral-300 dark:border-neutral-800"
+ class="border-neutral-300 dark_border-neutral-800"
)
.mx-6.mb-2(
- class="dark:text-neutral-300"
+ class="dark_text-neutral-300"
)
.text-xl.font-nunito.font-semibold {{ $store.state.user.user.displayName }}
- .text-sm.text-gray-900(class="dark:text-neutral-500") {{ $store.state.user.user.email }}
+ .text-sm.text-gray-900(class="dark_text-neutral-500") {{ $store.state.user.user.email }}
.py-3.px-6.space-x-5.flex.items-center(
- class="hocus:bg-white2 dark:hocus:bg-custom1"
+ class="hocus_bg-white2 dark_hocus_bg-custom1"
@click="$store.dispatch('user/signOut')"
)
.text-xl.mdi.mdi-logout
.text-sm {{ $t('userLogout') }}
- LayoutMenuModalItems
+ LayoutBottomMenuModalItems
</template>
<style lang="stylus" scoped>
@@ -63,6 +63,7 @@ Portal(to="modal")
.content
padding 0
+ background var(--c-bg-3)
border-radius $m7 $m7 0 0
+media(600px)
border-radius $m7
diff --git a/components/layout/MenuModalItems.vue b/components/layout/BottomMenuModalItems.vue
similarity index 64%
rename from components/layout/MenuModalItems.vue
rename to components/layout/BottomMenuModalItems.vue
index 6675d835..ec63ad0f 100644
--- a/components/layout/MenuModalItems.vue
+++ b/components/layout/BottomMenuModalItems.vue
@@ -21,14 +21,18 @@ div
v-for="(item, menuId) in items"
v-if="checkIsShow(item)"
:key="menuId"
- :class="['hocus:bg-zinc-100 dark:hocus:bg-neutral-800', { 'text-slate-900 dark:text-neutral-100': checkIsActive(menuId) }, { 'text-slate-600 dark:text-neutral-400': !checkIsActive(menuId) }]"
+ :class="['hocus_bg-zinc-100 dark_hocus_bg-neutral-800', { 'text-slate-900 dark_text-neutral-100': checkIsActive(menuId) }, { 'text-slate-600 dark_text-neutral-400': !checkIsActive(menuId) }]"
@click="onClick(menuId)"
)
.text-xl(:class="item.icon")
.text-sm {{ item.name }}
+ .text-2xs.text-slate-600.dark_text-neutral-400(
+ v-if="item.isBeta"
+ class="-ml-2 -mt-2"
+ ) Beta
.flex.items-center.py-3.px-6.space-x-5(
- class="text-slate-600 dark:text-neutral-400 hocus:bg-zinc-100 dark:hocus:bg-neutral-800"
+ class="text-slate-600 dark_text-neutral-400 hocus_bg-zinc-100 dark_hocus_bg-neutral-800"
@click="$store.dispatch('ui/changeTheme')"
)
.text-xl.mdi.mdi-palette
diff --git a/components/layout/Modals.vue b/components/layout/Modals.vue
index 0575cac3..a799367c 100644
--- a/components/layout/Modals.vue
+++ b/components/layout/Modals.vue
@@ -28,25 +28,14 @@ export default defineComponent({
TrnsModal
//- menu
- LazyLayoutMenuModal(v-if="activeTab === 'menu'")
+ LazyLayoutBottomMenuModal(v-if="activeTab === 'menu'")
//- currencies
CurrenciesModal
- //- category: item
- CategoriesModal
-
//- category: create or edit
LazyCategoriesEditModal(v-if="activeTab === 'createCategory'")
- //- settings
- Portal(v-if="activeTab === 'settings'" to="modal")
- ModalBottom(@onClose="$store.dispatch('ui/setActiveTab', null)")
- Settings(v-if="activeTab === 'settings'")
-
- //- wallet item
- WalletsModal
-
//- wallet: create or edit
Portal(v-if="activeTab === 'createWallet'" to="modal")
ModalBottom(
diff --git a/components/layout/Sidebar.vue b/components/layout/Sidebar.vue
index be762fe4..c2a2b4af 100644
--- a/components/layout/Sidebar.vue
+++ b/components/layout/Sidebar.vue
@@ -1,41 +1,28 @@
-<script lang="ts">
-export default defineComponent({
- methods: {
- handleShowWalletsModalWalletModal(id) {
- this.$store.commit('wallets/showWalletsModalWalletModal')
- this.$store.commit('wallets/setWalletsModalWalletModalId', id)
- },
- },
-})
-</script>
-
<template lang="pug" scoped>
-.sidebar.bg-white2(
- class="dark:bg-custom5"
-)
+.sidebar.relative.bg-gray-50.dark_bg-custom5
.sidebar__content
.p-4.px-5.flex.items-center.justify-between
- .font-nunito.text-xl.font-bold.text-neutral-500(
- class="dark:text-neutral-200"
- ) {{ $t('appName') }}
+ .text-xl.font-bold.text-neutral-500.dark_text-neutral-200.font-nunito
+ | {{ $t('appName') }}
- .text-xl.mdi.mdi-palette(
- @click="$store.dispatch('ui/changeTheme')"
- )
+ .text-xl.mdi.mdi-palette(@click="$store.dispatch('ui/changeTheme')")
.pt-2.pb-8
LayoutSidebarMenu
- WalletsTotal
- WalletsList(
- :showToogle="true"
- :limit="6"
- @onClick="(id) => handleShowWalletsModalWalletModal(id)"
- )
+ .pb-12
+ WalletsTotal
+ WalletsList(
+ :limit="6"
+ showToogle
+ uiSimple
+ @onClick="id => $router.push(`/wallets/${id}`)"
+ )
- .sidebar__trn.py-2(@click="$store.dispatch('trnForm/openTrnForm', { action: 'create' })")
- .btn
- .mdi.mdi-plus
+ .absolute.left-0.bottom-0.w-full
+ //- .sidebar__trn.py-4(@click="$store.dispatch('trnForm/openTrnForm', { action: 'create', isPc: true })")
+ .sidebar__trn.py-4(@click="$store.dispatch('trnForm/openTrnForm', { action: 'create' })")
+ .btn: .mdi.mdi-plus
</template>
<style lang="stylus" scoped>
@@ -61,8 +48,6 @@ export default defineComponent({
anim()
+media-hover()
- background var(--c-bg-5)
-
.btn
transform scale(1.3)
diff --git a/components/layout/SidebarMenu.vue b/components/layout/SidebarMenu.vue
index a725aa0e..b391b7e6 100644
--- a/components/layout/SidebarMenu.vue
+++ b/components/layout/SidebarMenu.vue
@@ -17,13 +17,17 @@ export default defineComponent({
<template lang="pug">
div
- .flex.items-center.py-2.px-6.space-x-5(
+ .flex.items-center.py-2.px-6.space-x-5.cursor-pointer(
v-for="(item, menuId) in items"
v-if="checkIsShow(item)"
:key="menuId"
- :class="['hocus:bg-zinc-100 dark:hocus:bg-neutral-800', { 'text-slate-900 dark:text-neutral-100': checkIsActive(menuId) }, { 'text-slate-600 dark:text-neutral-400': !checkIsActive(menuId) }]"
+ :class="['hocus_bg-gray-200 dark_hocus_bg-neutral-800', { 'text-slate-900 dark_text-neutral-100': checkIsActive(menuId) }, { 'text-slate-600 dark_text-neutral-400': !checkIsActive(menuId) }]"
@click="onClick(menuId)"
)
.text-xl(:class="item.icon")
.text-sm {{ item.name }}
+ .text-2xs.text-slate-600.dark_text-neutral-400(
+ v-if="item.isBeta"
+ class="-ml-2 -mt-2"
+ ) Beta
</template>
diff --git a/components/layout/useBaseLayout.ts b/components/layout/useBaseLayout.ts
deleted file mode 100644
index 07d219d8..00000000
--- a/components/layout/useBaseLayout.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-const isShowPeriodsNamesModal = ref(false)
-
-export default function useBaseLayout() {
- function showPeriodsNamesModal() {
- isShowPeriodsNamesModal.value = true
- }
- function hidePeriodsNamesModal() {
- isShowPeriodsNamesModal.value = false
- }
-
- return {
- isShowPeriodsNamesModal,
- showPeriodsNamesModal,
- hidePeriodsNamesModal,
- }
-}
diff --git a/components/modal/ModalBottom.vue b/components/modal/ModalBottom.vue
index 2653c799..f94fda0c 100644
--- a/components/modal/ModalBottom.vue
+++ b/components/modal/ModalBottom.vue
@@ -190,7 +190,7 @@ $transition-style = cubic-bezier(.17, .04, .03, 1)
display flex
flex-grow 1
flex-flow column nowrap
- max-width 440px
+ max-width 480px
margin-right auto
background var(--c-bg-3)
border-radius $m7 $m7 0 0
diff --git a/components/modal/ModalButton.vue b/components/modal/ModalButton.vue
index 5623e00d..0053ab39 100644
--- a/components/modal/ModalButton.vue
+++ b/components/modal/ModalButton.vue
@@ -14,13 +14,14 @@ export default {
@click="$emit('onClick')"
)
- .modalButton__icon(v-if="$slots.icon")
+ .modalButton__icon.pb-2(v-if="$slots.icon")
slot(name="icon")
template(v-if="!$slots.icon && icon")
- .modalButton__icon: div(:class="icon")
+ .modalButton__icon.pb-2
+ .text-3xl(:class="icon")
- .modalButton__name {{ name }}
+ .modalButton__name.text-xs {{ name }}
</template>
<style lang="stylus" scoped>
@@ -49,20 +50,12 @@ export default {
border 1px solid var(--c-item-bd-hover)
&__icon
- opacity .8
display flex
align-items center
justify-content center
- padding-bottom $m6
- color var(--c-font-2)
- font-size 32px
-
- ~/._active &
- color var(--c-blue-1)
&__name
color var(--c-font-3)
- font-size 12px
line-height 16px
~/._active &
diff --git a/components/periods/usePeriods.ts b/components/periods/usePeriods.ts
index dd8f83bc..5329753e 100644
--- a/components/periods/usePeriods.ts
+++ b/components/periods/usePeriods.ts
@@ -1,25 +1,23 @@
export default function usePeriods() {
const { nuxt2Context: { i18n } } = useNuxtApp()
- const periodsNames = computed(() => [
- {
- slug: 'day',
- icon: 'mdi mdi-weather-sunset-up',
- name: i18n.t('dates.day.simple'),
- }, {
- slug: 'week',
- icon: 'mdi mdi-calendar-week',
- name: i18n.t('dates.week.simple'),
- }, {
- slug: 'month',
- icon: 'mdi mdi-calendar',
- name: i18n.t('dates.month.simple'),
- }, {
- slug: 'year',
- icon: 'mdi mdi-calendar-star',
- name: i18n.t('dates.year.simple'),
- },
- ])
+ const periodsNames = computed(() => [{
+ slug: 'day',
+ icon: 'mdi mdi-weather-sunset-up',
+ name: i18n.t('dates.day.simple'),
+ }, {
+ slug: 'week',
+ icon: 'mdi mdi-calendar-week',
+ name: i18n.t('dates.week.simple'),
+ }, {
+ slug: 'month',
+ icon: 'mdi mdi-calendar',
+ name: i18n.t('dates.month.simple'),
+ }, {
+ slug: 'year',
+ icon: 'mdi mdi-calendar-star',
+ name: i18n.t('dates.year.simple'),
+ }])
return {
periodsNames,
diff --git a/components/shared/appName/AppName.vue b/components/shared/appName/AppName.vue
index 5c00b6ec..a5895791 100644
--- a/components/shared/appName/AppName.vue
+++ b/components/shared/appName/AppName.vue
@@ -1,6 +1,6 @@
<template lang="pug">
.appName.text-gray-600.font-nunito(
- class="dark:text-neutral-200"
+ class="dark_text-neutral-200"
) {{ $t('appName') }}
</template>
diff --git a/components/shared/contextMenu/ContextMenuItem.vue b/components/shared/contextMenu/ContextMenuItem.vue
index 7b7d3e36..6bbbdf5e 100644
--- a/components/shared/contextMenu/ContextMenuItem.vue
+++ b/components/shared/contextMenu/ContextMenuItem.vue
@@ -20,7 +20,7 @@ export default {
</script>
<template lang="pug">
-.item(
+.item.grow(
:class="{ _selected: selected, _grow: grow }"
@click="handleClick"
)
diff --git a/components/shared/copyright/Copyright.vue b/components/shared/copyright/Copyright.vue
index 540531bf..ed85e68a 100644
--- a/components/shared/copyright/Copyright.vue
+++ b/components/shared/copyright/Copyright.vue
@@ -7,7 +7,7 @@ export default {
<template lang="pug">
a.copyright.py-1.px-5.rounded-md(
href="https://ilko.me"
- class="hocus:bg-white2 dark:hocus:bg-custom1"
+ class="hocus_bg-white2 dark_hocus_bg-custom1"
)
| {{ $t('app.madeBy.text') }}
.copyright__heart.mdi.mdi-heart
diff --git a/components/stat/Chart.vue b/components/stat/Chart.vue
index 32602b01..f48ccf3d 100644
--- a/components/stat/Chart.vue
+++ b/components/stat/Chart.vue
@@ -1,50 +1,30 @@
-<script>
+<script setup lang="ts">
import useFilter from '~/modules/filter/useFilter'
import useStatChart from '~/components/stat/useStatChart'
-export default {
- setup() {
- const { $store } = useNuxtApp()
- const { filterPeriodNameAllReplacedToYear } = useFilter()
- const { chartState } = useStatChart()
+const { $store } = useNuxtApp()
+const { filterPeriodNameAllReplacedToYear } = useFilter()
+const { chartState } = useStatChart()
- const activeTabStat = computed(() => $store.state.ui.activeTabStat)
- const periods = computed(() => $store.state.chart.periods)
- const filter = computed(() => $store.state.filter)
- const filterPeriod = computed(() => $store.state.filter.period)
+const periods = computed(() => $store.state.chart.periods)
+const filter = computed(() => $store.state.filter)
- const chartType = computed(() => {
- let type = null
- periods.value[filterPeriodNameAllReplacedToYear.value].grouped
- ? type = 'column'
- : type = 'spline'
+const chartType = computed(() => {
+ let type = null
+ periods.value[filterPeriodNameAllReplacedToYear.value].grouped
+ ? type = 'column'
+ : type = 'spline'
- return type
- })
-
- return {
- chartState,
- activeTabStat,
- periods,
- filter,
- filterPeriod,
- chartType,
- }
- },
-}
+ return type
+})
</script>
<template lang="pug">
-.chart.px-3(v-if="chartState.show.expenses || chartState.show.incomes")
- LazyChartStatChartLines(
+.h-48.px-3(v-if="chartState.show.expenses || chartState.show.incomes")
+ LazyStatChartLines(
:categoryId="filter.categoryId"
:chartType="chartType"
:isShowExpenses="chartState.show.expenses"
:isShowIncomes="chartState.show.incomes"
)
</template>
-
-<style lang="stylus" scoped>
-.chart
- height 190px
-</style>
diff --git a/components/chart/StatChartLines.vue b/components/stat/ChartLines.vue
similarity index 88%
rename from components/chart/StatChartLines.vue
rename to components/stat/ChartLines.vue
index 2f7c2261..f94758c5 100644
--- a/components/chart/StatChartLines.vue
+++ b/components/stat/ChartLines.vue
@@ -3,6 +3,7 @@ import { Chart } from 'highcharts-vue'
import chartOptions from '~/components/stat/chartOptions'
import useChart from '~/components/chart/useChart'
import useFilter from '~/modules/filter/useFilter'
+import { getTrnsIds } from '~/components/trns/functions/getTrns'
export default defineComponent({
components: { Chart },
@@ -10,7 +11,6 @@ export default defineComponent({
props: {
amountType: { type: String, default: null },
categoryId: { type: String, default: null },
- disableCategoryFilter: { type: Boolean, default: false },
isShowExpenses: { type: Boolean, default: true },
isShowIncomes: { type: Boolean, default: true },
},
@@ -85,10 +85,12 @@ export default defineComponent({
chartData() {
const periodName = this.filterPeriodNameAllReplacedToYear
const chartPeriods = this.$store.state.chart.periods
- const trns = this.$store.state.trns.items
+ const trnsItems = this.$store.state.trns.items
+ const catsItems = this.$store.state.categories.items
+ const storeFilter = this.$store.state.filter
// diff periods from oldest trn and today
- const oldestTrnDate = this.$day(trns[this.$store.getters['trns/firstCreatedTrnId']].date).endOf(periodName)
+ const oldestTrnDate = this.$day(trnsItems[this.$store.getters['trns/firstCreatedTrnId']].date).endOf(periodName)
let periodsToShow = this.$day().endOf(periodName).diff(oldestTrnDate, periodName) + 1
const periodsWantToShow = chartPeriods[periodName].showedPeriods
periodsToShow = periodsWantToShow >= periodsToShow ? periodsToShow : periodsWantToShow
@@ -98,15 +100,35 @@ export default defineComponent({
const expensesData = []
const totalData = []
+ // TODO: shared functions
+ function getCatsIds(catsIds) {
+ const ids = []
+
+ for (const catId of catsIds) {
+ const category = catsItems[catId]
+ category?.childIds
+ ? ids.push(...category.childIds)
+ : ids.push(catId)
+ }
+
+ return ids
+ }
+
for (let index = 0; index < periodsToShow; index++) {
// count total period
const periodDate = this.$day().startOf(periodName).subtract(index, periodName).valueOf()
- const trnsIds = this.$store.getters['trns/getTrns']({
- date: periodDate,
+
+ const categoriesIds = storeFilter.catsIds.length > 0 ? getCatsIds(storeFilter.catsIds) : null
+ const walletsIds = storeFilter.walletsIds.length > 0 ? storeFilter.walletsIds : null
+
+ const trnsIds = getTrnsIds({
+ trnsItems,
+ walletsIds,
+ categoriesIds,
periodName,
- categoryId: null,
- disableCategoryFilter: this.disableCategoryFilter,
+ date: periodDate,
})
+
const periodTotal = this.$store.getters['trns/getTotalOfTrnsIds'](trnsIds)
let format = 'MM'
diff --git a/components/stat/Date.vue b/components/stat/Date.vue
index 42384cb1..7191c0f2 100644
--- a/components/stat/Date.vue
+++ b/components/stat/Date.vue
@@ -1,169 +1,26 @@
-<script>
-import useFilter from '~/modules/filter/useFilter'
-import usePeriods from '~/components/periods/usePeriods'
-
-export default {
- setup() {
- const { $store } = useNuxtApp()
- const { periodsNames } = usePeriods()
- const { filterPeriodNameAllReplacedToYear } = useFilter()
- const filterPeriod = computed(() => $store.state.filter.period)
-
- const visiblePeriodMenu = ref(false)
-
- const onSelectPeriod = (period) => {
- $store.dispatch('filter/setPeriod', period)
- }
-
- const periodCounts = {
- items: [1, 3, 6, 7, 12, 14, 16, 24, 30, 36, 48, 60],
- onSelect: (value) => {
- $store.commit('chart/setElementsToChart', {
- period: filterPeriod.value,
- value,
- })
- },
- }
-
- return {
- periodsNames,
- filterPeriodNameAllReplacedToYear,
- filterPeriod,
- visiblePeriodMenu,
- onSelectPeriod,
- periodCounts,
- }
- },
-}
+<script setup lang="ts">
+const isShowDateSelector = ref(false)
</script>
<template lang="pug">
-.z-10.bg-white(class="dark:bg-dark3")
+.z-10.hocus_bg-gray-100.dark_hocus_bg-neutral-800
//- Date
- .menuDots.flex.items-center.p-4.cursor-pointer(
- @click="visiblePeriodMenu = true"
+ .menuDots.cursor-pointer.flex.items-center.text-lg(
+ @click="isShowDateSelector = true"
)
- SharedDate
- .menuDots__dots: .mdi.mdi-dots-vertical
+ .py-6.px-3.font-nunito.text-neutral-800.dark_text-white.text-2xl.leading-none.font-semibold
+ SharedDate
- //- Modal
- Portal(to="modal")
- LazyBaseBottomSheet(
- v-if="visiblePeriodMenu"
- @closed="visiblePeriodMenu = false"
- )
- template(#handler="{ close }")
- .handler
- BaseBottomSheetClose(@onClick="close")
-
- template(#default="{ close }")
- .title {{ $t('dates.period') }}
-
- .content
- //- Periods
- .modalLinks
- ModalButton(
- v-for="periodItem in periodsNames"
- :key="periodItem.slug"
- :icon="periodItem.icon"
- :isActive="filterPeriod === periodItem.slug"
- :name="$t(`dates.${periodItem.slug}.simple`)"
- @onClick="onSelectPeriod(periodItem.slug)"
- )
-
- ModalButton(
- :isActive="filterPeriod === 'all'"
- :name="$t('dates.all.simple')"
- icon="mdi mdi-database"
- @onClick="onSelectPeriod('all')"
- )
-
- //- Counts
- .title {{ $t('dates.count') }}
- .counts.flex.items-center.justify-center
- .countsItem(
- v-for="periodCount in periodCounts.items"
- :key="periodCount"
- :class="{ _active: periodCount === $store.state.chart.periods[filterPeriodNameAllReplacedToYear].showedPeriods }"
- @click="periodCounts.onSelect(periodCount)"
- ) {{ periodCount }}
+ .menuDots__dots: .mdi.mdi-dots-vertical
- .flex.py-3.px-3
- .button(
- @click="close()"
- ) {{ $t('close') }}
+ LazyDateSelector(
+ v-if="isShowDateSelector"
+ @close="isShowDateSelector = false"
+ )
</template>
<style lang="stylus" scoped>
-.counts
- flex-flow row wrap
- gap $m7
- padding $m6 $m9
-
- &Item
- cursor pointer
- display flex
- align-items center
- justify-content center
- width 48px
- height 48px
- padding $m8 $m7
- font-secondary()
- font-size 18px
- text-align center
- background #1c1c1c
- border 1px solid transparent
- border-radius 50%
-
- +media-hover()
- &:not(._active)
- color var(--c-text-1)
- background var(--c-item-bg-hover)
- border-color var(--c-item-bd-hover)
-
- &._active
- background var(--c-item-bg-active)
- border-color var(--c-item-bd-main)
-
-.handler
- z-index 2
- position absolute
- top 0
- left 0
- display flex
- align-items center
- justify-content center
- width 100%
- height 16px
-
- &:after
- content ''
- display block
- width 32px
- height 4px
- background var(--c-bg-8)
- border-radius 4px
-
-.content
- +media(600px)
- border-radius 0 0 $m7 $m7
-
.menuDots
- color var(--c-font-3)
- font-size 22px
- font-weight 500
- border-radius $m8
- anim()
-
- +media(600px)
- font-size 26px
- font-weight 600
- fontFamilyNunito()
- background none
-
- +media-hover()
- color var(--c-blue-1)
-
&__dots
margin-top -2px
margin-right -5px
@@ -175,18 +32,4 @@ export default {
+media(600px)
padding-left 6px
font-size 22px
-
-.button
- button-base-1()
-
-.title
- padding $m9
- padding-bottom $m6
- color var(--c-font-2)
- fontFamilyNunito()
- font-size 28px
- font-weight 700
- text-align center
- background var(--c-bg-3)
- border-radius $m7 $m7 0 0
</style>
diff --git a/components/stat/Filter.vue b/components/stat/Filter.vue
new file mode 100644
index 00000000..23405822
--- /dev/null
+++ b/components/stat/Filter.vue
@@ -0,0 +1,94 @@
+<script setup lang="ts">
+import useFilter from '~/modules/filter/useFilter'
+
+const { $store } = useNuxtApp()
+const { setFilterCatsId } = useFilter()
+
+const filterWalletsItems = computed(() => {
+ let wallets = {}
+
+ for (const walletId of $store.state.filter.walletsIds) {
+ const wallet = $store.state.wallets.items[walletId]
+ if (!wallet) break
+ wallets = { ...wallets, [walletId]: wallet }
+ }
+
+ return wallets
+})
+
+const filterCatsItems = computed(() => {
+ let cats = {}
+
+ for (const catId of $store.state.filter.catsIds) {
+ const cat = $store.state.categories.items[catId]
+ if (!cat) break
+ cats = { ...cats, [catId]: cat }
+ }
+
+ return cats
+})
+
+const onClickCategory = (catId) => {
+ $store.commit('filter/removeFilterCatId', catId)
+}
+
+const onClearFilter = () => {
+ $store.commit('filter/clearFilterCatsIds')
+ $store.commit('filter/clearFilterWalletsIds')
+}
+
+function clearWalletFilter(walletId) {
+ $store.commit('filter/removeFilterWalletId', walletId)
+}
+</script>
+
+<template lang="pug">
+.overflow-hidden.rounded(v-if="filterCatsItems || filterWalletsItems")
+ .statTitle(class="!pb-3") {{ $t('base.filter') }}
+ .safe.scrollbar.overflow-hidden.overflow-x-auto.flex.items-center
+ //- Wallet
+ template(v-if="filterWalletsItems")
+ .cursor-pointer.relative.flex.flex-col.items-center.mr-3.py-2.px-3.bg-dark4.rounded-md.shadow.hocus_shadow-lg.hocus_bg-neutral-800(
+ v-for="(walletItem, walletId) in filterWalletsItems"
+ :key="walletId"
+ @click="clearWalletFilter(walletId)"
+ )
+ .absolute.top-0.left-0.w-full(:style="{ height: '2px', background: walletItem.color }")
+ .pr-2
+ .-mb-1.text-xs {{ walletItem.name }}
+ .text-sm
+ Amount(
+ :alwaysShowSymbol="false"
+ :currency="walletItem.currency"
+ :showBase="false"
+ :value="$store.getters['wallets/walletsTotal'][walletId].base"
+ vertical="left"
+ )
+ .absolute.top-1.right-1
+ .text-sm.mdi.mdi-close
+
+ //- Category
+ template(v-if="filterCatsItems")
+ .cursor-pointer.relative.mr-3.p-1.px-2.flex.items-center.gap-3.bg-gray-50.dark_bg-dark4.rounded-md.shadow.hocus_shadow-lg.hocus_bg-neutral-800(
+ v-for="(catItem, catId) in filterCatsItems"
+ :key="catId"
+ @click="onClickCategory(catId)"
+ )
+ .text-2xl(
+ :style="{ color: catItem.color }"
+ :class="catItem.icon"
+ )
+ div
+ .text-2xs(v-if="catItem.parentId") {{ $store.state.categories.items[catItem.parentId].name }}
+ .text-sm.leading-none {{ catItem.name }}
+
+ .mdi.mdi-close.opacity-70.text-lg.leading-none
+
+ //- Clear
+ .cursor-pointer.p-1.px-2.flex.items-center.gap-3.bg-gray-50.dark_bg-dark4.rounded-md.hocus_bg-gray-100.dark_hocus_bg-neutral-800.shadow.hocus_shadow-lg(
+ class="dark_text-white/60"
+ @click="onClearFilter"
+ )
+ .mdi.mdi-filter-remove-outline.text-2xl
+ .pr-1.text-xs.leading-none {{ $t('filter.clear') }}
+</template>
diff --git a/components/stat/Index.vue b/components/stat/Index.vue
index 99bf5183..27f240e2 100644
--- a/components/stat/Index.vue
+++ b/components/stat/Index.vue
@@ -1,79 +1,71 @@
-<script lang="ts">
+<script setup lang="ts">
import useStat from '~/modules/stat/useStat'
import useStatChart from '~/components/stat/useStatChart'
import useStatPage from '~/components/stat/useStatPage'
import useUIView from '~/components/layout/useUIView'
+import { getTrnsIds } from '~/components/trns/functions/getTrns'
-export default {
- setup() {
- const { $store } = useNuxtApp()
- const { statPage } = useStatPage()
- const { ui } = useUIView()
- const { moneyTypes, isEmptyStat } = useStat()
+const { $store } = useNuxtApp()
+const { statPage } = useStatPage()
+const { ui } = useUIView()
+const { moneyTypes, isEmptyStat } = useStat()
- const { onWatch } = useStatChart()
- onWatch()
+const { onWatch } = useStatChart()
+onWatch()
- const isShowGroup = (type) => {
- const p1 = statPage.activeTab === 'details'
+const isShowGroup = (type) => {
+ const p1 = statPage.activeTab === 'details'
|| (statPage.activeTab === 'incomes' && type === 'incomes')
|| (statPage.activeTab === 'expenses' && type === 'expenses')
- const p2 = statPage.current[type].total > 0
+ const p2 = statPage.current[type].total > 0
|| (statPage.average && statPage.average[type] !== 0)
|| $store.state.filter.period === 'all'
- return p1 && p2
- }
+ return p1 && p2
+}
- const isShowTrns = computed(() => {
- const proceed = statPage.activeTab === 'details'
+const isShowTrns = computed(() => {
+ const proceed = statPage.activeTab === 'details'
&& statPage.average?.incomes !== 0
&& statPage.average?.expenses !== 0
&& $store.getters['trns/selectedTrnsIdsWithDate'].length > 0
- return proceed
- })
-
- const isShowGroupTrns = computed(() => {
- const p1 = statPage.activeTab === 'incomes' || statPage.activeTab === 'expenses'
- const p2 = statPage.average.total === 0
- return (p1 || p2) && statPage.activeTab !== 'history'
- })
+ return proceed
+})
- return {
- isShowGroup,
- isShowGroupTrns,
- isShowTrns,
- moneyTypes,
- statPage,
- isEmptyStat,
- ui,
- }
- },
-}
+const isShowGroupTrns = computed(() => {
+ const p1 = statPage.activeTab === 'incomes' || statPage.activeTab === 'expenses'
+ const p2 = statPage.average.total === 0
+ return (p1 || p2) && statPage.activeTab !== 'history'
+})
</script>
<template lang="pug">
-.overflow-hidden.overflow-y-auto.scrollbar.pb-8.js_scroll_page
+.overflow-hidden.overflow-y-auto.h-full.pb-8.js_scroll_page
StatPeriodArrows
StatDate
- StatViewConfig
LazyStatChart(v-if="ui.showMainChart && statPage.isHasTrns")
- StatPeriods
- .pt-3.px-3(v-if="statPage.filter.isShow")
- LazyStatFilter(v-if="statPage.filter.isShow")
+ .lg_flex
+ StatViewConfig.lg_order-2.lg_ml-auto
+ StatPeriods.lg_order-1
+
+ .py-8.px-3
+ StatSumTotal
- StatSumTotal
- StatMenu
+ .pb-8.px-3(v-if="statPage.filter.isShow")
+ LazyStatFilter
- //- Loop throw incomes / expenses
- .w-100
+ .px-3.pb-2
+ StatMenu
+
+ template(v-if="statPage.activeTab !== 'trns'")
+ //- Loop throw incomes / expenses
.py-2.px-3
- .grid.grid-cols-1.gap-y-5(class="md:grid-cols-2 md:gap-x-20")
+ .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)"
+ v-show="isShowGroup(item.id)"
:key="item.id"
+ class="max-w-[420px]"
)
-
StatGroupSum(:typeText="item.id")
StatGroupEmpty(:typeText="item.id")
StatGroupCatsPie(:typeText="item.id")
@@ -83,15 +75,17 @@ export default {
LazyStatGroupTrns(v-if="isShowGroupTrns && !isEmptyStat")
- template(v-if="statPage.activeTab !== 'history'")
- StatEmpty
- LazyStatTrns.px-3(
- v-if="isShowTrns && !isEmptyStat"
- )
+ .px-3
+ StatEmpty
+ .grid.md_grid-cols-2.md_gap-x-20
+ LazyStatTrns(v-if="isShowTrns && !isEmptyStat")
- .px-3(v-if="statPage.activeTab === 'history'")
- TrnsListHistory(
- :size="50"
- isShowFilter
- )
+ //- Trns
+ template(v-if="statPage.activeTab === 'trns'")
+ .px-3
+ .grid.md_grid-cols-2.md_gap-x-20
+ TrnsList(
+ :size="50"
+ classNames="md_grid-cols-1"
+ )
</template>
diff --git a/components/stat/Menu.vue b/components/stat/Menu.vue
index 18319804..45bf94aa 100644
--- a/components/stat/Menu.vue
+++ b/components/stat/Menu.vue
@@ -19,47 +19,31 @@ export default {
</script>
<template lang="pug">
-.overflow-hidden.overflow-x-auto.mx-3.scrollbar
- .menu__wrap.flex.items-center.space-x-8
- .menuItem.statTitle(
- :class="{ _active: activeTabStat === 'details' }"
+.overflow-hidden.rounded-md.bg-gray-50.dark_bg-dark4.dark_shadow
+ .overflow-hidden.overflow-x-auto.flex.items-center.text-sm.text-center.max-w-md
+ .cursor-pointer.px-4.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': activeTabStat === 'details' }"
@click="onClickStatMenu('details')"
) {{ $t('stat.periods') }}
- .menuItem.statTitle(
- :class="{ _active: activeTabStat === 'expenses' }"
+ .cursor-pointer.px-4.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': activeTabStat === 'expenses' }"
@click="onClickStatMenu('expenses')"
) {{ $t('money.expenses') }}
- .menuItem.statTitle(
- :class="{ _active: activeTabStat === 'incomes' }"
+ .cursor-pointer.px-4.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': activeTabStat === 'incomes' }"
@click="onClickStatMenu('incomes')"
) {{ $t('money.incomes') }}
- .menuItem.statTitle(
- :class="{ _active: activeTabStat === 'history' }"
- @click="onClickStatMenu('history')"
- ) {{ $t('trns.history') }}
-</template>
-
-<style lang="stylus" scoped>
-.menu
- &__wrap
- border-bottom 3px solid var(--c-item-bg-main)
-
-.menuItem
- margin-bottom -3px
- padding 0 0
- padding-bottom 6px
- color var(--c-font-5)
- border-bottom 3px solid var(--c-item-bg-main)
+ .cursor-pointer.px-4.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': activeTabStat === 'trns' }"
+ @click="onClickStatMenu('trns')"
+ ) {{ $t('trns.shortTitle') }}
- +media-hover()
- &:not(._active)
- cursor pointer
- color var(--c-blue-1)
-
- &._active
- color var(--c-font-3)
- border-bottom 3px solid var(--c-blue-1)
-</style>
+ .cursor-pointer.px-4.py-3.grow.flex-center.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ @click="$router.push('history')"
+ )
+ span {{ $t('trns.history') }}
+ span.mdi.mdi-open-in-new.ml-1
+</template>
diff --git a/components/stat/PeriodArrows.vue b/components/stat/PeriodArrows.vue
index 4b9e9297..2959321a 100644
--- a/components/stat/PeriodArrows.vue
+++ b/components/stat/PeriodArrows.vue
@@ -5,7 +5,7 @@ export default {
</script>
<template lang="pug">
-div(class="lg:hidden")
+div(class="lg_hidden")
.arrowDate._left(
:class="{ _disable: $store.state.filter.period === 'all' || $store.getters['stat/isLastPeriodSelected'] }"
@click="$store.dispatch('filter/setPeriodNext')"
diff --git a/components/stat/Periods.vue b/components/stat/Periods.vue
index 85a01223..df80f92f 100644
--- a/components/stat/Periods.vue
+++ b/components/stat/Periods.vue
@@ -46,37 +46,24 @@ export default {
</script>
<template lang="pug">
-.py-2.px-3
+.pt-2.px-3.lg_pt-1
.flex.justify-between
- .overflow-hidden.inline-flex.items-center.bg-4.rounded
- .barItem.px-4.py-2.font5.text-xs(
+ .overflow-hidden.flex.items-center.rounded-md.text-xs.bg-gray-50.dark_bg-dark4.dark_shadow
+ .cursor-pointer.px-3.md_px-4.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
v-for="periodItem in periodsNames"
:key="periodItem.slug"
- :class="{ _active: periodItem.slug === filterPeriodNameAllReplacedToYear }"
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': periodItem.slug === filterPeriodNameAllReplacedToYear }"
@click="$store.dispatch('filter/setPeriod', periodItem.slug)"
) {{ periodItem.name }}
- .bar.overflow-hidden.flex.rounded-md
- .bar__btn.flex-grow.flex.items-center.justify-center.w-8(
+ .overflow-hidden.ml-2.flex.items-center.rounded-md.bg-gray-50.dark_bg-dark4.dark_shadow
+ .cursor-pointer.px-3.md_px-4.py-3.flex-center.hocus_bg-gray-200.dark_hocus_bg-neutral-800.w-8(
@click="removePeriodOrGroup"
): .mdi.mdi-minus
- .flex.items-center.text-sm.font5 {{ $store.state.chart.periods[filterPeriodNameAllReplacedToYear].showedPeriods }}
- .bar__btn.flex.items-center.justify-center.w-8(
+
+ .flex.items-center.text-sm {{ $store.state.chart.periods[filterPeriodNameAllReplacedToYear].showedPeriods }}
+
+ .cursor-pointer.px-3.md_px-4.py-3.flex-center.hocus_bg-gray-200.dark_hocus_bg-neutral-800.w-8(
@click="addPeriodOrGroup"
): .mdi.mdi-plus
</template>
-
-<style lang="stylus" scoped>
-.bar
- color var(--c-font-3)
- background var(--c-bg-4)
-
- &__btn
- background var(--c-bg-4)
- +media-hover()
- &:not(._active)
- cursor pointer
- background var(--c-bg-6)
- .mdi
- font-size 16px
-</style>
diff --git a/components/stat/StatItem.vue b/components/stat/StatItem.vue
index cee6efc0..5cbc4108 100644
--- a/components/stat/StatItem.vue
+++ b/components/stat/StatItem.vue
@@ -12,10 +12,10 @@ export default {
},
setup() {
- const { setCategoryFilter } = useFilter()
+ const { setFilterCatsId } = useFilter()
return {
- setCategoryFilter,
+ setFilterCatsId,
}
},
@@ -30,21 +30,8 @@ export default {
return this.$store.getters['categories/getChildCategoriesIds'](this.categoryId)
},
- showChildCategories() {
- const childCatsIdsWithTrns = []
- for (const childCategoryId of this.childCategoriesIds) {
- const trnsIds = this.$store.getters['trns/getTrnsIdsByFilter']({
- categoryId: childCategoryId,
- type: this.type,
- })
- if (trnsIds.length > 0)
- childCatsIdsWithTrns.push(childCategoryId)
- }
-
- if (childCatsIdsWithTrns.length > 0)
- return true
-
- return false
+ isCategoryHasChildren() {
+ return this.$store.getters['categories/isCategoryHasChildren'](this.categoryId)
},
styles() {
@@ -90,17 +77,18 @@ export default {
@click="toogleShowInside"
)
.ins.py-2.px-3.space-x-3.rounded-md.justify-between.items-center.flex.border.bg-white2(
- :class="['z-[9] dark:bg-dark4 hocus:bg-neutral-100 dark:hocus:bg-neutral-800', { _active: isShowInside }, { 'dark:border-neutral-800 cursor-n-resize shadow-xl': isShowInside }, { 'border-transparent cursor-s-resize shadow-sm': !isShowInside }]"
+ :class="['z-[9] dark_bg-dark4 hocus_bg-neutral-100 dark_hocus_bg-neutral-800', { _active: isShowInside }, { 'dark_border-neutral-800 cursor-n-resize shadow-xl': isShowInside }, { 'border-transparent cursor-s-resize shadow-sm': !isShowInside }]"
)
+ //- Icon
.cursor-pointer.text-neutral-50.text-xl.leading-none.w-8.h-8.rounded-full.justify-center.items-center.flex(
:style="{ background: category.color }"
- @click.stop="setCategoryFilter(categoryId)"
+ @click.stop="setFilterCatsId(categoryId)"
): div(:class="category.icon")
.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 ? '...' : '' }}
+ .overflow-hidden.truncate.grow.space-x-2.flex.items-baseline.text-neutral-700(class="dark_text-neutral-400")
+ .overflow-hidden.text-sm {{ category.name }}{{ isCategoryHasChildren ? '...' : '' }}
.statItem__amount
Amount(
@@ -112,10 +100,10 @@ export default {
//- Inside
.overflow-hidden.ins2.mx-2.rounded-b-md.border.border-t-0(
v-if="isShowInside"
- class="mt-[-1px] dark:border-neutral-800"
+ class="mt-[-1px] dark_border-neutral-800"
@click.stop=""
)
- template(v-if="showChildCategories")
+ template(v-if="isCategoryHasChildren")
StatItemChildCats(
:categoryId="categoryId"
:type="type"
diff --git a/components/stat/StatItemChildCatsItem.vue b/components/stat/StatItemChildCatsItem.vue
index dbcf7c3d..1b1e1096 100644
--- a/components/stat/StatItemChildCatsItem.vue
+++ b/components/stat/StatItemChildCatsItem.vue
@@ -11,10 +11,10 @@ export default {
},
setup() {
- const { setCategoryFilter } = useFilter()
+ const { setFilterCatsId } = useFilter()
return {
- setCategoryFilter,
+ setFilterCatsId,
}
},
@@ -47,11 +47,11 @@ export default {
@click="toogleShowInside"
)
.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']"
+ :class="[{ _active: isShowInside }, { 'border-b-0 cursor-n-resize': isShowInside }, { 'cursor-s-resize': !isShowInside }, 'dark_border-neutral-800']"
)
.text-neutral-50.text-xl.leading-none.w-8.h-8.rounded-full.justify-center.items-center.flex(
:style="{ background: category.color }"
- @click.stop="setCategoryFilter(categoryId)"
+ @click.stop="setFilterCatsId(categoryId)"
): div(:class="category.icon")
.grow
diff --git a/components/stat/StatItemRound.vue b/components/stat/StatItemRound.vue
index 41e1c26e..1f079ad0 100644
--- a/components/stat/StatItemRound.vue
+++ b/components/stat/StatItemRound.vue
@@ -5,53 +5,26 @@ export default {
name: 'StatItemRound',
props: {
- category: {
- type: Object,
- required: true,
- },
- categoryId: {
- type: String,
- required: true,
- },
- currency: {
- type: String,
- required: true,
- },
- total: {
- type: Number,
- required: true,
- },
- type: {
- type: Number,
- required: true,
- },
+ category: { type: Object, required: true },
+ categoryId: { type: String, required: true },
+ currency: { type: String, required: true },
+ total: { type: Number, required: true },
+ type: { type: Number, required: true },
},
setup(props) {
- const { categoryId, type } = toRefs(props)
+ const { categoryId } = toRefs(props)
const { $store } = useNuxtApp()
- const { setCategoryFilter } = useFilter()
-
- const trnsIds = computed(() => {
- return $store.getters['trns/getTrns']({
- categoryId: categoryId.value,
- type: type.value,
- })
- })
+ const { setFilterCatsId } = useFilter()
const isCategoryHasChildren = computed(() => $store.getters['categories/isCategoryHasChildren'](categoryId.value))
- const filterPeriod = computed(() => $store.state.filter.period)
- const statCurrentPeriod = computed(() => $store.getters['stat/statCurrentPeriod'])
// long press
- const item = ref(document.createElement('div'))
+ const itemRef = ref(document.createElement('div'))
return {
- setCategoryFilter,
- trnsIds,
- filterPeriod,
- statCurrentPeriod,
- item,
+ setFilterCatsId,
+ itemRef,
isCategoryHasChildren,
}
},
@@ -64,12 +37,12 @@ export default {
:class="{ _prevStat: total === 0 }"
ref="item"
data-long-press-delay="300"
- @click="setCategoryFilter(categoryId)"
+ @click="setFilterCatsId(categoryId)"
)
.statItemRound__icon
.text-neutral-50.text-xl.leading-none.w-8.h-8.rounded-full.justify-center.items-center.flex(
:style="{ background: category.color }"
- @click.stop="setCategoryFilter(categoryId)"
+ @click.stop="setFilterCatsId(categoryId)"
): div(:class="category.icon")
.statItemRound__name.js-getWidth(:class="{ _isCategoryHasChildren: isCategoryHasChildren }") {{ category.name }}{{ isCategoryHasChildren ? '...' : '' }}
diff --git a/components/stat/SummaryRowItemView.vue b/components/stat/SummaryRowItemView.vue
index 684f3ca7..93c00c89 100644
--- a/components/stat/SummaryRowItemView.vue
+++ b/components/stat/SummaryRowItemView.vue
@@ -30,7 +30,7 @@ export default {
<template lang="pug">
.summaryItem(:class="className")
- .summaryItem__title {{ title }}
+ .summaryItem__title.pb-1 {{ title }}
.summaryItem__amount
Amount(
:currency="$store.state.currencies.base"
diff --git a/components/stat/Trns.vue b/components/stat/Trns.vue
index d38a746a..1b959b7f 100644
--- a/components/stat/Trns.vue
+++ b/components/stat/Trns.vue
@@ -7,5 +7,6 @@ div
.py-2
.statTitle {{ $t('trns.inPeriodTitle') }}
- TrnsList(:size="50")
+ div(class="max-w-[420px] md_max-w-none")
+ TrnsList(:size="12")
</template>
diff --git a/components/stat/cats/PeriodCatsChartItem.vue b/components/stat/cats/PeriodCatsChartItem.vue
index e3c47009..9be37d8c 100644
--- a/components/stat/cats/PeriodCatsChartItem.vue
+++ b/components/stat/cats/PeriodCatsChartItem.vue
@@ -1,22 +1,19 @@
-<script>
-export default {
+<script lang="ts">
+import useFilter from '~/modules/filter/useFilter'
+
+export default defineComponent({
props: {
- category: {
- type: Object,
- required: true,
- },
- categoryId: {
- type: String,
- required: true,
- },
- total: {
- type: Number,
- required: true,
- },
- biggest: {
- type: Number,
- required: true,
- },
+ biggest: { type: Number, required: true },
+ category: { type: Object, required: true },
+ categoryId: { type: String, required: true },
+ total: { type: Number, required: true },
+ },
+
+ setup() {
+ const { setFilterCatsId } = useFilter()
+ return {
+ setFilterCatsId,
+ }
},
computed: {
@@ -55,12 +52,12 @@ export default {
this.$emit('onActiveCategoryChange', { categoryId: null })
},
},
-}
+})
</script>
<template lang="pug">
.statCatsItem.swiper-no-swiping(
- @click="() => $store.dispatch('filter/handleSetFilterCategory', categoryId)"
+ @click="setFilterCatsId(categoryId)"
@mouseenter="handleMouseEnter"
@mouseleave="handleMouseLeave"
)
diff --git a/components/stat/filter/Index.vue b/components/stat/filter/Index.vue
deleted file mode 100644
index cb63c7cf..00000000
--- a/components/stat/filter/Index.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<script>
-import useFilter from '~/modules/filter/useFilter'
-
-export default {
- setup() {
- const { $store } = useNuxtApp()
- const { setCategoryFilter, setWalletFilter } = useFilter()
-
- const filterCategory = computed(() => $store.state.categories.items[$store.state.filter.categoryId])
- const filterParentCategory = computed(() => $store.state.categories.items[filterCategory.value.parentId])
- const filterWallet = computed(() => $store.state.wallets.items[$store.state.filter.walletId])
-
- const onClearCategory = () => {
- filterCategory.value.parentId
- ? setCategoryFilter(filterCategory.value.parentId)
- : setCategoryFilter(null)
- }
-
- const onClearFilter = () => {
- setCategoryFilter(null)
- setWalletFilter(null)
- }
-
- return {
- setCategoryFilter,
- setWalletFilter,
-
- filterCategory,
- filterParentCategory,
- filterWallet,
-
- onClearFilter,
- onClearCategory,
- }
- },
-
- methods: {
- clearCategoryFilter() {
- const nextCategoryId = this.filterCategory.parentId !== 0 ? this.filterCategory.parentId : null
- this.setCategoryFilter(nextCategoryId)
- },
-
- clearParentCategoryFilter() {
- this.setCategoryFilter(null)
- },
-
- clearWalletFilter() {
- this.setWalletFilter(null)
- },
- },
-}
-</script>
-
-<template lang="pug">
-.overflow-hidden.rounded.py-2
- .pb-2
- .statTitle {{ $t('base.filter') }}
-
- .safe.scrollbar.overflow-hidden.overflow-x-auto.flex.items-stretch(v-if="filterCategory || filterWallet")
- //- Wallet
- template(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 }")
- .pr-2
- .-mb-1.text-xs.font4 {{ filterWallet.name }}
- .text-sm.font3
- Amount(
- :alwaysShowSymbol="false"
- :currency="filterWallet.currency"
- :showBase="false"
- :value="$store.getters['wallets/walletsTotal'][$store.state.filter.walletId].base"
- vertical="left"
- )
- .absolute.top-1.right-1
- .text-sm.font5.mdi.mdi-close
-
- //- Category
- template(v-if="filterCategory")
- .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(
- :style="{ color: filterCategory.color }"
- :class="filterCategory.icon"
- )
- .flex.flex-col.pl-3.pr-2
- .-mb-1.text-xs.font4(v-if="filterCategory.parentId") {{ filterParentCategory.name }}
- .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/Chart.vue b/components/stat/group/Chart.vue
index 19087eea..2dccea1c 100644
--- a/components/stat/group/Chart.vue
+++ b/components/stat/group/Chart.vue
@@ -3,17 +3,15 @@ import { Chart } from 'highcharts-vue'
import chartOptions from '~/components/stat/chartOptions'
import useChart from '~/components/chart/useChart'
import useFilter from '~/modules/filter/useFilter'
+import { getTrnsIds } from '~/components/trns/functions/getTrns'
export default {
name: 'StatChartLines',
- components: {
- Chart,
- },
+ components: { Chart },
props: {
isShowIncomes: { type: Boolean, default: true },
- disableCategoryFilter: { type: Boolean, default: false },
isShowExpenses: { type: Boolean, default: true },
categoryId: { type: String, default: null },
amountType: { type: String, default: null },
@@ -89,10 +87,10 @@ export default {
chartData() {
const periodName = this.filterPeriodNameAllReplacedToYear
const chartPeriods = this.$store.state.chart.periods
- const trns = this.$store.state.trns.items
+ const trnsItems = this.$store.state.trns.items
// diff periods from oldest trn and today
- const oldestTrnDate = this.$day(trns[this.$store.getters['trns/firstCreatedTrnId']].date).endOf(periodName)
+ const oldestTrnDate = this.$day(trnsItems[this.$store.getters['trns/firstCreatedTrnId']].date).endOf(periodName)
let periodsToShow = this.$day().endOf(periodName).diff(oldestTrnDate, periodName) + 1
const periodsWantToShow = chartPeriods[periodName].showedPeriods
periodsToShow = periodsWantToShow >= periodsToShow ? periodsToShow : periodsWantToShow
@@ -105,12 +103,14 @@ export default {
for (let index = 0; index < periodsToShow; index++) {
// count total period
const periodDate = this.$day().startOf(periodName).subtract(index, periodName).valueOf()
- const trnsIds = this.$store.getters['trns/getTrns']({
- date: periodDate,
+
+ const trnsIds = getTrnsIds({
+ categoriesIds: [this.categoryId],
periodName,
- categoryId: null,
- disableCategoryFilter: this.disableCategoryFilter,
+ date: periodDate,
+ trnsItems,
})
+
const periodTotal = this.$store.getters['trns/getTotalOfTrnsIds'](trnsIds)
let format = 'MM'
diff --git a/components/stat/group/Empty.vue b/components/stat/group/Empty.vue
index c05c8053..749b25c9 100644
--- a/components/stat/group/Empty.vue
+++ b/components/stat/group/Empty.vue
@@ -20,7 +20,7 @@ export default defineComponent({
</script>
<template lang="pug">
-.pb-3.text-sm.font5(v-if="isShow") {{ $t('stat.empty') }}
+.pb-3.text-sm(v-if="isShow") {{ $t('stat.empty') }}
</template>
<style lang="stylus" scoped>
diff --git a/components/stat/group/Sum.vue b/components/stat/group/Sum.vue
index c48ffded..121d0587 100644
--- a/components/stat/group/Sum.vue
+++ b/components/stat/group/Sum.vue
@@ -22,7 +22,7 @@ export default defineComponent({
</script>
<template lang="pug">
-.sticky.top-0.z-10.bg-white(class="dark:bg-dark3")
+.sticky.top-0.z-10.bg-white(class="dark_bg-dark3")
.py-3
.statTitle.pb-2(v-if="statPage.activeTab !== typeText") {{ $t(`money.${typeText}`) }}
.overflow-hidden.overflow-x-auto.scrollbar
diff --git a/components/stat/group/Sum2.vue b/components/stat/group/Sum2.vue
new file mode 100644
index 00000000..e896b48b
--- /dev/null
+++ b/components/stat/group/Sum2.vue
@@ -0,0 +1,67 @@
+<script setup lang="ts">
+import type { TrnID } from '~/components/trns/types'
+
+const props = withDefaults(defineProps<{
+ trnsIds: TrnID[]
+}>(), {
+ trnsIds: () => [],
+})
+
+const { $store } = useNuxtApp()
+const total = computed(() => $store.getters['trns/getTotalOfTrnsIds'](props.trnsIds))
+</script>
+
+<template lang="pug">
+div
+ .py-3
+ .overflow-hidden.overflow-x-auto.scrollbar
+ .flex.items-center.gap-6
+ //- Income
+ div
+ .statTitle.pb-2 {{ $t('money.expense') }}
+ Amount(
+ :currency="$store.state.currencies.base"
+ :type="0"
+ :value="total.expense"
+ size="lg"
+ vertical="left"
+ )
+
+ //- Expense
+ div
+ .statTitle.pb-2 {{ $t('money.income') }}
+ Amount(
+ :currency="$store.state.currencies.base"
+ :type="1"
+ :value="total.income"
+ size="lg"
+ vertical="left"
+ )
+
+ //- Sum
+ div
+ .statTitle.pb-2 {{ $t('money.sum') }}
+ Amount(
+ :currency="$store.state.currencies.base"
+ :type="3"
+ :value="total.sum"
+ size="lg"
+ vertical="left"
+ )
+
+ //- //- Average
+ //- LazyStatSummaryRowItemView(
+ //- v-if="statPage.average[typeText] !== 0"
+ //- :amount="statPage.average[typeText]"
+ //- :title="$t(`money.average.${typeText}`)"
+ //- :type="typeNumber"
+ //- )
+
+ //- //- Today
+ //- LazyStatSummaryRowItemView(
+ //- v-if="statToday && statToday[typeText].total !== 0"
+ //- :amount="statToday[typeText].total"
+ //- :title="$t('dates.day.today')"
+ //- :type="typeNumber"
+ //- )
+</template>
diff --git a/components/stat/group/Trns.vue b/components/stat/group/Trns.vue
index 3581569a..4f2aabf2 100644
--- a/components/stat/group/Trns.vue
+++ b/components/stat/group/Trns.vue
@@ -13,7 +13,7 @@ export default defineComponent({
</script>
<template lang="pug">
-div
+div(class="max-w-[420px]")
.py-2
.statTitle {{ $t('trns.inPeriodTitle') }}
@@ -21,6 +21,6 @@ div
:incomes="statPage.activeTab === 'incomes'"
:expenses="statPage.activeTab === 'expenses'"
:size="12"
- classNames="md:grid-cols-1"
+ classNames="md_grid-cols-1"
)
</template>
diff --git a/components/stat/group/cats/Horizontal.vue b/components/stat/group/cats/Horizontal.vue
index b05f654b..0370d32a 100644
--- a/components/stat/group/cats/Horizontal.vue
+++ b/components/stat/group/cats/Horizontal.vue
@@ -28,8 +28,7 @@ export default defineComponent({
<template lang="pug">
.space-y-2.flex-col.flex.pb-6(v-if="isShow")
- LazyStatItem(
- v-if="isShow"
+ StatItem(
v-for="categoryId in statPage.current[typeText].categoriesIds"
:key="categoryId"
:biggest="statPage.current[typeText].biggest"
diff --git a/components/stat/sum/Total.vue b/components/stat/sum/Total.vue
index cc30bc4e..e93028d9 100644
--- a/components/stat/sum/Total.vue
+++ b/components/stat/sum/Total.vue
@@ -1,36 +1,29 @@
-<script>
-export default defineComponent({
- setup() {
- const { $store } = useNuxtApp()
- const statCurrentPeriod = computed(() => $store.getters['stat/statCurrentPeriod'])
- const statAverage = computed(() => $store.getters['stat/statAverage'])
-
- return {
- statCurrentPeriod,
- statAverage,
- }
- },
-})
+<script setup script="ts">
+const { $store } = useNuxtApp()
+const statCurrentPeriod = computed(() => $store.getters['stat/statCurrentPeriod'])
+const statAverage = computed(() => $store.getters['stat/statAverage'])
</script>
<template lang="pug">
-.py-6.px-3
- .statTitle {{ $t('money.total') }}
- .overflow-hidden.overflow-x-auto.scrollbar
- .flex.items-center
- .pr-6
- Amount(
- :currency="$store.state.currencies.base"
- :type="(statCurrentPeriod.incomes.total - statCurrentPeriod.expenses.total) > 0 ? 1 : 0"
- :value="statCurrentPeriod.incomes.total - statCurrentPeriod.expenses.total"
- size="xl"
- vertical="left"
- )
+.swiper-container(ref="sliderRef")
+ .swiper-wrapper
+ //- Total
+ .swiper-slide.grow(class="!w-auto")
+ .statTitle {{ $t('money.total') }}
+ .flex.items-center
+ .pr-6
+ Amount(
+ :currency="$store.state.currencies.base"
+ :type="(statCurrentPeriod.incomes.total - statCurrentPeriod.expenses.total) > 0 ? 1 : 0"
+ :value="statCurrentPeriod.incomes.total - statCurrentPeriod.expenses.total"
+ size="xl"
+ vertical="left"
+ )
- LazyStatSummaryRowItemView(
- v-if="statAverage.incomes - statAverage.expenses !== 0"
- :type="(statAverage.incomes - statAverage.expenses) > 0 ? 1 : 0"
- :amount="statAverage.incomes - statAverage.expenses"
- :title="$t('money.averageTotal')"
- )
+ LazyStatSummaryRowItemView(
+ v-if="statAverage.incomes - statAverage.expenses !== 0"
+ :type="(statAverage.incomes - statAverage.expenses) > 0 ? 1 : 0"
+ :amount="statAverage.incomes - statAverage.expenses"
+ :title="$t('money.averageTotal')"
+ )
</template>
diff --git a/components/stat/useStatPage.ts b/components/stat/useStatPage.ts
index 92532217..e3e0e34a 100644
--- a/components/stat/useStatPage.ts
+++ b/components/stat/useStatPage.ts
@@ -7,8 +7,7 @@ export default function useStatPage() {
const filterPeriod = computed(() => $store.state.filter.period)
const filter = computed(() => $store.state.filter)
const filterDate = computed(() => $store.state.filter.date)
- const isShowFilter = computed(() => !!$store.state.filter.categoryId || !!$store.state.filter.walletId)
- // const periods = computed(() => $store.state.chart.periods)
+ const isShowFilter = computed(() => $store.state.filter.catsIds.length > 0 || $store.state.filter.walletsIds.length > 0)
const isHasTrns = computed(() => $store.getters['trns/hasTrns'])
return {
@@ -18,7 +17,7 @@ export default function useStatPage() {
current: statCurrentPeriod,
filter: {
- ...filter,
+ ...filter.value,
isShow: isShowFilter,
period: filterPeriod,
date: filterDate,
diff --git a/components/themeEditor/ThemeEditor.vue b/components/themeEditor/ThemeEditor.vue
deleted file mode 100644
index d08c211c..00000000
--- a/components/themeEditor/ThemeEditor.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-import Pickr from '@simonwep/pickr'
-import '@simonwep/pickr/dist/themes/classic.min.css'
-
-export default {
- name: 'ThemeEditor',
- data() {
- return {
- colors: [
- '--c-bg-1',
- '--c-bg-2',
- '--c-bg-3',
- '--c-bg-4',
- '--c-bg-5',
- '--c-bg-6',
- '--c-bg-7',
- '--c-bg-8',
- '--c-bg-9',
- '--c-bg-10',
- '--c-bg-11',
- '--c-bg-12',
- '--c-bg-13',
- '--c-bg-14',
- ],
- }
- },
-
- mounted() {
- this.initPickrs()
- },
-
- methods: {
- setColor(name, color) {
- document.documentElement.style.setProperty(name, color)
- },
-
- initPickrs() {
- for (const colorItem of this.colors) {
- const colorIdx = this.colors.indexOf(colorItem)
- const element = document.querySelector([`.initPickElement${colorIdx}`])
-
- Pickr.create({
- el: element,
- useAsButton: true,
- theme: 'classic',
-
- components: {
- // Main components
- preview: true,
- opacity: true,
- hue: true,
-
- // Input / output Options
- interaction: {
- hex: true,
- rgba: true,
- hsla: true,
- hsva: true,
- cmyk: true,
- input: true,
- },
- },
- }).on('change', (color) => {
- const hexColor = color.toHEXA().toString()
- this.setColor(colorItem, hexColor)
- })
- }
- },
- },
-}
-</script>
-
-<template lang="pug">
-.colors
- .colorItem(
- v-for="(colorItem, colorIdx) in colors"
- :key="colorItem"
- :class="`initPickElement${colorIdx}`"
- ) {{ colorItem }}
-</template>
-
-<style lang="stylus" scoped>
-.colors
- display flex
-
-.colorItem
- padding $m6
-</style>
diff --git a/components/trnForm/TrnForm.vue b/components/trnForm/TrnForm.vue
index 3aae02cc..17954c50 100644
--- a/components/trnForm/TrnForm.vue
+++ b/components/trnForm/TrnForm.vue
@@ -1,4 +1,4 @@
-<script lang="ts">
+<script setup lang="ts">
import Vue from 'vue'
import dayjs from 'dayjs'
import SwiperCore, { Pagination } from 'swiper'
@@ -11,199 +11,190 @@ import { random, successEmo } from '~/assets/js/emo'
SwiperCore.use([Pagination])
-export default {
- name: 'TrnForm',
-
- props: {
- show: { type: Boolean, default: true },
- },
-
- setup(props) {
- const { $store } = useNuxtApp()
- /**
- * Slider
- */
- const slider = ref<any>(null)
- const sliderObj = ref<any>(null)
- const maxHeight = ref('550px')
- const { clearExpression } = useCalculator()
-
- function setTrnFormHeight() {
- const el = document.querySelector('.getHeight')
- const height = el.clientHeight
+const props = withDefaults(defineProps<{
+ show: boolean
+}>(), {
+ show: true,
+})
+
+const { $store } = useNuxtApp()
+
+// Expense
+const expenseWalletId = computed(() => {
+ const expenseWalletId = $store.state.trnForm.values.expenseWalletId
+ const walletFromId = $store.state.trnForm.values.walletFromId
+ const firstWalletId = $store.getters['wallets/walletsSortedIds'][0]
+ return expenseWalletId || walletFromId || firstWalletId
+})
+const expenseWallet = computed(() => $store.state.wallets.items[expenseWalletId.value])
+
+// Income
+const incomeWalletId = computed(() => {
+ const incomeWalletId = $store.state.trnForm.values.incomeWalletId
+ const walletToId = $store.state.trnForm.values.walletToId
+ const secondWalletId = $store.getters['wallets/walletsSortedIds'][1]
+ return incomeWalletId || walletToId || secondWalletId
+})
+const incomeWallet = computed(() => $store.state.wallets.items[incomeWalletId.value])
+
+const isSameCurency = computed(() => incomeWallet.value?.currency === expenseWallet.value?.currency)
+
+/**
+ * Slider
+ */
+const slider = ref<any>(null)
+const sliderObj = ref<any>(null)
+const maxHeight = ref('550px')
+const { clearExpression } = useCalculator()
+
+function setTrnFormHeight() {
+ const el = document.querySelector('.getHeight')
+ const height = el.clientHeight
+
+ $store.commit('trnForm/setTrnFormHeight', height)
+ maxHeight.value = `${height}px`
+
+ const observer = new ResizeObserver((entries) => {
+ for (const entry of entries) {
+ const height = entry.contentRect.height
$store.commit('trnForm/setTrnFormHeight', height)
maxHeight.value = `${height}px`
-
- const observer = new ResizeObserver((entries) => {
- for (const entry of entries) {
- const height = entry.contentRect.height
- $store.commit('trnForm/setTrnFormHeight', height)
- maxHeight.value = `${height}px`
- }
- })
- observer.observe(el)
- }
-
- function init() {
- if (!sliderObj.value) {
- sliderObj.value = new SwiperCore(slider.value, {
- init: false,
- observer: true,
- observeParents: true,
- slidesPerView: 1,
- touchStartPreventDefault: false,
- initialSlide: 1,
- shortSwipes: false,
- longSwipesRatio: 0.1,
- longSwipesMs: 60,
- pagination: {
- el: '.trnForm__pagination',
- clickable: false,
- },
- })
- setTrnFormHeight()
- sliderObj.value.init()
- }
}
+ })
+ observer.observe(el)
+}
- /**
- * isShow
- */
- onMounted(() => {
- init()
- })
-
- watch(() => props.show, (value) => {
- if (!value) {
- clearExpression()
- if (sliderObj.value)
- sliderObj.value.slideTo(1, 0)
- }
+function init() {
+ if (!sliderObj.value) {
+ sliderObj.value = new SwiperCore(slider.value, {
+ init: false,
+ observer: true,
+ observeParents: true,
+ slidesPerView: 1,
+ touchStartPreventDefault: false,
+ initialSlide: 1,
+ shortSwipes: false,
+ longSwipesRatio: 0.1,
+ longSwipesMs: 60,
+ pagination: {
+ el: '.trnForm__pagination',
+ clickable: false,
+ },
})
+ setTrnFormHeight()
+ sliderObj.value.init()
+ }
+}
- /**
- * Amounts
- */
- const amountType = computed(() => $store.state.trnForm.values.amountType)
- const isTransfer = computed(() => $store.state.trnForm.values.amountType === 2)
-
- /**
- * Click on category
- */
- function onCategoryClick(categoryId) {
- $store.commit('trnForm/setTrnFormValues', { categoryId })
- }
+/**
+ * isShow
+ */
+onMounted(() => {
+ init()
+})
+
+watch(() => props.show, (value) => {
+ if (!value) {
+ clearExpression()
+ if (sliderObj.value)
+ sliderObj.value.slideTo(1, 0)
+ }
+})
+
+/**
+ * Amounts
+ */
+const amountType = computed(() => $store.state.trnForm.values.amountType)
+const isTransfer = computed(() => $store.state.trnForm.values.amountType === 2)
+
+/**
+ * Click on category
+ */
+function onCategoryClick(categoryId) {
+ $store.commit('trnForm/setTrnFormValues', { categoryId })
+}
- /**
- * Click on wallet
- */
- function onClickWallet(walletId) {
- $store.commit('trnForm/setTrnFormValues', { walletId })
- }
+/**
+ * Click on wallet
+ */
+function onClickWallet(walletId) {
+ $store.commit('trnForm/setTrnFormValues', { walletId })
+}
- /**
- * Prepare values
- */
- function prepeareValues(): any {
- let normalizedValues
-
- const id = $store.state.trnForm.values.trnId || generateId(dayjs().valueOf())
- const { getResult } = useCalculator()
-
- // Simple
- if (!isTransfer.value) {
- normalizedValues = {
- amount: getResult.value,
- categoryId: $store.state.trnForm.values.categoryId,
- date: dayjs($store.state.trnForm.values.date).valueOf(),
- description: $store.state.trnForm.values.description || null,
- groups: $store.state.trnForm.values.groups || null,
- type: Number($store.state.trnForm.values.amountType) || 0,
- walletId: $store.state.trnForm.values.walletId,
- }
- }
-
- // Transfer
- if (isTransfer.value) {
- normalizedValues = {
- amount: getResult.value,
- categoryId: 'transfer',
- date: dayjs($store.state.trnForm.values.date).valueOf(),
- walletId: $store.state.trnForm.values.walletFromId,
- walletFromId: $store.state.trnForm.values.walletFromId,
- walletToId: $store.state.trnForm.values.walletToId,
- type: 2,
- description: $store.state.trnForm.values.description || null,
- groups: $store.state.trnForm.values.groups || null,
- expense: {
- walletId: $store.state.trnForm.values.walletFromId,
- amount: getResult.value,
- },
- income: {
- walletId: $store.state.trnForm.values.walletToId,
- amount: getResult.value,
- },
- }
- }
-
- return {
- id,
- values: normalizedValues,
- }
+/**
+ * Prepare values
+ */
+function prepeareValues(): any {
+ let normalizedValues
+
+ const id = $store.state.trnForm.values.trnId || generateId(dayjs().valueOf())
+ const { getResult } = useCalculator()
+
+ // Simple
+ if (!isTransfer.value) {
+ normalizedValues = {
+ amount: getResult.value,
+ categoryId: $store.state.trnForm.values.categoryId,
+ date: dayjs($store.state.trnForm.values.date).valueOf(),
+ description: $store.state.trnForm.values.description || null,
+ groups: $store.state.trnForm.values.groups || null,
+ type: Number($store.state.trnForm.values.amountType) || 0,
+ walletId: $store.state.trnForm.values.walletId,
}
-
- /**
- * Submit form
- */
- function handleSubmitForm() {
- try {
- const { validate } = useTrnFormValidate()
- const { id, values } = prepeareValues()
-
- const validateStatus = validate({
- ...values,
- walletFrom: $store.getters['wallets/getWalletWithId']($store.state.trnForm.values.walletFromId),
- walletTo: $store.getters['wallets/getWalletWithId']($store.state.trnForm.values.walletToId),
- })
-
- if (validateStatus.error) {
- Vue.notify({
- type: 'error',
- title: validateStatus.error.title,
- text: validateStatus.error.text,
- })
- return
- }
-
- Vue.notify({
- type: 'success',
- text: 'Excellent transaction!',
- title: random(successEmo),
- })
-
- $store.dispatch('trns/addTrn', { id, values })
- }
- catch (e) {
- console.log(e)
- }
+ }
+
+ // Transfer
+ if (isTransfer.value) {
+ normalizedValues = {
+ categoryId: 'transfer',
+ date: dayjs($store.state.trnForm.values.date).valueOf(),
+ type: 2,
+ description: $store.state.trnForm.values.description || null,
+ groups: $store.state.trnForm.values.groups || null,
+ expenseAmount: isSameCurency.value ? getResult.value : $store.state.trnForm.values.expenseAmount,
+ expenseWalletId: $store.state.trnForm.values.expenseWalletId,
+ incomeAmount: isSameCurency.value ? getResult.value : $store.state.trnForm.values.incomeAmount,
+ incomeWalletId: $store.state.trnForm.values.incomeWalletId,
}
+ }
- return {
- maxHeight,
- slider,
- sliderObj,
- setTrnFormHeight,
+ return {
+ id,
+ values: normalizedValues,
+ }
+}
- amountType,
- isTransfer,
+/**
+ * Submit form
+ */
+function handleSubmitForm() {
+ try {
+ const { validate } = useTrnFormValidate()
+ const { id, values } = prepeareValues()
+
+ const validateStatus = validate(values)
+
+ if (validateStatus.error) {
+ Vue.notify({
+ type: 'error',
+ title: validateStatus.error.title,
+ text: validateStatus.error.text,
+ })
+ return
+ }
- onCategoryClick,
- onClickWallet,
+ Vue.notify({
+ type: 'success',
+ text: 'Excellent transaction!',
+ title: random(successEmo),
+ })
- handleSubmitForm,
- }
- },
+ $store.dispatch('trns/addTrn', { id, values })
+ }
+ catch (e) {
+ console.log(e)
+ }
}
</script>
@@ -221,48 +212,60 @@ export default {
//- Main
.swiper-slide.getHeight
.scroll.scrollerBlock(:style="{ maxHeight: `${$store.state.ui.height}px` }")
- .trnForm__title(v-if="$store.state.trnForm.values.trnId") {{ $t('trnForm.titleEditTrn') }}
- .trnForm__title(v-if="!$store.state.trnForm.values.trnId") {{ $t('trnForm.titleCreateTrn') }}
+ .subTitle.text-center.pt-5.pb-2.text-xs
+ temaplte(v-if="$store.state.trnForm.values.trnId") {{ $t('trnForm.titleEditTrn') }}
+ temaplte(v-if="!$store.state.trnForm.values.trnId") {{ $t('trnForm.titleCreateTrn') }}
TrnFormTypes
- TrnFormAmount
- TrnFormCalendar
- TrnFormCalculator(@onSubmit="handleSubmitForm")
+ TrnFormAmount(v-if="!isTransfer || isTransfer && isSameCurency")
+
+ TrnFormDate
+ TrnFormCalculator(
+ v-if="!isTransfer || isTransfer && isSameCurency"
+ @onSubmit="handleSubmitForm"
+ )
TrnFormHeader
- LazyTrnFormHeaderTransfer(v-if="isTransfer")
+ LazyTrnFormHeaderTransfer(
+ v-if="isTransfer"
+ @onSubmit="handleSubmitForm"
+ )
//- Quick selector
.swiper-slide(:style="{ height: maxHeight }")
.scroll.scrollerBlock
- div(style="paddingBottom: 16px")
- //- Wallets
- div(style="padding: 20px 0 26px 0")
- WalletsList3(
- :activeItemId="$store.state.trnForm.values.walletId"
- :limit="4"
- :showBase="false"
- @onClick="onClickWallet"
- )
-
- //- Favorite categories
- div(style="padding: 0 0 26px 0")
- .subTitle {{ $t('categories.favoriteTitle') }} {{ $t('categories.title') }}
- CategoriesView(
- :ids="$store.getters['categories/quickSelectorCategoriesIds']"
- :activeItemId="$store.state.trnForm.values.categoryId"
- :noPaddingBottom="true"
- @onClick="onCategoryClick"
- )
-
- //- Last used categories
- div(style="padding: 0 0 10px 0")
- .subTitle {{ $t('categories.lastUsedTitle') }} {{ $t('categories.title') }}
- CategoriesView(
- :ids="$store.getters['categories/lastUsedCategoriesIdsByDate']"
- :activeItemId="$store.state.trnForm.values.categoryId"
- :noPaddingBottom="true"
- @onClick="onCategoryClick"
- )
+ //- Wallets
+ .pt-5.pb-7
+ .subTitle.text-center.pb-2.text-xs {{ $t('wallets.title') }}
+ WalletsList3(
+ :activeItemId="$store.state.trnForm.values.walletId"
+ :limit="4"
+ :showBase="false"
+ @onClick="onClickWallet"
+ )
+
+ //- Favorite categories
+ .pb-7
+ .subTitle.text-center.pb-2.text-xs {{ $t('categories.favoriteTitle') }} {{ $t('categories.title') }}
+ CategoriesView(
+ v-if="sliderObj"
+ :ids="$store.getters['categories/quickSelectorCategoriesIds']"
+ :activeItemId="$store.state.trnForm.values.categoryId"
+ :slider="sliderObj"
+ noPaddingBottom
+ @onClick="onCategoryClick"
+ )
+
+ //- Last used categories
+ .pb-7
+ .subTitle.text-center.pb-2.text-xs {{ $t('categories.lastUsedTitle') }} {{ $t('categories.title') }}
+ CategoriesView(
+ v-if="sliderObj"
+ :ids="$store.getters['categories/lastUsedCategoriesIdsByDate']"
+ :activeItemId="$store.state.trnForm.values.categoryId"
+ :slider="sliderObj"
+ noPaddingBottom
+ @onClick="onCategoryClick"
+ )
.buttons
.button(@click="$store.commit('trnForm/showTrnFormModal', 'wallets')") {{ $t('wallets.title') }}
@@ -317,7 +320,6 @@ export default {
&-active
width 10px
- background var(--c-bg-10)
border-radius 4px
/.light &
@@ -376,17 +378,10 @@ export default {
padding-top $m4
padding-bottom $m9
-.button
- button-base-1()
-
.subTitle
- padding 0 $m8
- padding-bottom $m6
color var(--c-font-4)
- font-size 10px
letter-spacing 0px
font-weight 600
- text-align center
text-transform uppercase
.scroll
diff --git a/components/trnForm/TrnFormAmount.vue b/components/trnForm/TrnFormAmount.vue
index b0871646..7f2d6a0c 100644
--- a/components/trnForm/TrnFormAmount.vue
+++ b/components/trnForm/TrnFormAmount.vue
@@ -43,42 +43,29 @@ export default {
<template lang="pug">
.trnFormAmount(:class="className")
- .trnFormAmount__wrap(@click="handleChangeAmountType")
- .trnFormAmount__in
- .trnFormAmount__content
- .trnFormAmount__evaluation {{ isSum ? null : getResult }}
- .trnFormAmount__value {{ expression }}
+ .trnFormAmount__wrap.text-center.px-4.flex.items-center.flex-col.justify-center(
+ class="h-[46px]"
+ @click="handleChangeAmountType"
+ )
+ .trnFormAmount__value(class="!text-4xl") {{ expression }}
+ .trnFormAmount__evaluation(v-if="!isSum") {{ isSum ? null : getResult }}
</template>
<style lang="stylus" scoped>
.trnFormAmount
&__wrap
- padding $m7 $m7
- padding-top $m6
- text-align right
-
^[0]._expenses &
color var(--c-expenses-1)
-
^[0]._incomes &
color var(--c-incomes-1)
- &__in
- display flex
- justify-content center
-
- &__content
- flex-grow 1
-
&__value
typo-money()
padding 0
- font-size 42px !important
font-weight 500
line-height 32px
word-break break-word
white-space normal
- text-align right
background none
border none
diff --git a/components/trnForm/TrnFormCategories.vue b/components/trnForm/TrnFormCategories.vue
index 02e78900..d719279a 100644
--- a/components/trnForm/TrnFormCategories.vue
+++ b/components/trnForm/TrnFormCategories.vue
@@ -55,7 +55,7 @@ export default {
CategoriesView(
:activeItemId="$store.state.trnForm.values.categoryId"
:ids="$store.getters['categories/lastUsedCategoriesIdsByDate']"
- :noPaddingBottom="true"
+ noPaddingBottom
@onClick="handleCategoryClick"
)
@@ -65,7 +65,7 @@ export default {
.pb-4
CategoriesView(
:ids="$store.getters['categories/categoriesRootIds']"
- :noPaddingBottom="true"
+ noPaddingBottom
@onClick="handleCategoryClick"
)
@@ -78,24 +78,24 @@ export default {
CategoriesView(
:activeItemId="$store.state.trnForm.values.categoryId"
:ids="$store.getters['categories/quickSelectorCategoriesIds']"
- :noPaddingBottom="true"
+ noPaddingBottom
@onClick="handleCategoryClick"
)
- .pt-2.pb-0.px-3.justify-center.flex(v-if="slider")
- .overflow-hidden.bg-dark4.rounded-md.justify-center.items-center.flex
- .barItem.px-6.py-3.font5(
- :class="{ _active: slider.activeIndex === 0 }"
+ .py-2.px-3(v-if="slider")
+ .overflow-hidden.flex.items-center.text-center.text-xs.rounded-md.bg-gray-50.dark_bg-dark4.dark_shadow
+ .cursor-pointer.px-6.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': slider.activeIndex === 0 }"
@click="slider.slideTo(0)"
) {{ $t('categories.lastUsedTitle') }}
- .barItem.px-6.py-3.font5(
- :class="{ _active: slider.activeIndex === 1 }"
+ .cursor-pointer.px-6.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': slider.activeIndex === 1 }"
@click="slider.slideTo(1)"
) {{ $t('categories.allTitle') }}
- .barItem.px-6.py-3.font5(
- :class="{ _active: slider.activeIndex === 2 }"
+ .cursor-pointer.px-6.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': slider.activeIndex === 2 }"
@click="slider.slideTo(2)"
) {{ $t('categories.favoriteTitle') }}
</template>
diff --git a/components/trnForm/TrnFormCalendar.vue b/components/trnForm/TrnFormDate.vue
similarity index 67%
rename from components/trnForm/TrnFormCalendar.vue
rename to components/trnForm/TrnFormDate.vue
index d2a3e8ee..3e5203b9 100644
--- a/components/trnForm/TrnFormCalendar.vue
+++ b/components/trnForm/TrnFormDate.vue
@@ -5,7 +5,7 @@ export default {
computed: {
formatedDate() {
const date = formatDate(this.$store.state.trnForm.values.date, 'full')
- return `${date.weekday}, ${date.day} ${date.month}`
+ return `${date.weekday} <br/> ${date.day} ${date.month}`
},
isToday() {
@@ -31,19 +31,19 @@ export default {
</script>
<template lang="pug">
-.trnFormDate
+.trnFormDate.pb-2.px-4
.shame1._arrow(@click="setPrevDay()"): .mdi.mdi-chevron-left
- .trnFormDate__item._date(@click="$store.commit('trnForm/showTrnFormModal', 'calendar')") {{ formatedDate }}
+
+ .trnFormDate__item._date(
+ v-html="formatedDate"
+ @click="$store.commit('trnForm/showTrnFormModal', 'calendar')"
+ )
+
.flex
.shame1._arrow(
- v-if="!isToday" @click="setNextDay()"
- style="marginRight: 16px"
+ :class="{ 'opacity-30 cursor-default' : isToday }"
+ @click="setNextDay()"
): .mdi.mdi-chevron-right
- .trnFormDate__item._icon(
- :class="{ _desc: $store.state.trnForm.values.description }"
- @click="$store.commit('trnForm/showTrnFormModal', 'description')"
- )
- .mdi.mdi-comment-text-outline
</template>
<style lang="stylus" scoped>
@@ -52,23 +52,18 @@ export default {
display flex
align-items center
justify-content center
- width 44px
- height 44px
+ width 58px
+ height 58px
padding $m7
color var(--c-font-3)
- font-size 22px
+ font-size 28px
border-bottom 0
border-right 0
- background var(--c-item-bg-main)
- border 1px solid var(--c-item-bd-main)
+ border 1px solid transparent
border-radius 50%
user-select none
anim(100ms)
- +media(360px)
- width 58px
- height 58px
-
+media-hover()
background var(--c-bg-7)
border 1px solid var(--c-bg-8)
@@ -78,9 +73,6 @@ export default {
height 100%
grid-template-columns auto 1fr auto
grid-column-gap $m8
- padding 0 $m7
- font-size 12px
- font-weight 500
text-align center
&__item
@@ -105,41 +97,23 @@ export default {
border 1px solid var(--c-item-bd-hover)
&._date
+ display flex
+ padding 0
width 100%
height auto
flex-grow 1
- color var(--c-font-3)
+ color var(--c-font-4)
font-size 12px
+ font-weight 400
+ line-height 16px
border-radius 50px
border-color transparent
- &._desc .mdi
- color var(--c-blue-1)
-
- &._icon
- color var(--c-font-4)
- border-radius 50%
- .mdi
- font-size 24px
-
- &._arrow
- color var(--c-font-4)
- border-radius 50%
- .mdi
- font-size 32px
-
&._arrow
color var(--c-font-4)
font-size 28px
background var(--c-item-bg-main)
- // border-radius 50%
+ border-radius 50%
.mdi
font-size 24px
-
- &._disable
- opacity .4
-
- &:hover
- &:active
- background none
</style>
diff --git a/components/trnForm/TrnFormHeader.vue b/components/trnForm/TrnFormHeader.vue
index 01990d9e..b123bc2e 100644
--- a/components/trnForm/TrnFormHeader.vue
+++ b/components/trnForm/TrnFormHeader.vue
@@ -16,8 +16,8 @@ export default {
.trnFormHeader
display grid
grid-template-columns repeat(2, 1fr)
- grid-column-gap $m7
- grid-row-gap $m7
+ grid-column-gap $m8
+ grid-row-gap $m8
padding 0 $m7
padding-top 0
padding-bottom $m9
diff --git a/components/trnForm/TrnFormHeaderItemCategory.vue b/components/trnForm/TrnFormHeaderItemCategory.vue
index a27a5bae..54d46181 100644
--- a/components/trnForm/TrnFormHeaderItemCategory.vue
+++ b/components/trnForm/TrnFormHeaderItemCategory.vue
@@ -29,12 +29,11 @@ export default {
.trnFormHeaderItem__name
.text-xs.text-neutral-500(
v-if="parentCategory"
- class="dark:text-neutral-400"
+ class="dark_text-neutral-400"
) {{ parentCategory.name }}
- .text-sm.text-neutral-700(class="dark:text-neutral-300") {{ category.name }}
+ .text-sm.text-neutral-700(class="dark_text-neutral-300") {{ category.name }}
- .trnFormHeaderItem__dots.text-neutral-500(
- class="dark:text-neutral-400"
+ .trnFormHeaderItem__dots.text-neutral-500.dark_text-neutral-400(
): .mdi.mdi-dots-vertical
</template>
diff --git a/components/trnForm/TrnFormHeaderItemWallet.vue b/components/trnForm/TrnFormHeaderItemWallet.vue
index ebceed47..62932016 100644
--- a/components/trnForm/TrnFormHeaderItemWallet.vue
+++ b/components/trnForm/TrnFormHeaderItemWallet.vue
@@ -23,7 +23,7 @@ export default {
)
.trnFormHeaderItem__dots.text-neutral-500(
- class="dark:text-neutral-400"
+ class="dark_text-neutral-400"
): .mdi.mdi-dots-vertical
</template>
diff --git a/components/trnForm/TrnFormHeaderTransfer.vue b/components/trnForm/TrnFormHeaderTransfer.vue
index d4c869a6..bac0f0d1 100644
--- a/components/trnForm/TrnFormHeaderTransfer.vue
+++ b/components/trnForm/TrnFormHeaderTransfer.vue
@@ -1,88 +1,156 @@
-<script>
-export default {
- fetch() {
- if (this.$store.state.trnForm.values.amountType === 2) {
- this.$store.commit('trnForm/setTrnFormValues', {
- walletFromId: this.walletFromId,
- walletToId: this.walletToId,
- })
- }
- else {
- this.$store.commit('trnForm/setTrnFormTransfer', {
- tranferType: 'from',
- walletId: this.walletFromId,
- })
- this.$store.commit('trnForm/setTrnFormTransfer', {
- tranferType: 'to',
- walletId: this.walletToId,
- })
- }
- },
-
- computed: {
- walletFromId() {
- return this.$store.state.trnForm.values.walletFromId || this.$store.state.trnForm.values.walletId || this.$store.getters['wallets/walletsSortedIds'][0]
- },
- walletFrom() {
- return this.$store.state.wallets.items && this.$store.state.wallets.items[this.walletFromId]
- },
- walletToId() {
- return this.$store.state.trnForm.values.walletToId || this.$store.getters['wallets/walletsSortedIds'][1] || this.$store.state.trnForm.values.walletId
- },
- walletTo() {
- return this.$store.state.wallets.items && this.$store.state.wallets.items[this.walletToId]
- },
- },
+<script setup lang="ts">
+const { $store } = useNuxtApp()
+
+// Expense
+const expenseWalletId = computed(() => {
+ const expenseWalletId = $store.state.trnForm.values.expenseWalletId
+ const walletFromId = $store.state.trnForm.values.walletFromId
+ const firstWalletId = $store.getters['wallets/walletsSortedIds'][0]
+ return expenseWalletId || walletFromId || firstWalletId
+})
+const expenseWallet = computed(() => $store.state.wallets.items[expenseWalletId.value])
+const expenseWalletTotal = computed(() => $store.getters['wallets/walletsTotal'][expenseWalletId.value].base)
+
+// Income
+const incomeWalletId = computed(() => {
+ const incomeWalletId = $store.state.trnForm.values.incomeWalletId
+ const walletToId = $store.state.trnForm.values.walletToId
+ const secondWalletId = $store.getters['wallets/walletsSortedIds'][1]
+ return incomeWalletId || walletToId || secondWalletId
+})
+const incomeWallet = computed(() => $store.state.wallets.items[incomeWalletId.value])
+const incomeWalletTotal = computed(() => $store.getters['wallets/walletsTotal'][incomeWalletId.value].base)
+
+if ($store.state.trnForm.values.amountType === 2) {
+ $store.commit('trnForm/setTrnFormValues', {
+ expenseWalletId: expenseWalletId.value,
+ incomeWalletId: incomeWalletId.value,
+ })
+}
+
+const isSameCurency = computed(() => incomeWallet.value?.currency === expenseWallet.value?.currency)
+
+function changeAmount(tranferType: 'income' | 'expense', event: any) {
+ $store.commit('trnForm/setTrnFormValues', {
+ [`${tranferType}Amount`]: Number(event.target.value),
+ })
}
+
</script>
<template lang="pug">
-.trnFormHeader(
- v-if="$store.getters['wallets/walletsSortedIds'].length > 1"
-)
- //- Wallet from
- template(v-if="walletFrom")
- .trnFormHeaderItem
- .trnFormHeaderItem__desc {{ $t('trnForm.transfer.fromLong') }}
- WalletsItemWalletItem(
- :id="walletFromId"
- :showBase="false"
- isAltColor
- ui="tile"
- @onClick="$store.commit('trnForm/showTrnFormModal', 'transferFrom')"
- )
-
- .trnFormHeaderSeparator: .mdi.mdi-chevron-right
-
- //- Wallet to
- template(v-if="walletTo")
- .trnFormHeaderItem
- .trnFormHeaderItem__desc {{ $t('trnForm.transfer.toLong') }}
- WalletsItemWalletItem(
- :id="walletToId"
- :showBase="false"
- isAltColor
- ui="tile"
- @onClick="$store.commit('trnForm/showTrnFormModal', 'transferTo')"
- )
+div(v-if="$store.getters['wallets/walletsSortedIds'].length > 1")
+ //- isSameCurency
+ template(v-if="!isSameCurency")
+ .pb-8.px-4.grid.gap-6(class="grid-cols-[1fr_auto]")
+ .grid.gap-4
+ div
+ .opacity-80.pb-1.text-xs.leading-none {{ $t('trnForm.transfer.fromLong') }}
+ .overflow-hidden.rounded-xl.bg-custom4
+ .flex.items-center.gap-4.py-4.px-4.hocus_bg-gray-100.dark_hocus_bg-neutral-800.rounded-xl(
+ @click="$store.commit('trnForm/showTrnFormModal', 'transferFrom')"
+ )
+ .rounded-full.w-8.h-8.flex-center.text-xs.text-neutral-50(
+ :style="{ background: expenseWallet.color }"
+ ) {{ expenseWallet.currency }}
+
+ .grow.text-neutral-300
+ .text-base.leading-none {{ expenseWallet.name }}
+ Amount(
+ :currency="expenseWallet.currency"
+ :showBase="showBase"
+ :size="size"
+ :value="expenseWalletTotal"
+ vertical="left"
+ alwaysShowSymbol
+ )
+
+ .mdi.mdi-dots-vertical.text-xl.leading-none
+
+ input.w-full.p-3.bg-transparent.text-3xl.text-center.font-unica.text-expense.focus_bg-neutral-800(
+ :value="$store.state.trnForm.values.expenseAmount"
+ type="number"
+ @input="event => changeAmount('expense', event)"
+ )
+
+ div
+ .opacity-80.pb-2.text-xs.leading-none {{ $t('trnForm.transfer.toLong') }}
+ .overflow-hidden.rounded-xl.bg-custom4
+ .flex.items-center.gap-4.py-4.px-4.hocus_bg-gray-100.dark_hocus_bg-neutral-800.rounded-xl(
+ @click="$store.commit('trnForm/showTrnFormModal', 'transferTo')"
+ )
+ .rounded-full.w-8.h-8.flex-center.text-xs.text-neutral-50(
+ :style="{ background: incomeWallet.color }"
+ ) {{ incomeWallet.currency }}
+
+ .grow.text-neutral-300
+ .text-base.leading-none {{ incomeWallet.name }}
+ Amount(
+ :currency="incomeWallet.currency"
+ :showBase="showBase"
+ :size="size"
+ :value="incomeWalletTotal"
+ vertical="left"
+ alwaysShowSymbol
+ )
+
+ .mdi.mdi-dots-vertical.text-xl.leading-none
+
+ input.w-full.p-3.bg-transparent.text-3xl.text-center.font-unica.text-income.focus_bg-neutral-800(
+ :value="$store.state.trnForm.values.incomeAmount"
+ type="number"
+ @input="event => changeAmount('income', event)"
+ )
+
+ .grid.gap-2(class="grid-rows-[auto,1fr]")
+ .p-3.text-center.rounded-full.opacity-80.hocus_bg-neutral-700(
+ :class="['h-[58px]', { 'text-blue1': $store.state.trnForm.values.description }]"
+ @click="$store.commit('trnForm/showTrnFormModal', 'description')"
+ )
+ .mdi.mdi-comment-text-outline.text-2xl
+
+ .cursor-pointer.flex.items-center.justify-center.h-full.bg-blue3.hocus_bg_blue2.rounded-md.text-white.text-3xl(
+ class="w-[58px]"
+ @click="$emit('onSubmit')"
+ )
+ .mdi.mdi-equal
+
+ //- Same
+ .relative.trnFormHeader(v-if="isSameCurency")
+ //- Wallet from
+ template(v-if="expenseWallet")
+ .trnFormHeaderItem
+ .text-xs.text-neutral-400.pb-1 {{ $t('trnForm.transfer.fromLong') }}
+ WalletsItemWalletItem(
+ :id="expenseWalletId"
+ :showBase="false"
+ isAltColor
+ ui="tile"
+ @onClick="$store.commit('trnForm/showTrnFormModal', 'transferFrom')"
+ )
+
+ .trnFormHeaderSeparator: .mdi.mdi-chevron-right
+
+ //- Wallet to
+ template(v-if="incomeWallet")
+ .trnFormHeaderItem
+ .text-xs.text-neutral-400.pb-1 {{ $t('trnForm.transfer.toLong') }}
+ WalletsItemWalletItem(
+ :id="incomeWalletId"
+ :showBase="false"
+ isAltColor
+ ui="tile"
+ @onClick="$store.commit('trnForm/showTrnFormModal', 'transferTo')"
+ )
</template>
<style lang="stylus" scoped>
-.trnFormHeader
- position relative
-
.trnFormHeaderSeparator
z-index 2
position absolute
- top 22px
+ top 28px
left 50%
color var(--c-font-3)
font-size 32px
transform translate(-50%)
-
-.trnFormHeaderItem
- &__desc
- margin-bottom 2px
- color var(--c-font-4)
- font-size 12px
</style>
diff --git a/components/trnForm/TrnFormTrns.vue b/components/trnForm/TrnFormTrns.vue
index 0a4ca737..6dba2b89 100644
--- a/components/trnForm/TrnFormTrns.vue
+++ b/components/trnForm/TrnFormTrns.vue
@@ -1,4 +1,6 @@
<script lang="ts">
+import { getTrnsIds } from '~/components/trns/functions/getTrns'
+
export default defineComponent({
props: {
categoryId: { type: String, default: null },
@@ -25,27 +27,26 @@ export default defineComponent({
return this.trnsIds.slice(0, end)
},
- filterTrns() {
- const filter = {}
+ trnsIds() {
+ const trnsItems = this.$store.state.trns.items
+
+ const filter = {
+ walletsIds: null,
+ categoriesIds: null,
+ }
+
if (this.filterBy === 'wallet') {
- filter.walletId = this.$store.state.trnForm.values.walletId
+ filter.walletsIds = [this.$store.state.trnForm.values.walletId]
}
else if (this.filterBy === 'walletAndCategory') {
- filter.walletId = this.$store.state.trnForm.values.walletId
- filter.categoryId = this.$store.state.trnForm.values.categoryId
- }
- return filter
- },
+ const catId = this.$store.state.trnForm.values.categoryId
+ const category = this.$store.state.categories.items[catId]
- trnsIds() {
- const trns = this.$store.state.trns.items
- let trnsIds = this.$store.getters['trns/getTrnsIds']({
- ...this.filterTrns,
- })
+ filter.walletsIds = [this.$store.state.trnForm.values.walletId]
+ filter.categoriesIds = category?.childIds ? category?.childIds : [catId]
+ }
- // from category
- if (this.categoryId)
- trnsIds = trnsIds.filter(trnId => trns[trnId].categoryId === this.categoryId)
+ const trnsIds = getTrnsIds({ ...filter, trnsItems })
// limit
if (this.limit > 0) return trnsIds.slice(0, this.limit)
@@ -103,7 +104,10 @@ export default defineComponent({
.containerWrap(v-if="trnsIds.length === 0") No transactions
.scrollBlock
- .m-3.overflow-hidden.rounded-md.bg-dark4(
+ .pt-5
+ .subTitle.text-center.pb-1.text-xs {{ $t('trns.history') }}
+
+ .mx-3.my-2.overflow-hidden.rounded-md.bg-dark4(
v-for="(trnsIds, date) in groupedTrns"
:key="date"
)
@@ -122,17 +126,25 @@ export default defineComponent({
.pages(v-if="!isShowedAllTrns")
.button(@click="showMoreTrns") {{ $t('trns.more') }}
- .pt-2.pb-5.px-3.justify-center.flex
- .overflow-hidden.bg-dark4.rounded-md.justify-center.items-center.flex
- .barItem.px-6.py-3.font5.text-xs(@click="changeFilter('wallet')" :class="{ _active: filterBy === 'wallet' }") {{ $t('trnForm.filterWallet') }}
- .barItem.px-6.py-3.font5.text-xs(@click="changeFilter('walletAndCategory')" :class="{ _active: filterBy === 'walletAndCategory' }") {{ $t('trnForm.filterWalletAndCategory') }}
- .barItem.px-6.py-3.font5.text-xs(@click="changeFilter('all')" :class="{ _active: filterBy === 'all' }") {{ $t('trnForm.filterAll') }}
+ .pt-2.pb-5.px-3
+ .overflow-hidden.rounded-md.items-center.flex.text-xs.text-center.bg-gray-50.dark_bg-dark4.dark_shadow
+ .cursor-pointer.px-6.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': filterBy === 'wallet' }"
+ @click="changeFilter('wallet')"
+ ) {{ $t('trnForm.filterWallet') }}
+
+ .cursor-pointer.px-6.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': filterBy === 'walletAndCategory' }"
+ @click="changeFilter('walletAndCategory')"
+ ) {{ $t('trnForm.filterWalletAndCategory') }}
+
+ .cursor-pointer.px-6.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': filterBy === 'all' }"
+ @click="changeFilter('all')"
+ ) {{ $t('trnForm.filterAll') }}
</template>
<style lang="stylus" scoped>
-.button
- button-base-1()
-
.containerWrap
display flex
align-items center
@@ -161,7 +173,9 @@ export default defineComponent({
overflow-y auto
scrollbar()
-.scrollBlock
- padding-top $m6
- padding-bottom $m8
+.subTitle
+ color var(--c-font-4)
+ letter-spacing 0px
+ font-weight 600
+ text-transform uppercase
</style>
diff --git a/components/trnForm/TrnFormTypes.vue b/components/trnForm/TrnFormTypes.vue
index f07e26b7..30494dbe 100644
--- a/components/trnForm/TrnFormTypes.vue
+++ b/components/trnForm/TrnFormTypes.vue
@@ -22,21 +22,21 @@ export default {
</script>
<template lang="pug">
-.flex.justify-center
- .overflow-hidden.flex.items-center.bg-dark4.rounded-md
- .barItem.px-6.py-2.font5.text-sm(
+.px-4.pb-4.text-center
+ .overflow-hidden.flex.items-center.text-sm.rounded-md.bg-gray-50.dark_bg-dark4.dark_shadow
+ .cursor-pointer.px-6.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': amountType === 0 }"
@click="() => setAmountType(0)"
- :class="{ _active: amountType === 0 }"
) {{ $t('money.expenses') }}
- .barItem.px-6.py-2.font5.text-sm(
+ .cursor-pointer.px-6.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': amountType === 1 }"
@click="() => setAmountType(1)"
- :class="{ _active: amountType === 1 }"
) {{ $t('money.incomes') }}
- .barItem.px-6.py-2.font5.text-sm(
+ .cursor-pointer.px-6.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
v-if="$store.getters['wallets/walletsSortedIds'].length > 1"
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': amountType === 2 }"
@click="() => setAmountType(2)"
- :class="{ _active: amountType === 2 }"
) {{ $t('trnForm.transferTitle') }}
</template>
diff --git a/components/trnForm/calculator/TrnFormCalculator.vue b/components/trnForm/calculator/TrnFormCalculator.vue
index ff7d8b6b..1e731720 100644
--- a/components/trnForm/calculator/TrnFormCalculator.vue
+++ b/components/trnForm/calculator/TrnFormCalculator.vue
@@ -44,7 +44,7 @@ export default {
</script>
<template lang="pug">
-.trnFormCalculator
+.trnFormCalculator.px-4.pb-4
.trnFormCalculator__group
.trnFormCalculator__acts
.calcItem._act(@click="handleTouch('+')")
@@ -91,13 +91,20 @@ export default {
.calcItem__in C
.trnFormCalculator__group
- .trnFormCalculator__action
- .calcItem._sum(@click="isSum ? $emit('onSubmit') : handleTouch('=')")
- .calcItem__in
- template(v-if="isSum")
- .mdi.mdi-check
- template(v-else)
- .mdi.mdi-equal
+ .grid.gap-2(class="grid-rows-[auto,1fr]")
+ .p-3.text-center.rounded-full.opacity-80.hocus_bg-neutral-700(
+ :class="['h-[58px]', { 'text-blue1': $store.state.trnForm.values.description }]"
+ @click="$store.commit('trnForm/showTrnFormModal', 'description')"
+ )
+ .mdi.mdi-comment-text-outline.text-2xl
+
+ .trnFormCalculator__action
+ .calcItem._sum(@click="isSum ? $emit('onSubmit') : handleTouch('=')")
+ .calcItem__in
+ template(v-if="isSum")
+ .mdi.mdi-check
+ template(v-else)
+ .mdi.mdi-equal
</template>
<style lang="stylus" scoped>
@@ -110,7 +117,6 @@ export default {
align-items stretch
grid-column-gap $m8
grid-row-gap $m8
- padding $m7
&__group
display flex
@@ -144,7 +150,7 @@ export default {
font-secondary()
&._sum
- max-width 61px
+ max-width 58px
&__in
cursor pointer
diff --git a/components/trnForm/modal/TrnFormModalCatsChild.vue b/components/trnForm/modal/TrnFormModalCatsChild.vue
index f374cd44..c49df8fd 100644
--- a/components/trnForm/modal/TrnFormModalCatsChild.vue
+++ b/components/trnForm/modal/TrnFormModalCatsChild.vue
@@ -46,7 +46,7 @@ TrnFormModal(@closed="afterClose")
.pb_base
CategoriesView(
:ids="childCategoriesIds"
- :noPaddingBottom="true"
+ noPaddingBottom
@onClick="catId => handleCategoryClick(catId, close)"
)
</template>
diff --git a/components/trnForm/modal/TrnFormModalDescription.vue b/components/trnForm/modal/TrnFormModalDescription.vue
index 2cb10ea6..e07d7d74 100644
--- a/components/trnForm/modal/TrnFormModalDescription.vue
+++ b/components/trnForm/modal/TrnFormModalDescription.vue
@@ -54,7 +54,7 @@ TrnFormModal(@closed="afterClose")
.gap-4.items-center.justify-end.flex
.text-neutral-500.py-4.px-3.items-center.justify-center.flex(
- class="dark:text-neutral-400"
+ class="dark_text-neutral-400"
@click="handleCancel(close)"
) {{ $t('close') }}
.shame1.py-4.px-6.rounded-full.items-center.justify-center.flex(
diff --git a/components/trnForm/modal/TrnFormModalTransferFrom.vue b/components/trnForm/modal/TrnFormModalTransferFrom.vue
index 56947164..256751c2 100644
--- a/components/trnForm/modal/TrnFormModalTransferFrom.vue
+++ b/components/trnForm/modal/TrnFormModalTransferFrom.vue
@@ -1,32 +1,20 @@
-<script>
-export default {
- setup() {
- const { $store } = useNuxtApp()
+<script setup lang="ts">
+const { $store } = useNuxtApp()
- function onClickWallet(walletId, close) {
- $store.commit('trnForm/setTrnFormValues', {
- walletFromId: walletId,
- walletId,
- })
- close()
- }
-
- function afterClose() {
- $store.commit('trnForm/closeTrnFormModal', 'transferFrom')
- }
+function onClickWallet(walletId, close) {
+ $store.commit('trnForm/setTrnFormValues', { expenseWalletId: walletId })
+ close()
+}
- return {
- onClickWallet,
- afterClose,
- }
- },
+function afterClose() {
+ $store.commit('trnForm/closeTrnFormModal', 'transferFrom')
}
</script>
<template lang="pug">
TrnFormModal(@closed="afterClose")
template(#header)
- template Transfer from wallet
+ template {{ $t('transfer') }}
template(#default="{ close }")
.trnFormWalletsList.scrollerBlock
@@ -40,3 +28,14 @@ TrnFormModal(@closed="afterClose")
height 100%
padding-bottom 16px
</style>
+
+<i18n lang="json5">
+{
+ "en": {
+ "transfer": "Transfer from wallet",
+ },
+ "ru": {
+ "transfer": "Перевод из кошелька",
+ },
+}
+</i18n>
diff --git a/components/trnForm/modal/TrnFormModalTransferTo.vue b/components/trnForm/modal/TrnFormModalTransferTo.vue
index bbad0bf7..8e0b0a30 100644
--- a/components/trnForm/modal/TrnFormModalTransferTo.vue
+++ b/components/trnForm/modal/TrnFormModalTransferTo.vue
@@ -1,32 +1,20 @@
-<script lang="ts">
-export default {
- setup() {
- const { $store } = useNuxtApp()
+<script setup lang="ts">
+const { $store } = useNuxtApp()
- function onClickWallet(walletId, close) {
- $store.commit('trnForm/setTrnFormValues', {
- walletToId: walletId,
- walletId,
- })
- close()
- }
-
- function afterClose() {
- $store.commit('trnForm/closeTrnFormModal', 'transferTo')
- }
+function onClickWallet(walletId, close) {
+ $store.commit('trnForm/setTrnFormValues', { incomeWalletId: walletId })
+ close()
+}
- return {
- onClickWallet,
- afterClose,
- }
- },
+function afterClose() {
+ $store.commit('trnForm/closeTrnFormModal', 'transferTo')
}
</script>
<template lang="pug">
TrnFormModal(@closed="afterClose")
template(#header)
- template Transfer to wallet
+ template {{ $t('transfer') }}
template(#default="{ close }")
.trnFormWalletsList.scrollerBlock
@@ -40,3 +28,14 @@ TrnFormModal(@closed="afterClose")
height 100%
padding-bottom 16px
</style>
+
+<i18n lang="json5">
+{
+ "en": {
+ "transfer": "Transfer to wallet",
+ },
+ "ru": {
+ "transfer": "Перевод в кошелек",
+ },
+}
+</i18n>
diff --git a/components/trnForm/useTrnFormValidate.ts b/components/trnForm/useTrnFormValidate.ts
index 0e390689..7acf11a8 100644
--- a/components/trnForm/useTrnFormValidate.ts
+++ b/components/trnForm/useTrnFormValidate.ts
@@ -2,7 +2,7 @@ export default function useTrnFormValidate() {
function validate(values: any) {
const errorTitle = '😮'
- if (!values.amount) {
+ if (!values.amount && values.type !== 2) {
return {
error: {
title: errorTitle,
@@ -11,7 +11,7 @@ export default function useTrnFormValidate() {
}
}
- if (values.amount <= 0) {
+ if (values.amount <= 0 && values.type !== 2) {
return {
error: {
title: errorTitle,
@@ -20,7 +20,7 @@ export default function useTrnFormValidate() {
}
}
- if (values.amount === 0) {
+ if (values.amount === 0 && values.type !== 2) {
return {
error: {
title: errorTitle,
@@ -49,20 +49,20 @@ export default function useTrnFormValidate() {
// Transfer
if (values.type === 2) {
- if (values.walletFromId === values.walletToId) {
+ if (Number(values.incomeAmount) === 0 || Number(values.expenseAmount) === 0) {
return {
error: {
title: errorTitle,
- text: 'Transfer in same wallet',
+ text: 'Amount can not be empty',
},
}
}
- if (values.walletFrom.currency !== values.walletTo.currency) {
+ if (values.incomeWalletId === values.expenseWalletId) {
return {
error: {
title: errorTitle,
- text: 'Sorry, transfer between wallets with different currency in development',
+ text: 'Transfer in same wallet',
},
}
}
diff --git a/components/trns/History.vue b/components/trns/History.vue
new file mode 100644
index 00000000..18011dd9
--- /dev/null
+++ b/components/trns/History.vue
@@ -0,0 +1,66 @@
+<script setup lang="ts">
+import type { TrnID } from '~/components/trns/types'
+
+type TrnType = null | 0 | 1 | 2
+
+interface Props {
+ hideTransfers?: boolean
+ trnsIds: TrnID[]
+ trnType: TrnType
+}
+
+const props = withDefaults(defineProps<Props>(), {
+ hideTransfers: false,
+})
+
+const emit = defineEmits(['setFilterTrnType'])
+
+const trnsCount = computed(() => props.trnsIds.length)
+const setTrnType = (value: TrnType) => emit('setFilterTrnType', value)
+</script>
+
+<template lang="pug">
+div
+ //- Trns: Title
+ .statTitle.flex.gap-2(class="!pb-3")
+ div {{ $t('trns.inPeriodTitle') }}:
+ div {{ trnsCount }}
+
+ //- Trns: TypeSelector
+ .overflow-hidden.rounded-md.scrollbar.mb-4.bg-gray-50.dark_bg-dark4.dark_shadow
+ .overflow-hidden.overflow-x-auto.flex.items-center.text-sm.text-center.max-w-md
+ .cursor-pointer.px-6.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': props.trnType === null }"
+ @click="setTrnType(null)"
+ ) {{ $t('common.all') }}
+
+ .cursor-pointer.px-6.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': props.trnType === 0 }"
+ @click="setTrnType(0)"
+ ) {{ $t('money.expenses') }}
+
+ .cursor-pointer.px-6.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': props.trnType === 1 }"
+ @click="setTrnType(1)"
+ ) {{ $t('money.incomes') }}
+
+ .cursor-pointer.px-6.py-3.grow.hocus_bg-gray-200.dark_hocus_bg-neutral-800(
+ v-if="!hideTransfers"
+ :class="{ '_active cursor-default text-blue3 dark_text-blue1 bg-gray-100 dark_bg-232323': trnType === 2 }"
+ @click="setTrnType(2)"
+ ) {{ $t('transfer.titleMany') }}
+
+ //- Trns: Nothing
+ .py-6.text-center(v-if="trnsCount === 0")
+ .text-7xl.mdi.mdi-palm-tree
+ .text-md No Transactions
+
+ //- Trns: Items
+ .pb-10
+ .grid.md_grid-cols-2.md_gap-x-20
+ TrnsListHistory(
+ :size="50"
+ :trnsIds="trnsIds"
+ isShowFilter
+ )
+</template>
diff --git a/components/trns/Modal.vue b/components/trns/Modal.vue
index a821fedc..db327dc3 100644
--- a/components/trns/Modal.vue
+++ b/components/trns/Modal.vue
@@ -5,7 +5,7 @@ import useCalculator from '~/components/trnForm/calculator/useCalculator'
export default {
setup() {
const { $store } = useNuxtApp()
- const { setCategoryFilter, setWalletFilter } = useFilter()
+ const { setFilterCatsId, setFilterWalletsId } = useFilter()
const closed = () => {
$store.commit('trns/hideTrnModal')
@@ -13,8 +13,8 @@ export default {
}
return {
- setCategoryFilter,
- setWalletFilter,
+ setFilterCatsId,
+ setFilterWalletsId,
closed,
}
},
@@ -22,6 +22,7 @@ export default {
data() {
return {
showModalConfirm: false,
+ showModalGroups: false,
}
},
@@ -29,20 +30,23 @@ export default {
trnId() {
return this.$store.state.trns.modal.id
},
+
trn() {
return this.$store.state.trns.items[this.trnId]
},
+
category() {
return this.$store.state.categories.items[this.$store.state.trns.items[this.trnId].categoryId]
},
+
wallet() {
return this.$store.state.wallets.items[this.$store.state.trns.items[this.trnId].walletId]
- },
+ }
},
methods: {
handleSetFilterCategory() {
- this.setCategoryFilter(this.$store.state.trns.items[this.trnId].categoryId)
+ this.setFilterCatsId(this.$store.state.trns.items[this.trnId].categoryId)
this.$store.commit('filter/setFilterDateNow')
this.$store.commit('trns/hideTrnModal')
this.$store.commit('trns/setTrnModalId', null)
@@ -51,7 +55,7 @@ export default {
},
handleSetFilterWallet() {
- this.setWalletFilter(this.$store.state.trns.items[this.trnId].walletId)
+ this.setFilterWalletsId(this.$store.state.trns.items[this.trnId].walletId)
this.$store.commit('trns/hideTrnModal')
this.$store.commit('trns/setTrnModalId', null)
this.$store.commit('filter/setFilterDateNow')
@@ -75,7 +79,7 @@ export default {
this.$store.commit('stat/setCategoryModal', { id: null, type: null })
const { setExpression } = useCalculator()
- setExpression(trn.amount)
+ setExpression(trn.type === 2 && trn.incomeAmount ? trn.incomeAmount : trn.amount)
},
handleDeleteClick() {
@@ -89,7 +93,7 @@ export default {
this.showModalConfirm = false
this.$store.commit('trns/hideTrnModal')
this.$store.commit('trns/setTrnModalId', null)
- },
+ }
},
}
</script>
@@ -113,14 +117,14 @@ Portal(
.header__category
TrnsItemTrnItem(
:category="category"
- :trn="$store.state.trns.items[trnId]"
+ :trn="trn"
:trnId="trnId"
:wallet="wallet"
ui="detailed"
)
template(#default="{ close }")
- .content
+ .content.pb-4
.tools
.modalLinks
ModalButton(
@@ -153,6 +157,7 @@ Portal(
)
ModalButton(
+ v-if="wallet"
:name="`${$t('base.setFilter')} ${wallet.name}`"
@onClick="handleSetFilterWallet"
)
@@ -163,7 +168,7 @@ Portal(
)
.wrap
- .button(
+ .button.my-2.mx-auto(
@click="close()"
) {{ $t('close') }}
@@ -211,6 +216,7 @@ Portal(
flex-grow 1
.content
+ background var(--c-bg-3)
+media(600px)
border-radius 0 0 $m7 $m7
@@ -219,5 +225,4 @@ Portal(
.button
button-base-1()
- margin $m8 auto $m5 auto
</style>
diff --git a/components/trns/functions/getTrns.ts b/components/trns/functions/getTrns.ts
new file mode 100644
index 00000000..6e1e45aa
--- /dev/null
+++ b/components/trns/functions/getTrns.ts
@@ -0,0 +1,69 @@
+import dayjs from 'dayjs'
+import type { TrnID, TrnItem, TrnType } from '~/components/trns/types'
+import type { WalletID } from '~/components/wallets/types'
+
+type PeriodName = 'day' | 'week' | 'month' | 'year' | 'all'
+type Date = number
+interface Props {
+ trnsItems: Record<string, TrnItem>
+ walletsIds?: WalletID[]
+ categoriesIds?: WalletID[]
+ trnType?: TrnType
+ periodName?: PeriodName
+ date?: Date
+}
+
+export const getTrnsIds = (props: Props) => {
+ let trnsIds: TrnID[] = Object.keys(props.trnsItems)
+ const getTrn = (trnId: TrnID) => props.trnsItems[trnId]
+
+ // Type
+ if (props.trnType !== undefined && props.trnType !== null) {
+ trnsIds = trnsIds.filter((trnId: TrnID) => {
+ const trn = getTrn(trnId)
+ return trn.type === props.trnType
+ })
+ }
+
+ // Date
+ if (props?.date && props?.periodName !== 'all') {
+ const filterDate = dayjs(props.date)
+ const filterPeriod = props.periodName
+ const fromDate = filterDate.startOf(filterPeriod).valueOf()
+ const untilDate = filterDate.endOf(filterPeriod).valueOf()
+
+ trnsIds = trnsIds.filter(trnId =>
+ (props.trnsItems[trnId].date >= fromDate)
+ && (props.trnsItems[trnId].date <= untilDate))
+ }
+
+ // Wallet
+ if (props.walletsIds?.length > 0) {
+ trnsIds = trnsIds.filter((trnId: TrnID) => {
+ const trn = getTrn(trnId)
+ return props.walletsIds?.includes(trn?.walletId)
+ || props.walletsIds?.includes(trn?.expenseWalletId)
+ || props.walletsIds?.includes(trn?.incomeWalletId)
+ || props.walletsIds?.includes(trn?.walletToId)
+ || props.walletsIds?.includes(trn?.walletFromId)
+ })
+ }
+
+ // Category
+ if (props.categoriesIds?.length > 0) {
+ trnsIds = trnsIds.filter((trnId: TrnID) => {
+ const trn = getTrn(trnId)
+ return props.categoriesIds?.includes(trn?.categoryId)
+ })
+ }
+
+ // Sort
+ trnsIds = trnsIds
+ .sort((a, b) => {
+ if (props.trnsItems[a].date > props.trnsItems[b].date) return -1
+ if (props.trnsItems[a].date < props.trnsItems[b].date) return 1
+ return 0
+ })
+
+ return trnsIds
+}
diff --git a/components/trns/functions/trns.test.ts b/components/trns/functions/trns.test.ts
new file mode 100644
index 00000000..1655557e
--- /dev/null
+++ b/components/trns/functions/trns.test.ts
@@ -0,0 +1,82 @@
+import { describe, expect, it } from 'vitest'
+import type { TrnItem, TrnTransaction, TrnTransfer } from '~/components/trns/types'
+import { TrnType } from '~/components/trns/types'
+import { getWalletAmount } from '~/components/wallets/functions/getWalletAmount'
+import { getTrnsIds } from '~/components/trns/functions/getTrns'
+
+describe('trns', () => {
+ const trnsItems = {
+ incomeTransaction: {
+ categoryId: 'income',
+ walletId: 'walletId1',
+ type: TrnType.Income,
+ amount: 1000,
+ } as TrnTransaction,
+
+ expenseTransaction: {
+ type: TrnType.Expense,
+ categoryId: 'expense',
+ walletId: 'walletId1',
+ amount: 400,
+ } as TrnItem,
+
+ transferSameCurrncy: {
+ type: TrnType.Transfer,
+ categoryId: 'transfer',
+ incomeAmount: 40,
+ incomeWalletId: 'walletId2',
+ expenseAmount: 40,
+ expenseWalletId: 'walletId1',
+ } as TrnTransfer,
+
+ transferReverse: {
+ type: TrnType.Transfer,
+ categoryId: 'transfer',
+ incomeAmount: 10,
+ incomeWalletId: 'walletId1',
+ expenseAmount: 30,
+ expenseWalletId: 'walletId2',
+ } as TrnTransfer,
+
+ transferDifCurrncy: {
+ type: TrnType.Transfer,
+ categoryId: 'transfer',
+ incomeAmount: 20,
+ incomeWalletId: 'walletId2',
+ expenseAmount: 10,
+ expenseWalletId: 'walletId1',
+ } as TrnTransfer,
+ }
+
+ const trnsIdsInWallet1 = getTrnsIds({ walletsIds: ['walletId1'], trnsItems })
+ const wallet1Amount = getWalletAmount({
+ walletId: 'walletId1',
+ trnsIds: trnsIdsInWallet1,
+ trnsItems,
+ })
+ const trnsIdsInWallet2 = getTrnsIds({ walletsIds: ['walletId2'], trnsItems })
+
+ const wallet2Amount = getWalletAmount({
+ walletId: 'walletId2',
+ trnsIds: trnsIdsInWallet2,
+ trnsItems,
+ })
+
+ it('get right trns', () => {
+ expect(trnsIdsInWallet1).toEqual(['incomeTransaction', 'expenseTransaction', 'transferSameCurrncy', 'transferReverse', 'transferDifCurrncy'])
+ expect(trnsIdsInWallet2).toEqual(['transferSameCurrncy', 'transferReverse', 'transferDifCurrncy'])
+ })
+
+ it('get right amount', () => {
+ expect(wallet1Amount).toEqual({
+ income: 1000 + 10,
+ expense: 400 + 40 + 10,
+ total: 1000 + 10 - 400 - 40 - 10,
+ })
+ expect(wallet2Amount).toEqual({
+ income: 40 + 20,
+ expense: 30,
+ total: 40 + 20 - 30,
+ })
+ })
+})
diff --git a/components/trns/item/Details.vue b/components/trns/item/Details.vue
deleted file mode 100644
index ea29fe51..00000000
--- a/components/trns/item/Details.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<script lang="ts">
-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.vue
index 3188160b..71893fe2 100644
--- a/components/trns/item/History.vue
+++ b/components/trns/item/History.vue
@@ -6,19 +6,19 @@ import useFilter from '~/modules/filter/useFilter'
export default defineComponent({
props: {
trnId: { type: String, required: true },
+ slider: { type: Object, default: () => {} },
},
- setup({ trnId }) {
+ setup(props) {
const { $store } = useNuxtApp()
const { setExpression } = useCalculator()
- const { setCategoryFilter } = useFilter()
+ const { setFilterCatsId } = useFilter()
const { formatTrnItem } = useTrn()
- const trnItem = computed(() => formatTrnItem(trnId))
+ const trnItem = computed(() => formatTrnItem(props.trnId))
const actions = {
onOpenDetails: () => {
if (!$store.state.trns.modal.show) {
- $store.commit('categories/hideCategoryModal')
$store.commit('trns/showTrnModal')
$store.commit('trns/setTrnModalId', trnItem.value.id)
}
@@ -26,19 +26,27 @@ export default defineComponent({
onOpenEdit: (event) => {
event.stopPropagation()
- setExpression(trnItem.value.amount)
+
+ if (props.slider)
+ props.slider.slideTo(1)
+
+ setExpression(trnItem.value.type === 2 && trnItem.value.incomeAmount ? trnItem.value.incomeAmount : trnItem.value.amount)
$store.dispatch('trnForm/openTrnForm', { action: 'edit', trnId: trnItem.value.id })
$store.commit('stat/setCategoryModal', { id: null, type: null })
},
onSetFilter: (event) => {
+ if (props.slider)
+ return
+
event.stopPropagation()
- setCategoryFilter(trnItem.value.categoryId)
+ setFilterCatsId(trnItem.value.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')
+ if ($store.state.ui.activeTabStat !== 'trns')
+ $store.dispatch('ui/setActiveTabStat', 'details')
},
}
@@ -52,20 +60,21 @@ export default defineComponent({
<template lang="pug">
.space-x-3.flex.cursor-context-menu(
- class="hocus:bg-neutral-100 dark:hocus:bg-neutral-800"
+ class="hocus_bg-neutral-100 dark_hocus_bg-neutral-800"
@click="actions.onOpenDetails"
)
- .cursor-pointer.text-neutral-50.text-xl.leading-none.w-8.h-8.rounded-full.justify-center.items-center.flex(
+ .text-neutral-50.text-xl.leading-none.w-8.h-8.rounded-full.justify-center.items-center.flex(
:style="{ background: trnItem.category.color }"
+ :class="[{ 'cursor-pointer': !slider }]"
@click="actions.onSetFilter"
): div(:class="trnItem.category.icon")
.grow
.items-center.flex
- .grow.text-neutral-500(class="dark:text-neutral-400")
+ .grow.text-neutral-500(class="dark_text-neutral-500")
//- Category
.pb-1.space-x-2.items-baseline.flex
- .text-sm.text-neutral-700(class="dark:text-neutral-300") {{ trnItem.category.name }}
+ .text-sm.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 •
@@ -80,21 +89,39 @@ export default defineComponent({
//- 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 }}
+ div {{ $t('trnForm.transfer.from') }}:
+ .text-neutral-500(class="dark_text-neutral-400") {{ trnItem.expenseWallet.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 }}
+ div {{ $t('trnForm.transfer.to') }}:
+ .text-neutral-500(class="dark_text-neutral-400") {{ trnItem.incomeWallet.name }}
//- Amount
.cursor-pointer
- Amount2(
- :amount="trnItem.amount"
- :currency="trnItem.wallet.currency"
- :type="trnItem.type"
- colorize="incomes"
- @click="actions.onOpenEdit"
- )
+ template(v-if="trnItem.type !== 2")
+ Amount2(
+ :amount="trnItem.amount"
+ :currency="trnItem.wallet.currency"
+ :type="trnItem.type"
+ colorize="incomes"
+ @click="actions.onOpenEdit"
+ )
+
+ template(v-if="trnItem.type === 2")
+ Amount2(
+ :amount="trnItem.expenseAmount || trnItem.amount"
+ :currency="trnItem.expenseWallet.currency"
+ :type="0"
+ colorize="expenses"
+ @click="actions.onOpenEdit"
+ )
+ Amount2(
+ v-if="(trnItem.expenseAmount || trnItem.amount) !== (trnItem.incomeAmount || trnItem.amount)"
+ :amount="trnItem.incomeAmount || trnItem.amount"
+ :currency="trnItem.incomeWallet.currency"
+ :type="1"
+ colorize="incomes"
+ @click="actions.onOpenEdit"
+ )
//- Description
.pt-2.text-neutral-500.text-xs.leading-none(
diff --git a/components/trns/item/TrnItem.vue b/components/trns/item/TrnItem.vue
index f41a1201..534d965b 100644
--- a/components/trns/item/TrnItem.vue
+++ b/components/trns/item/TrnItem.vue
@@ -32,24 +32,11 @@ export default {
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)
}
@@ -58,7 +45,7 @@ export default {
setTrnEdit() {
const trnId = this.trnId
const { setExpression } = useCalculator()
- setExpression(this.trn.amount)
+ setExpression(this.trn.type === 2 && this.trn.incomeAmount ? this.trn.incomeAmount : 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)
@@ -70,11 +57,55 @@ export default {
<template lang="pug">
.trnItem.py-3.px-3(
v-if="(category && wallet) || trn.type === 2"
- :class="{ ...className, 'py-2.5': true }"
+ :class="{ ...className, 'py-2.5': true, '!cursor-default': trn.type === 2 && trn.incomeAmount && trn.expenseAmount }"
@click="handleClick"
)
- //- Transfer
- template(v-if="trn.type === 2")
+ //- Transfer@next
+ template(v-if="trn.type === 2 && trn.incomeAmount && trn.expenseAmount")
+ .trnItem__categoryIcon
+ Icon(
+ :background="category.color"
+ :icon="category.icon"
+ big
+ round
+ )
+ .trnItem__categoryName {{ $t('trnForm.transferTitle') }}
+ .trnItem__date {{ formatedDate }}
+ .trnItem__wallet
+ WalletsItemWalletItem(
+ :id="trn.expenseWalletId"
+ isAltColor
+ ui="tile"
+ )
+ .trnFormHeaderSeparator: .mdi.mdi-chevron-right
+ WalletsItemWalletItem(
+ :id="trn.incomeWalletId"
+ isAltColor
+ ui="tile"
+ )
+ .trnItem__amount.flex.gap-3(@click.stop="setTrnEdit")
+ Amount(
+ :currency="$store.state.wallets.items[trn.expenseWalletId].currency"
+ :value="trn.expenseAmount"
+ :type="2"
+ vertical="center"
+ size="xl"
+ )
+ .trnFormHeaderSeparator: .mdi.mdi-chevron-right
+ Amount(
+ :currency="$store.state.wallets.items[trn.incomeWalletId].currency"
+ :value="trn.incomeAmount"
+ :type="2"
+ vertical="center"
+ size="xl"
+ )
+ .trnItem__desc.whitespace-pre.font-roboto.leading-none(
+ class="!dark_text-white/80 !text-xs"
+ v-if="trn.description"
+ ) {{ trn.description }}
+
+ //- Transfer@deprecated
+ template(v-else-if="trn.type === 2")
//- Transfer: Detailed
template(v-if="ui === 'detailed'")
.trnItem__categoryIcon
@@ -213,6 +244,7 @@ export default {
.trnItem__center
.trnItem__categoryName
| {{ category.name }}
+ .trnItem__groups(v-if="trn.groups") In group
.trnItem__wallet
.trnItem__walletIcon
@@ -355,6 +387,11 @@ export default {
^[0]._stat &
padding-right 20px
+ &__groups
+ display inline-block
+ padding-left 10px
+ font-size 10px
+
// Stat
// ----------------------------------------------------------------------------
.trnItem._stat._history
diff --git a/components/trns/item/WithoutCat.vue b/components/trns/item/WithoutCat.vue
index f12d34c0..59bed63d 100644
--- a/components/trns/item/WithoutCat.vue
+++ b/components/trns/item/WithoutCat.vue
@@ -8,11 +8,11 @@ export default defineComponent({
trnId: { type: String, required: true },
},
- setup({ trnId, actions }) {
+ setup(props) {
const { formatTrnItem, formatDate } = useTrn()
- const trnItem = computed(() => formatTrnItem(trnId))
- // @ts-expect-error
- const { onOpenDetails, onOpenEdit, onSetFilter } = actions(trnItem.value)
+ const trnItem = computed(() => formatTrnItem(props.trnId))
+ // @ts-expect-error todo
+ const { onOpenDetails, onOpenEdit, onSetFilter } = props.actions(trnItem.value)
return {
trnItem,
@@ -28,7 +28,7 @@ export default defineComponent({
<template lang="pug">
.cursor-context-menu.space-x-4.flex.text-neutral-500(
- class="dark:text-neutral-400 hocus:bg-neutral-100 dark:hocus:bg-neutral-800"
+ class="dark_text-neutral-400 hocus_bg-neutral-100 dark_hocus_bg-neutral-800"
@click="onOpenDetails"
)
.truncate.shrink-0.text-xs.leading-none(
@@ -47,11 +47,11 @@ export default defineComponent({
//- 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 }}
+ .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 }}
+ .text-neutral-600(class="dark_text-neutral-500") {{ $t('trnForm.transfer.to') }}:
+ .text-neutral-500(class="dark_text-neutral-400") {{ trnItem.walletTo.name }}
//- Amount
.cursor-pointer
diff --git a/components/trns/item/useTrn.ts b/components/trns/item/useTrn.ts
index 11d23df6..3a0fc701 100644
--- a/components/trns/item/useTrn.ts
+++ b/components/trns/item/useTrn.ts
@@ -15,11 +15,6 @@ export default function useTrn() {
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)
@@ -33,36 +28,48 @@ export default function useTrn() {
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-expect-error
+ // @ts-expect-error todo
dateFormated = `${dateFormated.weekday}, ${dateFormated.day} ${dateFormated.month} ${dateFormated.year}`
- return {
- id,
- ...trn,
- dateFormated,
- category,
- categoryParent,
- walletFrom,
- walletTo,
- wallet,
+ // Transaction
+ if (trn.type !== 2) {
+ // Wallet
+ const wallet = wallets.items[trn.walletId]
+ if (!wallet)
+ return 'Wallet not found'
+
+ return {
+ id,
+ ...trn,
+ dateFormated,
+ category,
+ categoryParent,
+ wallet,
+ }
+ }
+
+ if (trn.type === 2) {
+ const expenseWalletId = trn.expenseWalletId || trn.walletFromId
+ const expenseWallet = wallets.items[expenseWalletId]
+ if (!expenseWallet)
+ return 'Transfer expense Wallet not found'
+
+ const incomeWalletId = trn.incomeWalletId || trn.walletToId
+ const incomeWallet = wallets.items[incomeWalletId]
+ if (!incomeWallet)
+ return 'Transfer income Wallet not found'
+
+ return {
+ id,
+ ...trn,
+ dateFormated,
+ category,
+ categoryParent,
+ expenseWallet,
+ incomeWallet,
+ }
}
}
catch (error) {
diff --git a/components/trns/list/TrnsList.vue b/components/trns/list/TrnsList.vue
index 6ac564ad..bc7c4653 100644
--- a/components/trns/list/TrnsList.vue
+++ b/components/trns/list/TrnsList.vue
@@ -17,12 +17,11 @@ export default defineComponent({
setup() {
const { $store } = useNuxtApp()
const { setExpression } = useCalculator()
- const { setCategoryFilter } = useFilter()
+ const { setFilterCatsId } = 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)
}
@@ -30,14 +29,14 @@ export default defineComponent({
onOpenEdit: (event) => {
event.stopPropagation()
- setExpression(trnItem.amount)
+ setExpression(trnItem.type === 2 && trnItem.incomeAmount ? trnItem.incomeAmount : 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)
+ setFilterCatsId(trnItem.categoryId)
$store.commit('filter/setFilterDateNow')
$store.commit('trns/hideTrnModal')
$store.commit('trns/setTrnModalId', null)
@@ -140,15 +139,14 @@ div
div(v-if="trnsIds.length > 0")
//- History view
- .grid.grid-cols-1.gap-y-5(
+ .grid.gap-y-2(
v-if="ui === 'history'"
- class="md:grid-cols-2 md:gap-x-20"
:class="classNames"
)
.overflow-hidden.rounded-md.bg-white2.shadow-sm(
v-for="(trnsIds, date) in groupedTrns"
:key="date"
- class="dark:bg-dark4"
+ class="dark_bg-dark4"
)
.pt-4
.pb-2.px-3
@@ -163,7 +161,7 @@ div
)
//- Stat view
- div(v-else)
+ div(v-if="ui !== 'history'")
TrnsItemWithoutCat.py-3.px-3.cursor-pointer(
v-for="trnId in paginatedTrnsIds"
:key="trnId"
@@ -174,8 +172,3 @@ div
.py-4(v-if="!isShowedAllTrns")
.button(@click="showMoreTrns") {{ $t('trns.more') }}
</template>
-
-<style lang="stylus" scoped>
-.button
- button-base-1()
-</style>
diff --git a/components/trns/list/TrnsListHistory.vue b/components/trns/list/TrnsListHistory.vue
index 872ff82d..a0ec0250 100644
--- a/components/trns/list/TrnsListHistory.vue
+++ b/components/trns/list/TrnsListHistory.vue
@@ -1,7 +1,46 @@
+<script setup lang="ts">
+import useCalculator from '~/components/trnForm/calculator/useCalculator'
+import useFilter from '~/modules/filter/useFilter'
+
+const { $store } = useNuxtApp()
+const { setExpression } = useCalculator()
+const { setFilterCatsId } = useFilter()
+
+const actions = trnItem => ({
+ onOpenDetails: () => {
+ if (!$store.state.trns.modal.show) {
+ $store.commit('trns/showTrnModal')
+ $store.commit('trns/setTrnModalId', trnItem.id)
+ }
+ },
+
+ onOpenEdit: (event) => {
+ event.stopPropagation()
+ setExpression(trnItem.type === 2 && trnItem.incomeAmount ? trnItem.incomeAmount : trnItem.amount)
+ $store.dispatch('trnForm/openTrnForm', { action: 'edit', trnId: trnItem.id })
+ $store.commit('stat/setCategoryModal', { id: null, type: null })
+ },
+
+ onSetFilter: (event) => {
+ event.stopPropagation()
+ setFilterCatsId(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')
+ },
+})
+</script>
+
<script lang="ts">
export default defineComponent({
props: {
+ trnsIds: { type: Array, required: true },
isShowFilter: { type: Boolean, default: false },
+ isShowGroupDate: { type: Boolean, default: true },
+ uiHistory: { type: Boolean, default: true },
+ uiCat: { type: Boolean, default: false },
limit: { type: Number, default: 0 },
size: { type: Number, required: false, default: 30 },
},
@@ -15,10 +54,6 @@ export default defineComponent({
},
computed: {
- trnsIds() {
- return this.$store.getters['trns/selectedTrnsIds']
- },
-
isShowedAllTrns() {
return this.paginatedTrnsIds.length === this.trnsIdsWithLimit.length
},
@@ -78,7 +113,7 @@ export default defineComponent({
<template lang="pug">
div
- .flex.pb-3(v-if="isShowFilter && isTrnsWithDescription")
+ .pb-3(v-if="isShowFilter && isTrnsWithDescription")
SharedContextMenuItem(
:checkboxValue="isShowTrnsWithDesc"
:grow="false"
@@ -89,30 +124,30 @@ div
)
template(v-if="trnsIds.length > 0")
- .grid.grid-cols-1.gap-2(
- class="md:grid-cols-2 md:gap-6 lg:grid-cols-3"
- )
+ .grid.gap-2
.overflow-hidden.rounded-md.bg-white2(
v-for="(trnsIds, date) in groupedTrns"
:key="date"
- class="dark:bg-dark4"
+ class="dark_bg-dark4"
)
- .pt-4
- .pb-2.px-3
- TrnsListDate(:date="date")
-
- .overflow-hidden.rounded-md
- TrnsItemHistory.py-3.px-3.cursor-pointer(
- v-for="trnId in trnsIds"
- :key="trnId"
- :trnId="trnId"
- )
+ .pt-4.pb-2.px-3(v-if="isShowGroupDate")
+ TrnsListDate(:date="date")
+
+ .overflow-hidden.rounded-md
+ TrnsItemHistory.py-3.px-3.cursor-pointer(
+ v-if="uiHistory"
+ v-for="trnId in trnsIds"
+ :key="trnId"
+ :trnId="trnId"
+ )
+ TrnsItemWithoutCat.py-3.px-3.cursor-pointer(
+ v-if="uiCat"
+ v-for="trnId in trnsIds"
+ :actions="actions"
+ :key="trnId"
+ :trnId="trnId"
+ )
.py-4(v-if="!isShowedAllTrns")
.button(@click="showMoreTrns") {{ $t('trns.more') }}
</template>
-
-<style lang="stylus" scoped>
-.button
- button-base-1()
-</style>
diff --git a/components/trns/types.ts b/components/trns/types.ts
new file mode 100644
index 00000000..b4298fea
--- /dev/null
+++ b/components/trns/types.ts
@@ -0,0 +1,33 @@
+import type { WalletID } from '~/components/wallets/types'
+
+export type TrnID = string
+export type CategoryID = string
+
+export enum TrnType {
+ Expense,
+ Income,
+ Transfer,
+}
+
+// TODO: make WalletId optional only if TrnType.Transfer
+export interface TrnTransaction{
+ amount: number
+ type: TrnType.Income | TrnType.Expense
+ categoryId: CategoryID
+ walletId: WalletID
+ date: number
+}
+
+export interface TrnTransfer{
+ type: TrnType.Transfer
+ date: number
+ categoryId: 'transfer'
+
+ incomeWalletId: WalletID
+ incomeAmount: number
+
+ expenseWalletId: WalletID
+ expenseAmount: number
+}
+
+export type TrnItem = TrnTransaction | TrnTransfer
diff --git a/components/wallets/Modal.vue b/components/wallets/Modal.vue
deleted file mode 100644
index 0c0e2463..00000000
--- a/components/wallets/Modal.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<script>
-import { removeData } from '~/services/firebaseHelpers'
-import useFilter from '~/modules/filter/useFilter'
-
-export default {
- setup() {
- const { $store } = useNuxtApp()
- const { setWalletFilter } = useFilter()
-
- const closed = () => {
- $store.commit('wallets/hideWalletsModalWalletModal')
- $store.commit('wallets/setWalletsModalWalletModalId', null)
- }
-
- const wallet = computed(() => {
- const id = $store.state.wallets.modal.id
- if (!id) return
- return {
- ...$store.state.wallets.items[id],
- total: $store.getters['wallets/walletsTotal'][id].base,
- }
- })
-
- return {
- setWalletFilter,
- closed,
- wallet,
- }
- },
-
- data() {
- return {
- showModalConfirm: false,
- }
- },
-
- computed: {
- deleteInfo() {
- if (this.trnsIds.length > 0)
- return `It's also will delete ${this.trnsIds.length} trns in this wallet`
-
- return null
- },
- walletId() {
- return this.$store.state.wallets.modal.id
- },
- trnsIds() {
- const trns = this.$store.state.trns.items
- const trnsIds = []
- for (const trnId in trns) {
- if (trns[trnId].walletId === this.walletId
- || trns[trnId].walletFromId === this.walletId
- || trns[trnId].walletToId === this.walletId)
- trnsIds.push(trnId)
- }
-
- return trnsIds
- },
- },
-
- methods: {
- handleSetFilterWallet() {
- this.setWalletFilter(this.walletId)
- this.$store.commit('filter/setFilterDateNow')
-
- this.$store.commit('wallets/hideWalletsModalWalletModal')
- this.$store.commit('wallets/setWalletsModalWalletModalId', null)
-
- this.$store.dispatch('ui/setActiveTabStat', 'details')
- },
-
- handleEditClick() {
- const walletId = this.walletId
- this.$store.commit('wallets/hideWalletsModalWalletModal')
- this.$store.commit('wallets/setWalletsModalWalletModalId', null)
- this.$store.commit('wallets/setWalletEditId', walletId)
- this.$store.dispatch('ui/setActiveTab', 'createWallet')
- },
-
- handleDeleteClick() {
- this.showModalConfirm = true
- },
-
- handleDeleteConfirm() {
- const trnsIds = this.trnsIds
- const uid = this.$store.state.user.user.uid
- const id = this.walletId
-
- this.showModalConfirm = false
- this.$store.commit('wallets/hideWalletsModalWalletModal')
- this.$store.commit('wallets/setWalletsModalWalletModalId', null)
-
- setTimeout(async() => {
- await this.$store.dispatch('trns/deleteTrnsByIds', trnsIds)
- removeData(`users/${uid}/accounts/${id}`)
- .then(() => console.log('wallet deleted'))
- }, 200)
- },
- },
-}
-</script>
-
-<template lang="pug">
-Portal(
- v-if="$store.state.wallets.modal.show"
- key="walletsModal"
- to="modal"
-)
- LazyBaseBottomSheet(
- v-if="$store.state.wallets.modal.id"
- @closed="closed()"
- )
- template(#handler="{ close }")
- BaseBottomSheetClose(@onClick="close")
-
- template(#header)
- template(v-if="walletId")
- .shame1.rounded-t-2xl.pb-2
- .gap-4.items-center.justify-center.flex-col.flex(
- class="-translate-y-6 -mb-6"
- )
- .text-neutral-50.text-lg.leading-none.w-12.h-12.rounded-md.justify-center.items-center.flex(
- :style="{ background: wallet.color }"
- ) {{ wallet.name.substring(0, 2) }}
-
- .gap-y-1.flex-col.flex
- .text-center.text-lg.text-neutral-500(class="dark:text-neutral-400") {{ wallet.name }}
-
- Amount(
- alwaysShowSymbol
- :currency="wallet.currency"
- :showBase="showBase"
- :value="wallet.total"
- size="xl"
- vertical="center"
- )
-
- template(#default="{ close }")
- .content
- template(v-if="$store.state.wallets.items[walletId].desc")
- .info(style="padding-bottom:20px") {{ $store.state.wallets.items[walletId].desc }}
-
- .modalLinks
- ModalButton(
- :name="$t('base.delete')"
- icon="mdi mdi-delete-empty-outline"
- @onClick="handleDeleteClick"
- )
- ModalButton(
- :name="$t('base.edit')"
- icon="mdi mdi-pencil-outline"
- @onClick="handleEditClick"
- )
- ModalButton(
- :name="$t('base.filter')"
- icon="mdi mdi-filter-outline"
- @onClick="handleSetFilterWallet"
- )
-
- .buttonBack(
- @click="close()"
- ) {{ $t('close') }}
-
- ModalBottomConfirm(
- :show="showModalConfirm"
- :description="deleteInfo"
- @onClose="showModalConfirm = false"
- @onConfirm="handleDeleteConfirm"
- )
-</template>
-
-<style lang="stylus">
-.shame1
- background var(--c-bg-3)
-
-.content
- padding-top $m6
- padding-bottom $m6
- background var(--c-bg-3)
- +media(600px)
- border-radius 0 0 $m7 $m7
-
-.handler
- z-index 2
- position absolute
- top 0
- left 0
- display flex
- align-items center
- justify-content center
- width 100%
- height 16px
-
-.buttonBack
- button-base-1()
- margin $m8 auto $m5 auto
-</style>
diff --git a/components/wallets/form/WalletForm.vue b/components/wallets/form/WalletForm.vue
index 3ea129f3..5f24a276 100644
--- a/components/wallets/form/WalletForm.vue
+++ b/components/wallets/form/WalletForm.vue
@@ -126,96 +126,94 @@ export default {
</script>
<template lang="pug">
-LayoutBaseWrap
- template(slot="headerLeft")
+.h-full.overflow.overflow-x-auto
+ .mb-2.py-10.pt-12.px-3.text-center.text-neutral-800.dark_text-white.text-2xl.font-semibold.font-nunito
template(v-if="!walletId") {{ $t('wallets.createNewTitle') }}
template(v-else) {{ $t('wallets.editTitle') }}
- template(slot="content")
- .form
- .form-line._text
- .inputText
- .inputText__label {{ $t('wallets.form.name.label') }}
- input(
- type="text"
- :placeholder="$t('wallets.form.name.placeholder')"
- v-model="wallet.name"
- ).inputText__value
-
- .form__btns(style="paddingBottom: 8px")
- .form__btns__i
- .form-line(@click="showCurrencies = true")
- .inputModal._flex
- .inputModal__value {{ wallet.currency }}
- .inputModal__content
- .inputModal__label {{ $t('wallets.form.currency.label') }}
-
- .form__btns__i
- .form-line(@click="showColors = true")
- .inputModal._flex
- .inputModal__value: .inputModal__color(:style="{ background: wallet.color }")
- .inputModal__label {{ $t('wallets.form.color.label') }}
-
- SharedContextMenuItem(
- :checkboxValue="wallet.countTotal"
- :title="$t('wallets.form.total.placeholder')"
- showCheckbox
- @onClick="wallet.countTotal = !wallet.countTotal"
- )
-
- SharedContextMenuItem(
- :checkboxValue="wallet.isCredit"
- :title="$t('isCredit')"
- showCheckbox
- @onClick="wallet.isCredit = !wallet.isCredit"
- )
-
- //- colors
- Portal(
- v-if="showColors"
- to="modal"
+ .form
+ .form-line._text
+ .inputText
+ .inputText__label {{ $t('wallets.form.name.label') }}
+ input(
+ type="text"
+ :placeholder="$t('wallets.form.name.placeholder')"
+ v-model="wallet.name"
+ ).inputText__value
+
+ .form__btns(style="paddingBottom: 8px")
+ .form__btns__i
+ .form-line(@click="showCurrencies = true")
+ .inputModal._flex
+ .inputModal__value {{ wallet.currency }}
+ .inputModal__content
+ .inputModal__label {{ $t('wallets.form.currency.label') }}
+
+ .form__btns__i
+ .form-line(@click="showColors = true")
+ .inputModal._flex
+ .inputModal__value: .inputModal__color(:style="{ background: wallet.color }")
+ .inputModal__label {{ $t('wallets.form.color.label') }}
+
+ SharedContextMenuItem(
+ :checkboxValue="wallet.countTotal"
+ :title="$t('wallets.form.total.placeholder')"
+ showCheckbox
+ @onClick="wallet.countTotal = !wallet.countTotal"
)
- ModalBottom(
- :center="true"
- :title="$t('wallets.form.color.placeholder')"
- @onClose="showColors = false"
- )
- .inputText
- .inputText__colors
- .colors
- .colorItem(
- :class="{ _active: wallet.color === color }"
- :style="{ background: color }"
- @click="handleColorSelect(color)"
- v-for="color in colors")
- .customColor
- .customColor__title {{ $t('wallets.form.color.custom') }}
- input.customColor__value(v-model="wallet.color" type="color")
-
- //- currencies
- Portal(
- v-if="showCurrencies"
- to="modal"
+
+ SharedContextMenuItem(
+ :checkboxValue="wallet.isCredit"
+ :title="$t('isCredit')"
+ showCheckbox
+ @onClick="wallet.isCredit = !wallet.isCredit"
)
- ModalBottom(
- :center="true"
- :title="$t('wallets.form.currency.placeholder')"
- @onClose="showCurrencies = false"
- )
- .inputText
- .currencies
- .currencies__item(
- :class="{ _active: wallet.currency === currency }"
- @click="handleCurrencySelect(currency)"
- v-for="(item, currency) in $store.state.currencies.rates"
- ) {{ currency }}
-
- template(slot="bottom")
+
.col(style="padding-top: 16px")
SharedButton(
:class="['_text-center _blue2', { _inline: $store.state.ui.pc }]"
:title="$t('wallets.form.save')"
@onClick="handleSubmit")
+
+ //- colors
+ Portal(
+ v-if="showColors"
+ to="modal"
+ )
+ ModalBottom(
+ :center="true"
+ :title="$t('wallets.form.color.placeholder')"
+ @onClose="showColors = false"
+ )
+ .inputText
+ .inputText__colors
+ .colors
+ .colorItem(
+ :class="{ _active: wallet.color === color }"
+ :style="{ background: color }"
+ @click="handleColorSelect(color)"
+ v-for="color in colors")
+ .customColor
+ .customColor__title {{ $t('wallets.form.color.custom') }}
+ input.customColor__value(v-model="wallet.color" type="color")
+
+ //- currencies
+ Portal(
+ v-if="showCurrencies"
+ to="modal"
+ )
+ ModalBottom(
+ :center="true"
+ :title="$t('wallets.form.currency.placeholder')"
+ @onClose="showCurrencies = false"
+ )
+ .inputText
+ .currencies
+ .currencies__item(
+ :class="{ _active: wallet.currency === currency }"
+ @click="handleCurrencySelect(currency)"
+ v-for="(item, currency) in $store.state.currencies.rates"
+ ) {{ currency }}
</template>
<style lang="stylus" scoped>
diff --git a/components/wallets/functions/getWalletAmount.ts b/components/wallets/functions/getWalletAmount.ts
new file mode 100644
index 00000000..f216be7f
--- /dev/null
+++ b/components/wallets/functions/getWalletAmount.ts
@@ -0,0 +1,62 @@
+import type { TrnID, TrnItem } from '~/components/trns/types'
+import { TrnType } from '~/components/trns/types'
+import type { WalletID } from '~/components/wallets/types'
+
+interface Types {
+ walletId: WalletID
+ trnsIds: TrnID[]
+ trnsItems: Record<TrnID, TrnItem>
+}
+
+export function getWalletAmount({ walletId, trnsIds, trnsItems }: Types): {
+ income: number
+ expense: number
+ total: number
+} {
+ let sum = 0
+ let income = 0
+ let expense = 0
+
+ for (const trnId of trnsIds) {
+ const trn = trnsItems[trnId]
+
+ // Income
+ if (trn.type === TrnType.Income) {
+ sum = sum + trn.amount
+ income = income + trn.amount
+ }
+
+ // Expense
+ if (trn.type === TrnType.Expense) {
+ sum = sum - trn.amount
+ expense = expense + trn.amount
+ }
+
+ // Transfer
+ if (trn.type === TrnType.Transfer) {
+ if (!trn.incomeAmount || !trn.expenseAmount) {
+ return {
+ total: sum,
+ income,
+ expense,
+ }
+ }
+
+ if (trn.incomeWalletId === walletId) {
+ sum = sum + trn.incomeAmount
+ income = income + trn.incomeAmount
+ }
+
+ if (trn.expenseWalletId === walletId) {
+ sum = sum - trn.expenseAmount
+ expense = expense + trn.expenseAmount
+ }
+ }
+ }
+
+ return {
+ total: income - expense,
+ income,
+ expense,
+ }
+}
diff --git a/components/wallets/item/Simple.vue b/components/wallets/item/Simple.vue
index c125eab6..bcfaa14a 100644
--- a/components/wallets/item/Simple.vue
+++ b/components/wallets/item/Simple.vue
@@ -1,4 +1,6 @@
<script lang="ts">
+import useFilter from '~/modules/filter/useFilter'
+
export default defineComponent({
props: {
id: { type: String, required: true },
@@ -8,6 +10,20 @@ export default defineComponent({
activeItemId: { type: String, default: null },
},
+ setup(props) {
+ const { $store } = useNuxtApp()
+ const { setFilterWalletsId } = useFilter()
+
+ const onClickFilterWallet = () => {
+ setFilterWalletsId(props.id)
+ $store.dispatch('ui/setActiveTabStat', 'details')
+ }
+
+ return {
+ onClickFilterWallet,
+ }
+ },
+
computed: {
wallet() {
return {
@@ -27,36 +43,30 @@ export default defineComponent({
</script>
<template lang="pug">
-.bg-main.py-2.px-5.gap-x-3.items-center.flex(
- :class="{ _active: activeItemId === id }"
+.py-2.px-5.gap-x-3.items-center.flex.cursor-pointer(
+ :class="[{ _active: activeItemId === id }, 'hocus_bg-gray-200 dark_hocus_bg-neutral-800']"
@click="handleClick"
)
- .text-neutral-50.text-xs.leading-none.w-6.h-6.rounded-md.justify-center.items-center.flex(
+ //- Icon
+ .w-6.h-6.flex-center.rounded-md.text-neutral-50.text-xs.leading-none(
:style="{ background: wallet.color }"
+ @click.stop="onClickFilterWallet"
) {{ wallet.name.substring(0, 2) }}
.grow
.py-1.items-center.flex
- .grow.text-xs.text-neutral-500(class="dark:text-neutral-400") {{ wallet.name }}
+ .grow.text-xs.text-neutral-600(
+ class="dark_text-neutral-400"
+ ) {{ wallet.name }}
Amount(
- :alwaysShowSymbol="true"
:currency="wallet.currency"
:showBase="showBase"
:size="size"
:value="wallet.total"
:vertical="vertical"
+ alwaysShowSymbol
)
- .line
+ div(class="h-[1px] bg-gray-200 dark_bg-neutral-800")
</template>
-
-<style lang="stylus">
-.bg-main
- +media-hover()
- background var(--c-item-bg-hover)
-
-.line
- height 1px
- background var(--c-bg-6);
-</style>
diff --git a/components/wallets/item/WalletItem.vue b/components/wallets/item/WalletItem.vue
index 947da725..e17885db 100644
--- a/components/wallets/item/WalletItem.vue
+++ b/components/wallets/item/WalletItem.vue
@@ -39,14 +39,14 @@ export default defineComponent({
) {{ wallet.name.substring(0, 2) }}
div
- .text-sm.text-neutral-500(class="dark:text-neutral-400") {{ wallet.name }}
+ .text-sm.text-neutral-500(class="dark_text-neutral-400") {{ wallet.name }}
Amount(
- :alwaysShowSymbol="true"
:currency="wallet.currency"
:showBase="showBase"
:size="size"
:value="wallet.total"
:vertical="vertical"
+ alwaysShowSymbol
)
</template>
diff --git a/components/wallets/list/WalletsList.vue b/components/wallets/list/WalletsList.vue
index b7a4cebf..7e9c8f07 100644
--- a/components/wallets/list/WalletsList.vue
+++ b/components/wallets/list/WalletsList.vue
@@ -3,6 +3,7 @@ export default {
props: {
limit: { type: [Number, Boolean], default: null },
showToogle: { type: Boolean, default: false },
+ uiSimple: { type: Boolean, default: false },
},
data() {
@@ -38,6 +39,16 @@ export default {
<template lang="pug">
.wallets
WalletsItemWalletItem(
+ v-if="!uiSimple"
+ v-for="walletId in walletsIds"
+ :id="walletId"
+ :key="walletId"
+ :ui="ui"
+ v-on="$listeners"
+ )
+
+ WalletsItemSimple(
+ v-if="uiSimple"
v-for="walletId in walletsIds"
:id="walletId"
:key="walletId"
diff --git a/components/wallets/list/WalletsList3.vue b/components/wallets/list/WalletsList3.vue
index 1d364a83..a04910a0 100644
--- a/components/wallets/list/WalletsList3.vue
+++ b/components/wallets/list/WalletsList3.vue
@@ -41,7 +41,7 @@ export default {
<template lang="pug">
.wallets
- .wallets__grid
+ .wallets__grid.px-3
WalletsItemWalletItem(
:activeItemId="activeItemId"
v-for="walletId in walletsIds"
@@ -63,7 +63,6 @@ export default {
grid-template-columns repeat(2, 1fr)
grid-column-gap $m6
grid-row-gap $m6
- padding 0 $m7
+media(600px)
grid-template-columns repeat(auto-fill, minmax(200px, 1fr))
diff --git a/components/wallets/sort/WalletsSort.vue b/components/wallets/sort/WalletsSort.vue
index 09cc9d78..7d053ae9 100644
--- a/components/wallets/sort/WalletsSort.vue
+++ b/components/wallets/sort/WalletsSort.vue
@@ -1,13 +1,9 @@
<script>
-import draggable from 'vuedraggable'
+import Draggable from 'vuedraggable'
import { random, successEmo } from '~/assets/js/emo'
export default {
- name: 'WalletsSort',
-
- components: {
- draggable,
- },
+ components: { Draggable },
data() {
return {
@@ -30,7 +26,6 @@ export default {
const result = await this.$store.dispatch('wallets/saveWalletsOrder', sortedWallets)
if (result.succsess) {
if (this.$listeners.closeModal) this.$listeners.closeModal()
- // this.$store.dispatch('ui/setActiveTab', 'wallets')
this.$notify({
type: 'success',
title: random(successEmo),
@@ -43,35 +38,34 @@ export default {
</script>
<template lang="pug">
-LayoutBaseWrap(:contentPadding="$store.state.ui.pc")
- template(slot="headerLeft") {{ $t('wallets.sortTitle') }}
-
- template(slot="content")
- WalletsList2(
- :style="{ paddingTop: '10px' }"
- v-slot="{ wallets }")
- draggable(
- v-model="sortedWalletsIds"
- handle=".handle"
- ghost-class="_draggable"
- )
- template(v-for="walletId in sortedWalletsIds")
- .walletItem2(:key="walletId")
- .walletItem2__icon.handle
- Icon(
- :abbr="$store.state.wallets.items[walletId].name"
- :background="$store.state.wallets.items[walletId].color || $store.state.ui.defaultBgColor")
-
- .walletItem2__name {{ $store.state.wallets.items[walletId].name }}
- .walletItem2__drag.handle.doNotCloseModal: .mdi.mdi-drag-horizontal-variant
-
- template(slot="bottom")
- .col
- SharedButton(
- className="_blue2 _text-center"
- :title="$t('base.save')"
- @onClick="saveWalletsOrder"
- )
+.h-full.overflow.overflow-x-auto
+ .mb-2.py-10.pt-12.px-3.text-center.text-neutral-800.dark_text-white.text-2xl.font-semibold.font-nunito
+ | {{ $t('wallets.sortTitle') }}
+
+ WalletsList2(
+ :style="{ paddingTop: '10px' }"
+ v-slot="{ wallets }")
+ Draggable(
+ v-model="sortedWalletsIds"
+ handle=".handle"
+ ghost-class="_draggable"
+ )
+ template(v-for="walletId in sortedWalletsIds")
+ .walletItem2(:key="walletId")
+ .walletItem2__icon.handle
+ Icon(
+ :abbr="$store.state.wallets.items[walletId].name"
+ :background="$store.state.wallets.items[walletId].color || $store.state.ui.defaultBgColor")
+
+ .walletItem2__name {{ $store.state.wallets.items[walletId].name }}
+ .walletItem2__drag.handle.doNotCloseModal: .mdi.mdi-drag-horizontal-variant
+
+ .col
+ SharedButton(
+ className="_blue2 _text-center"
+ :title="$t('base.save')"
+ @onClick="saveWalletsOrder"
+ )
</template>
<style lang="stylus" scoped>
diff --git a/components/wallets/total/WalletsTotal.vue b/components/wallets/total/WalletsTotal.vue
index 8d835ae1..500373d1 100644
--- a/components/wallets/total/WalletsTotal.vue
+++ b/components/wallets/total/WalletsTotal.vue
@@ -4,7 +4,7 @@ import useAmount from '~/components/amount/useAmount'
export default {
props: {
isShowCredits: { type: Boolean, default: false },
- isShowTotal: { type: Boolean, default: false },
+ isShowSavings: { type: Boolean, default: false },
},
setup() {
@@ -64,7 +64,7 @@ export default {
)
//- Savings
- .walletsTotal__item(v-if="totalInWallets.savings !== 0")
+ .walletsTotal__item(v-if="totalInWallets.savings !== 0 && isShowSavings")
.walletsTotal__title {{ $t('savings') }}
.walletsTotal__value
Amount(
@@ -74,24 +74,24 @@ export default {
vertical="center"
)
- //- Avaliable
+ //- Total
.walletsTotal__item
- .walletsTotal__title {{ $t('avaliable') }}
+ .walletsTotal__title {{ $t('total') }}
.walletsTotal__value
Amount(
:currency="$store.state.currencies.base"
- :value="totalInWallets.counted"
+ :value="totalInWallets.counted + totalInWallets.savings - Math.abs(totalInWallets.credits)"
size="lg"
vertical="center"
)
- //- Total
- .walletsTotal__item(v-if="isShowTotal")
- .walletsTotal__title {{ $t('total') }}
+ //- Avaliable
+ .walletsTotal__item(v-if="totalInWallets.counted !== totalInWallets.counted + totalInWallets.savings - Math.abs(totalInWallets.credits)")
+ .walletsTotal__title {{ $t('avaliable') }}
.walletsTotal__value
Amount(
:currency="$store.state.currencies.base"
- :value="totalInWallets.counted + totalInWallets.savings - Math.abs(totalInWallets.credits)"
+ :value="totalInWallets.counted"
size="lg"
vertical="center"
)
diff --git a/components/wallets/total/WalletsTotalAlt.vue b/components/wallets/total/WalletsTotalAlt.vue
new file mode 100644
index 00000000..78585e98
--- /dev/null
+++ b/components/wallets/total/WalletsTotalAlt.vue
@@ -0,0 +1,134 @@
+<script>
+import useAmount from '~/components/amount/useAmount'
+
+export default {
+ props: {
+ isShowCredits: { type: Boolean, default: false },
+ isShowSavings: { type: Boolean, default: false },
+ },
+
+ setup() {
+ const { getAmountInBaseCurrency } = useAmount()
+ return { getAmountInBaseCurrency }
+ },
+
+ computed: {
+ totalInWallets() {
+ const walletsItems = this.$store.state.wallets.items
+ const walletsTotal = this.$store.getters['wallets/walletsTotal']
+ const total = {
+ counted: 0,
+ savings: 0,
+ credits: 0,
+ }
+
+ for (const walletId in walletsItems) {
+ let walletTotal = 0
+ if (walletsItems[walletId].currency === this.$store.state.currencies.base) {
+ walletTotal = walletsTotal[walletId].base
+ }
+ else {
+ walletTotal = this.getAmountInBaseCurrency({
+ amount: walletsTotal[walletId].base,
+ currency: walletsItems[walletId].currency,
+ noFormat: true,
+ })
+ }
+
+ if (walletsItems[walletId].countTotal)
+ total.counted = total.counted + walletTotal
+ else if (walletsItems[walletId].isCredit)
+ total.credits = total.credits + walletTotal
+ else
+ total.savings = total.savings + walletTotal
+ }
+ return total
+ },
+ },
+}
+</script>
+
+<template lang="pug">
+.walletsTotal(
+ v-if="$store.getters['wallets/hasWallets']"
+)
+ //- Credits
+ .walletsTotal__item(v-if="isShowCredits && totalInWallets.credits !== 0")
+ .walletsTotal__title {{ $t('credits') }}
+ .walletsTotal__value
+ Amount(
+ :currency="$store.state.currencies.base"
+ :value="totalInWallets.credits"
+ size="lg"
+ vertical="center"
+ )
+
+ //- Savings
+ .walletsTotal__item(v-if="totalInWallets.savings !== 0 && isShowSavings")
+ .walletsTotal__title {{ $t('savings') }}
+ .walletsTotal__value
+ Amount(
+ :currency="$store.state.currencies.base"
+ :value="totalInWallets.savings"
+ size="lg"
+ vertical="center"
+ )
+
+ //- Total
+ .walletsTotal__item
+ .walletsTotal__title {{ $t('total') }}
+ .walletsTotal__value
+ Amount(
+ :currency="$store.state.currencies.base"
+ :value="totalInWallets.counted + totalInWallets.savings - Math.abs(totalInWallets.credits)"
+ size="lg"
+ vertical="center"
+ )
+
+ //- Avaliable
+ .walletsTotal__item(v-if="totalInWallets.counted !== totalInWallets.counted + totalInWallets.savings - Math.abs(totalInWallets.credits)")
+ .walletsTotal__title {{ $t('avaliable') }}
+ .walletsTotal__value
+ Amount(
+ :currency="$store.state.currencies.base"
+ :value="totalInWallets.counted"
+ size="lg"
+ vertical="center"
+ )
+</template>
+
+<style lang="stylus" scoped>
+.walletsTotal
+ display flex
+ flex-wrap wrap
+ align-items center
+ gap $m8
+
+ &__item
+ flex 0 0 0
+ align-self start
+ justify-self start
+
+ &__title
+ opacity .6
+ padding-right 0
+ padding-bottom 6px
+ font-size 12px
+</style>
+
+<i18n lang="json5">
+{
+ "en": {
+ "avaliable": "Avaliable",
+ "credits": "Credits",
+ "savings": "Savings",
+ "total": "Total"
+ },
+ "ru": {
+ "avaliable": "Доступные",
+ "credits": "Кредиты",
+ "savings": "Вложения",
+ "total": "Всего"
+ }
+}
+</i18n>
diff --git a/components/wallets/types.ts b/components/wallets/types.ts
new file mode 100644
index 00000000..3ec4e5a3
--- /dev/null
+++ b/components/wallets/types.ts
@@ -0,0 +1,7 @@
+export type WalletID = string
+
+export interface WalletItem {
+ name: string
+ color: string
+ currency: string
+}
diff --git a/finapp.code-workspace b/finapp.code-workspace
index 2850d7fb..eac5f5bd 100644
--- a/finapp.code-workspace
+++ b/finapp.code-workspace
@@ -1,35 +1,8 @@
{
"folders": [
- {
- "name": "components",
- "path": "components"
- },
- {
- "name": "pages",
- "path": "pages"
- },
- {
- "name": "layouts",
- "path": "layouts"
- },
- {
- "name": "store",
- "path": "store"
- },
- {
- "name": "assets",
- "path": "assets"
- },
{
"name": "finapp",
"path": "."
- }
- ],
- "settings": {
- "stylelint.customSyntax": "stylelint-plugin-stylus/custom-syntax",
- "stylelint.validate": [
- "vue",
- "stylus"
- ]
- }
+ },
+ ]
}
diff --git a/layouts/default.vue b/layouts/default.vue
index fff79e12..3c47fec6 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,70 +1,60 @@
-<script lang="ts">
+<script setup lang="ts">
import debounce from '~/utils/debounce'
import detectTouch from '~/assets/js/isTouchDevice'
import useUIView from '~/components/layout/useUIView'
-export default defineComponent({
- setup() {
- const { $store } = useNuxtApp()
+const { $store } = useNuxtApp()
- useLazyAsyncData('posts', async() => {
- const { initUI } = useUIView()
- await initUI()
- })
-
- const keepAliveInclude = ['PagesIndex, PagesWallets', 'PagesCategories', 'PagesHistory']
-
- /**
- * Update modal
- */
- const isShowUpdateApp = ref(false)
- onMounted(async() => {
- const workbox = await window.$workbox
- if (workbox) {
- workbox.addEventListener('installed', (event) => {
- isShowUpdateApp.value = event.isUpdate
- })
- }
- })
-
- /**
- * Detect touch device
- */
- const isTouchDevice = ref(false)
-
- /**
- * Page dimensions
- */
- function getPageDimensions() {
- const width = document.documentElement.clientWidth
- const height = document.documentElement.clientHeight
- document.documentElement.style.setProperty('--height', `${height}px`)
- $store.dispatch('ui/setAppDimensions', { width, height })
- }
-
- const touchClassNames = computed(() => ({
- isNotTouchDevice: !isTouchDevice.value,
- isTouchDevice: isTouchDevice.value,
- }))
+useLazyAsyncData('', async() => {
+ const { initUI } = useUIView()
+ await initUI()
+})
- onMounted(() => {
- isTouchDevice.value = detectTouch()
- getPageDimensions()
- window.addEventListener('resize', debounce(getPageDimensions, 300))
+const keepAliveInclude = ['index', 'PagesIndex', 'PagesWalletsIndex', 'PagesCategoriesIndex', 'PagesHistory']
+
+/**
+ * Update modal
+ */
+const isShowUpdateApp = ref(false)
+onMounted(async() => {
+ const workbox = await window.$workbox
+ if (workbox) {
+ workbox.addEventListener('installed', (event) => {
+ isShowUpdateApp.value = event.isUpdate
})
+ }
+})
- return {
- keepAliveInclude,
- touchClassNames,
- isShowUpdateApp,
- }
- },
+/**
+ * Detect touch device
+ */
+const isTouchDevice = ref(false)
+
+/**
+ * Page dimensions
+ */
+function getPageDimensions() {
+ const width = document.documentElement.clientWidth
+ const height = document.documentElement.clientHeight
+ document.documentElement.style.setProperty('--height', `${height}px`)
+ $store.dispatch('ui/setAppDimensions', { width, height })
+}
+
+const touchClassNames = computed(() => ({
+ isNotTouchDevice: !isTouchDevice.value,
+ isTouchDevice: isTouchDevice.value,
+}))
+
+onMounted(() => {
+ isTouchDevice.value = detectTouch()
+ getPageDimensions()
+ window.addEventListener('resize', debounce(getPageDimensions, 300))
})
</script>
<template lang="pug">
-.font-roboto.text-gray-500.leading-none.antialiased.overflow-hidden.relative.h-full.min-w-base.flex(
- :class="[{ ...touchClassNames }, 'dark:text-gray-400']"
+.overflow-hidden.relative.h-full.min-w-base.font-roboto.text-slate-500.dark_text-gray-400.leading-none.antialiased.bg-white.dark_bg-dark3.max-w-7xl(
+ :class="touchClassNames"
)
LayoutModals
@@ -78,56 +68,21 @@ export default defineComponent({
@onClose="isShowUpdateApp = false"
)
- .layout__wrap.overflow-hidden.flex-grow.h-full.grid
- .layout__sidebar
+ .h-full.grid(
+ class="grid-rows-[1fr_auto] xl_grid-cols-[auto_1fr]"
+ )
+ .hidden.xl_block
LayoutSidebar
- .layout__content
+ .overflow-hidden.h-full.xl_px-8.grid
Nuxt(keep-alive :keep-alive-props="{ include: keepAliveInclude }")
- .layout__menu
+ .xl_hidden
LayoutBottomMenu
</template>
<style lang="stylus">
-@import '~assets/stylus/base/animations'
@import '~assets/stylus/index'
@import '~assets/stylus/colors-dark'
@import '~assets/stylus/colors-light'
</style>
-
-<style lang="stylus" scoped>
-.layout
- &__wrap
- grid-template-columns 1fr
- grid-template-rows 1fr minmax(auto, auto)
-
- +media(1200px)
- grid-template-rows 1fr auto
- grid-template-columns minmax(auto, auto) 1fr
-
- &__sidebar
- display none
-
- +media(1200px)
- display block
-
- &__content
- overflow hidden
- overflowScrollY()
- display grid
- height 100%
- max-width 1100px
- padding 0
- background var(--c-bg-3)
- +media(800px)
- padding 0 32px
- +media(1000px)
- padding 0 64px
-
- &__menu
- background var(--c-bg-3)
-
- +media(1200px)
- display none
-</style>
diff --git a/layouts/login.vue b/layouts/login.vue
index e85b8ae9..df7e792d 100644
--- a/layouts/login.vue
+++ b/layouts/login.vue
@@ -1,34 +1,22 @@
-<script lang="ts">
+<script setup lang="ts">
import detectTouch from '~/assets/js/isTouchDevice'
-
-export default defineComponent({
- setup() {
- // Detect touch device
- const isTouchDevice = ref(false)
- onMounted(() => { isTouchDevice.value = detectTouch() })
-
- const touchClassNames = computed(() => ({
- isNotTouchDevice: !isTouchDevice.value,
- isTouchDevice: isTouchDevice.value,
- }))
-
- return {
- touchClassNames,
- }
- },
-})
+const { $store } = useNuxtApp()
+
+// Detect touch device
+const isTouchDevice = ref(false)
+onMounted(() => { isTouchDevice.value = detectTouch() })
+const touchClassNames = computed(() => ({
+ isNotTouchDevice: !isTouchDevice.value,
+ isTouchDevice: isTouchDevice.value,
+}))
</script>
<template lang="pug">
-.font-roboto.text-gray-600.antialiased.leading-none.bg-neutral-100.flex.h-full.min-w-base(
- :class="[{ ...touchClassNames }, 'dark:text-gray-400 dark:bg-dark3']"
+.font-roboto.text-gray-600.antialiased.leading-none.bg-neutral-100.flex.h-full.min-w-base.overflow-hidden(
+ :class="[touchClassNames, 'dark_text-gray-400 dark_bg-dark3']"
)
- template(v-if="!$store.state.app.status.ready")
- LoaderSharedLoader
-
transition(name="fadeInSlow" appear)
- template(v-if="$store.state.app.status.ready")
- Nuxt
+ Nuxt
Notifications(
:position="$store.state.ui.mobile ? 'top center' : 'top left'"
@@ -36,15 +24,3 @@ export default defineComponent({
classes="notifications"
)
</template>
-
-<style lang="css">
-:root {
- --height: 100vh
-}
-</style>
-
-<style lang="stylus">
-@import '~assets/stylus/base/animations'
-@import '~assets/stylus/colors-light'
-@import '~assets/stylus/colors-dark'
-</style>
diff --git a/layouts/welcome.vue b/layouts/welcome.vue
index f4a9b147..12a9eea2 100644
--- a/layouts/welcome.vue
+++ b/layouts/welcome.vue
@@ -1,70 +1,60 @@
-<script lang="ts">
+<script setup lang="ts">
import debounce from '~/utils/debounce'
import detectTouch from '~/assets/js/isTouchDevice'
import useUIView from '~/components/layout/useUIView'
-export default defineComponent({
- setup() {
- const { $store } = useNuxtApp()
+const { $store } = useNuxtApp()
- useLazyAsyncData('posts', async() => {
- const { initUI } = useUIView()
- await initUI()
- })
-
- const keepAliveInclude = ['PagesIndex, PagesWallets', 'PagesCategories', 'PagesHistory']
-
- /**
- * Update modal
- */
- const isShowUpdateApp = ref(false)
- onMounted(async() => {
- const workbox = await window.$workbox
- if (workbox) {
- workbox.addEventListener('installed', (event) => {
- isShowUpdateApp.value = event.isUpdate
- })
- }
- })
+useLazyAsyncData('posts', async() => {
+ const { initUI } = useUIView()
+ await initUI()
+})
- /**
- * Detect touch device
- */
- const isTouchDevice = ref(false)
-
- /**
- * Page dimensions
- */
- function getPageDimensions() {
- const width = document.documentElement.clientWidth
- const height = document.documentElement.clientHeight
- document.documentElement.style.setProperty('--height', `${height}px`)
- $store.dispatch('ui/setAppDimensions', { width, height })
- }
-
- const touchClassNames = computed(() => ({
- isNotTouchDevice: !isTouchDevice.value,
- isTouchDevice: isTouchDevice.value,
- }))
-
- onMounted(() => {
- isTouchDevice.value = detectTouch()
- getPageDimensions()
- window.addEventListener('resize', debounce(getPageDimensions, 300))
+const keepAliveInclude = ['PagesIndex, PagesWallets', 'PagesCategories', 'PagesHistory']
+
+/**
+ * Update modal
+ */
+const isShowUpdateApp = ref(false)
+onMounted(async() => {
+ const workbox = await window.$workbox
+ if (workbox) {
+ workbox.addEventListener('installed', (event) => {
+ isShowUpdateApp.value = event.isUpdate
})
+ }
+})
- return {
- keepAliveInclude,
- touchClassNames,
- isShowUpdateApp,
- }
- },
+/**
+ * Detect touch device
+ */
+const isTouchDevice = ref(false)
+
+/**
+ * Page dimensions
+ */
+function getPageDimensions() {
+ const width = document.documentElement.clientWidth
+ const height = document.documentElement.clientHeight
+ document.documentElement.style.setProperty('--height', `${height}px`)
+ $store.dispatch('ui/setAppDimensions', { width, height })
+}
+
+const touchClassNames = computed(() => ({
+ isNotTouchDevice: !isTouchDevice.value,
+ isTouchDevice: isTouchDevice.value,
+}))
+
+onMounted(() => {
+ isTouchDevice.value = detectTouch()
+ getPageDimensions()
+ window.addEventListener('resize', debounce(getPageDimensions, 300))
})
</script>
<template lang="pug">
.font-roboto.text-gray-500.leading-none.antialiased.overflow-hidden.relative.h-full.min-w-base.flex(
- :class="[{ ...touchClassNames }, 'dark:text-gray-400']"
+ :class="[touchClassNames, 'dark_text-gray-400']"
)
LayoutModals
diff --git a/locales/en-US.js b/locales/en-US.js
index 92f2c0aa..24bf83c3 100644
--- a/locales/en-US.js
+++ b/locales/en-US.js
@@ -1,6 +1,8 @@
export default {
common: {
date: 'Date',
+ open: 'Open',
+ all: 'All',
},
analytics: {
@@ -23,6 +25,10 @@ export default {
backTo: 'Back to ',
close: 'Close',
+ transfer: {
+ titleMany: 'Transfers',
+ },
+
trnForm: {
transferTitle: 'Transfer',
saveTrnButton: 'Save transaction',
@@ -132,7 +138,7 @@ export default {
showOnly: 'Show only',
sortTitle: 'Sort wallets',
createNewTitle: 'Create new wallet',
- editTitle: 'Edit wallet',
+ editTitle: 'Edit Wallet',
form: {
name: {
label: 'Wallet name',
@@ -206,7 +212,7 @@ export default {
title: 'Statistics',
selectedPeriod: 'Selected period',
shortTitle: 'Stat',
- periods: 'Detail',
+ periods: 'Summary',
balanceTitle: 'Balance',
empty: 'No stat for this period',
emptyDesc: 'Change filter, period or add new transactions.',
@@ -253,19 +259,24 @@ export default {
},
money: {
- incomes: 'Incomes',
- expenses: 'Expenses',
+ incomes: 'Income',
+ expenses: 'Expense',
+
+ total: 'Net income',
+ income: 'Income',
+ expense: 'Expense',
+ sum: 'Net income',
+
transfer: 'Transfer',
- total: 'Total',
average: {
base: 'Average',
- incomes: 'Average incomes',
- expenses: 'Average expenses',
+ incomes: 'Average',
+ expenses: 'Average',
},
- averageTotal: 'Average total',
+ averageTotal: 'Average',
also: 'Also',
wallets: 'Wallets',
- all: 'Total',
+ all: 'Net income',
},
dates: {
diff --git a/locales/ru-RU.js b/locales/ru-RU.js
index bdb0f0a5..09d41f71 100644
--- a/locales/ru-RU.js
+++ b/locales/ru-RU.js
@@ -2,6 +2,8 @@
export default {
common: {
date: 'Дата',
+ open: 'Открыть',
+ all: 'Все',
},
analytics: {
@@ -24,6 +26,10 @@ export default {
backTo: 'Назад к ',
close: 'Закрыть',
+ transfer: {
+ titleMany: 'Переводы',
+ },
+
trnForm: {
transferTitle: 'Перевод',
saveTrnButton: 'Сохранить',
@@ -67,7 +73,7 @@ export default {
madeBy: {
text: 'Разработал',
name: 'Илья Комичев',
- },
+ }
},
userLogout: 'Выход',
@@ -123,7 +129,7 @@ export default {
customize: 'Внешний вид',
app: 'Приложение',
caution: 'C осторожностью',
- deleteButton: 'Удалить все мои данные',
+ deleteButton: 'Удалить все мои данные'
},
wallets: {
@@ -134,7 +140,7 @@ export default {
showOnly: 'Показать только',
sortTitle: 'Сортировать кошельки',
createNewTitle: 'Создание кошелька',
- editTitle: 'Редактирование кошелек',
+ editTitle: 'Редактирование кошелька',
form: {
name: {
label: 'Имя кошелька',
@@ -257,12 +263,17 @@ export default {
money: {
incomes: 'Доход',
expenses: 'Расход',
+ total: 'Баланс',
+
+ income: 'Доход',
+ expense: 'Расход',
+ sum: 'Баланс',
+
transfer: 'Перевод',
- total: 'Итого',
average: {
- base: 'Среднее',
- incomes: 'Средний доход',
- expenses: 'Средний расход',
+ base: 'Обычно',
+ incomes: 'Обычно',
+ expenses: 'Обычно',
},
averageTotal: 'Обычно',
also: 'Еще',
diff --git a/modules/filter/useFilter.ts b/modules/filter/useFilter.ts
index 5c9bbe43..ad862e81 100644
--- a/modules/filter/useFilter.ts
+++ b/modules/filter/useFilter.ts
@@ -10,26 +10,26 @@ export default function useFilter() {
if (page) page.scrollTop = 0
}
- function setCategoryFilter(id) {
+ function setFilterCatsId(catId) {
if (isNeedToRedirect.value)
router.push('/')
- $store.dispatch('filter/handleSetFilterCategory', id)
+ $store.commit('filter/setFilterCatsId', catId)
scrollTop()
}
- function setWalletFilter(id) {
+ function setFilterWalletsId(walletId) {
if (isNeedToRedirect.value)
router.push('/')
- $store.dispatch('filter/setFilterWalletId', id)
+ $store.commit('filter/setFilterWalletsId', walletId)
scrollTop()
}
return {
scrollTop,
- setCategoryFilter,
- setWalletFilter,
+ setFilterCatsId,
+ setFilterWalletsId,
filterPeriodNameAllReplacedToYear,
}
}
diff --git a/modules/menu/useMenuData.ts b/modules/menu/useMenuData.ts
index a7edbc04..4f9346d6 100644
--- a/modules/menu/useMenuData.ts
+++ b/modules/menu/useMenuData.ts
@@ -9,18 +9,14 @@ export default function useMenuData() {
const route = useRoute()
const router = useRouter()
- const items: Record<string, MenuItem> = {
+ const items = computed(() => ({
trnForm: {
icon: 'mdi mdi-plus',
name: i18n.t('createTrn'),
},
index: {
icon: 'mdi mdi-poll',
- name: i18n.t('stat.shortTitle'),
- },
- history: {
- icon: 'mdi mdi-history',
- name: i18n.t('trns.history'),
+ name: i18n.t('stat.title'),
},
wallets: {
icon: 'mdi mdi-credit-card-multiple',
@@ -30,6 +26,10 @@ export default function useMenuData() {
icon: 'mdi mdi-folder-star',
name: i18n.t('categories.name'),
},
+ history: {
+ icon: 'mdi mdi-history',
+ name: i18n.t('trns.history'),
+ },
settings: {
icon: 'mdi mdi-cog-outline',
name: i18n.t('settings.title'),
@@ -39,21 +39,21 @@ export default function useMenuData() {
icon: 'mdi mdi-account-multiple',
name: i18n.t('users.title'),
},
- }
+ }))
function onClick(menuId: string) {
menuId === 'trnForm'
? $store.dispatch('trnForm/openTrnForm', { action: 'create' })
- : router.push(menuId)
+ : router.push(`/${menuId}`)
if (menuId === 'history')
- router.push(menuId)
+ router.push(`/${menuId}`)
$store.dispatch('ui/setActiveTab', null)
}
function checkIsActive(menuId: string) {
- return route.name === menuId
+ return route.name.includes(menuId)
}
function checkIsShow(item: MenuItem) {
diff --git a/modules/stat/getStat.ts b/modules/stat/getStat.ts
deleted file mode 100644
index 287f1f00..00000000
--- a/modules/stat/getStat.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Get first item in sorted catgories
- *
- * @param {*} categoriesTotal
- * @param {*} categoriesIds
- * @param {*} typeName
- * @return {*}
- */
-function getBiggestAmount(categoriesTotal, categoriesIds, typeName) {
- const biggestAmount = categoriesIds[0]
- return categoriesTotal[biggestAmount] && Math.abs(categoriesTotal[biggestAmount][typeName])
-}
-
-/**
- * Return default getStat
- *
- * @export
- * @param {*} [trnsIds=[]]
- * @return {*}
- */
-export default function getStat() {
- const { $store } = useNuxtApp()
-
- function getStatBy(trnsIds = []) {
- const categoriesWithTrnsIds = $store.getters['stat/getCategoriesIdsWithTrnsIds']({ trnsIds })
- const totalAllTrns = $store.getters['trns/getTotalOfTrnsIds'](trnsIds)
-
- // count total in categories
- const categoriesTotal = {}
- for (const categoryId in categoriesWithTrnsIds)
- categoriesTotal[categoryId] = $store.getters['trns/getTotalOfTrnsIds'](categoriesWithTrnsIds[categoryId])
-
- // separate catgories by incomes and expenses
- const statIncomes = {}
- const statExpenses = {}
- for (const categoryId in categoriesWithTrnsIds) {
- const total = categoriesTotal[categoryId]
- if (total.incomes > 0) statIncomes[categoryId] = total
- if (total.expenses > 0) statExpenses[categoryId] = total
- }
-
- // sorted
- const incomesCategoriesIds = Object.keys(statIncomes)
- const expensesCategoriesIds = Object.keys(statExpenses)
-
- // biggest
- const expensesBiggest = getBiggestAmount(categoriesTotal, expensesCategoriesIds, 'expenses')
- const incomesBiggest = getBiggestAmount(categoriesTotal, incomesCategoriesIds, 'incomes')
-
- const stat = {
- categories: categoriesTotal,
- total: totalAllTrns.total,
- expenses: {
- biggest: expensesBiggest,
- categoriesIds: expensesCategoriesIds,
- total: totalAllTrns.expenses,
- },
- incomes: {
- biggest: incomesBiggest,
- categoriesIds: incomesCategoriesIds,
- total: totalAllTrns.incomes,
- },
- }
-
- return stat
- }
-
- return {
- getStatBy,
- }
-}
diff --git a/modules/trns/use/formatTrn.ts b/modules/trns/use/formatTrn.ts
deleted file mode 100644
index 818d0ff9..00000000
--- a/modules/trns/use/formatTrn.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { formatDate } from '~/utils/formatDate'
-
-export default function useFormatTrnFullItem() {
- const { $store } = useNuxtApp()
-
- 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-expect-error dif types
- 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/modules/trns/useTrns.ts b/modules/trns/useTrns.ts
deleted file mode 100644
index 15ed6def..00000000
--- a/modules/trns/useTrns.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import dayjs from 'dayjs'
-
-export default function useFilter() {
- const { $store } = useNuxtApp()
-
- /**
- * Base
- */
- const trns = computed(() => $store.state.trns.items)
- const trnsIds = computed(() => Object.keys(trns.value))
- const cats = computed(() => $store.state.categories.items)
- const catsIds = computed(() => Object.keys(cats.value))
-
- /**
- * Get trns with params
- */
- function getTrnsIds(params: any) {
- if (trnsIds.value.length === 0)
- return trnsIds.value
-
- const { walletId, categoryId, date } = params || {}
- let ids = trnsIds.value
-
- // Wallet
- if (walletId) {
- ids = ids.filter(id =>
- trns.value[id].walletId === walletId
- || trns.value[id].walletToId === walletId
- || trns.value[id].walletFromId === walletId,
- )
- }
-
- // Category
- if (categoryId) {
- const childCategoriesIds = catsIds.value
- .filter(id => cats.value[id].parentId === categoryId)
-
- if (childCategoriesIds.length) {
- ids = trnsIds.value.filter((trnId) => {
- const trnCategoryId = trns.value[trnId].categoryId
- for (const categoryId of childCategoriesIds)
- if (trnCategoryId === categoryId) return true
-
- return true
- })
- }
- else {
- ids = trnsIds.value
- .filter(id => trns.value[id].categoryId === categoryId)
- }
- }
-
- // Date
- if (date) {
- if (typeof date === 'object') {
- ids = trnsIds.value
- .filter(id =>
- trns.value[id].date >= dayjs(date.from).startOf('date')
- && trns.value[id].date <= dayjs(date.to).endOf('date'),
- )
- }
- }
-
- return ids
- }
-
- return {
- trnsIds,
- getTrnsIds,
- }
-}
diff --git a/nuxt.config.js b/nuxt.config.js
index e13d322e..324b9765 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -90,15 +90,10 @@ export default defineNuxtConfig({
buildModules: [
'@nuxtjs/style-resources',
'@nuxtjs/pwa',
- // https://tailwindcss.nuxtjs.org/
'@nuxtjs/tailwindcss',
'unplugin-vue2-script-setup/nuxt',
],
- scriptSetup: {
- reactivityTransform: true,
- },
-
alias: {
tslib: 'tslib/tslib.es6.js',
},
@@ -137,6 +132,7 @@ export default defineNuxtConfig({
pwa: {
manifest: {
name: 'Finapp',
+ id: '/?standalone=true',
short_name: 'Finapp',
background_color: '#171717',
theme_color: '#171717',
diff --git a/package-lock.json b/package-lock.json
index d2d9ce23..628b4db5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,21 +1,21 @@
{
"name": "finapp",
- "version": "3.4.0",
+ "version": "3.5.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "finapp",
- "version": "3.4.0",
+ "version": "3.5.0",
"dependencies": {
"@nuxtjs/i18n": "^7.2.0",
"@simonwep/pickr": "1.8.2",
- "@vueuse/core": "^7.6.2",
+ "@vueuse/core": "^7.7.1",
"axios": "0.26.0",
"core-js": "3.21.1",
"currency.js": "2.0.4",
- "dayjs": "1.10.7",
- "firebase": "9.6.7",
+ "dayjs": "1.10.8",
+ "firebase": "9.6.8",
"highcharts": "9.3.3",
"highcharts-vue": "1.4.0",
"localforage": "1.10.0",
@@ -30,19 +30,20 @@
"webpack": "^4.46.0"
},
"devDependencies": {
- "@antfu/eslint-config": "^0.16.1",
- "@nuxt/bridge": "npm:@nuxt/bridge-edge@^3.0.0-27338323.1e98259",
+ "@antfu/eslint-config": "^0.18.3",
+ "@nuxt/bridge": "npm:@nuxt/bridge-edge@^3.0.0-27444434.856c01a",
"@nuxt/devalue": "^2.0.0",
"@nuxt/types": "2.15.8",
- "@nuxtjs/color-mode": "2.1.1",
+ "@nuxtjs/color-mode": "^3.0.2",
"@nuxtjs/pwa": "3.3.5",
"@nuxtjs/style-resources": "^1.2.1",
"@nuxtjs/tailwindcss": "^5.0.0-4",
"@vue/runtime-dom": "^3.2.31",
+ "@vue/test-utils": "^1.3.0",
"cross-env": "7.0.3",
- "eslint": "^8.9.0",
+ "eslint": "^8.10.0",
"eslint-plugin-nuxt": "3.1.0",
- "fancy-log": "^1.3.3",
+ "fancy-log": "^2.0.0",
"gulp": "4.0.2",
"gulp-notify": "4.0.0",
"gulp-plumber": "1.2.1",
@@ -52,9 +53,10 @@
"style-loader": "^2.0.0",
"stylus": "^0.56.0",
"stylus-loader": "^3.0.2",
- "typescript": "4.5.5",
- "unplugin-vue2-script-setup": "^0.9.3",
- "vinyl-ftp": "0.6.1"
+ "typescript": "4.6.2",
+ "unplugin-vue2-script-setup": "^0.10.0",
+ "vinyl-ftp": "0.6.1",
+ "vitest": "^0.6.0"
}
},
"node_modules/@ampproject/remapping": {
@@ -69,25 +71,25 @@
}
},
"node_modules/@antfu/eslint-config": {
- "version": "0.16.1",
- "resolved": "https://registry.npmjs.org/@antfu/eslint-config/-/eslint-config-0.16.1.tgz",
- "integrity": "sha512-GYJMtcEpHNNQA1A2acsRqSKGRkLEZ38Y9lvHBcX7HomJ+NsPFG4a3AJ5DW1CKpPTk5W3mOF0XBMiGA+pQOC37g==",
+ "version": "0.18.3",
+ "resolved": "https://registry.npmjs.org/@antfu/eslint-config/-/eslint-config-0.18.3.tgz",
+ "integrity": "sha512-NM5xydLE+pY3Tj5jjUdgmnK2ZmPwEklgq56A0odGASksp0ix3J7cOGp+PLiVWDvDpFga5LxsV23K3XkJbuBFHA==",
"dev": true,
"dependencies": {
- "@antfu/eslint-config-react": "^0.16.1",
- "@antfu/eslint-config-vue": "^0.16.1",
- "@typescript-eslint/eslint-plugin": "^5.10.1",
- "@typescript-eslint/parser": "^5.10.1",
- "eslint-config-standard": "17.0.0-0",
+ "@antfu/eslint-config-react": "^0.18.3",
+ "@antfu/eslint-config-vue": "^0.18.3",
+ "@typescript-eslint/eslint-plugin": "^5.13.0",
+ "@typescript-eslint/parser": "^5.13.0",
+ "eslint-config-standard": "17.0.0-1",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-html": "^6.2.0",
"eslint-plugin-import": "^2.25.4",
- "eslint-plugin-jsonc": "^2.0.0",
- "eslint-plugin-n": "^14.0.0",
+ "eslint-plugin-jsonc": "^2.2.1",
+ "eslint-plugin-n": "^15.0.1",
"eslint-plugin-promise": "^6.0.0",
- "eslint-plugin-unicorn": "^40.1.0",
- "eslint-plugin-vue": "^8.4.0",
- "eslint-plugin-yml": "^0.12.0",
+ "eslint-plugin-unicorn": "^41.0.0",
+ "eslint-plugin-vue": "^8.5.0",
+ "eslint-plugin-yml": "^0.14.0",
"jsonc-eslint-parser": "^2.1.0",
"yaml-eslint-parser": "^0.5.0"
},
@@ -96,20 +98,21 @@
}
},
"node_modules/@antfu/eslint-config-basic": {
- "version": "0.16.1",
- "resolved": "https://registry.npmjs.org/@antfu/eslint-config-basic/-/eslint-config-basic-0.16.1.tgz",
- "integrity": "sha512-kUA7UBD1W8FG2frH4pKfos4l5eUSxVH8oMK7+T9OxBAxpvXDAYUGU0KNZoMOdhWhu0dmE/7iHXYbnu6r9KXwUw==",
+ "version": "0.18.3",
+ "resolved": "https://registry.npmjs.org/@antfu/eslint-config-basic/-/eslint-config-basic-0.18.3.tgz",
+ "integrity": "sha512-0kkr/pYxnJmYbKfLUmEW5Nd7FsGFHt68M+Rv8T6t0YV1kn2pJNTFcsuBYtINOAoKktgoZ7+mRjwMaNJ/MIcWbg==",
"dev": true,
"dependencies": {
- "eslint-config-standard": "17.0.0-0",
+ "eslint-config-standard": "17.0.0-1",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-html": "^6.2.0",
"eslint-plugin-import": "^2.25.4",
- "eslint-plugin-jsonc": "^2.0.0",
- "eslint-plugin-n": "^14.0.0",
+ "eslint-plugin-jsonc": "^2.2.1",
+ "eslint-plugin-markdown": "^2.2.1",
+ "eslint-plugin-n": "^15.0.1",
"eslint-plugin-promise": "^6.0.0",
- "eslint-plugin-unicorn": "^40.1.0",
- "eslint-plugin-yml": "^0.12.0",
+ "eslint-plugin-unicorn": "^41.0.0",
+ "eslint-plugin-yml": "^0.14.0",
"jsonc-eslint-parser": "^2.1.0",
"yaml-eslint-parser": "^0.5.0"
},
@@ -118,27 +121,27 @@
}
},
"node_modules/@antfu/eslint-config-react": {
- "version": "0.16.1",
- "resolved": "https://registry.npmjs.org/@antfu/eslint-config-react/-/eslint-config-react-0.16.1.tgz",
- "integrity": "sha512-UU/KqDVRb6/XQVBsrL2a3fBwn2NRGWnZCBPAU9HbIqLY/zJ5p8CpBJTvvIvCC4p4aiO3unwnYhhf5SdCQtfOjw==",
+ "version": "0.18.3",
+ "resolved": "https://registry.npmjs.org/@antfu/eslint-config-react/-/eslint-config-react-0.18.3.tgz",
+ "integrity": "sha512-Mz5gPJowsMuMRuhiTRTvD2REbMDq+pU6QauoMsEMeVbJ3vTiLw/AV0aXprbRL1PUhPHGNDdzYyU+E/tw1UZS6A==",
"dev": true,
"dependencies": {
- "@antfu/eslint-config-ts": "^0.16.1",
- "eslint-plugin-react": "^7.28.0"
+ "@antfu/eslint-config-ts": "^0.18.3",
+ "eslint-plugin-react": "^7.29.3"
},
"peerDependencies": {
"eslint": ">=7.4.0"
}
},
"node_modules/@antfu/eslint-config-ts": {
- "version": "0.16.1",
- "resolved": "https://registry.npmjs.org/@antfu/eslint-config-ts/-/eslint-config-ts-0.16.1.tgz",
- "integrity": "sha512-FrIosrYILXog7v8GcQkj8YyMKe6HxUvv8DFDHxQjR5liI77BQ9kmIqRu8JZ/6RwMEEpMWV5Ed+LDR7FDjJiTxg==",
+ "version": "0.18.3",
+ "resolved": "https://registry.npmjs.org/@antfu/eslint-config-ts/-/eslint-config-ts-0.18.3.tgz",
+ "integrity": "sha512-ZCr0IjYkF5uSgvlHVpQ+Y2FdMIa5WCvmrkjDm8m9XGXCPvI/KbLy+2fXj65gZXDCAQ0bet6Dl+4EeNRn29E32Q==",
"dev": true,
"dependencies": {
- "@antfu/eslint-config-basic": "^0.16.1",
- "@typescript-eslint/eslint-plugin": "^5.10.1",
- "@typescript-eslint/parser": "^5.10.1"
+ "@antfu/eslint-config-basic": "^0.18.3",
+ "@typescript-eslint/eslint-plugin": "^5.13.0",
+ "@typescript-eslint/parser": "^5.13.0"
},
"peerDependencies": {
"eslint": ">=7.4.0",
@@ -146,26 +149,23 @@
}
},
"node_modules/@antfu/eslint-config-vue": {
- "version": "0.16.1",
- "resolved": "https://registry.npmjs.org/@antfu/eslint-config-vue/-/eslint-config-vue-0.16.1.tgz",
- "integrity": "sha512-2BMQBTVQrElu2Pvmubgc1G3BrCbaQjBzcepZZvHNnK74Wq4ec1Cl5i9BMRVVwBGg5fIg5erRPzUWr17j5BLa0A==",
+ "version": "0.18.3",
+ "resolved": "https://registry.npmjs.org/@antfu/eslint-config-vue/-/eslint-config-vue-0.18.3.tgz",
+ "integrity": "sha512-RgenlvleSCMQ9z+326OjuyB5X1wV9JbdE8BUUIeFUBcJ73PMEsk6dwickEmy+ELZtgH3Ql25XlPn4szbTdJScQ==",
"dev": true,
"dependencies": {
- "@antfu/eslint-config-ts": "^0.16.1",
- "eslint-plugin-vue": "^8.4.0"
+ "@antfu/eslint-config-ts": "^0.18.3",
+ "eslint-plugin-vue": "^8.5.0"
},
"peerDependencies": {
"eslint": ">=7.4.0"
}
},
"node_modules/@antfu/utils": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.4.0.tgz",
- "integrity": "sha512-gqkpvjkgFUu+s3kP+Ly33OKpo5zvVY3FDFhv5BIb98SncS3KD6DNxPfNDjwHIoyXbz1leWo1j8DtRLZ1D2Jv+Q==",
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.5.0.tgz",
+ "integrity": "sha512-MrAQ/MrPSxbh1bBrmwJjORfJymw4IqSHFBXqvxaga3ZdDM+/zokYF8DjyJpSjY2QmpmgQrajDUBJOWrYeARfzA==",
"dev": true,
- "dependencies": {
- "@types/throttle-debounce": "^2.1.0"
- },
"funding": {
"url": "https://github.com/sponsors/antfu"
}
@@ -288,9 +288,9 @@
}
},
"node_modules/@babel/helper-create-class-features-plugin": {
- "version": "7.17.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz",
- "integrity": "sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ==",
+ "version": "7.17.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz",
+ "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==",
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.16.7",
"@babel/helper-environment-visitor": "^7.16.7",
@@ -428,9 +428,9 @@
}
},
"node_modules/@babel/helper-module-transforms": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
- "integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+ "version": "7.17.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz",
+ "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
"dependencies": {
"@babel/helper-environment-visitor": "^7.16.7",
"@babel/helper-module-imports": "^7.16.7",
@@ -438,8 +438,8 @@
"@babel/helper-split-export-declaration": "^7.16.7",
"@babel/helper-validator-identifier": "^7.16.7",
"@babel/template": "^7.16.7",
- "@babel/traverse": "^7.16.7",
- "@babel/types": "^7.16.7"
+ "@babel/traverse": "^7.17.3",
+ "@babel/types": "^7.17.0"
},
"engines": {
"node": ">=6.9.0"
@@ -654,11 +654,11 @@
}
},
"node_modules/@babel/plugin-proposal-class-static-block": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz",
- "integrity": "sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==",
+ "version": "7.17.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz",
+ "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.16.7",
+ "@babel/helper-create-class-features-plugin": "^7.17.6",
"@babel/helper-plugin-utils": "^7.16.7",
"@babel/plugin-syntax-class-static-block": "^7.14.5"
},
@@ -1719,9 +1719,9 @@
}
},
"node_modules/@babel/standalone": {
- "version": "7.17.5",
- "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.17.5.tgz",
- "integrity": "sha512-9bd210vgc9yg6vc5jceuunpuTvsjfTMdcOeASo4rDCNfsgxjwvpkpMpoCIJFdENW0Sc4X9TrH/b6mrwQiKBmMQ==",
+ "version": "7.17.6",
+ "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.17.6.tgz",
+ "integrity": "sha512-rBBC7aZ4Q8UkMV4Wl6cAw8Wcgg7DcIG3pzo2n+W/FwmBRZB/q7yGpzE10VXpOmSj9/KW3L1pbDhPGI1oOrscgA==",
"dev": true,
"engines": {
"node": ">=6.9.0"
@@ -1852,9 +1852,9 @@
}
},
"node_modules/@csstools/postcss-is-pseudo-class": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.0.tgz",
- "integrity": "sha512-WnfZlyuh/CW4oS530HBbrKq0G8BKl/bsNr5NMFoubBFzJfvFRGJhplCgIJYWUidLuL3WJ/zhMtDIyNFTqhx63Q==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.1.tgz",
+ "integrity": "sha512-Og5RrTzwFhrKoA79c3MLkfrIBYmwuf/X83s+JQtz/Dkk/MpsaKtqHV1OOzYkogQ+tj3oYp5Mq39XotBXNqVc3Q==",
"dev": true,
"dependencies": {
"postcss-selector-parser": "^6.0.9"
@@ -1898,9 +1898,9 @@
}
},
"node_modules/@csstools/postcss-progressive-custom-properties": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.2.0.tgz",
- "integrity": "sha512-YLpFPK5OaLIRKZhUfnrZPT9s9cmtqltIOg7W6jPcxmiDpnZ4lk+odfufZttOAgcg6IHWvNLgcITSLpJxIQB/qQ==",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
+ "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
"dev": true,
"dependencies": {
"postcss-value-parser": "^4.2.0"
@@ -1913,9 +1913,9 @@
}
},
"node_modules/@eslint/eslintrc": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.1.0.tgz",
- "integrity": "sha512-C1DfL7XX4nPqGd6jcP01W9pVM1HYCuUkFk1432D7F0v3JSlUIeOYn9oCoi3eoLZ+iwBSb29BMFxxny0YrrEZqg==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.0.tgz",
+ "integrity": "sha512-igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w==",
"dev": true,
"dependencies": {
"ajv": "^6.12.4",
@@ -2022,13 +2022,14 @@
"integrity": "sha512-DNE2Waiwy5+zZnCfintkDtBfaW6MjIG883474v6Z0K1XZIvl76cLND4iv0YUb48leyF+PJK1KO2XrgHb/KpmhQ=="
},
"node_modules/@firebase/app": {
- "version": "0.7.17",
- "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.17.tgz",
- "integrity": "sha512-OnZab790eMwRxkUs7o/kgniAzSBxecDTGEk1PVhiG0HQhKrIf+R7lgqOZHDb/2GJsX12jby1p/Z5+WJCBxVbJQ==",
+ "version": "0.7.18",
+ "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.18.tgz",
+ "integrity": "sha512-jomDaPaEQEWfFUqvxQw4TYSs2gCT2BN0Ec1//3CdMsc1NcppduS31bxsjhn3KdPbtx4opkaZ2FcA+buHtdw9dw==",
"dependencies": {
"@firebase/component": "0.5.10",
"@firebase/logger": "0.3.2",
"@firebase/util": "1.4.3",
+ "idb": "3.0.2",
"tslib": "^2.1.0"
}
},
@@ -2067,11 +2068,11 @@
"integrity": "sha512-uZfn9s4uuRsaX5Lwx+gFP3B6YsyOKUE+Rqa6z9ojT4VSRAsZFko9FRn6OxQUA1z5t5d08fY4pf+/+Dkd5wbdbA=="
},
"node_modules/@firebase/app-compat": {
- "version": "0.1.18",
- "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.18.tgz",
- "integrity": "sha512-YXmMLQro2g2xlNnzB6zVxYoFx9sJS/JDEQy6vsj3FpMUuARaImipL6W8KuGfH+tJ3M+q38qRaFROk5gK6PoCrQ==",
+ "version": "0.1.19",
+ "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.19.tgz",
+ "integrity": "sha512-a0TgAXcjF3htSdi10mRwAks1+73nwbmSMXzjlOQDYJ8t3HE7FvHxfB4hjuwHKfgr3MWZjcarsGKVr7LWhUAE8w==",
"dependencies": {
- "@firebase/app": "0.7.17",
+ "@firebase/app": "0.7.18",
"@firebase/component": "0.5.10",
"@firebase/logger": "0.3.2",
"@firebase/util": "1.4.3",
@@ -2362,9 +2363,9 @@
}
},
"node_modules/@firebase/messaging": {
- "version": "0.9.8",
- "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.9.8.tgz",
- "integrity": "sha512-X588ZFA/plaO4de7MyZs2gukrkdp+ounwqZ7JerHHVa6eKl1WNi9AuAfoXOJUMq+nX2DsOWYjohciCkC6qLrWw==",
+ "version": "0.9.9",
+ "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.9.9.tgz",
+ "integrity": "sha512-Fe6+VqFgVuvFOiVerQkPzdmHXnB7urujcKAxK3lRKxgafH89CRvXO1sPnPMvox5/JOCBZrAPok5KA7rOCxBguw==",
"dependencies": {
"@firebase/component": "0.5.10",
"@firebase/installations": "0.5.5",
@@ -2378,12 +2379,12 @@
}
},
"node_modules/@firebase/messaging-compat": {
- "version": "0.1.8",
- "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.1.8.tgz",
- "integrity": "sha512-1q0Bp/auG6XUSEBzmExrn6uU6JUtB5JxIHwTj8wmUf+JcdNqPMWou040Mem421Sxgd4GLn+vHHlVIRxv1yLYUA==",
+ "version": "0.1.9",
+ "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.1.9.tgz",
+ "integrity": "sha512-smcBhvTLfgE2KDtvDj1Pm9zQ7GeyR5BLarYLxtvmhhbV6tpa8g+UUE3pCdqN+y1kx6mIYqNOmEEXv+1YnSiYwQ==",
"dependencies": {
"@firebase/component": "0.5.10",
- "@firebase/messaging": "0.9.8",
+ "@firebase/messaging": "0.9.9",
"@firebase/util": "1.4.3",
"tslib": "^2.1.0"
},
@@ -2564,9 +2565,9 @@
"integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="
},
"node_modules/@grpc/grpc-js": {
- "version": "1.5.5",
- "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.5.tgz",
- "integrity": "sha512-FTd27ItHlsSG/7hp62xgI9YnqSwRbHRSVmDVR8DwOoC+6t8JhHRXe2JL0U8N9GLc0jS0HrtEbO/KP5+G0ebjLQ==",
+ "version": "1.5.7",
+ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.7.tgz",
+ "integrity": "sha512-RAlSbZ9LXo0wNoHKeUlwP9dtGgVBDUbnBKFpfAv5iSqMG4qWz9um2yLH215+Wow1I48etIa1QMS+WAGmsE/7HQ==",
"dependencies": {
"@grpc/proto-loader": "^0.6.4",
"@types/node": ">=12.12.47"
@@ -2594,9 +2595,9 @@
}
},
"node_modules/@humanwhocodes/config-array": {
- "version": "0.9.3",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.3.tgz",
- "integrity": "sha512-3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ==",
+ "version": "0.9.5",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+ "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
"dev": true,
"dependencies": {
"@humanwhocodes/object-schema": "^1.2.1",
@@ -2824,18 +2825,18 @@
},
"node_modules/@nuxt/bridge": {
"name": "@nuxt/bridge-edge",
- "version": "3.0.0-27420403.16e2a54",
- "resolved": "https://registry.npmjs.org/@nuxt/bridge-edge/-/bridge-edge-3.0.0-27420403.16e2a54.tgz",
- "integrity": "sha512-iN5sNI51LI6ZUcNuGjw58Kbhwb4WWqmK8P7Vu3H/gfkTEXyQIiqlzIUF8QrfZO3tOq5akknz9M66QywqMY3bWQ==",
+ "version": "3.0.0-27444434.856c01a",
+ "resolved": "https://registry.npmjs.org/@nuxt/bridge-edge/-/bridge-edge-3.0.0-27444434.856c01a.tgz",
+ "integrity": "sha512-jN6j36E9K6gnWlo5eYZizeVDQzkVRUs8jt4Yi2n3a0zSvVCFvPDcvCNPsH3AB44NGmN3OT7UF6mh/TmqvdfllA==",
"dev": true,
"dependencies": {
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
"@babel/plugin-proposal-optional-chaining": "^7.16.7",
"@babel/plugin-transform-typescript": "^7.16.8",
- "@nuxt/kit": "npm:@nuxt/[email protected]",
- "@nuxt/nitro": "npm:@nuxt/[email protected]",
+ "@nuxt/kit": "npm:@nuxt/[email protected]",
+ "@nuxt/nitro": "npm:@nuxt/[email protected]",
"@nuxt/postcss8": "^1.1.3",
- "@nuxt/schema": "npm:@nuxt/[email protected]",
+ "@nuxt/schema": "npm:@nuxt/[email protected]",
"@vitejs/plugin-legacy": "^1.6.4",
"@vue/composition-api": "^1.4.6",
"@vueuse/head": "^0.7.5",
@@ -2856,7 +2857,7 @@
"mlly": "^0.4.2",
"murmurhash-es": "^0.1.1",
"node-fetch": "^3.2.0",
- "nuxi": "npm:[email protected]",
+ "nuxi": "npm:[email protected]",
"p-debounce": "^4.0.0",
"pathe": "^0.2.0",
"postcss": "^8",
@@ -2880,6 +2881,18 @@
"node": "^14.16.0 || ^16.11.0 || ^17.0.0"
}
},
+ "node_modules/@nuxt/bridge/node_modules/@antfu/utils": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.4.0.tgz",
+ "integrity": "sha512-gqkpvjkgFUu+s3kP+Ly33OKpo5zvVY3FDFhv5BIb98SncS3KD6DNxPfNDjwHIoyXbz1leWo1j8DtRLZ1D2Jv+Q==",
+ "dev": true,
+ "dependencies": {
+ "@types/throttle-debounce": "^2.1.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ }
+ },
"node_modules/@nuxt/bridge/node_modules/@vue/server-renderer": {
"version": "3.2.31",
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.31.tgz",
@@ -3458,17 +3471,18 @@
},
"node_modules/@nuxt/kit": {
"name": "@nuxt/kit-edge",
- "version": "3.0.0-27420403.16e2a54",
- "resolved": "https://registry.npmjs.org/@nuxt/kit-edge/-/kit-edge-3.0.0-27420403.16e2a54.tgz",
- "integrity": "sha512-W7/2Hd+lbJfDOK7qTOLSu1VFjpZlC/VsfE/wLbbX3BG2UTn3DsGQe3ksqdmGWn9o2XEWJ9snNMroXJPNrqEUkg==",
+ "version": "3.0.0-27444434.856c01a",
+ "resolved": "https://registry.npmjs.org/@nuxt/kit-edge/-/kit-edge-3.0.0-27444434.856c01a.tgz",
+ "integrity": "sha512-0mXD7Otg2Bpcx4PkiEAuNckjR68w81CHfkp33v97bERqRCm2HjZarmWuL04mmAHACdTUgcN0KRIspHvnISi5Ng==",
"dev": true,
"dependencies": {
- "@nuxt/schema": "npm:@nuxt/[email protected]",
+ "@nuxt/schema": "npm:@nuxt/[email protected]",
"c12": "^0.1.3",
"consola": "^2.15.3",
"defu": "^5.0.1",
"globby": "^13.1.1",
"hash-sum": "^2.0.0",
+ "ignore": "^5.2.0",
"jiti": "^1.13.0",
"knitwork": "^0.1.0",
"lodash.template": "^4.5.0",
@@ -3498,23 +3512,23 @@
},
"node_modules/@nuxt/nitro": {
"name": "@nuxt/nitro-edge",
- "version": "3.0.0-27420403.16e2a54",
- "resolved": "https://registry.npmjs.org/@nuxt/nitro-edge/-/nitro-edge-3.0.0-27420403.16e2a54.tgz",
- "integrity": "sha512-6QVI9FWmjSuZGLdpEwVyuSQx2eUJqwzkvSOwCGKLI5jeZVLuuRZbSdhZbG8LWLoxpH+MHSpKEJ5psWxAMPmbVg==",
+ "version": "3.0.0-27444434.856c01a",
+ "resolved": "https://registry.npmjs.org/@nuxt/nitro-edge/-/nitro-edge-3.0.0-27444434.856c01a.tgz",
+ "integrity": "sha512-crA4LEes1ovknxOmUVOFeHbg8saWdwGTLZ7ytt+dJgmaGWUMMdkuyaFUa7srxskqjf7P/YlOR5lnqDN0kXn69w==",
"dev": true,
"dependencies": {
"@cloudflare/kv-asset-handler": "^0.2.0",
"@netlify/functions": "^1.0.0",
"@nuxt/design": "0.1.5",
"@nuxt/devalue": "^2.0.0",
- "@nuxt/kit": "npm:@nuxt/[email protected]",
+ "@nuxt/kit": "npm:@nuxt/[email protected]",
"@rollup/plugin-alias": "^3.1.9",
- "@rollup/plugin-commonjs": "^21.0.1",
+ "@rollup/plugin-commonjs": "^21.0.2",
"@rollup/plugin-inject": "^4.0.4",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.1.3",
- "@rollup/plugin-replace": "^3.1.0",
- "@rollup/plugin-virtual": "^2.0.3",
+ "@rollup/plugin-replace": "^4.0.0",
+ "@rollup/plugin-virtual": "^2.1.0",
"@rollup/plugin-wasm": "^5.1.2",
"@rollup/pluginutils": "^4.1.2",
"@types/jsdom": "^16.2.14",
@@ -3527,9 +3541,9 @@
"defu": "^5.0.1",
"destr": "^1.1.0",
"dot-prop": "^7.2.0",
- "esbuild": "^0.14.22",
+ "esbuild": "^0.14.23",
"etag": "^1.8.1",
- "fs-extra": "^10.0.0",
+ "fs-extra": "^10.0.1",
"globby": "^13.1.1",
"gzip-size": "^7.0.0",
"h3": "^0.3.9",
@@ -3544,19 +3558,19 @@
"mlly": "^0.4.3",
"node-fetch": "^3.2.0",
"ohmyfetch": "^0.4.15",
- "ora": "^6.0.1",
+ "ora": "^6.1.0",
"p-debounce": "^4.0.0",
"pathe": "^0.2.0",
"pkg-types": "^0.3.2",
"pretty-bytes": "^6.0.0",
- "rollup": "^2.67.3",
+ "rollup": "^2.68.0",
"rollup-plugin-terser": "^7.0.2",
- "rollup-plugin-visualizer": "^5.5.4",
+ "rollup-plugin-visualizer": "^5.6.0",
"serve-placeholder": "^1.2.4",
"serve-static": "^1.14.2",
"std-env": "^3.0.1",
"table": "^6.8.0",
- "ufo": "^0.7.9",
+ "ufo": "^0.7.11",
"unenv": "^0.4.3",
"unstorage": "^0.3.3",
"vue-bundle-renderer": "^0.3.5",
@@ -3719,9 +3733,9 @@
},
"node_modules/@nuxt/schema": {
"name": "@nuxt/schema-edge",
- "version": "3.0.0-27420403.16e2a54",
- "resolved": "https://registry.npmjs.org/@nuxt/schema-edge/-/schema-edge-3.0.0-27420403.16e2a54.tgz",
- "integrity": "sha512-CDITD834JnlVHj72z6eGyU/Ezr1h52fv+xk3jybfgo0td38ANqT+vWKlLyBJf089Sd2pAP+SIWCIpfwjoknMKw==",
+ "version": "3.0.0-27444434.856c01a",
+ "resolved": "https://registry.npmjs.org/@nuxt/schema-edge/-/schema-edge-3.0.0-27444434.856c01a.tgz",
+ "integrity": "sha512-kVS0ShWVOzUJR+QV0Sqvv1m7lhP7ZT6d4CXuC5+N13ZwIonoxdwvCKWR3mNJOaXTZDqthic91noqH2GtXI9r5Q==",
"dev": true,
"dependencies": {
"c12": "^0.1.3",
@@ -3729,9 +3743,10 @@
"defu": "^5.0.1",
"jiti": "^1.13.0",
"pathe": "^0.2.0",
+ "postcss-import-resolver": "^2.0.0",
"scule": "^0.2.1",
"std-env": "^3.0.1",
- "ufo": "^0.7.9"
+ "ufo": "^0.7.11"
},
"engines": {
"node": "^14.16.0 || ^16.11.0 || ^17.0.0"
@@ -4821,13 +4836,15 @@
}
},
"node_modules/@nuxtjs/color-mode": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/@nuxtjs/color-mode/-/color-mode-2.1.1.tgz",
- "integrity": "sha512-kGB/FoICF4RwZkfNBhL/yGrHfaUFpviYq6HGvSkZEm2dCpjRXIv9VsWoP0uzwxnoaRAQQOkkWjaGv/nSk0gUSQ==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@nuxtjs/color-mode/-/color-mode-3.0.2.tgz",
+ "integrity": "sha512-JgppnxOsVe2T/UGj0xjok/8TKDI27bRuhNh+Qrvr0FsS90Mty2acZLLN0lkrOTV0WLrpnTgN7mZCrgCWmhvziA==",
"dev": true,
"dependencies": {
+ "@nuxt/kit": "npm:@nuxt/kit-edge@latest",
"defu": "^5.0.0",
- "lodash.template": "^4.5.0"
+ "lodash.template": "^4.5.0",
+ "pathe": "^0.2.0"
}
},
"node_modules/@nuxtjs/i18n": {
@@ -5086,9 +5103,9 @@
}
},
"node_modules/@rollup/plugin-commonjs": {
- "version": "21.0.1",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-21.0.1.tgz",
- "integrity": "sha512-EA+g22lbNJ8p5kuZJUYyhhDK7WgJckW5g4pNN7n4mAFUM96VuwUnNT3xr2Db2iCZPI1pJPbGyfT5mS9T1dHfMg==",
+ "version": "21.0.2",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-21.0.2.tgz",
+ "integrity": "sha512-d/OmjaLVO4j/aQX69bwpWPpbvI3TJkQuxoAk7BH8ew1PyoMBLTOuvJTjzG8oEoW7drIIqB0KCJtfFLu/2GClWg==",
"dev": true,
"dependencies": {
"@rollup/pluginutils": "^3.1.0",
@@ -5281,9 +5298,9 @@
"dev": true
},
"node_modules/@rollup/plugin-replace": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-3.1.0.tgz",
- "integrity": "sha512-pA3XRUrSKybVYqmH5TqWNZpGxF+VV+1GrYchKgCNIj2vsSOX7CVm2RCtx8p2nrC7xvkziYyK+lSi74T93MU3YA==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-4.0.0.tgz",
+ "integrity": "sha512-+rumQFiaNac9y64OHtkHGmdjm7us9bo1PlbgQfdihQtuNxzjpaB064HbRnewUOggLQxVCCyINfStkgmBeQpv1g==",
"dev": true,
"dependencies": {
"@rollup/pluginutils": "^3.1.0",
@@ -5323,10 +5340,13 @@
"dev": true
},
"node_modules/@rollup/plugin-virtual": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-virtual/-/plugin-virtual-2.0.3.tgz",
- "integrity": "sha512-pw6ziJcyjZtntQ//bkad9qXaBx665SgEL8C8KI5wO8G5iU5MPxvdWrQyVaAvjojGm9tJoS8M9Z/EEepbqieYmw==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-virtual/-/plugin-virtual-2.1.0.tgz",
+ "integrity": "sha512-CPPAtlKT53HFqC8jFHb/V5WErpU8Hrq2TyCR0A7kPQMlF2wNUf0o1xuAc+Qxj8NCZM0Z3Yvl+FbUXfJjVWqDwA==",
"dev": true,
+ "engines": {
+ "node": ">=8.0.0"
+ },
"peerDependencies": {
"rollup": "^1.20.0||^2.0.0"
}
@@ -5344,9 +5364,9 @@
}
},
"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==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.0.tgz",
+ "integrity": "sha512-2WUyJNRkyH5p487pGnn4tWAsxhEFKN/pT8CMgHshd5H+IXkOnKvKZwsz5ZWz+YCXkleZRAU5kwbfgF8CPfDRqA==",
"dev": true,
"dependencies": {
"estree-walker": "^2.0.1",
@@ -5483,6 +5503,21 @@
"browserslist": "*"
}
},
+ "node_modules/@types/chai": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.0.tgz",
+ "integrity": "sha512-/ceqdqeRraGolFTcfoXNiqjyQhZzbINDngeoAq9GoHa8PPK1yNzTaxWjA6BFWp5Ua9JpXEMSS4s5i9tS0hOJtw==",
+ "dev": true
+ },
+ "node_modules/@types/chai-subset": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.3.tgz",
+ "integrity": "sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==",
+ "dev": true,
+ "dependencies": {
+ "@types/chai": "*"
+ }
+ },
"node_modules/@types/clean-css": {
"version": "4.2.5",
"resolved": "https://registry.npmjs.org/@types/clean-css/-/clean-css-4.2.5.tgz",
@@ -5616,6 +5651,15 @@
"resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
"integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
},
+ "node_modules/@types/mdast": {
+ "version": "3.0.10",
+ "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
+ "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
+ "dev": true,
+ "dependencies": {
+ "@types/unist": "*"
+ }
+ },
"node_modules/@types/mime": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@@ -5779,6 +5823,12 @@
"node": ">=0.10.0"
}
},
+ "node_modules/@types/unist": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
+ "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
+ "dev": true
+ },
"node_modules/@types/webpack": {
"version": "4.41.28",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.28.tgz",
@@ -5848,14 +5898,14 @@
}
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.12.0.tgz",
- "integrity": "sha512-fwCMkDimwHVeIOKeBHiZhRUfJXU8n6xW1FL9diDxAyGAFvKcH4csy0v7twivOQdQdA0KC8TDr7GGRd3L4Lv0rQ==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.14.0.tgz",
+ "integrity": "sha512-ir0wYI4FfFUDfLcuwKzIH7sMVA+db7WYen47iRSaCGl+HMAZI9fpBwfDo45ZALD3A45ZGyHWDNLhbg8tZrMX4w==",
"dev": true,
"dependencies": {
- "@typescript-eslint/scope-manager": "5.12.0",
- "@typescript-eslint/type-utils": "5.12.0",
- "@typescript-eslint/utils": "5.12.0",
+ "@typescript-eslint/scope-manager": "5.14.0",
+ "@typescript-eslint/type-utils": "5.14.0",
+ "@typescript-eslint/utils": "5.14.0",
"debug": "^4.3.2",
"functional-red-black-tree": "^1.0.1",
"ignore": "^5.1.8",
@@ -5881,14 +5931,14 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.12.0.tgz",
- "integrity": "sha512-MfSwg9JMBojMUoGjUmX+D2stoQj1CBYTCP0qnnVtu9A+YQXVKNtLjasYh+jozOcrb/wau8TCfWOkQTiOAruBog==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.14.0.tgz",
+ "integrity": "sha512-aHJN8/FuIy1Zvqk4U/gcO/fxeMKyoSv/rS46UXMXOJKVsLQ+iYPuXNbpbH7cBLcpSbmyyFbwrniLx5+kutu1pw==",
"dev": true,
"dependencies": {
- "@typescript-eslint/scope-manager": "5.12.0",
- "@typescript-eslint/types": "5.12.0",
- "@typescript-eslint/typescript-estree": "5.12.0",
+ "@typescript-eslint/scope-manager": "5.14.0",
+ "@typescript-eslint/types": "5.14.0",
+ "@typescript-eslint/typescript-estree": "5.14.0",
"debug": "^4.3.2"
},
"engines": {
@@ -5908,13 +5958,13 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.12.0.tgz",
- "integrity": "sha512-GAMobtIJI8FGf1sLlUWNUm2IOkIjvn7laFWyRx7CLrv6nLBI7su+B7lbStqVlK5NdLvHRFiJo2HhiDF7Ki01WQ==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.14.0.tgz",
+ "integrity": "sha512-LazdcMlGnv+xUc5R4qIlqH0OWARyl2kaP8pVCS39qSL3Pd1F7mI10DbdXeARcE62sVQE4fHNvEqMWsypWO+yEw==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.12.0",
- "@typescript-eslint/visitor-keys": "5.12.0"
+ "@typescript-eslint/types": "5.14.0",
+ "@typescript-eslint/visitor-keys": "5.14.0"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -5925,12 +5975,12 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.12.0.tgz",
- "integrity": "sha512-9j9rli3zEBV+ae7rlbBOotJcI6zfc6SHFMdKI9M3Nc0sy458LJ79Os+TPWeBBL96J9/e36rdJOfCuyRSgFAA0Q==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.14.0.tgz",
+ "integrity": "sha512-d4PTJxsqaUpv8iERTDSQBKUCV7Q5yyXjqXUl3XF7Sd9ogNLuKLkxz82qxokqQ4jXdTPZudWpmNtr/JjbbvUixw==",
"dev": true,
"dependencies": {
- "@typescript-eslint/utils": "5.12.0",
+ "@typescript-eslint/utils": "5.14.0",
"debug": "^4.3.2",
"tsutils": "^3.21.0"
},
@@ -5951,9 +6001,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.12.0.tgz",
- "integrity": "sha512-JowqbwPf93nvf8fZn5XrPGFBdIK8+yx5UEGs2QFAYFI8IWYfrzz+6zqlurGr2ctShMaJxqwsqmra3WXWjH1nRQ==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.14.0.tgz",
+ "integrity": "sha512-BR6Y9eE9360LNnW3eEUqAg6HxS9Q35kSIs4rp4vNHRdfg0s+/PgHgskvu5DFTM7G5VKAVjuyaN476LCPrdA7Mw==",
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -5964,13 +6014,13 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.0.tgz",
- "integrity": "sha512-Dd9gVeOqt38QHR0BEA8oRaT65WYqPYbIc5tRFQPkfLquVEFPD1HAtbZT98TLBkEcCkvwDYOAvuSvAD9DnQhMfQ==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.14.0.tgz",
+ "integrity": "sha512-QGnxvROrCVtLQ1724GLTHBTR0lZVu13izOp9njRvMkCBgWX26PKvmMP8k82nmXBRD3DQcFFq2oj3cKDwr0FaUA==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.12.0",
- "@typescript-eslint/visitor-keys": "5.12.0",
+ "@typescript-eslint/types": "5.14.0",
+ "@typescript-eslint/visitor-keys": "5.14.0",
"debug": "^4.3.2",
"globby": "^11.0.4",
"is-glob": "^4.0.3",
@@ -6011,15 +6061,15 @@
}
},
"node_modules/@typescript-eslint/utils": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.12.0.tgz",
- "integrity": "sha512-k4J2WovnMPGI4PzKgDtQdNrCnmBHpMUFy21qjX2CoPdoBcSBIMvVBr9P2YDP8jOqZOeK3ThOL6VO/sy6jtnvzw==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.14.0.tgz",
+ "integrity": "sha512-EHwlII5mvUA0UsKYnVzySb/5EE/t03duUTweVy8Zqt3UQXBrpEVY144OTceFKaOe4xQXZJrkptCf7PjEBeGK4w==",
"dev": true,
"dependencies": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.12.0",
- "@typescript-eslint/types": "5.12.0",
- "@typescript-eslint/typescript-estree": "5.12.0",
+ "@typescript-eslint/scope-manager": "5.14.0",
+ "@typescript-eslint/types": "5.14.0",
+ "@typescript-eslint/typescript-estree": "5.14.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
},
@@ -6035,12 +6085,12 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.0.tgz",
- "integrity": "sha512-cFwTlgnMV6TgezQynx2c/4/tx9Tufbuo9LPzmWqyRC3QC4qTGkAG1C6pBr0/4I10PAI/FlYunI3vJjIcu+ZHMg==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.14.0.tgz",
+ "integrity": "sha512-yL0XxfzR94UEkjBqyymMLgCBdojzEuy/eim7N9/RIcTNxpJudAcqsU8eRyfzBbcEzGoPWfdM3AGak3cN08WOIw==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.12.0",
+ "@typescript-eslint/types": "5.14.0",
"eslint-visitor-keys": "^3.0.0"
},
"engines": {
@@ -6372,9 +6422,9 @@
"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
},
"node_modules/@vue/composition-api": {
- "version": "1.4.6",
- "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.4.6.tgz",
- "integrity": "sha512-UP359OJ0G0Zli603/i9fhXFmNtZUSrypSFyqClMxizp8ezlaMK2GCmHgy3qyrRnO/xjcDAx09vvXPwNFtxHPtQ==",
+ "version": "1.4.9",
+ "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.4.9.tgz",
+ "integrity": "sha512-l6YOeg5LEXmfPqyxAnBaCv1FMRw0OGKJ4m6nOWRm6ngt5TuHcj5ZoBRN+LXh3J0u6Ur3C4VA+RiKT+M0eItr/g==",
"devOptional": true,
"peerDependencies": {
"vue": ">= 2.5 < 3"
@@ -6435,12 +6485,27 @@
"integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==",
"dev": true
},
+ "node_modules/@vue/test-utils": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.3.0.tgz",
+ "integrity": "sha512-Xk2Xiyj2k5dFb8eYUKkcN9PzqZSppTlx7LaQWBbdA8tqh3jHr/KHX2/YLhNFc/xwDrgeLybqd+4ZCPJSGPIqeA==",
+ "dev": true,
+ "dependencies": {
+ "dom-event-types": "^1.0.0",
+ "lodash": "^4.17.15",
+ "pretty": "^2.0.0"
+ },
+ "peerDependencies": {
+ "vue": "2.x",
+ "vue-template-compiler": "^2.x"
+ }
+ },
"node_modules/@vueuse/core": {
- "version": "7.6.2",
- "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-7.6.2.tgz",
- "integrity": "sha512-bjAbXJVJO6aElMaZtDz2B70C0L6jFk/jGVqJxWZS5huffxA6dW5DN6tQQJwzOnx9B9rDhePHJIFKsix0qZIH2Q==",
+ "version": "7.7.1",
+ "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-7.7.1.tgz",
+ "integrity": "sha512-PRRgbATMpoeUmkCEBtUeJgOwtew8s+4UsEd+Pm7MhkjL2ihCNrSqxNVtM6NFE4uP2sWnkGcZpCjPuNSxowJ1Ow==",
"dependencies": {
- "@vueuse/shared": "7.6.2",
+ "@vueuse/shared": "7.7.1",
"vue-demi": "*"
},
"funding": {
@@ -6460,9 +6525,9 @@
}
},
"node_modules/@vueuse/shared": {
- "version": "7.6.2",
- "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-7.6.2.tgz",
- "integrity": "sha512-ThDld4Mx501tahRuHV6qJGkwCr17GknZrOzlD02Na9qJcH7Pq0quNTLx5cNDou7b1CKNvE3BXi2w/hz9KuPNTQ==",
+ "version": "7.7.1",
+ "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-7.7.1.tgz",
+ "integrity": "sha512-rN2qd22AUl7VdBxihagWyhUNHCyVk9IpvBTTfHoLH9G7rGE552X1f+zeCfehuno0zXif13jPw+icW/wn2a0rnQ==",
"dependencies": {
"vue-demi": "*"
},
@@ -7337,6 +7402,15 @@
"inherits": "2.0.1"
}
},
+ "node_modules/assertion-error": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+ "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/assign-symbols": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -7949,12 +8023,12 @@
}
},
"node_modules/browserslist": {
- "version": "4.19.3",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz",
- "integrity": "sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==",
+ "version": "4.20.0",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.0.tgz",
+ "integrity": "sha512-bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ==",
"dependencies": {
- "caniuse-lite": "^1.0.30001312",
- "electron-to-chromium": "^1.4.71",
+ "caniuse-lite": "^1.0.30001313",
+ "electron-to-chromium": "^1.4.76",
"escalade": "^3.1.1",
"node-releases": "^2.0.2",
"picocolors": "^1.0.0"
@@ -8043,6 +8117,15 @@
"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
"integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
},
+ "node_modules/builtins": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/builtins/-/builtins-4.0.0.tgz",
+ "integrity": "sha512-qC0E2Dxgou1IHhvJSLwGDSTvokbRovU5zZFuDY6oY8Y2lF3nGt5Ad8YZK7GMtqzY84Wu7pXTPeHQeHcXSXsRhw==",
+ "dev": true,
+ "dependencies": {
+ "semver": "^7.0.0"
+ }
+ },
"node_modules/bundle-runner": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/bundle-runner/-/bundle-runner-0.0.1.tgz",
@@ -8070,9 +8153,9 @@
}
},
"node_modules/c12": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/c12/-/c12-0.1.3.tgz",
- "integrity": "sha512-Y5i83E2V0aOptFvm2aEAo1uxQc4F/OgdrhncxEcv6tbyU0n+wbX7e5A5U+fKBnriNdTmXLcjS811wR5FLnmwJw==",
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/c12/-/c12-0.1.4.tgz",
+ "integrity": "sha512-Pq6ZA3B6psp9VtNaSwja1jsnIcNuB9J5dJhGI9VbEnXzB7oKaH5C8PCGVNM570V/SNU30qshnqtycyuS8qDt8g==",
"dev": true,
"dependencies": {
"defu": "^5.0.1",
@@ -8320,14 +8403,32 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001312",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz",
- "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==",
+ "version": "1.0.30001313",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001313.tgz",
+ "integrity": "sha512-rI1UN0koZUiKINjysQDuRi2VeSCce3bYJNmDcj3PIKREiAmjakugBul1QSkg/fPrlULYl6oWfGg3PbgOSY9X4Q==",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/browserslist"
}
},
+ "node_modules/chai": {
+ "version": "4.3.6",
+ "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz",
+ "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==",
+ "dev": true,
+ "dependencies": {
+ "assertion-error": "^1.1.0",
+ "check-error": "^1.0.2",
+ "deep-eql": "^3.0.1",
+ "get-func-name": "^2.0.0",
+ "loupe": "^2.3.1",
+ "pathval": "^1.1.1",
+ "type-detect": "^4.0.5"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -8349,6 +8450,26 @@
"node": ">=0.8.0"
}
},
+ "node_modules/character-entities": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
+ "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
+ "dev": true,
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
+ "node_modules/character-entities-legacy": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
+ "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
+ "dev": true,
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
"node_modules/character-parser": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
@@ -8358,6 +8479,16 @@
"is-regex": "^1.0.3"
}
},
+ "node_modules/character-reference-invalid": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
+ "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
+ "dev": true,
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
"node_modules/charcodes": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/charcodes/-/charcodes-0.2.0.tgz",
@@ -8371,6 +8502,15 @@
"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
},
+ "node_modules/check-error": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+ "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/chokidar": {
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -8947,6 +9087,63 @@
"safe-buffer": "~5.1.0"
}
},
+ "node_modules/condense-newlines": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/condense-newlines/-/condense-newlines-0.2.1.tgz",
+ "integrity": "sha1-PemFVTE5R10yUCyDsC9gaE0kxV8=",
+ "dev": true,
+ "dependencies": {
+ "extend-shallow": "^2.0.1",
+ "is-whitespace": "^0.3.0",
+ "kind-of": "^3.0.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/condense-newlines/node_modules/extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "dependencies": {
+ "is-extendable": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/condense-newlines/node_modules/is-extendable": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+ "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/condense-newlines/node_modules/kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "dependencies": {
+ "is-buffer": "^1.1.5"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/config-chain": {
+ "version": "1.1.13",
+ "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+ "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+ "dev": true,
+ "dependencies": {
+ "ini": "^1.3.4",
+ "proto-list": "~1.2.1"
+ }
+ },
"node_modules/connect": {
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
@@ -9560,9 +9757,9 @@
}
},
"node_modules/cssdb": {
- "version": "6.3.1",
- "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-6.3.1.tgz",
- "integrity": "sha512-Ho3gIkGY4O8S3J54fHu7RP5GHWz85McDhimaXEwf7qV0MSPhLM0jdd61zqs1kkadIVDAvfqoku0kArbWaMYolw==",
+ "version": "6.4.1",
+ "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-6.4.1.tgz",
+ "integrity": "sha512-R70R/Q1fPlM1D6Y+Kpat0QjiY+aMsY2/8lekdVoYcJ7ZQs9kw71W78FdOMf8DFq975KHQf1089PNg1dLsbAhoA==",
"dev": true
},
"node_modules/cssesc": {
@@ -9789,9 +9986,9 @@
}
},
"node_modules/csstype": {
- "version": "2.6.19",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.19.tgz",
- "integrity": "sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ==",
+ "version": "2.6.20",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
+ "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==",
"dev": true
},
"node_modules/cuint": {
@@ -9832,9 +10029,9 @@
}
},
"node_modules/dayjs": {
- "version": "1.10.7",
- "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz",
- "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="
+ "version": "1.10.8",
+ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.8.tgz",
+ "integrity": "sha512-wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow=="
},
"node_modules/de-indent": {
"version": "1.0.2",
@@ -9874,6 +10071,18 @@
"node": ">=0.10"
}
},
+ "node_modules/deep-eql": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+ "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+ "dev": true,
+ "dependencies": {
+ "type-detect": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=0.12"
+ }
+ },
"node_modules/deep-equal": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
@@ -10032,9 +10241,9 @@
"integrity": "sha512-Ev/sqS5AzzDwlpor/5wFCDu0dYMQu/0x2D6XfAsQ0E7uQmamIgYJ6Dppo2T2EOFVkeVYWjc+PCLKaqZZ57qmLg=="
},
"node_modules/destroy": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.1.0.tgz",
- "integrity": "sha512-R5QZrOXxSs0JDUIU/VANvRJlQVMts9C0L76HToQdPdlftfZCE7W6dyH0G4GZ5UW9fRqUOhAoCE2aGekuu+3HjQ==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.1.1.tgz",
+ "integrity": "sha512-jxwFW+yrVOLdwqIWvowFOM8UPdhZnvOF6mhXQQLXMxBDLtv2JVJlVJPEwkDv9prqscEtGtmnxuuI6pQKStK1vA==",
"engines": {
"node": ">= 0.8",
"npm": "1.2.8000 || >= 1.4.16"
@@ -10155,6 +10364,12 @@
"utila": "~0.4"
}
},
+ "node_modules/dom-event-types": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/dom-event-types/-/dom-event-types-1.1.0.tgz",
+ "integrity": "sha512-jNCX+uNJ3v38BKvPbpki6j5ItVlnSqVV6vDWGS6rExzCMjsc39frLjm1n91o6YaKK6AZl0wLloItW6C6mr61BQ==",
+ "dev": true
+ },
"node_modules/dom-serializer": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
@@ -10329,15 +10544,55 @@
"object.defaults": "^1.1.0"
}
},
+ "node_modules/editorconfig": {
+ "version": "0.15.3",
+ "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
+ "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
+ "dev": true,
+ "dependencies": {
+ "commander": "^2.19.0",
+ "lru-cache": "^4.1.5",
+ "semver": "^5.6.0",
+ "sigmund": "^1.0.1"
+ },
+ "bin": {
+ "editorconfig": "bin/editorconfig"
+ }
+ },
+ "node_modules/editorconfig/node_modules/lru-cache": {
+ "version": "4.1.5",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+ "dev": true,
+ "dependencies": {
+ "pseudomap": "^1.0.2",
+ "yallist": "^2.1.2"
+ }
+ },
+ "node_modules/editorconfig/node_modules/semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true,
+ "bin": {
+ "semver": "bin/semver"
+ }
+ },
+ "node_modules/editorconfig/node_modules/yallist": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+ "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+ "dev": true
+ },
"node_modules/ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
},
"node_modules/electron-to-chromium": {
- "version": "1.4.71",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz",
- "integrity": "sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw=="
+ "version": "1.4.76",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.76.tgz",
+ "integrity": "sha512-3Vftv7cenJtQb+k00McEBZ2vVmZ/x+HEF7pcZONZIkOsESqAqVuACmBxMv0JhzX7u0YltU0vSqRqgBSTAhFUjA=="
},
"node_modules/elliptic": {
"version": "6.5.4",
@@ -10388,9 +10643,9 @@
}
},
"node_modules/enhanced-resolve": {
- "version": "5.9.0",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.0.tgz",
- "integrity": "sha512-weDYmzbBygL7HzGGS26M3hGQx68vehdEg6VUmqSOaFzXExFqlnKuSvsEJCVGQHScS8CQMbrAqftT+AzzHNt/YA==",
+ "version": "5.9.2",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
+ "integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
"dev": true,
"dependencies": {
"graceful-fs": "^4.2.4",
@@ -10533,9 +10788,9 @@
}
},
"node_modules/esbuild": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.23.tgz",
- "integrity": "sha512-XjnIcZ9KB6lfonCa+jRguXyRYcldmkyZ99ieDksqW/C8bnyEX299yA4QH2XcgijCgaddEZePPTgvx/2imsq7Ig==",
+ "version": "0.14.25",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.25.tgz",
+ "integrity": "sha512-4JHEIOMNFvK09ziiL+iVmldIhLbn49V4NAVo888tcGFKedEZY/Y8YapfStJ6zSE23tzYPKxqKwQBnQoIO0BI/Q==",
"dev": true,
"hasInstallScript": true,
"bin": {
@@ -10545,47 +10800,32 @@
"node": ">=12"
},
"optionalDependencies": {
- "esbuild-android-arm64": "0.14.23",
- "esbuild-darwin-64": "0.14.23",
- "esbuild-darwin-arm64": "0.14.23",
- "esbuild-freebsd-64": "0.14.23",
- "esbuild-freebsd-arm64": "0.14.23",
- "esbuild-linux-32": "0.14.23",
- "esbuild-linux-64": "0.14.23",
- "esbuild-linux-arm": "0.14.23",
- "esbuild-linux-arm64": "0.14.23",
- "esbuild-linux-mips64le": "0.14.23",
- "esbuild-linux-ppc64le": "0.14.23",
- "esbuild-linux-riscv64": "0.14.23",
- "esbuild-linux-s390x": "0.14.23",
- "esbuild-netbsd-64": "0.14.23",
- "esbuild-openbsd-64": "0.14.23",
- "esbuild-sunos-64": "0.14.23",
- "esbuild-windows-32": "0.14.23",
- "esbuild-windows-64": "0.14.23",
- "esbuild-windows-arm64": "0.14.23"
- }
- },
- "node_modules/esbuild-android-arm64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.23.tgz",
- "integrity": "sha512-k9sXem++mINrZty1v4FVt6nC5BQCFG4K2geCIUUqHNlTdFnuvcqsY7prcKZLFhqVC1rbcJAr9VSUGFL/vD4vsw==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "android"
- ],
- "engines": {
- "node": ">=12"
+ "esbuild-android-64": "0.14.25",
+ "esbuild-android-arm64": "0.14.25",
+ "esbuild-darwin-64": "0.14.25",
+ "esbuild-darwin-arm64": "0.14.25",
+ "esbuild-freebsd-64": "0.14.25",
+ "esbuild-freebsd-arm64": "0.14.25",
+ "esbuild-linux-32": "0.14.25",
+ "esbuild-linux-64": "0.14.25",
+ "esbuild-linux-arm": "0.14.25",
+ "esbuild-linux-arm64": "0.14.25",
+ "esbuild-linux-mips64le": "0.14.25",
+ "esbuild-linux-ppc64le": "0.14.25",
+ "esbuild-linux-riscv64": "0.14.25",
+ "esbuild-linux-s390x": "0.14.25",
+ "esbuild-netbsd-64": "0.14.25",
+ "esbuild-openbsd-64": "0.14.25",
+ "esbuild-sunos-64": "0.14.25",
+ "esbuild-windows-32": "0.14.25",
+ "esbuild-windows-64": "0.14.25",
+ "esbuild-windows-arm64": "0.14.25"
}
},
"node_modules/esbuild-darwin-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.23.tgz",
- "integrity": "sha512-lB0XRbtOYYL1tLcYw8BoBaYsFYiR48RPrA0KfA/7RFTr4MV7Bwy/J4+7nLsVnv9FGuQummM3uJ93J3ptaTqFug==",
+ "version": "0.14.25",
+ "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.25.tgz",
+ "integrity": "sha512-TGp8tuudIxOyWd1+8aYPxQmC1ZQyvij/AfNBa35RubixD0zJ1vkKHVAzo0Zao1zcG6pNqiSyzfPto8vmg0s7oA==",
"cpu": [
"x64"
],
@@ -10598,278 +10838,6 @@
"node": ">=12"
}
},
- "node_modules/esbuild-darwin-arm64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.23.tgz",
- "integrity": "sha512-yat73Z/uJ5tRcfRiI4CCTv0FSnwErm3BJQeZAh+1tIP0TUNh6o+mXg338Zl5EKChD+YGp6PN+Dbhs7qa34RxSw==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "darwin"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-freebsd-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.23.tgz",
- "integrity": "sha512-/1xiTjoLuQ+LlbfjJdKkX45qK/M7ARrbLmyf7x3JhyQGMjcxRYVR6Dw81uH3qlMHwT4cfLW4aEVBhP1aNV7VsA==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "freebsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-freebsd-arm64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.23.tgz",
- "integrity": "sha512-uyPqBU/Zcp6yEAZS4LKj5jEE0q2s4HmlMBIPzbW6cTunZ8cyvjG6YWpIZXb1KK3KTJDe62ltCrk3VzmWHp+iLg==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "freebsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-32": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.23.tgz",
- "integrity": "sha512-37R/WMkQyUfNhbH7aJrr1uCjDVdnPeTHGeDhZPUNhfoHV0lQuZNCKuNnDvlH/u/nwIYZNdVvz1Igv5rY/zfrzQ==",
- "cpu": [
- "ia32"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.23.tgz",
- "integrity": "sha512-H0gztDP60qqr8zoFhAO64waoN5yBXkmYCElFklpd6LPoobtNGNnDe99xOQm28+fuD75YJ7GKHzp/MLCLhw2+vQ==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-arm": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.23.tgz",
- "integrity": "sha512-x64CEUxi8+EzOAIpCUeuni0bZfzPw/65r8tC5cy5zOq9dY7ysOi5EVQHnzaxS+1NmV+/RVRpmrzGw1QgY2Xpmw==",
- "cpu": [
- "arm"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-arm64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.23.tgz",
- "integrity": "sha512-c4MLOIByNHR55n3KoYf9hYDfBRghMjOiHLaoYLhkQkIabb452RWi+HsNgB41sUpSlOAqfpqKPFNg7VrxL3UX9g==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-mips64le": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.23.tgz",
- "integrity": "sha512-kHKyKRIAedYhKug2EJpyJxOUj3VYuamOVA1pY7EimoFPzaF3NeY7e4cFBAISC/Av0/tiV0xlFCt9q0HJ68IBIw==",
- "cpu": [
- "mips64el"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-ppc64le": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.23.tgz",
- "integrity": "sha512-7ilAiJEPuJJnJp/LiDO0oJm5ygbBPzhchJJh9HsHZzeqO+3PUzItXi+8PuicY08r0AaaOe25LA7sGJ0MzbfBag==",
- "cpu": [
- "ppc64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-riscv64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.23.tgz",
- "integrity": "sha512-fbL3ggK2wY0D8I5raPIMPhpCvODFE+Bhb5QGtNP3r5aUsRR6TQV+ZBXIaw84iyvKC8vlXiA4fWLGhghAd/h/Zg==",
- "cpu": [
- "riscv64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-linux-s390x": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.23.tgz",
- "integrity": "sha512-GHMDCyfy7+FaNSO8RJ8KCFsnax8fLUsOrj9q5Gi2JmZMY0Zhp75keb5abTFCq2/Oy6KVcT0Dcbyo/bFb4rIFJA==",
- "cpu": [
- "s390x"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "linux"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-netbsd-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.23.tgz",
- "integrity": "sha512-ovk2EX+3rrO1M2lowJfgMb/JPN1VwVYrx0QPUyudxkxLYrWeBxDKQvc6ffO+kB4QlDyTfdtAURrVzu3JeNdA2g==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "netbsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-openbsd-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.23.tgz",
- "integrity": "sha512-uYYNqbVR+i7k8ojP/oIROAHO9lATLN7H2QeXKt2H310Fc8FJj4y3Wce6hx0VgnJ4k1JDrgbbiXM8rbEgQyg8KA==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "openbsd"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-sunos-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.23.tgz",
- "integrity": "sha512-hAzeBeET0+SbScknPzS2LBY6FVDpgE+CsHSpe6CEoR51PApdn2IB0SyJX7vGelXzlyrnorM4CAsRyb9Qev4h9g==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "sunos"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-windows-32": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.23.tgz",
- "integrity": "sha512-Kttmi3JnohdaREbk6o9e25kieJR379TsEWF0l39PQVHXq3FR6sFKtVPgY8wk055o6IB+rllrzLnbqOw/UV60EA==",
- "cpu": [
- "ia32"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-windows-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.23.tgz",
- "integrity": "sha512-JtIT0t8ymkpl6YlmOl6zoSWL5cnCgyLaBdf/SiU/Eg3C13r0NbHZWNT/RDEMKK91Y6t79kTs3vyRcNZbfu5a8g==",
- "cpu": [
- "x64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">=12"
- }
- },
- "node_modules/esbuild-windows-arm64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.23.tgz",
- "integrity": "sha512-cTFaQqT2+ik9e4hePvYtRZQ3pqOvKDVNarzql0VFIzhc0tru/ZgdLoXd6epLiKT+SzoSce6V9YJ+nn6RCn6SHw==",
- "cpu": [
- "arm64"
- ],
- "dev": true,
- "optional": true,
- "os": [
- "win32"
- ],
- "engines": {
- "node": ">=12"
- }
- },
"node_modules/escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -10896,12 +10864,12 @@
}
},
"node_modules/eslint": {
- "version": "8.9.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.9.0.tgz",
- "integrity": "sha512-PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q==",
+ "version": "8.10.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.10.0.tgz",
+ "integrity": "sha512-tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw==",
"dev": true,
"dependencies": {
- "@eslint/eslintrc": "^1.1.0",
+ "@eslint/eslintrc": "^1.2.0",
"@humanwhocodes/config-array": "^0.9.2",
"ajv": "^6.10.0",
"chalk": "^4.0.0",
@@ -10948,9 +10916,9 @@
}
},
"node_modules/eslint-config-standard": {
- "version": "17.0.0-0",
- "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0-0.tgz",
- "integrity": "sha512-sf9udec8fkLTnH82SmhZQ3E31e4eJaMW09Mt9fbN3OccXFtvSSbGrltpQgGFVooGHoIdiMzDfp6ZNFd+I6Ob+w==",
+ "version": "17.0.0-1",
+ "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0-1.tgz",
+ "integrity": "sha512-aqRG58dqoBNfOLN+PsitasxmW+W9Os4oQrx081B16T4E4WogsSbpUL6hnKSnyv35sSRYA2XjBtKMOrUboL6jgw==",
"dev": true,
"funding": [
{
@@ -11168,19 +11136,35 @@
"eslint": ">=6.0.0"
}
},
+ "node_modules/eslint-plugin-markdown": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-markdown/-/eslint-plugin-markdown-2.2.1.tgz",
+ "integrity": "sha512-FgWp4iyYvTFxPwfbxofTvXxgzPsDuSKHQy2S+a8Ve6savbujey+lgrFFbXQA0HPygISpRYWYBjooPzhYSF81iA==",
+ "dev": true,
+ "dependencies": {
+ "mdast-util-from-markdown": "^0.8.5"
+ },
+ "engines": {
+ "node": "^8.10.0 || ^10.12.0 || >= 12.0.0"
+ },
+ "peerDependencies": {
+ "eslint": ">=6.0.0"
+ }
+ },
"node_modules/eslint-plugin-n": {
- "version": "14.0.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-14.0.0.tgz",
- "integrity": "sha512-mNwplPLsbaKhHyA0fa/cy8j+oF6bF6l81hzBTWa6JOvPcMNAuIogk2ih6d9tYvWYzyUG+7ZFeChqbzdFpg2QrQ==",
+ "version": "15.0.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.0.1.tgz",
+ "integrity": "sha512-w1vgnlS3Y3kd2Ye2YpQvWJppx6ViySIpBIcdlw1dBBaX3m1R/cdKHE3X2PWXhJdH88pmFy1a+04a6lMlo5D9EQ==",
"dev": true,
"dependencies": {
+ "builtins": "^4.0.0",
"eslint-plugin-es": "^4.1.0",
"eslint-utils": "^3.0.0",
"ignore": "^5.1.1",
"is-core-module": "^2.3.0",
"minimatch": "^3.0.4",
"resolve": "^1.10.1",
- "semver": "^6.1.0"
+ "semver": "^6.3.0"
},
"engines": {
"node": ">=12.22.0"
@@ -11225,9 +11209,9 @@
}
},
"node_modules/eslint-plugin-react": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz",
- "integrity": "sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw==",
+ "version": "7.29.3",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.29.3.tgz",
+ "integrity": "sha512-MzW6TuCnDOcta67CkpDyRfRsEVx9FNMDV8wZsDqe1luHPdGTrQIUaUXD27Ja3gHsdOIs/cXzNchWGlqm+qRVRg==",
"dev": true,
"dependencies": {
"array-includes": "^3.1.4",
@@ -11235,12 +11219,12 @@
"doctrine": "^2.1.0",
"estraverse": "^5.3.0",
"jsx-ast-utils": "^2.4.1 || ^3.0.0",
- "minimatch": "^3.0.4",
+ "minimatch": "^3.1.2",
"object.entries": "^1.1.5",
"object.fromentries": "^2.0.5",
"object.hasown": "^1.1.0",
"object.values": "^1.1.5",
- "prop-types": "^15.7.2",
+ "prop-types": "^15.8.1",
"resolve": "^2.0.0-next.3",
"semver": "^6.3.0",
"string.prototype.matchall": "^4.0.6"
@@ -11287,9 +11271,9 @@
}
},
"node_modules/eslint-plugin-unicorn": {
- "version": "40.1.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-40.1.0.tgz",
- "integrity": "sha512-y5doK2DF9Sr5AqKEHbHxjFllJ167nKDRU01HDcWyv4Tnmaoe9iNxMrBnaybZvWZUaE3OC5Unu0lNIevYamloig==",
+ "version": "41.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-41.0.0.tgz",
+ "integrity": "sha512-xoJCaRc1uy5REg9DkVga1BkZV57jJxoqOcrU28QHZB89Lk5LdSqdVyTIt9JQVfHNKaiyJ7X+3iLlIn+VEHWEzA==",
"dev": true,
"dependencies": {
"@babel/helper-validator-identifier": "^7.15.7",
@@ -11314,13 +11298,13 @@
"url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1"
},
"peerDependencies": {
- "eslint": ">=7.32.0"
+ "eslint": ">=8.8.0"
}
},
"node_modules/eslint-plugin-vue": {
- "version": "8.4.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.4.1.tgz",
- "integrity": "sha512-nmWOhNmDx9TZ+yP9ZhezTkZUupSHsYA2TocRm+efPSXMOyFrVczVlaIuQcLBjCtI8CbkBiUQ3VcyQsjlIhDrhA==",
+ "version": "8.5.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.5.0.tgz",
+ "integrity": "sha512-i1uHCTAKOoEj12RDvdtONWrGzjFm/djkzqfhmQ0d6M/W8KM81mhswd/z+iTZ0jCpdUedW3YRgcVfQ37/J4zoYQ==",
"dev": true,
"dependencies": {
"eslint-utils": "^3.0.0",
@@ -11336,9 +11320,9 @@
}
},
"node_modules/eslint-plugin-yml": {
- "version": "0.12.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-yml/-/eslint-plugin-yml-0.12.0.tgz",
- "integrity": "sha512-aS82M+diohZTusadiByzh/bKDrfi+Y6VBQkD3ym/7JH+KF9WUB9qKCizLfTaCACwtRrHpqaLz3G8GKmslshyiw==",
+ "version": "0.14.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-yml/-/eslint-plugin-yml-0.14.0.tgz",
+ "integrity": "sha512-+0+bBV/07txENbxfrHF9olGoLCHez64vmnOmjWOoLwmXOwfdaSRleBSPIi4nWQs7WwX8lm/fSLadOjbVEcsXQQ==",
"dev": true,
"dependencies": {
"debug": "^4.3.2",
@@ -11349,6 +11333,9 @@
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
+ "funding": {
+ "url": "https://github.com/sponsors/ota-meshi"
+ },
"peerDependencies": {
"eslint": ">=6.0.0"
}
@@ -11990,18 +11977,15 @@
}
},
"node_modules/fancy-log": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
- "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz",
+ "integrity": "sha512-9CzxZbACXMUXW13tS0tI8XsGGmxWzO2DmYrGuBJOJ8k8q2K7hwfJA5qHjuPPe8wtsco33YR9wc+Rlr5wYFvhSA==",
"dev": true,
"dependencies": {
- "ansi-gray": "^0.1.1",
- "color-support": "^1.1.3",
- "parse-node-version": "^1.0.0",
- "time-stamp": "^1.0.0"
+ "color-support": "^1.1.3"
},
"engines": {
- "node": ">= 0.10"
+ "node": ">=10.13.0"
}
},
"node_modules/fast-deep-equal": {
@@ -12380,16 +12364,16 @@
}
},
"node_modules/firebase": {
- "version": "9.6.7",
- "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.6.7.tgz",
- "integrity": "sha512-WiqGC26cepwVy0CZ4n3ZrLSNpVj1RCPJTB6j1tZU4SadPOrGmuPAt71qcWwaLyqKtRzNTyOA9F5J4ygGDplchw==",
+ "version": "9.6.8",
+ "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.6.8.tgz",
+ "integrity": "sha512-a/RcgiqK9L5d/ZKpHZ21c3x/KKIo2XwXp2droukbBTuaX0Md8ppHQWYlSqLmWIDR0y2zwN17lrfNVsE6f+4ncA==",
"dependencies": {
"@firebase/analytics": "0.7.5",
"@firebase/analytics-compat": "0.1.6",
- "@firebase/app": "0.7.17",
+ "@firebase/app": "0.7.18",
"@firebase/app-check": "0.5.3",
"@firebase/app-check-compat": "0.2.3",
- "@firebase/app-compat": "0.1.18",
+ "@firebase/app-compat": "0.1.19",
"@firebase/app-types": "0.7.0",
"@firebase/auth": "0.19.9",
"@firebase/auth-compat": "0.2.9",
@@ -12400,8 +12384,8 @@
"@firebase/functions": "0.7.8",
"@firebase/functions-compat": "0.1.9",
"@firebase/installations": "0.5.5",
- "@firebase/messaging": "0.9.8",
- "@firebase/messaging-compat": "0.1.8",
+ "@firebase/messaging": "0.9.9",
+ "@firebase/messaging-compat": "0.1.9",
"@firebase/performance": "0.5.5",
"@firebase/performance-compat": "0.1.5",
"@firebase/polyfill": "0.3.36",
@@ -12543,9 +12527,9 @@
}
},
"node_modules/fraction.js": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.3.tgz",
- "integrity": "sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
+ "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
"dev": true,
"engines": {
"node": "*"
@@ -12612,9 +12596,9 @@
"dev": true
},
"node_modules/fs-extra": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
- "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+ "version": "10.0.1",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
+ "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
"dependencies": {
"graceful-fs": "^4.2.0",
"jsonfile": "^6.0.1",
@@ -12827,6 +12811,15 @@
"node": "6.* || 8.* || >= 10.*"
}
},
+ "node_modules/get-func-name": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+ "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/get-intrinsic": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
@@ -12841,9 +12834,9 @@
}
},
"node_modules/get-port-please": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/get-port-please/-/get-port-please-2.3.0.tgz",
- "integrity": "sha512-zO6ST8v7jBO+uSnm0vaQuZEpdr7DgY9iMgoMLUC+Zfz31HYoDiiQrL78oZspaAryT6NH903Bwk+mYxiCy3X/RQ==",
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/get-port-please/-/get-port-please-2.4.3.tgz",
+ "integrity": "sha512-l5zVrG3mzz+I7MfbPwyJJ4xZKIdQfARpOtsBjUDUZ0iXlF0IXc1wMBg3Jb7G1te7tRzjOxu+MRLpvgxxTdCkwg==",
"dependencies": {
"fs-memo": "^1.2.0"
}
@@ -13762,6 +13755,21 @@
"wrap-ansi": "^2.0.0"
}
},
+ "node_modules/gulp-cli/node_modules/fancy-log": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+ "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+ "dev": true,
+ "dependencies": {
+ "ansi-gray": "^0.1.1",
+ "color-support": "^1.1.3",
+ "parse-node-version": "^1.0.0",
+ "time-stamp": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
"node_modules/gulp-cli/node_modules/find-up": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
@@ -13971,6 +13979,21 @@
"node": ">=6"
}
},
+ "node_modules/gulp-notify/node_modules/fancy-log": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+ "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+ "dev": true,
+ "dependencies": {
+ "ansi-gray": "^0.1.1",
+ "color-support": "^1.1.3",
+ "parse-node-version": "^1.0.0",
+ "time-stamp": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
"node_modules/gulp-notify/node_modules/node-notifier": {
"version": "9.0.1",
"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-9.0.1.tgz",
@@ -14087,6 +14110,21 @@
"node": ">=0.10.0"
}
},
+ "node_modules/gulp-plumber/node_modules/fancy-log": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+ "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+ "dev": true,
+ "dependencies": {
+ "ansi-gray": "^0.1.1",
+ "color-support": "^1.1.3",
+ "parse-node-version": "^1.0.0",
+ "time-stamp": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
"node_modules/gulp-plumber/node_modules/kind-of": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
@@ -14405,9 +14443,9 @@
}
},
"node_modules/has-symbols": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
- "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
"engines": {
"node": ">= 0.4"
},
@@ -14816,9 +14854,9 @@
}
},
"node_modules/http-parser-js": {
- "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=="
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz",
+ "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA=="
},
"node_modules/http-proxy": {
"version": "1.18.1",
@@ -15254,6 +15292,30 @@
"node": ">=0.10.0"
}
},
+ "node_modules/is-alphabetical": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
+ "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
+ "dev": true,
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
+ "node_modules/is-alphanumerical": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
+ "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
+ "dev": true,
+ "dependencies": {
+ "is-alphabetical": "^1.0.0",
+ "is-decimal": "^1.0.0"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
"node_modules/is-arguments": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
@@ -15389,6 +15451,16 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/is-decimal": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
+ "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
+ "dev": true,
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
"node_modules/is-descriptor": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
@@ -15499,6 +15571,16 @@
"node": ">=0.10.0"
}
},
+ "node_modules/is-hexadecimal": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
+ "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
+ "dev": true,
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
"node_modules/is-https": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/is-https/-/is-https-4.0.0.tgz",
@@ -15771,6 +15853,15 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/is-whitespace": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz",
+ "integrity": "sha1-Fjnssb4DauxppUy7QBz77XEUq38=",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/is-windows": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -15855,6 +15946,26 @@
"jiti": "bin/jiti.js"
}
},
+ "node_modules/js-beautify": {
+ "version": "1.14.0",
+ "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.0.tgz",
+ "integrity": "sha512-yuck9KirNSCAwyNJbqW+BxJqJ0NLJ4PwBUzQQACl5O3qHMBXVkXb/rD0ilh/Lat/tn88zSZ+CAHOlk0DsY7GuQ==",
+ "dev": true,
+ "dependencies": {
+ "config-chain": "^1.1.12",
+ "editorconfig": "^0.15.3",
+ "glob": "^7.1.3",
+ "nopt": "^5.0.0"
+ },
+ "bin": {
+ "css-beautify": "js/bin/css-beautify.js",
+ "html-beautify": "js/bin/html-beautify.js",
+ "js-beautify": "js/bin/js-beautify.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
"node_modules/js-cookie": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
@@ -16415,6 +16526,18 @@
"node": ">=8.9.0"
}
},
+ "node_modules/local-pkg": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.1.tgz",
+ "integrity": "sha512-lL87ytIGP2FU5PWwNDo0w3WhIo2gopIAxPg9RxDYF7m4rr5ahuZxP22xnJHIvaLTe4Z9P6uKKY2UHiwyB4pcrw==",
+ "dev": true,
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ }
+ },
"node_modules/localforage": {
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
@@ -16586,6 +16709,15 @@
"loose-envify": "cli.js"
}
},
+ "node_modules/loupe": {
+ "version": "2.3.4",
+ "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
+ "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==",
+ "dev": true,
+ "dependencies": {
+ "get-func-name": "^2.0.0"
+ }
+ },
"node_modules/lower-case": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
@@ -16600,12 +16732,12 @@
}
},
"node_modules/magic-string": {
- "version": "0.25.7",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
- "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+ "version": "0.25.9",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+ "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
"dev": true,
"dependencies": {
- "sourcemap-codec": "^1.4.4"
+ "sourcemap-codec": "^1.4.8"
}
},
"node_modules/make-dir": {
@@ -16843,6 +16975,33 @@
"safe-buffer": "^5.1.2"
}
},
+ "node_modules/mdast-util-from-markdown": {
+ "version": "0.8.5",
+ "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
+ "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/mdast": "^3.0.0",
+ "mdast-util-to-string": "^2.0.0",
+ "micromark": "~2.11.0",
+ "parse-entities": "^2.0.0",
+ "unist-util-stringify-position": "^2.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
+ "node_modules/mdast-util-to-string": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
+ "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
+ "dev": true,
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
"node_modules/mdn-data": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
@@ -16940,6 +17099,26 @@
"node": ">= 0.6"
}
},
+ "node_modules/micromark": {
+ "version": "2.11.4",
+ "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
+ "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "GitHub Sponsors",
+ "url": "https://github.com/sponsors/unifiedjs"
+ },
+ {
+ "type": "OpenCollective",
+ "url": "https://opencollective.com/unified"
+ }
+ ],
+ "dependencies": {
+ "debug": "^4.0.0",
+ "parse-entities": "^2.0.0"
+ }
+ },
"node_modules/micromatch": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
@@ -16982,9 +17161,9 @@
}
},
"node_modules/mime-db": {
- "version": "1.51.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
- "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+ "version": "1.52.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
"engines": {
"node": ">= 0.6"
}
@@ -17000,6 +17179,14 @@
"node": ">= 0.6"
}
},
+ "node_modules/mime-types/node_modules/mime-db": {
+ "version": "1.51.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+ "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
"node_modules/mimic-fn": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -17402,9 +17589,9 @@
}
},
"node_modules/node-fetch": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.0.tgz",
- "integrity": "sha512-8xeimMwMItMw8hRrOl3C9/xzU49HV/yE6ORew/l+dxWimO5A4Ra8ld2rerlJvc/O7et5Z1zrWsPX43v1QBjCxw==",
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.2.tgz",
+ "integrity": "sha512-Cwhq1JFIoon15wcIkFzubVNFE5GvXGV82pKf4knXXjvGmn7RJKcypeuqcVNZMGDZsAFWyIRya/anwAJr7TWJ7w==",
"dev": true,
"dependencies": {
"data-uri-to-buffer": "^4.0.0",
@@ -17977,9 +18164,9 @@
},
"node_modules/nuxi": {
"name": "nuxi-edge",
- "version": "3.0.0-27420403.16e2a54",
- "resolved": "https://registry.npmjs.org/nuxi-edge/-/nuxi-edge-3.0.0-27420403.16e2a54.tgz",
- "integrity": "sha512-R2zYTsJDkZKS8KkoZopYTXvgyBcdqTt1qM3+e4GI+Vd7AMnrVNVS3CXthsYxo+GnSuDmXOoww7Gp1abx/tSMUw==",
+ "version": "3.0.0-27444434.856c01a",
+ "resolved": "https://registry.npmjs.org/nuxi-edge/-/nuxi-edge-3.0.0-27444434.856c01a.tgz",
+ "integrity": "sha512-NMi+6Qb2hegNBHLKnUvw39hgB+KQG28tfKhgvDCaX+1YDl1bRgbnJbcsXjIEipXlfb9CjBlbwskZzmZiddZ6Xw==",
"dev": true,
"bin": {
"nuxi-edge": "bin/nuxi.mjs"
@@ -18398,18 +18585,18 @@
}
},
"node_modules/ora": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/ora/-/ora-6.0.1.tgz",
- "integrity": "sha512-TDdKkKHdWE6jo/6pIa5U5AWcSVfpNRFJ8sdRJpioGNVPLAzZzHs/N+QhUfF7ZbyoC+rnDuNTKzeDJUbAza9g4g==",
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/ora/-/ora-6.1.0.tgz",
+ "integrity": "sha512-CxEP6845hLK+NHFWZ+LplGO4zfw4QSfxTlqMfvlJ988GoiUeZDMzCvqsZkFHv69sPICmJH1MDxZoQFOKXerAVw==",
"dev": true,
"dependencies": {
"bl": "^5.0.0",
- "chalk": "^4.1.2",
+ "chalk": "^5.0.0",
"cli-cursor": "^4.0.0",
- "cli-spinners": "^2.6.0",
+ "cli-spinners": "^2.6.1",
"is-interactive": "^2.0.0",
"is-unicode-supported": "^1.1.0",
- "log-symbols": "^5.0.0",
+ "log-symbols": "^5.1.0",
"strip-ansi": "^7.0.1",
"wcwidth": "^1.0.1"
},
@@ -18432,32 +18619,13 @@
"url": "https://github.com/chalk/ansi-regex?sponsor=1"
}
},
- "node_modules/ora/node_modules/ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
- "dependencies": {
- "color-convert": "^2.0.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
"node_modules/ora/node_modules/chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.0.tgz",
+ "integrity": "sha512-/duVOqst+luxCQRKEo4bNxinsOQtMP80ZYm7mMqzuh5PociNL0PvmHFvREJ9ueYL2TxlHjBcmLCdmocx9Vg+IQ==",
"dev": true,
- "dependencies": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- },
"engines": {
- "node": ">=10"
+ "node": "^12.17.0 || ^14.13 || >=16.0.0"
},
"funding": {
"url": "https://github.com/chalk/chalk?sponsor=1"
@@ -18478,33 +18646,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/ora/node_modules/color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
- "dependencies": {
- "color-name": "~1.1.4"
- },
- "engines": {
- "node": ">=7.0.0"
- }
- },
- "node_modules/ora/node_modules/color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true
- },
- "node_modules/ora/node_modules/has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true,
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/ora/node_modules/restore-cursor": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz",
@@ -18536,18 +18677,6 @@
"url": "https://github.com/chalk/strip-ansi?sponsor=1"
}
},
- "node_modules/ora/node_modules/supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
- "dependencies": {
- "has-flag": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/ordered-read-streams": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
@@ -18584,8 +18713,7 @@
"node_modules/os-browserify": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
- "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
- "license": "MIT"
+ "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
},
"node_modules/os-homedir": {
"version": "1.0.2",
@@ -18751,6 +18879,24 @@
"safe-buffer": "^5.1.1"
}
},
+ "node_modules/parse-entities": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
+ "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
+ "dev": true,
+ "dependencies": {
+ "character-entities": "^1.0.0",
+ "character-entities-legacy": "^1.0.0",
+ "character-reference-invalid": "^1.0.0",
+ "is-alphanumerical": "^1.0.0",
+ "is-decimal": "^1.0.0",
+ "is-hexadecimal": "^1.0.0"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/wooorm"
+ }
+ },
"node_modules/parse-filepath": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -18988,6 +19134,15 @@
"integrity": "sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw==",
"dev": true
},
+ "node_modules/pathval": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+ "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
"node_modules/pbkdf2": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
@@ -19227,11 +19382,11 @@
}
},
"node_modules/postcss": {
- "version": "8.4.6",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz",
- "integrity": "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==",
+ "version": "8.4.8",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz",
+ "integrity": "sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==",
"dependencies": {
- "nanoid": "^3.2.0",
+ "nanoid": "^3.3.1",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
},
@@ -19294,21 +19449,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/postcss-clamp": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.0.0.tgz",
- "integrity": "sha512-FsMmeBZtymFN7Jtlnw9is8I4nB+qEEb/qS0ZLTIqcKiwZyHBq44Yhv29Q+VQsTGHYFqIr/s/9tqvNM7j+j1d+g==",
- "dev": true,
- "dependencies": {
- "postcss-value-parser": "^4.2.0"
- },
- "engines": {
- "node": ">=7.6.0"
- },
- "peerDependencies": {
- "postcss": "^8.4.6"
- }
- },
"node_modules/postcss-color-functional-notation": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.2.tgz",
@@ -19751,9 +19891,9 @@
}
},
"node_modules/postcss-double-position-gradients": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.0.tgz",
- "integrity": "sha512-oz73I08yMN3oxjj0s8mED1rG+uOYoK3H8N9RjQofyg52KBRNmePJKg3fVwTpL2U5ZFbCzXoZBsUD/CvZdlqE4Q==",
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.1.tgz",
+ "integrity": "sha512-jM+CGkTs4FcG53sMPjrrGE0rIvLDdCrqMzgDC5fLI7JHDO7o6QG8C5TQBtExb13hdBdoH9C2QVbG4jo2y9lErQ==",
"dev": true,
"dependencies": {
"@csstools/postcss-progressive-custom-properties": "^1.1.0",
@@ -20447,18 +20587,18 @@
}
},
"node_modules/postcss-nesting": {
- "version": "10.1.2",
- "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.2.tgz",
- "integrity": "sha512-dJGmgmsvpzKoVMtDMQQG/T6FSqs6kDtUDirIfl4KnjMCiY9/ETX8jdKyCd20swSRAbUYkaBKV20pxkzxoOXLqQ==",
+ "version": "10.1.3",
+ "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.3.tgz",
+ "integrity": "sha512-wUC+/YCik4wH3StsbC5fBG1s2Z3ZV74vjGqBFYtmYKlVxoio5TYGM06AiaKkQPPlkXWn72HKfS7Cw5PYxnoXSw==",
"dev": true,
"dependencies": {
- "postcss-selector-parser": "^6.0.8"
+ "postcss-selector-parser": "^6.0.9"
},
"engines": {
"node": "^12 || ^14 || >=16"
},
"peerDependencies": {
- "postcss": "^8.3"
+ "postcss": "^8.4"
}
},
"node_modules/postcss-normalize-charset": {
@@ -20990,9 +21130,9 @@
}
},
"node_modules/postcss-preset-env": {
- "version": "7.4.1",
- "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.4.1.tgz",
- "integrity": "sha512-UvBVvPJ2vb4odAtckSbryndyBz+Me1q8wawqq0qznpDXy188I+8W5Sa929sCPqw2/NSYnqpHJbo41BKso3+I9A==",
+ "version": "7.4.2",
+ "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.4.2.tgz",
+ "integrity": "sha512-AmOkb8AeNNQwE/z2fHl1iwOIt8J50V8WR0rmLagcgIDoqlJZWjV3NdtOPnLGco1oN8DZe+Ss5B9ULbBeS6HfeA==",
"dev": true,
"dependencies": {
"@csstools/postcss-color-function": "^1.0.2",
@@ -21004,13 +21144,12 @@
"@csstools/postcss-oklab-function": "^1.0.1",
"@csstools/postcss-progressive-custom-properties": "^1.2.0",
"autoprefixer": "^10.4.2",
- "browserslist": "^4.19.1",
+ "browserslist": "^4.19.3",
"css-blank-pseudo": "^3.0.3",
"css-has-pseudo": "^3.0.4",
"css-prefers-color-scheme": "^6.0.3",
- "cssdb": "^6.3.1",
+ "cssdb": "^6.4.0",
"postcss-attribute-case-insensitive": "^5.0.0",
- "postcss-clamp": "^4.0.0",
"postcss-color-functional-notation": "^4.2.2",
"postcss-color-hex-alpha": "^8.0.3",
"postcss-color-rebeccapurple": "^7.0.2",
@@ -21036,7 +21175,8 @@
"postcss-place": "^7.0.4",
"postcss-pseudo-class-any-link": "^7.1.1",
"postcss-replace-overflow-wrap": "^4.0.0",
- "postcss-selector-not": "^5.0.0"
+ "postcss-selector-not": "^5.0.0",
+ "postcss-value-parser": "^4.2.0"
},
"engines": {
"node": "^12 || ^14 || >=16"
@@ -21400,6 +21540,20 @@
"node": ">=10.13.0"
}
},
+ "node_modules/pretty": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz",
+ "integrity": "sha1-rbx5YLe7/iiaVX3F9zdhmiINBqU=",
+ "dev": true,
+ "dependencies": {
+ "condense-newlines": "^0.2.1",
+ "extend-shallow": "^2.0.1",
+ "js-beautify": "^1.6.12"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/pretty-bytes": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz",
@@ -21438,6 +21592,27 @@
"node": ">=4"
}
},
+ "node_modules/pretty/node_modules/extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "dependencies": {
+ "is-extendable": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/pretty/node_modules/is-extendable": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+ "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
"node_modules/printj": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz",
@@ -21503,6 +21678,12 @@
"signal-exit": "^3.0.2"
}
},
+ "node_modules/proto-list": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+ "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
+ "dev": true
+ },
"node_modules/protobufjs": {
"version": "6.11.2",
"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz",
@@ -21529,9 +21710,9 @@
}
},
"node_modules/protobufjs/node_modules/@types/node": {
- "version": "17.0.18",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz",
- "integrity": "sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA=="
+ "version": "17.0.21",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz",
+ "integrity": "sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="
},
"node_modules/protocols": {
"version": "1.4.8",
@@ -22537,9 +22718,9 @@
}
},
"node_modules/replace-in-file/node_modules/yargs-parser": {
- "version": "21.0.0",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz",
- "integrity": "sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==",
+ "version": "21.0.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
+ "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
"dev": true,
"engines": {
"node": ">=12"
@@ -22740,9 +22921,9 @@
}
},
"node_modules/rollup": {
- "version": "2.67.3",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.67.3.tgz",
- "integrity": "sha512-G/x1vUwbGtP6O5ZM8/sWr8+p7YfZhI18pPqMRtMYMWSbHjKZ/ajHGiM+GWNTlWyOR0EHIdT8LHU+Z4ciIZ1oBw==",
+ "version": "2.70.0",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.70.0.tgz",
+ "integrity": "sha512-iEzYw+syFxQ0X9RefVwhr8BA2TNJsTaX8L8dhyeyMECDbmiba+8UQzcu+xZdji0+JQ+s7kouQnw+9Oz5M19XKA==",
"dev": true,
"bin": {
"rollup": "dist/bin/rollup"
@@ -22788,11 +22969,12 @@
}
},
"node_modules/rollup-plugin-terser/node_modules/terser": {
- "version": "5.10.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
- "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
+ "version": "5.12.0",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz",
+ "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
"dev": true,
"dependencies": {
+ "acorn": "^8.5.0",
"commander": "^2.20.0",
"source-map": "~0.7.2",
"source-map-support": "~0.5.20"
@@ -22802,20 +22984,12 @@
},
"engines": {
"node": ">=10"
- },
- "peerDependencies": {
- "acorn": "^8.5.0"
- },
- "peerDependenciesMeta": {
- "acorn": {
- "optional": true
- }
}
},
"node_modules/rollup-plugin-visualizer": {
- "version": "5.5.4",
- "resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.5.4.tgz",
- "integrity": "sha512-CJQFUuZ75S1daGEkk62UH7lL6UFCoP86Sn/iz4gXBdamdwFeD5nPGCHHXfXCrly/wNgQOYTH7cdcxk4+OG3Xjw==",
+ "version": "5.6.0",
+ "resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.6.0.tgz",
+ "integrity": "sha512-CKcc8GTUZjC+LsMytU8ocRr/cGZIfMR7+mdy4YnlyetlmIl/dM8BMnOEpD4JPIGt+ZVW7Db9ZtSsbgyeBH3uTA==",
"dev": true,
"dependencies": {
"nanoid": "^3.1.32",
@@ -22861,9 +23035,9 @@
}
},
"node_modules/rollup-plugin-visualizer/node_modules/yargs-parser": {
- "version": "21.0.0",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz",
- "integrity": "sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==",
+ "version": "21.0.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
+ "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
"dev": true,
"engines": {
"node": ">=12"
@@ -23403,6 +23577,12 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/sigmund": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+ "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+ "dev": true
+ },
"node_modules/signal-exit": {
"version": "3.0.7",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -24932,10 +25112,11 @@
}
},
"node_modules/terser-webpack-plugin/node_modules/terser": {
- "version": "5.10.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
- "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
+ "version": "5.12.0",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz",
+ "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
"dependencies": {
+ "acorn": "^8.5.0",
"commander": "^2.20.0",
"source-map": "~0.7.2",
"source-map-support": "~0.5.20"
@@ -24945,14 +25126,6 @@
},
"engines": {
"node": ">=10"
- },
- "peerDependencies": {
- "acorn": "^8.5.0"
- },
- "peerDependenciesMeta": {
- "acorn": {
- "optional": true
- }
}
},
"node_modules/terser-webpack-plugin/node_modules/terser/node_modules/source-map": {
@@ -25090,6 +25263,24 @@
"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
},
+ "node_modules/tinypool": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.1.2.tgz",
+ "integrity": "sha512-fvtYGXoui2RpeMILfkvGIgOVkzJEGediv8UJt7TxdAOY8pnvUkFg/fkvqTfXG9Acc9S17Cnn1S4osDc2164guA==",
+ "dev": true,
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/tinyspy": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-0.3.0.tgz",
+ "integrity": "sha512-c5uFHqtUp74R2DJE3/Efg0mH5xicmgziaQXMm/LvuuZn3RdpADH32aEGDRyCzObXT1DNfwDMqRQ/Drh1MlO12g==",
+ "dev": true,
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
"node_modules/tmp": {
"version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -25269,9 +25460,9 @@
}
},
"node_modules/tsconfig-paths": {
- "version": "3.12.0",
- "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz",
- "integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==",
+ "version": "3.13.0",
+ "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.13.0.tgz",
+ "integrity": "sha512-nWuffZppoaYK0vQ1SQmkSsQzJoHA4s6uzdb2waRpD806x9yfq153AdVsWz4je2qZcW+pENrMQXbGQ3sMCkXuhw==",
"dev": true,
"dependencies": {
"@types/json5": "^0.0.29",
@@ -25350,10 +25541,19 @@
"node": ">= 0.8.0"
}
},
+ "node_modules/type-detect": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
"node_modules/type-fest": {
- "version": "2.11.2",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.11.2.tgz",
- "integrity": "sha512-reW2Y2Mpn0QNA/5fvtm5doROLwDPu2zOm5RtY7xQQS05Q7xgC8MOZ3yPNaP9m/s/sNjjFQtHo7VCNqYW2iI+Ig==",
+ "version": "2.12.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.12.0.tgz",
+ "integrity": "sha512-Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA==",
"dev": true,
"engines": {
"node": ">=12.20"
@@ -25381,9 +25581,9 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
},
"node_modules/typescript": {
- "version": "4.5.5",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz",
- "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==",
+ "version": "4.6.2",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz",
+ "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==",
"dev": true,
"bin": {
"tsc": "bin/tsc",
@@ -25412,14 +25612,14 @@
}
},
"node_modules/ufo": {
- "version": "0.7.10",
- "resolved": "https://registry.npmjs.org/ufo/-/ufo-0.7.10.tgz",
- "integrity": "sha512-YTnDRlE1cIofRqOFN8ioAbz9qenDvkgVMSn0cnxvIDjM9sfEOMKB0ybMr+otSlCXMfQ/X35haYRoI7Nua82RrA=="
+ "version": "0.7.11",
+ "resolved": "https://registry.npmjs.org/ufo/-/ufo-0.7.11.tgz",
+ "integrity": "sha512-IT3q0lPvtkqQ8toHQN/BkOi4VIqoqheqM1FnkNWT9y0G8B3xJhwnoKBu5OHx8zHDOvveQzfKuFowJ0VSARiIDg=="
},
"node_modules/uglify-js": {
- "version": "3.15.1",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz",
- "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==",
+ "version": "3.15.2",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz",
+ "integrity": "sha512-peeoTk3hSwYdoc9nrdiEJk+gx1ALCtTjdYuKSXMTDqq7n1W7dHPqWDdSi+BPL0ni2YMeHD7hKUSdbj3TZauY2A==",
"bin": {
"uglifyjs": "bin/uglifyjs"
},
@@ -25493,9 +25693,9 @@
"dev": true
},
"node_modules/undici": {
- "version": "4.14.1",
- "resolved": "https://registry.npmjs.org/undici/-/undici-4.14.1.tgz",
- "integrity": "sha512-WJ+g+XqiZcATcBaUeluCajqy4pEDcQfK1vy+Fo+bC4/mqXI9IIQD/XWHLS70fkGUT6P52Drm7IFslO651OdLPQ==",
+ "version": "4.15.1",
+ "resolved": "https://registry.npmjs.org/undici/-/undici-4.15.1.tgz",
+ "integrity": "sha512-h8LJybhMKD09IyQZoQadNtIR/GmugVhTOVREunJrpV6RStriKBFdSVoFzEzTihwXi/27DIBO+Z0OGF+Mzfi0lA==",
"dev": true,
"engines": {
"node": ">=12.18"
@@ -25653,6 +25853,19 @@
"through2-filter": "^3.0.0"
}
},
+ "node_modules/unist-util-stringify-position": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
+ "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
+ "dev": true,
+ "dependencies": {
+ "@types/unist": "^2.0.2"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/unified"
+ }
+ },
"node_modules/universalify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -25670,9 +25883,9 @@
}
},
"node_modules/unplugin": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-0.3.2.tgz",
- "integrity": "sha512-5d0DMYNKZU+S9eZUiBfw6Co32eRg8myUgBPoWSqG/wDFCUE/WznfSsJnZWi1P9l69x4uLJqt2qVq1xW/AsXFrw==",
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-0.3.3.tgz",
+ "integrity": "sha512-WjZWpUqqcYPQ/efR00Zm2m1+J1LitwoZ4uhHV4VdZ+IpW0Nh/qnDYtVf+nLhozXdGxslMPecOshVR7NiWFl4gA==",
"dev": true,
"dependencies": {
"webpack-virtual-modules": "^0.4.3"
@@ -25699,34 +25912,32 @@
}
},
"node_modules/unplugin-vue2-script-setup": {
- "version": "0.9.3",
- "resolved": "https://registry.npmjs.org/unplugin-vue2-script-setup/-/unplugin-vue2-script-setup-0.9.3.tgz",
- "integrity": "sha512-m2QESHiFNmx0fIo/P0AiCrH6E5WtijRB/Ldrj8zjwRIYYbiOgmTfRmWQquW0H8ei5OwhYT30WAgepFjWrJ5oJg==",
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/unplugin-vue2-script-setup/-/unplugin-vue2-script-setup-0.10.0.tgz",
+ "integrity": "sha512-Zra5vrlHkpzC9vITP5e0EbtVq2MfbaaDoBG8Gx1GDkpUuLJ3Sohnj4523v9KlOH4DSqInESGamzEVPUjFFBNyA==",
"dev": true,
"dependencies": {
- "@antfu/utils": "^0.4.0",
- "@babel/core": "^7.16.7",
- "@babel/generator": "^7.16.8",
- "@babel/parser": "^7.16.8",
- "@babel/traverse": "^7.16.8",
- "@babel/types": "^7.16.8",
+ "@antfu/utils": "^0.5.0",
+ "@babel/core": "^7.17.5",
+ "@babel/generator": "^7.17.3",
+ "@babel/parser": "^7.17.3",
+ "@babel/traverse": "^7.17.3",
+ "@babel/types": "^7.17.0",
"@rollup/pluginutils": "^4.1.2",
- "@vue/compiler-core": "^3.2.26",
- "@vue/compiler-dom": "^3.2.26",
- "@vue/reactivity-transform": "^3.2.26",
- "@vue/shared": "^3.2.26",
- "defu": "^5.0.0",
- "htmlparser2": "5.0.1",
+ "@vue/compiler-core": "^3.2.31",
+ "@vue/compiler-dom": "^3.2.31",
+ "@vue/reactivity-transform": "^3.2.31",
+ "@vue/shared": "^3.2.31",
+ "defu": "^5.0.1",
"magic-string": "^0.25.7",
- "tslib": "^2.3.1",
- "unplugin": "^0.3.0"
+ "unplugin": "^0.3.2"
},
"funding": {
"url": "https://github.com/sponsors/antfu"
},
"peerDependencies": {
"@vue/composition-api": "^1.4.3",
- "@vue/runtime-dom": "^3.2.26",
+ "@vue/runtime-dom": "^3.2.31",
"pug": "^3.0.2"
},
"peerDependenciesMeta": {
@@ -25735,45 +25946,6 @@
}
}
},
- "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": {
- "domelementtype": "^2.0.1"
- },
- "engines": {
- "node": ">= 4"
- },
- "funding": {
- "url": "https://github.com/fb55/domhandler?sponsor=1"
- }
- },
- "node_modules/unplugin-vue2-script-setup/node_modules/entities": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
- "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
- "dev": true,
- "funding": {
- "url": "https://github.com/fb55/entities?sponsor=1"
- }
- },
- "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,
- "dependencies": {
- "domelementtype": "^2.0.1",
- "domhandler": "^3.3.0",
- "domutils": "^2.4.2",
- "entities": "^2.0.0"
- },
- "funding": {
- "url": "https://github.com/fb55/htmlparser2?sponsor=1"
- }
- },
"node_modules/unquote": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
@@ -26197,9 +26369,9 @@
}
},
"node_modules/vite": {
- "version": "2.8.4",
- "resolved": "https://registry.npmjs.org/vite/-/vite-2.8.4.tgz",
- "integrity": "sha512-GwtOkkaT2LDI82uWZKcrpRQxP5tymLnC7hVHHqNkhFNknYr0hJUlDLfhVRgngJvAy3RwypkDCWtTKn1BjO96Dw==",
+ "version": "2.8.6",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-2.8.6.tgz",
+ "integrity": "sha512-e4H0QpludOVKkmOsRyqQ7LTcMUDF3mcgyNU4lmi0B5JUbe0ZxeBBl8VoZ8Y6Rfn9eFKYtdXNPcYK97ZwH+K2ug==",
"dev": true,
"dependencies": {
"esbuild": "^0.14.14",
@@ -26289,6 +26461,50 @@
"node": ">= 8"
}
},
+ "node_modules/vitest": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.6.0.tgz",
+ "integrity": "sha512-FuIkLHCQxz6rO35MQROUtVdwcBaYnt198YpPGIrJXmuNHGolfPbrZIiwpD7bek0OiETxuphK3+KR5oJ5Qi1g5A==",
+ "dev": true,
+ "dependencies": {
+ "@types/chai": "^4.3.0",
+ "@types/chai-subset": "^1.3.3",
+ "chai": "^4.3.6",
+ "local-pkg": "^0.4.1",
+ "tinypool": "^0.1.2",
+ "tinyspy": "^0.3.0",
+ "vite": "^2.7.10"
+ },
+ "bin": {
+ "vitest": "vitest.mjs"
+ },
+ "engines": {
+ "node": ">=14.14.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ },
+ "peerDependencies": {
+ "@vitest/ui": "*",
+ "c8": "*",
+ "happy-dom": "*",
+ "jsdom": "*"
+ },
+ "peerDependenciesMeta": {
+ "@vitest/ui": {
+ "optional": true
+ },
+ "c8": {
+ "optional": true
+ },
+ "happy-dom": {
+ "optional": true
+ },
+ "jsdom": {
+ "optional": true
+ }
+ }
+ },
"node_modules/vm-browserify": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
@@ -26348,9 +26564,9 @@
}
},
"node_modules/vue-eslint-parser": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.2.0.tgz",
- "integrity": "sha512-hvl8OVT8imlKk/lQyhkshqwQQChzHETcBd5abiO4ePw7ib7QUZLfW+2TUrJHKUvFOCFRJrDin5KJO9OHzB5bRQ==",
+ "version": "8.3.0",
+ "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz",
+ "integrity": "sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==",
"dev": true,
"dependencies": {
"debug": "^4.3.2",
@@ -28240,87 +28456,85 @@
}
},
"@antfu/eslint-config": {
- "version": "0.16.1",
- "resolved": "https://registry.npmjs.org/@antfu/eslint-config/-/eslint-config-0.16.1.tgz",
- "integrity": "sha512-GYJMtcEpHNNQA1A2acsRqSKGRkLEZ38Y9lvHBcX7HomJ+NsPFG4a3AJ5DW1CKpPTk5W3mOF0XBMiGA+pQOC37g==",
+ "version": "0.18.3",
+ "resolved": "https://registry.npmjs.org/@antfu/eslint-config/-/eslint-config-0.18.3.tgz",
+ "integrity": "sha512-NM5xydLE+pY3Tj5jjUdgmnK2ZmPwEklgq56A0odGASksp0ix3J7cOGp+PLiVWDvDpFga5LxsV23K3XkJbuBFHA==",
"dev": true,
"requires": {
- "@antfu/eslint-config-react": "^0.16.1",
- "@antfu/eslint-config-vue": "^0.16.1",
- "@typescript-eslint/eslint-plugin": "^5.10.1",
- "@typescript-eslint/parser": "^5.10.1",
- "eslint-config-standard": "17.0.0-0",
+ "@antfu/eslint-config-react": "^0.18.3",
+ "@antfu/eslint-config-vue": "^0.18.3",
+ "@typescript-eslint/eslint-plugin": "^5.13.0",
+ "@typescript-eslint/parser": "^5.13.0",
+ "eslint-config-standard": "17.0.0-1",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-html": "^6.2.0",
"eslint-plugin-import": "^2.25.4",
- "eslint-plugin-jsonc": "^2.0.0",
- "eslint-plugin-n": "^14.0.0",
+ "eslint-plugin-jsonc": "^2.2.1",
+ "eslint-plugin-n": "^15.0.1",
"eslint-plugin-promise": "^6.0.0",
- "eslint-plugin-unicorn": "^40.1.0",
- "eslint-plugin-vue": "^8.4.0",
- "eslint-plugin-yml": "^0.12.0",
+ "eslint-plugin-unicorn": "^41.0.0",
+ "eslint-plugin-vue": "^8.5.0",
+ "eslint-plugin-yml": "^0.14.0",
"jsonc-eslint-parser": "^2.1.0",
"yaml-eslint-parser": "^0.5.0"
}
},
"@antfu/eslint-config-basic": {
- "version": "0.16.1",
- "resolved": "https://registry.npmjs.org/@antfu/eslint-config-basic/-/eslint-config-basic-0.16.1.tgz",
- "integrity": "sha512-kUA7UBD1W8FG2frH4pKfos4l5eUSxVH8oMK7+T9OxBAxpvXDAYUGU0KNZoMOdhWhu0dmE/7iHXYbnu6r9KXwUw==",
+ "version": "0.18.3",
+ "resolved": "https://registry.npmjs.org/@antfu/eslint-config-basic/-/eslint-config-basic-0.18.3.tgz",
+ "integrity": "sha512-0kkr/pYxnJmYbKfLUmEW5Nd7FsGFHt68M+Rv8T6t0YV1kn2pJNTFcsuBYtINOAoKktgoZ7+mRjwMaNJ/MIcWbg==",
"dev": true,
"requires": {
- "eslint-config-standard": "17.0.0-0",
+ "eslint-config-standard": "17.0.0-1",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-html": "^6.2.0",
"eslint-plugin-import": "^2.25.4",
- "eslint-plugin-jsonc": "^2.0.0",
- "eslint-plugin-n": "^14.0.0",
+ "eslint-plugin-jsonc": "^2.2.1",
+ "eslint-plugin-markdown": "^2.2.1",
+ "eslint-plugin-n": "^15.0.1",
"eslint-plugin-promise": "^6.0.0",
- "eslint-plugin-unicorn": "^40.1.0",
- "eslint-plugin-yml": "^0.12.0",
+ "eslint-plugin-unicorn": "^41.0.0",
+ "eslint-plugin-yml": "^0.14.0",
"jsonc-eslint-parser": "^2.1.0",
"yaml-eslint-parser": "^0.5.0"
}
},
"@antfu/eslint-config-react": {
- "version": "0.16.1",
- "resolved": "https://registry.npmjs.org/@antfu/eslint-config-react/-/eslint-config-react-0.16.1.tgz",
- "integrity": "sha512-UU/KqDVRb6/XQVBsrL2a3fBwn2NRGWnZCBPAU9HbIqLY/zJ5p8CpBJTvvIvCC4p4aiO3unwnYhhf5SdCQtfOjw==",
+ "version": "0.18.3",
+ "resolved": "https://registry.npmjs.org/@antfu/eslint-config-react/-/eslint-config-react-0.18.3.tgz",
+ "integrity": "sha512-Mz5gPJowsMuMRuhiTRTvD2REbMDq+pU6QauoMsEMeVbJ3vTiLw/AV0aXprbRL1PUhPHGNDdzYyU+E/tw1UZS6A==",
"dev": true,
"requires": {
- "@antfu/eslint-config-ts": "^0.16.1",
- "eslint-plugin-react": "^7.28.0"
+ "@antfu/eslint-config-ts": "^0.18.3",
+ "eslint-plugin-react": "^7.29.3"
}
},
"@antfu/eslint-config-ts": {
- "version": "0.16.1",
- "resolved": "https://registry.npmjs.org/@antfu/eslint-config-ts/-/eslint-config-ts-0.16.1.tgz",
- "integrity": "sha512-FrIosrYILXog7v8GcQkj8YyMKe6HxUvv8DFDHxQjR5liI77BQ9kmIqRu8JZ/6RwMEEpMWV5Ed+LDR7FDjJiTxg==",
+ "version": "0.18.3",
+ "resolved": "https://registry.npmjs.org/@antfu/eslint-config-ts/-/eslint-config-ts-0.18.3.tgz",
+ "integrity": "sha512-ZCr0IjYkF5uSgvlHVpQ+Y2FdMIa5WCvmrkjDm8m9XGXCPvI/KbLy+2fXj65gZXDCAQ0bet6Dl+4EeNRn29E32Q==",
"dev": true,
"requires": {
- "@antfu/eslint-config-basic": "^0.16.1",
- "@typescript-eslint/eslint-plugin": "^5.10.1",
- "@typescript-eslint/parser": "^5.10.1"
+ "@antfu/eslint-config-basic": "^0.18.3",
+ "@typescript-eslint/eslint-plugin": "^5.13.0",
+ "@typescript-eslint/parser": "^5.13.0"
}
},
"@antfu/eslint-config-vue": {
- "version": "0.16.1",
- "resolved": "https://registry.npmjs.org/@antfu/eslint-config-vue/-/eslint-config-vue-0.16.1.tgz",
- "integrity": "sha512-2BMQBTVQrElu2Pvmubgc1G3BrCbaQjBzcepZZvHNnK74Wq4ec1Cl5i9BMRVVwBGg5fIg5erRPzUWr17j5BLa0A==",
+ "version": "0.18.3",
+ "resolved": "https://registry.npmjs.org/@antfu/eslint-config-vue/-/eslint-config-vue-0.18.3.tgz",
+ "integrity": "sha512-RgenlvleSCMQ9z+326OjuyB5X1wV9JbdE8BUUIeFUBcJ73PMEsk6dwickEmy+ELZtgH3Ql25XlPn4szbTdJScQ==",
"dev": true,
"requires": {
- "@antfu/eslint-config-ts": "^0.16.1",
- "eslint-plugin-vue": "^8.4.0"
+ "@antfu/eslint-config-ts": "^0.18.3",
+ "eslint-plugin-vue": "^8.5.0"
}
},
"@antfu/utils": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.4.0.tgz",
- "integrity": "sha512-gqkpvjkgFUu+s3kP+Ly33OKpo5zvVY3FDFhv5BIb98SncS3KD6DNxPfNDjwHIoyXbz1leWo1j8DtRLZ1D2Jv+Q==",
- "dev": true,
- "requires": {
- "@types/throttle-debounce": "^2.1.0"
- }
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.5.0.tgz",
+ "integrity": "sha512-MrAQ/MrPSxbh1bBrmwJjORfJymw4IqSHFBXqvxaga3ZdDM+/zokYF8DjyJpSjY2QmpmgQrajDUBJOWrYeARfzA==",
+ "dev": true
},
"@babel/code-frame": {
"version": "7.16.7",
@@ -28410,9 +28624,9 @@
}
},
"@babel/helper-create-class-features-plugin": {
- "version": "7.17.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz",
- "integrity": "sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ==",
+ "version": "7.17.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz",
+ "integrity": "sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==",
"requires": {
"@babel/helper-annotate-as-pure": "^7.16.7",
"@babel/helper-environment-visitor": "^7.16.7",
@@ -28513,9 +28727,9 @@
}
},
"@babel/helper-module-transforms": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz",
- "integrity": "sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==",
+ "version": "7.17.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz",
+ "integrity": "sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==",
"requires": {
"@babel/helper-environment-visitor": "^7.16.7",
"@babel/helper-module-imports": "^7.16.7",
@@ -28523,8 +28737,8 @@
"@babel/helper-split-export-declaration": "^7.16.7",
"@babel/helper-validator-identifier": "^7.16.7",
"@babel/template": "^7.16.7",
- "@babel/traverse": "^7.16.7",
- "@babel/types": "^7.16.7"
+ "@babel/traverse": "^7.17.3",
+ "@babel/types": "^7.17.0"
}
},
"@babel/helper-optimise-call-expression": {
@@ -28670,11 +28884,11 @@
}
},
"@babel/plugin-proposal-class-static-block": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz",
- "integrity": "sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==",
+ "version": "7.17.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz",
+ "integrity": "sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==",
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.16.7",
+ "@babel/helper-create-class-features-plugin": "^7.17.6",
"@babel/helper-plugin-utils": "^7.16.7",
"@babel/plugin-syntax-class-static-block": "^7.14.5"
}
@@ -29364,9 +29578,9 @@
}
},
"@babel/standalone": {
- "version": "7.17.5",
- "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.17.5.tgz",
- "integrity": "sha512-9bd210vgc9yg6vc5jceuunpuTvsjfTMdcOeASo4rDCNfsgxjwvpkpMpoCIJFdENW0Sc4X9TrH/b6mrwQiKBmMQ==",
+ "version": "7.17.6",
+ "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.17.6.tgz",
+ "integrity": "sha512-rBBC7aZ4Q8UkMV4Wl6cAw8Wcgg7DcIG3pzo2n+W/FwmBRZB/q7yGpzE10VXpOmSj9/KW3L1pbDhPGI1oOrscgA==",
"dev": true
},
"@babel/template": {
@@ -29458,9 +29672,9 @@
}
},
"@csstools/postcss-is-pseudo-class": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.0.tgz",
- "integrity": "sha512-WnfZlyuh/CW4oS530HBbrKq0G8BKl/bsNr5NMFoubBFzJfvFRGJhplCgIJYWUidLuL3WJ/zhMtDIyNFTqhx63Q==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.1.tgz",
+ "integrity": "sha512-Og5RrTzwFhrKoA79c3MLkfrIBYmwuf/X83s+JQtz/Dkk/MpsaKtqHV1OOzYkogQ+tj3oYp5Mq39XotBXNqVc3Q==",
"dev": true,
"requires": {
"postcss-selector-parser": "^6.0.9"
@@ -29486,18 +29700,18 @@
}
},
"@csstools/postcss-progressive-custom-properties": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.2.0.tgz",
- "integrity": "sha512-YLpFPK5OaLIRKZhUfnrZPT9s9cmtqltIOg7W6jPcxmiDpnZ4lk+odfufZttOAgcg6IHWvNLgcITSLpJxIQB/qQ==",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
+ "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
"dev": true,
"requires": {
"postcss-value-parser": "^4.2.0"
}
},
"@eslint/eslintrc": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.1.0.tgz",
- "integrity": "sha512-C1DfL7XX4nPqGd6jcP01W9pVM1HYCuUkFk1432D7F0v3JSlUIeOYn9oCoi3eoLZ+iwBSb29BMFxxny0YrrEZqg==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.0.tgz",
+ "integrity": "sha512-igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w==",
"dev": true,
"requires": {
"ajv": "^6.12.4",
@@ -29579,13 +29793,14 @@
"integrity": "sha512-DNE2Waiwy5+zZnCfintkDtBfaW6MjIG883474v6Z0K1XZIvl76cLND4iv0YUb48leyF+PJK1KO2XrgHb/KpmhQ=="
},
"@firebase/app": {
- "version": "0.7.17",
- "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.17.tgz",
- "integrity": "sha512-OnZab790eMwRxkUs7o/kgniAzSBxecDTGEk1PVhiG0HQhKrIf+R7lgqOZHDb/2GJsX12jby1p/Z5+WJCBxVbJQ==",
+ "version": "0.7.18",
+ "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.7.18.tgz",
+ "integrity": "sha512-jomDaPaEQEWfFUqvxQw4TYSs2gCT2BN0Ec1//3CdMsc1NcppduS31bxsjhn3KdPbtx4opkaZ2FcA+buHtdw9dw==",
"requires": {
"@firebase/component": "0.5.10",
"@firebase/logger": "0.3.2",
"@firebase/util": "1.4.3",
+ "idb": "3.0.2",
"tslib": "^2.1.0"
}
},
@@ -29618,11 +29833,11 @@
"integrity": "sha512-uZfn9s4uuRsaX5Lwx+gFP3B6YsyOKUE+Rqa6z9ojT4VSRAsZFko9FRn6OxQUA1z5t5d08fY4pf+/+Dkd5wbdbA=="
},
"@firebase/app-compat": {
- "version": "0.1.18",
- "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.18.tgz",
- "integrity": "sha512-YXmMLQro2g2xlNnzB6zVxYoFx9sJS/JDEQy6vsj3FpMUuARaImipL6W8KuGfH+tJ3M+q38qRaFROk5gK6PoCrQ==",
+ "version": "0.1.19",
+ "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.1.19.tgz",
+ "integrity": "sha512-a0TgAXcjF3htSdi10mRwAks1+73nwbmSMXzjlOQDYJ8t3HE7FvHxfB4hjuwHKfgr3MWZjcarsGKVr7LWhUAE8w==",
"requires": {
- "@firebase/app": "0.7.17",
+ "@firebase/app": "0.7.18",
"@firebase/component": "0.5.10",
"@firebase/logger": "0.3.2",
"@firebase/util": "1.4.3",
@@ -29841,9 +30056,9 @@
}
},
"@firebase/messaging": {
- "version": "0.9.8",
- "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.9.8.tgz",
- "integrity": "sha512-X588ZFA/plaO4de7MyZs2gukrkdp+ounwqZ7JerHHVa6eKl1WNi9AuAfoXOJUMq+nX2DsOWYjohciCkC6qLrWw==",
+ "version": "0.9.9",
+ "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.9.9.tgz",
+ "integrity": "sha512-Fe6+VqFgVuvFOiVerQkPzdmHXnB7urujcKAxK3lRKxgafH89CRvXO1sPnPMvox5/JOCBZrAPok5KA7rOCxBguw==",
"requires": {
"@firebase/component": "0.5.10",
"@firebase/installations": "0.5.5",
@@ -29854,12 +30069,12 @@
}
},
"@firebase/messaging-compat": {
- "version": "0.1.8",
- "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.1.8.tgz",
- "integrity": "sha512-1q0Bp/auG6XUSEBzmExrn6uU6JUtB5JxIHwTj8wmUf+JcdNqPMWou040Mem421Sxgd4GLn+vHHlVIRxv1yLYUA==",
+ "version": "0.1.9",
+ "resolved": "https://registry.npmjs.org/@firebase/messaging-compat/-/messaging-compat-0.1.9.tgz",
+ "integrity": "sha512-smcBhvTLfgE2KDtvDj1Pm9zQ7GeyR5BLarYLxtvmhhbV6tpa8g+UUE3pCdqN+y1kx6mIYqNOmEEXv+1YnSiYwQ==",
"requires": {
"@firebase/component": "0.5.10",
- "@firebase/messaging": "0.9.8",
+ "@firebase/messaging": "0.9.9",
"@firebase/util": "1.4.3",
"tslib": "^2.1.0"
}
@@ -30004,9 +30219,9 @@
"integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="
},
"@grpc/grpc-js": {
- "version": "1.5.5",
- "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.5.tgz",
- "integrity": "sha512-FTd27ItHlsSG/7hp62xgI9YnqSwRbHRSVmDVR8DwOoC+6t8JhHRXe2JL0U8N9GLc0jS0HrtEbO/KP5+G0ebjLQ==",
+ "version": "1.5.7",
+ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.7.tgz",
+ "integrity": "sha512-RAlSbZ9LXo0wNoHKeUlwP9dtGgVBDUbnBKFpfAv5iSqMG4qWz9um2yLH215+Wow1I48etIa1QMS+WAGmsE/7HQ==",
"requires": {
"@grpc/proto-loader": "^0.6.4",
"@types/node": ">=12.12.47"
@@ -30025,9 +30240,9 @@
}
},
"@humanwhocodes/config-array": {
- "version": "0.9.3",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.3.tgz",
- "integrity": "sha512-3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ==",
+ "version": "0.9.5",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
+ "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
"dev": true,
"requires": {
"@humanwhocodes/object-schema": "^1.2.1",
@@ -30205,18 +30420,18 @@
}
},
"@nuxt/bridge": {
- "version": "npm:@nuxt/[email protected]",
- "resolved": "https://registry.npmjs.org/@nuxt/bridge-edge/-/bridge-edge-3.0.0-27420403.16e2a54.tgz",
- "integrity": "sha512-iN5sNI51LI6ZUcNuGjw58Kbhwb4WWqmK8P7Vu3H/gfkTEXyQIiqlzIUF8QrfZO3tOq5akknz9M66QywqMY3bWQ==",
+ "version": "npm:@nuxt/[email protected]",
+ "resolved": "https://registry.npmjs.org/@nuxt/bridge-edge/-/bridge-edge-3.0.0-27444434.856c01a.tgz",
+ "integrity": "sha512-jN6j36E9K6gnWlo5eYZizeVDQzkVRUs8jt4Yi2n3a0zSvVCFvPDcvCNPsH3AB44NGmN3OT7UF6mh/TmqvdfllA==",
"dev": true,
"requires": {
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
"@babel/plugin-proposal-optional-chaining": "^7.16.7",
"@babel/plugin-transform-typescript": "^7.16.8",
- "@nuxt/kit": "npm:@nuxt/[email protected]",
- "@nuxt/nitro": "npm:@nuxt/[email protected]",
+ "@nuxt/kit": "npm:@nuxt/[email protected]",
+ "@nuxt/nitro": "npm:@nuxt/[email protected]",
"@nuxt/postcss8": "^1.1.3",
- "@nuxt/schema": "npm:@nuxt/[email protected]",
+ "@nuxt/schema": "npm:@nuxt/[email protected]",
"@vitejs/plugin-legacy": "^1.6.4",
"@vue/composition-api": "^1.4.6",
"@vueuse/head": "^0.7.5",
@@ -30237,7 +30452,7 @@
"mlly": "^0.4.2",
"murmurhash-es": "^0.1.1",
"node-fetch": "^3.2.0",
- "nuxi": "npm:[email protected]",
+ "nuxi": "npm:[email protected]",
"p-debounce": "^4.0.0",
"pathe": "^0.2.0",
"postcss": "^8",
@@ -30255,6 +30470,15 @@
"vue-template-compiler": "^2.6.14"
},
"dependencies": {
+ "@antfu/utils": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.4.0.tgz",
+ "integrity": "sha512-gqkpvjkgFUu+s3kP+Ly33OKpo5zvVY3FDFhv5BIb98SncS3KD6DNxPfNDjwHIoyXbz1leWo1j8DtRLZ1D2Jv+Q==",
+ "dev": true,
+ "requires": {
+ "@types/throttle-debounce": "^2.1.0"
+ }
+ },
"@vue/server-renderer": {
"version": "3.2.31",
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.31.tgz",
@@ -30696,17 +30920,18 @@
}
},
"@nuxt/kit": {
- "version": "npm:@nuxt/[email protected]",
- "resolved": "https://registry.npmjs.org/@nuxt/kit-edge/-/kit-edge-3.0.0-27420403.16e2a54.tgz",
- "integrity": "sha512-W7/2Hd+lbJfDOK7qTOLSu1VFjpZlC/VsfE/wLbbX3BG2UTn3DsGQe3ksqdmGWn9o2XEWJ9snNMroXJPNrqEUkg==",
+ "version": "npm:@nuxt/[email protected]",
+ "resolved": "https://registry.npmjs.org/@nuxt/kit-edge/-/kit-edge-3.0.0-27444434.856c01a.tgz",
+ "integrity": "sha512-0mXD7Otg2Bpcx4PkiEAuNckjR68w81CHfkp33v97bERqRCm2HjZarmWuL04mmAHACdTUgcN0KRIspHvnISi5Ng==",
"dev": true,
"requires": {
- "@nuxt/schema": "npm:@nuxt/[email protected]",
+ "@nuxt/schema": "npm:@nuxt/[email protected]",
"c12": "^0.1.3",
"consola": "^2.15.3",
"defu": "^5.0.1",
"globby": "^13.1.1",
"hash-sum": "^2.0.0",
+ "ignore": "^5.2.0",
"jiti": "^1.13.0",
"knitwork": "^0.1.0",
"lodash.template": "^4.5.0",
@@ -30732,23 +30957,23 @@
}
},
"@nuxt/nitro": {
- "version": "npm:@nuxt/[email protected]",
- "resolved": "https://registry.npmjs.org/@nuxt/nitro-edge/-/nitro-edge-3.0.0-27420403.16e2a54.tgz",
- "integrity": "sha512-6QVI9FWmjSuZGLdpEwVyuSQx2eUJqwzkvSOwCGKLI5jeZVLuuRZbSdhZbG8LWLoxpH+MHSpKEJ5psWxAMPmbVg==",
+ "version": "npm:@nuxt/[email protected]",
+ "resolved": "https://registry.npmjs.org/@nuxt/nitro-edge/-/nitro-edge-3.0.0-27444434.856c01a.tgz",
+ "integrity": "sha512-crA4LEes1ovknxOmUVOFeHbg8saWdwGTLZ7ytt+dJgmaGWUMMdkuyaFUa7srxskqjf7P/YlOR5lnqDN0kXn69w==",
"dev": true,
"requires": {
"@cloudflare/kv-asset-handler": "^0.2.0",
"@netlify/functions": "^1.0.0",
"@nuxt/design": "0.1.5",
"@nuxt/devalue": "^2.0.0",
- "@nuxt/kit": "npm:@nuxt/[email protected]",
+ "@nuxt/kit": "npm:@nuxt/[email protected]",
"@rollup/plugin-alias": "^3.1.9",
- "@rollup/plugin-commonjs": "^21.0.1",
+ "@rollup/plugin-commonjs": "^21.0.2",
"@rollup/plugin-inject": "^4.0.4",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^13.1.3",
- "@rollup/plugin-replace": "^3.1.0",
- "@rollup/plugin-virtual": "^2.0.3",
+ "@rollup/plugin-replace": "^4.0.0",
+ "@rollup/plugin-virtual": "^2.1.0",
"@rollup/plugin-wasm": "^5.1.2",
"@rollup/pluginutils": "^4.1.2",
"@types/jsdom": "^16.2.14",
@@ -30761,9 +30986,9 @@
"defu": "^5.0.1",
"destr": "^1.1.0",
"dot-prop": "^7.2.0",
- "esbuild": "^0.14.22",
+ "esbuild": "^0.14.23",
"etag": "^1.8.1",
- "fs-extra": "^10.0.0",
+ "fs-extra": "^10.0.1",
"globby": "^13.1.1",
"gzip-size": "^7.0.0",
"h3": "^0.3.9",
@@ -30778,19 +31003,19 @@
"mlly": "^0.4.3",
"node-fetch": "^3.2.0",
"ohmyfetch": "^0.4.15",
- "ora": "^6.0.1",
+ "ora": "^6.1.0",
"p-debounce": "^4.0.0",
"pathe": "^0.2.0",
"pkg-types": "^0.3.2",
"pretty-bytes": "^6.0.0",
- "rollup": "^2.67.3",
+ "rollup": "^2.68.0",
"rollup-plugin-terser": "^7.0.2",
- "rollup-plugin-visualizer": "^5.5.4",
+ "rollup-plugin-visualizer": "^5.6.0",
"serve-placeholder": "^1.2.4",
"serve-static": "^1.14.2",
"std-env": "^3.0.1",
"table": "^6.8.0",
- "ufo": "^0.7.9",
+ "ufo": "^0.7.11",
"unenv": "^0.4.3",
"unstorage": "^0.3.3",
"vue-bundle-renderer": "^0.3.5",
@@ -30904,9 +31129,9 @@
}
},
"@nuxt/schema": {
- "version": "npm:@nuxt/[email protected]",
- "resolved": "https://registry.npmjs.org/@nuxt/schema-edge/-/schema-edge-3.0.0-27420403.16e2a54.tgz",
- "integrity": "sha512-CDITD834JnlVHj72z6eGyU/Ezr1h52fv+xk3jybfgo0td38ANqT+vWKlLyBJf089Sd2pAP+SIWCIpfwjoknMKw==",
+ "version": "npm:@nuxt/[email protected]",
+ "resolved": "https://registry.npmjs.org/@nuxt/schema-edge/-/schema-edge-3.0.0-27444434.856c01a.tgz",
+ "integrity": "sha512-kVS0ShWVOzUJR+QV0Sqvv1m7lhP7ZT6d4CXuC5+N13ZwIonoxdwvCKWR3mNJOaXTZDqthic91noqH2GtXI9r5Q==",
"dev": true,
"requires": {
"c12": "^0.1.3",
@@ -30914,9 +31139,10 @@
"defu": "^5.0.1",
"jiti": "^1.13.0",
"pathe": "^0.2.0",
+ "postcss-import-resolver": "^2.0.0",
"scule": "^0.2.1",
"std-env": "^3.0.1",
- "ufo": "^0.7.9"
+ "ufo": "^0.7.11"
}
},
"@nuxt/server-edge": {
@@ -31766,13 +31992,15 @@
}
},
"@nuxtjs/color-mode": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/@nuxtjs/color-mode/-/color-mode-2.1.1.tgz",
- "integrity": "sha512-kGB/FoICF4RwZkfNBhL/yGrHfaUFpviYq6HGvSkZEm2dCpjRXIv9VsWoP0uzwxnoaRAQQOkkWjaGv/nSk0gUSQ==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@nuxtjs/color-mode/-/color-mode-3.0.2.tgz",
+ "integrity": "sha512-JgppnxOsVe2T/UGj0xjok/8TKDI27bRuhNh+Qrvr0FsS90Mty2acZLLN0lkrOTV0WLrpnTgN7mZCrgCWmhvziA==",
"dev": true,
"requires": {
+ "@nuxt/kit": "npm:@nuxt/kit-edge@latest",
"defu": "^5.0.0",
- "lodash.template": "^4.5.0"
+ "lodash.template": "^4.5.0",
+ "pathe": "^0.2.0"
}
},
"@nuxtjs/i18n": {
@@ -32000,9 +32228,9 @@
}
},
"@rollup/plugin-commonjs": {
- "version": "21.0.1",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-21.0.1.tgz",
- "integrity": "sha512-EA+g22lbNJ8p5kuZJUYyhhDK7WgJckW5g4pNN7n4mAFUM96VuwUnNT3xr2Db2iCZPI1pJPbGyfT5mS9T1dHfMg==",
+ "version": "21.0.2",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-21.0.2.tgz",
+ "integrity": "sha512-d/OmjaLVO4j/aQX69bwpWPpbvI3TJkQuxoAk7BH8ew1PyoMBLTOuvJTjzG8oEoW7drIIqB0KCJtfFLu/2GClWg==",
"dev": true,
"requires": {
"@rollup/pluginutils": "^3.1.0",
@@ -32165,9 +32393,9 @@
}
},
"@rollup/plugin-replace": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-3.1.0.tgz",
- "integrity": "sha512-pA3XRUrSKybVYqmH5TqWNZpGxF+VV+1GrYchKgCNIj2vsSOX7CVm2RCtx8p2nrC7xvkziYyK+lSi74T93MU3YA==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-4.0.0.tgz",
+ "integrity": "sha512-+rumQFiaNac9y64OHtkHGmdjm7us9bo1PlbgQfdihQtuNxzjpaB064HbRnewUOggLQxVCCyINfStkgmBeQpv1g==",
"dev": true,
"requires": {
"@rollup/pluginutils": "^3.1.0",
@@ -32200,9 +32428,9 @@
}
},
"@rollup/plugin-virtual": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-virtual/-/plugin-virtual-2.0.3.tgz",
- "integrity": "sha512-pw6ziJcyjZtntQ//bkad9qXaBx665SgEL8C8KI5wO8G5iU5MPxvdWrQyVaAvjojGm9tJoS8M9Z/EEepbqieYmw==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-virtual/-/plugin-virtual-2.1.0.tgz",
+ "integrity": "sha512-CPPAtlKT53HFqC8jFHb/V5WErpU8Hrq2TyCR0A7kPQMlF2wNUf0o1xuAc+Qxj8NCZM0Z3Yvl+FbUXfJjVWqDwA==",
"dev": true,
"requires": {}
},
@@ -32214,9 +32442,9 @@
"requires": {}
},
"@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==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.0.tgz",
+ "integrity": "sha512-2WUyJNRkyH5p487pGnn4tWAsxhEFKN/pT8CMgHshd5H+IXkOnKvKZwsz5ZWz+YCXkleZRAU5kwbfgF8CPfDRqA==",
"dev": true,
"requires": {
"estree-walker": "^2.0.1",
@@ -32342,6 +32570,21 @@
"browserslist": "*"
}
},
+ "@types/chai": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.0.tgz",
+ "integrity": "sha512-/ceqdqeRraGolFTcfoXNiqjyQhZzbINDngeoAq9GoHa8PPK1yNzTaxWjA6BFWp5Ua9JpXEMSS4s5i9tS0hOJtw==",
+ "dev": true
+ },
+ "@types/chai-subset": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.3.tgz",
+ "integrity": "sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==",
+ "dev": true,
+ "requires": {
+ "@types/chai": "*"
+ }
+ },
"@types/clean-css": {
"version": "4.2.5",
"resolved": "https://registry.npmjs.org/@types/clean-css/-/clean-css-4.2.5.tgz",
@@ -32474,6 +32717,15 @@
"resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
"integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
},
+ "@types/mdast": {
+ "version": "3.0.10",
+ "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
+ "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
+ "dev": true,
+ "requires": {
+ "@types/unist": "*"
+ }
+ },
"@types/mime": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@@ -32636,6 +32888,12 @@
}
}
},
+ "@types/unist": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
+ "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==",
+ "dev": true
+ },
"@types/webpack": {
"version": "4.41.28",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.28.tgz",
@@ -32703,14 +32961,14 @@
}
},
"@typescript-eslint/eslint-plugin": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.12.0.tgz",
- "integrity": "sha512-fwCMkDimwHVeIOKeBHiZhRUfJXU8n6xW1FL9diDxAyGAFvKcH4csy0v7twivOQdQdA0KC8TDr7GGRd3L4Lv0rQ==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.14.0.tgz",
+ "integrity": "sha512-ir0wYI4FfFUDfLcuwKzIH7sMVA+db7WYen47iRSaCGl+HMAZI9fpBwfDo45ZALD3A45ZGyHWDNLhbg8tZrMX4w==",
"dev": true,
"requires": {
- "@typescript-eslint/scope-manager": "5.12.0",
- "@typescript-eslint/type-utils": "5.12.0",
- "@typescript-eslint/utils": "5.12.0",
+ "@typescript-eslint/scope-manager": "5.14.0",
+ "@typescript-eslint/type-utils": "5.14.0",
+ "@typescript-eslint/utils": "5.14.0",
"debug": "^4.3.2",
"functional-red-black-tree": "^1.0.1",
"ignore": "^5.1.8",
@@ -32720,52 +32978,52 @@
}
},
"@typescript-eslint/parser": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.12.0.tgz",
- "integrity": "sha512-MfSwg9JMBojMUoGjUmX+D2stoQj1CBYTCP0qnnVtu9A+YQXVKNtLjasYh+jozOcrb/wau8TCfWOkQTiOAruBog==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.14.0.tgz",
+ "integrity": "sha512-aHJN8/FuIy1Zvqk4U/gcO/fxeMKyoSv/rS46UXMXOJKVsLQ+iYPuXNbpbH7cBLcpSbmyyFbwrniLx5+kutu1pw==",
"dev": true,
"requires": {
- "@typescript-eslint/scope-manager": "5.12.0",
- "@typescript-eslint/types": "5.12.0",
- "@typescript-eslint/typescript-estree": "5.12.0",
+ "@typescript-eslint/scope-manager": "5.14.0",
+ "@typescript-eslint/types": "5.14.0",
+ "@typescript-eslint/typescript-estree": "5.14.0",
"debug": "^4.3.2"
}
},
"@typescript-eslint/scope-manager": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.12.0.tgz",
- "integrity": "sha512-GAMobtIJI8FGf1sLlUWNUm2IOkIjvn7laFWyRx7CLrv6nLBI7su+B7lbStqVlK5NdLvHRFiJo2HhiDF7Ki01WQ==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.14.0.tgz",
+ "integrity": "sha512-LazdcMlGnv+xUc5R4qIlqH0OWARyl2kaP8pVCS39qSL3Pd1F7mI10DbdXeARcE62sVQE4fHNvEqMWsypWO+yEw==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.12.0",
- "@typescript-eslint/visitor-keys": "5.12.0"
+ "@typescript-eslint/types": "5.14.0",
+ "@typescript-eslint/visitor-keys": "5.14.0"
}
},
"@typescript-eslint/type-utils": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.12.0.tgz",
- "integrity": "sha512-9j9rli3zEBV+ae7rlbBOotJcI6zfc6SHFMdKI9M3Nc0sy458LJ79Os+TPWeBBL96J9/e36rdJOfCuyRSgFAA0Q==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.14.0.tgz",
+ "integrity": "sha512-d4PTJxsqaUpv8iERTDSQBKUCV7Q5yyXjqXUl3XF7Sd9ogNLuKLkxz82qxokqQ4jXdTPZudWpmNtr/JjbbvUixw==",
"dev": true,
"requires": {
- "@typescript-eslint/utils": "5.12.0",
+ "@typescript-eslint/utils": "5.14.0",
"debug": "^4.3.2",
"tsutils": "^3.21.0"
}
},
"@typescript-eslint/types": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.12.0.tgz",
- "integrity": "sha512-JowqbwPf93nvf8fZn5XrPGFBdIK8+yx5UEGs2QFAYFI8IWYfrzz+6zqlurGr2ctShMaJxqwsqmra3WXWjH1nRQ==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.14.0.tgz",
+ "integrity": "sha512-BR6Y9eE9360LNnW3eEUqAg6HxS9Q35kSIs4rp4vNHRdfg0s+/PgHgskvu5DFTM7G5VKAVjuyaN476LCPrdA7Mw==",
"dev": true
},
"@typescript-eslint/typescript-estree": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.0.tgz",
- "integrity": "sha512-Dd9gVeOqt38QHR0BEA8oRaT65WYqPYbIc5tRFQPkfLquVEFPD1HAtbZT98TLBkEcCkvwDYOAvuSvAD9DnQhMfQ==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.14.0.tgz",
+ "integrity": "sha512-QGnxvROrCVtLQ1724GLTHBTR0lZVu13izOp9njRvMkCBgWX26PKvmMP8k82nmXBRD3DQcFFq2oj3cKDwr0FaUA==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.12.0",
- "@typescript-eslint/visitor-keys": "5.12.0",
+ "@typescript-eslint/types": "5.14.0",
+ "@typescript-eslint/visitor-keys": "5.14.0",
"debug": "^4.3.2",
"globby": "^11.0.4",
"is-glob": "^4.0.3",
@@ -32790,26 +33048,26 @@
}
},
"@typescript-eslint/utils": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.12.0.tgz",
- "integrity": "sha512-k4J2WovnMPGI4PzKgDtQdNrCnmBHpMUFy21qjX2CoPdoBcSBIMvVBr9P2YDP8jOqZOeK3ThOL6VO/sy6jtnvzw==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.14.0.tgz",
+ "integrity": "sha512-EHwlII5mvUA0UsKYnVzySb/5EE/t03duUTweVy8Zqt3UQXBrpEVY144OTceFKaOe4xQXZJrkptCf7PjEBeGK4w==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.12.0",
- "@typescript-eslint/types": "5.12.0",
- "@typescript-eslint/typescript-estree": "5.12.0",
+ "@typescript-eslint/scope-manager": "5.14.0",
+ "@typescript-eslint/types": "5.14.0",
+ "@typescript-eslint/typescript-estree": "5.14.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
}
},
"@typescript-eslint/visitor-keys": {
- "version": "5.12.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.0.tgz",
- "integrity": "sha512-cFwTlgnMV6TgezQynx2c/4/tx9Tufbuo9LPzmWqyRC3QC4qTGkAG1C6pBr0/4I10PAI/FlYunI3vJjIcu+ZHMg==",
+ "version": "5.14.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.14.0.tgz",
+ "integrity": "sha512-yL0XxfzR94UEkjBqyymMLgCBdojzEuy/eim7N9/RIcTNxpJudAcqsU8eRyfzBbcEzGoPWfdM3AGak3cN08WOIw==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.12.0",
+ "@typescript-eslint/types": "5.14.0",
"eslint-visitor-keys": "^3.0.0"
}
},
@@ -33088,9 +33346,9 @@
}
},
"@vue/composition-api": {
- "version": "1.4.6",
- "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.4.6.tgz",
- "integrity": "sha512-UP359OJ0G0Zli603/i9fhXFmNtZUSrypSFyqClMxizp8ezlaMK2GCmHgy3qyrRnO/xjcDAx09vvXPwNFtxHPtQ==",
+ "version": "1.4.9",
+ "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.4.9.tgz",
+ "integrity": "sha512-l6YOeg5LEXmfPqyxAnBaCv1FMRw0OGKJ4m6nOWRm6ngt5TuHcj5ZoBRN+LXh3J0u6Ur3C4VA+RiKT+M0eItr/g==",
"devOptional": true,
"requires": {}
},
@@ -33151,19 +33409,30 @@
"integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==",
"dev": true
},
+ "@vue/test-utils": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.3.0.tgz",
+ "integrity": "sha512-Xk2Xiyj2k5dFb8eYUKkcN9PzqZSppTlx7LaQWBbdA8tqh3jHr/KHX2/YLhNFc/xwDrgeLybqd+4ZCPJSGPIqeA==",
+ "dev": true,
+ "requires": {
+ "dom-event-types": "^1.0.0",
+ "lodash": "^4.17.15",
+ "pretty": "^2.0.0"
+ }
+ },
"@vueuse/core": {
- "version": "7.6.2",
- "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-7.6.2.tgz",
- "integrity": "sha512-bjAbXJVJO6aElMaZtDz2B70C0L6jFk/jGVqJxWZS5huffxA6dW5DN6tQQJwzOnx9B9rDhePHJIFKsix0qZIH2Q==",
+ "version": "7.7.1",
+ "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-7.7.1.tgz",
+ "integrity": "sha512-PRRgbATMpoeUmkCEBtUeJgOwtew8s+4UsEd+Pm7MhkjL2ihCNrSqxNVtM6NFE4uP2sWnkGcZpCjPuNSxowJ1Ow==",
"requires": {
- "@vueuse/shared": "7.6.2",
+ "@vueuse/shared": "7.7.1",
"vue-demi": "*"
}
},
"@vueuse/shared": {
- "version": "7.6.2",
- "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-7.6.2.tgz",
- "integrity": "sha512-ThDld4Mx501tahRuHV6qJGkwCr17GknZrOzlD02Na9qJcH7Pq0quNTLx5cNDou7b1CKNvE3BXi2w/hz9KuPNTQ==",
+ "version": "7.7.1",
+ "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-7.7.1.tgz",
+ "integrity": "sha512-rN2qd22AUl7VdBxihagWyhUNHCyVk9IpvBTTfHoLH9G7rGE552X1f+zeCfehuno0zXif13jPw+icW/wn2a0rnQ==",
"requires": {
"vue-demi": "*"
}
@@ -33864,6 +34133,12 @@
"integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==",
"dev": true
},
+ "assertion-error": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+ "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+ "dev": true
+ },
"assign-symbols": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -34314,12 +34589,12 @@
}
},
"browserslist": {
- "version": "4.19.3",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz",
- "integrity": "sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==",
+ "version": "4.20.0",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.0.tgz",
+ "integrity": "sha512-bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ==",
"requires": {
- "caniuse-lite": "^1.0.30001312",
- "electron-to-chromium": "^1.4.71",
+ "caniuse-lite": "^1.0.30001313",
+ "electron-to-chromium": "^1.4.76",
"escalade": "^3.1.1",
"node-releases": "^2.0.2",
"picocolors": "^1.0.0"
@@ -34372,6 +34647,15 @@
"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
"integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
},
+ "builtins": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/builtins/-/builtins-4.0.0.tgz",
+ "integrity": "sha512-qC0E2Dxgou1IHhvJSLwGDSTvokbRovU5zZFuDY6oY8Y2lF3nGt5Ad8YZK7GMtqzY84Wu7pXTPeHQeHcXSXsRhw==",
+ "dev": true,
+ "requires": {
+ "semver": "^7.0.0"
+ }
+ },
"bundle-runner": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/bundle-runner/-/bundle-runner-0.0.1.tgz",
@@ -34395,9 +34679,9 @@
"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
},
"c12": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/c12/-/c12-0.1.3.tgz",
- "integrity": "sha512-Y5i83E2V0aOptFvm2aEAo1uxQc4F/OgdrhncxEcv6tbyU0n+wbX7e5A5U+fKBnriNdTmXLcjS811wR5FLnmwJw==",
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/c12/-/c12-0.1.4.tgz",
+ "integrity": "sha512-Pq6ZA3B6psp9VtNaSwja1jsnIcNuB9J5dJhGI9VbEnXzB7oKaH5C8PCGVNM570V/SNU30qshnqtycyuS8qDt8g==",
"dev": true,
"requires": {
"defu": "^5.0.1",
@@ -34593,9 +34877,24 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001312",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz",
- "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ=="
+ "version": "1.0.30001313",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001313.tgz",
+ "integrity": "sha512-rI1UN0koZUiKINjysQDuRi2VeSCce3bYJNmDcj3PIKREiAmjakugBul1QSkg/fPrlULYl6oWfGg3PbgOSY9X4Q=="
+ },
+ "chai": {
+ "version": "4.3.6",
+ "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz",
+ "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==",
+ "dev": true,
+ "requires": {
+ "assertion-error": "^1.1.0",
+ "check-error": "^1.0.2",
+ "deep-eql": "^3.0.1",
+ "get-func-name": "^2.0.0",
+ "loupe": "^2.3.1",
+ "pathval": "^1.1.1",
+ "type-detect": "^4.0.5"
+ }
},
"chalk": {
"version": "2.4.2",
@@ -34614,6 +34913,18 @@
}
}
},
+ "character-entities": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
+ "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
+ "dev": true
+ },
+ "character-entities-legacy": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
+ "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
+ "dev": true
+ },
"character-parser": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
@@ -34623,6 +34934,12 @@
"is-regex": "^1.0.3"
}
},
+ "character-reference-invalid": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
+ "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
+ "dev": true
+ },
"charcodes": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/charcodes/-/charcodes-0.2.0.tgz",
@@ -34633,6 +34950,12 @@
"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
"integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
},
+ "check-error": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+ "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+ "dev": true
+ },
"chokidar": {
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -35096,6 +35419,53 @@
}
}
},
+ "condense-newlines": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/condense-newlines/-/condense-newlines-0.2.1.tgz",
+ "integrity": "sha1-PemFVTE5R10yUCyDsC9gaE0kxV8=",
+ "dev": true,
+ "requires": {
+ "extend-shallow": "^2.0.1",
+ "is-whitespace": "^0.3.0",
+ "kind-of": "^3.0.2"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ },
+ "is-extendable": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+ "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+ "dev": true
+ },
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "^1.1.5"
+ }
+ }
+ }
+ },
+ "config-chain": {
+ "version": "1.1.13",
+ "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+ "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+ "dev": true,
+ "requires": {
+ "ini": "^1.3.4",
+ "proto-list": "~1.2.1"
+ }
+ },
"connect": {
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
@@ -35572,9 +35942,9 @@
"integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="
},
"cssdb": {
- "version": "6.3.1",
- "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-6.3.1.tgz",
- "integrity": "sha512-Ho3gIkGY4O8S3J54fHu7RP5GHWz85McDhimaXEwf7qV0MSPhLM0jdd61zqs1kkadIVDAvfqoku0kArbWaMYolw==",
+ "version": "6.4.1",
+ "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-6.4.1.tgz",
+ "integrity": "sha512-R70R/Q1fPlM1D6Y+Kpat0QjiY+aMsY2/8lekdVoYcJ7ZQs9kw71W78FdOMf8DFq975KHQf1089PNg1dLsbAhoA==",
"dev": true
},
"cssesc": {
@@ -35746,9 +36116,9 @@
}
},
"csstype": {
- "version": "2.6.19",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.19.tgz",
- "integrity": "sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ==",
+ "version": "2.6.20",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
+ "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==",
"dev": true
},
"cuint": {
@@ -35783,9 +36153,9 @@
"dev": true
},
"dayjs": {
- "version": "1.10.7",
- "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz",
- "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="
+ "version": "1.10.8",
+ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.8.tgz",
+ "integrity": "sha512-wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow=="
},
"de-indent": {
"version": "1.0.2",
@@ -35811,6 +36181,15 @@
"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
},
+ "deep-eql": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+ "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+ "dev": true,
+ "requires": {
+ "type-detect": "^4.0.0"
+ }
+ },
"deep-equal": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
@@ -35940,9 +36319,9 @@
"integrity": "sha512-Ev/sqS5AzzDwlpor/5wFCDu0dYMQu/0x2D6XfAsQ0E7uQmamIgYJ6Dppo2T2EOFVkeVYWjc+PCLKaqZZ57qmLg=="
},
"destroy": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.1.0.tgz",
- "integrity": "sha512-R5QZrOXxSs0JDUIU/VANvRJlQVMts9C0L76HToQdPdlftfZCE7W6dyH0G4GZ5UW9fRqUOhAoCE2aGekuu+3HjQ=="
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.1.1.tgz",
+ "integrity": "sha512-jxwFW+yrVOLdwqIWvowFOM8UPdhZnvOF6mhXQQLXMxBDLtv2JVJlVJPEwkDv9prqscEtGtmnxuuI6pQKStK1vA=="
},
"detect-file": {
"version": "1.0.0",
@@ -36037,6 +36416,12 @@
"utila": "~0.4"
}
},
+ "dom-event-types": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/dom-event-types/-/dom-event-types-1.1.0.tgz",
+ "integrity": "sha512-jNCX+uNJ3v38BKvPbpki6j5ItVlnSqVV6vDWGS6rExzCMjsc39frLjm1n91o6YaKK6AZl0wLloItW6C6mr61BQ==",
+ "dev": true
+ },
"dom-serializer": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
@@ -36183,15 +36568,51 @@
"object.defaults": "^1.1.0"
}
},
+ "editorconfig": {
+ "version": "0.15.3",
+ "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
+ "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
+ "dev": true,
+ "requires": {
+ "commander": "^2.19.0",
+ "lru-cache": "^4.1.5",
+ "semver": "^5.6.0",
+ "sigmund": "^1.0.1"
+ },
+ "dependencies": {
+ "lru-cache": {
+ "version": "4.1.5",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+ "dev": true,
+ "requires": {
+ "pseudomap": "^1.0.2",
+ "yallist": "^2.1.2"
+ }
+ },
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ },
+ "yallist": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+ "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+ "dev": true
+ }
+ }
+ },
"ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
},
"electron-to-chromium": {
- "version": "1.4.71",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz",
- "integrity": "sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw=="
+ "version": "1.4.76",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.76.tgz",
+ "integrity": "sha512-3Vftv7cenJtQb+k00McEBZ2vVmZ/x+HEF7pcZONZIkOsESqAqVuACmBxMv0JhzX7u0YltU0vSqRqgBSTAhFUjA=="
},
"elliptic": {
"version": "6.5.4",
@@ -36238,9 +36659,9 @@
}
},
"enhanced-resolve": {
- "version": "5.9.0",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.0.tgz",
- "integrity": "sha512-weDYmzbBygL7HzGGS26M3hGQx68vehdEg6VUmqSOaFzXExFqlnKuSvsEJCVGQHScS8CQMbrAqftT+AzzHNt/YA==",
+ "version": "5.9.2",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz",
+ "integrity": "sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==",
"dev": true,
"requires": {
"graceful-fs": "^4.2.4",
@@ -36359,162 +36780,37 @@
}
},
"esbuild": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.23.tgz",
- "integrity": "sha512-XjnIcZ9KB6lfonCa+jRguXyRYcldmkyZ99ieDksqW/C8bnyEX299yA4QH2XcgijCgaddEZePPTgvx/2imsq7Ig==",
- "dev": true,
- "requires": {
- "esbuild-android-arm64": "0.14.23",
- "esbuild-darwin-64": "0.14.23",
- "esbuild-darwin-arm64": "0.14.23",
- "esbuild-freebsd-64": "0.14.23",
- "esbuild-freebsd-arm64": "0.14.23",
- "esbuild-linux-32": "0.14.23",
- "esbuild-linux-64": "0.14.23",
- "esbuild-linux-arm": "0.14.23",
- "esbuild-linux-arm64": "0.14.23",
- "esbuild-linux-mips64le": "0.14.23",
- "esbuild-linux-ppc64le": "0.14.23",
- "esbuild-linux-riscv64": "0.14.23",
- "esbuild-linux-s390x": "0.14.23",
- "esbuild-netbsd-64": "0.14.23",
- "esbuild-openbsd-64": "0.14.23",
- "esbuild-sunos-64": "0.14.23",
- "esbuild-windows-32": "0.14.23",
- "esbuild-windows-64": "0.14.23",
- "esbuild-windows-arm64": "0.14.23"
- }
- },
- "esbuild-android-arm64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.23.tgz",
- "integrity": "sha512-k9sXem++mINrZty1v4FVt6nC5BQCFG4K2geCIUUqHNlTdFnuvcqsY7prcKZLFhqVC1rbcJAr9VSUGFL/vD4vsw==",
- "dev": true,
- "optional": true
+ "version": "0.14.25",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.25.tgz",
+ "integrity": "sha512-4JHEIOMNFvK09ziiL+iVmldIhLbn49V4NAVo888tcGFKedEZY/Y8YapfStJ6zSE23tzYPKxqKwQBnQoIO0BI/Q==",
+ "dev": true,
+ "requires": {
+ "esbuild-android-64": "0.14.25",
+ "esbuild-android-arm64": "0.14.25",
+ "esbuild-darwin-64": "0.14.25",
+ "esbuild-darwin-arm64": "0.14.25",
+ "esbuild-freebsd-64": "0.14.25",
+ "esbuild-freebsd-arm64": "0.14.25",
+ "esbuild-linux-32": "0.14.25",
+ "esbuild-linux-64": "0.14.25",
+ "esbuild-linux-arm": "0.14.25",
+ "esbuild-linux-arm64": "0.14.25",
+ "esbuild-linux-mips64le": "0.14.25",
+ "esbuild-linux-ppc64le": "0.14.25",
+ "esbuild-linux-riscv64": "0.14.25",
+ "esbuild-linux-s390x": "0.14.25",
+ "esbuild-netbsd-64": "0.14.25",
+ "esbuild-openbsd-64": "0.14.25",
+ "esbuild-sunos-64": "0.14.25",
+ "esbuild-windows-32": "0.14.25",
+ "esbuild-windows-64": "0.14.25",
+ "esbuild-windows-arm64": "0.14.25"
+ }
},
"esbuild-darwin-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.23.tgz",
- "integrity": "sha512-lB0XRbtOYYL1tLcYw8BoBaYsFYiR48RPrA0KfA/7RFTr4MV7Bwy/J4+7nLsVnv9FGuQummM3uJ93J3ptaTqFug==",
- "dev": true,
- "optional": true
- },
- "esbuild-darwin-arm64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.23.tgz",
- "integrity": "sha512-yat73Z/uJ5tRcfRiI4CCTv0FSnwErm3BJQeZAh+1tIP0TUNh6o+mXg338Zl5EKChD+YGp6PN+Dbhs7qa34RxSw==",
- "dev": true,
- "optional": true
- },
- "esbuild-freebsd-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.23.tgz",
- "integrity": "sha512-/1xiTjoLuQ+LlbfjJdKkX45qK/M7ARrbLmyf7x3JhyQGMjcxRYVR6Dw81uH3qlMHwT4cfLW4aEVBhP1aNV7VsA==",
- "dev": true,
- "optional": true
- },
- "esbuild-freebsd-arm64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.23.tgz",
- "integrity": "sha512-uyPqBU/Zcp6yEAZS4LKj5jEE0q2s4HmlMBIPzbW6cTunZ8cyvjG6YWpIZXb1KK3KTJDe62ltCrk3VzmWHp+iLg==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-32": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.23.tgz",
- "integrity": "sha512-37R/WMkQyUfNhbH7aJrr1uCjDVdnPeTHGeDhZPUNhfoHV0lQuZNCKuNnDvlH/u/nwIYZNdVvz1Igv5rY/zfrzQ==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.23.tgz",
- "integrity": "sha512-H0gztDP60qqr8zoFhAO64waoN5yBXkmYCElFklpd6LPoobtNGNnDe99xOQm28+fuD75YJ7GKHzp/MLCLhw2+vQ==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-arm": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.23.tgz",
- "integrity": "sha512-x64CEUxi8+EzOAIpCUeuni0bZfzPw/65r8tC5cy5zOq9dY7ysOi5EVQHnzaxS+1NmV+/RVRpmrzGw1QgY2Xpmw==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-arm64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.23.tgz",
- "integrity": "sha512-c4MLOIByNHR55n3KoYf9hYDfBRghMjOiHLaoYLhkQkIabb452RWi+HsNgB41sUpSlOAqfpqKPFNg7VrxL3UX9g==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-mips64le": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.23.tgz",
- "integrity": "sha512-kHKyKRIAedYhKug2EJpyJxOUj3VYuamOVA1pY7EimoFPzaF3NeY7e4cFBAISC/Av0/tiV0xlFCt9q0HJ68IBIw==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-ppc64le": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.23.tgz",
- "integrity": "sha512-7ilAiJEPuJJnJp/LiDO0oJm5ygbBPzhchJJh9HsHZzeqO+3PUzItXi+8PuicY08r0AaaOe25LA7sGJ0MzbfBag==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-riscv64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.23.tgz",
- "integrity": "sha512-fbL3ggK2wY0D8I5raPIMPhpCvODFE+Bhb5QGtNP3r5aUsRR6TQV+ZBXIaw84iyvKC8vlXiA4fWLGhghAd/h/Zg==",
- "dev": true,
- "optional": true
- },
- "esbuild-linux-s390x": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.23.tgz",
- "integrity": "sha512-GHMDCyfy7+FaNSO8RJ8KCFsnax8fLUsOrj9q5Gi2JmZMY0Zhp75keb5abTFCq2/Oy6KVcT0Dcbyo/bFb4rIFJA==",
- "dev": true,
- "optional": true
- },
- "esbuild-netbsd-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.23.tgz",
- "integrity": "sha512-ovk2EX+3rrO1M2lowJfgMb/JPN1VwVYrx0QPUyudxkxLYrWeBxDKQvc6ffO+kB4QlDyTfdtAURrVzu3JeNdA2g==",
- "dev": true,
- "optional": true
- },
- "esbuild-openbsd-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.23.tgz",
- "integrity": "sha512-uYYNqbVR+i7k8ojP/oIROAHO9lATLN7H2QeXKt2H310Fc8FJj4y3Wce6hx0VgnJ4k1JDrgbbiXM8rbEgQyg8KA==",
- "dev": true,
- "optional": true
- },
- "esbuild-sunos-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.23.tgz",
- "integrity": "sha512-hAzeBeET0+SbScknPzS2LBY6FVDpgE+CsHSpe6CEoR51PApdn2IB0SyJX7vGelXzlyrnorM4CAsRyb9Qev4h9g==",
- "dev": true,
- "optional": true
- },
- "esbuild-windows-32": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.23.tgz",
- "integrity": "sha512-Kttmi3JnohdaREbk6o9e25kieJR379TsEWF0l39PQVHXq3FR6sFKtVPgY8wk055o6IB+rllrzLnbqOw/UV60EA==",
- "dev": true,
- "optional": true
- },
- "esbuild-windows-64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.23.tgz",
- "integrity": "sha512-JtIT0t8ymkpl6YlmOl6zoSWL5cnCgyLaBdf/SiU/Eg3C13r0NbHZWNT/RDEMKK91Y6t79kTs3vyRcNZbfu5a8g==",
- "dev": true,
- "optional": true
- },
- "esbuild-windows-arm64": {
- "version": "0.14.23",
- "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.23.tgz",
- "integrity": "sha512-cTFaQqT2+ik9e4hePvYtRZQ3pqOvKDVNarzql0VFIzhc0tru/ZgdLoXd6epLiKT+SzoSce6V9YJ+nn6RCn6SHw==",
+ "version": "0.14.25",
+ "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.25.tgz",
+ "integrity": "sha512-TGp8tuudIxOyWd1+8aYPxQmC1ZQyvij/AfNBa35RubixD0zJ1vkKHVAzo0Zao1zcG6pNqiSyzfPto8vmg0s7oA==",
"dev": true,
"optional": true
},
@@ -36535,12 +36831,12 @@
"dev": true
},
"eslint": {
- "version": "8.9.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.9.0.tgz",
- "integrity": "sha512-PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q==",
+ "version": "8.10.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.10.0.tgz",
+ "integrity": "sha512-tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw==",
"dev": true,
"requires": {
- "@eslint/eslintrc": "^1.1.0",
+ "@eslint/eslintrc": "^1.2.0",
"@humanwhocodes/config-array": "^0.9.2",
"ajv": "^6.10.0",
"chalk": "^4.0.0",
@@ -36684,9 +36980,9 @@
}
},
"eslint-config-standard": {
- "version": "17.0.0-0",
- "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0-0.tgz",
- "integrity": "sha512-sf9udec8fkLTnH82SmhZQ3E31e4eJaMW09Mt9fbN3OccXFtvSSbGrltpQgGFVooGHoIdiMzDfp6ZNFd+I6Ob+w==",
+ "version": "17.0.0-1",
+ "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0-1.tgz",
+ "integrity": "sha512-aqRG58dqoBNfOLN+PsitasxmW+W9Os4oQrx081B16T4E4WogsSbpUL6hnKSnyv35sSRYA2XjBtKMOrUboL6jgw==",
"dev": true,
"requires": {}
},
@@ -36844,19 +37140,29 @@
"natural-compare": "^1.4.0"
}
},
+ "eslint-plugin-markdown": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-markdown/-/eslint-plugin-markdown-2.2.1.tgz",
+ "integrity": "sha512-FgWp4iyYvTFxPwfbxofTvXxgzPsDuSKHQy2S+a8Ve6savbujey+lgrFFbXQA0HPygISpRYWYBjooPzhYSF81iA==",
+ "dev": true,
+ "requires": {
+ "mdast-util-from-markdown": "^0.8.5"
+ }
+ },
"eslint-plugin-n": {
- "version": "14.0.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-14.0.0.tgz",
- "integrity": "sha512-mNwplPLsbaKhHyA0fa/cy8j+oF6bF6l81hzBTWa6JOvPcMNAuIogk2ih6d9tYvWYzyUG+7ZFeChqbzdFpg2QrQ==",
+ "version": "15.0.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.0.1.tgz",
+ "integrity": "sha512-w1vgnlS3Y3kd2Ye2YpQvWJppx6ViySIpBIcdlw1dBBaX3m1R/cdKHE3X2PWXhJdH88pmFy1a+04a6lMlo5D9EQ==",
"dev": true,
"requires": {
+ "builtins": "^4.0.0",
"eslint-plugin-es": "^4.1.0",
"eslint-utils": "^3.0.0",
"ignore": "^5.1.1",
"is-core-module": "^2.3.0",
"minimatch": "^3.0.4",
"resolve": "^1.10.1",
- "semver": "^6.1.0"
+ "semver": "^6.3.0"
},
"dependencies": {
"semver": {
@@ -36886,9 +37192,9 @@
"requires": {}
},
"eslint-plugin-react": {
- "version": "7.28.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz",
- "integrity": "sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw==",
+ "version": "7.29.3",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.29.3.tgz",
+ "integrity": "sha512-MzW6TuCnDOcta67CkpDyRfRsEVx9FNMDV8wZsDqe1luHPdGTrQIUaUXD27Ja3gHsdOIs/cXzNchWGlqm+qRVRg==",
"dev": true,
"requires": {
"array-includes": "^3.1.4",
@@ -36896,12 +37202,12 @@
"doctrine": "^2.1.0",
"estraverse": "^5.3.0",
"jsx-ast-utils": "^2.4.1 || ^3.0.0",
- "minimatch": "^3.0.4",
+ "minimatch": "^3.1.2",
"object.entries": "^1.1.5",
"object.fromentries": "^2.0.5",
"object.hasown": "^1.1.0",
"object.values": "^1.1.5",
- "prop-types": "^15.7.2",
+ "prop-types": "^15.8.1",
"resolve": "^2.0.0-next.3",
"semver": "^6.3.0",
"string.prototype.matchall": "^4.0.6"
@@ -36935,9 +37241,9 @@
}
},
"eslint-plugin-unicorn": {
- "version": "40.1.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-40.1.0.tgz",
- "integrity": "sha512-y5doK2DF9Sr5AqKEHbHxjFllJ167nKDRU01HDcWyv4Tnmaoe9iNxMrBnaybZvWZUaE3OC5Unu0lNIevYamloig==",
+ "version": "41.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-41.0.0.tgz",
+ "integrity": "sha512-xoJCaRc1uy5REg9DkVga1BkZV57jJxoqOcrU28QHZB89Lk5LdSqdVyTIt9JQVfHNKaiyJ7X+3iLlIn+VEHWEzA==",
"dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.15.7",
@@ -36957,9 +37263,9 @@
}
},
"eslint-plugin-vue": {
- "version": "8.4.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.4.1.tgz",
- "integrity": "sha512-nmWOhNmDx9TZ+yP9ZhezTkZUupSHsYA2TocRm+efPSXMOyFrVczVlaIuQcLBjCtI8CbkBiUQ3VcyQsjlIhDrhA==",
+ "version": "8.5.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.5.0.tgz",
+ "integrity": "sha512-i1uHCTAKOoEj12RDvdtONWrGzjFm/djkzqfhmQ0d6M/W8KM81mhswd/z+iTZ0jCpdUedW3YRgcVfQ37/J4zoYQ==",
"dev": true,
"requires": {
"eslint-utils": "^3.0.0",
@@ -36969,9 +37275,9 @@
}
},
"eslint-plugin-yml": {
- "version": "0.12.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-yml/-/eslint-plugin-yml-0.12.0.tgz",
- "integrity": "sha512-aS82M+diohZTusadiByzh/bKDrfi+Y6VBQkD3ym/7JH+KF9WUB9qKCizLfTaCACwtRrHpqaLz3G8GKmslshyiw==",
+ "version": "0.14.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-yml/-/eslint-plugin-yml-0.14.0.tgz",
+ "integrity": "sha512-+0+bBV/07txENbxfrHF9olGoLCHez64vmnOmjWOoLwmXOwfdaSRleBSPIi4nWQs7WwX8lm/fSLadOjbVEcsXQQ==",
"dev": true,
"requires": {
"debug": "^4.3.2",
@@ -37362,15 +37668,12 @@
}
},
"fancy-log": {
- "version": "1.3.3",
- "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
- "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz",
+ "integrity": "sha512-9CzxZbACXMUXW13tS0tI8XsGGmxWzO2DmYrGuBJOJ8k8q2K7hwfJA5qHjuPPe8wtsco33YR9wc+Rlr5wYFvhSA==",
"dev": true,
"requires": {
- "ansi-gray": "^0.1.1",
- "color-support": "^1.1.3",
- "parse-node-version": "^1.0.0",
- "time-stamp": "^1.0.0"
+ "color-support": "^1.1.3"
}
},
"fast-deep-equal": {
@@ -37669,16 +37972,16 @@
}
},
"firebase": {
- "version": "9.6.7",
- "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.6.7.tgz",
- "integrity": "sha512-WiqGC26cepwVy0CZ4n3ZrLSNpVj1RCPJTB6j1tZU4SadPOrGmuPAt71qcWwaLyqKtRzNTyOA9F5J4ygGDplchw==",
+ "version": "9.6.8",
+ "resolved": "https://registry.npmjs.org/firebase/-/firebase-9.6.8.tgz",
+ "integrity": "sha512-a/RcgiqK9L5d/ZKpHZ21c3x/KKIo2XwXp2droukbBTuaX0Md8ppHQWYlSqLmWIDR0y2zwN17lrfNVsE6f+4ncA==",
"requires": {
"@firebase/analytics": "0.7.5",
"@firebase/analytics-compat": "0.1.6",
- "@firebase/app": "0.7.17",
+ "@firebase/app": "0.7.18",
"@firebase/app-check": "0.5.3",
"@firebase/app-check-compat": "0.2.3",
- "@firebase/app-compat": "0.1.18",
+ "@firebase/app-compat": "0.1.19",
"@firebase/app-types": "0.7.0",
"@firebase/auth": "0.19.9",
"@firebase/auth-compat": "0.2.9",
@@ -37689,8 +37992,8 @@
"@firebase/functions": "0.7.8",
"@firebase/functions-compat": "0.1.9",
"@firebase/installations": "0.5.5",
- "@firebase/messaging": "0.9.8",
- "@firebase/messaging-compat": "0.1.8",
+ "@firebase/messaging": "0.9.9",
+ "@firebase/messaging-compat": "0.1.9",
"@firebase/performance": "0.5.5",
"@firebase/performance-compat": "0.1.5",
"@firebase/polyfill": "0.3.36",
@@ -37801,9 +38104,9 @@
}
},
"fraction.js": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.3.tgz",
- "integrity": "sha512-pUHWWt6vHzZZiQJcM6S/0PXfS+g6FM4BF5rj9wZyreivhQPdsh5PpE25VtSNxq80wHS5RfY51Ii+8Z0Zl/pmzg==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
+ "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
"dev": true
},
"fragment-cache": {
@@ -37859,9 +38162,9 @@
"dev": true
},
"fs-extra": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
- "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+ "version": "10.0.1",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
+ "integrity": "sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==",
"requires": {
"graceful-fs": "^4.2.0",
"jsonfile": "^6.0.1",
@@ -38052,6 +38355,12 @@
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
},
+ "get-func-name": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+ "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+ "dev": true
+ },
"get-intrinsic": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
@@ -38063,9 +38372,9 @@
}
},
"get-port-please": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/get-port-please/-/get-port-please-2.3.0.tgz",
- "integrity": "sha512-zO6ST8v7jBO+uSnm0vaQuZEpdr7DgY9iMgoMLUC+Zfz31HYoDiiQrL78oZspaAryT6NH903Bwk+mYxiCy3X/RQ==",
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/get-port-please/-/get-port-please-2.4.3.tgz",
+ "integrity": "sha512-l5zVrG3mzz+I7MfbPwyJJ4xZKIdQfARpOtsBjUDUZ0iXlF0IXc1wMBg3Jb7G1te7tRzjOxu+MRLpvgxxTdCkwg==",
"requires": {
"fs-memo": "^1.2.0"
}
@@ -38806,6 +39115,18 @@
"wrap-ansi": "^2.0.0"
}
},
+ "fancy-log": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+ "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+ "dev": true,
+ "requires": {
+ "ansi-gray": "^0.1.1",
+ "color-support": "^1.1.3",
+ "parse-node-version": "^1.0.0",
+ "time-stamp": "^1.0.0"
+ }
+ },
"find-up": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
@@ -38980,6 +39301,18 @@
"integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
"dev": true
},
+ "fancy-log": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+ "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+ "dev": true,
+ "requires": {
+ "ansi-gray": "^0.1.1",
+ "color-support": "^1.1.3",
+ "parse-node-version": "^1.0.0",
+ "time-stamp": "^1.0.0"
+ }
+ },
"node-notifier": {
"version": "9.0.1",
"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-9.0.1.tgz",
@@ -39070,6 +39403,18 @@
"kind-of": "^1.1.0"
}
},
+ "fancy-log": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
+ "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+ "dev": true,
+ "requires": {
+ "ansi-gray": "^0.1.1",
+ "color-support": "^1.1.3",
+ "parse-node-version": "^1.0.0",
+ "time-stamp": "^1.0.0"
+ }
+ },
"kind-of": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
@@ -39313,9 +39658,9 @@
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
},
"has-symbols": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
- "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
},
"has-tostringtag": {
"version": "1.0.0",
@@ -39628,9 +39973,9 @@
}
},
"http-parser-js": {
- "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=="
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz",
+ "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA=="
},
"http-proxy": {
"version": "1.18.1",
@@ -39954,6 +40299,22 @@
"kind-of": "^6.0.0"
}
},
+ "is-alphabetical": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
+ "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
+ "dev": true
+ },
+ "is-alphanumerical": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
+ "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
+ "dev": true,
+ "requires": {
+ "is-alphabetical": "^1.0.0",
+ "is-decimal": "^1.0.0"
+ }
+ },
"is-arguments": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
@@ -40050,6 +40411,12 @@
"has-tostringtag": "^1.0.0"
}
},
+ "is-decimal": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
+ "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
+ "dev": true
+ },
"is-descriptor": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
@@ -40123,6 +40490,12 @@
"is-extglob": "^2.1.1"
}
},
+ "is-hexadecimal": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
+ "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
+ "dev": true
+ },
"is-https": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/is-https/-/is-https-4.0.0.tgz",
@@ -40308,6 +40681,12 @@
"call-bind": "^1.0.2"
}
},
+ "is-whitespace": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz",
+ "integrity": "sha1-Fjnssb4DauxppUy7QBz77XEUq38=",
+ "dev": true
+ },
"is-windows": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -40373,6 +40752,18 @@
"resolved": "https://registry.npmjs.org/jiti/-/jiti-1.13.0.tgz",
"integrity": "sha512-/n9mNxZj/HDSrincJ6RP+L+yXbpnB8FybySBa+IjIaoH9FIxBbrbRT5XUbe8R7zuVM2AQqNMNDDqz0bzx3znOQ=="
},
+ "js-beautify": {
+ "version": "1.14.0",
+ "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.0.tgz",
+ "integrity": "sha512-yuck9KirNSCAwyNJbqW+BxJqJ0NLJ4PwBUzQQACl5O3qHMBXVkXb/rD0ilh/Lat/tn88zSZ+CAHOlk0DsY7GuQ==",
+ "dev": true,
+ "requires": {
+ "config-chain": "^1.1.12",
+ "editorconfig": "^0.15.3",
+ "glob": "^7.1.3",
+ "nopt": "^5.0.0"
+ }
+ },
"js-cookie": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
@@ -40853,6 +41244,12 @@
"json5": "^2.1.2"
}
},
+ "local-pkg": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.1.tgz",
+ "integrity": "sha512-lL87ytIGP2FU5PWwNDo0w3WhIo2gopIAxPg9RxDYF7m4rr5ahuZxP22xnJHIvaLTe4Z9P6uKKY2UHiwyB4pcrw==",
+ "dev": true
+ },
"localforage": {
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
@@ -41008,6 +41405,15 @@
"js-tokens": "^3.0.0 || ^4.0.0"
}
},
+ "loupe": {
+ "version": "2.3.4",
+ "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
+ "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==",
+ "dev": true,
+ "requires": {
+ "get-func-name": "^2.0.0"
+ }
+ },
"lower-case": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
@@ -41022,12 +41428,12 @@
}
},
"magic-string": {
- "version": "0.25.7",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
- "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+ "version": "0.25.9",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+ "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
"dev": true,
"requires": {
- "sourcemap-codec": "^1.4.4"
+ "sourcemap-codec": "^1.4.8"
}
},
"make-dir": {
@@ -41221,6 +41627,25 @@
"safe-buffer": "^5.1.2"
}
},
+ "mdast-util-from-markdown": {
+ "version": "0.8.5",
+ "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
+ "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
+ "dev": true,
+ "requires": {
+ "@types/mdast": "^3.0.0",
+ "mdast-util-to-string": "^2.0.0",
+ "micromark": "~2.11.0",
+ "parse-entities": "^2.0.0",
+ "unist-util-stringify-position": "^2.0.0"
+ }
+ },
+ "mdast-util-to-string": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
+ "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
+ "dev": true
+ },
"mdn-data": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
@@ -41304,6 +41729,16 @@
"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
"dev": true
},
+ "micromark": {
+ "version": "2.11.4",
+ "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
+ "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
+ "dev": true,
+ "requires": {
+ "debug": "^4.0.0",
+ "parse-entities": "^2.0.0"
+ }
+ },
"micromatch": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
@@ -41336,9 +41771,9 @@
"dev": true
},
"mime-db": {
- "version": "1.51.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
- "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
+ "version": "1.52.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
},
"mime-types": {
"version": "2.1.34",
@@ -41346,6 +41781,13 @@
"integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
"requires": {
"mime-db": "1.51.0"
+ },
+ "dependencies": {
+ "mime-db": {
+ "version": "1.51.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+ "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
+ }
}
},
"mimic-fn": {
@@ -41678,9 +42120,9 @@
"dev": true
},
"node-fetch": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.0.tgz",
- "integrity": "sha512-8xeimMwMItMw8hRrOl3C9/xzU49HV/yE6ORew/l+dxWimO5A4Ra8ld2rerlJvc/O7et5Z1zrWsPX43v1QBjCxw==",
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.2.tgz",
+ "integrity": "sha512-Cwhq1JFIoon15wcIkFzubVNFE5GvXGV82pKf4knXXjvGmn7RJKcypeuqcVNZMGDZsAFWyIRya/anwAJr7TWJ7w==",
"dev": true,
"requires": {
"data-uri-to-buffer": "^4.0.0",
@@ -42167,9 +42609,9 @@
"dev": true
},
"nuxi": {
- "version": "npm:[email protected]",
- "resolved": "https://registry.npmjs.org/nuxi-edge/-/nuxi-edge-3.0.0-27420403.16e2a54.tgz",
- "integrity": "sha512-R2zYTsJDkZKS8KkoZopYTXvgyBcdqTt1qM3+e4GI+Vd7AMnrVNVS3CXthsYxo+GnSuDmXOoww7Gp1abx/tSMUw==",
+ "version": "npm:[email protected]",
+ "resolved": "https://registry.npmjs.org/nuxi-edge/-/nuxi-edge-3.0.0-27444434.856c01a.tgz",
+ "integrity": "sha512-NMi+6Qb2hegNBHLKnUvw39hgB+KQG28tfKhgvDCaX+1YDl1bRgbnJbcsXjIEipXlfb9CjBlbwskZzmZiddZ6Xw==",
"dev": true,
"requires": {
"fsevents": "~2.3.2"
@@ -42477,18 +42919,18 @@
}
},
"ora": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/ora/-/ora-6.0.1.tgz",
- "integrity": "sha512-TDdKkKHdWE6jo/6pIa5U5AWcSVfpNRFJ8sdRJpioGNVPLAzZzHs/N+QhUfF7ZbyoC+rnDuNTKzeDJUbAza9g4g==",
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/ora/-/ora-6.1.0.tgz",
+ "integrity": "sha512-CxEP6845hLK+NHFWZ+LplGO4zfw4QSfxTlqMfvlJ988GoiUeZDMzCvqsZkFHv69sPICmJH1MDxZoQFOKXerAVw==",
"dev": true,
"requires": {
"bl": "^5.0.0",
- "chalk": "^4.1.2",
+ "chalk": "^5.0.0",
"cli-cursor": "^4.0.0",
- "cli-spinners": "^2.6.0",
+ "cli-spinners": "^2.6.1",
"is-interactive": "^2.0.0",
"is-unicode-supported": "^1.1.0",
- "log-symbols": "^5.0.0",
+ "log-symbols": "^5.1.0",
"strip-ansi": "^7.0.1",
"wcwidth": "^1.0.1"
},
@@ -42499,24 +42941,11 @@
"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
"dev": true
},
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
"chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dev": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.0.tgz",
+ "integrity": "sha512-/duVOqst+luxCQRKEo4bNxinsOQtMP80ZYm7mMqzuh5PociNL0PvmHFvREJ9ueYL2TxlHjBcmLCdmocx9Vg+IQ==",
+ "dev": true
},
"cli-cursor": {
"version": "4.0.0",
@@ -42527,27 +42956,6 @@
"restore-cursor": "^4.0.0"
}
},
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true
- },
"restore-cursor": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz",
@@ -42566,15 +42974,6 @@
"requires": {
"ansi-regex": "^6.0.1"
}
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
}
}
},
@@ -42754,6 +43153,20 @@
"safe-buffer": "^5.1.1"
}
},
+ "parse-entities": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
+ "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
+ "dev": true,
+ "requires": {
+ "character-entities": "^1.0.0",
+ "character-entities-legacy": "^1.0.0",
+ "character-reference-invalid": "^1.0.0",
+ "is-alphanumerical": "^1.0.0",
+ "is-decimal": "^1.0.0",
+ "is-hexadecimal": "^1.0.0"
+ }
+ },
"parse-filepath": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
@@ -42943,6 +43356,12 @@
"integrity": "sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw==",
"dev": true
},
+ "pathval": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+ "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+ "dev": true
+ },
"pbkdf2": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
@@ -43126,11 +43545,11 @@
"integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
},
"postcss": {
- "version": "8.4.6",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz",
- "integrity": "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==",
+ "version": "8.4.8",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.8.tgz",
+ "integrity": "sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==",
"requires": {
- "nanoid": "^3.2.0",
+ "nanoid": "^3.3.1",
"picocolors": "^1.0.0",
"source-map-js": "^1.0.2"
}
@@ -43175,15 +43594,6 @@
}
}
},
- "postcss-clamp": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.0.0.tgz",
- "integrity": "sha512-FsMmeBZtymFN7Jtlnw9is8I4nB+qEEb/qS0ZLTIqcKiwZyHBq44Yhv29Q+VQsTGHYFqIr/s/9tqvNM7j+j1d+g==",
- "dev": true,
- "requires": {
- "postcss-value-parser": "^4.2.0"
- }
- },
"postcss-color-functional-notation": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.2.tgz",
@@ -43497,9 +43907,9 @@
}
},
"postcss-double-position-gradients": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.0.tgz",
- "integrity": "sha512-oz73I08yMN3oxjj0s8mED1rG+uOYoK3H8N9RjQofyg52KBRNmePJKg3fVwTpL2U5ZFbCzXoZBsUD/CvZdlqE4Q==",
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.1.tgz",
+ "integrity": "sha512-jM+CGkTs4FcG53sMPjrrGE0rIvLDdCrqMzgDC5fLI7JHDO7o6QG8C5TQBtExb13hdBdoH9C2QVbG4jo2y9lErQ==",
"dev": true,
"requires": {
"@csstools/postcss-progressive-custom-properties": "^1.1.0",
@@ -43974,12 +44384,12 @@
}
},
"postcss-nesting": {
- "version": "10.1.2",
- "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.2.tgz",
- "integrity": "sha512-dJGmgmsvpzKoVMtDMQQG/T6FSqs6kDtUDirIfl4KnjMCiY9/ETX8jdKyCd20swSRAbUYkaBKV20pxkzxoOXLqQ==",
+ "version": "10.1.3",
+ "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.3.tgz",
+ "integrity": "sha512-wUC+/YCik4wH3StsbC5fBG1s2Z3ZV74vjGqBFYtmYKlVxoio5TYGM06AiaKkQPPlkXWn72HKfS7Cw5PYxnoXSw==",
"dev": true,
"requires": {
- "postcss-selector-parser": "^6.0.8"
+ "postcss-selector-parser": "^6.0.9"
}
},
"postcss-normalize-charset": {
@@ -44372,9 +44782,9 @@
}
},
"postcss-preset-env": {
- "version": "7.4.1",
- "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.4.1.tgz",
- "integrity": "sha512-UvBVvPJ2vb4odAtckSbryndyBz+Me1q8wawqq0qznpDXy188I+8W5Sa929sCPqw2/NSYnqpHJbo41BKso3+I9A==",
+ "version": "7.4.2",
+ "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.4.2.tgz",
+ "integrity": "sha512-AmOkb8AeNNQwE/z2fHl1iwOIt8J50V8WR0rmLagcgIDoqlJZWjV3NdtOPnLGco1oN8DZe+Ss5B9ULbBeS6HfeA==",
"dev": true,
"requires": {
"@csstools/postcss-color-function": "^1.0.2",
@@ -44386,13 +44796,12 @@
"@csstools/postcss-oklab-function": "^1.0.1",
"@csstools/postcss-progressive-custom-properties": "^1.2.0",
"autoprefixer": "^10.4.2",
- "browserslist": "^4.19.1",
+ "browserslist": "^4.19.3",
"css-blank-pseudo": "^3.0.3",
"css-has-pseudo": "^3.0.4",
"css-prefers-color-scheme": "^6.0.3",
- "cssdb": "^6.3.1",
+ "cssdb": "^6.4.0",
"postcss-attribute-case-insensitive": "^5.0.0",
- "postcss-clamp": "^4.0.0",
"postcss-color-functional-notation": "^4.2.2",
"postcss-color-hex-alpha": "^8.0.3",
"postcss-color-rebeccapurple": "^7.0.2",
@@ -44418,7 +44827,8 @@
"postcss-place": "^7.0.4",
"postcss-pseudo-class-any-link": "^7.1.1",
"postcss-replace-overflow-wrap": "^4.0.0",
- "postcss-selector-not": "^5.0.0"
+ "postcss-selector-not": "^5.0.0",
+ "postcss-value-parser": "^4.2.0"
}
},
"postcss-pseudo-class-any-link": {
@@ -44682,6 +45092,34 @@
"integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
"devOptional": true
},
+ "pretty": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz",
+ "integrity": "sha1-rbx5YLe7/iiaVX3F9zdhmiINBqU=",
+ "dev": true,
+ "requires": {
+ "condense-newlines": "^0.2.1",
+ "extend-shallow": "^2.0.1",
+ "js-beautify": "^1.6.12"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ },
+ "is-extendable": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+ "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+ "dev": true
+ }
+ }
+ },
"pretty-bytes": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz",
@@ -44764,6 +45202,12 @@
"signal-exit": "^3.0.2"
}
},
+ "proto-list": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+ "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
+ "dev": true
+ },
"protobufjs": {
"version": "6.11.2",
"resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.2.tgz",
@@ -44785,9 +45229,9 @@
},
"dependencies": {
"@types/node": {
- "version": "17.0.18",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz",
- "integrity": "sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA=="
+ "version": "17.0.21",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz",
+ "integrity": "sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="
}
}
},
@@ -45599,9 +46043,9 @@
}
},
"yargs-parser": {
- "version": "21.0.0",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz",
- "integrity": "sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==",
+ "version": "21.0.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
+ "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
"dev": true
}
}
@@ -45756,9 +46200,9 @@
}
},
"rollup": {
- "version": "2.67.3",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.67.3.tgz",
- "integrity": "sha512-G/x1vUwbGtP6O5ZM8/sWr8+p7YfZhI18pPqMRtMYMWSbHjKZ/ajHGiM+GWNTlWyOR0EHIdT8LHU+Z4ciIZ1oBw==",
+ "version": "2.70.0",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.70.0.tgz",
+ "integrity": "sha512-iEzYw+syFxQ0X9RefVwhr8BA2TNJsTaX8L8dhyeyMECDbmiba+8UQzcu+xZdji0+JQ+s7kouQnw+9Oz5M19XKA==",
"dev": true,
"requires": {
"fsevents": "~2.3.2"
@@ -45792,11 +46236,12 @@
"dev": true
},
"terser": {
- "version": "5.10.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
- "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
+ "version": "5.12.0",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz",
+ "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
"dev": true,
"requires": {
+ "acorn": "^8.5.0",
"commander": "^2.20.0",
"source-map": "~0.7.2",
"source-map-support": "~0.5.20"
@@ -45805,9 +46250,9 @@
}
},
"rollup-plugin-visualizer": {
- "version": "5.5.4",
- "resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.5.4.tgz",
- "integrity": "sha512-CJQFUuZ75S1daGEkk62UH7lL6UFCoP86Sn/iz4gXBdamdwFeD5nPGCHHXfXCrly/wNgQOYTH7cdcxk4+OG3Xjw==",
+ "version": "5.6.0",
+ "resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.6.0.tgz",
+ "integrity": "sha512-CKcc8GTUZjC+LsMytU8ocRr/cGZIfMR7+mdy4YnlyetlmIl/dM8BMnOEpD4JPIGt+ZVW7Db9ZtSsbgyeBH3uTA==",
"dev": true,
"requires": {
"nanoid": "^3.1.32",
@@ -45838,9 +46283,9 @@
}
},
"yargs-parser": {
- "version": "21.0.0",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz",
- "integrity": "sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==",
+ "version": "21.0.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
+ "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
"dev": true
}
}
@@ -46265,6 +46710,12 @@
"object-inspect": "^1.9.0"
}
},
+ "sigmund": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+ "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+ "dev": true
+ },
"signal-exit": {
"version": "3.0.7",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -47472,10 +47923,11 @@
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
},
"terser": {
- "version": "5.10.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz",
- "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==",
+ "version": "5.12.0",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.12.0.tgz",
+ "integrity": "sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==",
"requires": {
+ "acorn": "^8.5.0",
"commander": "^2.20.0",
"source-map": "~0.7.2",
"source-map-support": "~0.5.20"
@@ -47593,6 +48045,18 @@
"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
},
+ "tinypool": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.1.2.tgz",
+ "integrity": "sha512-fvtYGXoui2RpeMILfkvGIgOVkzJEGediv8UJt7TxdAOY8pnvUkFg/fkvqTfXG9Acc9S17Cnn1S4osDc2164guA==",
+ "dev": true
+ },
+ "tinyspy": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-0.3.0.tgz",
+ "integrity": "sha512-c5uFHqtUp74R2DJE3/Efg0mH5xicmgziaQXMm/LvuuZn3RdpADH32aEGDRyCzObXT1DNfwDMqRQ/Drh1MlO12g==",
+ "dev": true
+ },
"tmp": {
"version": "0.0.33",
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -47740,9 +48204,9 @@
"integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw=="
},
"tsconfig-paths": {
- "version": "3.12.0",
- "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz",
- "integrity": "sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==",
+ "version": "3.13.0",
+ "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.13.0.tgz",
+ "integrity": "sha512-nWuffZppoaYK0vQ1SQmkSsQzJoHA4s6uzdb2waRpD806x9yfq153AdVsWz4je2qZcW+pENrMQXbGQ3sMCkXuhw==",
"dev": true,
"requires": {
"@types/json5": "^0.0.29",
@@ -47810,10 +48274,16 @@
"prelude-ls": "^1.2.1"
}
},
+ "type-detect": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+ "dev": true
+ },
"type-fest": {
- "version": "2.11.2",
- "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.11.2.tgz",
- "integrity": "sha512-reW2Y2Mpn0QNA/5fvtm5doROLwDPu2zOm5RtY7xQQS05Q7xgC8MOZ3yPNaP9m/s/sNjjFQtHo7VCNqYW2iI+Ig==",
+ "version": "2.12.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.12.0.tgz",
+ "integrity": "sha512-Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA==",
"dev": true
},
"type-is": {
@@ -47832,9 +48302,9 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
},
"typescript": {
- "version": "4.5.5",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz",
- "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==",
+ "version": "4.6.2",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz",
+ "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==",
"dev": true
},
"ua-parser-js": {
@@ -47843,14 +48313,14 @@
"integrity": "sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg=="
},
"ufo": {
- "version": "0.7.10",
- "resolved": "https://registry.npmjs.org/ufo/-/ufo-0.7.10.tgz",
- "integrity": "sha512-YTnDRlE1cIofRqOFN8ioAbz9qenDvkgVMSn0cnxvIDjM9sfEOMKB0ybMr+otSlCXMfQ/X35haYRoI7Nua82RrA=="
+ "version": "0.7.11",
+ "resolved": "https://registry.npmjs.org/ufo/-/ufo-0.7.11.tgz",
+ "integrity": "sha512-IT3q0lPvtkqQ8toHQN/BkOi4VIqoqheqM1FnkNWT9y0G8B3xJhwnoKBu5OHx8zHDOvveQzfKuFowJ0VSARiIDg=="
},
"uglify-js": {
- "version": "3.15.1",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz",
- "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="
+ "version": "3.15.2",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.2.tgz",
+ "integrity": "sha512-peeoTk3hSwYdoc9nrdiEJk+gx1ALCtTjdYuKSXMTDqq7n1W7dHPqWDdSi+BPL0ni2YMeHD7hKUSdbj3TZauY2A=="
},
"unbox-primitive": {
"version": "1.0.1",
@@ -47908,9 +48378,9 @@
"dev": true
},
"undici": {
- "version": "4.14.1",
- "resolved": "https://registry.npmjs.org/undici/-/undici-4.14.1.tgz",
- "integrity": "sha512-WJ+g+XqiZcATcBaUeluCajqy4pEDcQfK1vy+Fo+bC4/mqXI9IIQD/XWHLS70fkGUT6P52Drm7IFslO651OdLPQ==",
+ "version": "4.15.1",
+ "resolved": "https://registry.npmjs.org/undici/-/undici-4.15.1.tgz",
+ "integrity": "sha512-h8LJybhMKD09IyQZoQadNtIR/GmugVhTOVREunJrpV6RStriKBFdSVoFzEzTihwXi/27DIBO+Z0OGF+Mzfi0lA==",
"dev": true
},
"unenv": {
@@ -48031,6 +48501,15 @@
"through2-filter": "^3.0.0"
}
},
+ "unist-util-stringify-position": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
+ "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
+ "dev": true,
+ "requires": {
+ "@types/unist": "^2.0.2"
+ }
+ },
"universalify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -48042,65 +48521,34 @@
"integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
},
"unplugin": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-0.3.2.tgz",
- "integrity": "sha512-5d0DMYNKZU+S9eZUiBfw6Co32eRg8myUgBPoWSqG/wDFCUE/WznfSsJnZWi1P9l69x4uLJqt2qVq1xW/AsXFrw==",
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-0.3.3.tgz",
+ "integrity": "sha512-WjZWpUqqcYPQ/efR00Zm2m1+J1LitwoZ4uhHV4VdZ+IpW0Nh/qnDYtVf+nLhozXdGxslMPecOshVR7NiWFl4gA==",
"dev": true,
"requires": {
"webpack-virtual-modules": "^0.4.3"
}
},
"unplugin-vue2-script-setup": {
- "version": "0.9.3",
- "resolved": "https://registry.npmjs.org/unplugin-vue2-script-setup/-/unplugin-vue2-script-setup-0.9.3.tgz",
- "integrity": "sha512-m2QESHiFNmx0fIo/P0AiCrH6E5WtijRB/Ldrj8zjwRIYYbiOgmTfRmWQquW0H8ei5OwhYT30WAgepFjWrJ5oJg==",
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/unplugin-vue2-script-setup/-/unplugin-vue2-script-setup-0.10.0.tgz",
+ "integrity": "sha512-Zra5vrlHkpzC9vITP5e0EbtVq2MfbaaDoBG8Gx1GDkpUuLJ3Sohnj4523v9KlOH4DSqInESGamzEVPUjFFBNyA==",
"dev": true,
"requires": {
- "@antfu/utils": "^0.4.0",
- "@babel/core": "^7.16.7",
- "@babel/generator": "^7.16.8",
- "@babel/parser": "^7.16.8",
- "@babel/traverse": "^7.16.8",
- "@babel/types": "^7.16.8",
+ "@antfu/utils": "^0.5.0",
+ "@babel/core": "^7.17.5",
+ "@babel/generator": "^7.17.3",
+ "@babel/parser": "^7.17.3",
+ "@babel/traverse": "^7.17.3",
+ "@babel/types": "^7.17.0",
"@rollup/pluginutils": "^4.1.2",
- "@vue/compiler-core": "^3.2.26",
- "@vue/compiler-dom": "^3.2.26",
- "@vue/reactivity-transform": "^3.2.26",
- "@vue/shared": "^3.2.26",
- "defu": "^5.0.0",
- "htmlparser2": "5.0.1",
+ "@vue/compiler-core": "^3.2.31",
+ "@vue/compiler-dom": "^3.2.31",
+ "@vue/reactivity-transform": "^3.2.31",
+ "@vue/shared": "^3.2.31",
+ "defu": "^5.0.1",
"magic-string": "^0.25.7",
- "tslib": "^2.3.1",
- "unplugin": "^0.3.0"
- },
- "dependencies": {
- "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"
- }
- },
- "entities": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
- "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
- "dev": true
- },
- "htmlparser2": {
- "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": "^3.3.0",
- "domutils": "^2.4.2",
- "entities": "^2.0.0"
- }
- }
+ "unplugin": "^0.3.2"
}
},
"unquote": {
@@ -48464,9 +48912,9 @@
}
},
"vite": {
- "version": "2.8.4",
- "resolved": "https://registry.npmjs.org/vite/-/vite-2.8.4.tgz",
- "integrity": "sha512-GwtOkkaT2LDI82uWZKcrpRQxP5tymLnC7hVHHqNkhFNknYr0hJUlDLfhVRgngJvAy3RwypkDCWtTKn1BjO96Dw==",
+ "version": "2.8.6",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-2.8.6.tgz",
+ "integrity": "sha512-e4H0QpludOVKkmOsRyqQ7LTcMUDF3mcgyNU4lmi0B5JUbe0ZxeBBl8VoZ8Y6Rfn9eFKYtdXNPcYK97ZwH+K2ug==",
"dev": true,
"requires": {
"esbuild": "^0.14.14",
@@ -48524,6 +48972,21 @@
}
}
},
+ "vitest": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.6.0.tgz",
+ "integrity": "sha512-FuIkLHCQxz6rO35MQROUtVdwcBaYnt198YpPGIrJXmuNHGolfPbrZIiwpD7bek0OiETxuphK3+KR5oJ5Qi1g5A==",
+ "dev": true,
+ "requires": {
+ "@types/chai": "^4.3.0",
+ "@types/chai-subset": "^1.3.3",
+ "chai": "^4.3.6",
+ "local-pkg": "^0.4.1",
+ "tinypool": "^0.1.2",
+ "tinyspy": "^0.3.0",
+ "vite": "^2.7.10"
+ }
+ },
"vm-browserify": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
@@ -48561,9 +49024,9 @@
"requires": {}
},
"vue-eslint-parser": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.2.0.tgz",
- "integrity": "sha512-hvl8OVT8imlKk/lQyhkshqwQQChzHETcBd5abiO4ePw7ib7QUZLfW+2TUrJHKUvFOCFRJrDin5KJO9OHzB5bRQ==",
+ "version": "8.3.0",
+ "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz",
+ "integrity": "sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==",
"dev": true,
"requires": {
"debug": "^4.3.2",
diff --git a/package.json b/package.json
index bf4aee9f..e8d2ba3b 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,11 @@
{
"name": "finapp",
- "version": "3.4.0",
+ "version": "3.5.0",
"scripts": {
"dev": "cross-env NUXT_HOST=0.0.0.0 PORT=3010 nuxi dev",
"build": "nuxi generate",
"start": "nuxi preview",
+ "test": "vitest",
"deploy": "npm run build && firebase deploy",
"build-upload-all": "npm run build && npm run upload-all",
"build-upload-min": "npm run build && npm run upload-min",
@@ -14,12 +15,12 @@
"dependencies": {
"@nuxtjs/i18n": "^7.2.0",
"@simonwep/pickr": "1.8.2",
- "@vueuse/core": "^7.6.2",
+ "@vueuse/core": "^7.7.1",
"axios": "0.26.0",
"core-js": "3.21.1",
"currency.js": "2.0.4",
- "dayjs": "1.10.7",
- "firebase": "9.6.7",
+ "dayjs": "1.10.8",
+ "firebase": "9.6.8",
"highcharts": "9.3.3",
"highcharts-vue": "1.4.0",
"localforage": "1.10.0",
@@ -34,19 +35,20 @@
"webpack": "^4.46.0"
},
"devDependencies": {
- "@antfu/eslint-config": "^0.16.1",
- "@nuxt/bridge": "npm:@nuxt/bridge-edge@^3.0.0-27338323.1e98259",
+ "@antfu/eslint-config": "^0.18.3",
+ "@nuxt/bridge": "npm:@nuxt/bridge-edge@^3.0.0-27444434.856c01a",
"@nuxt/devalue": "^2.0.0",
"@nuxt/types": "2.15.8",
- "@nuxtjs/color-mode": "2.1.1",
+ "@nuxtjs/color-mode": "^3.0.2",
"@nuxtjs/pwa": "3.3.5",
"@nuxtjs/style-resources": "^1.2.1",
"@nuxtjs/tailwindcss": "^5.0.0-4",
"@vue/runtime-dom": "^3.2.31",
+ "@vue/test-utils": "^1.3.0",
"cross-env": "7.0.3",
- "eslint": "^8.9.0",
+ "eslint": "^8.10.0",
"eslint-plugin-nuxt": "3.1.0",
- "fancy-log": "^1.3.3",
+ "fancy-log": "^2.0.0",
"gulp": "4.0.2",
"gulp-notify": "4.0.0",
"gulp-plumber": "1.2.1",
@@ -56,8 +58,9 @@
"style-loader": "^2.0.0",
"stylus": "^0.56.0",
"stylus-loader": "^3.0.2",
- "typescript": "4.5.5",
- "unplugin-vue2-script-setup": "^0.9.3",
- "vinyl-ftp": "0.6.1"
+ "typescript": "4.6.2",
+ "unplugin-vue2-script-setup": "^0.10.0",
+ "vinyl-ftp": "0.6.1",
+ "vitest": "^0.6.0"
}
}
diff --git a/pages/api.vue b/pages/api.vue
deleted file mode 100644
index 0679c5ef..00000000
--- a/pages/api.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<script lang="ts">
-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
- .sort((a, b) => {
- if (trns[a].date > trns[b].date) return -1
- if (trns[a].date < trns[b].date) return 1
- return 0
- })
-}
-
-const filterByDate = (trns, ids, date) => {
- console.log(date)
- return ids.filter(
- trnId =>
- (trns[trnId].date >= date.start)
- && (trns[trnId].date <= date.end))
-}
-
-export default defineComponent({
- components: { Datepicker },
-
- setup() {
- const { $store } = useNuxtApp()
- const { setExpression } = useCalculator()
- const { setCategoryFilter } = useFilter()
-
- const period = reactive({
- name: 'month',
- value: 1,
- })
-
- // const today = dayjs().subtract(1, 'week').valueOf()
- const today = dayjs().valueOf()
-
- const date = {
- // @ts-expect-error
- end: dayjs(today).subtract(period.value, period.name).startOf(period.name).valueOf(),
- // @ts-expect-error
- start: dayjs(today).endOf(period.name).valueOf(),
- }
-
- // @ts-expect-error
- 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-expect-error
- 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()
- }
-
- function onChangePeriodName(name) {
- period.name = name
- selectPeriod()
- }
-
- 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-expect-error
- dateRange.start = dayjs(selectedDate).startOf(period.name).valueOf()
- // @ts-expect-error
- dateRange.end = dayjs(selectedDate).endOf(period.name).valueOf()
- }
-
- const trns = computed(() => $store.state.trns.items)
- const trnsIds = computed(() => Object.keys(trns.value))
-
- const selectedTrnsIds = computed(() => {
- if (!$store.getters['trns/hasTrns']) return []
- let ids = []
- ids = filterByDate(trns.value, trnsIds.value, dateRange)
- ids = sortByDate(trns.value, ids)
- return ids
- })
-
- 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 {
- actions,
- selectedTrnsIds,
-
- startDay,
- dateRange,
- onSelectDay,
- disabledDates,
- selectPeriod,
- onChangePeriodName,
-
- period,
- }
- },
-})
-</script>
-
-<template lang="pug">
-div
- 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
- 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>
-//
-</style>
diff --git a/pages/categories.vue b/pages/categories.vue
deleted file mode 100644
index 566283bb..00000000
--- a/pages/categories.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<script>
-export default defineComponent({
- setup() {
-
- },
-
- head() {
- return {
- title: this.$t('categories.title'),
- }
- },
-})
-</script>
-
-<template lang="pug">
-LayoutBaseWrap(:contentPadding="false")
- template(slot="content")
- .header {{ $t('categories.name') }}
- CategoriesListSlot(
- :ids="$store.getters['categories/categoriesRootIds']"
- v-slot="{ categories }"
- )
- .shame1
- CategoriesItemCategoryItem(
- v-for="category in categories"
- :category="category"
- :id="category.id"
- :key="category.id"
- @onClick="$store.dispatch('categories/showCategoryModal', category.id)"
- )
-
- template(slot="bottom")
- .buttons
- .button(@click="$store.dispatch('ui/setActiveTab', 'createCategory')") {{ $t('categories.new') }}
-</template>
-
-<style lang="stylus" scoped>
-.shame1
- display grid
- grid-template-columns repeat(2, 1fr)
- grid-column-gap $m6
- grid-row-gap $m6
- padding 0 $m7
-
- +media(600px)
- grid-template-columns repeat(auto-fill, minmax(200px, 1fr))
- grid-column-gap $m6
- grid-row-gap $m6
-
-.header
- header-title()
-
-.buttons
- display flex
- gap $m8
-
-.button
- button-base-1()
- margin-top $m7
-</style>
diff --git a/pages/categories/_id/index.vue b/pages/categories/_id/index.vue
new file mode 100644
index 00000000..5cc52620
--- /dev/null
+++ b/pages/categories/_id/index.vue
@@ -0,0 +1,120 @@
+<script setup lang="ts">
+import useFilter from '~/modules/filter/useFilter'
+import { getTrnsIds } from '~/components/trns/functions/getTrns'
+
+const { $store } = useNuxtApp()
+const { setFilterCatsId } = useFilter()
+
+const route = useRoute()
+const router = useRouter()
+
+const categoryId = computed(() => route.params.id)
+const category = computed(() => $store.state.categories.items[categoryId.value])
+if (!category.value)
+ router.replace('/categories')
+
+const trnsItems = computed(() => $store.state.trns.items)
+const backLink = computed(() => category.value?.parentId ? `/categories/${category.value.parentId}` : '/categories')
+
+const filter = reactive({ trnType: null })
+
+const categoryChildIds = computed(() => category.value.childIds?.sort((a, b) => {
+ if ($store.state.categories.items[a].name < $store.state.categories.items[b].name) return -1
+ if ($store.state.categories.items[a].name > $store.state.categories.items[b].name) return 1
+ return 0
+}))
+
+const trnsIds = computed(() =>
+ getTrnsIds({
+ categoriesIds: category.value?.childIds ? category.value?.childIds : [categoryId.value],
+ trnType: filter.trnType,
+ trnsItems: trnsItems.value,
+ }))
+
+function handleSetFilterCategory() {
+ setFilterCatsId(categoryId.value)
+ $store.commit('filter/setFilterDateNow')
+ $store.dispatch('ui/setActiveTabStat', 'details')
+}
+
+function handleEditClick() {
+ $store.commit('categories/setCategoryEditId', categoryId.value)
+ $store.dispatch('ui/setActiveTab', 'createCategory')
+}
+</script>
+
+<template lang="pug">
+.h-full.overflow.overflow-x-auto(v-if="category")
+ router-link(
+ v-slot='{ href, navigate }'
+ :to='backLink'
+ custom
+ )
+ .flex.items-start
+ a.grow.cursor-pointer.block.py-5.mb-3.px-3.font-nunito.hocus_bg-gray-100.dark_hocus_bg-neutral-800(
+ :href='href'
+ @click='navigate'
+ )
+ .pb-2.text-2xs.font-medium(class="text-white/50")
+ | {{ $t('categories.title') }}
+ template(v-if="category.parentId")
+ |
+ | • {{ $store.state.categories.items[category.parentId].name }}
+
+ .pb-0.flex.items-center.gap-3
+ .text-neutral-800.dark_text-white.text-2xl.leading-none.font-semibold {{ category.name }}
+ .w-6.h-6.rounded-full.flex-center.text-sm.text-neutral-50(
+ :style="{ background: category.color }"
+ )
+ div(:class="category.icon")
+
+ .mdi.mdi-pencil-outline.cursor-pointer.rounded-full.mt-3.mr-2.w-16.h-16.flex-center.text-2xl.p-4.hocus_bg-gray-100.dark_hocus_bg-neutral-800(
+ @click="handleEditClick"
+ )
+
+ .pb-12
+ .px-4.flex
+ .cursor-pointer.p-1.px-3.flex.items-center.gap-3.bg-gray-50.dark_bg-dark4.rounded-md.hocus_bg-gray-100.dark_hocus_bg-neutral-800.shadow.hocus_shadow-lg(
+ class="dark_text-white/60"
+ @click="handleSetFilterCategory"
+ )
+ .mdi.mdi-poll.text-xl
+ .text-xs.leading-none {{ $t('statBy') }} {{ category.name }}
+ .mdi.mdi-chevron-right.opacity-70.text-lg.leading-none
+
+ //- Childs categories
+ .pb-12(v-if="category.childIds && category.childIds.length > 0")
+ .statTitle.flex.gap-2.px-3(class="!pb-3")
+ div {{ $t('categories.title') }}:
+ div {{ category.childIds.length }}
+
+ .px-3
+ CategoriesView(
+ :ids="categoryChildIds"
+ :slider="() => ({})"
+ isHideParentCategory
+ borderTop
+ noPadding
+ @onClick="id => $router.push(`/categories/${id}`)"
+ )
+
+ //- History
+ .px-3
+ TrnsHistory(
+ :trnsIds="trnsIds"
+ :trnType="filter.trnType"
+ hideTransfers
+ @setFilterTrnType="value => filter.trnType = value"
+ )
+</template>
+
+<i18n lang="json5">
+{
+ "en": {
+ "statBy": "Statistics: ",
+ },
+ "ru": {
+ "statBy": "Статистика: ",
+ },
+}
+</i18n>
diff --git a/pages/categories/index.vue b/pages/categories/index.vue
new file mode 100644
index 00000000..6be377c7
--- /dev/null
+++ b/pages/categories/index.vue
@@ -0,0 +1,56 @@
+<script setup lang="ts">
+const { $store } = useNuxtApp()
+
+const catsIds = computed(() => $store.getters['categories/categoriesRootIds']?.sort((a, b) => {
+ if ($store.state.categories.items[a].name < $store.state.categories.items[b].name) return -1
+ if ($store.state.categories.items[a].name > $store.state.categories.items[b].name) return 1
+ return 0
+}))
+</script>
+
+<script lang="ts">
+export default defineComponent({
+ head() {
+ return {
+ title: this.$t('categories.title'),
+ }
+ },
+})
+</script>
+
+<template lang="pug">
+.h-full.overflow.overflow-x-auto
+ .py-6.pb-8.px-4.font-nunito.text-neutral-800.dark_text-white.text-2xl.leading-none.font-semibold
+ | {{ $t('categories.name') }}
+
+ .pb-4
+ CategoriesListSlot(
+ :ids="catsIds"
+ v-slot="{ categories }"
+ )
+ .shame1.px-3
+ CategoriesItemCategoryItem(
+ v-for="category in categories"
+ :category="category"
+ :slider="() => ({})"
+ :id="category.id"
+ :key="category.id"
+ @onClick="id => $router.push(`/categories/${category.id}`)"
+ )
+
+ .pb-4.px-4.flex.gap-4.pt-4
+ .button(@click="$store.dispatch('ui/setActiveTab', 'createCategory')") {{ $t('categories.new') }}
+</template>
+
+<style lang="stylus" scoped>
+.shame1
+ display grid
+ grid-template-columns repeat(2, 1fr)
+ grid-column-gap $m6
+ grid-row-gap $m6
+
+ +media(600px)
+ grid-template-columns repeat(auto-fill, minmax(200px, 1fr))
+ grid-column-gap $m6
+ grid-row-gap $m6
+</style>
diff --git a/pages/history.vue b/pages/history.vue
index eed2a9b3..3832f812 100644
--- a/pages/history.vue
+++ b/pages/history.vue
@@ -1,36 +1,64 @@
-<script>
+<script setup lang="ts">
import useStatPage from '~/components/stat/useStatPage'
+import { getTrnsIds } from '~/components/trns/functions/getTrns'
-export default {
- setup() {
- const { statPage } = useStatPage()
- return { statPage }
- },
+const { $store } = useNuxtApp()
+const { statPage } = useStatPage()
+const catsItems = computed(() => $store.state.categories.items)
+const trnsItems = computed(() => $store.state.trns.items)
+const storeFilter = computed(() => $store.state.filter)
+const filterTrnType = ref(null)
+
+// TODO: shared functions
+function getCatsIds(catsIds) {
+ const ids = []
+
+ for (const catId of catsIds) {
+ const category = catsItems.value[catId]
+ category?.childIds
+ ? ids.push(...category.childIds)
+ : ids.push(catId)
+ }
+
+ return ids
+}
+
+const trnsIds = computed(() => {
+ const categoriesIds = storeFilter.value.catsIds.length > 0 ? getCatsIds(storeFilter.value.catsIds) : null
+ const walletsIds = storeFilter.value.walletsIds.length > 0 ? storeFilter.value.walletsIds : null
+ return getTrnsIds({
+ categoriesIds,
+ walletsIds,
+ trnType: filterTrnType.value,
+ trnsItems: trnsItems.value,
+ })
+})
+</script>
+
+<script lang="ts">
+export default defineComponent({
head() {
return {
title: this.$t('trns.history'),
}
},
-}
+})
</script>
<template lang="pug">
-LayoutBaseWrap(:contentPadding="false")
- template(slot="content")
- .header {{ $t('trns.history') }}
-
- .px-3
- .pb-4
- LazyStatFilter(v-if="statPage.filter.isShow")
-
- TrnsListHistory(
- :size="50"
- isShowFilter
- )
-</template>
+.h-full.overflow.overflow-x-auto
+ .py-6.px-3.font-nunito.text-neutral-800.dark_text-white.text-2xl.leading-none.font-semibold
+ | {{ $t('trns.history') }}
+
+ .px-3
+ .pb-8(v-if="statPage.filter.isShow")
+ LazyStatFilter
-<style lang="stylus" scoped>
-.header
- header-title()
-</style>
+ //- History
+ TrnsHistory(
+ :trnsIds="trnsIds"
+ :trnType="filterTrnType"
+ @setFilterTrnType="value => filterTrnType = value"
+ )
+</template>
diff --git a/pages/index.vue b/pages/index.vue
index d9f7e58e..dad30fc7 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -9,7 +9,7 @@ export default {
</script>
<template lang="pug">
-.overflow-hidden.grid.h-full
+.overflow-hidden.h-full
LazyStat(v-if="$store.getters['trns/hasTrns']")
LazyStatNoStatActions(v-if="!$store.getters['trns/hasTrns']")
</template>
diff --git a/pages/login.vue b/pages/login.vue
index 795f1793..089524d7 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -1,8 +1,10 @@
<script lang="ts">
import { GoogleAuthProvider, signInWithRedirect } from 'firebase/auth'
-import { auth } from '~/services/firebaseHelpers'
+import { auth } from '~/services/firebase/api'
export default defineComponent({
+ layout: 'login',
+
setup() {
const isLoading = ref(false)
@@ -53,22 +55,22 @@ export default defineComponent({
.tab
.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"
+ class="lg_top-7 lg_left-7"
)
- .linkItem.py-2.px-4.rounded-md(
- :class="[{ 'text-blue2 dark:text-blue1': $store.state.lang.lang === 'ru' }, 'hocus:bg-white2 dark:hocus:bg-custom1']"
+ .linkItem.py-2.px-3.rounded-md(
+ :class="[{ 'text-blue2 dark_text-blue1': $store.state.lang.lang === 'ru' }, 'hocus_bg-white2 dark_hocus_bg-custom1']"
@click="onSetLocale('ru')"
) Русский
- .linkItem.py-2.px-4.rounded-md(
- :class="[{ 'text-blue2 dark:text-blue1': $store.state.lang.lang === 'en' }, 'hocus:bg-white2 dark:hocus:bg-custom1']"
+ .linkItem.py-2.px-3.rounded-md(
+ :class="[{ 'text-blue2 dark_text-blue1': $store.state.lang.lang === 'en' }, 'hocus_bg-white2 dark_hocus_bg-custom1']"
@click="onSetLocale('en')"
) English
.flex.gap-3.top-3.right-5(
- class="lg:top-7 lg:right-7"
+ class="lg_top-7 lg_right-7"
)
- .linkItem.py-2.px-4.rounded-md(
- class="hocus:bg-white2 dark:hocus:bg-custom1"
+ .linkItem.py-2.px-3.rounded-md(
+ class="hocus_bg-white2 dark_hocus_bg-custom1"
@click="$store.dispatch('ui/changeTheme')"
) {{ $t('changeTheme') }}
@@ -77,8 +79,8 @@ export default defineComponent({
SharedCopyright
.flex.flex-col.items-center.px-3.py-8
- .loginButton(
- :class="{ _loading: isLoading }"
+ .loginButton.bg-blue3.hocus_bg-blue1.hocus_shadow(
+ :class="[{ _loading: isLoading }]"
@click.prevent="signInWithGoogle"
)
transition(name="fadeIn")
@@ -123,13 +125,9 @@ export default defineComponent({
padding $m7 $mb1
font-size 16px
text-align center
- background var(--c-blue-3)
border-radius 36px
anim()
- &:hover
- background var(--c-blue-3)
-
&._loading
pointer-events none
cursor default
diff --git a/pages/settings.vue b/pages/settings.vue
index f7a5307a..2bb8fded 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -6,6 +6,7 @@ export default {
data() {
return {
+ confirmCreateDemo: false,
confirmRemoveUserData: false,
version: pkg.version,
}
@@ -30,82 +31,70 @@ export default {
</script>
<template lang="pug">
-LayoutBaseWrap(:contentPadding="false")
- template(slot="content")
- .header {{ $t('settings.title') }}
-
- .settings
- .settings__column
- .settings__group
- .settings__subHeader {{ $t('currency.title') }}
- .settings__item
- SharedButton._bdb(
- :title="$t('currency.selectBaseTitle')"
- icon="mdi mdi-currency-usd"
- @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
- LangDropdown
- .settings__item
- SharedButton._bdb(
- icon="mdi mdi-palette"
- :title="$t('theme.change')"
- @onClick="$store.dispatch('ui/changeTheme')"
- )
-
- .settings__group
- .settings__subHeader {{ $t('settings.caution') }}
- .settings__desc {{ $t('alerts.willDeleteEverything') }}
- .settings__item
- SharedButton._bdb(
- :title="$t('settings.deleteButton')"
- icon="mdi mdi-delete-empty-outline"
- @onClick="confirmRemoveUserData = true"
- )
-
- .settings__column
- .settings__group
- About
- .appVersion {{ $t('app.version') }} {{ version }}
-
- ModalBottomConfirm(
- :description="$t('alerts.willDeleteEverything')"
- :show="confirmRemoveUserData"
- @onClose="confirmRemoveUserData = false"
- @onConfirm="removeUserData"
- )
+.h-full.overflow.overflow-x-auto
+ .py-6.px-3.font-nunito.text-neutral-800.dark_text-white.text-2xl.leading-none.font-semibold
+ | {{ $t('settings.title') }}
+
+ .settings.px-3.pt-5
+ .settings__column
+ .settings__group
+ .settings__subHeader {{ $t('settings.app') }}
+ .settings__item
+ LangDropdown
+ .settings__item
+ SharedButton._bdb(
+ icon="mdi mdi-palette"
+ :title="$t('theme.change')"
+ @onClick="$store.dispatch('ui/changeTheme')"
+ )
+ .settings__item
+ SharedButton._bdb(
+ :title="$t('currency.selectBaseTitle')"
+ icon="mdi mdi-currency-usd"
+ @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.caution') }}
+ .settings__desc {{ $t('alerts.willDeleteEverything') }}
+ .settings__item
+ SharedButton._bdb(
+ :title="$t('settings.deleteButton')"
+ icon="mdi mdi-delete-empty-outline"
+ @onClick="confirmRemoveUserData = true"
+ )
+
+ .settings__column
+ .settings__group
+ About
+ .appVersion {{ $t('app.version') }} {{ version }}
+
+ ModalBottomConfirm(
+ :description="$t('alerts.willDeleteEverything')"
+ :show="confirmRemoveUserData"
+ @onClose="confirmRemoveUserData = false"
+ @onConfirm="removeUserData"
+ )
</template>
<style lang="stylus" scoped>
-.button
- button-base-1()
-
-.header
- header-title()
-
.settings
width 100%
flex-grow 1
max-width 660px
- margin 0 auto
- padding 0 $m7
- padding-top 0
+media-laptop()
display grid
@@ -131,10 +120,6 @@ LayoutBaseWrap(:contentPadding="false")
font-h1()
font-size 18px
-.thanksTo
- color var(--c-font-2)
- font-size 14px
-
.appVersion
padding-top $m10
color var(--c-font-3)
diff --git a/pages/wallets.vue b/pages/wallets.vue
deleted file mode 100644
index 5fd4f070..00000000
--- a/pages/wallets.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<script>
-export default {
- name: 'WalletsPage',
-
- head() {
- return {
- title: this.$t('wallets.title'),
- }
- },
-
- methods: {
- handleShowWalletsModalWalletModal(id) {
- this.$store.commit('wallets/showWalletsModalWalletModal')
- this.$store.commit('wallets/setWalletsModalWalletModalId', id)
- },
- },
-}
-</script>
-
-<template lang="pug">
-LayoutBaseWrap(:contentPadding="false")
- template(slot="content")
- .header {{ $t('wallets.name') }}
-
- div(style="padding: 0 0 16px 0")
- WalletsTotal(
- isShowCredits
- isShowTotal
- )
-
- WalletsList3(
- @onClick="(id) => handleShowWalletsModalWalletModal(id)"
- )
-
- template(slot="bottom")
- .buttons
- .button(@click="$store.dispatch('ui/setActiveTab', 'createWallet')") {{ $t('wallets.new') }}
- .button(@click="$store.dispatch('ui/setActiveTab', 'walletsSort')") {{ $t('base.sort') }}
-</template>
-
-<style lang="stylus" scoped>
-.header
- header-title()
-
-.buttons
- display flex
- align-items center
- justify-content center
- gap $m8
-
-.button
- button-base-1()
-</style>
diff --git a/pages/wallets/_id/edit.vue b/pages/wallets/_id/edit.vue
new file mode 100644
index 00000000..ebcd9183
--- /dev/null
+++ b/pages/wallets/_id/edit.vue
@@ -0,0 +1,323 @@
+<script>
+import generateId from '~/utils/id'
+import colors from '~/assets/js/colors'
+
+export default {
+ data() {
+ return {
+ showColors: false,
+ showCurrencies: false,
+ wallet: {
+ color: this.$store.state.ui.defaultBgColor,
+ countTotal: true,
+ currency: 'RUB',
+ isCredit: false,
+ name: null,
+ order: Object.keys(this.$store.state.wallets.items).length || 1,
+ },
+ }
+ },
+
+ computed: {
+ walletId() {
+ return this.$route.params.id
+ },
+ },
+
+ watch: {
+ walletId: {
+ handler(walletId) {
+ if (walletId) {
+ this.wallet = {
+ ...this.wallet,
+ ...this.$store.state.wallets.items[this.walletId],
+ }
+ }
+ },
+ immediate: true,
+ },
+ },
+
+ created() {
+ this.colors = colors
+ if (!this.walletId)
+ this.wallet.color = colors[Math.floor(Math.random() * colors.length)]
+ },
+
+ methods: {
+ handleColorSelect(color) {
+ this.wallet.color = color
+ this.showColors = false
+ },
+ handleCurrencySelect(currency) {
+ this.wallet.currency = currency
+ this.showCurrencies = false
+ },
+
+ handleSubmit() {
+ if (this.validateForm()) {
+ const id = this.walletId || generateId()
+
+ const walletsValues = {
+ color: this.wallet.color,
+ countTotal: this.wallet.countTotal,
+ currency: this.wallet.currency,
+ isCredit: this.wallet.isCredit,
+ name: this.wallet.name,
+ order: this.wallet.order,
+ }
+
+ this.$store.dispatch('wallets/addWallet', { id, values: walletsValues })
+ this.$router.replace(`/wallets/${id}`)
+ }
+ },
+
+ validateForm() {
+ const wallets = this.$store.state.wallets.items
+ // name
+ if (!this.wallet.name) {
+ this.$notify({
+ title: '😮',
+ text: this.$t('wallets.form.name.error'),
+ })
+ return false
+ }
+
+ // currency
+ if (!this.wallet.currency) {
+ this.$notify({
+ title: '😮',
+ text: this.$t('wallets.form.currency.error'),
+ })
+ return false
+ }
+
+ for (const walletId in wallets) {
+ if (wallets[walletId].name === this.wallet.name) {
+ if (this.walletId) {
+ if (this.walletId !== walletId) {
+ this.$notify({
+ title: '😮',
+ text: this.$t('wallets.form.name.exist'),
+ })
+ return false
+ }
+ }
+ else {
+ this.$notify({
+ title: '😮',
+ text: this.$t('wallets.form.name.exist'),
+ })
+ return false
+ }
+ }
+ }
+
+ return true
+ },
+ },
+}
+</script>
+
+<template lang="pug">
+.h-full.overflow.overflow-x-auto
+ .relative(v-if="wallet")
+ router-link(
+ v-slot='{ href, navigate }'
+ :to='`/wallets/${walletId}`'
+ custom
+ )
+ a.grow.cursor-pointer.block.py-5.pb-5.mb-4.px-3.font-nunito.hocus_bg-gray-100.dark_hocus_bg-neutral-800(
+ :href='href'
+ @click='navigate'
+ )
+ .pb-1.text-xs.font-medium(class="text-white/50") {{ $t('wallets.editTitle') }}
+
+ .flex.items-center.gap-3
+ .text-neutral-800.dark_text-white.text-2xl.font-semibold {{ wallet.name }}
+
+ .form.px-3.py-5(class="max-w-[400px]")
+ .mb-4
+ .inputText
+ .inputText__label {{ $t('wallets.form.name.label') }}
+ input(
+ type="text"
+ :placeholder="$t('wallets.form.name.placeholder')"
+ v-model="wallet.name"
+ ).inputText__value
+
+ //- Currensies
+ .cursor-pointer.mb-4.p-2.px-3.flex.items-center.gap-4.text-sm.bg-dark4.rounded-md.hocus_bg-gray-100.dark_hocus_bg-neutral-800.shadow.hocus_shadow-lg(
+ class="text-white/60"
+ @click="showCurrencies = true"
+ )
+ .mdi.mdi-currency-sign.text-2xl
+ .grow.leading-none {{ $t('wallets.form.currency.label') }}
+ .leading-none {{ wallet.currency }}
+ .mdi.mdi-dots-vertical.opacity-70.text-lg.leading-none
+
+ //- Colors
+ .cursor-pointer.mb-2.p-2.px-3.flex.items-center.gap-4.text-sm.bg-dark4.rounded-md.hocus_bg-gray-100.dark_hocus_bg-neutral-800.shadow.hocus_shadow-lg(
+ class="text-white/60"
+ @click="showColors = true"
+ )
+ .mdi.mdi-palette.text-2xl
+ .grow.leading-none {{ $t('wallets.form.color.label') }}
+ .w-5.h-5.rounded-full(:style="{ background: wallet.color }")
+ .mdi.mdi-dots-vertical.opacity-70.text-lg.leading-none
+
+ SharedContextMenuItem(
+ :checkboxValue="wallet.countTotal"
+ :title="$t('wallets.form.total.placeholder')"
+ showCheckbox
+ @onClick="wallet.countTotal = !wallet.countTotal"
+ )
+
+ SharedContextMenuItem(
+ :checkboxValue="wallet.isCredit"
+ :title="$t('isCredit')"
+ showCheckbox
+ @onClick="wallet.isCredit = !wallet.isCredit"
+ )
+
+ .pt-4
+ SharedButton(
+ :class="['_text-center _blue2', { _inline: $store.state.ui.pc }]"
+ :title="$t('wallets.form.save')"
+ @onClick="handleSubmit")
+
+ //- colors
+ Portal(
+ v-if="showColors"
+ to="modal"
+ )
+ ModalBottom(
+ :center="true"
+ :title="$t('wallets.form.color.placeholder')"
+ @onClose="showColors = false"
+ )
+ .inputText
+ .inputText__colors
+ .colors
+ .colorItem(
+ :class="{ _active: wallet.color === color }"
+ :style="{ background: color }"
+ @click="handleColorSelect(color)"
+ v-for="color in colors")
+ .customColor
+ .customColor__title {{ $t('wallets.form.color.custom') }}
+ input.customColor__value(v-model="wallet.color" type="color")
+
+ //- currencies
+ Portal(
+ v-if="showCurrencies"
+ to="modal"
+ )
+ ModalBottom(
+ :center="true"
+ :title="$t('wallets.form.currency.placeholder')"
+ @onClose="showCurrencies = false"
+ )
+ .inputText
+ .currencies
+ .currencies__item(
+ :class="{ _active: wallet.currency === currency }"
+ @click="handleCurrencySelect(currency)"
+ v-for="(item, currency) in $store.state.currencies.rates"
+ ) {{ currency }}
+</template>
+
+<style lang="stylus" scoped>
+.customColor
+ margin (- $m7)
+ margin-top 0
+ padding $m7
+ background var(--c-bg-1)
+
+ @media $media-laptop
+ margin (- $m9)
+ margin-top 0
+ padding $m9
+
+ &__title
+ padding-bottom $m6
+ color var(--c-font-4)
+
+ &__value
+ width 100%
+ height 40px
+ margin 0
+ padding 0
+ border 0
+
+.form__actions
+ @media $media-phone
+ text-align center
+
+.form__btns
+ display grid
+ grid-template-columns repeat(2, 1fr)
+ grid-column-gap $m9
+ grid-row-gap $m9
+ padding-bottom $m9
+
+ +media-laptop()
+ grid-column-gap $m10
+ grid-row-gap $m10
+
+ &__i._full
+ grid-column 1 / -1
+
+.inputModal
+ &._flex
+ flex 1
+ display flex
+ align-items center
+ justify-content space-between
+
+ &__content
+ display flex
+
+ &__label
+ margin 0
+ padding 0
+ font-size 10px
+
+.currencies
+ display grid
+ grid-template-columns repeat(auto-fill, minmax(120px, 1fr))
+ grid-column-gap $m7
+ grid-row-gap $m7
+
+ &__item
+ cursor pointer
+ display flex
+ align-items center
+ justify-content center
+ height 44px
+ padding $m6
+ text-align center
+ border 1px solid var(--c-bg-6)
+ border-radius $m4
+
+ +media-hover()
+ &:not(._active)
+ background var(--c-bg-6)
+
+ &._active
+ cursor default
+ color var(--c-font-1)
+ background var(--c-blue-1)
+ border none
+</style>
+
+<i18n lang="json5">
+{
+ "en": {
+ "isCredit": "Credit account"
+ },
+ "ru": {
+ "isCredit": "Кредитный счёт"
+ }
+}
+</i18n>
diff --git a/pages/wallets/_id/index.vue b/pages/wallets/_id/index.vue
new file mode 100644
index 00000000..1909034e
--- /dev/null
+++ b/pages/wallets/_id/index.vue
@@ -0,0 +1,154 @@
+<script setup lang="ts">
+import { removeData } from '~/services/firebase/api'
+import useFilter from '~/modules/filter/useFilter'
+import { getTrnsIds } from '~/components/trns/functions/getTrns'
+
+const { $store } = useNuxtApp()
+const { setFilterWalletsId } = useFilter()
+
+const route = useRoute()
+const router = useRouter()
+
+const walletId = computed(() => route.params.id)
+const wallet = computed(() => $store.state.wallets.items[walletId.value])
+if (!wallet.value)
+ router.replace('/wallets')
+
+const trnsItems = computed(() => $store.state.trns.items)
+const total = computed(() => $store.getters['wallets/walletsTotal'][walletId.value].base)
+
+const filter = reactive({ trnType: null })
+const trnsIds = computed(() =>
+ getTrnsIds({
+ walletsIds: [walletId.value],
+ trnType: filter.trnType,
+ trnsItems: trnsItems.value,
+ }))
+
+const filteredTrnsIds = computed(() => $store.getters['trns/selectedTrnsIdsWithDate'].filter(trnId => $store.state.trns.items[trnId].walletId === walletId.value))
+
+const showModalConfirm = ref(false)
+const deleteInfo = computed(() => {
+ if (trnsIds.value.length > 0)
+ return `It's also will delete ${trnsIds.value.length} trns in this wallet`
+ return false
+})
+
+function handleSetFilterWallet() {
+ setFilterWalletsId(walletId.value)
+ $store.commit('filter/setFilterDateNow')
+ $store.dispatch('ui/setActiveTabStat', 'details')
+}
+
+function handleEditClick() {
+ router.push(`/wallets/${walletId.value}/edit`)
+}
+
+function handleDeleteClick() {
+ showModalConfirm.value = true
+}
+
+function handleDeleteConfirm() {
+ const uid = $store.state.user.user.uid
+ const id = JSON.parse(JSON.stringify(walletId.value))
+ const trnsIdsForDelete = JSON.parse(JSON.stringify(trnsIds.value))
+
+ showModalConfirm.value = false
+ router.replace('/wallets')
+
+ setTimeout(async() => {
+ await $store.dispatch('trns/deleteTrnsByIds', trnsIdsForDelete)
+ removeData(`users/${uid}/accounts/${id}`)
+ .then(() => console.log('wallet deleted'))
+ }, 200)
+}
+</script>
+
+<script lang="ts">
+export default defineComponent({
+ head() {
+ return {
+ title: `${this.$t('wallets.title')}: ${this.wallet.name}`,
+ }
+ },
+})
+</script>
+
+<template lang="pug">
+.relative.h-full.overflow-y-auto(v-if="wallet")
+ router-link(
+ v-slot='{ href, navigate }'
+ to='/wallets'
+ custom
+ )
+ .flex.items-start
+ a.grow.cursor-pointer.block.py-5.mb-3.px-3.font-nunito.hocus_bg-gray-100.dark_hocus_bg-neutral-800(
+ :href='href'
+ @click='navigate'
+ )
+ .pb-2.text-xs.font-medium(class="text-white/50") {{ $t('wallets.title') }}
+
+ .pb-3.flex.items-center.gap-3
+ .text-neutral-800.dark_text-white.text-2xl.leading-none.font-semibold {{ wallet.name }}
+ .p-1.px-1.rounded.flex-center.text-2xs.text-neutral-50(
+ :style="{ background: wallet.color }"
+ ) {{ wallet.currency }}
+
+ .flex
+ Amount(
+ :currency="wallet.currency"
+ :value="total"
+ showBase
+ size="lg"
+ vertical="right"
+ )
+
+ .mdi.mdi-pencil-outline.cursor-pointer.rounded-full.mt-3.mr-2.w-16.h-16.flex-center.text-2xl.p-4.hocus_bg-gray-100.dark_hocus_bg-neutral-800(
+ @click="handleEditClick"
+ )
+
+ .pb-6
+ .px-3.flex
+ .cursor-pointer.p-1.px-3.flex.items-center.gap-3.bg-gray-50.dark_bg-dark4.rounded-md.hocus_bg-gray-100.dark_hocus_bg-neutral-800.shadow.hocus_shadow-lg(
+ class="dark_text-white/60"
+ @click="handleSetFilterWallet"
+ )
+ .mdi.mdi-poll.text-xl
+ .text-xs.leading-none {{ $t('statBy') }}: {{ wallet.name }}
+ .mdi.mdi-chevron-right.opacity-70.text-lg.leading-none
+
+ //- Stat
+ .overflow-hidden.relative.bg-white.dark_bg-custom4.mx-3.mb-12.p-3.rounded-md
+ SharedDate.text-xs.font-medium(class="-mb-1 text-white/50")
+ div(class="-mb-3")
+ StatGroupSum2(
+ :trnsIds="filteredTrnsIds"
+ )
+
+ //- History
+ .px-3
+ TrnsHistory(
+ :trnsIds="trnsIds"
+ :trnType="filter.trnType"
+ @setFilterTrnType="value => filter.trnType = value"
+ )
+
+ //- Delete?
+ ModalBottomConfirm(
+ :show="showModalConfirm"
+ :description="deleteInfo"
+ @onClose="showModalConfirm = false"
+ @onConfirm="handleDeleteConfirm"
+ )
+</template>
+
+<i18n lang="json5">
+{
+ "en": {
+ "statBy": "Statistics",
+ },
+ "ru": {
+ "statBy": "Статистика",
+ },
+}
+</i18n>
diff --git a/pages/wallets/index.vue b/pages/wallets/index.vue
new file mode 100644
index 00000000..f44a8ca4
--- /dev/null
+++ b/pages/wallets/index.vue
@@ -0,0 +1,31 @@
+<script lang="ts">
+export default defineComponent({
+ head() {
+ return {
+ title: this.$t('wallets.title'),
+ }
+ },
+})
+</script>
+
+<template lang="pug">
+.h-full.overflow.overflow-x-auto
+ .py-6.px-3.font-nunito.text-neutral-800.dark_text-white.text-2xl.leading-none.font-semibold
+ | {{ $t('wallets.name') }}
+
+ .pb-6.px-3
+ .flex.gap-4.justify-between.items-center
+ WalletsTotalAlt(
+ isShowCredits
+ isShowSavings
+ )
+
+ .pb-12
+ WalletsList3(@onClick="id => $router.push(`/wallets/${id}`)")
+
+ .pb-4.px-3.flex.gap-4
+ //- Create
+ .button(@click="$store.dispatch('ui/setActiveTab', 'createWallet')") {{ $t('wallets.new') }}
+ //- Sort
+ .button(@click="$store.dispatch('ui/setActiveTab', 'walletsSort')") {{ $t('base.sort') }}
+</template>
diff --git a/pages/welcome.vue b/pages/welcome.vue
index b7c0d13c..9f813618 100644
--- a/pages/welcome.vue
+++ b/pages/welcome.vue
@@ -136,11 +136,10 @@ export default {
.header
.header__title {{ $t('appName') }}
.options__desc {{ $t('welcome.createFirstWallet.text') }}
- .button
- SharedButton._center._blue2(
- :title="$t('welcome.createFirstWallet.btn')"
- @onClick="showWalletForm = true"
- )
+ SharedButton._center._blue2(
+ :title="$t('welcome.createFirstWallet.btn')"
+ @onClick="showWalletForm = true"
+ )
//- category
transition(name="fadeIn")
@@ -149,10 +148,9 @@ export default {
.tab__content
.icon: .mdi.mdi-folder-star
.options__desc {{ $t('welcome.createFirstCategory.text') }}
- .button
- SharedButton._blue2._center(
- :title="$t('welcome.createFirstCategory.btn')"
- @onClick="showCategoryForm = true")
+ SharedButton._blue2._center(
+ :title="$t('welcome.createFirstCategory.btn')"
+ @onClick="showCategoryForm = true")
transition(name="fadeIn")
.tab(v-if="showWalletForm")
diff --git a/services/firebaseHelpers.js b/services/firebase/api.js
similarity index 95%
rename from services/firebaseHelpers.js
rename to services/firebase/api.js
index 8f7b23a3..9e9e3cb6 100644
--- a/services/firebaseHelpers.js
+++ b/services/firebase/api.js
@@ -1,7 +1,7 @@
import { initializeApp } from 'firebase/app'
-import { child, get, getDatabase, off, onValue, ref, remove, set, update } from 'firebase/database'
import { getAuth } from 'firebase/auth'
-import { config } from '~/services/firebaseConfig'
+import { child, get, getDatabase, off, onValue, ref, remove, set, update } from 'firebase/database'
+import { config } from '~/services/firebase/config'
export const app = initializeApp(config)
export const db = getDatabase(app)
diff --git a/services/firebaseConfig.js b/services/firebase/config.js
similarity index 100%
rename from services/firebaseConfig.js
rename to services/firebase/config.js
diff --git a/store/app/actions.js b/store/app/actions.js
index f83edb6a..61169a99 100644
--- a/store/app/actions.js
+++ b/store/app/actions.js
@@ -1,6 +1,6 @@
import localforage from 'localforage'
import { onAuthStateChanged } from 'firebase/auth'
-import { auth } from '~/services/firebaseHelpers'
+import { auth } from '~/services/firebase/api'
export default {
initApp({ rootGetters, commit, dispatch }) {
@@ -30,9 +30,7 @@ export default {
if (this.$router.currentRoute.name === 'login') {
this.app.context.redirect('/')
- setTimeout(() => {
- commit('setAppStatus', 'ready')
- }, 100)
+ setTimeout(() => commit('setAppStatus', 'ready'), 100)
}
}
catch (e) {
@@ -68,7 +66,6 @@ export default {
if (categories && user && trns && wallets) {
if (this.$router.currentRoute.name === 'login')
this.app.context.redirect('/')
-
resolve()
}
else {
@@ -84,8 +81,6 @@ export default {
await dispatch('categories/setCategories', null, { root: true })
await dispatch('wallets/setWallets', null, { root: true })
await dispatch('trns/setTrns', null, { root: true })
- setTimeout(() => {
- commit('setAppStatus', 'ready')
- }, 100)
+ setTimeout(() => commit('setAppStatus', 'ready'), 100)
},
}
diff --git a/store/app/index.js b/store/app/index.js
index a41fff91..aa4eba06 100644
--- a/store/app/index.js
+++ b/store/app/index.js
@@ -1,21 +1,12 @@
-import actions from './actions'
-import mutations from './mutations'
-
export const initStatus = {
loading: true,
login: false,
ready: false,
}
-const state = () => ({
+export const state = () => ({
status: {
...initStatus,
loading: true,
},
})
-
-export default {
- state,
- actions,
- mutations,
-}
diff --git a/store/categories/actions.js b/store/categories/actions.js
index 800e6024..8cb12d50 100644
--- a/store/categories/actions.js
+++ b/store/categories/actions.js
@@ -1,5 +1,5 @@
import localforage from 'localforage'
-import { getDataAndWatch, unsubcribeData } from '~/services/firebaseHelpers'
+import { getDataAndWatch, unsubcribeData } from '~/services/firebase/api'
export default {
initCategories({ dispatch, rootState }) {
@@ -8,7 +8,7 @@ export default {
// add child categories to root categories
for (const categoryId in items) {
const parentCategoryId = items[categoryId].parentId
- if (parentCategoryId !== 0) {
+ if (parentCategoryId !== 0 && items[parentCategoryId]) {
items[parentCategoryId].childIds
? !items[parentCategoryId].childIds.includes(categoryId) && items[parentCategoryId].childIds.push(categoryId)
: items[parentCategoryId].childIds = [categoryId]
@@ -39,9 +39,4 @@ export default {
const uid = rootState.user.user.uid
unsubcribeData(`users/${uid}/categories`)
},
-
- showCategoryModal({ commit }, id) {
- commit('showCategoryModal')
- commit('setCategoryModalId', id)
- },
}
diff --git a/store/categories/getters.js b/store/categories/getters.js
index 9ab2857b..8b3daa09 100644
--- a/store/categories/getters.js
+++ b/store/categories/getters.js
@@ -60,15 +60,22 @@ export default {
lastUsedCategoriesIdsByDate(state, getters, rootState, rootGetters) {
if (!getters.hasCategories) return []
- const trns = rootState.trns.items
- const sortedTrnsIds = rootGetters['trns/sortedTrnsIds']
+ const trnsItems = rootState.trns.items
+ const trnsIds = Object.keys(trnsItems)
+ .filter(trnId => trnsItems[trnId].type !== 2)
+ .sort((a, b) => {
+ if (trnsItems[a].date > trnsItems[b].date) return -1
+ if (trnsItems[a].date < trnsItems[b].date) return 1
+ return 0
+ })
+
const transferCategoryId = getters.transferCategoryId
const lastCategoriesIds = []
if (state.items && rootGetters['trns/hasTrns']) {
- for (const trnId of sortedTrnsIds.slice(0, 500)) {
+ for (const trnId of trnsIds.slice(0, 500)) {
if (lastCategoriesIds.length < 12) {
- const categoryId = trns[trnId].categoryId
+ const categoryId = trnsItems[trnId].categoryId
const category = state.items[categoryId]
if (category && (category.showInLastUsed || category.showInLastUsed === undefined)) {
if (categoryId !== transferCategoryId) {
diff --git a/store/categories/index.js b/store/categories/index.js
index b035b455..6b697cce 100644
--- a/store/categories/index.js
+++ b/store/categories/index.js
@@ -1,19 +1,4 @@
-import actions from './actions'
-import getters from './getters'
-import mutations from './mutations'
-
-const state = () => ({
+export const state = () => ({
items: {},
editId: null,
- modal: {
- show: false,
- id: null,
- },
})
-
-export default {
- state,
- actions,
- getters,
- mutations,
-}
diff --git a/store/categories/mutations.js b/store/categories/mutations.js
index 8752d79c..0b631d96 100644
--- a/store/categories/mutations.js
+++ b/store/categories/mutations.js
@@ -21,20 +21,6 @@ export default {
}
},
- showCategoryModal(state) {
- state.modal.show = true
- },
-
- hideCategoryModal(state) {
- state.modal.show = false
- },
-
- setCategoryModalId(state, id) {
- state.modal.id === id
- ? state.modal.id = null
- : state.modal.id = id
- },
-
setCategoryEditId(state, id) {
state.editId === id
? state.editId = null
diff --git a/store/currencies/actions.js b/store/currencies/actions.js
index 5b869642..6f2c5a88 100644
--- a/store/currencies/actions.js
+++ b/store/currencies/actions.js
@@ -1,7 +1,7 @@
import localforage from 'localforage'
import dayjs from 'dayjs'
import { getRatesOf } from './api'
-import { getDataOnce, saveData } from '~/services/firebaseHelpers'
+import { getDataOnce, saveData } from '~/services/firebase/api'
export default {
async initCurrencies({ rootState, commit }) {
diff --git a/store/filter/actions.js b/store/filter/actions.js
index de8985fc..878caab6 100644
--- a/store/filter/actions.js
+++ b/store/filter/actions.js
@@ -2,38 +2,6 @@ import dayjs from 'dayjs'
import localforage from 'localforage'
export default {
- handleSetFilterCategory({ rootState, dispatch }, categoryId) {
- const filterCategoryId = rootState.filter.categoryId
- const filterCategory = rootState.categories.items[categoryId]
-
- if (filterCategoryId === categoryId) {
- if (filterCategory?.parentId !== 0) {
- dispatch('setFilterCategoryId', null)
- dispatch('setFilterCategoryId', filterCategory.parentId)
- }
- else {
- dispatch('setFilterCategoryId', null)
- }
- }
- else {
- dispatch('setFilterCategoryId', categoryId)
- }
- },
-
- setFilterCategoryId({ state, commit }, categoryId) {
- state.categoryId === categoryId
- ? commit('setFilterCategoryId', null)
- : commit('setFilterCategoryId', categoryId)
- // TODO: save to composition api
- },
-
- setFilterWalletId({ state, commit }, walletId) {
- state.walletId === walletId
- ? commit('setFilterWalletId', null)
- : commit('setFilterWalletId', walletId)
- // TODO: save to composition api
- },
-
setPeriod({ commit, dispatch }, period) {
if (period.custom) {
commit('setPeriod', period.name)
diff --git a/store/filter/getters.js b/store/filter/getters.js
deleted file mode 100644
index efba7fa6..00000000
--- a/store/filter/getters.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export default {
-}
diff --git a/store/filter/index.js b/store/filter/index.js
index 74a9c112..4dc0c34d 100644
--- a/store/filter/index.js
+++ b/store/filter/index.js
@@ -1,8 +1,8 @@
import dayjs from 'dayjs'
export const state = () => ({
- categoryId: null,
- walletId: null,
+ walletsIds: [],
+ catsIds: [],
date: dayjs().startOf('month').valueOf(),
period: 'month',
})
diff --git a/store/filter/mutations.js b/store/filter/mutations.js
index 214a5452..72263aa4 100644
--- a/store/filter/mutations.js
+++ b/store/filter/mutations.js
@@ -5,18 +5,10 @@ export default {
state.date = dayjs(date).valueOf()
},
- setFilterCategoryId(state, categoryId) {
- state.categoryId = categoryId
- },
-
setFilterDateNow(state) {
state.date = dayjs().valueOf()
},
- setFilterWalletId(state, walletId) {
- state.walletId = walletId
- },
-
setPeriod(state, period) {
state.period = period
},
@@ -28,4 +20,32 @@ export default {
setPeriodPrev(state, date) {
state.date = date
},
+
+ // Wallets
+ setFilterWalletsId(state, walletId) {
+ if (state.walletsIds.includes(walletId)) return
+ state.walletsIds.push(walletId)
+ },
+
+ removeFilterWalletId(state, walletId) {
+ state.walletsIds = state.walletsIds.filter(id => id !== walletId)
+ },
+
+ clearFilterWalletsIds(state) {
+ state.walletsIds = []
+ },
+
+ // Cats
+ setFilterCatsId(state, catId) {
+ if (state.catsIds.includes(catId)) return
+ state.catsIds.push(catId)
+ },
+
+ removeFilterCatId(state, catId) {
+ state.catsIds = state.catsIds.filter(id => id !== catId)
+ },
+
+ clearFilterCatsIds(state) {
+ state.catsIds = []
+ },
}
diff --git a/store/lang/actions.js b/store/lang/actions.js
index f63ae3f7..24535985 100644
--- a/store/lang/actions.js
+++ b/store/lang/actions.js
@@ -1,5 +1,5 @@
import localforage from 'localforage'
-import { getDataOnce, saveData } from '~/services/firebaseHelpers'
+import { getDataOnce, saveData } from '~/services/firebase/api'
export default {
setLang({ commit, rootGetters }, lang) {
diff --git a/store/lang/index.js b/store/lang/index.js
index 58c69796..8eeb7843 100644
--- a/store/lang/index.js
+++ b/store/lang/index.js
@@ -1,12 +1,3 @@
-import actions from './actions'
-import mutations from './mutations'
-
-const state = () => ({
+export const state = () => ({
lang: 'en',
})
-
-export default {
- state,
- actions,
- mutations,
-}
diff --git a/store/periods/index.js b/store/periods/index.js
deleted file mode 100644
index 6d8485fe..00000000
--- a/store/periods/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const state = () => ({
-})
diff --git a/store/stat/getters.js b/store/stat/getters.js
index 480579a9..9d9b0b1c 100644
--- a/store/stat/getters.js
+++ b/store/stat/getters.js
@@ -1,4 +1,5 @@
import dayjs from 'dayjs'
+import { getTrnsIds } from '~/components/trns/functions/getTrns'
export default {
/**
@@ -112,73 +113,6 @@ export default {
}
},
- /**
- * Return root category ID from trnId
- *
- * @param {String} trnId
- * @return {String} root categoryId
- */
- getRootCategoryIdFromTrnId: (state, getters, rootState) => (trnId) => {
- const trns = rootState.trns.items
- const categories = rootState.categories.items
- const wallets = rootState.wallets.items
- const trnCategoryId = trns[trnId].categoryId
-
- if (!wallets[trns[trnId].walletId]) {
- console.log('no wallet for trn', trnId, trns[trnId])
- console.log('walletId', trns[trnId].walletId)
- console.log(`https://finapp-17474.firebaseio.com/users/${rootState.user.user.uid}/trns/${trnId}`)
- }
-
- if (!categories[trnCategoryId]) {
- console.log('no category for trn', trnId, trns[trnId], categories[trnCategoryId])
- console.log(`https://finapp-17474.firebaseio.com/users/${rootState.user.user.uid}/trns/${trnId}`)
- return trnCategoryId
- }
-
- const trnCategoryParentId = categories[trnCategoryId].parentId
- return trnCategoryParentId || trnCategoryId
- },
-
- /**
- * Create categories with trnsIds from list of trnsIds
- *
- * @param {Array} trnsIds
- * @return {Object} categoryId - categoryId with trnsIDs
- * @return {Array} categoryId[] - trnsIds
- * @return {String} categoryId[] - trnId
- * { categiryId: [...trnId, trnId] }
- */
- getCategoriesIdsWithTrnsIds: (state, getters, rootState, rootGetters) => ({
- trnsIds,
- }) => {
- const filterCategoryId = rootState.filter.categoryId
- const trns = rootState.trns.items
- const transferCategoryId = rootGetters['categories/transferCategoryId']
-
- const categoriesWithTrnsIds = {}
-
- for (const trnId of trnsIds) {
- if (trns[trnId]) {
- let categoryId
- filterCategoryId
- ? categoryId = trns[trnId].categoryId
- : categoryId = getters.getRootCategoryIdFromTrnId(trnId)
-
- // Push trnId to category. Exclude transfer category
- if (categoryId !== transferCategoryId) {
- if (!categoriesWithTrnsIds[categoryId])
- categoriesWithTrnsIds[categoryId] = [trnId]
-
- else
- categoriesWithTrnsIds[categoryId].push(trnId)
- }
- }
- }
-
- return categoriesWithTrnsIds
- },
-
/**
* Stat by periods with period name and total.
*
@@ -194,15 +128,99 @@ export default {
* @return {Number} total.total
*
*/
- getStat: (_state, getters, _rootState, rootGetters) => ({ date, periodName }) => {
- const selectedTrns = rootGetters['trns/getTrns']({ date, periodName })
- const categoriesWithTrnsIds = getters.getCategoriesIdsWithTrnsIds({ trnsIds: selectedTrns })
- const totalAllTrns = rootGetters['trns/getTotalOfTrnsIds'](selectedTrns)
+ statCurrentPeriod(_state, getters, rootState, rootGetters) {
+ const trnsItems = rootState.trns.items
+ const catsItems = rootState.categories.items
+ const storeFilter = rootState.filter
+
+ // TODO: shared functions
+ function getCatsIds(catsIds) {
+ const ids = []
+
+ for (const catId of catsIds) {
+ const category = catsItems[catId]
+ category?.childIds
+ ? ids.push(...category.childIds)
+ : ids.push(catId)
+ }
+
+ return ids
+ }
+
+ const categoriesIds = rootState.filter.catsIds.length > 0 ? getCatsIds(rootState.filter.catsIds) : null
+ const walletsIds = storeFilter.walletsIds.length > 0 ? storeFilter.walletsIds : null
+
+ const trnsIds = getTrnsIds({
+ trnsItems,
+ walletsIds,
+ categoriesIds,
+ periodName: storeFilter.period,
+ date: storeFilter.date,
+ })
+
+ /**
+ * Return root category ID from trnId
+ *
+ * @param {String} trnId
+ * @return {String} root categoryId
+ */
+ function getRootCategoryIdFromTrnId(trnId) {
+ const categories = rootState.categories.items
+ const wallets = rootState.wallets.items
+ const trnCategoryId = trnsItems[trnId].categoryId
+
+ if (!wallets[trnsItems[trnId].walletId] && !wallets[trnsItems[trnId].incomeWalletId] && !wallets[trnsItems[trnId].expenseWalletId]) {
+ console.log('no wallet for trn', trnId, trnsItems[trnId])
+ console.log('walletId', trnsItems[trnId].walletId)
+ console.log(`https://finapp-17474.firebaseio.com/users/${rootState.user.user.uid}/trns/${trnId}`)
+ }
+
+ if (!categories[trnCategoryId]) {
+ console.log('no category for trn', trnId, trnsItems[trnId], categories[trnCategoryId])
+ console.log(`https://finapp-17474.firebaseio.com/users/${rootState.user.user.uid}/trns/${trnId}`)
+ return trnCategoryId
+ }
+
+ const trnCategoryParentId = categories[trnCategoryId].parentId
+ return trnCategoryParentId || trnCategoryId
+ }
+
+ function getCatsIdsWithTrnsIds() {
+ const filterCategoryId = rootState.filter.categoryId
+ const transferCategoryId = rootGetters['categories/transferCategoryId']
+ const categoriesWithTrnsIds = {}
+
+ for (const trnId of trnsIds) {
+ if (trnsItems[trnId]) {
+ let categoryId
+ filterCategoryId
+ ? categoryId = trnsItems[trnId].categoryId
+ : categoryId = getRootCategoryIdFromTrnId(trnId)
+
+ // Push trnId to category. Exclude transfer category
+ // TODO: place transfer category in one place
+ if (categoryId !== transferCategoryId) {
+ if (!categoriesWithTrnsIds[categoryId])
+ categoriesWithTrnsIds[categoryId] = [trnId]
+
+ else
+ categoriesWithTrnsIds[categoryId].push(trnId)
+ }
+ }
+ }
+
+ return categoriesWithTrnsIds
+ }
+
+ const categoriesWithTrnsIds = getCatsIdsWithTrnsIds(trnsIds)
+ const totalAllTrns = rootGetters['trns/getTotalOfTrnsIds'](trnsIds)
// count total in categories
const categoriesTotal = {}
- for (const categoryId in categoriesWithTrnsIds)
- categoriesTotal[categoryId] = rootGetters['trns/getTotalOfTrnsIds'](categoriesWithTrnsIds[categoryId])
+ for (const categoryId in categoriesWithTrnsIds) {
+ const trnsIdsInCategory = categoriesWithTrnsIds[categoryId]
+ categoriesTotal[categoryId] = rootGetters['trns/getTotalOfTrnsIds'](trnsIdsInCategory)
+ }
// separate catgories by incomes and expenses
const statIncomes = {}
@@ -260,10 +278,4 @@ export default {
return stat
},
-
- statCurrentPeriod(_state, getters, rootState) {
- const date = rootState.filter.date
- const stat = getters.getStat({ date })
- return stat
- },
}
diff --git a/store/trnForm/actions.js b/store/trnForm/actions.js
index 55aa7f22..54c891eb 100644
--- a/store/trnForm/actions.js
+++ b/store/trnForm/actions.js
@@ -8,8 +8,11 @@ export default {
})
},
- openTrnForm({ rootState, rootGetters, commit }, { action, trnId }) {
- commit('openTrnForm')
+ openTrnForm({ rootState, rootGetters, commit }, { action, trnId, isPc }) {
+ isPc
+ ? commit('openTrnFormPc')
+ : commit('openTrnForm')
+
switch (action) {
case 'create':
// get data from last trn
@@ -23,6 +26,8 @@ export default {
description: null,
groups: null,
trnId: null,
+ expenseAmount: 0,
+ incomeAmount: 0,
walletId: lastTrn.walletId,
})
}
@@ -40,6 +45,8 @@ export default {
description: null,
groups: null,
trnId: null,
+ expenseAmount: 0,
+ incomeAmount: 0,
walletId,
})
}
@@ -53,17 +60,20 @@ export default {
if (trn.type === 2) {
commit('setTrnFormValues', {
...trn,
- amount: trn.amount,
- amountType: trn.type,
+ amount: 888,
+ amountType: 2,
categoryId: trn.categoryId,
date: trn.date,
description: trn.description || null,
groups: null,
trnId,
- walletFromId: trn.walletFromId,
- walletId: trn.walletId,
- walletToId: trn.walletToId,
+ expenseWalletAmount: trn.expenseWalletAmount || trn.amount,
+ expenseWalletId: trn.expenseWalletId || trn.walletToId,
+ incomeWalletAmount: trn.incomeWalletAmount || trn.amount,
+ incomeWalletId: trn.incomeWalletId || trn.walletFromId,
})
+
+ console.log(trn)
}
// Simple
else {
diff --git a/store/trnForm/index.js b/store/trnForm/index.js
index 4c10b5e0..4061f4c8 100644
--- a/store/trnForm/index.js
+++ b/store/trnForm/index.js
@@ -1,28 +1,22 @@
import dayjs from 'dayjs'
-export const baseModalState = {
- calendar: false,
- categories: false,
- categoriesChild: false,
- description: false,
- transferFrom: false,
- transferTo: false,
- wallets: false,
- trn: false,
-}
-
export const state = () => ({
action: 'create',
-
height: '100%',
- modal: baseModalState,
- transfer: {
- from: null,
- to: null,
+ modal: {
+ calendar: false,
+ categories: false,
+ categoriesChild: false,
+ description: false,
+ transferFrom: false,
+ transferTo: false,
+ wallets: false,
+ trn: false,
},
show: false,
+ showPc: true,
showModalCategoryId: null,
showModalTrnId: null,
@@ -34,5 +28,9 @@ export const state = () => ({
description: null,
trnId: null,
walletId: null,
+ incomeAmount: 0,
+ incomeWalletId: null,
+ expenseAmount: 0,
+ expenseWalletId: null,
},
})
diff --git a/store/trnForm/mutations.js b/store/trnForm/mutations.js
index 0bbb5475..87f1bef2 100644
--- a/store/trnForm/mutations.js
+++ b/store/trnForm/mutations.js
@@ -6,11 +6,6 @@ export default {
}
},
- setTrnFormTransfer(state, { tranferType, walletId }) {
- if (tranferType)
- state.transfer[tranferType] = walletId
- },
-
setTrnFormHeight(state, height) {
state.height = height
},
@@ -39,9 +34,8 @@ export default {
state.show = false
},
- openTrnForm(state) {
- state.show = true
- },
+ openTrnForm(state) { state.show = true },
+ openTrnFormPc(state) { state.showPc = true },
toogleTrnForm(state) {
state.show = !state.show
diff --git a/store/trns/actions.js b/store/trns/actions.js
index 89fc5983..4d219a08 100644
--- a/store/trns/actions.js
+++ b/store/trns/actions.js
@@ -13,7 +13,7 @@ import {
saveData,
unsubcribeData,
updateData,
-} from '~/services/firebaseHelpers'
+} from '~/services/firebase/api'
export default {
// init
@@ -63,6 +63,8 @@ export default {
commit('trnForm/setTrnFormValues', {
trnId: null,
amount: '0',
+ incomeAmount: 0,
+ expenseAmount: 0,
description: null,
}, { root: true })
diff --git a/store/trns/getters.js b/store/trns/getters.js
index 26fd4fac..bc22094c 100644
--- a/store/trns/getters.js
+++ b/store/trns/getters.js
@@ -1,4 +1,5 @@
import dayjs from 'dayjs'
+import { getTrnsIds } from '~/components/trns/functions/getTrns'
export default {
hasTrns(_state, _getters, rootState) {
@@ -32,69 +33,76 @@ export default {
for (const key of trnsIds) {
const trn = trns[key]
if (trn && (inculdeTrnasfers || trn.categoryId !== transferCategoryId)) {
- // Simple
+ // Transaction
if (trn.type !== 2) {
const wallet = wallets[trn.walletId]
- if (wallet && currencies) {
- let amount = 0
- if (isConvertToBase && wallet.currency !== baseCurrency)
- amount = Math.abs(trn.amount / currencies[wallet.currency])
+ if (!wallet && currencies)
+ return
- else
- amount = trn.amount
+ let amount = 0
+ isConvertToBase && wallet.currency !== baseCurrency
+ ? amount = Math.abs(trn.amount / currencies[wallet.currency])
+ : amount = trn.amount
- if (trn.type === 1) incomes = incomes + amount
- else expenses = expenses + amount
- }
+ trn.type === 1
+ ? incomes = incomes + amount
+ : expenses = expenses + amount
}
+ // Transfer
if (trn.type === 2 && inculdeTrnasfers) {
- if (walletId === trn.walletFromId)
- expenses = expenses + trn.amount
+ if (walletId === trn.walletFromId || walletId === trn.expenseWalletId)
+ expenses = expenses + (trn.expenseAmount ? trn.expenseAmount : trn.amount)
- if (walletId === trn.walletToId)
- incomes = incomes + trn.amount
+ if (walletId === trn.walletToId || walletId === trn.incomeWalletId)
+ incomes = incomes + (trn.incomeAmount ? trn.incomeAmount : trn.amount)
}
}
}
return {
+ expense: Math.abs(+expenses.toFixed(0)),
+ income: Math.abs(+incomes.toFixed(0)),
+ sum: parseInt(incomes - expenses),
+ // @deprecated
expenses: Math.abs(+expenses.toFixed(0)),
incomes: Math.abs(+incomes.toFixed(0)),
total: parseInt(incomes - expenses),
}
},
- // getTrnsIdsInWallet
- getTrnsIdsInWallet: (state, getters, rootState) => (walletId) => {
- const trns = rootState.trns.items
- const trnsIds = []
- for (const trnId in trns) {
- if (trns[trnId] && (trns[trnId].walletId === walletId || trns[trnId].walletFromId === walletId || trns[trnId].walletToId === walletId))
- trnsIds.push(trnId)
- }
- return trnsIds
- },
-
lastCreatedTrnId(state, getters, rootState, rootGetters) {
- if (getters.hasTrns) {
- const trnsIds = getters.sortedTrnsIds
- const trns = rootState.trns.items
- const transferCategoryId = rootGetters['categories/transferCategoryId']
+ if (!getters.hasTrns) return
- if (trnsIds.length) {
- for (const trnId of trnsIds) {
- if (trns[trnId].categoryId !== transferCategoryId)
- return trnId
- }
+ const trnsItems = rootState.trns.items
+ const transferCategoryId = rootGetters['categories/transferCategoryId']
+ const trnsIds = Object.keys(trnsItems)
+ .sort((a, b) => {
+ if (trnsItems[a].date > trnsItems[b].date) return -1
+ if (trnsItems[a].date < trnsItems[b].date) return 1
+ return 0
+ })
+
+ if (trnsIds.length) {
+ for (const trnId of trnsIds) {
+ if (trnsItems[trnId].categoryId !== transferCategoryId && trnsItems[trnId].type !== 2)
+ return trnId
}
}
},
- firstCreatedTrnId(state, getters) {
- if (getters.hasTrns) {
- const trnsIds = [...getters.sortedTrnsIds].reverse()
- return trnsIds[0]
- }
+ firstCreatedTrnId(_state, getters, rootState) {
+ if (!getters.hasTrns) return
+
+ const trnsItems = rootState.trns.items
+ const trnsIds = Object.keys(trnsItems)
+ .sort((a, b) => {
+ if (trnsItems[a].date > trnsItems[b].date) return -1
+ if (trnsItems[a].date < trnsItems[b].date) return 1
+ return 0
+ })
+ .reverse()
+
+ return trnsIds[0]
},
firstCreatedTrnIdFromSelectedTrns(state, getters) {
@@ -103,47 +111,41 @@ export default {
return trnsIds[0]
},
- // selectedTrnsIds
+ // TODO: should use components/trns/functions/getTrns when its compatible
selectedTrnsIds(_state, getters, rootState) {
if (!getters.hasTrns) return []
- const categories = rootState.categories.items
- const filterCategoryId = rootState.filter.categoryId
- const filterWalletId = rootState.filter.walletId
- const trns = rootState.trns.items
- let trnsIds = Object.keys(trns)
-
- // filter wallet
- if (filterWalletId)
- trnsIds = trnsIds.filter(trnId => trns[trnId].walletId === filterWalletId || trns[trnId].walletToId === filterWalletId || trns[trnId].walletFromId === filterWalletId)
+ const trnsItems = rootState.trns.items
+ const catsItems = rootState.categories.items
+ const storeFilter = rootState.filter
- // filter category
- if (filterCategoryId) {
- const childCategoriesIds = categories[filterCategoryId].childIds
- if (childCategoriesIds?.length) {
- trnsIds = trnsIds.filter((trnId) => {
- const trnCategoryId = trns[trnId].categoryId
- for (const categoryId of childCategoriesIds)
- if (trnCategoryId === categoryId) return true
+ // TODO: shared functions
+ function getCatsIds(catsIds) {
+ const ids = []
- return false
- })
- }
- else {
- trnsIds = trnsIds.filter(trnId => trns[trnId].categoryId === filterCategoryId)
+ for (const catId of catsIds) {
+ const category = catsItems[catId]
+ category?.childIds
+ ? ids.push(...category.childIds)
+ : ids.push(catId)
}
+
+ return ids
}
- trnsIds = trnsIds
- .sort((a, b) => {
- if (trns[a].date > trns[b].date) return -1
- if (trns[a].date < trns[b].date) return 1
- return 0
- })
+ const categoriesIds = rootState.filter.catsIds.length > 0 ? getCatsIds(rootState.filter.catsIds) : null
+ const walletsIds = storeFilter.walletsIds.length > 0 ? storeFilter.walletsIds : null
+
+ const trnsIds = getTrnsIds({
+ trnsItems,
+ walletsIds,
+ categoriesIds,
+ })
return trnsIds
},
+ // TODO: should use components/trns/functions/getTrns when its compatible
selectedTrnsIdsWithDate(_state, getters, rootState) {
if (!getters.hasTrns) return []
@@ -171,144 +173,4 @@ export default {
return trnsIds
},
-
- // sortedTrnsIds
- sortedTrnsIds(state, getters) {
- if (!getters.hasTrns) return []
-
- const trns = state.items
- const trnsIds = Object.keys(trns)
-
- return trnsIds.sort((a, b) => {
- if (trns[a].date > trns[b].date) return -1
- if (trns[a].date < trns[b].date) return 1
- return 0
- })
- },
-
- getTrnsIdsByFilter: (_state, getters, rootState) => ({ categoryId, type }) => {
- const trns = rootState.trns.items
- let trnsIds = getters.sortedTrnsIds
- if (categoryId) trnsIds = trnsIds.filter(id => trns[id].categoryId === categoryId)
- if (type) trnsIds = trnsIds.filter(id => trns[id].type === type)
-
- return trnsIds
- },
-
- getTrns: (_state, getters, rootState) => (props) => {
- if (!getters.hasTrns) return []
-
- const { date, periodName, description, categoryId, type, disableCategoryFilter } = props
- const categories = rootState.categories.items
- const filterCategoryId = rootState.filter.categoryId || categoryId
- const filterWalletId = rootState.filter.walletId
-
- const trns = rootState.trns.items
- let trnsIds = Object.keys(trns)
-
- const filterDate = dayjs(date)
- const filterPeriod = periodName || rootState.filter.period
- const startDateValue = filterDate.startOf(filterPeriod).valueOf()
- const endDateValue = filterDate.endOf(filterPeriod).valueOf()
-
- // filter type
- if (type) {
- trnsIds = trnsIds
- .filter(trnId => (trns[trnId].type === type))
- }
-
- // filter date
- if (date && filterPeriod !== 'all') {
- trnsIds = trnsIds
- .filter(trnId => (trns[trnId].date >= startDateValue) && (trns[trnId].date <= endDateValue))
- }
-
- // filter wallet
- if (filterWalletId)
- trnsIds = trnsIds.filter(trnId => trns[trnId].walletId === filterWalletId || trns[trnId].walletToId === filterWalletId || trns[trnId].walletFromId === filterWalletId)
-
- // filter category
- if (filterCategoryId && !disableCategoryFilter) {
- const childCategoriesIds = categories[filterCategoryId].childIds
- if (childCategoriesIds?.length) {
- trnsIds = trnsIds.filter((trnId) => {
- const trnCategoryId = trns[trnId].categoryId
- for (const categoryId of childCategoriesIds)
- if (trnCategoryId === categoryId) return true
-
- return false
- })
- }
- else {
- trnsIds = trnsIds.filter(trnId => trns[trnId].categoryId === filterCategoryId)
- }
- }
-
- // description
- if (description) {
- trnsIds = trnsIds
- .filter(trnId =>
- trns[trnId].description?.includes(description))
- }
-
- trnsIds = trnsIds
- .sort((a, b) => {
- if (trns[a].date > trns[b].date) return -1
- if (trns[a].date < trns[b].date) return 1
- return 0
- })
-
- return trnsIds
- },
-
- getTrnsIds: (_state, getters, rootState) => (props) => {
- if (!getters.hasTrns) return []
-
- const { startDate, endDate, periodName } = props
- const categories = rootState.categories.items
- const filterCategoryId = props.categoryId
- const filterWalletId = props.walletId
-
- const trns = rootState.trns.items
- let trnsIds = Object.keys(trns)
-
- // filter date
- if (startDate && endDate && periodName) {
- const startDateValue = dayjs(startDate).startOf('day').valueOf()
- const endDateValue = dayjs(endDate).endOf('day').valueOf()
-
- trnsIds = trnsIds
- .filter(trnId => (trns[trnId].date >= startDateValue) && (trns[trnId].date <= endDateValue))
- }
-
- // filter wallet
- if (filterWalletId)
- trnsIds = trnsIds.filter(trnId => trns[trnId].walletId === filterWalletId || trns[trnId].walletToId === filterWalletId || trns[trnId].walletFromId === filterWalletId)
-
- // filter category
- if (filterCategoryId) {
- const childCategoriesIds = categories[filterCategoryId].childIds
- if (childCategoriesIds?.length) {
- trnsIds = trnsIds.filter((trnId) => {
- const trnCategoryId = trns[trnId].categoryId
- for (const categoryId of childCategoriesIds)
- if (trnCategoryId === categoryId) return true
-
- return false
- })
- }
- else {
- trnsIds = trnsIds.filter(trnId => trns[trnId].categoryId === filterCategoryId)
- }
- }
-
- trnsIds = trnsIds
- .sort((a, b) => {
- if (trns[a].date > trns[b].date) return -1
- if (trns[a].date < trns[b].date) return 1
- return 0
- })
-
- return trnsIds || []
- },
}
diff --git a/store/trns/index.js b/store/trns/index.js
index 298dcff5..fa76a8ab 100644
--- a/store/trns/index.js
+++ b/store/trns/index.js
@@ -1,8 +1,4 @@
-import actions from './actions'
-import getters from './getters'
-import mutations from './mutations'
-
-const state = () => ({
+export const state = () => ({
items: {},
edit: {
id: null,
@@ -12,10 +8,3 @@ const state = () => ({
id: null,
},
})
-
-export default {
- state,
- actions,
- getters,
- mutations,
-}
diff --git a/store/trns/mutations.js b/store/trns/mutations.js
index ab05bf0d..a0f52f8d 100644
--- a/store/trns/mutations.js
+++ b/store/trns/mutations.js
@@ -17,10 +17,8 @@ export default {
},
setTrnModalId(state, id) {
- if (state.modal.id === id)
- state.modal.id = null
-
- else
- state.modal.id = id
+ state.modal.id === id
+ ? state.modal.id = null
+ : state.modal.id = id
},
}
diff --git a/store/ui/index.js b/store/ui/index.js
index 16bbe2fb..06dfd0c8 100644
--- a/store/ui/index.js
+++ b/store/ui/index.js
@@ -1,7 +1,4 @@
-import actions from './actions'
-import mutations from './mutations'
-
-const state = () => ({
+export const state = () => ({
activeTab: 'stat',
activeTabStat: 'details',
@@ -12,9 +9,3 @@ const state = () => ({
defaultBgColor: '#455a64',
})
-
-export default {
- state,
- actions,
- mutations,
-}
diff --git a/store/user/actions.js b/store/user/actions.js
index 67ca5b8e..a2467ee3 100644
--- a/store/user/actions.js
+++ b/store/user/actions.js
@@ -1,9 +1,7 @@
import localforage from 'localforage'
-import dayjs from 'dayjs'
import { signOut as signOutFirebase } from 'firebase/auth'
-import { auth, getDataOnce, saveData } from '~/services/firebaseHelpers'
-import pkg from '~/package'
+import { auth, saveData } from '~/services/firebase/api'
export default {
initUser({ dispatch }, userParams) {
@@ -14,7 +12,6 @@ export default {
}
dispatch('setUser', user)
- dispatch('saveUserInfo', user)
},
setUser({ commit }, user) {
@@ -22,10 +19,7 @@ export default {
localforage.setItem('finapp.user', user)
},
- async signOut({ rootGetters, dispatch }) {
- const uid = rootGetters['user/userUid']
-
- saveData(`users-info/${uid}/actions/${dayjs().valueOf()}`, 'signOut')
+ async signOut({ dispatch }) {
await dispatch('categories/unsubcribeCategories', null, { root: true })
await dispatch('trns/unsubcribeTrns', null, { root: true })
await dispatch('wallets/unsubcribeWallets', null, { root: true })
@@ -37,34 +31,6 @@ export default {
this.app.context.redirect('/login')
},
- async saveUserInfo({ rootState }) {
- const user = rootState.user.user
- const todayValueOf = dayjs().valueOf()
-
- // add to user list
- const usersInfo = await getDataOnce(`users-info/${user.uid}/`) || {}
- const userData = {
- displayName: user.displayName,
- email: user.email,
- uid: user.uid,
- loginDate: todayValueOf,
- }
-
- saveData(`users/${user.uid}/user`, userData)
-
- saveData(`users-info/${user.uid}/name`, user.displayName)
- saveData(`users-info/${user.uid}/email`, user.email)
- saveData(`users-info/${user.uid}/uid`, user.uid)
- saveData(`users-info/${user.uid}/loginDate`, todayValueOf)
-
- // set creation date once
- if (!usersInfo || (usersInfo && !usersInfo.creationDate))
- saveData(`users-info/${user.uid}/creationDate`, todayValueOf)
-
- // set date of open app
- saveData(`users-info/${user.uid}/opensApp/${pkg.version.split('.').join('')}`, dayjs().valueOf())
- },
-
removeUserData({ rootGetters, commit, dispatch }) {
commit('app/setAppStatus', 'loading', { root: true })
dispatch('ui/setActiveTab', null, { root: true })
@@ -73,7 +39,6 @@ export default {
saveData(`users/${uid}/accounts/`, null)
saveData(`users/${uid}/categories/`, null)
saveData(`users/${uid}/trns/`, null)
- saveData(`users-info/${uid}/actions/${dayjs().valueOf()}`, 'removeUserData')
commit('app/setAppStatus', 'ready', { root: true })
},
}
diff --git a/store/user/index.js b/store/user/index.js
index c0c3e280..5103270b 100644
--- a/store/user/index.js
+++ b/store/user/index.js
@@ -1,14 +1,3 @@
-import actions from './actions'
-import getters from './getters'
-import mutations from './mutations'
-
-const state = () => ({
+export const state = () => ({
user: null,
})
-
-export default {
- state,
- actions,
- getters,
- mutations,
-}
diff --git a/store/wallets/actions.js b/store/wallets/actions.js
index 65bf5829..c99023fd 100644
--- a/store/wallets/actions.js
+++ b/store/wallets/actions.js
@@ -1,5 +1,5 @@
import localforage from 'localforage'
-import { getDataAndWatch, saveData, unsubcribeData, updateData } from '~/services/firebaseHelpers'
+import { getDataAndWatch, saveData, unsubcribeData, updateData } from '~/services/firebase/api'
export default {
initWallets({ dispatch, rootState }) {
diff --git a/store/wallets/getters.js b/store/wallets/getters.js
index 67dccf5d..c4c3cd37 100644
--- a/store/wallets/getters.js
+++ b/store/wallets/getters.js
@@ -1,6 +1,4 @@
-// getWalletAmount
-// walletsTotal
-// walletsSortedIds
+import { getTrnsIds } from '~/components/trns/functions/getTrns'
export default {
hasWallets(state, getters, rootState) {
@@ -11,27 +9,22 @@ export default {
return false
},
- // getWalletAmount
- getWalletAmount: (state, getters, rootState, rootGetters) => (walletId) => {
- const trnsIds = rootGetters['trns/getTrnsIdsInWallet'](walletId)
- const { total } = rootGetters['trns/getTotalOfTrnsIds'](trnsIds, true, false, walletId)
- return total || 0
- },
-
walletsTotal(state, getters, rootState, rootGetters) {
if (!getters.hasWallets) return {}
const walletsTotal = {}
const wallets = rootState.wallets.items
+ const trnsItems = rootState.trns.items
- const getWalletAmount = (walletId) => {
- const trnsIds = rootGetters['trns/getTrnsIdsInWallet'](walletId)
+ const getWalletTotal = (walletId) => {
+ const trnsIds = getTrnsIds({ trnsItems, walletsIds: walletId })
+ // @IncludeTransfers @!isConvertToBase
const { total } = rootGetters['trns/getTotalOfTrnsIds'](trnsIds, true, false, walletId)
return total || 0
}
Object.keys(wallets).forEach((id) => {
walletsTotal[id] = {
- base: getWalletAmount(id),
+ base: getWalletTotal(id),
currency: wallets[id].currency,
}
})
@@ -47,11 +40,4 @@ export default {
return 0
})
},
-
- getWalletWithId: (state, getters, rootState, rootGetters) => (walletId) => {
- return {
- id: walletId,
- ...rootState.wallets.items[walletId],
- }
- },
}
diff --git a/store/wallets/index.js b/store/wallets/index.js
index a4836e63..6b697cce 100644
--- a/store/wallets/index.js
+++ b/store/wallets/index.js
@@ -1,8 +1,4 @@
export const state = () => ({
items: {},
editId: null,
- modal: {
- show: false,
- id: null,
- },
})
diff --git a/store/wallets/mutations.js b/store/wallets/mutations.js
index eb5970ec..547cb7f0 100644
--- a/store/wallets/mutations.js
+++ b/store/wallets/mutations.js
@@ -8,27 +8,9 @@ export default {
state.items = freezedItems
},
- showWalletsModalWalletModal(state) {
- state.modal.show = true
- },
-
- hideWalletsModalWalletModal(state) {
- state.modal.show = false
- },
-
- setWalletsModalWalletModalId(state, id) {
- if (state.modal.id === id)
- state.modal.id = null
-
- else
- state.modal.id = id
- },
-
setWalletEditId(state, id) {
- if (state.editId === id)
- state.editId = null
-
- else
- state.editId = id
+ state.editId === id
+ ? state.editId = null
+ : state.editId = id
},
}
diff --git a/tailwind.config.js b/tailwind.config.js
index f3eec8c6..e2395a60 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -2,26 +2,32 @@ const plugin = require('tailwindcss/plugin')
module.exports = {
darkMode: 'class',
+ separator: '_',
content: [
- './components/**/*.{js,ts}',
- './layouts/**/*.{js,ts}',
- './modules/**/*.{js,ts}',
- './pages/**/*.{js,ts}',
+ './components/**/*.{js,ts,vue}',
+ './layouts/**/*.{js,ts,vue}',
+ './modules/**/*.{js,ts,vue}',
+ './pages/**/*.{js,ts,vue}',
],
theme: {
extend: {
colors: {
+ '232323': '#232323',
+ blue1: '#58a6ff',
+ blue2: '#0366d6',
+ blue3: '#3a7dff',
+ blue4: '#2183f2',
custom1: '#212121',
- dark3: '#171717',
- dark4: '#1c1c1c',
custom4: '#1c1c1c',
custom5: '#1b1b1c',
+ dark3: '#171717',
+ dark4: '#1c1c1c',
white1: '#fdfdfd',
white2: '#fcfcfd',
- blue1: '#58a6ff',
- blue2: '#0366d6',
+ income: '#2cad22',
+ expense: '#f92134',
},
fontSize: {
'2xs': '10px',
@@ -39,7 +45,7 @@ module.exports = {
plugins: [
plugin(({ addVariant }) => {
- addVariant('hocus', ['.isNotTouchDevice &:hover', '&:active'])
+ addVariant('hocus', ['.isNotTouchDevice &:not(._active):hover', '&:not(._active):active'])
}),
],
}
diff --git a/vite.config.ts b/vite.config.ts
new file mode 100644
index 00000000..70d61981
--- /dev/null
+++ b/vite.config.ts
@@ -0,0 +1,9 @@
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+ resolve: {
+ alias: {
+ '~/': '/',
+ },
+ },
+})
diff --git a/vue-shim.d.ts b/vue-shim.d.ts
index 6b11577d..d9f24faa 100644
--- a/vue-shim.d.ts
+++ b/vue-shim.d.ts
@@ -2,7 +2,3 @@ declare module '*.vue' {
import Vue from 'vue'
export default Vue
}
-
-interface Category {
- id: string
-}