Skip to content

Open source personal finance application

release(4.0.0): new TrnForm, Nuxt Bridge, composition API

Ilya Komichev4d1fe291ba00
diff --git a/assets/css/index.css b/assets/css/index.css
index c7d0dd55..05548efd 100644
--- a/assets/css/index.css
+++ b/assets/css/index.css
@@ -1,8 +1,5 @@
html {
- /* Fonts */
--font-primary: 'Roboto', 'sans-serif';
- --font-secondary: 'Nunito', 'Roboto', 'sans-serif';
- --font-number: 'Unica One', 'Roboto Condensed', 'sans-serif';
}
body {
diff --git a/assets/css/themes.css b/assets/css/themes.css
index 2e7d64b6..e1608a34 100644
--- a/assets/css/themes.css
+++ b/assets/css/themes.css
@@ -16,7 +16,7 @@ html.dark {
--foreground-secondary: 245 245 245;
/* --foreground-main: 28 28 28; */
- --foreground-main: 23 27 32;
+ --foreground-main: 0 0 0;
--foreground-hover: 58 58 60;
--foreground-active: 44 44 46;
--foreground-second: 23 23 23;
diff --git a/components/amount/getTotal.ts b/components/amount/getTotal.ts
index 9b8dd2b2..94557a85 100644
--- a/components/amount/getTotal.ts
+++ b/components/amount/getTotal.ts
@@ -1,6 +1,6 @@
-import type { CategoryID } from '~/components/categories/types'
-import type { TrnID, TrnItem } from '~/components/trns/types'
-import type { WalletID, WalletItem } from '~/components/wallets/types'
+import type { CategoryId } from '~/components/categories/types'
+import type { TrnId, TrnItem } from '~/components/trns/types'
+import type { WalletId, WalletItem } from '~/components/wallets/types'
import { TrnType } from '~/components/trns/types'
export function getAmountInRate({
@@ -24,11 +24,11 @@ export function getAmountInRate({
}
interface TotalProps {
- trnsIds: TrnID[]
- trnsItems: Record<TrnID, TrnItem>
- walletsItems: Record<WalletID, WalletItem>
- transferCategoriesIds?: CategoryID[]
- walletsIds?: WalletID[]
+ trnsIds: TrnId[]
+ trnsItems: Record<TrnId, TrnItem>
+ walletsItems: Record<WalletId, WalletItem>
+ transferCategoriesIds?: CategoryId[]
+ walletsIds?: WalletId[]
baseCurrencyCode?: string // TODO: add typings
rates?: Record<string, number> // TODO: add typings
}
diff --git a/components/base/BottomSheet2.vue b/components/base/BottomSheet2.vue
new file mode 100644
index 00000000..fc663eb5
--- /dev/null
+++ b/components/base/BottomSheet2.vue
@@ -0,0 +1,391 @@
+<script setup lang="ts">
+import { useElementSize, useEventListener, useWindowSize } from '@vueuse/core'
+
+type Event = TouchEvent | MouseEvent
+
+const props = defineProps<{
+ isShow?: boolean
+}>()
+
+const emit = defineEmits<{
+ (e: 'closed'): void
+}>()
+
+// Settings
+const settings = {
+ pixelsNeedToDrugForClose: 60,
+ pixelOffsetToStartClosing: 20,
+ debug: false,
+}
+
+// Ref Elements
+const drug = ref<HTMLElement | null>(null)
+const containerRef = ref<HTMLElement | null>(null)
+const handlerRef = ref<HTMLElement | null>(null)
+
+// State
+const initialY = ref(0)
+const clientY = ref(0)
+const isDragging = ref(true)
+const direction = ref<'up' | 'down'>('up')
+const isHandler = ref(false)
+
+const disabled = ref(true)
+const opened = ref(false)
+const isEventsAdded = ref(false)
+
+/**
+ * Next current y
+ */
+const nextCurrentY = computed(() => clientY.value - initialY.value)
+
+/*
+ * Set direction
+ */
+watch(nextCurrentY, (current, prev) => {
+ current > prev
+ ? direction.value = 'down'
+ : direction.value = 'up'
+})
+
+/**
+ * Debounce drug
+ */
+const debounce = computed(() =>
+ disabled.value || isHandler.value ? 0 : settings.pixelOffsetToStartClosing,
+)
+
+/**
+ * Diff height
+ */
+const diffHeight = computed(() => {
+ const containerHeight = drug.value?.clientHeight ?? 0
+ const handlerHeight = handlerRef.value?.clientHeight ?? 0
+ return Math.round((containerHeight + handlerHeight - nextCurrentY.value) / (containerHeight / 100))
+})
+
+/**
+ * Diff height with debounce
+ */
+const diffHeightWithDebounce = computed(() => {
+ const containerHeight = drug.value?.clientHeight ?? 0
+ const handlerHeight = handlerRef.value?.clientHeight ?? 0
+ return Math.round((containerHeight + handlerHeight - nextCurrentY.value + debounce.value) / (containerHeight / 100))
+})
+
+/**
+ * Overlay Opacity
+ */
+const overlayStyles = computed(() => {
+ if (nextCurrentY.value <= debounce.value)
+ return
+
+ let opacity = 1
+ if (diffHeight.value < 0 || diffHeight.value > 100) {
+ opacity = nextCurrentY.value <= 100 ? 1 : 0
+ }
+ else {
+ opacity = Number(diffHeightWithDebounce.value >= 100
+ ? 1
+ : diffHeightWithDebounce.value >= 10
+ ? `0.${diffHeightWithDebounce.value}`
+ : `0.0${diffHeightWithDebounce.value}`,
+ )
+ }
+ return {
+ opacity,
+ }
+})
+
+/**
+ * Drug styles
+ */
+const drugStyles = computed(() => {
+ if (nextCurrentY.value <= debounce.value) {
+ return {
+ opacity: 1,
+ transform: '',
+ }
+ }
+
+ return {
+ transform: `translateX(-50%) translateY(${nextCurrentY.value - debounce.value}px)`,
+ ...overlayStyles.value,
+ }
+})
+
+/**
+ * Get client Y
+ */
+function getClientY(event: Event): number {
+ return 'touches' in event
+ ? Math.round(event.touches[0].clientY)
+ : event.clientY
+}
+
+/**
+ * Content has scroll
+ */
+function contentHasScroll(event: Event) {
+ // Handle scroll inside slider
+ const swiperSlideActive = drug.value?.querySelector('.swiper-slide-active')
+ if (swiperSlideActive) {
+ const scrollerBlock = swiperSlideActive.querySelector('.scrollerBlock')
+ if (scrollerBlock)
+ return scrollerBlock.scrollTop > 0 && event.type.includes('touch')
+ }
+
+ // const scrollerBlock = drug.value?.querySelector('.scrollerBlock')
+ // if (!swiperSlideActive && drug.value)
+ // return drug.value.scrollTop > 0 && event.type.includes('touch')
+
+ const scrollerBlock = drug.value?.querySelector('.scrollerBlock')
+ if (!swiperSlideActive && scrollerBlock)
+ return scrollerBlock.scrollTop > 0 && event.type.includes('touch')
+}
+
+/**
+ * Drag start
+ */
+function onDragStart(event: Event): void {
+ if (disabled.value)
+ return
+
+ if (event.target instanceof Element) {
+ isHandler.value = event.target.classList.contains('handler')
+ const isTarget = event.target.closest('.drug')
+ const isHasScroll = contentHasScroll(event)
+
+ if ((!isTarget || isHasScroll) && !isHandler.value) {
+ isDragging.value = false
+ return
+ }
+
+ clientY.value = getClientY(event)
+ initialY.value = clientY.value + initialY.value
+ isDragging.value = true
+ }
+}
+
+const debug = ref({
+ status: 'standby',
+ direction: computed(() => direction.value),
+ diffHeight: computed(() => diffHeight.value),
+ diffHeightWithDebounce: computed(() => diffHeightWithDebounce.value),
+ nextCurrentY: computed(() => nextCurrentY.value),
+})
+
+/**
+ * Dragging
+ */
+function onDragging(event: Event): void {
+ if (disabled.value)
+ return
+
+ const isHasScroll = contentHasScroll(event)
+
+ if (isHasScroll && !isHandler.value) {
+ isDragging.value = false
+ initialY.value = 0
+ clientY.value = 0
+ return
+ }
+
+ // drug on pc only by handler drug on mobile everywhere
+ // if (isDragging.value && ((!isHandler.value && event.type.includes('touch') || isHandler.value)))
+ // clientY.value = getClientY(event)
+
+ if (isDragging.value)
+ clientY.value = getClientY(event)
+
+ if (settings.debug) {
+ nextCurrentY.value >= settings.pixelsNeedToDrugForClose && direction.value === 'down'
+ ? debug.value.status = 'will close'
+ : debug.value.status = 'will open'
+ }
+}
+
+/**
+ * Drag end
+ */
+function onDragEnd(): void {
+ if (disabled.value || !isDragging.value)
+ return
+
+ const isNeedClose = (nextCurrentY.value >= settings.pixelsNeedToDrugForClose) && direction.value === 'down'
+ isNeedClose
+ ? close()
+ : open()
+}
+
+/**
+ * Clear
+ */
+function clear() {
+ clientY.value = 0
+ isDragging.value = false
+}
+
+function setInitialY() {
+ initialY.value = -((drug.value?.clientHeight ?? 0) + (handlerRef.value?.clientHeight ?? 0))
+}
+
+/**
+ * Close modal
+ */
+function close() {
+ clear()
+ setInitialY()
+}
+
+/**
+ * Open modal
+ */
+function open() {
+ clear()
+ opened.value = true
+ initialY.value = 0
+}
+
+/**
+ * On close modal
+ */
+function onClose() {
+ // Scroll up all scroller blocks
+ const scrollerBlocks = drug.value?.querySelectorAll('.scrollerBlock')
+ scrollerBlocks?.forEach(el => el.scrollTop = 0)
+ drug.value?.removeEventListener('transitionend', onClose)
+ opened.value = false
+ emit('closed')
+}
+
+/**
+ * Add events listeners
+ */
+function addEvents() {
+ if (isEventsAdded.value)
+ return
+
+ isEventsAdded.value = true
+
+ // Touch
+ useEventListener(containerRef, 'touchstart', onDragStart, { passive: true })
+ useEventListener(containerRef, 'touchmove', onDragging, { passive: true })
+ useEventListener(containerRef, 'touchend', onDragEnd, { passive: true })
+
+ // Mouse
+ useEventListener(containerRef, 'mousedown', onDragStart, { passive: true })
+ useEventListener(document, 'mousemove', onDragging, { passive: true })
+
+ // Mouse: Finish drag event only when mouse released
+ useEventListener(containerRef, 'mouseup', onDragEnd, { passive: true })
+ useEventListener(document, 'mouseleave', onDragEnd, { passive: true })
+}
+
+/**
+ * Init modal
+ */
+async function init() {
+ setTimeout(async () => {
+ setInitialY()
+ disabled.value = false
+ addEvents()
+ setTimeout(() => {
+ open()
+ }, 100)
+ }, 10)
+}
+
+/**
+ * Watch for diff height
+ */
+watch(diffHeight, () => {
+ if (isDragging.value)
+ return
+
+ if (diffHeight.value === 0) {
+ disabled.value = true
+ useEventListener(drug, 'transitionend', onClose, { passive: true })
+ return
+ }
+
+ disabled.value = false
+})
+
+/**
+ * Run init when mounted or isShow changed
+ */
+watch(() => props.isShow, async () => {
+ if (props.isShow)
+ await init()
+
+ if (!props.isShow && opened.value)
+ close()
+}, { immediate: true })
+
+/**
+ * Height
+ */
+const { height: drugHeight } = useElementSize(drug)
+const { height: windowHeight } = useWindowSize()
+
+const drugClasses = computed(() => ({
+ 'rounded-tl-xl rounded-tr-xl': drugHeight.value < windowHeight.value,
+ 'transition-opacity transition-transform': !isDragging.value && opened.value,
+ 'pointer-events-none': isDragging.value && drugStyles.value.transform,
+}))
+
+const overflowClasses = computed(() => ({
+ 'transition-opacity': !isDragging.value && opened.value,
+ 'pointer-events-none opacity-0': !opened.value,
+}))
+
+const wrapClasses = computed(() => ({
+ 'pointer-events-none invisible opacity-0': !opened.value,
+}))
+</script>
+
+<template lang="pug">
+.z-50.select-none.overflow-hidden.absolute.inset-0.w-full.h-full(
+ ref="containerRef"
+ :class="wrapClasses"
+)
+ //- Overlay
+ div(
+ :class="overflowClasses"
+ :style="overlayStyles"
+ class=`
+ absolute inset-0 w-full h-full
+ bg-foreground-main/70
+ `
+ @click="close()"
+ )
+
+ //- Drug
+ .drug(
+ ref="drug"
+ :class="drugClasses"
+ :style="drugStyles"
+ class=`
+ overflow-hidden
+ z-10 absolute left-1/2 bottom-0 w-full max-w-5xl h-auto
+ -translate-x-1/2 translate-y-0
+ bg-foreground-second
+ `
+ @click.stop=""
+ )
+
+ div(ref="handlerRef")
+ slot(name="handler" :close="close")
+
+ slot(:close="close")
+ .overflow-hidden.grid.h-full.select-none
+ .flex.flex-col.gap-2
+ .p-2 Status: {{ debug.status }}
+ .p-2 Direction: {{ debug.direction }}
+ .p-2 DiffHeight: {{ diffHeight }}
+ .p-2 DiffHeightWithDebounce: {{ debug.diffHeightWithDebounce }}
+ .p-2 NextCurrentY: {{ debug.nextCurrentY }}
+ .p-2 drugStyles: {{ drugStyles }}
+ .p-2 overlayStyles: {{ overlayStyles }}
+</template>
diff --git a/components/categories/Delete.vue b/components/categories/Delete.vue
index 38af0a95..e7f19d88 100644
--- a/components/categories/Delete.vue
+++ b/components/categories/Delete.vue
@@ -2,10 +2,10 @@
import { getTrnsIds } from '~/components/trns/getTrns'
import { errorEmo, random, successEmo } from '~/assets/js/emo'
import { removeData } from '~/services/firebase/api'
-import type { CategoryID } from '~/components/categories/types'
+import type { CategoryId } from '~/components/categories/types'
const props = defineProps<{
- categoryId: CategoryID
+ categoryId: CategoryId
}>()
const { $store, $notify } = useNuxtApp()
diff --git a/components/categories/Form.vue b/components/categories/Form.vue
index 688e6d63..e1d412f9 100644
--- a/components/categories/Form.vue
+++ b/components/categories/Form.vue
@@ -1,13 +1,13 @@
<script setup lang="ts">
import { generateId } from '~/utils/generateId'
import icons from '~/assets/js/icons'
-import type { CategoryForm, CategoryID, CategoryItem } from '~/components/categories/types'
+import type { CategoryForm, CategoryId, CategoryItem } from '~/components/categories/types'
import { allColors } from '~/assets/js/colors'
import { getPreparedFormData } from '~/components/categories/getForm'
import { saveData } from '~/services/firebase/api'
const props = defineProps<{
- categoryId?: CategoryID
+ categoryId?: CategoryId
categoryForm: CategoryForm
}>()
@@ -41,7 +41,7 @@ const tabs = computed(() => [{
* Find category with color
*/
function findCategoryIconByColor(color) {
- const categoriesItems: Record<CategoryID, CategoryItem> = $store.state.categories.items
+ const categoriesItems: Record<CategoryId, CategoryItem> = $store.state.categories.items
if (!categoriesItems)
return
@@ -53,7 +53,7 @@ function findCategoryIconByColor(color) {
/**
* Select parent
*/
-function onParentSelect(parentId: CategoryID) {
+function onParentSelect(parentId: CategoryId) {
emit('updateValue', 'parentId', parentId)
// Change category color when patent category changed
@@ -227,7 +227,7 @@ div
:ids="$store.getters['categories/categoriesForBeParent'].filter(id => id !== categoryId)"
:slider="() => ({})"
class="!gap-x-1"
- @onClick="onParentSelect"
+ @click="onParentSelect"
)
//- Icon
diff --git a/components/categories/Item.vue b/components/categories/Item.vue
index 05cf9c2c..9dbf7cdf 100644
--- a/components/categories/Item.vue
+++ b/components/categories/Item.vue
@@ -1,28 +1,30 @@
<script setup lang="ts">
-import type { CategoryID, CategoryItem } from '~/components/categories/types'
+import type { CategoryId, CategoryItem } from '~/components/categories/types'
import useFilter from '~/components/filter/useFilter'
const props = defineProps<{
activeItemId: string | 0
category: CategoryItem
- id: CategoryID
+ id: CategoryId
isHideParentCategory?: boolean
slider: any
}>()
-const emit = defineEmits(['onClick'])
+const emit = defineEmits<{
+ (e: 'click', id: CategoryId): void
+}>()
const { $store } = useNuxtApp()
const { setFilterCatsId } = useFilter()
+
const childCategoriesIds = computed(() =>
$store.getters['categories/getChildCategoriesIds'](props.id))
const parentCategory = computed(() => $store.state.categories.items[props.category?.parentId])
-const onClickItem = () => emit('onClick', props.id)
function onClickIcon() {
// Prevent filter when using in TrnForm
if (props.slider) {
- onClickItem()
+ emit('click', props.id)
return
}
@@ -37,7 +39,7 @@ function onClickIcon() {
.cursor-pointer.py-2.px-2.gap-x-3.flex.items-center.rounded-md.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
v-if="category"
:class="{ '!cursor-default !bg-skin-item-main-active': activeItemId === id }"
- @click="onClickItem"
+ @click="emit('click', id)"
)
.w-8.h-8.flex.items-center.justify-center.rounded-full.text-xl.leading-none.text-neutral-50(
:style="{ background: category.color }"
diff --git a/components/categories/List.vue b/components/categories/List.vue
index 9e47421f..e928e98f 100644
--- a/components/categories/List.vue
+++ b/components/categories/List.vue
@@ -1,8 +1,8 @@
<script setup lang="ts">
-import type { CategoryID } from '~/components/categories/types'
+import type { CategoryId } from '~/components/categories/types'
defineProps<{
- ids: CategoryID[]
+ ids: CategoryId[]
activeItemId?: string | 0
isHideParentCategory?: boolean
slider?: object
diff --git a/components/categories/getCategories.ts b/components/categories/getCategories.ts
index 2baaa144..676820ad 100644
--- a/components/categories/getCategories.ts
+++ b/components/categories/getCategories.ts
@@ -1,13 +1,13 @@
-import type { CategoryID, CategoryItem } from '~/components/categories/types'
+import type { CategoryId, CategoryItem } from '~/components/categories/types'
export function getTransactibleCategoriesIds(
- catsIds: CategoryID[],
- categoriesItems: Record<CategoryID, CategoryItem>,
-): CategoryID[] {
+ catsIds: CategoryId[],
+ categoriesItems: Record<CategoryId, CategoryItem>,
+): CategoryId[] {
return catsIds.map(id => categoriesItems[id]?.childIds ?? id).flat()
}
-export function getTransferCategoriesIds(items: Record<CategoryID, CategoryItem>): CategoryID[] {
+export function getTransferCategoriesIds(items: Record<CategoryId, CategoryItem>): CategoryId[] {
const names = ['перевод', 'transfer']
const categoriesIdsByName = Object.keys(items)
@@ -17,8 +17,8 @@ export function getTransferCategoriesIds(items: Record<CategoryID, CategoryItem>
}
export function getParentCategory(
- items: Record<CategoryID, CategoryItem>,
- parentId: CategoryID | 0,
+ items: Record<CategoryId, CategoryItem>,
+ parentId: CategoryId | 0,
): CategoryItem | false {
if (parentId === 0)
return false
diff --git a/components/categories/page/List.vue b/components/categories/page/List.vue
index 481b4fbb..45ce61eb 100644
--- a/components/categories/page/List.vue
+++ b/components/categories/page/List.vue
@@ -25,7 +25,7 @@ UiPage
.pt-1.pb-12.px-2
CategoriesList(
:ids="categoriesRootIds"
- @onClick="catId => $router.push(`/categories/${catId}`)"
+ @click="catId => $router.push(`/categories/${catId}`)"
)
template(#bottom)
diff --git a/components/categories/page/id/Edit.vue b/components/categories/page/id/Edit.vue
index 3c324abf..37311228 100644
--- a/components/categories/page/id/Edit.vue
+++ b/components/categories/page/id/Edit.vue
@@ -1,5 +1,5 @@
<script setup lang="ts">
-import type { CategoryID, CategoryItem } from '~/components/categories/types'
+import type { CategoryId, CategoryItem } from '~/components/categories/types'
import { getPreparedFormData } from '~/components/categories/getForm'
import { getParentCategory } from '~/components/categories/getCategories'
@@ -7,7 +7,7 @@ const { $store } = useNuxtApp()
const router = useRouter()
const route = useRoute()
-const categoryId = computed<CategoryID>(() => route.params.id)
+const categoryId = computed<CategoryId>(() => route.params.id)
const category = computed<CategoryItem>(() => $store.state.categories.items[categoryId.value])
const categoryForm = ref(getPreparedFormData(category.value))
const parentCategory = computed(() =>
diff --git a/components/categories/page/id/Index.vue b/components/categories/page/id/Index.vue
index 1c6dd760..b7c7ca47 100644
--- a/components/categories/page/id/Index.vue
+++ b/components/categories/page/id/Index.vue
@@ -86,7 +86,7 @@ UiPage(v-if="category")
:ids="categoryChildIds"
:slider="() => ({})"
isHideParentCategory
- @onClick="id => $router.push(`/categories/${id}`)"
+ @click="id => $router.push(`/categories/${id}`)"
)
//- History
diff --git a/components/categories/types.ts b/components/categories/types.ts
index deb2dd24..44ecaebc 100644
--- a/components/categories/types.ts
+++ b/components/categories/types.ts
@@ -1,15 +1,17 @@
-export type CategoryID = string
+export type CategoryId = string
export interface CategoryItem {
color: string
icon: string
name: string
- parentId: CategoryID | 0
- childIds?: CategoryID[]
+ parentId: CategoryId | 0
+ childIds?: CategoryId[]
+ showInLastUsed: boolean
+ showInQuickSelector: boolean
}
export interface CategoryStore {
- items: Record<CategoryID, CategoryItem>
+ items: Record<CategoryId, CategoryItem>
}
export interface CategoryForm {
@@ -22,3 +24,5 @@ export interface CategoryForm {
showInQuickSelector: boolean
showStat: boolean
}
+
+export type Categories = Record<CategoryId, CategoryItem>
diff --git a/components/currencies/types.ts b/components/currencies/types.ts
index b34b8815..ebe83ac4 100644
--- a/components/currencies/types.ts
+++ b/components/currencies/types.ts
@@ -1 +1,3 @@
export type CurrencyCode = string
+
+export type Rates = Record<CurrencyCode, any>
diff --git a/components/currencies/utils.ts b/components/currencies/utils.ts
new file mode 100644
index 00000000..05a0faa4
--- /dev/null
+++ b/components/currencies/utils.ts
@@ -0,0 +1,13 @@
+import currency from 'currency.js'
+
+// TODO: refactor to Object Params
+// TODO: is same like in Stat component?
+export function formatByCurrency(value: string, separator: string, symbol?: string) {
+ return currency(value, {
+ pattern: '#',
+ precision: 0,
+ separator,
+ symbol,
+ })
+ .format()
+}
diff --git a/components/filter/useFilter.ts b/components/filter/useFilter.ts
index c05916bc..83525e94 100644
--- a/components/filter/useFilter.ts
+++ b/components/filter/useFilter.ts
@@ -1,5 +1,5 @@
-import type { CategoryID } from '~/components/categories/types'
-import type { WalletID } from '~/components/wallets/types'
+import type { CategoryId } from '~/components/categories/types'
+import type { WalletId } from '~/components/wallets/types'
export default function useFilter() {
const { $store } = useNuxtApp()
@@ -26,7 +26,7 @@ export default function useFilter() {
scrollTop()
}
- function setFilterWalletsId(walletId: WalletID) {
+ function setFilterWalletsId(walletId: WalletId) {
if (isNeedToRedirect.value)
router.push('/')
@@ -34,7 +34,7 @@ export default function useFilter() {
scrollTop()
}
- function toggleWalletFilter(walletId: WalletID) {
+ function toggleWalletFilter(walletId: WalletId) {
if ($store.state.filter.walletsIds.includes(walletId)) {
$store.commit('filter/removeFilterWalletId', walletId)
scrollTop()
@@ -49,7 +49,7 @@ export default function useFilter() {
function setDayDate(date) {
$store.dispatch('filter/setPeriod', 'day')
- $store.dispatch('filter/setDate', parseInt(date))
+ $store.dispatch('filter/setDate', Number.parseInt(date))
scrollTop()
}
@@ -57,7 +57,7 @@ export default function useFilter() {
* Removes
*
*/
- function removeFilterCategoryId(id: CategoryID) {
+ function removeFilterCategoryId(id: CategoryId) {
$store.commit('filter/removeFilterCategoryId', id)
}
diff --git a/components/layout/MenuBottom.vue b/components/layout/MenuBottom.vue
index 87266c09..6b10b31f 100644
--- a/components/layout/MenuBottom.vue
+++ b/components/layout/MenuBottom.vue
@@ -1,7 +1,11 @@
<script setup lang="ts">
import useMenuData from '~/components/menu/useMenuData'
+import { useTrnForm, useTrnFormStore } from '~/components/trnForm/useTrnForm'
const { $store } = useNuxtApp()
+const $trnForm = useTrnFormStore()
+const { trnFormCreate } = useTrnForm()
+
const { onClick, checkIsActive } = useMenuData()
const activeTab = computed(() => $store.state.ui.activeTab)
</script>
@@ -30,7 +34,7 @@ const activeTab = computed(() => $store.state.ui.activeTab)
:class="{ 'text-blue3 dark_text-white': checkIsActive('categories'), 'group-hover_text-white': !checkIsActive('categories') }"
)
- .openTrnForm(@click="$store.dispatch('trnForm/openTrnForm', { action: 'create' })")
+ .openTrnForm(@click="trnFormCreate")
svg(
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
diff --git a/components/layout/Modals.vue b/components/layout/Modals.vue
index bdf7a60d..d8f849df 100644
--- a/components/layout/Modals.vue
+++ b/components/layout/Modals.vue
@@ -1,28 +1,6 @@
-<script lang="ts">
-export default defineComponent({
- setup() {
- const { $store } = useNuxtApp()
- const activeTab = computed(() => $store.state.ui.activeTab)
-
- return {
- activeTab,
- }
- },
-})
-</script>
-
<template lang="pug">
.h-0
- //- TrnForm
- BaseBottomSheet(
- keepAlive
- :show="$store.getters['wallets/hasWallets'] && $store.getters['categories/hasCategories'] && $store.state.trnForm.show"
- @closed="$store.dispatch('trnForm/closeTrnForm')"
- )
- template(#handler="{ close }")
- BaseBottomSheetHandler
- BaseBottomSheetClose(@onClick="close")
- TrnForm(:show="$store.getters['wallets/hasWallets'] && $store.getters['categories/hasCategories'] && $store.state.trnForm.show")
+ TrnFormWrap
//- Trn Item
TrnsItemModal
diff --git a/components/menu/useMenuData.ts b/components/menu/useMenuData.ts
index a5a121b1..e454d512 100644
--- a/components/menu/useMenuData.ts
+++ b/components/menu/useMenuData.ts
@@ -1,3 +1,5 @@
+import { useTrnForm, useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
interface MenuItem {
icon: string
name: string
@@ -6,8 +8,10 @@ interface MenuItem {
export default function useMenuData() {
const { $store, nuxt2Context: { i18n } } = useNuxtApp()
+ const { trnFormCreate } = useTrnForm()
const route = useRoute()
const router = useRouter()
+ const $trnForm = useTrnFormStore()
const items = computed(() => ({
trnForm: {
@@ -37,18 +41,18 @@ export default function useMenuData() {
}))
function onClick(menuId: string) {
- menuId === 'trnForm'
- ? $store.dispatch('trnForm/openTrnForm', { action: 'create' })
- : router.push(`/${menuId}`)
+ $store.dispatch('ui/setActiveTab', null)
- if (menuId === 'history')
- router.push(`/${menuId}`)
+ if (menuId === 'trnForm') {
+ trnFormCreate()
+ return
+ }
- $store.dispatch('ui/setActiveTab', null)
+ router.push(`/${menuId}`)
}
function checkIsActive(menuId: string) {
- return route.name.includes(menuId)
+ return route.name?.includes(menuId)
}
function checkIsShow(item: MenuItem) {
diff --git a/components/modal/ModalBottom.vue b/components/modal/ModalBottom.vue
index 9c66648c..d2d70c9f 100644
--- a/components/modal/ModalBottom.vue
+++ b/components/modal/ModalBottom.vue
@@ -1,4 +1,5 @@
<script>
+// TODO: need to deprecate
import useTouchClose from '~/components/base/modal/useTouchClose'
export default {
diff --git a/components/shared/copyright/Copyright.vue b/components/shared/copyright/Copyright.vue
index e8473d1b..5456d4a7 100644
--- a/components/shared/copyright/Copyright.vue
+++ b/components/shared/copyright/Copyright.vue
@@ -1,5 +1,5 @@
<template lang="pug">
-a.flex-center.py-3.px-5.rounded-md.hocus_bg-item-hover.transition(
+a.flex-center.py-2.px-5.rounded-md.hocus_bg-item-hover.transition(
href="https://ilko.me"
)
| {{ $t('app.madeBy.text') }}
diff --git a/components/stat/WelcomeActions.vue b/components/stat/WelcomeActions.vue
index 8afeca77..6bed83db 100644
--- a/components/stat/WelcomeActions.vue
+++ b/components/stat/WelcomeActions.vue
@@ -1,6 +1,10 @@
<script setup lang="ts">
+import { useTrnForm, useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
const { $store } = useNuxtApp()
const router = useRouter()
+const $trnForm = useTrnFormStore()
+const { trnFormCreate } = useTrnForm()
if (!$store.getters['wallets/hasWallets'] || !$store.getters['categories/hasCategories'])
router.replace('/welcome')
@@ -12,20 +16,16 @@ if (!$store.getters['wallets/hasWallets'] || !$store.getters['categories/hasCate
SharedButton._text-center._blue2(
:title="$t('create')"
- @onClick="$store.dispatch('trnForm/openTrnForm', { action: 'create' })"
+ @onClick="trnFormCreate"
)
</template>
-<i18n lang="json5">
-{
- "en": {
- "intro": "To see Statistics",
- "create": "Create your first Transaction",
- },
+<i18n lang="yaml">
+en:
+ intro: To see Statistics
+ create: Create your first Transaction
- "ru": {
- "intro": "Чтобы увидеть статистику",
- "create": "Создайте свою первую Транзакцию",
- }
-}
+ru:
+ intro: Чтобы увидеть статистику
+ create: Создайте свою первую Транзакцию
</i18n>
diff --git a/components/stat/group/horizontal/Item.vue b/components/stat/group/horizontal/Item.vue
index 546eefe9..4c86287c 100644
--- a/components/stat/group/horizontal/Item.vue
+++ b/components/stat/group/horizontal/Item.vue
@@ -1,5 +1,5 @@
<script setup lang="ts">
-import type { CategoryID, CategoryItem } from '~/components/categories/types'
+import type { CategoryId, CategoryItem } from '~/components/categories/types'
import type { TrnType } from '~/components/trns/types'
import useFilter from '~/components/filter/useFilter'
import useStatPage from '~/components/stat/useStatPage'
@@ -10,7 +10,7 @@ const props = defineProps<{
total: number
type: TrnType
category: CategoryItem
- categoryId: CategoryID
+ categoryId: CategoryId
}>()
const { $store } = useNuxtApp()
diff --git a/components/stat/group/horizontal/ItemCat.vue b/components/stat/group/horizontal/ItemCat.vue
index f39f4f1e..7f60e3cb 100644
--- a/components/stat/group/horizontal/ItemCat.vue
+++ b/components/stat/group/horizontal/ItemCat.vue
@@ -1,12 +1,12 @@
<script setup lang="ts">
// TODO: setup
-import type { CategoryID } from '~/components/categories/types'
+import type { CategoryId } from '~/components/categories/types'
import { getTotal } from '~/components/amount/getTotal'
import type { TrnType } from '~/components/trns/types'
const props = defineProps<{
type: TrnType
- categoryId: CategoryID
+ categoryId: CategoryId
}>()
const { $store } = useNuxtApp()
diff --git a/components/stat/group/horizontal/ItemCatItem.vue b/components/stat/group/horizontal/ItemCatItem.vue
index 284eb39e..b7745d48 100644
--- a/components/stat/group/horizontal/ItemCatItem.vue
+++ b/components/stat/group/horizontal/ItemCatItem.vue
@@ -1,5 +1,5 @@
<script setup lang="ts">
-import type { CategoryID, CategoryItem } from '~/components/categories/types'
+import type { CategoryId, CategoryItem } from '~/components/categories/types'
import useFilter from '~/components/filter/useFilter'
import type { TrnType } from '~/components/trns/types'
import useStatPage from '~/components/stat/useStatPage'
@@ -9,7 +9,7 @@ const props = defineProps<{
total: number
type: TrnType
category: CategoryItem
- categoryId: CategoryID
+ categoryId: CategoryId
}>()
const { $store } = useNuxtApp()
diff --git a/components/stat/group/horizontal/types.ts b/components/stat/group/horizontal/types.ts
index a565d54f..3551c441 100644
--- a/components/stat/group/horizontal/types.ts
+++ b/components/stat/group/horizontal/types.ts
@@ -1,10 +1,10 @@
import type { TrnType } from '~/components/trns/types'
-import type { CategoryID, CategoryItem } from '~/components/categories/types'
+import type { CategoryId, CategoryItem } from '~/components/categories/types'
export interface StatGroupHorizontalItemProps {
biggest: number
total: number
type: TrnType
category: CategoryItem
- categoryId: CategoryID
+ categoryId: CategoryId
}
diff --git a/components/trnForm/Amount.vue b/components/trnForm/Amount.vue
deleted file mode 100644
index e8e8904b..00000000
--- a/components/trnForm/Amount.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<script>
-import useCalculator from '~/components/trnForm/calculator/useCalculator'
-
-export default {
- setup() {
- const { $store } = useNuxtApp()
- const { isSum, getResult, expression } = useCalculator()
- const amountType = computed(() => $store.state.trnForm.values.amountType)
-
- return {
- amountType,
- isSum,
- getResult,
- expression,
- className: computed(() => ({
- _expense: amountType.value === 0,
- _income: amountType.value === 1,
- })),
- }
- },
-
- methods: {
- handleChangeAmountType() {
- let nextAmountType = 0
-
- switch (this.amountType) {
- case 0:
- nextAmountType = 1
- break
- case 1:
- if (this.$store.getters['wallets/walletsSortedIds'].length > 1)
- nextAmountType = 0
- break
- }
-
- this.$store.commit('trnForm/setTrnFormValues', {
- amountType: nextAmountType,
- })
- },
- },
-}
-</script>
-
-<template lang="pug">
-.trnFormAmount(:class="className")
- .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
- ^[0]._expense &
- color var(--c-expense-1)
- ^[0]._income &
- color var(--c-income-1)
-
- &__value
- typo-money()
- padding 0
- font-weight 500
- line-height 32px
- word-break break-word
- white-space normal
- background none
- border none
-
- ^[0]._expense &
- color var(--c-expense-1)
-
- ^[0]._income &
- color var(--c-income-1)
-
- &__evaluation
- opacity .8
- height 14px
- font-size 14px
-</style>
diff --git a/components/trnForm/Categories.vue b/components/trnForm/Categories.vue
index 62ad0900..c2e033a1 100644
--- a/components/trnForm/Categories.vue
+++ b/components/trnForm/Categories.vue
@@ -1,45 +1,44 @@
-<script>
+<script setup lang="ts">
import SwiperCore from 'swiper'
import 'swiper/swiper-bundle.css'
-
-export default {
- name: 'TrnFormCategories',
-
- data() {
- return {
- slider: null,
- }
- },
-
- mounted() {
- const initialSlide = 1
-
- this.slider = new SwiperCore(this.$refs.trnFormCategories, {
- observer: true,
- observeParents: true,
- slidesPerView: 1,
- touchStartPreventDefault: false,
- autoHeight: false,
- initialSlide,
- shortSwipes: false,
- longSwipesRatio: 0.1,
- longSwipesMs: 60,
- })
- },
-
- methods: {
- handleCategoryClick(categoryId) {
- if (this.$store.getters['categories/isCategoryHasChildren'](categoryId)) {
- this.$store.commit('trnForm/setTrnFormModalCategoryId', categoryId)
- this.$store.commit('trnForm/showTrnFormModal', 'categoriesChild')
- }
- else {
- this.$emit('closeModal')
- this.$store.commit('trnForm/setTrnFormValues', { categoryId })
- }
- },
- },
+import type { CategoryId } from '../categories/types'
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
+const emit = defineEmits<{
+ (e: 'closeModal'): void
+}>()
+
+const { $store } = useNuxtApp()
+const $trnForm = useTrnFormStore()
+const slider = ref()
+const trnFormCategories = ref()
+
+function onClick(categoryId: CategoryId) {
+ if ($store.getters['categories/isCategoryHasChildren'](categoryId)) {
+ $store.commit('trnForm/setTrnFormModalCategoryId', categoryId)
+ $store.commit('trnForm/showTrnFormModal', 'categoriesChild')
+ }
+ else {
+ $trnForm.values.categoryId = categoryId
+ emit('closeModal')
+ }
}
+
+onMounted(() => {
+ const initialSlide = 1
+
+ slider.value = new SwiperCore(trnFormCategories.value, {
+ observer: true,
+ observeParents: true,
+ slidesPerView: 1,
+ touchStartPreventDefault: false,
+ autoHeight: false,
+ initialSlide,
+ shortSwipes: false,
+ longSwipesRatio: 0.1,
+ longSwipesMs: 60,
+ })
+})
</script>
<template lang="pug">
@@ -54,10 +53,10 @@ export default {
| {{ $t('categories.lastUsedTitle') }} {{ $t('categories.title') }}
.pb-1.px-3
CategoriesList(
- :activeItemId="$store.state.trnForm.values.categoryId"
+ :activeItemId="$trnForm?.values?.categoryId"
:ids="$store.getters['categories/recentCategoriesIds']"
class="!gap-x-1"
- @onClick="handleCategoryClick"
+ @click="onClick"
)
//- Main
@@ -67,10 +66,10 @@ export default {
| {{ $t('categories.title') }}
.pb-1.px-3
CategoriesList(
- :activeItemId="$store.state.trnForm.values.categoryId"
+ :activeItemId="$trnForm?.values?.categoryId"
:ids="$store.getters['categories/categoriesRootIds']"
class="!gap-x-1"
- @onClick="handleCategoryClick"
+ @click="onClick"
)
//- Favorite
@@ -80,10 +79,10 @@ export default {
| {{ $t('categories.favoriteTitle') }} {{ $t('categories.title') }}
.pb-1.px-3
CategoriesList(
- :activeItemId="$store.state.trnForm.values.categoryId"
+ :activeItemId="$trnForm?.values?.categoryId"
:ids="$store.getters['categories/favoriteCategoriesIds']"
class="!gap-x-1"
- @onClick="handleCategoryClick"
+ @click="onClick"
)
.py-2.px-3(v-if="slider")
diff --git a/components/trnForm/Date.vue b/components/trnForm/Date.vue
deleted file mode 100644
index e6bfb519..00000000
--- a/components/trnForm/Date.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<script>
-import { formatDate } from '~/utils/formatDate'
-
-export default {
- computed: {
- formattedDate() {
- const date = formatDate(this.$store.state.trnForm.values.date, 'full')
- return `${date.weekday} <br/> ${date.day} ${date.month}`
- },
-
- isToday() {
- return this.$day().isSame(this.$store.state.trnForm.values.date, 'day')
- },
- },
-
- methods: {
- setPrevDay() {
- this.$store.commit('trnForm/setTrnFormValues', {
- date: this.$day(this.$store.state.trnForm.values.date).subtract(1, 'day').valueOf(),
- })
- },
- setNextDay() {
- if (!this.isToday) {
- this.$store.commit('trnForm/setTrnFormValues', {
- date: this.$day(this.$store.state.trnForm.values.date).add(1, 'day').valueOf(),
- })
- }
- },
- },
-}
-</script>
-
-<template lang="pug">
-.trnFormDate.pb-2.px-2
- .shame1._arrow.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
- @click="setPrevDay()"
- ): .mdi.mdi-chevron-left
-
- .cursor-pointer.py-2.px-3.flex-center.rounded-md.text-center.text-sm.leading-none.hocus_bg-skin-item-main-hover(
- v-html="formattedDate"
- @click="$store.commit('trnForm/showTrnFormModal', 'calendar')"
- )
-
- .flex
- .shame1._arrow.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
- :class="{ 'opacity-30 !cursor-default' : isToday }"
- @click="setNextDay()"
- ): .mdi.mdi-chevron-right
-</template>
-
-<style lang="stylus" scoped>
-.shame1
- cursor pointer
- display flex
- align-items center
- justify-content center
- width 58px
- height 58px
- padding $m7
- color var(--c-font-3)
- font-size 28px
- border 1px solid transparent
- border-radius 50%
- user-select none
- anim(100ms)
-
-.trnFormDate
- display grid
- height 100%
- grid-template-columns auto 1fr auto
- grid-column-gap $m8
- text-align center
-
- &__item
- cursor pointer
- position relative
- display flex
- align-items center
- justify-content center
- width 44px
- height 44px
- padding $m7
- border 1px solid transparent
- border-radius $borderRadiusMd
- user-select none
-
- +media(400px)
- width 58px
- height 58px
-
- &._date
- display flex
- padding 0
- width 100%
- height auto
- flex-grow 1
- color var(--c-font-4)
- font-size 12px
- font-weight 400
- line-height 16px
- border-radius 50px
- border-color transparent
-
- &._arrow
- color var(--c-font-4)
- font-size 28px
- background var(--c-item-bg-main)
- border-radius 50%
- .mdi
- font-size 24px
-</style>
diff --git a/components/trnForm/Index.vue b/components/trnForm/Index.vue
index cd186d06..26a009fb 100644
--- a/components/trnForm/Index.vue
+++ b/components/trnForm/Index.vue
@@ -1,13 +1,7 @@
<script setup lang="ts">
-import Vue from 'vue'
-import dayjs from 'dayjs'
import SwiperCore, { Pagination } from 'swiper'
import 'swiper/swiper-bundle.css'
-import { generateId } from '~/utils/generateId'
-
-import useCalculator from '~/components/trnForm/calculator/useCalculator'
-import useTrnFormValidate from '~/components/trnForm/useTrnFormValidate'
-import { random, successEmo } from '~/assets/js/emo'
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
const props = withDefaults(defineProps<{
show: boolean
@@ -18,26 +12,7 @@ const props = withDefaults(defineProps<{
SwiperCore.use([Pagination])
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 isSameCurrency = computed(() => incomeWallet.value?.currency === expenseWallet.value?.currency)
+const $trnForm = useTrnFormStore()
/**
* Slider
@@ -45,11 +20,10 @@ const isSameCurrency = computed(() => incomeWallet.value?.currency === expenseWa
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 height = el?.clientHeight
$store.commit('trnForm/setTrnFormHeight', height)
maxHeight.value = `${height}px`
@@ -61,7 +35,9 @@ function setTrnFormHeight() {
maxHeight.value = `${height}px`
}
})
- observer.observe(el)
+
+ if (el)
+ observer.observe(el)
}
function init() {
@@ -93,112 +69,16 @@ onMounted(() => {
init()
})
-watch(() => props.show, (value) => {
- if (!value) {
- clearExpression()
+watch(() => props.show, (isShow) => {
+ if (!isShow) {
if (sliderObj.value)
sliderObj.value.slideTo(1, 0)
}
})
-
-/**
- * Amounts
- */
-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 })
-}
-
-/**
- * Prepare values
- */
-function prepareValues(): 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 = {
- 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: isSameCurrency.value ? getResult.value : $store.state.trnForm.values.expenseAmount,
- expenseWalletId: $store.state.trnForm.values.expenseWalletId,
- incomeAmount: isSameCurrency.value ? getResult.value : $store.state.trnForm.values.incomeAmount,
- incomeWalletId: $store.state.trnForm.values.incomeWalletId,
- }
- }
-
- return {
- id,
- values: normalizedValues,
- }
-}
-
-/**
- * Submit form
- */
-function handleSubmitForm() {
- try {
- const { validate } = useTrnFormValidate()
- const { id, values } = prepareValues()
-
- const validateStatus = validate(values)
-
- if (validateStatus.error) {
- Vue.notify({
- type: 'error',
- title: validateStatus.error.title,
- text: validateStatus.error.text,
- })
- return
- }
-
- // TODO: translate
- Vue.notify({
- type: 'success',
- text: 'Excellent transaction!',
- title: random(successEmo),
- })
-
- $store.dispatch('trns/addTrn', { id, values })
- }
- catch (e) {
- console.log(e)
- }
-}
</script>
<template lang="pug">
-.trnForm
+.trnForm.max-w-md.mx-auto
.swiper-container(ref="slider")
.swiper-wrapper
//- History
@@ -211,23 +91,7 @@ function handleSubmitForm() {
//- Main
.swiper-slide.getHeight
.scroll.scrollerBlock(:style="{ maxHeight: `${$store.state.ui.height}px` }")
- .px-3.pt-4.pb-2.text-skin-item-base.text-sm.font-semibold.font-nunito
- template(v-if="$store.state.trnForm.values.trnId") {{ $t('trnForm.titleEditTrn') }}
- template(v-if="!$store.state.trnForm.values.trnId") {{ $t('trnForm.createTrn') }}
-
- TrnFormTypes
- TrnFormAmount(v-if="!isTransfer || isTransfer && isSameCurrency")
-
- TrnFormDate
- TrnFormCalculator(
- v-if="!isTransfer || isTransfer && isSameCurrency"
- @onSubmit="handleSubmitForm"
- )
- TrnFormSelected
- TrnFormSelectedTransfer(
- v-if="isTransfer"
- @onSubmit="handleSubmitForm"
- )
+ TrnFormMain
//- Quick selector
.swiper-slide(:style="{ height: maxHeight }")
@@ -244,31 +108,14 @@ function handleSubmitForm() {
)
.px-3.grid.gap-y-1.gap-x-1.3sm_grid-cols-2
//- Wallet
- .cursor-pointer.relative.flex.items-center.py-2.px-3.rounded-md.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
+ TrnFormMainSelectedWallet(
v-for="(walletItem, walletId) in walletsItemsLimited"
:key="walletId"
- :class="[{ 'cursor-default !bg-skin-item-main-active': $store.state.trnForm.values.walletId === walletId }]"
- @click="onClickWallet(walletId)"
+ :class="[{ 'cursor-default !bg-skin-item-main-active': $trnForm.values.walletId === walletId }]"
+ :id="walletId"
+ isHideDots
+ @click="id => $trnForm.values.walletId = id"
)
- .grow.flex-center.gap-x-3
- //- Icon
- .w-6.h-6.rounded-md.flex-center.text-skin-icon-base.text-xs.leading-none(
- :style="{ background: walletItem.color }"
- class="mt-[2px]"
- ) {{ walletItem.name.substring(0, 2) }}
-
- .grow
- //- Name
- .text-sm.text-skin-item-base {{ walletItem.name }}
-
- //- Amount
- .text-sm
- Amount(
- :amount="walletItem.amount"
- :currencyCode="walletItem.currency"
- :isShowBaseRate="false"
- align="left"
- )
//- Favorite categories
.pb-7(v-if="$store.getters['categories/favoriteCategoriesIds'].length > 0")
@@ -280,10 +127,10 @@ function handleSubmitForm() {
CategoriesList(
v-if="sliderObj"
:ids="$store.getters['categories/favoriteCategoriesIds']"
- :activeItemId="$store.state.trnForm.values.categoryId"
+ :activeItemId="$trnForm.values.categoryId"
:slider="sliderObj"
class="!gap-x-1"
- @onClick="onCategoryClick"
+ @click="id => $trnForm.values.categoryId = id"
)
//- Recent categories
@@ -296,10 +143,10 @@ function handleSubmitForm() {
CategoriesList(
v-if="sliderObj"
:ids="$store.getters['categories/recentCategoriesIds']"
- :activeItemId="$store.state.trnForm.values.categoryId"
+ :activeItemId="$trnForm.values.categoryId"
:slider="sliderObj"
class="!gap-x-1"
- @onClick="onCategoryClick"
+ @click="id => $trnForm.values.categoryId = id"
)
.trnForm__pagination
@@ -307,14 +154,9 @@ function handleSubmitForm() {
//- Modals
Portal(to="modal")
TrnFormModals
- TrnFormModalCalendar(v-if="$store.state.trnForm.modal.calendar")
- TrnFormModalCats(v-if="$store.state.trnForm.modal.categories")
- TrnFormModalCatsChild(v-if="$store.state.trnForm.modal.categoriesChild")
- TrnFormModalDescription(v-if="$store.state.trnForm.modal.description")
</template>
<style lang="stylus">
-// TODO: style
.trnForm
&__pagination
z-index 2
@@ -328,7 +170,6 @@ function handleSubmitForm() {
padding $m5
background alpha(#171717, .9)
border-radius $m5
- backdrop-filter blur(12px)
transform translateX(-50%)
/.light &
diff --git a/components/trnForm/Main.vue b/components/trnForm/Main.vue
new file mode 100644
index 00000000..7acf91c9
--- /dev/null
+++ b/components/trnForm/Main.vue
@@ -0,0 +1,25 @@
+<script setup lang="ts">
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
+const $trnForm = useTrnFormStore()
+</script>
+
+<template lang="pug">
+div
+ UiTitle
+ template(v-if="$trnForm.values.trnId") {{ $t('trnForm.titleEditTrn') }}
+ template(v-if="!$trnForm.values.trnId") {{ $t('trnForm.createTrn') }}
+
+ TrnFormMainDate
+ TrnFormMainAmountTrn(v-if="$trnForm.values.trnType !== 2")
+ TrnFormMainAmountTransfer(v-if="$trnForm.values.trnType === 2")
+
+ TrnFormMainCalculator.pb-2(
+ :amountRaw="$trnForm.values.amountRaw[$trnForm.activeAmountIdx]"
+ @onChange="$trnForm.onChangeAmount"
+ )
+
+ //- Selected
+ TrnFormMainSelectedTrn(v-if="$trnForm.values.trnType !== 2")
+ TrnFormMainTypes
+</template>
diff --git a/components/trnForm/modal/TrnFormModal.vue b/components/trnForm/Modal.vue
similarity index 99%
rename from components/trnForm/modal/TrnFormModal.vue
rename to components/trnForm/Modal.vue
index 0d290caf..4cbb1588 100644
--- a/components/trnForm/modal/TrnFormModal.vue
+++ b/components/trnForm/Modal.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
import { useWindowSize } from '@vueuse/core'
+
const { height } = useWindowSize()
</script>
diff --git a/components/trnForm/Modals.vue b/components/trnForm/Modals.vue
index fcf0020f..d837d26e 100644
--- a/components/trnForm/Modals.vue
+++ b/components/trnForm/Modals.vue
@@ -1,26 +1,37 @@
+<script setup lang="ts">
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
+const $trnForm = useTrnFormStore()
+</script>
+
<template lang="pug">
div
+ LazyTrnFormModalCalendar(v-if="$store.state.trnForm.modal.calendar")
+ LazyTrnFormModalCats(v-if="$store.state.trnForm.modal.categories")
+ LazyTrnFormModalCatsChild(v-if="$store.state.trnForm.modal.categoriesChild")
+ LazyTrnFormModalDescription(v-if="$store.state.trnForm.modal.description")
+
//- Transaction
- TrnFormModalWallets(
+ LazyTrnFormModalWallets(
v-if="$store.state.trnForm.modal.wallets"
:title="$t('wallets.title')"
- @click="walletId => $store.commit('trnForm/setTrnFormValues', { walletId })"
+ @click="walletId => $trnForm.values.walletId = walletId"
@closed="$store.commit('trnForm/closeTrnFormModal', 'wallets')"
)
//- Transfer: expense
- TrnFormModalWallets(
+ LazyTrnFormModalWallets(
v-if="$store.state.trnForm.modal.transferFrom"
:title="$t('trnForm.transfer.fromLong')"
- @click="walletId => $store.commit('trnForm/setTrnFormValues', { expenseWalletId: walletId })"
+ @click="id => $trnForm.values.expenseWalletId = id"
@closed="$store.commit('trnForm/closeTrnFormModal', 'transferFrom')"
)
//- Transfer: income
- TrnFormModalWallets(
+ LazyTrnFormModalWallets(
v-if="$store.state.trnForm.modal.transferTo"
:title="$t('trnForm.transfer.toLong')"
- @click="walletId => $store.commit('trnForm/setTrnFormValues', { incomeWalletId: walletId })"
+ @click="id => $trnForm.values.incomeWalletId = id"
@closed="$store.commit('trnForm/closeTrnFormModal', 'transferTo')"
)
</template>
diff --git a/components/trnForm/Selected.vue b/components/trnForm/Selected.vue
deleted file mode 100644
index 0332ab73..00000000
--- a/components/trnForm/Selected.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template lang="pug">
-.px-2.pb-6.grid.grid-cols-2.gap-3(
- v-show="$store.state.trnForm.values.amountType !== 2"
-)
- TrnFormSelectedWallet(
- :walletId="$store.state.trnForm.values.walletId"
- @click="$store.commit('trnForm/showTrnFormModal', 'wallets')"
- )
-
- TrnFormSelectedCategory
-</template>
diff --git a/components/trnForm/SelectedCategory.vue b/components/trnForm/SelectedCategory.vue
deleted file mode 100644
index baf8371a..00000000
--- a/components/trnForm/SelectedCategory.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<script setup lang="ts">
-const { $store } = useNuxtApp()
-const category = computed(() => $store.state.categories.items[$store.state.trnForm.values.categoryId])
-const parentCategory = computed(() => $store.state.categories.items[category.value.parentId])
-</script>
-
-<template lang="pug">
-.cursor-pointer.py-2.px-3.relative.gap-x-3.flex.items-center.rounded-md.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
- v-if="category"
- @click="$store.commit('trnForm/showTrnFormModal', 'categories')"
-)
- .w-8.h-8.flex.items-center.justify-center.rounded-full.text-xl.leading-none.text-neutral-50(
- :style="{ background: category.color }"
- ): div(:class="category.icon")
-
- .grow.truncate
- .text-xs.text-skin-item-base-down.dark_text-neutral-400(
- v-if="parentCategory"
- ) {{ parentCategory.name }}
-
- .leading-none.text-sm.text-neutral-700.dark_text-neutral-300 {{ category.name }}
-
- .mdi.mdi-dots-vertical.-mr-1.text-lg.text-skin-item-base-down
-</template>
diff --git a/components/trnForm/SelectedTransfer.vue b/components/trnForm/SelectedTransfer.vue
deleted file mode 100644
index d1cf0900..00000000
--- a/components/trnForm/SelectedTransfer.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<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])
-
-// 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])
-
-if ($store.state.trnForm.values.amountType === 2) {
- $store.commit('trnForm/setTrnFormValues', {
- expenseWalletId: expenseWalletId.value,
- incomeWalletId: incomeWalletId.value,
- })
-}
-
-const isSameCurrency = computed(() => incomeWallet.value?.currency === expenseWallet.value?.currency)
-
-function changeAmount(TransferType: 'income' | 'expense', event: any) {
- $store.commit('trnForm/setTrnFormValues', {
- [`${TransferType}Amount`]: Number(event.target.value),
- })
-}
-</script>
-
-<template lang="pug">
-div(v-if="$store.getters['wallets/walletsSortedIds'].length > 1")
- //- isSameCurrency
- template(v-if="!isSameCurrency")
- .pb-8.px-4.grid.gap-6(class="grid-cols-[1fr_auto]")
- .grid.gap-6
- div
- .opacity-80.pb-1.text-xs.leading-none {{ $t('trnForm.transfer.fromLong') }}
- .overflow-hidden.rounded-xl.bg-skin-layout-main-up
- TrnFormSelectedWallet(
- :walletId="expenseWalletId"
- @click="$store.commit('trnForm/showTrnFormModal', 'transferFrom')"
- )
-
- 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-skin-layout-main-up
- TrnFormSelectedWallet(
- :walletId="incomeWalletId"
- @click="$store.commit('trnForm/showTrnFormModal', 'transferTo')"
- )
-
- 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)"
- )
-
- //- Right
- .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.px-3.pb-6.grid.grid-cols-2.gap-3(v-if="isSameCurrency")
- //- Transfer expense
- div(
- v-if="expenseWallet"
- @click="$store.commit('trnForm/showTrnFormModal', 'transferFrom')"
- )
- .text-xs.text-neutral-400.pb-1 {{ $t('trnForm.transfer.fromLong') }}
- TrnFormSelectedWallet(:walletId="expenseWalletId")
-
- .mdi.mdi-chevron-right.absolute.text-xl(
- class="top-[30px] left-1/2 -translate-x-1/2"
- )
-
- //- Transfer income
- .cursor-pointer(
- v-if="incomeWallet"
- @click="$store.commit('trnForm/showTrnFormModal', 'transferTo')"
- )
- .text-xs.text-neutral-400.pb-1 {{ $t('trnForm.transfer.toLong') }}
- TrnFormSelectedWallet(:walletId="incomeWalletId")
-</template>
diff --git a/components/trnForm/TrnsSlide.vue b/components/trnForm/TrnsSlide.vue
index 7f792f72..14820b53 100644
--- a/components/trnForm/TrnsSlide.vue
+++ b/components/trnForm/TrnsSlide.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
import { getTrnsIds } from '~/components/trns/getTrns'
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
const props = defineProps<{
slider: {
@@ -8,17 +9,18 @@ const props = defineProps<{
}>()
const { $store, nuxt2Context: { i18n } } = useNuxtApp()
+const $trnForm = useTrnFormStore()
const filterBy = ref('wallet')
const filteredTrnsIds = computed(() => {
const trnsItems = $store.state.trns.items
- const walletsIds = [$store.state.trnForm.values.walletId]
+ const walletsIds = [$trnForm.values.walletId]
if (filterBy.value === 'wallet')
return getTrnsIds({ walletsIds, trnsItems })
if (filterBy.value === 'walletAndCategory') {
- const categoryId = $store.state.trnForm.values.categoryId
+ const categoryId = $trnForm.values.categoryId
const childIds = $store.getters['categories/getChildCategoriesIds'](categoryId)
const categoriesIds = childIds.length > 0 ? childIds : [categoryId]
@@ -56,7 +58,9 @@ const tabs = computed(() => [{
</script>
<template lang="pug">
-.h-full.overflow-hidden.grid.trnsListScroll
+.h-full.overflow-hidden.grid.trnsListScroll(
+ class="grid-rows-[1fr_auto]"
+)
.h-full.overflow-hidden
.h-full.overflow-y-auto.pt-5.px-2.scroll.scrollerBlock(
:class="{ 'grid items-center': filteredTrnsIds.length === 0, 'grid-rows-[1fr_auto]': filteredTrnsIds.length > 0 }"
diff --git a/components/trnForm/Types.vue b/components/trnForm/Types.vue
deleted file mode 100644
index 0b18d1cb..00000000
--- a/components/trnForm/Types.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<script setup lang="ts">
-const { $store } = useNuxtApp()
-const amountType = computed(() => $store.state.trnForm.values.amountType)
-
-function setAmountType(amountType) {
- $store.commit('trnForm/setTrnFormValues', { amountType })
-}
-</script>
-
-<template lang="pug">
-.px-2.pb-4
- UiTabs
- UiTabsItem(
- :isActive="amountType === 0"
- @click="setAmountType(0)"
- ) {{ $t('money.expense') }}
-
- UiTabsItem(
- :isActive="amountType === 1"
- @click="setAmountType(1)"
- ) {{ $t('money.income') }}
-
- UiTabsItem(
- v-if="$store.getters['wallets/walletsSortedIds'].length > 1"
- :isActive="amountType === 2"
- @click="setAmountType(2)"
- ) {{ $t('trnForm.transferTitle') }}
-</template>
diff --git a/components/trnForm/Wrap.vue b/components/trnForm/Wrap.vue
new file mode 100644
index 00000000..95f76c14
--- /dev/null
+++ b/components/trnForm/Wrap.vue
@@ -0,0 +1,25 @@
+<script setup lang="ts">
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
+const { $store } = useNuxtApp()
+const $trnForm = useTrnFormStore()
+
+const isShowTrnForm = computed(() => $store.getters['wallets/hasWallets'] && $store.getters['categories/hasCategories'] && $store.state.trnForm.show)
+
+function closeTrnForm() {
+ $store.commit('trnForm/closeTrnForm')
+ $trnForm.onClose()
+}
+</script>
+
+<template lang="pug">
+BaseBottomSheet2(
+ keepAlive
+ :isShow="isShowTrnForm"
+ @closed="closeTrnForm"
+)
+ template(#handler="{ close }")
+ BaseBottomSheetHandler
+ BaseBottomSheetClose(@onClick="close")
+ TrnForm
+</template>
diff --git a/components/trnForm/calculator/TrnFormCalculator.vue b/components/trnForm/calculator/TrnFormCalculator.vue
deleted file mode 100644
index 68268395..00000000
--- a/components/trnForm/calculator/TrnFormCalculator.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<script setup lang="ts">
-import useCalculator from './useCalculator'
-import './long-press-event'
-
-const { $store } = useNuxtApp()
-const amountType = computed(() => $store.state.trnForm.values.amountType)
-
-const deleteRef = ref(document.createElement('div'))
-
-const {
- clearExpression,
- handleTouch,
- isSum,
- keyboardHandler,
-} = useCalculator()
-
-// Mounted
-onMounted(() => {
- document.addEventListener('keydown', keyboardHandler)
-
- // Long press for delete
- const element: HTMLElement = deleteRef.value
- element.addEventListener('long-press', clearExpression)
-})
-
-// Unmounted
-onUnmounted(() => document.removeEventListener('keydown', keyboardHandler))
-</script>
-
-<template lang="pug">
-.trnFormCalculator.px-2.pb-4
- .trnFormCalculator__group
- .trnFormCalculator__acts
- .calcItem._act(@click="handleTouch('+')")
- .calcItem__in: .mdi.mdi-plus
- .calcItem._act(@click="handleTouch('-')")
- .calcItem__in: .mdi.mdi-minus
- .calcItem._act(@click="handleTouch('*')")
- .calcItem__in: .mdi.mdi-plus(style="transform: rotate(45deg)")
- .calcItem._act(@click="handleTouch('/')")
- .calcItem__in: .mdi.mdi-slash-forward
-
- .trnFormCalculator__group
- .trnFormCalculator__numbers
- .calcItem(@click="handleTouch('7')")
- .calcItem__in 7
- .calcItem(@click="handleTouch('8')")
- .calcItem__in 8
- .calcItem(@click="handleTouch('9')")
- .calcItem__in 9
-
- .calcItem(@click="handleTouch('4')")
- .calcItem__in 4
- .calcItem(@click="handleTouch('5')")
- .calcItem__in 5
- .calcItem(@click="handleTouch('6')")
- .calcItem__in 6
-
- .calcItem(@click="handleTouch('1')")
- .calcItem__in 1
- .calcItem(@click="handleTouch('2')")
- .calcItem__in 2
- .calcItem(@click="handleTouch('3')")
- .calcItem__in 3
-
- .calcItem(@click="handleTouch('.')")
- .calcItem__in .
- .calcItem(@click="handleTouch('0')")
- .calcItem__in 0
- .calcItem(
- ref="deleteRef"
- data-long-press-delay="300"
- @click="handleTouch('delete')"
- )
- .calcItem__in C
-
- .trnFormCalculator__group
- .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-if="!isSum")
- .mdi.mdi-equal
-</template>
-
-<style lang="stylus" scoped>
-// TODO: style
-.trnFormCalculator
- display grid
- grid-template-columns auto 1fr auto
- align-items stretch
- grid-column-gap $m8
- grid-row-gap $m8
-
- &__group
- display flex
- align-items stretch
- justify-content center
-
- &__action
- display flex
- align-items stretch
-
- &__acts
- display grid
- grid-template-columns 1fr
- grid-column-gap $m5
- grid-row-gap $m5
-
- &__numbers
- flex-grow 1
- display grid
- grid-template-columns repeat(3, 1fr)
- grid-column-gap $m5
- grid-row-gap $m5
- align-items space-between
- justify-content space-between
- max-width 240px
-
-.calcItem
- display flex
- align-items center
- justify-content center
- font-secondary()
-
- &._sum
- max-width 58px
-
- &__in
- cursor pointer
- display flex
- align-items center
- justify-content center
- width 44px
- height 44px
- padding $m7
- color var(--c-font-3)
- font-size 22px
- background var(--c-item-bg-main)
- border 1px solid var(--c-item-bd-main)
- border-radius 50%
- user-select none
- anim(100ms)
-
- +media(360px)
- width 58px
- height 58px
-
- ~/._sum &
- width 100%
- height 100%
- color var(--c-font-1)
- font-size 40px
- background var(--c-blue-1) !important
- border-color transparent !important
- border none
- border-radius 6px
- +media-hover()
- transform scale(1.04)
-
- +media-hover()
- background var(--c-bg-7)
- border 1px solid var(--c-bg-8)
-</style>
diff --git a/components/trnForm/calculator/long-press-event.js b/components/trnForm/calculator/long-press-event.js
deleted file mode 100644
index a18c26d7..00000000
--- a/components/trnForm/calculator/long-press-event.js
+++ /dev/null
@@ -1,249 +0,0 @@
-/*!
- * long-press-event - v@version@
- * Pure JavaScript long-press-event
- * https://github.com/john-doherty/long-press-event
- * @author John Doherty <www.johndoherty.info>
- * @license MIT
- */
-(function (window, document) {
- 'use strict'
-
- // local timer object based on rAF
- let timer = null
-
- // check if we're using a touch screen
- const isTouch = (('ontouchstart' in window) || (navigator.MaxTouchPoints > 0) || (navigator.msMaxTouchPoints > 0))
-
- // switch to touch events if using a touch screen
- const mouseDown = isTouch ? 'touchstart' : 'mousedown'
- const mouseUp = isTouch ? 'touchend' : 'mouseup'
- const mouseMove = isTouch ? 'touchmove' : 'mousemove'
-
- // track number of pixels the mouse moves during long press
- let startX = 0 // mouse x position when timer started
- let startY = 0 // mouse y position when timer started
- const maxDiffX = 10 // max number of X pixels the mouse can move during long press before it is canceled
- const maxDiffY = 10 // max number of Y pixels the mouse can move during long press before it is canceled
-
- // patch CustomEvent to allow constructor creation (IE/Chrome)
- if (typeof window.CustomEvent !== 'function') {
- window.CustomEvent = function (event, params) {
- params = params || { bubbles: false, cancelable: false, detail: undefined }
-
- const evt = document.createEvent('CustomEvent')
- evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail)
- return evt
- }
-
- window.CustomEvent.prototype = window.Event.prototype
- }
-
- // requestAnimationFrame() shim by Paul Irish
- window.requestAnimFrame = (function () {
- return window.requestAnimationFrame
- || window.webkitRequestAnimationFrame
- || window.mozRequestAnimationFrame
- || window.oRequestAnimationFrame
- || window.msRequestAnimationFrame || function (callback) {
- window.setTimeout(callback, 1000 / 60)
- }
- })()
-
- /**
- * Behaves the same as setTimeout except uses requestAnimationFrame() where possible for better performance
- * @param {function} fn The callback function
- * @param {int} delay The delay in milliseconds
- * @returns {object} handle to the timeout object
- */
- function requestTimeout(fn, delay) {
- if (!window.requestAnimationFrame && !window.webkitRequestAnimationFrame
- && !(window.mozRequestAnimationFrame && window.mozCancelRequestAnimationFrame) // Firefox 5 ships without cancel support
- && !window.oRequestAnimationFrame && !window.msRequestAnimationFrame)
- return window.setTimeout(fn, delay)
-
- const start = new Date().getTime()
- const handle = {}
-
- const loop = function () {
- const current = new Date().getTime()
- const delta = current - start
-
- if (delta >= delay)
- fn.call()
-
- else
- handle.value = requestAnimFrame(loop)
- }
-
- handle.value = requestAnimFrame(loop)
-
- return handle
- }
-
- /**
- * Behaves the same as clearTimeout except uses cancelRequestAnimationFrame() where possible for better performance
- * @param {object} handle The callback function
- * @returns {void}
- */
- function clearRequestTimeout(handle) {
- if (handle) {
- window.cancelAnimationFrame ? window.cancelAnimationFrame(handle.value)
- : window.webkitCancelAnimationFrame ? window.webkitCancelAnimationFrame(handle.value)
- : window.webkitCancelRequestAnimationFrame ? window.webkitCancelRequestAnimationFrame(handle.value) /* Support for legacy API */
- : window.mozCancelRequestAnimationFrame
- ? window.mozCancelRequestAnimationFrame(handle.value)
- : window.oCancelRequestAnimationFrame
- ? window.oCancelRequestAnimationFrame(handle.value)
- : window.msCancelRequestAnimationFrame
- ? window.msCancelRequestAnimationFrame(handle.value)
- : clearTimeout(handle)
- }
- }
-
- /**
- * Gets event object regardless of touch or regular event
- * @param {object} e - default browser event object
- * @returns {object} regular event object
- */
- function normaliseEvent(e) {
- if (isTouch && e.touches && e.touches[0])
- return e.touches[0]
-
- return e
- }
-
- /**
- * Fires the 'long-press' event on element
- * @param {MouseEvent|TouchEvent} originalEvent The original event being fired
- * @returns {void}
- */
- function fireLongPressEvent(originalEvent) {
- clearLongPressTimer()
-
- originalEvent = normaliseEvent(originalEvent)
-
- // fire the long-press event
- const allowClickEvent = this.dispatchEvent(new CustomEvent('long-press', {
- bubbles: true,
- cancelable: true,
-
- // custom event data (legacy)
- detail: {
- clientX: originalEvent.clientX,
- clientY: originalEvent.clientY,
- },
-
- // add coordinate data that would typically acompany a touch/click event
- clientX: originalEvent.clientX,
- clientY: originalEvent.clientY,
- offsetX: originalEvent.offsetX,
- offsetY: originalEvent.offsetY,
- pageX: originalEvent.pageX,
- pageY: originalEvent.pageY,
- screenX: originalEvent.screenX,
- screenY: originalEvent.screenY,
- }))
-
- if (!allowClickEvent) {
- // supress the next click event if e.preventDefault() was called in long-press handler
- document.addEventListener('click', function suppressEvent(e) {
- document.removeEventListener('click', suppressEvent, true)
- cancelEvent(e)
- }, true)
- }
- }
-
- /**
- * method responsible for starting the long press timer
- * @param {event} e - event object
- * @returns {void}
- */
- function startLongPressTimer(e) {
- clearLongPressTimer(e)
-
- const el = e.target
-
- // get delay from html attribute if it exists, otherwise default to 1500
- const longPressDelayInMs = parseInt(getNearestAttribute(el, 'data-long-press-delay', '1500'), 10) // default 1500
-
- // start the timer
- timer = requestTimeout(fireLongPressEvent.bind(el, e), longPressDelayInMs)
- }
-
- /**
- * method responsible for clearing a pending long press timer
- * @param {event} e - event object
- * @returns {void}
- */
- function clearLongPressTimer(e) {
- clearRequestTimeout(timer)
- timer = null
- }
-
- /**
- * Cancels the current event
- * @param {object} e - browser event object
- * @returns {void}
- */
- function cancelEvent(e) {
- e.stopImmediatePropagation()
- e.preventDefault()
- e.stopPropagation()
- }
-
- /**
- * Starts the timer on mouse down and logs current position
- * @param {object} e - browser event object
- * @returns {void}
- */
- function mouseDownHandler(e) {
- startX = e.clientX
- startY = e.clientY
- startLongPressTimer(e)
- }
-
- /**
- * If the mouse moves n pixels during long-press, cancel the timer
- * @param {object} e - browser event object
- * @returns {void}
- */
- function mouseMoveHandler(e) {
- // calculate total number of pixels the pointer has moved
- const diffX = Math.abs(startX - e.clientX)
- const diffY = Math.abs(startY - e.clientY)
-
- // if pointer has moved more than allowed, cancel the long-press timer and therefore the event
- if (diffX >= maxDiffX || diffY >= maxDiffY)
- clearLongPressTimer(e)
- }
-
- /**
- * Gets attribute off HTML element or nearest parent
- * @param {object} el - HTML element to retrieve attribute from
- * @param {string} attributeName - name of the attribute
- * @param {any} defaultValue - default value to return if no match found
- * @returns {any} attribute value or defaultValue
- */
- function getNearestAttribute(el, attributeName, defaultValue) {
- // walk up the dom tree looking for data-action and data-trigger
- while (el && el !== document.documentElement) {
- const attributeValue = el.getAttribute(attributeName)
-
- if (attributeValue)
- return attributeValue
-
- el = el.parentNode
- }
-
- return defaultValue
- }
-
- // hook events that clear a pending long press event
- document.addEventListener(mouseUp, clearLongPressTimer, true)
- document.addEventListener(mouseMove, mouseMoveHandler, true)
- document.addEventListener('wheel', clearLongPressTimer, true)
- document.addEventListener('scroll', clearLongPressTimer, true)
-
- // hook events that can trigger a long press event
- document.addEventListener(mouseDown, mouseDownHandler, true) // <- start
-}(window, document))
diff --git a/components/trnForm/calculator/useCalculator.ts b/components/trnForm/calculator/useCalculator.ts
deleted file mode 100644
index fc35fba1..00000000
--- a/components/trnForm/calculator/useCalculator.ts
+++ /dev/null
@@ -1,275 +0,0 @@
-import currency from 'currency.js'
-
-const baseAmountFormat = (value: string, separator: string, symbol?: string) => currency(value, { symbol, precision: 0, pattern: '#', separator }).format()
-
-// State
-const fixed = 2
-const expression = ref('0')
-const separator = ref(' ')
-const isKeysActive = ref(true)
-
-export default function useCalculator() {
- /**
- * Set separator
- *
- * @param {string} sep
- */
- function setSeparator(sep: string): void {
- separator.value = sep
- expression.value = formatInput(expression.value)
- }
-
- /**
- * Set formatted expression
- *
- * @param {string} value
- */
- function setExpression(value: string): void {
- expression.value = formatInput(value)
- }
-
- /**
- * Set key listeners for keyboard
- *
- * @param {boolean} value
- */
- function setKeysActive(value: boolean): void {
- isKeysActive.value = value
- }
-
- /**
- * Create array from expression
- *
- * @param {string} value
- * @return {string[]}
- */
- function separateExpression(value: string): string[] {
- return value
- .split(/([\/*\-+])/)
- .filter(i => i)
- }
-
- /**
- * Remove space in string
- *
- * @param {string} value
- * @return {string}
- */
- function removeSpaces(value: string): string {
- return String(value).replace(/[ ,]/g, '')
- }
-
- function checkIsLastSymbolAction(lastSymbol: string): boolean {
- return Number.isNaN(Number.parseInt(lastSymbol))
- }
-
- /**
- * Make calculation
- *
- * @param {string} value
- * @return {(string | undefined)}
- */
- function makeCalculation(value: string): string {
- try {
- const clearedExpression = removeSpaces(value)
- const lastSymbol = clearedExpression.slice(-1)
- const isLastSymbolAction = checkIsLastSymbolAction(lastSymbol)
- const prepeatedExpression = isLastSymbolAction ? clearedExpression.slice(0, -1) : clearedExpression
-
- // eslint-disable-next-line no-new-func
- const math = Function(`"use strict";return (${prepeatedExpression})`)()
-
- if (math <= Number.MAX_SAFE_INTEGER)
- return String(Math.abs(math))
-
- return '0'
- }
- catch (error) {
- console.log(error)
- return value
- }
- }
-
- /**
- * Create expression string
- *
- * @param {string} expression
- * @param {string} value
- * @return {string} expression
- */
- function createExpressionString(expression: string, value: string): string {
- const inputIsAction = Number.isNaN(Number.parseInt(value))
-
- // Last symbol of expression
- const clearedExpression = removeSpaces(expression)
- const lastSymbol = clearedExpression.slice(-1)
- const isLastSymbolAction = checkIsLastSymbolAction(lastSymbol)
- const isSumAction = value === '='
- const isDeleteAction = value === 'delete'
- const isDotAction = value === '.'
-
- // Delete
- if (clearedExpression !== '0' && isDeleteAction) {
- const deleteString = clearedExpression.slice(0, -1)
- if (deleteString)
- return deleteString
- return '0'
- }
-
- // Start from 0
- if (clearedExpression === '0') {
- if (value === '0')
- return expression
- if (!inputIsAction)
- return value
- }
-
- // Change math symbol
- if (inputIsAction && isLastSymbolAction && !isDotAction && !isSumAction && !isDeleteAction)
- return clearedExpression.slice(0, -1) + value
-
- // Calculate
- if (inputIsAction && isSumAction) {
- const result = makeCalculation(clearedExpression)
- return formatInput(result, true)
- }
-
- // Handle dot value
- if (inputIsAction && isDotAction) {
- if (Array.isArray(clearedExpression.split(/[/*\-+]/)) && (clearedExpression.split(/[/*\-+]/).slice(-1)[0].includes('.') || isLastSymbolAction)) {
- if (isLastSymbolAction && lastSymbol !== '.')
- return `${clearedExpression}0.`
-
- return expression
- }
- else {
- return clearedExpression + value
- }
- }
-
- // Add math symbol
- if (inputIsAction)
- return clearedExpression + value
-
- // Handle number
- const maxIntegerLengthAllowed = 12
- const separatedExpression = separateExpression(clearedExpression)
-
- if (separatedExpression) {
- const lastNumber = separatedExpression.slice(-1)[0]
- const lastNumberSplit = lastNumber.split(/[.]/)
- const isInteger = lastNumberSplit.length === 1
-
- // Check if math will success
- if (lastSymbol !== '.') {
- const result = makeCalculation(clearedExpression + value)
- if (result === '0')
- return clearedExpression
- }
-
- // Limit integer
- if (isInteger && lastNumber.length < maxIntegerLengthAllowed)
- return clearedExpression + value
-
- // Limit float
- if (!isInteger && lastNumberSplit[1].length < fixed)
- return clearedExpression + value
- }
-
- return expression
- }
-
- /**
- * Format input
- *
- * @param {(string | number)} value
- * @param {boolean} [isTrimFloatSpaces]
- * @return {string} expression string
- */
- function formatInput(value: string, isTrimFloatSpaces?: boolean): string {
- const formattedArray = separateExpression(String(value))
- .map((item) => {
- let formattedItem: string
- const isAction = item.match(/[/*\-+]/g)
-
- if (isAction) {
- formattedItem = ` ${item} `
- }
- else {
- let clearedValue = removeSpaces(String(item))
-
- // Remove ended zero after dot
- if (isTrimFloatSpaces)
- clearedValue = String(parseFloat(Number(clearedValue).toFixed(fixed)))
-
- const splitFloatValue = String(clearedValue).split(/[.]/)
- const isInteger = splitFloatValue.length === 1
-
- if (isInteger)
- formattedItem = baseAmountFormat(item, separator.value)
-
- else
- formattedItem = `${baseAmountFormat(splitFloatValue[0], separator.value)}.${splitFloatValue[1]}`
- }
- return formattedItem
- })
-
- return formattedArray.join('')
- }
-
- function clearExpression(): void {
- expression.value = '0'
- }
-
- function handleTouch(input: string): void {
- const expressionValue = createExpressionString(expression.value, input)
- expression.value = formatInput(expressionValue)
- }
-
- function keyboardHandler(event: KeyboardEvent): void {
- if (!isKeysActive.value)
- return
-
- const allowValue = (event.key).match(/[\d%/*\-+=.,]|Backspace|Enter/)
- let input = allowValue ? allowValue.input : false
-
- if (input) {
- if (input === ',')
- input = '.'
- if (input === 'Enter')
- input = '='
- if (input === 'Backspace')
- input = 'delete'
-
- handleTouch(input)
- }
- }
-
- const getExpression = computed(() => expression.value)
- const getResult = computed(() => {
- const result = makeCalculation(getExpression.value)
- return Number(result)
- })
- const getFormattedResult = computed(() => { return formatInput(expression.value) })
- const isSum = computed(() => String(getResult.value) === removeSpaces(expression.value))
-
- return {
- expression,
- formatInput,
- isSum,
- getExpression,
- getFormattedResult,
- setExpression,
- getResult,
- isKeysActive,
- setKeysActive,
- makeCalculation,
- separateExpression,
- clearExpression,
- keyboardHandler,
- createExpressionString,
- setSeparator,
- handleTouch,
- removeSpaces,
- }
-}
diff --git a/components/trnForm/main/ActionSide.vue b/components/trnForm/main/ActionSide.vue
new file mode 100644
index 00000000..cc0d6acb
--- /dev/null
+++ b/components/trnForm/main/ActionSide.vue
@@ -0,0 +1,49 @@
+<script setup lang="ts">
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
+const { $store } = useNuxtApp()
+const $trnForm = useTrnFormStore()
+// TODO: check for 0
+const isMath = computed(() => $trnForm.getIsShowSum($trnForm.activeAmountIdx, true))
+const isSubmittable = computed(() => $trnForm.values.amount[$trnForm.activeAmountIdx] > 0)
+
+async function onClickSubmit() {
+ if (isMath.value) {
+ $trnForm.onChangeCountSum()
+ return
+ }
+
+ const trnFormData = await $trnForm.onSubmit()
+ if (!trnFormData)
+ return
+
+ await $store.dispatch('trns/addTrn', {
+ id: trnFormData.id,
+ values: trnFormData.values,
+ })
+ $trnForm.onClear()
+}
+</script>
+
+<template lang="pug">
+div(
+ :class=`{
+ '!bg-accent-default/50 border-accent-default/50 hocus_!bg-accent-default/70': !isMath && isSubmittable,
+ }`
+ class=`
+ cursor-pointer
+ flex items-center justify-center
+ min-w-[58px]
+ py-4 px-2
+ h-full
+ text-4xl text-primary text-center
+ bg-item-main border border-item-border rounded-xl
+ hocus_bg-item-hover hocus_border[red] hocus_scale-[1.02]
+ transition
+ transition
+ `
+ @click="onClickSubmit"
+)
+ .mdi.mdi-check(v-if="!isMath")
+ .mdi.mdi-equal(v-if="isMath")
+</template>
diff --git a/components/trnForm/main/AmountTransfer.vue b/components/trnForm/main/AmountTransfer.vue
new file mode 100644
index 00000000..344f023c
--- /dev/null
+++ b/components/trnForm/main/AmountTransfer.vue
@@ -0,0 +1,85 @@
+<script setup lang="ts">
+import { type TransferType, TrnType } from '~/components/trns/types'
+import type { WalletId } from '~~/components/wallets/types'
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
+const $trnForm = useTrnFormStore()
+const { $store } = useNuxtApp()
+
+const items = ref<Record<'expense' | 'income', {
+ transferType: TransferType
+ amountsIdx: 1 | 2
+}>>({
+ expense: {
+ transferType: 0,
+ amountsIdx: 1,
+ },
+ income: {
+ transferType: 1,
+ amountsIdx: 2,
+ },
+})
+
+const incomeWalletId = computed<WalletId | null>(() =>
+ $trnForm.values.incomeWalletId ?? $store.getters['wallets/walletsSortedIds'][0],
+)
+
+const expenseWalletId = computed<WalletId | null>(() =>
+ $trnForm.values.expenseWalletId ?? $store.getters['wallets/walletsSortedIds'][1],
+)
+
+watch(() => $trnForm.values.trnType, (trnType) => {
+ if (trnType === TrnType.Transfer) {
+ $trnForm.values.incomeWalletId = incomeWalletId.value
+ $trnForm.values.expenseWalletId = expenseWalletId.value
+ }
+}, { immediate: true })
+</script>
+
+<template lang="pug">
+.pb-2
+ .flex.flex-col
+ .cursor-pointer.overflow-hidden.rounded-md(
+ v-for="(item, slug) in items"
+ :key="slug"
+ :class="[{ '!bg-skin-item-main-active': $trnForm.values.transferType === item.transferType }]"
+ @click="$trnForm.onChangeTransferType(item.transferType)"
+ )
+ //- Wallet name
+ .px-3.pt-2.grid.items-center.whitespace-nowrap(
+ class="grid-cols-[.4fr,1fr]"
+ )
+ .grow.text-sm(class="w-1/2 text-primary/70") {{ $t(slug) }}
+ template(v-if="slug === 'income'")
+ TrnFormMainSelectedWallet(
+ :key="incomeWalletId"
+ :id="incomeWalletId"
+ @click="$store.commit('trnForm/showTrnFormModal', 'transferTo')"
+ )
+ template(v-if="slug === 'expense'")
+ TrnFormMainSelectedWallet(
+ :key="expenseWalletId"
+ :id="expenseWalletId"
+ @click="$store.commit('trnForm/showTrnFormModal', 'transferFrom')"
+ )
+
+ //- Input
+ TrnFormMainInput(
+ :key="item.amountsIdx"
+ :amount="$trnForm.values.amount[item.amountsIdx]"
+ :amountRaw="$trnForm.values.amountRaw[item.amountsIdx]"
+ :highlight="item.transferType === 1 ? 'expense' : 'income'"
+ :isShowSum="$trnForm.getIsShowSum(item.amountsIdx)"
+ isTransfer
+ @onChange="$trnForm.onChangeAmount"
+ )
+</template>
+
+<i18n lang="yaml">
+en:
+ expense: Transfer from
+ income: Transfer to
+ru:
+ expense: Перевод из
+ income: Перевод в
+</i18n>
diff --git a/components/trnForm/main/AmountTrn.vue b/components/trnForm/main/AmountTrn.vue
new file mode 100644
index 00000000..5903a360
--- /dev/null
+++ b/components/trnForm/main/AmountTrn.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
+const $trnForm = useTrnFormStore()
+</script>
+
+<template lang="pug">
+.pb-2.px-2
+ TrnFormMainInput(
+ :amount="$trnForm.values.amount[$trnForm.activeAmountIdx]"
+ :amountRaw="$trnForm.values.amountRaw[$trnForm.activeAmountIdx]"
+ :highlight="$trnForm.values.trnType === 0 ? 'income' : 'expense'"
+ :isShowSum="$trnForm.getIsShowSum($trnForm.activeAmountIdx)"
+ @onChange="$trnForm.onChangeAmount"
+ )
+</template>
diff --git a/components/trnForm/main/Calculator.vue b/components/trnForm/main/Calculator.vue
new file mode 100644
index 00000000..f17eb56c
--- /dev/null
+++ b/components/trnForm/main/Calculator.vue
@@ -0,0 +1,88 @@
+<script setup lang="ts">
+import { onLongPress } from '@vueuse/core'
+import { createExpressionString } from '~/components/trnForm/utils/calculate'
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
+const props = defineProps<{
+ amountRaw: string
+}>()
+
+const emit = defineEmits<{
+ (e: 'onChange', value: string): string
+}>()
+
+const $trnForm = useTrnFormStore()
+
+const buttons = [
+ ['7', '8', '9'],
+ ['4', '5', '6'],
+ ['1', '2', '3'],
+]
+
+// ['*', '7', '8', '9'],
+// ['+', '4', '5', '6'],
+// ['-', '1', '2', '3'],
+// ['/', '.', '0', 'c'],
+
+function onClick(key: string) {
+ const value = createExpressionString(key, props.amountRaw)
+ emit('onChange', value)
+}
+
+function getClassName(btnIdx: number, rowIdx: number, row: string[]) {
+ return {
+ 'bg-opacity-60': btnIdx === 0 || (rowIdx === row.length - 1 && (btnIdx === 1 || btnIdx === 3)),
+ }
+}
+
+const deleteBtnRef = ref<HTMLElement | null>(null)
+
+onLongPress(
+ deleteBtnRef,
+ () => {
+ $trnForm.$patch((state) => {
+ state.values.amount = [0, 0, 0]
+ state.values.amountRaw = ['0', '0', '0']
+ })
+ },
+ { modifiers: { prevent: false } },
+)
+</script>
+
+<template lang="pug">
+.px-2.grid.gap-0(class="grid-cols-[auto,1fr,auto]")
+ .w-20.flex.flex-col.gap-2
+ TrnFormMainCalculatorButton(@click="onClick('*')"): .mdi.mdi-plus.rotate-45
+ TrnFormMainCalculatorButton(@click="onClick('-')"): .mdi.mdi-minus
+ TrnFormMainCalculatorButton(@click="onClick('+')"): .mdi.mdi-plus
+ TrnFormMainCalculatorButton(@click="onClick('/')"): .mdi.mdi-slash-forward
+
+ .flex.flex-col.gap-2
+ .flex.gap-2.justify-center(
+ v-for="(row, rowIdx) in buttons"
+ :key="rowIdx"
+ )
+ TrnFormMainCalculatorButton(
+ v-for="(btn, btnIdx) in row"
+ :key="btn"
+ :class="getClassName(btnIdx, rowIdx, row)"
+ @click="onClick(btn)"
+ ) {{ btn }}
+
+ .flex.gap-2.justify-center
+ TrnFormMainCalculatorButton(@click="onClick('.')") .
+ TrnFormMainCalculatorButton(@click="onClick('0')") 0
+ TrnFormMainCalculatorButton(
+ ref="deleteBtnRef"
+ @click="onClick('c')"
+ ) c
+
+ .w-20.grid.gap-2.justify-items-end(class="grid-rows-[auto,1fr]")
+ //- Description
+ TrnFormMainCalculatorButton(
+ @click="$store.commit('trnForm/showTrnFormModal', 'description')"
+ ): .mdi.mdi-comment-text-outline
+
+ //- Action
+ TrnFormMainActionSide
+</template>
diff --git a/components/trnForm/main/CalculatorButton.vue b/components/trnForm/main/CalculatorButton.vue
new file mode 100644
index 00000000..c396e5ee
--- /dev/null
+++ b/components/trnForm/main/CalculatorButton.vue
@@ -0,0 +1,14 @@
+<template lang="pug">
+div(tabindex="0"
+ class=`
+ cursor-pointer aspect-square
+ max-w-[58px] grow w-full p-3 flex items-center justify-center
+ text-2xl font-unica font-normal text-item-primary
+ bg-item-main border border-item-border rounded-full
+ hocus_bg-item-hover hocus_border[red] hocus_scale-[1.02]
+ transition
+ `
+ @click="$emit('click')"
+)
+ slot
+</template>
diff --git a/components/trnForm/main/Date.vue b/components/trnForm/main/Date.vue
new file mode 100644
index 00000000..6017fd07
--- /dev/null
+++ b/components/trnForm/main/Date.vue
@@ -0,0 +1,88 @@
+<script setup lang="ts">
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+import { formatDate } from '~/utils/formatDate'
+
+const { $day } = useNuxtApp()
+const $trnForm = useTrnFormStore()
+
+const formattedDate = computed(() => {
+ const date = formatDate($trnForm.values.date, 'full')
+ return `${date.weekday} <br/> ${date.day} ${date.month}`
+})
+
+const isToday = computed(() => {
+ return $day().isSame($trnForm.values.date, 'day')
+})
+
+function changeDate(way: 'prev' | 'next') {
+ if (way === 'prev')
+ $trnForm.values.date = $day($trnForm.values.date).subtract(1, 'day').valueOf()
+ if (way === 'next' && !isToday.value)
+ $trnForm.values.date = $day($trnForm.values.date).add(1, 'day').valueOf()
+}
+</script>
+
+<template lang="pug">
+.trnFormDate.flex.pb-2.px-2.gap-2
+ .overflow-hidden.flex.rounded-xl
+ .shame1.flex-center.w-12._arrow.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
+ @click="changeDate('prev')"
+ ): .mdi.mdi-chevron-left
+
+ .shame1.flex-center.w-12._arrow.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
+ :class="{ 'opacity-30 !cursor-default' : isToday }"
+ @click="changeDate('next')"
+ )
+ .mdi.mdi-calendar-today(v-if="isToday")
+ .mdi.mdi-chevron-right(v-else)
+
+ .grow.cursor-pointer.py-2.px-3.flex.items-center.rounded-md.text-xs.leading-none.hocus_bg-skin-item-main-hover(
+ v-html="formattedDate"
+ @click="$store.commit('trnForm/showTrnFormModal', 'calendar')"
+ )
+</template>
+
+<style lang="stylus" scoped>
+.shame1
+ color var(--c-font-3)
+ font-size 28px
+ border 1px solid transparent
+ user-select none
+
+.trnFormDate
+ &__item
+ cursor pointer
+ position relative
+ display flex
+ align-items center
+ justify-content center
+ width 44px
+ height 44px
+ padding $m7
+ border 1px solid transparent
+ user-select none
+
+ +media(400px)
+ width 58px
+ height 58px
+
+ &._date
+ display flex
+ padding 0
+ width 100%
+ height auto
+ flex-grow 1
+ color var(--c-font-4)
+ font-size 12px
+ font-weight 400
+ line-height 16px
+ border-radius 50px
+ border-color transparent
+
+ &._arrow
+ color var(--c-font-4)
+ font-size 28px
+ background var(--c-item-bg-main)
+ .mdi
+ font-size 24px
+</style>
diff --git a/components/trnForm/main/Input.vue b/components/trnForm/main/Input.vue
new file mode 100644
index 00000000..44ae39f3
--- /dev/null
+++ b/components/trnForm/main/Input.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import { formatInput } from '~/components/trnForm/utils/calculate'
+
+defineProps<{
+ amount: number
+ amountRaw: string
+ highlight?: 'income' | 'expense'
+ isShowSum: boolean
+ isTransfer?: boolean
+}>()
+
+const emit = defineEmits<{
+ (e: 'onChange', value: string): void
+}>()
+
+function onInput(event: Event) {
+ const value = (event.target as HTMLInputElement).value
+ emit('onChange', value || '')
+}
+</script>
+
+<template lang="pug">
+.relative
+ //- Sum
+ div(
+ :class=`[{
+ 'opacity-0': !isShowSum,
+ 'left-3': isTransfer,
+ 'left-1/2 -translate-x-1/2': !isTransfer,
+ }]`
+ class=`
+ pointer-events-none
+ absolute top-2
+ text-center text-sm text-primary/60
+ `
+ tabindex="0"
+ ).
+ {{ formatInput(amount) }}
+
+ //- Input
+ input(
+ :class=`{
+ 'text-[#f92134] placeholder_text-red-700/80': highlight === 'income',
+ 'text-[#2cad22] placeholder_text-green-700/80': highlight === 'expense',
+ 'text-center': !isTransfer,
+ }`
+ :placeholder="$t('enterAmount')"
+ :value="amountRaw"
+ class=`
+ swiper-no-swiping
+ block w-full h-auto pt-6 pb-2 px-3
+ text-3xl font-unica
+ bg-transparent rounded-md
+ placeholder_text-3xl placeholder_font-roboto
+ hocus_bg-item-hover
+ focus_bg-item-hover
+ transition
+ `
+ type="text"
+ inputmode="tel"
+ @input="onInput"
+ )
+</template>
+
+<i18n lang="yaml">
+en:
+ enterAmount: Type amount
+
+ru:
+ enterAmount: Введите сумму
+</i18n>
diff --git a/components/trnForm/main/SelectedCategory.vue b/components/trnForm/main/SelectedCategory.vue
new file mode 100644
index 00000000..530d33a7
--- /dev/null
+++ b/components/trnForm/main/SelectedCategory.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+import type { CategoryId, CategoryItem } from '~/components/categories/types'
+
+const { $store } = useNuxtApp()
+const $trnForm = useTrnFormStore()
+
+const categoryId = computed<CategoryId | false>(() =>
+ $trnForm.values.categoryId ?? $store.getters['categories/categoriesIdsForTrnValues'][0],
+)
+const category = computed<CategoryItem | false>(() =>
+ categoryId.value && $store.state.categories.items[categoryId.value],
+)
+const parentCategory = computed<CategoryItem | false>(() =>
+ category.value && $store.state.categories.items[category.value.parentId],
+)
+</script>
+
+<template lang="pug">
+.cursor-pointer.py-2.px-3.relative.gap-x-3.flex.items-center.rounded-md.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
+ v-if="category"
+ @click="$store.commit('trnForm/showTrnFormModal', 'categories')"
+)
+ .w-8.h-8.flex.items-center.justify-center.rounded-full.text-xl.leading-none.text-neutral-50(
+ :style="{ background: category.color }"
+ ): div(:class="category.icon")
+
+ .grow.truncate
+ .text-xs.text-skin-item-base-down.dark_text-neutral-400(v-if="parentCategory").
+ {{ parentCategory.name }}
+
+ .leading-none.text-sm.text-neutral-700.dark_text-neutral-300.
+ {{ category.name }}
+
+ .mdi.mdi-dots-vertical.-mr-1.text-lg.text-skin-item-base-down
+</template>
diff --git a/components/trnForm/main/SelectedTrn.vue b/components/trnForm/main/SelectedTrn.vue
new file mode 100644
index 00000000..f78041bd
--- /dev/null
+++ b/components/trnForm/main/SelectedTrn.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts">
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
+const $trnForm = useTrnFormStore()
+const { $store } = useNuxtApp()
+
+const walletId = computed(() => {
+ const walletsIds = Object.keys($store.state.wallets.items)
+ const walletId = walletsIds[0]
+ return $trnForm.values.walletId ?? walletId
+})
+</script>
+
+<template lang="pug">
+.px-2.pb-2.grid.grid-cols-2.gap-3
+ TrnFormMainSelectedWallet(
+ :id="walletId"
+ @click="$store.commit('trnForm/showTrnFormModal', 'wallets')"
+ )
+ TrnFormMainSelectedCategory
+</template>
diff --git a/components/trnForm/SelectedWallet.vue b/components/trnForm/main/SelectedWallet.vue
similarity index 69%
rename from components/trnForm/SelectedWallet.vue
rename to components/trnForm/main/SelectedWallet.vue
index b6d7debd..9491ae95 100644
--- a/components/trnForm/SelectedWallet.vue
+++ b/components/trnForm/main/SelectedWallet.vue
@@ -1,19 +1,26 @@
<script setup lang="ts">
import useWallets from '~/components/wallets/useWallets'
+import type { WalletId } from '~/components/wallets/types'
+
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
const props = defineProps<{
- walletId: string
+ id: WalletId
+ isHideDots: boolean
}>()
+
const emit = defineEmits(['click'])
+const $trnForm = useTrnFormStore()
const { walletsItemsSorted } = useWallets()
-const wallet = computed(() => walletsItemsSorted.value[props.walletId])
+
+const wallet = computed(() => walletsItemsSorted.value[props.id])
</script>
<template lang="pug">
.cursor-pointer.flex.items-center.py-2.px-3.rounded-md.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
v-if="wallet"
- @click="emit('click')"
+ @click="emit('click', id)"
)
.grow.flex-center.gap-x-3
//- Icon
@@ -35,5 +42,5 @@ const wallet = computed(() => walletsItemsSorted.value[props.walletId])
align="left"
)
- .mdi.mdi-dots-vertical.-mr-1.text-lg.text-skin-item-base-down
+ .mdi.mdi-dots-vertical.-mr-1.text-lg.text-skin-item-base-down(v-if="!isHideDots")
</template>
diff --git a/components/trnForm/main/Types.vue b/components/trnForm/main/Types.vue
new file mode 100644
index 00000000..92b34b45
--- /dev/null
+++ b/components/trnForm/main/Types.vue
@@ -0,0 +1,34 @@
+<script setup lang="ts">
+import type { TrnType } from '~/components/trns/types'
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
+const $trnForm = useTrnFormStore()
+
+function setAmountType(amountType: TrnType) {
+ $trnForm.onChangeTrnType(amountType)
+}
+
+function isItActive(amountType: TrnType) {
+ return $trnForm.values.trnType === amountType
+}
+</script>
+
+<template lang="pug">
+.px-2.pb-5
+ UiTabs
+ UiTabsItem(
+ :isActive="isItActive(0)"
+ @click="setAmountType(0)"
+ ) {{ $t('money.expense') }}
+
+ UiTabsItem(
+ :isActive="isItActive(1)"
+ @click="setAmountType(1)"
+ ) {{ $t('money.income') }}
+
+ UiTabsItem(
+ v-if="$store.getters['wallets/walletsSortedIds'].length > 1"
+ :isActive="isItActive(2)"
+ @click="setAmountType(2)"
+ ) {{ $t('trnForm.transferTitle') }}
+</template>
diff --git a/components/trnForm/main/_Menu.vue b/components/trnForm/main/_Menu.vue
new file mode 100644
index 00000000..3415de3a
--- /dev/null
+++ b/components/trnForm/main/_Menu.vue
@@ -0,0 +1,94 @@
+<!-- <script setup lang="ts">
+import { computePosition, flip, offset, shift } from '@floating-ui/dom'
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
+const $trnForm = useTrnFormStore()
+const button = ref()
+
+const tooltipRef = ref<HTMLElement>()
+const tooltip = ref<{
+ isShow: boolean
+ show: any
+ hide: any
+ toggle: any
+ update: any
+ onClick: any
+}>({
+ isShow: false,
+ show: () => {
+ tooltipRef.value?.classList.remove('hidden')
+ tooltip.value.update()
+ },
+ hide: () => tooltipRef.value?.classList.add('hidden'),
+ toggle: () => {
+ if (tooltipRef.value?.classList.contains('hidden')) {
+ tooltip.value.show()
+ return
+ }
+ tooltip.value.hide()
+ },
+ update: () => {
+ if (!tooltipRef.value)
+ return
+
+ computePosition(button.value.$el, tooltipRef.value, {
+ placement: 'bottom-end',
+ middleware: [flip(), shift(), offset(6)],
+ })
+ .then(({ x, y }) => {
+ if (!tooltipRef.value)
+ return
+ Object.assign(tooltipRef.value?.style, {
+ left: `${x}px`,
+ top: `${y}px`,
+ })
+ })
+ },
+ onClick: (f: Function) => {
+ f()
+ tooltip.value.hide()
+ },
+})
+
+onMounted(() => tooltip.value.update())
+</script>
+
+<template lang="pug">
+TrnFormMainMetaItem(
+ ref="button"
+ aria-describedby="tooltip"
+ @click="tooltip.toggle"
+)
+ template(#icon)
+ .mdi.mdi-menu
+
+ .z-10.hidden.absolute.left-0.top-0.w-60.bg-foreground-main.rounded-xl.shadow-lg(
+ ref="tooltipRef"
+ role="tooltip"
+ @click.stop=""
+ )
+ TrnFormMainMetaItem.py-3.px-3.gap-3(
+ ref="button"
+ aria-describedby="tooltip"
+ @click="tooltip.onClick($trnForm.calculator.onToggle)"
+ )
+ template(#icon)
+ .mdi.mdi-comment-text-outline
+ | Toggle keyboard
+
+ TrnFormMainMetaItem.py-3.px-3.gap-3(
+ ref="button"
+ aria-describedby="tooltip"
+ @click="tooltip.onClick($trnForm.onClear)"
+ )
+ template(#icon)
+ .mdi.mdi-comment-text-outline
+ | Reset form
+</template> -->
+<script setup lang="ts">
+
+</script>
+
+<template lang="pug">
+
+</template>
diff --git a/components/trnForm/main/_MetaItem.vue b/components/trnForm/main/_MetaItem.vue
new file mode 100644
index 00000000..8dc933c8
--- /dev/null
+++ b/components/trnForm/main/_MetaItem.vue
@@ -0,0 +1,14 @@
+<template lang="pug">
+div(class=`
+ cursor-pointer
+ px-3 py-2 flex gap-1 items-center
+ border-1 rounded-lg
+ text-primary/60 leading-none
+ hocus_bg-item-hover
+`)
+ .text-xl.leading-none
+ slot(name="icon")
+
+ .text-xs.font-arial.text-left.leading-none
+ slot
+</template>
diff --git a/components/trnForm/modal/TrnFormModalCalendar.vue b/components/trnForm/modal/Calendar.vue
similarity index 72%
rename from components/trnForm/modal/TrnFormModalCalendar.vue
rename to components/trnForm/modal/Calendar.vue
index 41ace685..85d8d43f 100644
--- a/components/trnForm/modal/TrnFormModalCalendar.vue
+++ b/components/trnForm/modal/Calendar.vue
@@ -1,53 +1,29 @@
-<script>
+<script setup lang="ts">
import Datepicker from 'vuejs-datepicker'
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
-const calendarOptions = {
+const options = {
'use-utc': true,
'disabledDates': {
from: new Date(),
},
}
-export default {
- components: {
- Datepicker,
- },
-
- setup() {
- const { $store } = useNuxtApp()
-
- const date = computed(() => $store.state.trnForm.values.date)
- const closeModal = ref(null)
+const { $store, $day } = useNuxtApp()
+const $trnForm = useTrnFormStore()
- return {
- date,
- closeModal,
- }
- },
+function handleSelectDate(date, close) {
+ $trnForm.values.date = $day(date).valueOf()
+ close()
+}
- created() {
- this.calendarOptions = calendarOptions
- },
+function handleSelectDateDaysAgo(daysAgo, close) {
+ $trnForm.values.date = $day().subtract(daysAgo, 'day').valueOf()
+ close()
+}
- methods: {
- handleSelectDate(date, close) {
- this.$store.commit('trnForm/setTrnFormValues', {
- date: this.$day(date).valueOf(),
- })
- close()
- },
-
- handleSelectDateDaysAgo(daysAgo, close) {
- this.$store.commit('trnForm/setTrnFormValues', {
- date: this.$day().subtract(daysAgo, 'day').valueOf(),
- })
- close()
- },
-
- afterClose() {
- this.$store.commit('trnForm/closeTrnFormModal', 'calendar')
- },
- },
+function afterClose() {
+ $store.commit('trnForm/closeTrnFormModal', 'calendar')
}
</script>
@@ -58,12 +34,12 @@ TrnFormModal(@closed="afterClose")
template(#default="{ close }")
Datepicker(
+ :disabledDates="options.disabledDates"
:inline="true"
- :value="date"
:monday-first="true"
- wrapper-class="inlineCalendar"
+ :value="$trnForm.values.date"
calendar-class="inlineCalendar__in"
- :disabledDates="calendarOptions.disabledDates"
+ wrapper-class="inlineCalendar"
@selected="date => handleSelectDate(date, close)"
)
.modalLinks
@@ -79,7 +55,7 @@ TrnFormModal(@closed="afterClose")
)
ModalButton(
:name="$t('dates.day.today')"
- icon="mdi mdi-weather-sunset-up"
+ icon="mdi mdi-calendar-today"
@onClick="() => handleSelectDateDaysAgo(0, close)"
)
</template>
diff --git a/components/trnForm/modal/TrnFormModalCats.vue b/components/trnForm/modal/Cats.vue
similarity index 100%
rename from components/trnForm/modal/TrnFormModalCats.vue
rename to components/trnForm/modal/Cats.vue
diff --git a/components/trnForm/modal/CatsChild.vue b/components/trnForm/modal/CatsChild.vue
new file mode 100644
index 00000000..c171d35c
--- /dev/null
+++ b/components/trnForm/modal/CatsChild.vue
@@ -0,0 +1,42 @@
+<script setup lang="ts">
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+import type { CategoryId } from '~~/components/trns/types'
+
+const { $store } = useNuxtApp()
+const $trnForm = useTrnFormStore()
+
+const childSelected = ref(false)
+
+const id = computed(() => $store.state.trnForm.showModalCategoryId)
+const category = computed(() => $store.state.categories.items[id.value])
+const childCategoriesIds = computed(() => $store.getters['categories/getChildCategoriesIds'](id.value))
+
+function handleCategoryClick(categoryId: CategoryId, close: any) {
+ childSelected.value = true
+ $trnForm.values.categoryId = categoryId
+ close()
+}
+
+function afterClose() {
+ if (childSelected.value)
+ $store.commit('trnForm/closeTrnFormModal', 'categories')
+
+ $store.commit('trnForm/closeTrnFormModal', 'categoriesChild')
+ $store.commit('trnForm/setTrnFormModalCategoryId', null)
+}
+</script>
+
+<template lang="pug">
+TrnFormModal(@closed="afterClose")
+ template(#header)
+ template {{ $t('categories.title') }}
+
+ template(#default="{ close }")
+ template(v-if="id && category")
+ .pb-3.px-3
+ CategoriesList(
+ :ids="childCategoriesIds"
+ class="!gap-x-1"
+ @click="catId => handleCategoryClick(catId, close)"
+ )
+</template>
diff --git a/components/trnForm/modal/Description.vue b/components/trnForm/modal/Description.vue
new file mode 100644
index 00000000..fb9a9b38
--- /dev/null
+++ b/components/trnForm/modal/Description.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import { useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
+const { $store } = useNuxtApp()
+const $trnForm = useTrnFormStore()
+
+const description = ref('')
+
+function handleCancel(close) {
+ description.value = ''
+ close()
+}
+
+function handleSave(close) {
+ $trnForm.values.desc = description.value
+ close()
+}
+
+function afterClose() {
+ $store.commit('trnForm/closeTrnFormModal', 'description')
+}
+
+onMounted(() => {
+ description.value = $trnForm.values.desc ?? ''
+})
+</script>
+
+<template lang="pug">
+TrnFormModal(@closed="afterClose")
+ template(#header)
+ template {{ $t('trnForm.description.title') }}
+
+ template(#default="{ close }")
+ .pb-6.px-3
+ textarea.w-full.h-28.m-0.py-3.px-4.rounded-lg.text-base.font-normal.text-skin-item-base.bg-skin-item-main-bg.border.border-solid.border-skin-item-main-hover.placeholder_text-skin-item-base-down.transition.ease-in-out.focus_text-skin-item-base-up.focus_bg-skin-item-main-hover.focus_border-blue3.focus_outline-none(
+ v-model="description"
+ :placeholder="$t('trnForm.description.placeholder')"
+ )
+
+ .pb-4.px-3
+ .cursor-pointer.grow.py-3.px-5.flex-center.rounded-full.text-skin-item-base-up.text-sm.bg-skin-accent-base.hocus_bg-skin-accent-down(
+ @click="handleSave(close)"
+ ) {{ $t('base.save') }}
+</template>
diff --git a/components/trnForm/modal/TrnFormModalCatsChild.vue b/components/trnForm/modal/TrnFormModalCatsChild.vue
deleted file mode 100644
index 0e69e8d2..00000000
--- a/components/trnForm/modal/TrnFormModalCatsChild.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<script>
-// TODO: setup
-export default {
- data() {
- return {
- childSelected: false,
- }
- },
-
- computed: {
- id() {
- return this.$store.state.trnForm.showModalCategoryId
- },
- category() {
- return this.$store.state.categories.items[this.id]
- },
- childCategoriesIds() {
- return this.$store.getters['categories/getChildCategoriesIds'](this.id)
- },
- },
-
- methods: {
- handleCategoryClick(categoryId, close) {
- this.childSelected = true
- this.$store.commit('trnForm/setTrnFormValues', { categoryId })
- close()
- },
-
- afterClose() {
- if (this.childSelected)
- this.$store.commit('trnForm/closeTrnFormModal', 'categories')
-
- this.$store.commit('trnForm/closeTrnFormModal', 'categoriesChild')
- this.$store.commit('trnForm/setTrnFormModalCategoryId', null)
- },
- },
-}
-</script>
-
-<template lang="pug">
-TrnFormModal(@closed="afterClose")
- template(#header)
- template {{ $t('categories.title') }}
-
- template(#default="{ close }")
- template(v-if="id && category")
- .pb-3.px-3
- CategoriesList(
- :ids="childCategoriesIds"
- class="!gap-x-1"
- @onClick="catId => handleCategoryClick(catId, close)"
- )
-</template>
diff --git a/components/trnForm/modal/TrnFormModalDescription.vue b/components/trnForm/modal/TrnFormModalDescription.vue
deleted file mode 100644
index 223dd312..00000000
--- a/components/trnForm/modal/TrnFormModalDescription.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<script lang="ts">
-import useCalculator from '~/components/trnForm/calculator/useCalculator'
-
-export default {
- name: 'TrnFormModalDescription',
-
- setup() {
- const { $store } = useNuxtApp()
- const { setKeysActive } = useCalculator()
- const description = ref('')
-
- onMounted(() => {
- description.value = $store.state.trnForm.values.description
- setKeysActive(false)
- })
-
- return {
- description,
- setKeysActive,
- }
- },
-
- methods: {
- handleCancel(close) {
- this.description = null
- close()
- },
-
- handleSave(close) {
- this.$store.commit('trnForm/setTrnFormValues', { description: this.description })
- close()
- },
-
- afterClose() {
- this.setKeysActive(true)
- this.$store.commit('trnForm/closeTrnFormModal', 'description')
- },
- },
-}
-</script>
-
-<template lang="pug">
-TrnFormModal(@closed="afterClose")
- template(#header)
- template {{ $t('trnForm.description.title') }}
-
- template(#default="{ close }")
- .pb-6.px-3
- textarea.w-full.h-28.m-0.py-3.px-4.rounded-lg.text-base.font-normal.text-skin-item-base.bg-skin-item-main-bg.border.border-solid.border-skin-item-main-hover.placeholder_text-skin-item-base-down.transition.ease-in-out.focus_text-skin-item-base-up.focus_bg-skin-item-main-hover.focus_border-blue3.focus_outline-none(
- v-model="description"
- :placeholder="$t('trnForm.description.placeholder')"
- )
-
- .pb-4.px-3.flex.justify-evenly.gap-6
- .cursor-pointer.grow.py-3.px-5.flex-center.rounded-full.text-skin-item-base-down.text-sm.bg-skin-item-main-bg.hocus_bg-skin-item-main-hover(
- class="basis-1/2 max-w-[280px]"
- @click="handleCancel(close)"
- ) {{ $t('close') }}
-
- .cursor-pointer.grow.py-3.px-5.flex-center.rounded-full.text-skin-item-base-up.text-sm.bg-skin-accent-base.hocus_bg-skin-accent-down(
- class="basis-1/2 max-w-[280px]"
- @click="handleSave(close)"
- ) {{ $t('base.save') }}
-</template>
diff --git a/components/trnForm/ModalWallets.vue b/components/trnForm/modal/Wallets.vue
similarity index 99%
rename from components/trnForm/ModalWallets.vue
rename to components/trnForm/modal/Wallets.vue
index 42bc1be3..45dac271 100644
--- a/components/trnForm/ModalWallets.vue
+++ b/components/trnForm/modal/Wallets.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
import { useWindowSize } from '@vueuse/core'
+
defineProps<{
title: string
}>()
diff --git a/components/trnForm/types.ts b/components/trnForm/types.ts
new file mode 100644
index 00000000..42d300cb
--- /dev/null
+++ b/components/trnForm/types.ts
@@ -0,0 +1,64 @@
+import type { TransferType, TrnId, TrnType } from '~/components/trns/types'
+import type { CategoryId } from '~/components/categories/types'
+import type { WalletId } from '~/components/wallets/types'
+
+export enum AmountsType {
+ Transaction = 0,
+ TransferIncome = 1,
+ TransferExpense = 2,
+}
+
+export interface TrnFormValues {
+ trnId: null | TrnId
+ // TODO: is better way to show array meaning?
+ // ['Transaction', 'expenseTransfer', 'incomeTransfer']
+ amount: [number, number, number]
+ // TODO: is better way to show array meaning?
+ // ['Transaction', 'expenseTransfer', 'incomeTransfer']
+ amountRaw: [string, string, string]
+ date: number
+ desc?: string
+ transferType: TransferType
+ trnType: TrnType
+ categoryId: CategoryId | null
+ walletId: WalletId | null
+
+ expenseWalletId: WalletId | null
+ incomeWalletId: WalletId | null
+}
+
+// export type TrnFormValues = {
+// // TODO: is better way to show array meaning?
+// // ['Transaction', 'expenseTransfer', 'incomeTransfer']
+
+// amount: [number, number, number]
+// amountRaw: [string, string, string]
+// date: number
+// desc: string | null
+// trnId: null | TrnId
+// trnType: TrnType
+// } & ({
+// categoryId: CategoryId | null
+// trnType: TrnType.Expense | TrnType.Income
+// walletId: WalletId | null
+// } | {
+// categoryId: 'transfer' | null
+// expenseWalletId: WalletId | null
+// incomeWalletId: WalletId | null
+// transferType: TransferType
+// trnType: TrnType.Transfer
+// })
+
+export interface TrnFormUi {
+ isShow: boolean
+ walletsTab: string // TODO: add typing
+ walletsModal: boolean
+ catsRootModal: boolean
+ catsParentId: CategoryId | null
+ catsChildModal: boolean
+ walletsViewAs: 'big' | 'small' // TODO: add typing
+ tab: 'main' | 'date' | 'desc'
+
+ walletTransferModal: boolean
+ walletTransferType: 'expense' | 'income'
+}
diff --git a/components/trnForm/useTrnForm.ts b/components/trnForm/useTrnForm.ts
new file mode 100644
index 00000000..aeae77af
--- /dev/null
+++ b/components/trnForm/useTrnForm.ts
@@ -0,0 +1,296 @@
+import dayjs from 'dayjs'
+import vue from 'vue'
+import { defineStore } from 'pinia'
+import type { WalletId } from '../wallets/types'
+import type { CategoryId } from '../categories/types'
+import type { AmountsType, TrnFormUi, TrnFormValues } from '~/components/trnForm/types'
+import type { TransferType, TrnId, TrnItem } from '~/components/trns/types'
+import { TrnType } from '~/components/trns/types'
+import { formatInput, getSum } from '~/components/trnForm/utils/calculate'
+import { formatTransaction, formatTransfer } from '~/components/trnForm/utils/formatData'
+import { random, successEmo } from '~/assets/js/emo'
+import { validate } from '~/components/trnForm/utils/validate'
+import { generateId } from '~/utils/generateId'
+
+export const useTrnFormStore = defineStore('trnForm', () => {
+ const values = reactive<TrnFormValues>({
+ trnId: null,
+ amount: [0, 0, 0],
+ amountRaw: ['', '', ''],
+ date: dayjs().valueOf(),
+ desc: undefined,
+ transferType: 0,
+ trnType: 0,
+ walletId: null,
+ categoryId: null,
+ incomeWalletId: null,
+ expenseWalletId: null,
+ })
+
+ const ui = ref<TrnFormUi>({
+ isShow: false,
+ walletsTab: 'all',
+ walletsModal: false,
+ walletTransferModal: false,
+ walletTransferType: 'expense',
+ catsRootModal: false,
+ catsChildModal: false,
+ catsParentId: null,
+ walletsViewAs: 'big',
+ tab: 'main',
+ })
+
+ /**
+ * Active amount idx
+ */
+ const activeAmountIdx = computed(() =>
+ values.trnType !== TrnType.Transfer
+ ? 0
+ : 1 + values.transferType,
+ )
+
+ /**
+ * Change amount
+ */
+ function onChangeAmount(amountRaw: string) {
+ vue.set(values.amount, activeAmountIdx.value, getSum(amountRaw))
+ vue.set(values.amountRaw, activeAmountIdx.value, formatInput(amountRaw))
+
+ // TODO: Vue3
+ // values.amount[activeAmountIdx.value] = getSum(amountRaw)
+ // values.amountRaw[activeAmountIdx.value] = formatInput(amountRaw)
+ }
+
+ /**
+ * Get is show sum
+ */
+ // TODO: refactor isTransferAuto
+ function getIsShowSum(trnType: TrnType | AmountsType, isTransferAuto = false) {
+ if (isTransferAuto && trnType === 2) {
+ const expense = values.amount[1] !== 0
+ && formatInput(values.amount[1]) !== values.amountRaw[1]
+ const income = values.amount[2] !== 0
+ && formatInput(values.amount[2]) !== values.amountRaw[2]
+
+ return expense || income
+ }
+
+ return values.amount[trnType] !== 0
+ && formatInput(values.amount[trnType]) !== values.amountRaw[trnType]
+ }
+
+ /**
+ * Change trn type
+ */
+ function onChangeTrnType(trnType: TrnType) {
+ values.trnType = trnType
+ }
+
+ /**
+ * Change transfer type
+ */
+
+ // TODO: not working when use tab keyboard
+ function onChangeTransferType(transferType: TransferType) {
+ values.transferType = transferType
+ }
+
+ /**
+ * Clear form
+ */
+ function onClear() {
+ values.amount = [0, 0, 0]
+ values.amountRaw = ['', '', '']
+ values.desc = undefined
+ values.trnId = null
+ // values.trnType = 0
+
+ // values.date = dayjs().valueOf()
+ // values.walletId = null
+ // values.categoryId = null
+ // values.incomeWalletId = null
+ // values.expenseWalletId = null
+ }
+
+ function onClose() {
+ if (values.trnId)
+ onClear()
+ }
+
+ /**
+ * Set Values
+ */
+ type Values = {
+ categoriesIds: CategoryId[]
+ trn: TrnItem
+ walletsIds: WalletId[]
+ } & ({
+ action: 'create'
+ } | {
+ action: 'edit' | 'duplicate'
+ trnId: TrnId
+ })
+
+ function setValues(props: Values) {
+ values.trnId = null
+
+ if (props.action === 'create') {
+ values.walletId = props.trn?.walletId ?? props.walletsIds[0]
+ values.categoryId = props.trn?.categoryId ?? props.categoriesIds[0]
+ values.incomeWalletId = props.walletsIds[0]
+ values.expenseWalletId = props.walletsIds[1]
+ }
+
+ if (props.action === 'edit')
+ values.trnId = props.trnId
+
+ if (props.action === 'edit' || props.action === 'duplicate') {
+ if (props.trn.type !== TrnType.Transfer) {
+ values.amount = [props.trn.amount, 0, 0]
+ values.categoryId = props.trn.categoryId
+ values.walletId = props.trn.walletId
+ }
+
+ if (props.trn.type === TrnType.Transfer) {
+ values.amount = [0, props.trn.expenseAmount, props.trn.incomeAmount]
+ values.expenseWalletId = props.trn.expenseWalletId
+ values.incomeWalletId = props.trn.incomeWalletId
+ values.categoryId = 'transfer'
+ }
+
+ values.amountRaw = values.amount.map(i => formatInput(i)) as TrnFormValues['amountRaw']
+ values.trnType = props.trn.type
+ values.desc = props.trn.desc
+ values.date = props.trn.date
+ }
+ }
+
+ /**
+ * Submit
+ */
+ async function onSubmit() {
+ const data = values.trnType !== 2
+ ? formatTransaction(values)
+ : formatTransfer(values)
+
+ try {
+ const validateStatus = validate(data)
+
+ if (validateStatus.error) {
+ vue.notify({
+ type: 'error',
+ title: validateStatus.error.title,
+ text: validateStatus.error.text,
+ })
+ return
+ }
+
+ // TODO: translate
+ vue.notify({
+ type: 'success',
+ text: 'Excellent transaction!',
+ title: random(successEmo),
+ })
+
+ return {
+ id: values.trnId ?? generateId(),
+ values: data,
+ }
+ }
+ catch (e) {
+ return false
+ }
+ }
+
+ /**
+ * onChangeCountSum
+ */
+ function onChangeCountSum() {
+ // Transfer
+ if (values.trnType === 2) {
+ vue.set(values.amountRaw, 1, formatInput(values.amount[1]))
+ vue.set(values.amountRaw, 2, formatInput(values.amount[2]))
+
+ // TODO: Vue3
+ // values.amountRaw[1] = formatInput(values.amount[1])
+ // values.amountRaw[2] = formatInput(values.amount[2])
+ return
+ }
+
+ // Transaction
+ vue.set(values.amountRaw, values.trnType, formatInput(values.amount[values.trnType]))
+ // TODO: Vue3
+ // values.amountRaw[values.trnType] = formatInput(values.amount[values.trnType])
+ }
+
+ return {
+ activeAmountIdx,
+ values,
+ ui,
+ // dates,
+
+ setValues,
+ getIsShowSum,
+ onChangeAmount,
+ onChangeTransferType,
+ onChangeTrnType,
+ onChangeCountSum,
+ onClear,
+ onSubmit,
+ onClose,
+ }
+})
+
+export function useTrnForm() {
+ const $trnForm = useTrnFormStore()
+ const { $store } = useNuxtApp()
+
+ const categoriesIds = computed(() => $store.getters['categories/categoriesIdsForTrnValues'])
+ const walletIds = computed(() => $store.getters['wallets/walletsSortedIds'])
+
+ function trnFormEdit(trnId: TrnId) {
+ const trn = $store.state.trns.items[trnId]
+
+ $trnForm.setValues({
+ action: 'edit',
+ categoriesIds: categoriesIds.value,
+ trn,
+ trnId,
+ walletsIds: walletIds.value,
+ })
+
+ $store.commit('trnForm/openTrnForm')
+ }
+
+ function trnFormCreate() {
+ $trnForm.setValues({
+ action: 'create',
+ categoriesIds: categoriesIds.value,
+ trn: $store.getters['trns/lastCreatedTrnItem'],
+ walletsIds: walletIds.value,
+ })
+
+ $store.commit('trnForm/openTrnForm')
+ }
+
+ function trnFormDuplicate(trnId: TrnId) {
+ const trn = $store.state.trns.items[trnId]
+ console.log('trnId', trnId)
+
+ $trnForm.setValues({
+ action: 'duplicate',
+ categoriesIds: categoriesIds.value,
+ trn,
+ trnId,
+ walletsIds: walletIds.value,
+ })
+
+ $store.commit('trnForm/openTrnForm')
+ }
+
+ return {
+ trnFormEdit,
+ trnFormCreate,
+ trnFormDuplicate,
+ }
+}
diff --git a/components/trnForm/useTrnFormValidate.ts b/components/trnForm/useTrnFormValidate.ts
deleted file mode 100644
index 75e490de..00000000
--- a/components/trnForm/useTrnFormValidate.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-// TODO: translate
-export default function useTrnFormValidate() {
- function validate(values: any) {
- const errorTitle = '😮'
-
- if (!values.amount && values.type !== 2) {
- return {
- error: {
- title: errorTitle,
- text: 'Amount can not be empty',
- },
- }
- }
-
- if (values.amount <= 0 && values.type !== 2) {
- return {
- error: {
- title: errorTitle,
- text: 'Amount can not be negative number',
- },
- }
- }
-
- if (values.amount === 0 && values.type !== 2) {
- return {
- error: {
- title: errorTitle,
- text: 'Amount can not be equal Zero',
- },
- }
- }
-
- if (!values.walletId && values.type !== 2) {
- return {
- error: {
- title: errorTitle,
- text: 'Please select wallet',
- },
- }
- }
-
- if (!values.categoryId && values.type !== 2) {
- return {
- error: {
- title: errorTitle,
- text: 'Please select category',
- },
- }
- }
-
- // Transfer
- if (values.type === 2) {
- if (Number(values.incomeAmount) === 0 || Number(values.expenseAmount) === 0) {
- return {
- error: {
- title: errorTitle,
- text: 'Amount can not be empty',
- },
- }
- }
-
- if (values.incomeWalletId === values.expenseWalletId) {
- return {
- error: {
- title: errorTitle,
- text: 'Transfer in same wallet',
- },
- }
- }
- }
-
- return {
- valid: true,
- }
- }
-
- return {
- validate,
- }
-}
diff --git a/components/trnForm/utils/calculate.ts b/components/trnForm/utils/calculate.ts
new file mode 100644
index 00000000..90a84191
--- /dev/null
+++ b/components/trnForm/utils/calculate.ts
@@ -0,0 +1,177 @@
+import { formatByCurrency } from '~/components/currencies/utils'
+
+// TODO: params
+const fixed = 2
+const separator = ' '
+const maxIntegerLengthAllowed = 999
+
+/**
+ * Create array from expression
+ *
+ * @param {string} value
+ * @return {string[]}
+ */
+function _separateExpression(value: string): string[] {
+ return value
+ .split(/([\/*\-+])/)
+ .filter(i => i)
+}
+
+/**
+ * Remove spaces in string
+ *
+ * @param {string} value
+ * @return {string}
+ */
+function _removeSpaces(value: string): string {
+ return String(value).replace(/[ ,]/g, '')
+}
+
+function _checkIsLastSymbolAction(lastSymbol: string): boolean {
+ return Number.isNaN(Number.parseInt(lastSymbol))
+}
+
+/**
+ * Make calculation
+ *
+ * @param {string} value
+ * @return {(string | undefined)}
+ */
+export function getSum(value: string): number {
+ try {
+ const clearedExpression = _removeSpaces(String(value || ''))
+ const lastSymbol = clearedExpression.slice(-1)
+ const isLastSymbolAction = _checkIsLastSymbolAction(lastSymbol)
+ const formattedExpression = (
+ isLastSymbolAction
+ ? clearedExpression.slice(0, -1)
+ : clearedExpression
+ ) || '0'
+
+ // eslint-disable-next-line no-new-func
+ const math = Function(`"";return (${formattedExpression})`)()
+
+ if (math <= Number.MAX_SAFE_INTEGER)
+ return Math.abs(math)
+
+ return 0
+ }
+ catch (error) {
+ console.log(error)
+ return Number(value)
+ }
+}
+
+/**
+ * Create expression string
+ *
+ * @param {string} expression
+ * @param {string} value
+ * @return {string} expression
+ */
+export function createExpressionString(value: string, expression: string): string {
+ const inputIsAction = Number.isNaN(Number.parseInt(value))
+
+ // Last symbol of expression
+ const clearedExpression = _removeSpaces(expression)
+ const lastSymbol = clearedExpression.slice(-1)
+ const isLastSymbolAction = _checkIsLastSymbolAction(lastSymbol)
+ const isSumAction = value === '='
+ const isDeleteAction = value.toLocaleLowerCase() === 'c'
+ const isDotAction = value === '.'
+
+ // Delete
+ if (clearedExpression !== '0' && isDeleteAction) {
+ const deleteString = clearedExpression.slice(0, -1)
+ if (deleteString)
+ return deleteString
+ return '0'
+ }
+
+ // Starts from 0
+ if (clearedExpression === '0') {
+ if (value === '0')
+ return expression
+ if (!inputIsAction)
+ return value
+ }
+
+ // Change math symbol
+ if (inputIsAction && isLastSymbolAction && !isDotAction && !isSumAction && !isDeleteAction)
+ return clearedExpression.slice(0, -1) + value
+
+ // Calculate
+ if (inputIsAction && isSumAction) {
+ const result = getSum(clearedExpression)
+ return formatInput(result)
+ }
+
+ // Handle dot value
+ if (inputIsAction && isDotAction) {
+ if (Array.isArray(clearedExpression.split(/[/*\-+]/)) && (clearedExpression.split(/[/*\-+]/).slice(-1)[0].includes('.') || isLastSymbolAction)) {
+ if (isLastSymbolAction && lastSymbol !== '.')
+ return `${clearedExpression}0.`
+
+ return expression
+ }
+ else {
+ return clearedExpression + value
+ }
+ }
+
+ // Add math symbol
+ if (inputIsAction)
+ return clearedExpression + value
+
+ // Handle number
+ const separatedExpression = _separateExpression(clearedExpression)
+
+ if (separatedExpression) {
+ const lastNumber = separatedExpression.slice(-1)[0] || '0'
+ const lastNumberSplit = lastNumber.split(/[.]/)
+ const isInteger = lastNumberSplit.length === 1
+
+ // Check if math will success
+ if (lastSymbol !== '.') {
+ const result = getSum(clearedExpression + value)
+ if (result === 0)
+ return clearedExpression
+ }
+
+ // Limit integer
+ if (isInteger && lastNumber.length < maxIntegerLengthAllowed)
+ return clearedExpression + value
+
+ // Limit float
+ if (!isInteger && lastNumberSplit[1].length < fixed)
+ return clearedExpression + value
+ }
+
+ return expression
+}
+
+/**
+ * Format input
+ *
+ * @param {string} value
+ * @return {string} expression string
+ */
+export function formatInput(value: string | number): string {
+ return _separateExpression(String(value))
+ .map((item) => {
+ const isAction = item.match(/[/*\-+]/g)
+
+ if (isAction)
+ return ` ${item} `
+
+ const clearedValue = _removeSpaces(String(item))
+ const splitFloatValue = String(clearedValue).split(/[.]/)
+ const isInteger = splitFloatValue.length === 1
+
+ if (isInteger)
+ return formatByCurrency(item, separator)
+ else
+ return `${formatByCurrency(splitFloatValue[0], separator)}.${splitFloatValue[1]}`
+ })
+ .join('')
+}
diff --git a/components/trnForm/utils/formatData.test.ts b/components/trnForm/utils/formatData.test.ts
new file mode 100644
index 00000000..d5b5f503
--- /dev/null
+++ b/components/trnForm/utils/formatData.test.ts
@@ -0,0 +1,173 @@
+import { describe, expect, it } from 'vitest'
+import type { TrnFormValues } from '~/components/trnForm/types'
+import type { Transaction, Transfer } from '~/components/trns/types'
+import { formatTransaction, formatTransfer } from '~/components/trnForm/utils/formatData'
+
+const valuesBase: TrnFormValues = {
+ id: 'id',
+ amount: [10, 20, 30],
+ amountRaw: ['10', '20', '30'],
+ date: 99999,
+ desc: null,
+ transferType: 1,
+ trnType: 2,
+ walletId: 'WalletId',
+ categoryId: 'CategoryId',
+ expenseWalletId: 'expenseWalletId',
+ incomeWalletId: 'incomeWalletId',
+}
+
+const transaction: {
+ raw: TrnFormValues
+ generated: Transaction
+} = {
+ raw: {
+ ...valuesBase,
+ transferType: 1,
+ trnType: 0,
+ },
+ generated: {
+ categoryId: 'CategoryId',
+ date: 99999,
+ edited: 1690711427451,
+ type: 0,
+ amount: 10,
+ walletId: 'WalletId',
+ },
+}
+
+const transfer: {
+ raw: TrnFormValues
+ generated: Transfer
+} = {
+ raw: {
+ ...valuesBase,
+ transferType: 1,
+ trnType: 2,
+ },
+ generated: {
+ categoryId: 'transfer',
+ date: 99999,
+ edited: 1690711427451,
+ type: 2,
+ expenseAmount: 20,
+ incomeAmount: 30,
+ incomeWalletId: 'incomeWalletId',
+ expenseWalletId: 'expenseWalletId',
+ },
+}
+
+const transactions = [{
+ name: 'Format empty',
+ data: {
+ expect: {},
+ become: false,
+ },
+}, {
+ name: 'Format income',
+ data: {
+ expect: {
+ ...transaction.raw,
+ } as TrnFormValues,
+ become: {
+ ...transaction.generated,
+ } as Transaction | false,
+ },
+}, {
+ name: 'Format with wrong type',
+ data: {
+ expect: {
+ ...transaction.raw,
+ trnType: 2,
+ } as TrnFormValues,
+ become: false,
+ },
+}, {
+ name: 'Format with missing CategoryId',
+ data: {
+ expect: {
+ ...transaction.raw,
+ categoryId: null,
+ } as TrnFormValues,
+ become: false,
+ },
+}]
+
+const transfers = [{
+ name: 'Format empty',
+ data: {
+ expect: {},
+ become: false,
+ },
+}, {
+ name: 'Format values',
+ data: {
+ expect: {
+ ...transfer.raw,
+ } as TrnFormValues,
+ become: {
+ ...transfer.generated,
+ } as Transfer,
+ },
+}, {
+ name: 'Format with wrong type',
+ data: {
+ expect: {
+ ...transfer.raw,
+ trnType: 1,
+ } as TrnFormValues,
+ become: false,
+ },
+}, {
+ name: 'Format with missing expenseWalletId',
+ data: {
+ expect: {
+ ...transfer.raw,
+ expenseWalletId: null,
+ } as TrnFormValues,
+ become: false,
+ },
+}, {
+ name: 'Format with wrong type',
+ data: {
+ expect: {
+ ...transfer.raw,
+ trnType: 1,
+ } as TrnFormValues,
+ become: false,
+ },
+}]
+
+/**
+ * Tests
+ */
+const tests = [{
+ id: 'transactions',
+ name: 'Format Transaction to put on server',
+ variants: transactions,
+}, {
+ id: 'transfers',
+ name: 'Format Transfer to put on server',
+ variants: transfers,
+}]
+
+/**
+ * Run
+ */
+tests.forEach((test) => {
+ describe(test.name, () => {
+ test.variants.forEach((variant) => {
+ it(variant.name, () => {
+ const data = test.id === 'transactions'
+ ? formatTransaction(variant.data.expect)
+ : formatTransfer(variant.data.expect)
+ delete data.edited
+
+ const res = variant.data.become
+ delete res.edited
+
+ expect(data).toEqual(res)
+ })
+ })
+ })
+})
diff --git a/components/trnForm/utils/formatData.ts b/components/trnForm/utils/formatData.ts
new file mode 100644
index 00000000..d4f8f598
--- /dev/null
+++ b/components/trnForm/utils/formatData.ts
@@ -0,0 +1,57 @@
+import dayjs from 'dayjs'
+import type { Transaction, Transfer } from '~/components/trns/types'
+import type { TrnFormValues } from '~/components/trnForm/types'
+
+function formatTransaction(props: TrnFormValues): Transaction | false {
+ if (props.trnType === 2 || !props.categoryId || !props.walletId) {
+ console.error('missing props', props.trnType, props.categoryId, props.walletId)
+ return false
+ }
+
+ const data: Transaction = {
+ amount: props.amount[0],
+ type: props.trnType,
+
+ categoryId: props.categoryId,
+ walletId: props.walletId,
+
+ date: props.date || dayjs().valueOf(),
+ edited: dayjs().valueOf(),
+ }
+
+ if (props.desc)
+ data.desc = props.desc
+
+ return data
+}
+
+function formatTransfer(props: TrnFormValues): Transfer | false {
+ if (props.trnType !== 2 || !props.expenseWalletId || !props.incomeWalletId) {
+ console.error('missing props', props.trnType, props.expenseWalletId, props.incomeWalletId)
+ return false
+ }
+
+ const data: Transfer = {
+ type: props.trnType,
+ categoryId: 'transfer' as const,
+
+ date: props.date,
+ edited: dayjs().valueOf(),
+
+ expenseAmount: props.amount[1],
+ expenseWalletId: props.expenseWalletId,
+
+ incomeAmount: props.amount[2],
+ incomeWalletId: props.incomeWalletId,
+ }
+
+ if (props.desc)
+ data.desc = props.desc
+
+ return data
+}
+
+export {
+ formatTransaction,
+ formatTransfer,
+}
diff --git a/components/trnForm/utils/validate.ts b/components/trnForm/utils/validate.ts
new file mode 100644
index 00000000..d29808b8
--- /dev/null
+++ b/components/trnForm/utils/validate.ts
@@ -0,0 +1,73 @@
+export function validate(values: any) {
+ const errorTitle = '😮'
+
+ if (!values.amount && values.type !== 2) {
+ return {
+ error: {
+ title: errorTitle,
+ text: 'Amount can not be empty',
+ },
+ }
+ }
+
+ if (values.amount <= 0 && values.type !== 2) {
+ return {
+ error: {
+ title: errorTitle,
+ text: 'Amount can not be negative number',
+ },
+ }
+ }
+
+ if (values.amount === 0 && values.type !== 2) {
+ return {
+ error: {
+ title: errorTitle,
+ text: 'Amount can not be equal Zero',
+ },
+ }
+ }
+
+ if (!values.walletId && values.type !== 2) {
+ return {
+ error: {
+ title: errorTitle,
+ text: 'Please select wallet',
+ },
+ }
+ }
+
+ if (!values.categoryId && values.type !== 2) {
+ return {
+ error: {
+ title: errorTitle,
+ text: 'Please select category',
+ },
+ }
+ }
+
+ // Transfer
+ if (values.type === 2) {
+ if (Number(values.incomeAmount) === 0 || Number(values.expenseAmount) === 0) {
+ return {
+ error: {
+ title: errorTitle,
+ text: 'Transfer amounts can not be empty',
+ },
+ }
+ }
+
+ if (values.incomeWalletId === values.expenseWalletId) {
+ return {
+ error: {
+ title: errorTitle,
+ text: 'Transfer in same wallet',
+ },
+ }
+ }
+ }
+
+ return {
+ valid: true,
+ }
+}
diff --git a/components/trns/List.vue b/components/trns/List.vue
index 05d2e1c4..7158fac5 100644
--- a/components/trns/List.vue
+++ b/components/trns/List.vue
@@ -1,13 +1,13 @@
<script setup lang="ts">
import dayjs from 'dayjs'
-import type { TrnID } from '~/components/trns/types'
-import useCalculator from '~/components/trnForm/calculator/useCalculator'
+import type { TrnId } from '~/components/trns/types'
import useFilter from '~/components/filter/useFilter'
+import { useTrnForm } from '~/components/trnForm/useTrnForm'
const props = withDefaults(defineProps<{
limit: number
size: number
- trnsIds: TrnID[]
+ trnsIds: TrnId[]
isShowFilter?: boolean
isFilterByDay?: boolean
@@ -24,8 +24,8 @@ const props = withDefaults(defineProps<{
const emit = defineEmits(['onClickEdit'])
const { $store } = useNuxtApp()
-const { setExpression } = useCalculator()
const { setFilterCatsId, setDayDate } = useFilter()
+const { trnFormEdit } = useTrnForm()
const pageNumber = ref(1)
const isShowTrnsWithDesc = ref(false)
@@ -72,33 +72,30 @@ function toggleTrnsWithDesc() {
isShowTrnsWithDesc.value = !isShowTrnsWithDesc.value
}
-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 })
- },
-
- // TODO: useFilter
- onSetFilter: (event) => {
- event.stopPropagation()
- setFilterCatsId(trnItem.categoryId)
- $store.commit('filter/setFilterDateNow')
- $store.commit('trns/hideTrnModal')
- $store.commit('trns/setTrnModalId', null)
- $store.dispatch('ui/setActiveTabStat', 'details')
- },
-})
-
-function onClickEdit(props) {
- emit('onClickEdit', props)
+function actions(trnItem) {
+ return {
+ onOpenDetails: () => {
+ if (!$store.state.trns.modal.show) {
+ $store.commit('trns/showTrnModal')
+ $store.commit('trns/setTrnModalId', trnItem.id)
+ }
+ },
+
+ onOpenEdit: (event) => {
+ event.stopPropagation()
+ trnFormEdit(trnItem.id)
+ },
+
+ // TODO: useFilter
+ onSetFilter: (event) => {
+ event.stopPropagation()
+ setFilterCatsId(trnItem.categoryId)
+ $store.commit('filter/setFilterDateNow')
+ $store.commit('trns/hideTrnModal')
+ $store.commit('trns/setTrnModalId', null)
+ $store.dispatch('ui/setActiveTabStat', 'details')
+ },
+ }
}
</script>
@@ -133,7 +130,7 @@ div(v-if="trnsIds && trnsIds.length > 0")
v-for="trnId in trnsIds"
:key="trnId"
:trnId="trnId"
- @onClickEdit="onClickEdit"
+ @onClickEdit="$emit('onClickEdit')"
)
TrnsItemWithoutCat.py-3.px-3.cursor-pointer(
v-if="uiCat"
diff --git a/components/trns/ListWithControl.vue b/components/trns/ListWithControl.vue
index 345d3276..55214cce 100644
--- a/components/trns/ListWithControl.vue
+++ b/components/trns/ListWithControl.vue
@@ -1,15 +1,15 @@
<script setup lang="ts">
-import type { TrnID, TrnItem, TrnType } from '~/components/trns/types'
+import type { TrnId, TrnItem, TrnType } from '~/components/trns/types'
import useTrns from '~/components/trns/useTrns'
import useStatPage from '~/components/stat/useStatPage'
const props = withDefaults(defineProps<{
- trnsIds: TrnID[]
+ trnsIds: TrnId[]
trnsClassNames?: string
defaultFilterTrnsPeriod?: string
isFilterByDay?: boolean
}>(), {
- trnsClassNames: ' grid md_grid-cols-2 md_gap-x-20',
+ trnsClassNames: 'grid md_grid-cols-2 md_gap-x-20',
})
const emit = defineEmits(['onClickEdit'])
@@ -30,7 +30,7 @@ const filteredTrnsIds = computed(() => {
if (filterTrnsType.value === null)
return trnsIds
- const trnsItems: Record<TrnID, TrnItem> = $store.state.trns.items
+ const trnsItems: Record<TrnId, TrnItem> = $store.state.trns.items
return trnsIds.filter(id => trnsItems[id].type === filterTrnsType.value)
})
diff --git a/components/trns/getTrns.ts b/components/trns/getTrns.ts
index 8af7e18f..175f6c62 100644
--- a/components/trns/getTrns.ts
+++ b/components/trns/getTrns.ts
@@ -1,23 +1,23 @@
import dayjs from 'dayjs'
import type { PeriodNames } from '~/components/date/types'
-import type { TrnID, TrnItem, TrnType } from '~/components/trns/types'
-import type { WalletID } from '~/components/wallets/types'
+import type { CategoryId, TrnId, TrnItem, TrnType } from '~/components/trns/types'
+import type { WalletId } from '~/components/wallets/types'
type Date = number
interface Props {
trnsItems: Record<string, TrnItem>
- categoriesIds?: WalletID[]
+ categoriesIds?: CategoryId[] | false
date?: Date
fromDate?: number
periodName?: PeriodNames
trnType?: TrnType
untilDate?: number
- walletsIds?: WalletID[]
+ walletsIds?: WalletId[]
}
// TODO: sorting option?
-export const getTrnsIds = (props: Props) => {
- let trnsIds: TrnID[] = Object.keys(props.trnsItems)
+export function getTrnsIds(props: Props) {
+ let trnsIds: TrnId[] = Object.keys(props.trnsItems)
// Type
if (props.trnType !== undefined && props.trnType !== null)
@@ -45,7 +45,7 @@ export const getTrnsIds = (props: Props) => {
// Wallet
if (props.walletsIds?.length > 0) {
- trnsIds = trnsIds.filter((trnId: TrnID) => {
+ trnsIds = trnsIds.filter((trnId: TrnId) => {
const trn = props.trnsItems[trnId]
return props.walletsIds?.includes(trn?.walletId)
|| props.walletsIds?.includes(trn?.expenseWalletId)
@@ -58,7 +58,7 @@ export const getTrnsIds = (props: Props) => {
// Category
if (props.categoriesIds?.length > 0) {
trnsIds = trnsIds.filter(
- (trnId: TrnID) => props.categoriesIds.includes(props.trnsItems[trnId].categoryId))
+ (trnId: TrnId) => props.categoriesIds.includes(props.trnsItems[trnId].categoryId))
}
return trnsIds.sort((a, b) => props.trnsItems[b].date - props.trnsItems[a].date)
diff --git a/components/trns/helpers.ts b/components/trns/helpers.ts
index 8cfb31bf..3ac29cd7 100644
--- a/components/trns/helpers.ts
+++ b/components/trns/helpers.ts
@@ -1,11 +1,11 @@
import dayjs from 'dayjs'
import type { DateValueOf } from '~/components/date/types'
-import type { TrnID, TrnItem } from '~/components/trns/types'
+import type { TrnId, TrnItem } from '~/components/trns/types'
/**
* Get the oldest Transaction date
*/
-export function getOldestTrnDate(trnsItems: Record<TrnID, TrnItem>): DateValueOf {
+export function getOldestTrnDate(trnsItems: Record<TrnId, TrnItem>): DateValueOf {
const startOfToday = dayjs().startOf('day').valueOf()
const minDate = Math.min(...Object.values(trnsItems).map(trn => trn.date))
return minDate || startOfToday
diff --git a/components/trns/item/Base.vue b/components/trns/item/Base.vue
index ae34ab79..5a51fa80 100644
--- a/components/trns/item/Base.vue
+++ b/components/trns/item/Base.vue
@@ -1,17 +1,19 @@
<script setup lang="ts">
-import type { TrnID } from '~/components/trns/types'
-import useCalculator from '~/components/trnForm/calculator/useCalculator'
+import type { TrnId } from '~/components/trns/types'
import useFilter from '~/components/filter/useFilter'
import useTrn from '~/components/trns/item/useTrn'
+import { useTrnForm, useTrnFormStore } from '~/components/trnForm/useTrnForm'
const props = defineProps<{
- trnId: TrnID
+ trnId: TrnId
slider?: any
}>()
const emit = defineEmits(['onClickEdit'])
const { $store } = useNuxtApp()
-const { setExpression } = useCalculator()
+const $trnForm = useTrnFormStore()
+const { trnFormEdit } = useTrnForm()
+
const { setFilterCatsId } = useFilter()
const { formatTrnItem } = useTrn()
const trnItem = computed(() => formatTrnItem(props.trnId))
@@ -30,8 +32,7 @@ const actions = {
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 })
+ trnFormEdit(props.trnId)
emit('onClickEdit', props.trnId)
},
@@ -125,6 +126,6 @@ const actions = {
)
//- Description
- .pt-2.text-neutral-500.text-xs.leading-none(v-if="trnItem.description")
- | {{ trnItem.description }}
+ .pt-2.text-neutral-500.text-xs.leading-none(v-if="trnItem.desc")
+ | {{ trnItem.desc }}
</template>
diff --git a/components/trns/item/Details.vue b/components/trns/item/Details.vue
index 19119d55..136bedfc 100644
--- a/components/trns/item/Details.vue
+++ b/components/trns/item/Details.vue
@@ -1,55 +1,61 @@
-<script>
-import useCalculator from '~/components/trnForm/calculator/useCalculator'
+<script setup lang="ts">
import { formatDate } from '~/utils/formatDate'
+import type { TrnId, TrnItem } from '~/components/trns/types'
+import type { WalletItem } from '~~/components/wallets/types'
+import { useTrnForm } from '~/components/trnForm/useTrnForm'
+
+const props = withDefaults(defineProps<{
+ category: object
+ isActive?: boolean
+ showCategory?: boolean
+ trn: TrnItem
+ trnId: TrnId
+ ui?: string
+ wallet: WalletItem
+}>(), {
+ ui: 'history',
+})
+
+const emit = defineEmits<{
+ (e: 'onClickEdit', trnId: TrnId): void
+}>()
+
+const { $store } = useNuxtApp()
+const { trnFormEdit } = useTrnForm()
+
+const className = computed(() => {
+ return {
+ _active: props.isActive,
+ _detailed: props.ui === 'detailed',
+ _history: props.ui === 'history' || (props.ui === 'stat' && props.showCategory),
+ _stat: props.ui === 'stat',
+ }
+})
+
+const formattedDate = computed(() => {
+ const date = formatDate(props.trn.date, 'full')
+ return `${date.weekday}, ${date.day} ${date.month} ${date.year}`
+})
+
+const formattedDateDay = computed(() => {
+ return formatDate(props.trn.date, 'trnItem')
+})
+
+const formattedDateDay2 = computed(() => {
+ return formatDate(props.trn.date, 'trnItem')
+})
+
+function handleClick() {
+ if (!$store.state.trns.modal.show) {
+ $store.commit('trns/showTrnModal')
+ $store.commit('trns/setTrnModalId', props.trnId)
+ }
+}
-export default {
- props: {
- category: { type: Object, required: true },
- isActive: { type: Boolean, default: false },
- showCategory: { type: Boolean, default: false },
- trn: { type: Object, required: true },
- trnId: { type: String, required: true },
- ui: { type: String, default: 'history' },
- wallet: { type: Object, required: true },
- },
-
- computed: {
- className() {
- return {
- _active: this.isActive,
- _detailed: this.ui === 'detailed',
- _history: this.ui === 'history' || (this.ui === 'stat' && this.showCategory),
- _stat: this.ui === 'stat',
- }
- },
- formattedDate() {
- const date = formatDate(this.trn.date, 'full')
- return `${date.weekday}, ${date.day} ${date.month} ${date.year}`
- },
- formattedDateDay() {
- return formatDate(this.trn.date, 'trnItem')
- },
- formattedDateDay2() {
- return formatDate(this.trn.date, 'trnItem')
- },
- },
-
- methods: {
- handleClick() {
- if (!this.$store.state.trns.modal.show) {
- this.$store.commit('trns/showTrnModal')
- this.$store.commit('trns/setTrnModalId', this.trnId)
- }
- },
-
- setTrnEdit() {
- const trnId = this.trnId
- const { setExpression } = useCalculator()
- setExpression(this.trn.type === 2 && this.trn.incomeAmount ? this.trn.incomeAmount : this.trn.amount)
- this.$store.dispatch('trnForm/openTrnForm', { action: 'edit', trnId })
- this.$emit('onClickEdit', this.trnId)
- },
- },
+function setTrnEdit() {
+ const trnId = props.trnId
+ trnFormEdit(trnId)
+ emit('onClickEdit', trnId)
}
</script>
diff --git a/components/trns/item/Modal.vue b/components/trns/item/Modal.vue
index 569964f6..97a11fdb 100644
--- a/components/trns/item/Modal.vue
+++ b/components/trns/item/Modal.vue
@@ -1,12 +1,13 @@
<script lang="ts">
import useFilter from '~/components/filter/useFilter'
-import useCalculator from '~/components/trnForm/calculator/useCalculator'
import useTrn from '~/components/trns/item/useTrn'
+import { useTrnForm } from '~/components/trnForm/useTrnForm'
// TODO: useFilter
export default {
setup() {
const { $store } = useNuxtApp()
+ const { trnFormEdit, trnFormDuplicate } = useTrnForm()
const { setFilterCatsId, setFilterWalletsId } = useFilter()
const closed = () => {
@@ -22,6 +23,8 @@ export default {
setFilterCatsId,
setFilterWalletsId,
closed,
+ trnFormEdit,
+ trnFormDuplicate,
}
},
@@ -65,20 +68,19 @@ export default {
handleDuplicateTrn() {
const trnId = this.trnId
- this.$store.dispatch('trnForm/openTrnForm', { action: 'duplicate', trnId })
+ console.log('trnId', trnId)
+ this.trnFormDuplicate(trnId)
this.$store.commit('trns/hideTrnModal')
this.$store.commit('trns/setTrnModalId', null)
},
handleEditClick() {
- const trn = this.trnItem
const trnId = this.trnId
- this.$store.dispatch('trnForm/openTrnForm', { action: 'edit', trnId })
+ this.trnFormEdit(trnId)
this.$store.commit('trns/hideTrnModal')
this.$store.commit('trns/setTrnModalId', null)
- const { setExpression } = useCalculator()
- setExpression(trn.type === 2 && trn.incomeAmount ? trn.incomeAmount : trn.amount)
+ // setExpression(trn.type === 2 && trn.incomeAmount ? trn.incomeAmount : trn.amount)
},
handleDeleteClick() {
@@ -87,7 +89,9 @@ export default {
handleDeleteConfirm() {
const trnId = this.trnId
- setTimeout(() => { this.$store.dispatch('trns/deleteTrn', trnId) }, 100)
+ setTimeout(() => {
+ this.$store.dispatch('trns/deleteTrn', trnId)
+ }, 100)
this.showModalConfirm = false
this.$store.commit('trns/hideTrnModal')
diff --git a/components/trns/item/WithoutCat.vue b/components/trns/item/WithoutCat.vue
index 6bd39dcd..cb514286 100644
--- a/components/trns/item/WithoutCat.vue
+++ b/components/trns/item/WithoutCat.vue
@@ -63,6 +63,6 @@ export default defineComponent({
//- Description
.pt-1.text-neutral-500.text-xs(
- v-if="trnItem.description"
- ) {{ trnItem.description }}
+ v-if="trnItem.desc"
+ ) {{ trnItem.desc }}
</template>
diff --git a/components/trns/types.ts b/components/trns/types.ts
index effc90eb..a0fe5c8b 100644
--- a/components/trns/types.ts
+++ b/components/trns/types.ts
@@ -1,7 +1,7 @@
-import type { WalletID } from '~/components/wallets/types'
+import type { WalletId } from '~/components/wallets/types'
-export type TrnID = string
-export type CategoryID = string
+export type TrnId = string
+export type CategoryId = string
export enum TrnType {
Expense,
@@ -9,38 +9,57 @@ export enum TrnType {
Transfer,
}
-// TODO: make WalletId optional only if TrnType.Transfer
-export interface TrnTransaction {
- amount: number
- type: TrnType.Income | TrnType.Expense
- categoryId: CategoryID
- walletId: WalletID
+export enum TransferType {
+ Expense,
+ Income,
+}
+
+export enum TrnTypeSlug {
+ Expense = 'expense',
+ Income = 'income',
+ Transfer = 'transfer',
+}
+
+interface BaseTrn {
date: number
+ desc?: string
+ edited: number
}
-export interface TrnTransfer {
+export interface Transaction extends BaseTrn {
+ type: TrnType.Income | TrnType.Expense
+ amount: number
+ categoryId: CategoryId
+ walletId: WalletId
+}
+
+export interface Transfer extends BaseTrn {
type: TrnType.Transfer
- date: number
categoryId: 'transfer'
- incomeWalletId: WalletID
+ incomeWalletId: WalletId
incomeAmount: number
- expenseWalletId: WalletID
+ expenseWalletId: WalletId
expenseAmount: number
}
-// @deprecated: Use TrnTransfer instead
-export interface TrnTransferOld {
+/** @deprecated: use Transfer */
+export interface TransferDeprecated {
type: TrnType.Transfer
date: number
+ edited: number
categoryId: 'transfer'
amountFrom: number
- walletFromId: WalletID
+ walletFromId: WalletId
amountTo: number
- walletToId: WalletID
+ walletToId: WalletId
}
-export type TrnItem = TrnTransaction | TrnTransfer | TrnTransferOld
+export type TrnItem = Transaction | Transfer
+export type TrnItemDirty = Transaction | Transfer | TransferDeprecated
+
+export type Trns = Record<TrnId, TrnItem>
+export type TrnsDirty = Record<TrnId, TrnItemDirty>
diff --git a/components/ui/Title.vue b/components/ui/Title.vue
new file mode 100644
index 00000000..e860efb5
--- /dev/null
+++ b/components/ui/Title.vue
@@ -0,0 +1,8 @@
+<script setup lang="ts">
+
+</script>
+
+<template lang="pug">
+.py-4.px-3.text-secondary.font-nunito.text-xl.font-semibold
+ slot
+</template>
diff --git a/components/wallets/Delete.vue b/components/wallets/Delete.vue
index 59e3c298..5f6996da 100644
--- a/components/wallets/Delete.vue
+++ b/components/wallets/Delete.vue
@@ -2,10 +2,10 @@
import { getTrnsIds } from '~/components/trns/getTrns'
import { random, successEmo } from '~/assets/js/emo'
import { removeData } from '~/services/firebase/api'
-import type { WalletID } from '~/components/wallets/types'
+import type { WalletId } from '~/components/wallets/types'
const props = defineProps<{
- walletId: WalletID
+ walletId: WalletId
}>()
const { walletId } = toRefs(props)
diff --git a/components/wallets/Form.vue b/components/wallets/Form.vue
index 4e6d825c..ed49226c 100644
--- a/components/wallets/Form.vue
+++ b/components/wallets/Form.vue
@@ -1,12 +1,11 @@
<script setup lang="ts">
import { generateId } from '~/utils/generateId'
-import type { WalletForm, WalletID } from '~/components/wallets/types'
-import { allColors } from '~/assets/js/colors'
+import type { WalletForm, WalletId } from '~/components/wallets/types'
import { getPreparedFormData } from '~/components/wallets/getForm'
import { saveData } from '~/services/firebase/api'
const props = defineProps<{
- walletId?: WalletID
+ walletId?: WalletId
walletForm: WalletForm
}>()
diff --git a/components/wallets/ItemTotalSum.vue b/components/wallets/ItemTotalSum.vue
index 6919f1e3..d1ac5ff2 100644
--- a/components/wallets/ItemTotalSum.vue
+++ b/components/wallets/ItemTotalSum.vue
@@ -1,12 +1,12 @@
<script setup lang="ts">
import { getTransferCategoriesIds } from '~/components/categories/getCategories'
import { getTotal } from '~/components/amount/getTotal'
-import type { WalletID } from '~/components/wallets/types'
-import type { TrnID } from '~/components/trns/types'
+import type { WalletId } from '~/components/wallets/types'
+import type { TrnId } from '~/components/trns/types'
const props = withDefaults(defineProps<{
- trnsIds: TrnID[]
- walletId: WalletID
+ trnsIds: TrnId[]
+ walletId: WalletId
}>(), {
trnsIds: () => [],
})
diff --git a/components/wallets/Total.vue b/components/wallets/Total.vue
index ecdaeefa..8ca0f4bd 100644
--- a/components/wallets/Total.vue
+++ b/components/wallets/Total.vue
@@ -1,10 +1,10 @@
<script setup lang="ts">
-import type { WalletID, WalletItem } from './types'
+import type { WalletId, WalletItem } from './types'
import useAmount from '~/components/amount/useAmount'
import type { CurrencyCode } from '~/components/currencies/types'
const props = defineProps<{
- walletsItems: Record<WalletID, WalletItem>
+ walletsItems: Record<WalletId, WalletItem>
currencyCode: CurrencyCode
}>()
const { $store } = useNuxtApp()
diff --git a/components/wallets/page/id/Edit.vue b/components/wallets/page/id/Edit.vue
index 3d978727..9ce253b0 100644
--- a/components/wallets/page/id/Edit.vue
+++ b/components/wallets/page/id/Edit.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { getPreparedFormData } from '~/components/wallets/getForm'
-const { $store } = useNuxtApp()
+const { $store, nuxt2Context: { i18n } } = useNuxtApp()
const route = useRoute()
const router = useRouter()
@@ -11,15 +11,9 @@ const walletForm = ref(getPreparedFormData(wallet.value))
const updateValue = (id, value) => walletForm.value[id] = value
const afterSave = () => router.push(`/wallets/${walletId.value}`)
-</script>
-<script lang="ts">
-export default defineComponent({
- head() {
- return {
- title: `${this.$t('base.edit')}: ${this.walletForm.name ? this.walletForm.name : this.$t('wallets.form.name.label')}`,
- }
- },
+useHead({
+ title: `${i18n.t('base.edit')}: ${walletForm.value?.name ? walletForm.value?.name : i18n.t('wallets.form.name.label')}`,
})
</script>
diff --git a/components/wallets/page/id/Index.vue b/components/wallets/page/id/Index.vue
index b8bd95d6..45b212ce 100644
--- a/components/wallets/page/id/Index.vue
+++ b/components/wallets/page/id/Index.vue
@@ -2,7 +2,7 @@
import useFilter from '~/components/filter/useFilter'
import { getTrnsIds } from '~/components/trns/getTrns'
-const { $store } = useNuxtApp()
+const { $store, nuxt2Context: { i18n } } = useNuxtApp()
const { setFilterWalletsId } = useFilter()
const route = useRoute()
@@ -37,15 +37,9 @@ function onClickFilterWallet() {
function onEditClick() {
router.push(`/wallets/${walletId.value}/edit`)
}
-</script>
-<script lang="ts">
-export default defineComponent({
- head() {
- return {
- title: `${this.$t('wallets.title')}: ${this.wallet.name}`,
- }
- },
+useHead({
+ title: `${i18n.t('wallets.title')}: ${wallet.value?.name}`,
})
</script>
diff --git a/components/wallets/types.ts b/components/wallets/types.ts
index 40b2c529..d5b0bcc0 100644
--- a/components/wallets/types.ts
+++ b/components/wallets/types.ts
@@ -1,11 +1,56 @@
-export type WalletID = string
+import type { TotalReturns } from '~/components/amount/getTotal'
+
+export type WalletId = string
+
+export enum WalletType {
+ Cash,
+ Card,
+ Deposit,
+ Electron,
+ Credit,
+}
export interface WalletItem {
- color: string
- currency: string
+ id: WalletId
name: string
+ type: WalletType
+ withdrawal?: boolean
+ currency: string
+ color: string
+ order: number
+ // @deprecated: use withdrawal type
+ isCredit?: boolean
+ // @deprecated: use withdrawal
+ countTotal?: boolean
+ archived?: boolean
+}
+
+export interface WalletWithTotal extends WalletItem {
+ total: TotalReturns
}
+export type Wallets = Record<WalletId, WalletItem>
+
+export interface WalletsCurrenciesGroup {
+ card: (v: WalletWithTotal) => boolean
+ electron: (v: WalletWithTotal) => boolean
+ deposit: (v: WalletWithTotal) => boolean
+ cash: (v: WalletWithTotal) => boolean
+ credits: (v: WalletWithTotal) => boolean
+ savings: (v: WalletWithTotal) => boolean
+ withdrawal: (v: WalletWithTotal) => boolean
+ all: () => true
+}
+
+export interface Item {
+ count: number
+ total: number
+ totalInBase: number
+ ids: WalletId[]
+}
+
+export type WalletId = string
+
export interface WalletItemWithAmount extends WalletItem {
amount: number
}
@@ -14,8 +59,8 @@ export interface WalletForm {
color: string
countTotal: boolean
currency: string
+ description?: string
isCredit: boolean
name: string
order: number
- description?: string
}
diff --git a/components/wallets/useWallets.ts b/components/wallets/useWallets.ts
index 870b062f..ead91a5d 100644
--- a/components/wallets/useWallets.ts
+++ b/components/wallets/useWallets.ts
@@ -1,5 +1,4 @@
-import type { ComputedRef } from '@vue/composition-api'
-import type { WalletID, WalletItem, WalletItemWithAmount } from '~/components/wallets/types'
+import type { WalletId, WalletItem, WalletItemWithAmount } from '~/components/wallets/types'
export default function useWallets() {
const { $store } = useNuxtApp()
@@ -8,14 +7,14 @@ export default function useWallets() {
* Wallets IDs sorted
*
*/
- const walletsIdsSorted: ComputedRef<WalletID[]> = computed(() => $store.getters['wallets/walletsSortedIds'])
+ const walletsIdsSorted = computed<WalletId[]>(() => $store.getters['wallets/walletsSortedIds'])
/**
* Wallets items sorted
*
*/
- const walletsItemsSorted: ComputedRef<Record<WalletID, WalletItemWithAmount>> = computed(() => {
- const walletsIdsSorted: WalletID[] = $store.getters['wallets/walletsSortedIds']
+ const walletsItemsSorted = computed<Record<WalletId, WalletItemWithAmount>>(() => {
+ const walletsIdsSorted: WalletId[] = $store.getters['wallets/walletsSortedIds']
return walletsIdsSorted.reduce((acc, id) => {
acc[id] ??= []
@@ -30,9 +29,9 @@ export default function useWallets() {
/**
* Wallets currencies
*/
- const walletsCurrencies: ComputedRef<WalletID[]> = computed(() => {
- const walletsIdsSorted: WalletID[] = $store.getters['wallets/walletsSortedIds']
- const walletsItems: Record<WalletID, WalletItem> = $store.state.wallets.items
+ const walletsCurrencies = computed<WalletId[]>(() => {
+ const walletsIdsSorted: WalletId[] = $store.getters['wallets/walletsSortedIds']
+ const walletsItems: Record<WalletId, WalletItem> = $store.state.wallets.items
// TODO: check A
return walletsIdsSorted.reduce((acc, id) => {
diff --git a/finapp-3.code-workspace b/finapp-3.code-workspace
index 8b128276..b9e6c8cc 100644
--- a/finapp-3.code-workspace
+++ b/finapp-3.code-workspace
@@ -21,4 +21,6 @@
"path": "."
}
],
+ "settings": {
+ },
}
diff --git a/gulpfile.js b/gulpfile.js
index 18cf7857..130f292c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,4 +1,4 @@
-const fs = require('fs')
+const fs = require('node:fs')
const ftp = require('vinyl-ftp')
const notifier = require('node-notifier')
const { src } = require('gulp')
@@ -31,8 +31,8 @@ function uploadTask(path, cb) {
return src(path)
.pipe(toaster('Upload', cb))
- .pipe(conn.newer(configFTP.dest))
- .pipe(conn.dest(configFTP.dest))
+ .pipe(conn.newer('/'))
+ .pipe(conn.dest('/'))
}
else {
notifier.notify({
diff --git a/layouts/default.vue b/layouts/default.vue
index 6efd8fcd..27b05b47 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -2,8 +2,16 @@
import { usePointer } from '@vueuse/core'
import debounce from '~/utils/debounce'
import useUIView from '~/components/layout/useUIView'
+import { useTrnForm, useTrnFormStore } from '~/components/trnForm/useTrnForm'
+
+import '~/assets/css/index.css'
+import '~/assets/css/themes.css'
+import '~/assets/css/fullpage.css'
+import '~/assets/css/reset.css'
const { $store } = useNuxtApp()
+const $trnForm = useTrnFormStore()
+const { trnFormCreate } = useTrnForm()
useLazyAsyncData('', async () => {
const { initUI } = useUIView()
@@ -66,7 +74,7 @@ div(:class="classes")
Nuxt(keep-alive :keep-alive-props="{ include: keepAliveInclude }")
.createTrn.hidden.z-10.absolute.right-6.bottom-6.lg_flex(
- @click="$store.dispatch('trnForm/openTrnForm', { action: 'create' })"
+ @click="trnFormCreate"
)
.btn: .mdi.mdi-plus
diff --git a/mocks/trns.ts b/mocks/trns.ts
index 081b42c2..51256e3c 100644
--- a/mocks/trns.ts
+++ b/mocks/trns.ts
@@ -1,7 +1,7 @@
import { TrnType } from '~/components/trns/types'
-import type { TrnID, TrnItem } from '~/components/trns/types'
+import type { TrnId, TrnItem } from '~/components/trns/types'
-export const trnsItems: Record<TrnID, TrnItem> = {
+export const trnsItems: Record<TrnId, TrnItem> = {
transactionIncomeWalletCashUSD1000: {
amount: 1000,
date: 123456, // TODO: add real dates
diff --git a/nuxt.config.js b/nuxt.config.js
index 1978d2ae..232b31d3 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -4,10 +4,18 @@ export default defineNuxtConfig({
bridge: {
nitro: false,
vite: false,
+ meta: true,
+ },
+
+ // Nuxt3: use this instead of publicRuntimeConfig
+ runtimeConfig: {
+ public: {
+ devEmails: process.env.DEV_EMAILS || [],
+ ratesApiKey: process.env.OPEN_EXCHANGE_RATES,
+ },
},
publicRuntimeConfig: {
- devEmails: process.env.DEV_EMAILS || [],
ratesApiKey: process.env.OPEN_EXCHANGE_RATES,
},
diff --git a/package.json b/package.json
index a754346b..124c19be 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"axios": "^1.5.0",
"core-js": "3.32.2",
"currency.js": "^2.0.4",
- "dayjs": "^1.11.9",
+ "dayjs": "^1.11.10",
"echarts": "^5.4.3",
"firebase": "^10.4.0",
"highcharts": "^11.1.0",
@@ -29,7 +29,6 @@
"lodash.merge": "^4.6.2",
"lodash.sortby": "^4.7.0",
"nuxt": "^2.17.1",
- "nuxt-edge": "latest",
"nuxt-typed-vuex": "^0.3.1",
"pinia": "^2.1.6",
"portal-vue": "^2.1.7",
@@ -59,10 +58,10 @@
"@types/validator": "^13.11.1",
"@volar/vue-language-plugin-pug": "^1.6.5",
"@vue/runtime-dom": "^3.3.4",
- "autoprefixer": "^10.4.15",
+ "autoprefixer": "^10.4.16",
"c8": "7.12.0",
"cross-env": "^7.0.3",
- "eslint": "^8.49.0",
+ "eslint": "^8.50.0",
"eslint-plugin-nuxt": "^4.0.0",
"eslint-plugin-vue": "^9.17.0",
"eslint-plugin-vue-pug": "^0.6.0",
@@ -81,7 +80,7 @@
"stylus-loader": "^3.0.2",
"typescript": "^5.2.2",
"vinyl-ftp": "0.6.1",
- "vitest": "^0.34.4",
+ "vitest": "^0.34.5",
"webpack": "4.46.0"
}
}
diff --git a/pages/login.vue b/pages/login.vue
index c0d95fe2..18c7a821 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -36,6 +36,35 @@ export default defineComponent({
},
methods: {
+ // signInWithEmailLink() {
+ // const email = '[email protected]'
+ // const actionCodeSettings = {
+ // // URL you want to redirect back to. The domain (www.example.com) for this
+ // // URL must be in the authorized domains list in the Firebase Console.
+ // url: 'https://finapp.ilko.me',
+ // handleCodeInApp: true,
+ // iOS: {
+ // bundleId: 'com.finapp.ilko.me.ios',
+ // },
+ // android: {
+ // packageName: 'com.finapp.ilko.me.android',
+ // installApp: true,
+ // minimumVersion: '12',
+ // },
+ // dynamicLinkDomain: 'finapp.ilko.me',
+ // }
+
+ // sendSignInLinkToEmail(auth, email, actionCodeSettings)
+ // .then(() => {
+ // window.localStorage.setItem('emailForSignIn', email)
+ // })
+ // .catch((error) => {
+ // const errorCode = error.code
+ // const errorMessage = error.message
+ // console.log(errorCode, errorMessage)
+ // })
+ // },
+
signInWithGoogle() {
this.$router.push({ query: { loading: true } })
this.isLoading = true
@@ -61,7 +90,7 @@ export default defineComponent({
<template lang="pug">
.grid.h-full.text-center(class="grid-rows-[auto,1fr,auto]")
//- Top
- .max-w-xl.mx-auto.p-2.w-full.md_p-6
+ .max-w-xl.mx-auto.py-4.p-2.w-full.md_p-6
.flex.justify-between
LocaleSwitcher
ThemeSwitcher
@@ -70,7 +99,8 @@ export default defineComponent({
.h-full.grid.items-center.gap-8.py-4.px-3.h-full.overflow-hidden.overflow-y-auto
.flex.flex-col.items-center.justify-center.pb-10
SharedAppName
- SharedCopyright
+
+ //- div(@click="signInWithEmailLink") signInWithEmailLink
.flex.flex-col.items-center.px-3.py-8
.loginButton.bg-blue3.hocus_bg-blue1.hocus_shadow(
@@ -81,12 +111,8 @@ export default defineComponent({
.loginButton__spinier(v-if="isLoading"): SharedSpinier
.loginButton__text.text-white {{ $t('loginWithGoogle') }}
- .p-4.flex.items-center.justify-center
- a.py-2.px-4.flex.items-center.justify-center.gap-1.rounded-md.hocus_bg-item-hover.transition(
- href="https://ilko.me"
- target="_blank"
- )
- | ilko.me
+ .p-4.md_p-6
+ SharedCopyright
</template>
<style lang="stylus" scoped>
diff --git a/pages/settings.vue b/pages/settings.vue
index 92314f88..6039e374 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -106,20 +106,14 @@ UiPage
)
</template>
-<i18n lang="json5">
-{
- "en": {
- "user": "User",
- "currency": {
- "descBase": "Transactions in different currencies will be converted to this currency."
- }
- },
-
- "ru": {
- "user": "Пользователь",
- "currency": {
- "descBase": "Основная валюта, в которую будут конвертироваться транзакции в других валютах."
- }
- }
-}
+<i18n lang="yaml">
+en:
+ user: User
+ currency:
+ descBase: Transactions in different currencies will be converted to this currency.
+
+ru:
+ user: Пользователь
+ currency:
+ descBase: 'Основная валюта, в которую будут конвертироваться транзакции в других валютах.'
</i18n>
diff --git a/pages/wallets/total.vue b/pages/wallets/total.vue
index 6c8be11f..e285a94b 100644
--- a/pages/wallets/total.vue
+++ b/pages/wallets/total.vue
@@ -1,9 +1,8 @@
<script setup lang="ts">
import _merge from 'lodash.merge'
import dayjs from 'dayjs'
-import type { ComputedRef, Ref } from '@vue/composition-api'
import type { PeriodsNamesExceptAll } from '~/components/date/types'
-import type { TrnID, TrnItem } from '~/components/trns/types'
+import type { TrnId, TrnItem } from '~/components/trns/types'
import useAmount from '~/components/amount/useAmount'
import { averageLine, baseSeriesItemStyle, options } from '~/components/chart/chartOprions'
import { getTransferCategoriesIds } from '~/components/categories/getCategories'
@@ -21,13 +20,13 @@ const { $store } = useNuxtApp()
/**
* Transactions
*/
-const trnsItems: ComputedRef<Record<TrnID, TrnItem>> = computed(() => $store.state.trns.items)
+const trnsItems = computed<Record<TrnId, TrnItem>>(() => $store.state.trns.items)
const oldestTrnDate = getOldestTrnDate(trnsItems.value)
/**
* Config
*/
-const activePeriod: Ref<PeriodsNamesExceptAll> = ref('month')
+const activePeriod = ref<PeriodsNamesExceptAll>('month')
/**
* Periods
diff --git a/services/firebase/api.js b/services/firebase/api.js
index 5729a977..cc49a1e0 100644
--- a/services/firebase/api.js
+++ b/services/firebase/api.js
@@ -7,7 +7,7 @@ export const app = initializeApp(config)
export const db = getDatabase(app)
export const auth = getAuth(app)
-export const getDataOnce = (path) => {
+export function getDataOnce(path) {
return new Promise((resolve) => {
get(child(ref(db), path))
.then((snapshot) => {
@@ -22,7 +22,7 @@ export const getDataOnce = (path) => {
})
}
-export const getDataAndWatch = (path, callback) => {
+export function getDataAndWatch(path, callback) {
onValue(ref(db, path), (snapshot) => {
const data = snapshot.val()
return callback(data)
diff --git a/services/rates/api.ts b/services/rates/api.ts
index 4c046143..53ecb1d4 100644
--- a/services/rates/api.ts
+++ b/services/rates/api.ts
@@ -1,11 +1,12 @@
import axios from 'axios'
+import type { Rates } from '~/components/currencies/types'
-export const getRatesOfUSD = async (apiKey: string): Promise<Record<string, string> | false> => {
+export async function getRatesOfUSD(apiKey: string): Promise<Rates | false> {
const serviceUrl = `https://openexchangerates.org/api/latest.json?app_id=${apiKey}`
const { data } = await axios.get(serviceUrl)
if (!data) {
- console.log('api unavailable')
+ console.error('openexchangerates.org api unavailable')
return false
}
diff --git a/store/categories/actions.js b/store/categories/actions.ts
similarity index 82%
rename from store/categories/actions.js
rename to store/categories/actions.ts
index 5d84d3a0..8c6ac012 100644
--- a/store/categories/actions.js
+++ b/store/categories/actions.ts
@@ -1,16 +1,17 @@
import localforage from 'localforage'
import { getDataAndWatch, unsubscribeData } from '~/services/firebase/api'
+import type { Categories } from '~/components/categories/types'
export default {
initCategories({ dispatch, rootState }) {
const uid = rootState.user.user.uid
- getDataAndWatch(`users/${uid}/categories`, (items) => {
+ getDataAndWatch(`users/${uid}/categories`, (items: Categories) => {
// add child categories to root categories
for (const categoryId in items) {
const parentCategoryId = items[categoryId].parentId
if (parentCategoryId !== 0 && items[parentCategoryId]) {
items[parentCategoryId].childIds
- ? !items[parentCategoryId].childIds.includes(categoryId) && items[parentCategoryId].childIds.push(categoryId)
+ ? !items[parentCategoryId].childIds?.includes(categoryId) && items[parentCategoryId].childIds?.push(categoryId)
: items[parentCategoryId].childIds = [categoryId]
}
}
@@ -42,7 +43,7 @@ export default {
for (const childCatId of cat.childIds) {
if (!items[childCatId])
- items[categoryId].childIds = items[categoryId].childIds.filter(id => id !== childCatId)
+ items[categoryId].childIds = items[categoryId].childIds?.filter(id => id !== childCatId)
}
}
}
@@ -51,7 +52,7 @@ export default {
})
},
- setCategories({ commit }, items) {
+ setCategories({ commit }, items: Categories) {
commit('setCategories', items)
localforage.setItem('finapp.categories', items)
},
diff --git a/store/categories/getters.ts b/store/categories/getters.ts
index afa5af6f..2d16685e 100644
--- a/store/categories/getters.ts
+++ b/store/categories/getters.ts
@@ -1,6 +1,6 @@
import _sortby from 'lodash.sortby'
-import type { TrnID, TrnItem } from '~/components/trns/types'
-import type { CategoryID, CategoryItem } from '~/components/categories/types'
+import type { TrnId, TrnItem } from '~/components/trns/types'
+import type { Categories, CategoryId, CategoryItem } from '~/components/categories/types'
import { getTransferCategoriesIds } from '~/components/categories/getCategories'
export default {
@@ -23,7 +23,7 @@ export default {
/**
* Categories root IDs
*/
- categoriesRootIds(state, getters): CategoryID[] {
+ categoriesRootIds(state, getters): CategoryId[] {
if (!getters.hasCategories)
return []
@@ -33,11 +33,11 @@ export default {
},
categoriesForBeParent(state, getters, rootState) {
- const categoriesItems: Record<CategoryID, CategoryItem> = state.items
- const trnsItems: Record<TrnID, TrnItem> = rootState.trns.items
+ const categoriesItems: Record<CategoryId, CategoryItem> = state.items
+ const trnsItems: Record<TrnId, TrnItem> = rootState.trns.items
const transferCategoriesIds = getTransferCategoriesIds(categoriesItems)
- return getters.categoriesRootIds.filter((id: CategoryID) => {
+ return getters.categoriesRootIds.filter((id: CategoryId) => {
const hasTrnsInCategory = Object.values(trnsItems).some(trn => trn.categoryId === id)
const isTransferCategory = transferCategoriesIds.includes(id)
@@ -67,6 +67,12 @@ export default {
return []
},
+ categoriesIdsForTrnValues(state: { items: Categories }, getters: any): CategoryId[] {
+ const ids: CategoryId[] = getters['categoriesIds']
+ return ids.filter((id: CategoryId) =>
+ id !== 'transfer' && (!state.items[id].childIds || state.items[id].childIds?.length === 0))
+ },
+
recentCategoriesIds(state, getters, rootState, rootGetters) {
if (!getters.hasCategories || !rootGetters['trns/hasTrns'])
return []
diff --git a/store/categories/mutations.js b/store/categories/mutations.js
index 16108194..41e05b9c 100644
--- a/store/categories/mutations.js
+++ b/store/categories/mutations.js
@@ -12,7 +12,7 @@ export default {
color: 'var(--c-blue-1)',
icon: 'mdi mdi-repeat',
name: 'Transfer',
- order: 999,
+ order: 9999,
parentId: 0,
childIds: [],
showInLastUsed: false,
diff --git a/store/currencies/index.js b/store/currencies/index.js
deleted file mode 100644
index c6f47da7..00000000
--- a/store/currencies/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const state = () => ({
- base: 'RUB',
- rates: {},
- modal: {
- show: false,
- },
-})
diff --git a/store/currencies/index.ts b/store/currencies/index.ts
new file mode 100644
index 00000000..3b8dffc7
--- /dev/null
+++ b/store/currencies/index.ts
@@ -0,0 +1,9 @@
+export function state() {
+ return {
+ base: 'RUB',
+ rates: {},
+ modal: {
+ show: false,
+ },
+ }
+}
diff --git a/store/currencies/mutations.js b/store/currencies/mutations.ts
similarity index 100%
rename from store/currencies/mutations.js
rename to store/currencies/mutations.ts
diff --git a/store/stat/getters.ts b/store/stat/getters.ts
index 21f14815..c1cf585b 100644
--- a/store/stat/getters.ts
+++ b/store/stat/getters.ts
@@ -1,6 +1,6 @@
import dayjs from 'dayjs'
-import type { CategoryID } from '~/components/categories/types'
-import type { TrnID } from '~/components/trns/types'
+import type { CategoryId } from '~/components/categories/types'
+import type { TrnId } from '~/components/trns/types'
import { getTransactibleCategoriesIds, getTransferCategoriesIds } from '~/components/categories/getCategories'
import { getTotal } from '~/components/amount/getTotal'
import { getTrnsIds } from '~/components/trns/getTrns'
@@ -34,7 +34,7 @@ export default {
walletsIds,
})
- function getRootCategoryIdFromTrnId(trnId: TrnID, excludeTransfer = false): CategoryID {
+ function getRootCategoryIdFromTrnId(trnId: TrnId, excludeTransfer = false): CategoryId {
const categories = rootState.categories.items
const trnCategoryId = trnsItems[trnId].categoryId
const trnCategoryParentId = categories[trnCategoryId].parentId
diff --git a/store/trnForm/actions.js b/store/trnForm/actions.js
deleted file mode 100644
index 26699a56..00000000
--- a/store/trnForm/actions.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import dayjs from 'dayjs'
-
-export default {
- closeTrnForm({ commit }) {
- commit('closeTrnForm')
- commit('setTrnFormValues', {
- trnId: null,
- })
- },
-
- openTrnForm({ rootState, rootGetters, commit }, { action, trnId }) {
- commit('openTrnForm')
- const lastTrn = rootState.trns.items[rootGetters['trns/lastCreatedTrnId']]
-
- switch (action) {
- case 'create':
- // Get data from last trn
- if (lastTrn) {
- commit('setTrnFormValues', {
- amount: '0',
- amountType: 0,
- categoryId: lastTrn.categoryId,
- date: dayjs().valueOf(),
- description: null,
- groups: null,
- trnId: null,
- expenseAmount: 0,
- incomeAmount: 0,
- walletId: lastTrn.walletId,
- })
- }
- else {
- const categoriesIds = rootGetters['categories/categoriesIds']
- const childs = categoriesIds.filter(id =>
- id !== 'transfer'
- && (!rootState.categories.items[id].childIds || rootState.categories.items[id].childIds.length === 0))
-
- const categoryId = childs[0]
- const walletsIds = Object.keys(rootState.wallets.items)
- const walletId = walletsIds[0]
- commit('setTrnFormValues', {
- amount: '0',
- amountType: 0,
- categoryId,
- date: dayjs().valueOf(),
- description: null,
- groups: null,
- trnId: null,
- expenseAmount: 0,
- incomeAmount: 0,
- walletId,
- })
- }
- break
-
- case 'edit':
- if (trnId && rootGetters['trns/hasTrns']) {
- const trn = rootState.trns.items[trnId]
-
- // Transfer
- if (trn.type === 2) {
- commit('setTrnFormValues', {
- ...trn,
- amount: '0',
- amountType: 2,
- categoryId: trn.categoryId,
- date: trn.date,
- description: trn.description || null,
- groups: null,
- trnId,
- expenseWalletAmount: trn.expenseWalletAmount || trn.amount,
- expenseWalletId: trn.expenseWalletId || trn.walletFromId,
- incomeWalletAmount: trn.incomeWalletAmount || trn.amount,
- incomeWalletId: trn.incomeWalletId || trn.walletToId,
- })
- }
- // Simple
- else {
- commit('setTrnFormValues', {
- ...trn,
- amount: trn.amount,
- amountType: trn.type,
- categoryId: trn.categoryId,
- date: trn.date,
- description: trn.description || null,
- groups: trn.groups || null,
- trnId,
- walletId: trn.walletId,
- })
- }
- }
- break
-
- case 'duplicate':
- if (trnId && rootGetters['trns/hasTrns']) {
- const trn = rootState.trns.items[trnId]
- commit('setTrnFormValues', {
- ...trn,
- amountType: trn.type,
- categoryId: trn.categoryId,
- date: dayjs().valueOf(),
- description: trn.description || null,
- groups: null,
- trnId: null,
- walletId: trn.walletId,
- })
- }
- break
- }
- },
-}
diff --git a/store/trnForm/index.js b/store/trnForm/index.js
deleted file mode 100644
index 49adb49c..00000000
--- a/store/trnForm/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import dayjs from 'dayjs'
-
-export const state = () => ({
- action: 'create',
- height: '100%',
-
- modal: {
- calendar: false,
- categories: false,
- categoriesChild: false,
- description: false,
- transferFrom: false,
- transferTo: false,
- wallets: false,
- trn: false,
- },
-
- show: false,
- showModalCategoryId: null,
- showModalTrnId: null,
-
- values: {
- amount: '0',
- amountType: 0,
- categoryId: null,
- date: dayjs().valueOf(),
- description: null,
- trnId: null,
- walletId: null,
- incomeAmount: 0,
- incomeWalletId: null,
- expenseAmount: 0,
- expenseWalletId: null,
- },
-})
diff --git a/store/trnForm/index.ts b/store/trnForm/index.ts
new file mode 100644
index 00000000..ae791c74
--- /dev/null
+++ b/store/trnForm/index.ts
@@ -0,0 +1,21 @@
+export function state() {
+ return {
+ action: 'create',
+ height: '100%',
+
+ modal: {
+ calendar: false,
+ categories: false,
+ categoriesChild: false,
+ description: false,
+ transferFrom: false,
+ transferTo: false,
+ wallets: false,
+ trn: false,
+ },
+
+ show: false,
+ showModalCategoryId: null,
+ showModalTrnId: null,
+ }
+}
diff --git a/store/trnForm/mutations.js b/store/trnForm/mutations.ts
similarity index 57%
rename from store/trnForm/mutations.js
rename to store/trnForm/mutations.ts
index ca88c788..3a5d4e19 100644
--- a/store/trnForm/mutations.js
+++ b/store/trnForm/mutations.ts
@@ -1,11 +1,4 @@
export default {
- setTrnFormValues(state, values) {
- state.values = {
- ...state.values,
- ...values,
- }
- },
-
setTrnFormHeight(state, height) {
state.height = height
},
@@ -16,12 +9,6 @@ export default {
: state.showModalCategoryId = id
},
- setTrnFormModalTrnId(state, id) {
- state.showModalTrnId === id
- ? state.showModalTrnId = null
- : state.showModalTrnId = id
- },
-
closeTrnFormModal(state, modalName) {
state.modal[modalName] = false
},
@@ -34,9 +21,7 @@ export default {
state.show = false
},
- openTrnForm(state) { state.show = true },
-
- toggleTrnForm(state) {
- state.show = !state.show
+ openTrnForm(state) {
+ state.show = true
},
}
diff --git a/store/trns/actions.js b/store/trns/actions.ts
similarity index 79%
rename from store/trns/actions.js
rename to store/trns/actions.ts
index e73ee553..4942dc93 100644
--- a/store/trns/actions.js
+++ b/store/trns/actions.ts
@@ -1,19 +1,8 @@
import localforage from 'localforage'
import dayjs from 'dayjs'
-import {
- removeTrnToAddLaterLocal,
- removeTrnToDeleteLaterLocal,
- saveTrnIDforDeleteWhenClientOnline,
- saveTrnToAddLaterLocal,
-} from './helpers'
-import useCalculator from '~/components/trnForm/calculator/useCalculator'
-import {
- getDataAndWatch,
- removeData,
- saveData,
- unsubscribeData,
- updateData,
-} from '~/services/firebase/api'
+import { removeTrnToAddLaterLocal, removeTrnToDeleteLaterLocal, saveTrnIDforDeleteWhenClientOnline, saveTrnToAddLaterLocal } from './helpers'
+import { getDataAndWatch, removeData, saveData, unsubscribeData, updateData } from '~/services/firebase/api'
+import type { Transaction, Transfer, TrnId } from '~/components/trns/types'
export default {
// init
@@ -30,12 +19,11 @@ export default {
/**
* Create new trn
* and save it to local storage when Client offline
- *
- * @param {object}
- * @param id
- * @param values
*/
- addTrn({ commit, rootState }, { id, values }) {
+ addTrn({ commit, rootState }, { id, values }: {
+ id: TrnId
+ values: Transaction | Transfer
+ }) {
const uid = rootState.user.user.uid
const trns = rootState.trns.items
const valuesWithEditDate = {
@@ -47,6 +35,8 @@ export default {
localforage.setItem('finapp.trns', { ...trns, [id]: valuesWithEditDate })
commit('setTrns', Object.freeze({ ...trns, [id]: valuesWithEditDate }))
+ console.log('id', id)
+ console.log('hey', `users/${uid}/trns/${id}`, valuesWithEditDate)
saveData(`users/${uid}/trns/${id}`, valuesWithEditDate)
.then(() => {
isTrnSavedOnline = true
@@ -58,17 +48,8 @@ export default {
saveTrnToAddLaterLocal({ id, values })
}, 1000)
- const { clearExpression } = useCalculator()
- clearExpression()
-
- commit('trnForm/setTrnFormValues', {
- trnId: null,
- amount: '0',
- incomeAmount: 0,
- expenseAmount: 0,
- description: null,
- }, { root: true })
-
+ // TODO: clean form
+ // TODO: move offline logic to pinia store
return true
},
@@ -101,12 +82,12 @@ export default {
},
/**
- * Add and delete trns which has been created in offline mode
- *
- * When user online
- * get trns from local storage
- * and add trns to database
- */
+ * Add and delete trns which has been created in offline mode
+ *
+ * When user online
+ * get trns from local storage
+ * and add trns to database
+ */
uploadOfflineTrns({ dispatch, rootState }) {
getDataAndWatch('.info/connected', async (isConnected) => {
if (isConnected) {
diff --git a/store/trns/getters.js b/store/trns/getters.ts
similarity index 80%
rename from store/trns/getters.js
rename to store/trns/getters.ts
index 2eac78d0..6c0bc91c 100644
--- a/store/trns/getters.js
+++ b/store/trns/getters.ts
@@ -1,15 +1,16 @@
import dayjs from 'dayjs'
import { getTransactibleCategoriesIds, getTransferCategoriesIds } from '~/components/categories/getCategories'
import { getTrnsIds } from '~/components/trns/getTrns'
+import type { TrnId, TrnItem, Trns } from '~/components/trns/types'
export default {
hasTrns(_state, _getters, rootState) {
return rootState.trns.items && Object.keys(rootState.trns.items).length > 0
},
- lastCreatedTrnId(_state, getters, rootState) {
+ lastCreatedTrnId(_state, getters, rootState): TrnId | false {
if (!getters.hasTrns)
- return
+ return false
const trnsItems = rootState.trns.items
const categoriesItems = rootState.categories.items
@@ -20,18 +21,20 @@ export default {
.find(trnId =>
!transferCategoriesIds.includes(trnsItems[trnId].categoryId)
&& trnsItems[trnId].type !== 2,
- )
+ ) ?? false
},
- firstCreatedTrnId(_state, getters, rootState) {
- if (!getters.hasTrns)
- return
+ lastCreatedTrnItem(_state, getters, rootState): TrnItem | false {
+ return rootState.trns.items?.[getters['lastCreatedTrnId']]
+ },
- const trnsItems = rootState.trns.items
- const sortedTrnsIds = Object.keys(trnsItems)
- .sort((a, b) => trnsItems[a].date - trnsItems[b].date)
+ firstCreatedTrnId(_state, getters, rootState): TrnId | false {
+ if (!getters.hasTrns)
+ return false
- return sortedTrnsIds[0]
+ const trnsItems: Trns = rootState.trns.items
+ return Object.keys(trnsItems)
+ .sort((a, b) => trnsItems[a].date - trnsItems[b].date)[0]
},
firstCreatedTrnIdFromSelectedTrns(_state, getters) {
@@ -49,10 +52,10 @@ export default {
// TODO: move it to a separate function getFilterParams
const categoriesIds = rootState.filter.catsIds.length > 0
? getTransactibleCategoriesIds(rootState.filter.catsIds, categoriesItems)
- : null
+ : false
const walletsIds = storeFilter.walletsIds.length > 0
? storeFilter.walletsIds
- : null
+ : false
return getTrnsIds({
trnsItems,
diff --git a/store/trns/helpers.js b/store/trns/helpers.js
deleted file mode 100644
index cdb761c7..00000000
--- a/store/trns/helpers.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import localforage from 'localforage'
-
-// save added trn to local
-export const saveTrnToAddLaterLocal = async ({ id, values }) => {
- const trns = await localforage.getItem('finapp.trns.offline.update')
- await localforage.setItem('finapp.trns.offline.update', {
- ...trns,
- [id]: values,
- })
-}
-
-// remove added trn from local
-export const removeTrnToAddLaterLocal = async (id) => {
- const trns = await localforage.getItem('finapp.trns.offline.update') || {}
- // console.log('removeTrnToAddLaterLocal', trns)
- if (trns[id]) {
- delete trns[id]
- await localforage.setItem('finapp.trns.offline.update', trns || {})
- console.log(trns)
- }
-}
-
-// save deleted trn to local
-export const saveTrnIDforDeleteWhenClientOnline = async (id) => {
- const trnsIds = await localforage.getItem('finapp.trns.offline.delete') || []
-
- if (trnsIds.includes(id))
- return
-
- await localforage.setItem('finapp.trns.offline.delete', [
- ...trnsIds,
- id,
- ])
-}
-
-// remove deleted trn from local
-export const removeTrnToDeleteLaterLocal = async (id) => {
- const trnsIds = await localforage.getItem('finapp.trns.offline.delete') || []
- const trnId = trnsIds.find(trnId => trnId === id)
- if (trnId) {
- await localforage.setItem('finapp.trns.offline.delete', [
- ...trnsIds.filter(trnId => trnId !== id),
- ])
- }
-}
diff --git a/store/trns/helpers.ts b/store/trns/helpers.ts
new file mode 100644
index 00000000..4a12c406
--- /dev/null
+++ b/store/trns/helpers.ts
@@ -0,0 +1,56 @@
+import localforage from 'localforage'
+import type { TrnId } from '~/components/trns/types'
+
+const rootPath = 'finapp3.trns.offline'
+
+const actions = {
+ delete: 'delete',
+ update: 'update',
+} as const
+
+async function getLocalTrns(path: keyof typeof actions): Promise<TrnId[]> {
+ const generatedPath = `${rootPath}.${path}` as const
+ return await localforage.getItem(generatedPath) || []
+}
+
+// save added trn to local
+export async function saveTrnToAddLaterLocal({ id, values }) {
+ const trns = await localforage.getItem('finapp.trns.offline.update') || {}
+ await localforage.setItem('finapp.trns.offline.update', {
+ ...trns,
+ [id]: values,
+ })
+}
+
+// remove added trn from local
+export async function removeTrnToAddLaterLocal(id) {
+ const trns = await localforage.getItem('finapp.trns.offline.update') || {}
+ if (trns[id]) {
+ delete trns[id]
+ await localforage.setItem('finapp.trns.offline.update', trns || {})
+ console.log(trns)
+ }
+}
+
+// save deleted trn to local
+export async function saveTrnIDforDeleteWhenClientOnline(id: TrnId) {
+ const ids: TrnId[] = await getLocalTrns(actions.delete)
+
+ if (ids.includes(id))
+ return
+
+ ids.push(id)
+ await localforage.setItem('finapp.trns.offline.delete', ids)
+}
+
+// remove deleted trn from local
+export async function removeTrnToDeleteLaterLocal(id: TrnId) {
+ const ids: TrnId[] = await getLocalTrns(actions.delete)
+ const trnId = ids.find(trnId => trnId === id)
+ if (!trnId)
+ return
+
+ await localforage.setItem('finapp.trns.offline.delete', [
+ ...ids.filter(trnId => trnId !== id),
+ ])
+}
diff --git a/store/trns/index.js b/store/trns/index.js
deleted file mode 100644
index fa76a8ab..00000000
--- a/store/trns/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export const state = () => ({
- items: {},
- edit: {
- id: null,
- },
- modal: {
- show: false,
- id: null,
- },
-})
diff --git a/store/trns/index.ts b/store/trns/index.ts
new file mode 100644
index 00000000..26dc7a7f
--- /dev/null
+++ b/store/trns/index.ts
@@ -0,0 +1,14 @@
+import type { TrnsState } from '~/store/trns/types'
+
+export function state(): TrnsState {
+ return {
+ items: {},
+ edit: {
+ id: null,
+ },
+ modal: {
+ show: false,
+ id: null,
+ },
+ }
+}
diff --git a/store/trns/mutations.js b/store/trns/mutations.js
deleted file mode 100644
index 3a581ecb..00000000
--- a/store/trns/mutations.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export default {
- setTrns(state, items) {
- const freezedItems = {}
- if (items) {
- for (const itemId of Object.keys(items))
- freezedItems[itemId] = Object.freeze(items[itemId])
- }
-
- state.items = freezedItems
- },
-
- showTrnModal(state) {
- state.modal.show = true
- },
-
- hideTrnModal(state) {
- state.modal.show = false
- },
-
- setTrnModalId(state, id) {
- state.modal.id === id
- ? state.modal.id = null
- : state.modal.id = id
- },
-}
diff --git a/store/trns/mutations.ts b/store/trns/mutations.ts
new file mode 100644
index 00000000..ea137d15
--- /dev/null
+++ b/store/trns/mutations.ts
@@ -0,0 +1,28 @@
+import type { TrnId, Trns } from '~/components/trns/types'
+import type { TrnsState } from '~/store/trns/types'
+
+export default {
+ setTrns(state: TrnsState, items: Trns) {
+ if (!items)
+ return {}
+
+ state.items = Object.keys(items).reduce((prev, itemId) => {
+ prev[itemId] = Object.freeze(items[itemId])
+ return prev
+ }, {})
+ },
+
+ showTrnModal(state: TrnsState) {
+ state.modal.show = true
+ },
+
+ hideTrnModal(state: TrnsState) {
+ state.modal.show = false
+ },
+
+ setTrnModalId(state: TrnsState, id: TrnId) {
+ state.modal.id === id
+ ? state.modal.id = null
+ : state.modal.id = id
+ },
+}
diff --git a/store/trns/types.ts b/store/trns/types.ts
new file mode 100644
index 00000000..6be250b3
--- /dev/null
+++ b/store/trns/types.ts
@@ -0,0 +1,12 @@
+import type { Trns } from '~/components/trns/types'
+
+export interface TrnsState {
+ items: Trns
+ edit: {
+ id: null | string
+ }
+ modal: {
+ show: boolean
+ id: null | string
+ }
+}
diff --git a/store/ui/index.js b/store/ui/index.js
index 762a94e0..0da639e8 100644
--- a/store/ui/index.js
+++ b/store/ui/index.js
@@ -1,9 +1,11 @@
-export const state = () => ({
- activeTab: 'stat',
- activeTabStat: 'details',
+export function state() {
+ return {
+ activeTab: 'stat',
+ activeTabStat: 'details',
- width: 0,
- height: 0,
- mobile: false,
- pc: false,
-})
+ width: 0,
+ height: 0,
+ mobile: false,
+ pc: false,
+ }
+}
diff --git a/store/user/getters.js b/store/user/getters.js
index 76bd8ae2..db76c8e0 100644
--- a/store/user/getters.js
+++ b/store/user/getters.js
@@ -5,7 +5,7 @@ export default {
},
isDevUser(state) {
- if ($nuxt.$config.devEmails.includes(state.user?.email))
+ if ($nuxt.$config.public.devEmails.includes(state.user?.email))
return true
},
}
diff --git a/store/wallets/getters.js b/store/wallets/getters.ts
similarity index 82%
rename from store/wallets/getters.js
rename to store/wallets/getters.ts
index bd5480e5..7fc8df23 100644
--- a/store/wallets/getters.js
+++ b/store/wallets/getters.ts
@@ -1,5 +1,6 @@
import { getTrnsIds } from '~/components/trns/getTrns'
import { getTotal } from '~/components/amount/getTotal'
+import type { WalletId } from '~~/components/wallets/types'
export default {
hasWallets(_state, _getters, rootState) {
@@ -17,8 +18,8 @@ export default {
const walletsItems = rootState.wallets.items
const trnsItems = rootState.trns.items
- const getWalletTotal = (walletId) => {
- const trnsIds = getTrnsIds({ trnsItems, walletsIds: walletId })
+ const getWalletTotal = (walletId: WalletId) => {
+ const trnsIds = getTrnsIds({ trnsItems, walletsIds: [walletId] })
const { sumTransactions, sumTransfers } = getTotal({
trnsIds,
trnsItems,
@@ -31,7 +32,7 @@ export default {
const walletsTotal = {}
Object.keys(walletsItems)
- .forEach(walletId =>
+ .forEach((walletId: WalletId) =>
walletsTotal[walletId] = getWalletTotal(walletId))
return walletsTotal
diff --git a/utils/formatDate.js b/utils/formatDate.js
index 789ed4ca..771e9599 100644
--- a/utils/formatDate.js
+++ b/utils/formatDate.js
@@ -1,4 +1,5 @@
import dayjs from 'dayjs'
+
const calendar = require('dayjs/plugin/calendar')
dayjs.extend(calendar)
@@ -7,7 +8,7 @@ dayjs.locale('en', {
mondayFirst: true,
})
-export const formatDate = (value, type) => {
+export function formatDate(value, type) {
// eslint-disable-next-line no-undef
const currentLocale = $nuxt.$i18n.locale
@@ -16,10 +17,10 @@ export const formatDate = (value, type) => {
return {
day: dayjs(+value).format('D'),
weekday: dayjs(+value).calendar(null, {
- sameDay: `dddd, [${currentLocale === 'ru' ? 'Сегодня' : 'Today'}]`,
- nextDay: `dddd, [${currentLocale === 'ru' ? 'Завтра' : 'Tomorrow'}]`,
+ sameDay: `[${currentLocale === 'ru' ? 'Сегодня' : 'Today'}], dddd`,
+ nextDay: `[${currentLocale === 'ru' ? 'Завтра' : 'Tomorrow'}], dddd`,
nextWeek: 'dddd',
- lastDay: `dddd, [${currentLocale === 'ru' ? 'Вчера' : 'Yesterday'}]`,
+ lastDay: `[${currentLocale === 'ru' ? 'Вчера' : 'Yesterday'}], dddd`,
lastWeek: 'dddd',
sameElse: 'dddd',
}),
diff --git a/utils/generateId.ts b/utils/generateId.ts
index 6a13c095..81b5d376 100644
--- a/utils/generateId.ts
+++ b/utils/generateId.ts
@@ -1,3 +1,6 @@
+import dayjs from 'dayjs'
+
export function generateId() {
- return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15)
+ const st = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15)
+ return `${dayjs().format('YYMMDD')}_${st.slice(0, 6)}`
}
diff --git a/yarn.lock b/yarn.lock
index d63248d4..f2680ada 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,12 +25,12 @@
"@jridgewell/gen-mapping" "^0.3.0"
"@jridgewell/trace-mapping" "^0.3.9"
- version "0.42.0"
- resolved "https://registry.yarnpkg.com/@antfu/eslint-config-basic/-/eslint-config-basic-0.42.0.tgz#a3cc1e34b36f286849634ce37d5580ded5469e82"
- integrity sha512-vPy2qYCc8G8nd7RuHV4z05RUhvFOwtulcBwzEYPQTbd4IqbqJ9UA8ISgp1qYcJvbz74eR3mUl8r4b0OzxngPkg==
+ version "0.42.1"
+ resolved "https://registry.yarnpkg.com/@antfu/eslint-config-basic/-/eslint-config-basic-0.42.1.tgz#50bb99c53f771f7a3f2d4470032dfced0381815b"
+ integrity sha512-VYcWpDXAYytrYNH4LjNy42t0d/fq1dFOsnIs6DyqDKdvMAlXN7ScksFAgm/NBaTnBcaBrySCIG+cLQPk5wLTIg==
dependencies:
- eslint-plugin-antfu "0.42.0"
+ eslint-plugin-antfu "0.42.1"
eslint-plugin-eslint-comments "^3.2.0"
eslint-plugin-html "^7.1.0"
eslint-plugin-import "npm:[email protected]"
@@ -46,32 +46,32 @@
jsonc-eslint-parser "^2.3.0"
yaml-eslint-parser "^1.2.2"
- version "0.42.0"
- resolved "https://registry.yarnpkg.com/@antfu/eslint-config-ts/-/eslint-config-ts-0.42.0.tgz#97fc0b6e134828f6f50445e915cbfcab833c44b0"
- integrity sha512-XYnWaNYhGeSgXZLpgPUsn0qHaBCJoNJVPD712fwLEGTJ5a5QctT5v04TRERJmeqfk67EaVMlsuDveLx3fqVuyQ==
+ version "0.42.1"
+ resolved "https://registry.yarnpkg.com/@antfu/eslint-config-ts/-/eslint-config-ts-0.42.1.tgz#60a8cafc9a86ca6081182452a24faf5dd9724cff"
+ integrity sha512-gCz6sapcwZIsXu8LB9THR0r4hHKnNY7HZe4op0AwlK/lA5dO4sSLk68M9ig3CdaRkIW8LTC/sAKyQhX7md6++w==
dependencies:
- "@antfu/eslint-config-basic" "0.42.0"
+ "@antfu/eslint-config-basic" "0.42.1"
"@typescript-eslint/eslint-plugin" "^6.7.0"
"@typescript-eslint/parser" "^6.7.0"
eslint-plugin-jest "^27.2.3"
- version "0.42.0"
- resolved "https://registry.yarnpkg.com/@antfu/eslint-config-vue/-/eslint-config-vue-0.42.0.tgz#bf2db871d15e777aae04b26f2af7b52ad32e00b6"
- integrity sha512-QiD16D5bk99EImRc/z0mnO4TeP0cMMPIOMO8RamJ1ChD/lIluEZFjBTRykTesRyc7+YsdJYit4M/t6hu8YeSww==
+ version "0.42.1"
+ resolved "https://registry.yarnpkg.com/@antfu/eslint-config-vue/-/eslint-config-vue-0.42.1.tgz#0111478d4461c58c6af2b8aaa629b89f753e3b4c"
+ integrity sha512-9F+AyDHw9exEcg1RNhDoTyHgsanBkKE2kZ8Atadn2O8EMbrFE383tETxO+VTv1Dr71z9qaVA2SVQjesPzctQVg==
dependencies:
- "@antfu/eslint-config-basic" "0.42.0"
- "@antfu/eslint-config-ts" "0.42.0"
+ "@antfu/eslint-config-basic" "0.42.1"
+ "@antfu/eslint-config-ts" "0.42.1"
eslint-plugin-vue "^9.17.0"
local-pkg "^0.4.3"
"@antfu/eslint-config@^0.42.0":
- version "0.42.0"
- resolved "https://registry.yarnpkg.com/@antfu/eslint-config/-/eslint-config-0.42.0.tgz#97693bf31a9c9338828e80b3fa7afd47123b4576"
- integrity sha512-RdTn+ggGF/mctHjnzLvImx/+RV18HwVTvC/jeHSF4bKBTA3eTftq+FrxWuCpmrEQRIb+J/tn2gmNpzizUo1PLQ==
+ version "0.42.1"
+ resolved "https://registry.yarnpkg.com/@antfu/eslint-config/-/eslint-config-0.42.1.tgz#9872ad8981d322139d24ccdf0ab9b298573b3f57"
+ integrity sha512-/U5PRCTPUI5khNMl4jBw1tLii7biJcrgD3yJEnxCQiTOjkfuVJeESSZieI5Qlu0zVXuudpq8R5VApCKjH4TpsA==
dependencies:
- "@antfu/eslint-config-vue" "0.42.0"
+ "@antfu/eslint-config-vue" "0.42.1"
"@typescript-eslint/eslint-plugin" "^6.7.0"
"@typescript-eslint/parser" "^6.7.0"
eslint-plugin-eslint-comments "^3.2.0"
@@ -99,7 +99,7 @@
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.20.tgz#8df6e96661209623f1975d66c35ffca66f3306d0"
integrity sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==
-"@babel/core@^7.22.11", "@babel/core@^7.22.9":
+"@babel/core@^7.22.9":
version "7.22.20"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.20.tgz#e3d0eed84c049e2a2ae0a64d27b6a37edec385b7"
integrity sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==
@@ -153,7 +153,7 @@
dependencies:
"@babel/types" "^7.22.15"
-"@babel/helper-compilation-targets@^7.22.10", "@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.22.9":
+"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.22.9":
version "7.22.15"
resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52"
integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==
@@ -366,7 +366,7 @@
"@babel/helper-create-class-features-plugin" "^7.18.6"
"@babel/helper-plugin-utils" "^7.18.6"
-"@babel/plugin-proposal-decorators@^7.22.10", "@babel/plugin-proposal-decorators@^7.22.7":
+"@babel/plugin-proposal-decorators@^7.22.7":
version "7.22.15"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.15.tgz#dc774eae73ab8c28a644d490b45aa47a85bb0bf5"
integrity sha512-kc0VvbbUyKelvzcKOSyQUSVVXS5pT3UhRB0e3c9An86MvLqs+gx0dN4asllrDluqSa3m9YyooXKGOFVomnyFkg==
@@ -886,7 +886,7 @@
dependencies:
"@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-runtime@^7.22.10", "@babel/plugin-transform-runtime@^7.22.9":
+"@babel/plugin-transform-runtime@^7.22.9":
version "7.22.15"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.15.tgz#3a625c4c05a39e932d7d34f5d4895cdd0172fdc9"
integrity sha512-tEVLhk8NRZSmwQ0DJtxxhTrCht1HVo8VaMzYT4w6lwyKBuHsgoioAUA7/6eT2fRfc5/23fuGdlwIxXhRVgWr4g==
@@ -975,7 +975,7 @@
"@babel/helper-create-regexp-features-plugin" "^7.22.5"
"@babel/helper-plugin-utils" "^7.22.5"
-"@babel/preset-env@^7.22.10", "@babel/preset-env@^7.22.9":
+"@babel/preset-env@^7.22.9":
version "7.22.20"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.20.tgz#de9e9b57e1127ce0a2f580831717f7fb677ceedb"
integrity sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==
@@ -1075,7 +1075,7 @@
resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
-"@babel/runtime@^7.22.11", "@babel/runtime@^7.22.6", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.22.6", "@babel/runtime@^7.8.4":
version "7.22.15"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.15.tgz#38f46494ccf6cf020bd4eed7124b425e83e523b8"
integrity sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==
@@ -1133,43 +1133,43 @@
dependencies:
mime "^3.0.0"
-"@csstools/cascade-layer-name-parser@^1.0.3", "@csstools/cascade-layer-name-parser@^1.0.4":
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.4.tgz#3ff490b84660dc0592b4315029f22908f3de0577"
- integrity sha512-zXMGsJetbLoXe+gjEES07MEGjL0Uy3hMxmnGtVBrRpVKr5KV9OgCB09zr/vLrsEtoVQTgJFewxaU8IYSAE4tjg==
+"@csstools/cascade-layer-name-parser@^1.0.4", "@csstools/cascade-layer-name-parser@^1.0.5":
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.5.tgz#c4d276e32787651df0007af22c9fa70d9c9ca3c2"
+ integrity sha512-v/5ODKNBMfBl0us/WQjlfsvSlYxfZLhNMVIsuCPib2ulTwGKYbKJbwqw671+qH9Y4wvWVnu7LBChvml/wBKjFg==
"@csstools/color-helpers@^3.0.2":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-3.0.2.tgz#6571d289af8bfcc3a8d75357b35e6d17a8ba6848"
integrity sha512-NMVs/l7Y9eIKL5XjbCHEgGcG8LOUT2qVcRjX6EzkCdlvftHVKr2tHIPzHavfrULRZ5Q2gxrJ9f44dAlj6fX97Q==
-"@csstools/css-calc@^1.1.3":
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-1.1.3.tgz#75e07eec075f1f3df0ce25575dab3d63da2bd680"
- integrity sha512-7mJZ8gGRtSQfQKBQFi5N0Z+jzNC0q8bIkwojP1W0w+APzEqHu5wJoGVsvKxVnVklu9F8tW1PikbBRseYnAdv+g==
+"@csstools/css-calc@^1.1.4":
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-1.1.4.tgz#70bf4c5b379cdc256d3936bf4a21e3a3454a3d68"
+ integrity sha512-ZV1TSmToiNcQL1P3hfzlzZzA02mmVkVmXGaUDUqpYUG84PmLhVSZpKX+KfxAuOcK7de04UXSQPBrAvaya6iiGg==
-"@csstools/css-color-parser@^1.3.1":
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-1.3.1.tgz#ab37d833e65595c8dae05c6ec44aeb87f210b76b"
- integrity sha512-cehc/DQCyb4hL4fspvyL7WiY+uAy8Iuaz0yTyndC/AyBmxkNpgtSgCSsr0aR4vkaSFVZfNNVlKbjHFwOsPGB1Q==
+"@csstools/css-color-parser@^1.3.2":
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-1.3.2.tgz#ec6ac35e24a34e1f37eb3d366a2ea637bcc7c7e5"
+ integrity sha512-YLCWI+nm18qr5nj7QhRMGuIi4ddFe0SKEtPQliLf1+pmyHFxoHYd0+Hg+bRnbnVbdyCTTlCqBiUvCeNJfd903g==
dependencies:
"@csstools/color-helpers" "^3.0.2"
- "@csstools/css-calc" "^1.1.3"
+ "@csstools/css-calc" "^1.1.4"
-"@csstools/css-parser-algorithms@^2.3.0", "@csstools/css-parser-algorithms@^2.3.1":
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.1.tgz#ec4fc764ba45d2bb7ee2774667e056aa95003f3a"
- integrity sha512-xrvsmVUtefWMWQsGgFffqWSK03pZ1vfDki4IVIIUxxDKnGBzqNgv0A7SB1oXtVNEkcVO8xi1ZrTL29HhSu5kGA==
+"@csstools/css-parser-algorithms@^2.3.1", "@csstools/css-parser-algorithms@^2.3.2":
+ version "2.3.2"
+ resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.2.tgz#1e0d581dbf4518cb3e939c3b863cb7180c8cedad"
+ integrity sha512-sLYGdAdEY2x7TSw9FtmdaTrh2wFtRJO5VMbBrA8tEqEod7GEggFmxTSK9XqExib3yMuYNcvcTdCZIP6ukdjAIA==
-"@csstools/css-tokenizer@^2.1.1", "@csstools/css-tokenizer@^2.2.0":
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.2.0.tgz#9d70e6dcbe94e44c7400a2929928db35c4de32b5"
- integrity sha512-wErmsWCbsmig8sQKkM6pFhr/oPha1bHfvxsUY5CYSQxwyhA9Ulrs8EqCgClhg4Tgg2XapVstGqSVcz0xOYizZA==
+"@csstools/css-tokenizer@^2.2.0", "@csstools/css-tokenizer@^2.2.1":
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.2.1.tgz#9dc431c9a5f61087af626e41ac2a79cce7bb253d"
+ integrity sha512-Zmsf2f/CaEPWEVgw29odOj+WEVoiJy9s9NOv5GgNY9mZ1CZ7394By6wONrONrTsnNDv6F9hR02nvFihrGVGHBg==
-"@csstools/media-query-list-parser@^2.1.2", "@csstools/media-query-list-parser@^2.1.4":
- version "2.1.4"
- resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.4.tgz#0017f99945f6c16dd81a7aacf6821770933c3a5c"
- integrity sha512-V/OUXYX91tAC1CDsiY+HotIcJR+vPtzrX8pCplCpT++i8ThZZsq5F5dzZh/bDM3WUOjrvC1ljed1oSJxMfjqhw==
+"@csstools/media-query-list-parser@^2.1.4", "@csstools/media-query-list-parser@^2.1.5":
+ version "2.1.5"
+ resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.5.tgz#94bc8b3c3fd7112a40b7bf0b483e91eba0654a0f"
+ integrity sha512-IxVBdYzR8pYe89JiyXQuYk4aVVoCPhMJkz6ElRwlVysjwURTsTk/bmY/z4FfeRE+CRBMlykPwXEVUg8lThv7AQ==
"@csstools/postcss-cascade-layers@^4.0.0":
version "4.0.0"
@@ -1179,34 +1179,34 @@
"@csstools/selector-specificity" "^3.0.0"
postcss-selector-parser "^6.0.13"
-"@csstools/postcss-color-function@^3.0.3":
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-3.0.3.tgz#0e771c7268052165ff80a561f081786a3f097239"
- integrity sha512-5oNUbO89SX7BuSB0ZiUxDaQt4R2K3A+RQZlxNHOvghZJO/UqgomLPII6JkgrywLQ0Y4JDzbyNuwr0OKo2v0RsQ==
+"@csstools/postcss-color-function@^3.0.4":
+ version "3.0.5"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-3.0.5.tgz#4f50b7e71869fcd4499d4235e23127b579da73b1"
+ integrity sha512-q9E7oJwf1Z8nJqQbob9DmFxrte3RQc+pwV+5WlWw6Ei9XaObaNJlPAQ1HfOpcEg/fxrRf/Yf6fgO8Q01r7u17A==
dependencies:
- "@csstools/css-color-parser" "^1.3.1"
- "@csstools/css-parser-algorithms" "^2.3.1"
- "@csstools/css-tokenizer" "^2.2.0"
- "@csstools/postcss-progressive-custom-properties" "^3.0.0"
+ "@csstools/css-color-parser" "^1.3.2"
+ "@csstools/css-parser-algorithms" "^2.3.2"
+ "@csstools/css-tokenizer" "^2.2.1"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.1"
-"@csstools/postcss-color-mix-function@^2.0.3":
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-2.0.3.tgz#acdd3a867a3e27faa8bf523cd50bc1dabeb32349"
- integrity sha512-q/fv8pdRR07GAJTvemXbQ02hwVGmVcOjBJj7+gnlGrAVwSzrPEsJc8zM/EzoqVJTZtm/DwG6TWu+VJIxVpyUBg==
+"@csstools/postcss-color-mix-function@^2.0.4":
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-2.0.5.tgz#589fea3346fc985cdfa49a1fdc12c28125def985"
+ integrity sha512-0MDBTG0FPDjNlAYMImNjnQ9lrldiFRCmsBx4dZB1ikbFwt6aYJRWDjgXoZY+1CmQ6m1qPeBJO762i6AKwQDlQQ==
dependencies:
- "@csstools/css-color-parser" "^1.3.1"
- "@csstools/css-parser-algorithms" "^2.3.1"
- "@csstools/css-tokenizer" "^2.2.0"
- "@csstools/postcss-progressive-custom-properties" "^3.0.0"
+ "@csstools/css-color-parser" "^1.3.2"
+ "@csstools/css-parser-algorithms" "^2.3.2"
+ "@csstools/css-tokenizer" "^2.2.1"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.1"
"@csstools/postcss-exponential-functions@^1.0.0":
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-1.0.0.tgz#2e558ad2856e0c737d9cb98a5d91cfe8d785c9f6"
- integrity sha512-FPndJ/7oGlML7/4EhLi902wGOukO0Nn37PjwOQGc0BhhjQPy3np3By4d3M8s9Cfmp9EHEKgUHRN2DQ5HLT/hTw==
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-1.0.1.tgz#0d938f58ba5ac5c362e09ad22b5768b04ee82650"
+ integrity sha512-ZLK2iSK4DUxeypGce2PnQSdYugUqDTwxnhNiq1o6OyKMNYgYs4eKbvEhFG8JKr1sJWbeqBi5jRr0017l2EWVvg==
dependencies:
- "@csstools/css-calc" "^1.1.3"
- "@csstools/css-parser-algorithms" "^2.3.1"
- "@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/css-calc" "^1.1.4"
+ "@csstools/css-parser-algorithms" "^2.3.2"
+ "@csstools/css-tokenizer" "^2.2.1"
"@csstools/postcss-font-format-keywords@^3.0.0":
version "3.0.0"
@@ -1215,37 +1215,42 @@
dependencies:
postcss-value-parser "^4.2.0"
-"@csstools/postcss-gradients-interpolation-method@^4.0.3":
- version "4.0.3"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-4.0.3.tgz#f5ddcc25e18ac1f1bffe5728828c793aa1d8dde3"
- integrity sha512-dEK3WbajX538Zu3lPMtBPAO1pooR7zslJ1mDrWKQzlwQczls3fEz+tlRhd7KWMMlsoIwNGMIGq2W/GqEErDjkg==
+"@csstools/postcss-gradients-interpolation-method@^4.0.4":
+ version "4.0.5"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-4.0.5.tgz#aeb9cb87df28247aeda706ac7d650335e24294b2"
+ integrity sha512-ABDOADpKrTvNb+cUBj9ciocCgFvE832eENKVuONca1u2bkFL4jM9430XFmi/GOgzt0agg5Q8FFJHXgYyKbgOFQ==
dependencies:
- "@csstools/css-color-parser" "^1.3.1"
- "@csstools/css-parser-algorithms" "^2.3.1"
- "@csstools/css-tokenizer" "^2.2.0"
- "@csstools/postcss-progressive-custom-properties" "^3.0.0"
+ "@csstools/css-color-parser" "^1.3.2"
+ "@csstools/css-parser-algorithms" "^2.3.2"
+ "@csstools/css-tokenizer" "^2.2.1"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.1"
"@csstools/postcss-hwb-function@^3.0.3":
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-3.0.3.tgz#adbd5f8094cbe476ada2990ce7e4ad3e0fc0a303"
- integrity sha512-2TqrRD8JzSwQCRKKNc9BFhSEmsz+mR3RtwSw5mQSGILC+LIYCVWeYwC33cI+saFWv0DGZ0NXLx5VSX2tdJyU6w==
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-3.0.4.tgz#431d2fe3af0956a5f0f52b71126a872e04bb39df"
+ integrity sha512-HxyOVYowL0wsz7BjlAyGu3ydPGliXHgVnXP4pOWFktkAaBvjks8S51NqMbR6AkBQHB9W4nt9KW2qB6Qt2PJ80A==
dependencies:
- "@csstools/css-color-parser" "^1.3.1"
- "@csstools/css-parser-algorithms" "^2.3.1"
- "@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/css-color-parser" "^1.3.2"
+ "@csstools/css-parser-algorithms" "^2.3.2"
+ "@csstools/css-tokenizer" "^2.2.1"
-"@csstools/postcss-ic-unit@^3.0.0":
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-3.0.0.tgz#bbc55170d880daa3cc096ee160e8f2492a48e881"
- integrity sha512-FH3+zfOfsgtX332IIkRDxiYLmgwyNk49tfltpC6dsZaO4RV2zWY6x9VMIC5cjvmjlDO7DIThpzqaqw2icT8RbQ==
+"@csstools/postcss-ic-unit@^3.0.1":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-3.0.1.tgz#9d4964fe9da11f51463e0a141b3184ee3a23acb8"
+ integrity sha512-OkKZV0XZQixChA6r68O9UfGNFv06cPVcuT+MjpzfEuoCfbNWCj+b0dhsmdz776giQ+DymPmFDlTD+QJEFPI7rw==
dependencies:
- "@csstools/postcss-progressive-custom-properties" "^3.0.0"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.1"
postcss-value-parser "^4.2.0"
-"@csstools/postcss-is-pseudo-class@^4.0.1":
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-4.0.1.tgz#3f05faedf05fbaa20abd4bf77cb47c55585e0451"
- integrity sha512-KJGLbjjjg+mdNclLyCfsZaJS4xCaRaxKAnmWKpIp1FarEem3ZdoOxTlIELwvlE5BVg1t3QTmp0+DPSlLTTFMhA==
+"@csstools/postcss-initial@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-initial/-/postcss-initial-1.0.0.tgz#e35ec12143a654b384fb81623970deeacedb0769"
+ integrity sha512-1l7iHHjIl5qmVeGItugr4ZOlCREDP71mNKqoEyxlosIoiu3Os1nPWMHpuCvDLCLiWI/ONTOg3nzJh7gwHOrqUA==
+
+"@csstools/postcss-is-pseudo-class@^4.0.2":
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-4.0.2.tgz#c896e25baf0a5249eb5c5e8cce78dfc0cc11380e"
+ integrity sha512-LeAJozyZTY3c1SaHMbwF4p8Ego/2HHprYusmmdmUH7wP6lRF1w3s7IO2iNwQ6fHBrSOfkPUFaUtRUGZLBE23Eg==
dependencies:
"@csstools/selector-specificity" "^3.0.0"
postcss-selector-parser "^6.0.13"
@@ -1262,31 +1267,31 @@
dependencies:
postcss-value-parser "^4.2.0"
-"@csstools/postcss-logical-viewport-units@^2.0.1":
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-2.0.1.tgz#2921034d11d60ea7340ebe795bb4fe60f32ebbae"
- integrity sha512-R5s19SscS7CHoxvdYNMu2Y3WDwG4JjdhsejqjunDB1GqfzhtHSvL7b5XxCkUWqm2KRl35hI6kJ4HEaCDd/3BXg==
+"@csstools/postcss-logical-viewport-units@^2.0.2":
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-2.0.3.tgz#95e7195660bb8b05cd46f13d0495fe427e2db988"
+ integrity sha512-xeVxqND5rlQyqLGdH7rX34sIm/JbbQKxpKQP8oD1YQqUHHCLQR9NUS57WqJKajxKN6AcNAMWJhb5LUH5RfPcyA==
dependencies:
- "@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/css-tokenizer" "^2.2.1"
"@csstools/postcss-media-minmax@^1.0.7":
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.0.7.tgz#6701cf1141d28b5240de9bfae083c8a0af0daa00"
- integrity sha512-5LGLdu8cJgRPmvkjUNqOPKIKeHbyQmoGKooB5Rh0mp5mLaNI9bl+IjFZ2keY0cztZYsriJsGf6Lu8R5XetuwoQ==
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.1.0.tgz#8d46317b6686cd49e05870ae3c8993e49a54149c"
+ integrity sha512-t5Li/DPC5QmW/6VFLfUvsw/4dNYYseWR0tOXDeJg/9EKUodBgNawz5tuk5vYKtNvoj+Q08odMuXcpS5YJj0AFA==
dependencies:
- "@csstools/css-calc" "^1.1.3"
- "@csstools/css-parser-algorithms" "^2.3.1"
- "@csstools/css-tokenizer" "^2.2.0"
- "@csstools/media-query-list-parser" "^2.1.4"
+ "@csstools/css-calc" "^1.1.4"
+ "@csstools/css-parser-algorithms" "^2.3.2"
+ "@csstools/css-tokenizer" "^2.2.1"
+ "@csstools/media-query-list-parser" "^2.1.5"
"@csstools/postcss-media-queries-aspect-ratio-number-values@^2.0.2":
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-2.0.2.tgz#8cb8865ad6311756b5de5179fb65b9c008406b69"
- integrity sha512-kQJR6NvTRidsaRjCdHGjra2+fLoFiDQOm5B2aZrhmXqng/hweXjruboKzB326rxQO2L0m0T+gCKbZgyuncyhLg==
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-2.0.3.tgz#a74355c828a13ede8e8390bcf2701a34a60696b3"
+ integrity sha512-IPL8AvnwMYW+cWtp+j8cW3MFN0RyXNT4hLOvs6Rf2N+NcbvXhSyKxZuE3W9Cv4KjaNoNoGx1d0UhT6tktq6tUw==
dependencies:
- "@csstools/css-parser-algorithms" "^2.3.1"
- "@csstools/css-tokenizer" "^2.2.0"
- "@csstools/media-query-list-parser" "^2.1.4"
+ "@csstools/css-parser-algorithms" "^2.3.2"
+ "@csstools/css-tokenizer" "^2.2.1"
+ "@csstools/media-query-list-parser" "^2.1.5"
"@csstools/postcss-nested-calc@^3.0.0":
version "3.0.0"
@@ -1295,39 +1300,39 @@
dependencies:
postcss-value-parser "^4.2.0"
-"@csstools/postcss-normalize-display-values@^3.0.0":
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-3.0.0.tgz#de995eeafe217ac1854a7135b1db44c57487e9ea"
- integrity sha512-6Nw55PRXEKEVqn3bzA8gRRPYxr5tf5PssvcE5DRA/nAxKgKtgNZMCHCSd1uxTCWeyLnkf6h5tYRSB0P1Vh/K/A==
+"@csstools/postcss-normalize-display-values@^3.0.1":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-3.0.1.tgz#8bacd4fa20434de67a7b1f4f64f6e4476922a98d"
+ integrity sha512-nUvRxI+ALJwkxZdPU4EDyuM380vP91sAGvI3jAOHs/sr3jfcCOzLkY6xKI1Mr526kZ3RivmMoYM/xq+XFyE/bw==
dependencies:
postcss-value-parser "^4.2.0"
-"@csstools/postcss-oklab-function@^3.0.3":
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-3.0.3.tgz#1adc135c85bf4c5fbc2bc7383e0810346d3f23b2"
- integrity sha512-8Wdpmy8mvVyHsToJkrnNpwpAgqCPNpQMLNqkR62smbEuFcmRHEiDnb0OlkKjErzmiBMr7vjZAQ6e2lA9oVguQQ==
+"@csstools/postcss-oklab-function@^3.0.4":
+ version "3.0.5"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-3.0.5.tgz#8a299198a2c3b6698677b1b9b19cde4f85b95e0e"
+ integrity sha512-tFjYaBbAvoks5yvE9uA3b3xsqVKkZJ2sXwPMw1bxlv2ydrmdiojuoRAskRfvMbZQkzp47DzBP1V9GhDLOyFVYA==
dependencies:
- "@csstools/css-color-parser" "^1.3.1"
- "@csstools/css-parser-algorithms" "^2.3.1"
- "@csstools/css-tokenizer" "^2.2.0"
- "@csstools/postcss-progressive-custom-properties" "^3.0.0"
+ "@csstools/css-color-parser" "^1.3.2"
+ "@csstools/css-parser-algorithms" "^2.3.2"
+ "@csstools/css-tokenizer" "^2.2.1"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.1"
-"@csstools/postcss-progressive-custom-properties@^3.0.0":
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-3.0.0.tgz#bb86ae4bb7f2206b0cf6e9b8f0bfc191f67271d8"
- integrity sha512-2/D3CCL9DN2xhuUTP8OKvKnaqJ1j4yZUxuGLsCUOQ16wnDAuMLKLkflOmZF5tsPh/02VPeXRmqIN+U595WAulw==
+"@csstools/postcss-progressive-custom-properties@^3.0.1":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-3.0.1.tgz#15251d880d60850df42deeb7702aab6c50ab74e7"
+ integrity sha512-yfdEk8o3CWPTusoInmGpOVCcMg1FikcKZyYB5ApULg9mES4FTGNuHK3MESscmm64yladcLNkPlz26O7tk3LMbA==
dependencies:
postcss-value-parser "^4.2.0"
-"@csstools/postcss-relative-color-syntax@^2.0.3":
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-2.0.3.tgz#ecc48fae6af7f401d1ac8ae71782cc520663d295"
- integrity sha512-9MOzad5i0fnkOI6qXzcznuyGhLYARBkR8wDsyqbANkZ20srHJZ6PAy44g5eNw3+B7yvslUK4hx9ehnbbI9x4rw==
+"@csstools/postcss-relative-color-syntax@^2.0.4":
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-2.0.5.tgz#6ab9f87e6a748ac66e7e6adea179486222c685d5"
+ integrity sha512-wK8IX6X2+kLKxTTTq5yd7mH2U+GPcTMTpP2rM8ig0/rgxuid7vgTOxup6heZUk1IUA409eak3bYGOtDDYCpxbQ==
dependencies:
- "@csstools/css-color-parser" "^1.3.1"
- "@csstools/css-parser-algorithms" "^2.3.1"
- "@csstools/css-tokenizer" "^2.2.0"
- "@csstools/postcss-progressive-custom-properties" "^3.0.0"
+ "@csstools/css-color-parser" "^1.3.2"
+ "@csstools/css-parser-algorithms" "^2.3.2"
+ "@csstools/css-tokenizer" "^2.2.1"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.1"
"@csstools/postcss-scope-pseudo-class@^3.0.0":
version "3.0.0"
@@ -1337,30 +1342,30 @@
postcss-selector-parser "^6.0.13"
"@csstools/postcss-stepped-value-functions@^3.0.1":
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-3.0.1.tgz#c337a8ae09bec13cdf6c95f63a58b407f6965557"
- integrity sha512-y1sykToXorFE+5cjtp//xAMWEAEple0kcZn2QhzEFIZDDNvGOCp5JvvmmPGsC3eDlj6yQp70l9uXZNLnimEYfA==
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-3.0.2.tgz#a902395efbf9c5c30a6d902a7c65549fb3f49309"
+ integrity sha512-I3wX44MZVv+tDuWfrd3BTvRB/YRIM2F5v1MBtTI89sxpFn47mNpTwpPYUOGPVCgKlRDfZSlxIUYhUQmqRQZZFQ==
dependencies:
- "@csstools/css-calc" "^1.1.3"
- "@csstools/css-parser-algorithms" "^2.3.1"
- "@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/css-calc" "^1.1.4"
+ "@csstools/css-parser-algorithms" "^2.3.2"
+ "@csstools/css-tokenizer" "^2.2.1"
-"@csstools/postcss-text-decoration-shorthand@^3.0.2":
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-3.0.2.tgz#8c2e98bb0cf13e93af0613e04a19a9c68811b00a"
- integrity sha512-vO2onX7/TPU3LMrSvg+FhMxTujhU+LELP9zln7SiB5BJqZi+y/ZOJZRBHFvCfM9J1lnNkskMN96bP5g3yg7Jmw==
+"@csstools/postcss-text-decoration-shorthand@^3.0.3":
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-3.0.3.tgz#e0708cf41f94013837edca1c6db23d5d6dd3c10e"
+ integrity sha512-d5J9m49HhqXRcw1S6vTZuviHi/iknUKGjBpChiNK1ARg9sSa3b8m5lsWz5Izs8ISORZdv2bZRwbw5Z2R6gQ9kQ==
dependencies:
"@csstools/color-helpers" "^3.0.2"
postcss-value-parser "^4.2.0"
"@csstools/postcss-trigonometric-functions@^3.0.1":
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-3.0.1.tgz#06148aa8624b69a6573adb40ed27d3d019875caa"
- integrity sha512-hW+JPv0MPQfWC1KARgvJI6bisEUFAZWSvUNq/khGCupYV/h6Z9R2ZFz0Xc633LXBst0ezbXpy7NpnPurSx5Klw==
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-3.0.2.tgz#b03d045015fc6e16d81e36e5783c545b5590a2f2"
+ integrity sha512-AwzNhF4QOKaLOKvMljwwFkeYXwufhRO15G+kKohHkyoNOL75xWkN+W2Y9ik9tSeAyDv+cYNlYaF+o/a79WjVjg==
dependencies:
- "@csstools/css-calc" "^1.1.3"
- "@csstools/css-parser-algorithms" "^2.3.1"
- "@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/css-calc" "^1.1.4"
+ "@csstools/css-parser-algorithms" "^2.3.2"
+ "@csstools/css-tokenizer" "^2.2.1"
"@csstools/postcss-unset-value@^3.0.0":
version "3.0.0"
@@ -1638,10 +1643,10 @@
minimatch "^3.1.2"
strip-json-comments "^3.1.1"
-"@eslint/[email protected]":
- version "8.49.0"
- resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.49.0.tgz#86f79756004a97fa4df866835093f1df3d03c333"
- integrity sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==
+"@eslint/[email protected]":
+ version "8.50.0"
+ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.50.0.tgz#9e93b850f0f3fa35f5fa59adfd03adae8488e484"
+ integrity sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==
"@firebase/[email protected]":
version "0.2.6"
@@ -2029,9 +2034,9 @@
"@types/node" ">=12.12.47"
"@grpc/proto-loader@^0.7.8":
- version "0.7.9"
- resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.9.tgz#3ca68236f1a0d77566dafa53c715eb31d096279a"
- integrity sha512-YJsOehVXzgurc+lLAxYnlSMc1p/Gu6VAvnfx0ATi2nzvr0YZcjhmZDeY8SeAKv1M7zE3aEJH0Xo9mK1iZ8GYoQ==
+ version "0.7.10"
+ resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.10.tgz#6bf26742b1b54d0a473067743da5d3189d06d720"
+ integrity sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==
dependencies:
lodash.camelcase "^4.3.0"
long "^5.0.0"
@@ -2238,29 +2243,6 @@
mkdirp "^1.0.4"
rimraf "^3.0.2"
- version "2.17.2-28247058.53dfec7"
- resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app-edge/-/babel-preset-app-edge-2.17.2-28247058.53dfec7.tgz#ac4b32b077827ae4208c7e5ae139abc21c7f02a1"
- integrity sha512-hnG/f0YOXf18PcnjjhhGvJQS2BVELPHkRBftxAKpXJnEdXzSsvyyjS4awsIYXb7U9rWRKVW3bWt0TeiKoLyIGg==
- dependencies:
- "@babel/compat-data" "^7.22.9"
- "@babel/core" "^7.22.11"
- "@babel/helper-compilation-targets" "^7.22.10"
- "@babel/helper-module-imports" "^7.22.5"
- "@babel/plugin-proposal-class-properties" "^7.18.6"
- "@babel/plugin-proposal-decorators" "^7.22.10"
- "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
- "@babel/plugin-proposal-optional-chaining" "^7.21.0"
- "@babel/plugin-proposal-private-methods" "^7.18.6"
- "@babel/plugin-proposal-private-property-in-object" "^7.21.11"
- "@babel/plugin-transform-runtime" "^7.22.10"
- "@babel/preset-env" "^7.22.10"
- "@babel/runtime" "^7.22.11"
- "@vue/babel-preset-jsx" "^1.4.0"
- core-js "^3.32.1"
- core-js-compat "^3.32.1"
- regenerator-runtime "^0.14.0"
-
version "2.17.1"
resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.17.1.tgz#481ac0f47c873c89c16d6de4e72d0319f1654326"
@@ -2363,27 +2345,6 @@
vite-node "^0.34.4"
vue-bundle-renderer "^2.0.0"
- version "2.17.2-28247058.53dfec7"
- resolved "https://registry.yarnpkg.com/@nuxt/builder-edge/-/builder-edge-2.17.2-28247058.53dfec7.tgz#348515350a4e488f587cf501b323e0437477a065"
- integrity sha512-WeR3N4RVs2RLQyguJ64B0VgGsaEQtv9dHXOpAqAhcltVET7WHEVTq18Vhd9/rNQwtCxMpNtmaDCbhPxQD3iKcQ==
- dependencies:
- "@nuxt/devalue" "^2.0.2"
- "@nuxt/utils-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/vue-app-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/webpack-edge" "2.17.2-28247058.53dfec7"
- chalk "^4.1.2"
- chokidar "^3.5.3"
- consola "^3.2.3"
- fs-extra "^10.1.0"
- glob "^8.1.0"
- hash-sum "^2.0.0"
- ignore "^5.2.4"
- lodash "^4.17.21"
- pify "^5.0.0"
- serialize-javascript "^6.0.1"
- upath "^2.0.1"
-
version "2.17.1"
resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.17.1.tgz#c42dcf07697cd83a499260dd3978f15331141320"
@@ -2405,36 +2366,6 @@
serialize-javascript "^6.0.1"
upath "^2.0.1"
- version "2.17.2-28247058.53dfec7"
- resolved "https://registry.yarnpkg.com/@nuxt/cli-edge/-/cli-edge-2.17.2-28247058.53dfec7.tgz#49ebb4e997da733ae5369f266def0361a14419ad"
- integrity sha512-8a8SWyD/xWKq+8LD6mRFKEsI9DvPhun5vXW22JoGB3J2nNY4c6G46oJ3H+l737mJZuroPoT7XGM/oycGFAPlqg==
- dependencies:
- "@nuxt/config-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/utils-edge" "2.17.2-28247058.53dfec7"
- boxen "^5.1.2"
- chalk "^4.1.2"
- compression "^1.7.4"
- connect "^3.7.0"
- consola "^3.2.3"
- crc "^4.3.2"
- defu "^6.1.2"
- destr "^2.0.1"
- execa "^5.1.1"
- exit "^0.1.2"
- fs-extra "^10.1.0"
- globby "^11.0.4"
- hable "^3.0.0"
- lodash "^4.17.21"
- minimist "^1.2.8"
- opener "1.5.2"
- pretty-bytes "^5.6.0"
- semver "^7.5.4"
- serve-static "^1.15.0"
- std-env "^3.4.3"
- upath "^2.0.1"
- wrap-ansi "^7.0.0"
-
version "2.17.1"
resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.17.1.tgz#0ccdaa277981ce32833f445c6a6846bcf3d80470"
@@ -2479,21 +2410,6 @@
upath "^2.0.1"
vue-template-compiler "^2.6.14"
- version "2.17.2-28247058.53dfec7"
- resolved "https://registry.yarnpkg.com/@nuxt/config-edge/-/config-edge-2.17.2-28247058.53dfec7.tgz#81daf34f96b250f6498ecc81c90061e254b409de"
- integrity sha512-pcImBIqmiJmY/EntzsQPJilEIaHU+gZraHMPTbLZR8fxn0osCV17VsS3zZKTHJ6kIzBGj5tuZwPtJcJ9Al4doA==
- dependencies:
- "@nuxt/utils-edge" "2.17.2-28247058.53dfec7"
- consola "^3.2.3"
- defu "^6.1.2"
- destr "^2.0.1"
- dotenv "^16.3.1"
- lodash "^4.17.21"
- rc9 "^2.1.1"
- std-env "^3.4.3"
- ufo "^1.3.0"
-
version "2.17.1"
resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.17.1.tgz#f44d73a535394eea756bd291187bbd7b799886e1"
@@ -2509,20 +2425,6 @@
std-env "^3.3.3"
ufo "^1.1.2"
- version "2.17.2-28247058.53dfec7"
- resolved "https://registry.yarnpkg.com/@nuxt/core-edge/-/core-edge-2.17.2-28247058.53dfec7.tgz#20b2cb2c74cb8996caf0d0c3e429a9e972fdd1d0"
- integrity sha512-QNvf/N1T9Vkp3OpEoj4LRZJjVDUfPLziFzKen/pXaazR67gpITZ4hJ8/LaRp80gTwN8tAk6Jmf6g4e3sHpGMQw==
- dependencies:
- "@nuxt/config-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/server-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/utils-edge" "2.17.2-28247058.53dfec7"
- consola "^3.2.3"
- fs-extra "^10.1.0"
- hable "^3.0.0"
- hash-sum "^2.0.0"
- lodash "^4.17.21"
-
version "2.17.1"
resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.17.1.tgz#061e79995033fc8554b68c1dc319353e31b61a9f"
@@ -2552,21 +2454,6 @@
error-stack-parser "^2.0.0"
string-width "^4.2.3"
- version "2.17.2-28247058.53dfec7"
- resolved "https://registry.yarnpkg.com/@nuxt/generator-edge/-/generator-edge-2.17.2-28247058.53dfec7.tgz#0b8f601acfc624d6c098bc5c3cc6dfd9cd80c2ed"
- integrity sha512-iILqLF0jeVtzAzWOI6I0HI2x9Nr9MTF6CFeD8aU9UJ1i+XImHQ6k4/2q2EjbuR4ibgUG0Vveb/YdeL1gKlxzMg==
- dependencies:
- "@nuxt/utils-edge" "2.17.2-28247058.53dfec7"
- chalk "^4.1.2"
- consola "^3.2.3"
- defu "^6.1.2"
- devalue "^2.0.1"
- fs-extra "^10.1.0"
- html-minifier "^4.0.0"
- node-html-parser "^6.1.6"
- ufo "^1.3.0"
-
version "2.17.1"
resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.17.1.tgz#a74e7e5b438c6bd67c708154e28df4e42a473509"
@@ -2656,29 +2543,6 @@
unimport "^3.3.0"
untyped "^1.4.0"
- version "2.17.2-28247058.53dfec7"
- resolved "https://registry.yarnpkg.com/@nuxt/server-edge/-/server-edge-2.17.2-28247058.53dfec7.tgz#7e9dd428f2f2c90cbd42d0d044bc6138d37ddb49"
- integrity sha512-YfLrChxFbhnkhXsTb+wrA1ybB73/GydBvlruFpuGQuAiYtyhZL9jgEvfOfl/JXmwlU2bQeMv2XFyxh6W3uN6Mw==
- dependencies:
- "@nuxt/utils-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/vue-renderer-edge" "2.17.2-28247058.53dfec7"
- "@nuxtjs/youch" "^4.2.3"
- compression "^1.7.4"
- connect "^3.7.0"
- consola "^3.2.3"
- etag "^1.8.1"
- fresh "^0.5.2"
- fs-extra "^10.1.0"
- ip "^1.1.8"
- launch-editor-middleware "^2.6.0"
- on-headers "^1.0.2"
- pify "^5.0.0"
- serve-placeholder "^2.0.1"
- serve-static "^1.15.0"
- server-destroy "^1.0.1"
- ufo "^1.3.0"
-
version "2.17.1"
resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.17.1.tgz#7451ce85249f66e56a86df9c9bc15f3642aa69b6"
@@ -2730,24 +2594,6 @@
resolved "https://registry.yarnpkg.com/@nuxt/ui-templates/-/ui-templates-1.3.1.tgz#35f5c1adced7495a8c1284e37246a16e373ef5d5"
integrity sha512-5gc02Pu1HycOVUWJ8aYsWeeXcSTPe8iX8+KIrhyEtEoOSkY0eMBuo0ssljB8wALuEmepv31DlYe5gpiRwkjESA==
- version "2.17.2-28247058.53dfec7"
- resolved "https://registry.yarnpkg.com/@nuxt/utils-edge/-/utils-edge-2.17.2-28247058.53dfec7.tgz#b3bfe613262fe3c85327889033ee0b1b0cc7c3d8"
- integrity sha512-9l7+FGAoWYFHXHe/Z8CClzIhf3nFZGsUk1yQMnFkQEmvuRjN0OBn3jOwall6d8TbjbYSQ9CZNNvWsA9Pvpqk2g==
- dependencies:
- consola "^3.2.3"
- create-require "^1.1.1"
- fs-extra "^10.1.0"
- hash-sum "^2.0.0"
- jiti "^1.19.3"
- lodash "^4.17.21"
- proper-lockfile "^4.1.2"
- semver "^7.5.4"
- serialize-javascript "^6.0.1"
- signal-exit "^4.1.0"
- ua-parser-js "^1.0.35"
- ufo "^1.3.0"
-
version "2.17.1"
resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.17.1.tgz#648e354f4f2a35fd77f3cdb11676382d94a5d4ae"
@@ -2766,22 +2612,6 @@
ua-parser-js "^1.0.35"
ufo "^1.1.2"
- version "2.17.2-28247058.53dfec7"
- resolved "https://registry.yarnpkg.com/@nuxt/vue-app-edge/-/vue-app-edge-2.17.2-28247058.53dfec7.tgz#615587c949584e107b4a3dc0c6fdb586c4732d5f"
- integrity sha512-kczKJomQ1ZjnQhGs8YyC++oP5fwS4Y0jUJyayjlvAAGaa/tEvWNfrQjZfhdbJ900lMBbq5I83BEli0hgZF1/bA==
- dependencies:
- node-fetch-native "^1.4.0"
- ufo "^1.3.0"
- unfetch "^5.0.0"
- vue "^2.7.10"
- vue-client-only "^2.1.0"
- vue-meta "^2.4.0"
- vue-no-ssr "^1.1.1"
- vue-router "^3.6.5"
- vue-template-compiler "^2.7.14"
- vuex "^3.6.2"
-
version "2.17.1"
resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.17.1.tgz#3f78d017c91330d126cc6d2ef94854fa4bada7a3"
@@ -2798,23 +2628,6 @@
vue-template-compiler "^2.7.14"
vuex "^3.6.2"
- version "2.17.2-28247058.53dfec7"
- resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer-edge/-/vue-renderer-edge-2.17.2-28247058.53dfec7.tgz#32ab78b002703b9a3e80329100978ae9c46a7487"
- integrity sha512-+pPPATeEOEZt1bCW/VZYprjzKV+AqzuOLmZgk0EO3M8scqYDk1YIR4YSs7Gnu2yqKbs7w/C5MbW5V0P1rQlq5A==
- dependencies:
- "@nuxt/devalue" "^2.0.2"
- "@nuxt/utils-edge" "2.17.2-28247058.53dfec7"
- consola "^3.2.3"
- defu "^6.1.2"
- fs-extra "^10.1.0"
- lodash "^4.17.21"
- lru-cache "^5.1.1"
- ufo "^1.3.0"
- vue "^2.7.10"
- vue-meta "^2.4.0"
- vue-server-renderer "^2.7.14"
-
version "2.17.1"
resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.17.1.tgz#6d8e3321b755afa85707d330b0a3c55d5bb07ae1"
@@ -2832,59 +2645,6 @@
vue-meta "^2.4.0"
vue-server-renderer "^2.7.14"
- version "2.17.2-28247058.53dfec7"
- resolved "https://registry.yarnpkg.com/@nuxt/webpack-edge/-/webpack-edge-2.17.2-28247058.53dfec7.tgz#4e10e930140bbc45a5090d74511a303af23e032f"
- integrity sha512-M2vYH5hXUiGEdpt5f7C8dgSZANJmcMF+Tc5gjwa3JH/SmFB8GlWlpaO9+XK9U9TztciI6rqVv86wFFfdmqXyHQ==
- dependencies:
- "@babel/core" "^7.22.11"
- "@nuxt/babel-preset-app-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/friendly-errors-webpack-plugin" "^2.5.2"
- "@nuxt/utils-edge" "2.17.2-28247058.53dfec7"
- babel-loader "^8.3.0"
- cache-loader "^4.1.0"
- caniuse-lite "^1.0.30001523"
- consola "^3.2.3"
- css-loader "^5.2.7"
- cssnano "^6.0.1"
- eventsource-polyfill "^0.9.6"
- extract-css-chunks-webpack-plugin "^4.9.0"
- file-loader "^6.2.0"
- glob "^8.1.0"
- hard-source-webpack-plugin "^0.13.1"
- hash-sum "^2.0.0"
- html-webpack-plugin "^4.5.1"
- lodash "^4.17.21"
- memory-fs "^0.5.0"
- optimize-css-assets-webpack-plugin "^6.0.1"
- pify "^5.0.0"
- pnp-webpack-plugin "^1.7.0"
- postcss "^8.4.28"
- postcss-import "^15.1.0"
- postcss-import-resolver "^2.0.0"
- postcss-loader "^4.3.0"
- postcss-preset-env "^9.1.1"
- postcss-url "^10.1.3"
- semver "^7.5.4"
- std-env "^3.4.3"
- style-resources-loader "^1.5.0"
- terser-webpack-plugin "^4.2.3"
- thread-loader "^3.0.4"
- time-fix-plugin "^2.0.7"
- ufo "^1.3.0"
- upath "^2.0.1"
- url-loader "^4.1.1"
- vue-loader "^15.10.2"
- vue-style-loader "^4.1.3"
- vue-template-compiler "^2.7.14"
- watchpack "^2.4.0"
- webpack "^4.46.0"
- webpack-bundle-analyzer "^4.9.0"
- webpack-dev-middleware "^5.0.0"
- webpack-hot-middleware "^2.25.4"
- webpack-node-externals "^3.0.0"
- webpackbar "^5.0.2"
-
version "2.17.1"
resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.17.1.tgz#147df3fdd10f7041abbd63b63f2bcaec505e5352"
@@ -3338,17 +3098,17 @@
integrity sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==
"@types/eslint@^8.37.0", "@types/eslint@^8.4.5":
- version "8.44.2"
- resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.2.tgz#0d21c505f98a89b8dd4d37fa162b09da6089199a"
- integrity sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==
+ version "8.44.3"
+ resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.3.tgz#96614fae4875ea6328f56de38666f582d911d962"
+ integrity sha512-iM/WfkwAhwmPff3wZuPLYiHX18HI24jU8k1ZSH7P8FHwxTjZ2P6CoX2wnF43oprR+YXJM6UUxATkNvyv/JHd+g==
dependencies:
"@types/estree" "*"
"@types/json-schema" "*"
"@types/estree@*", "@types/estree@^1.0.0":
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
- integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.2.tgz#ff02bc3dc8317cd668dfec247b750ba1f1d62453"
+ integrity sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==
"@types/html-minifier-terser@^5.0.0":
version "5.1.2"
@@ -3399,14 +3159,14 @@
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0":
- version "20.6.2"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-20.6.2.tgz#a065925409f59657022e9063275cd0b9bd7e1b12"
- integrity sha512-Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw==
+ version "20.6.5"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.6.5.tgz#4c6a79adf59a8e8193ac87a0e522605b16587258"
+ integrity sha512-2qGq5LAOTh9izcc0+F+dToFigBWiK1phKPt7rNhOqJSr35y8rlIBjDwGtFSgAI6MGIhjwOVNSQZVdJsZJ2uR1w==
"@types/normalize-package-data@^2.4.0":
- version "2.4.1"
- resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
- integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.2.tgz#9b0e3e8533fe5024ad32d6637eb9589988b6fdca"
+ integrity sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A==
"@types/parse-json@^4.0.0":
version "4.0.0"
@@ -3477,27 +3237,27 @@
source-map "^0.6.0"
"@types/yargs-parser@*":
- version "21.0.0"
- resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
- integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
+ version "21.0.1"
+ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.1.tgz#07773d7160494d56aa882d7531aac7319ea67c3b"
+ integrity sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ==
"@types/yargs@^17.0.8":
- version "17.0.24"
- resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902"
- integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==
+ version "17.0.25"
+ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.25.tgz#3edd102803c97356fb4c805b2bbaf7dfc9ab6abc"
+ integrity sha512-gy7iPgwnzNvxgAEi2bXOHWCVOG6f7xsprVJH4MjlAWeBmJ7vh/Y1kwMtUrs64ztf24zVIRCpr3n/z6gm9QIkgg==
dependencies:
"@types/yargs-parser" "*"
"@typescript-eslint/eslint-plugin@^6.5.0", "@typescript-eslint/eslint-plugin@^6.7.0":
- version "6.7.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.0.tgz#ed2a38867190f8a688af85ad7c8a74670b8b3675"
- integrity sha512-gUqtknHm0TDs1LhY12K2NA3Rmlmp88jK9Tx8vGZMfHeNMLE3GH2e9TRub+y+SOjuYgtOmok+wt1AyDPZqxbNag==
+ version "6.7.2"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.2.tgz#f18cc75c9cceac8080a9dc2e7d166008c5207b9f"
+ integrity sha512-ooaHxlmSgZTM6CHYAFRlifqh1OAr3PAQEwi7lhYhaegbnXrnh7CDcHmc3+ihhbQC7H0i4JF0psI5ehzkF6Yl6Q==
dependencies:
"@eslint-community/regexpp" "^4.5.1"
- "@typescript-eslint/scope-manager" "6.7.0"
- "@typescript-eslint/type-utils" "6.7.0"
- "@typescript-eslint/utils" "6.7.0"
- "@typescript-eslint/visitor-keys" "6.7.0"
+ "@typescript-eslint/scope-manager" "6.7.2"
+ "@typescript-eslint/type-utils" "6.7.2"
+ "@typescript-eslint/utils" "6.7.2"
+ "@typescript-eslint/visitor-keys" "6.7.2"
debug "^4.3.4"
graphemer "^1.4.0"
ignore "^5.2.4"
@@ -3506,14 +3266,14 @@
ts-api-utils "^1.0.1"
"@typescript-eslint/parser@^6.5.0", "@typescript-eslint/parser@^6.7.0":
- version "6.7.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.7.0.tgz#332fe9c7ecf6783d3250b4c8a960bd4af0995807"
- integrity sha512-jZKYwqNpNm5kzPVP5z1JXAuxjtl2uG+5NpaMocFPTNC2EdYIgbXIPImObOkhbONxtFTTdoZstLZefbaK+wXZng==
- dependencies:
- "@typescript-eslint/scope-manager" "6.7.0"
- "@typescript-eslint/types" "6.7.0"
- "@typescript-eslint/typescript-estree" "6.7.0"
- "@typescript-eslint/visitor-keys" "6.7.0"
+ version "6.7.2"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.7.2.tgz#e0ae93771441b9518e67d0660c79e3a105497af4"
+ integrity sha512-KA3E4ox0ws+SPyxQf9iSI25R6b4Ne78ORhNHeVKrPQnoYsb9UhieoiRoJgrzgEeKGOXhcY1i8YtOeCHHTDa6Fw==
+ dependencies:
+ "@typescript-eslint/scope-manager" "6.7.2"
+ "@typescript-eslint/types" "6.7.2"
+ "@typescript-eslint/typescript-estree" "6.7.2"
+ "@typescript-eslint/visitor-keys" "6.7.2"
debug "^4.3.4"
"@typescript-eslint/[email protected]":
@@ -3524,21 +3284,21 @@
"@typescript-eslint/types" "5.62.0"
"@typescript-eslint/visitor-keys" "5.62.0"
-"@typescript-eslint/[email protected]":
- version "6.7.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.0.tgz#6b3c22187976e2bf5ed0dc0d9095f1f2cbd1d106"
- integrity sha512-lAT1Uau20lQyjoLUQ5FUMSX/dS07qux9rYd5FGzKz/Kf8W8ccuvMyldb8hadHdK/qOI7aikvQWqulnEq2nCEYA==
+"@typescript-eslint/[email protected]":
+ version "6.7.2"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.2.tgz#cf59a2095d2f894770c94be489648ad1c78dc689"
+ integrity sha512-bgi6plgyZjEqapr7u2mhxGR6E8WCzKNUFWNh6fkpVe9+yzRZeYtDTbsIBzKbcxI+r1qVWt6VIoMSNZ4r2A+6Yw==
dependencies:
- "@typescript-eslint/types" "6.7.0"
- "@typescript-eslint/visitor-keys" "6.7.0"
+ "@typescript-eslint/types" "6.7.2"
+ "@typescript-eslint/visitor-keys" "6.7.2"
-"@typescript-eslint/[email protected]":
- version "6.7.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.7.0.tgz#21a013d4c7f96255f5e64ac59fb41301d1e052ba"
- integrity sha512-f/QabJgDAlpSz3qduCyQT0Fw7hHpmhOzY/Rv6zO3yO+HVIdPfIWhrQoAyG+uZVtWAIS85zAyzgAFfyEr+MgBpg==
+"@typescript-eslint/[email protected]":
+ version "6.7.2"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.7.2.tgz#ed921c9db87d72fa2939fee242d700561454f367"
+ integrity sha512-36F4fOYIROYRl0qj95dYKx6kybddLtsbmPIYNK0OBeXv2j9L5nZ17j9jmfy+bIDHKQgn2EZX+cofsqi8NPATBQ==
dependencies:
- "@typescript-eslint/typescript-estree" "6.7.0"
- "@typescript-eslint/utils" "6.7.0"
+ "@typescript-eslint/typescript-estree" "6.7.2"
+ "@typescript-eslint/utils" "6.7.2"
debug "^4.3.4"
ts-api-utils "^1.0.1"
@@ -3547,10 +3307,10 @@
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
-"@typescript-eslint/[email protected]":
- version "6.7.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.0.tgz#8de8ba9cafadc38e89003fe303e219c9250089ae"
- integrity sha512-ihPfvOp7pOcN/ysoj0RpBPOx3HQTJTrIN8UZK+WFd3/iDeFHHqeyYxa4hQk4rMhsz9H9mXpR61IzwlBVGXtl9Q==
+"@typescript-eslint/[email protected]":
+ version "6.7.2"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.2.tgz#75a615a6dbeca09cafd102fe7f465da1d8a3c066"
+ integrity sha512-flJYwMYgnUNDAN9/GAI3l8+wTmvTYdv64fcH8aoJK76Y+1FCZ08RtI5zDerM/FYT5DMkAc+19E4aLmd5KqdFyg==
"@typescript-eslint/[email protected]":
version "5.62.0"
@@ -3565,30 +3325,30 @@
semver "^7.3.7"
tsutils "^3.21.0"
-"@typescript-eslint/[email protected]":
- version "6.7.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.0.tgz#20ce2801733bd46f02cc0f141f5b63fbbf2afb63"
- integrity sha512-dPvkXj3n6e9yd/0LfojNU8VMUGHWiLuBZvbM6V6QYD+2qxqInE7J+J/ieY2iGwR9ivf/R/haWGkIj04WVUeiSQ==
+"@typescript-eslint/[email protected]":
+ version "6.7.2"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.2.tgz#ce5883c23b581a5caf878af641e49dd0349238c7"
+ integrity sha512-kiJKVMLkoSciGyFU0TOY0fRxnp9qq1AzVOHNeN1+B9erKFCJ4Z8WdjAkKQPP+b1pWStGFqezMLltxO+308dJTQ==
dependencies:
- "@typescript-eslint/types" "6.7.0"
- "@typescript-eslint/visitor-keys" "6.7.0"
+ "@typescript-eslint/types" "6.7.2"
+ "@typescript-eslint/visitor-keys" "6.7.2"
debug "^4.3.4"
globby "^11.1.0"
is-glob "^4.0.3"
semver "^7.5.4"
ts-api-utils "^1.0.1"
-"@typescript-eslint/[email protected]", "@typescript-eslint/utils@^6.7.0":
- version "6.7.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.7.0.tgz#61b6f1f1b82ad529abfcee074d21764e880886fb"
- integrity sha512-MfCq3cM0vh2slSikQYqK2Gq52gvOhe57vD2RM3V4gQRZYX4rDPnKLu5p6cm89+LJiGlwEXU8hkYxhqqEC/V3qA==
+"@typescript-eslint/[email protected]", "@typescript-eslint/utils@^6.7.0":
+ version "6.7.2"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.7.2.tgz#b9ef0da6f04932167a9222cb4ac59cb187165ebf"
+ integrity sha512-ZCcBJug/TS6fXRTsoTkgnsvyWSiXwMNiPzBUani7hDidBdj1779qwM1FIAmpH4lvlOZNF3EScsxxuGifjpLSWQ==
dependencies:
"@eslint-community/eslint-utils" "^4.4.0"
"@types/json-schema" "^7.0.12"
"@types/semver" "^7.5.0"
- "@typescript-eslint/scope-manager" "6.7.0"
- "@typescript-eslint/types" "6.7.0"
- "@typescript-eslint/typescript-estree" "6.7.0"
+ "@typescript-eslint/scope-manager" "6.7.2"
+ "@typescript-eslint/types" "6.7.2"
+ "@typescript-eslint/typescript-estree" "6.7.2"
semver "^7.5.4"
"@typescript-eslint/utils@^5.10.0":
@@ -3613,12 +3373,12 @@
"@typescript-eslint/types" "5.62.0"
eslint-visitor-keys "^3.3.0"
-"@typescript-eslint/[email protected]":
- version "6.7.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.0.tgz#34140ac76dfb6316d17012e4469acf3366ad3f44"
- integrity sha512-/C1RVgKFDmGMcVGeD8HjKv2bd72oI1KxQDeY8uc66gw9R0OK0eMq48cA+jv9/2Ag6cdrsUGySm1yzYmfz0hxwQ==
+"@typescript-eslint/[email protected]":
+ version "6.7.2"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.2.tgz#4cb2bd786f1f459731b0ad1584c9f73e1c7a4d5c"
+ integrity sha512-uVw9VIMFBUTz8rIeaUT3fFe8xIUx8r4ywAdlQv1ifH+6acn/XF8Y6rwJ7XNmkNMDrTW+7+vxFFPIF40nJCVsMQ==
dependencies:
- "@typescript-eslint/types" "6.7.0"
+ "@typescript-eslint/types" "6.7.2"
eslint-visitor-keys "^3.4.1"
"@unhead/[email protected]":
@@ -3697,44 +3457,44 @@
resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue2/-/plugin-vue2-2.2.0.tgz#7453207197d6ac2b7023cedc7133b142c604c356"
integrity sha512-1km7zEuZ/9QRPvzXSjikbTYGQPG86Mq1baktpC4sXqsXlb02HQKfi+fl8qVS703JM7cgm24Ga9j+RwKmvFn90A==
-"@vitest/[email protected]":
- version "0.34.4"
- resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.34.4.tgz#f857a83268b9e9d4e9410fe168cb206033838102"
- integrity sha512-XlMKX8HyYUqB8dsY8Xxrc64J2Qs9pKMt2Z8vFTL4mBWXJsg4yoALHzJfDWi8h5nkO4Zua4zjqtapQ/IluVkSnA==
+"@vitest/[email protected]":
+ version "0.34.5"
+ resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.34.5.tgz#1f58829e746311162220d6580f72d6329efb9081"
+ integrity sha512-/3RBIV9XEH+nRpRMqDJBufKIOQaYUH2X6bt0rKSCW0MfKhXFLYsR5ivHifeajRSTsln0FwJbitxLKHSQz/Xwkw==
dependencies:
- "@vitest/spy" "0.34.4"
- "@vitest/utils" "0.34.4"
+ "@vitest/spy" "0.34.5"
+ "@vitest/utils" "0.34.5"
chai "^4.3.7"
-"@vitest/[email protected]":
- version "0.34.4"
- resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.34.4.tgz#07543915ad22c53d99fb4bb758cb9bd5db3d7f80"
- integrity sha512-hwwdB1StERqUls8oV8YcpmTIpVeJMe4WgYuDongVzixl5hlYLT2G8afhcdADeDeqCaAmZcSgLTLtqkjPQF7x+w==
+"@vitest/[email protected]":
+ version "0.34.5"
+ resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.34.5.tgz#2bc69a21cd1a09c9403a2a9b0cbd7c42df79f1ae"
+ integrity sha512-RDEE3ViVvl7jFSCbnBRyYuu23XxmvRTSZWW6W4M7eC5dOsK75d5LIf6uhE5Fqf809DQ1+9ICZZNxhIolWHU4og==
dependencies:
- "@vitest/utils" "0.34.4"
+ "@vitest/utils" "0.34.5"
p-limit "^4.0.0"
pathe "^1.1.1"
-"@vitest/[email protected]":
- version "0.34.4"
- resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-0.34.4.tgz#ee2c732e5978438f96c669aabb9eb66eb7f3ff46"
- integrity sha512-GCsh4coc3YUSL/o+BPUo7lHQbzpdttTxL6f4q0jRx2qVGoYz/cyTRDJHbnwks6TILi6560bVWoBpYC10PuTLHw==
+"@vitest/[email protected]":
+ version "0.34.5"
+ resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-0.34.5.tgz#1d81fce3cdc9cf6ad57e86eb5e5eecefc71d1e02"
+ integrity sha512-+ikwSbhu6z2yOdtKmk/aeoDZ9QPm2g/ZO5rXT58RR9Vmu/kB2MamyDSx77dctqdZfP3Diqv4mbc/yw2kPT8rmA==
dependencies:
magic-string "^0.30.1"
pathe "^1.1.1"
pretty-format "^29.5.0"
-"@vitest/[email protected]":
- version "0.34.4"
- resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.34.4.tgz#181ad9f32ce426ac33eb66ed35b880ee9b457035"
- integrity sha512-PNU+fd7DUPgA3Ya924b1qKuQkonAW6hL7YUjkON3wmBwSTIlhOSpy04SJ0NrRsEbrXgMMj6Morh04BMf8k+w0g==
+"@vitest/[email protected]":
+ version "0.34.5"
+ resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.34.5.tgz#2d32993b18eeb50f682e5dde089e390cbb387cb8"
+ integrity sha512-epsicsfhvBjRjCMOC/3k00mP/TBGQy8/P0DxOFiWyLt55gnZ99dqCfCiAsKO17BWVjn4eZRIjKvcqNmSz8gvmg==
dependencies:
tinyspy "^2.1.1"
-"@vitest/[email protected]":
- version "0.34.4"
- resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-0.34.4.tgz#0b6bf5fe07223ebb6ec24cd1edc0137cb301ecfd"
- integrity sha512-yR2+5CHhp/K4ySY0Qtd+CAL9f5Yh1aXrKfAT42bq6CtlGPh92jIDDDSg7ydlRow1CP+dys4TrOrbELOyNInHSg==
+"@vitest/[email protected]":
+ version "0.34.5"
+ resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-0.34.5.tgz#2178fdbc36524d25b8d846b3d408962e1771e83a"
+ integrity sha512-ur6CmmYQoeHMwmGb0v+qwkwN3yopZuZyf4xt1DBBSGBed8Hf9Gmbm/5dEWqgpLPdRx6Av6jcWXrjcKfkTzg/pw==
dependencies:
diff-sequences "^29.4.3"
loupe "^2.3.6"
@@ -4636,14 +4396,14 @@ atob@^2.1.2:
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-autoprefixer@^10.2.5, autoprefixer@^10.4.14, autoprefixer@^10.4.15:
- version "10.4.15"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.15.tgz#a1230f4aeb3636b89120b34a1f513e2f6834d530"
- integrity sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==
+autoprefixer@^10.2.5, autoprefixer@^10.4.14, autoprefixer@^10.4.15, autoprefixer@^10.4.16:
+ version "10.4.16"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.16.tgz#fad1411024d8670880bdece3970aa72e3572feb8"
+ integrity sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==
dependencies:
browserslist "^4.21.10"
- caniuse-lite "^1.0.30001520"
- fraction.js "^4.2.0"
+ caniuse-lite "^1.0.30001538"
+ fraction.js "^4.3.6"
normalize-range "^0.1.2"
picocolors "^1.0.0"
postcss-value-parser "^4.2.0"
@@ -4687,12 +4447,12 @@ babel-plugin-polyfill-corejs2@^0.4.5:
semver "^6.3.1"
babel-plugin-polyfill-corejs3@^0.8.3:
- version "0.8.3"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz#b4f719d0ad9bb8e0c23e3e630c0c8ec6dd7a1c52"
- integrity sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==
+ version "0.8.4"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.4.tgz#1fac2b1dcef6274e72b3c72977ed8325cb330591"
+ integrity sha512-9l//BZZsPR+5XjyJMPtZSK4jv0BsTO1zDac2GC6ygx9WLGlcsnRd1Co0B2zT5fF5Ic6BZy+9m3HNZ3QcOeDKfg==
dependencies:
"@babel/helper-define-polyfill-provider" "^0.4.2"
- core-js-compat "^3.31.0"
+ core-js-compat "^3.32.2"
babel-plugin-polyfill-regenerator@^0.5.2:
version "0.5.2"
@@ -4912,14 +4672,14 @@ browserify-zlib@^0.2.0:
pako "~1.0.5"
browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9:
- version "4.21.10"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
- integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
+ version "4.21.11"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.11.tgz#35f74a3e51adc4d193dcd76ea13858de7b8fecb8"
+ integrity sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ==
dependencies:
- caniuse-lite "^1.0.30001517"
- electron-to-chromium "^1.4.477"
+ caniuse-lite "^1.0.30001538"
+ electron-to-chromium "^1.4.526"
node-releases "^2.0.13"
- update-browserslist-db "^1.0.11"
+ update-browserslist-db "^1.0.13"
buffer-crc32@^0.2.1:
version "0.2.13"
@@ -5172,10 +4932,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001515, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001520, caniuse-lite@^1.0.30001523:
- version "1.0.30001534"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001534.tgz#f24a9b2a6d39630bac5c132b5dff89b39a12e7dd"
- integrity sha512-vlPVrhsCS7XaSh2VvWluIQEzVhefrUQcEsQWSS5A5V+dM07uv1qHeQzAOTGIMy9i3e9bH15+muvI/UHojVgS/Q==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001515, caniuse-lite@^1.0.30001538:
+ version "1.0.30001539"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001539.tgz#325a387ab1ed236df2c12dc6cd43a4fff9903a44"
+ integrity sha512-hfS5tE8bnNiNvEOEkm8HElUHroYwlqMMENEzELymy77+tJ6m+gA2krtHl5hxJaj71OlpC2cHZbdSMX1/YEqEkA==
chai@^4.3.7:
version "4.3.8"
@@ -5729,14 +5489,14 @@ copy-props@^2.0.1:
each-props "^1.3.2"
is-plain-object "^5.0.0"
-core-js-compat@^3.31.0, core-js-compat@^3.31.1, core-js-compat@^3.32.1:
+core-js-compat@^3.31.0, core-js-compat@^3.31.1, core-js-compat@^3.32.2:
version "3.32.2"
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.32.2.tgz#8047d1a8b3ac4e639f0d4f66d4431aa3b16e004c"
integrity sha512-+GjlguTDINOijtVRUxrQOv3kfu9rl+qPNdX2LTbJ/ZyVTuxK+ksVSAGX1nHstu4hrv1En/uPTtWgq2gI5wt4AQ==
dependencies:
browserslist "^4.21.10"
[email protected], core-js@^3.15.1, core-js@^3.31.1, core-js@^3.32.1:
[email protected], core-js@^3.15.1, core-js@^3.31.1:
version "3.32.2"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.32.2.tgz#172fb5949ef468f93b4be7841af6ab1f21992db7"
integrity sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ==
@@ -5951,7 +5711,7 @@ css@^3.0.0:
source-map "^0.6.1"
source-map-resolve "^0.6.0"
-cssdb@^7.7.1:
+cssdb@^7.7.2:
version "7.7.2"
resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.7.2.tgz#fbebd90edfc6af129fda4fd986f9dd604a209094"
integrity sha512-pQPYP7/kch4QlkTcLuUNiNL2v/E+O+VIdotT+ug62/+2B2/jkzs5fMM6RHCzGCZ9C82pODEMSIzRRUzJOrl78g==
@@ -6105,10 +5865,10 @@ data-uri-to-buffer@^4.0.0:
resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e"
integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==
-dayjs@^1.11.9:
- version "1.11.9"
- resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.9.tgz#9ca491933fadd0a60a2c19f6c237c03517d71d1a"
- integrity sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==
+dayjs@^1.11.10:
+ version "1.11.10"
+ resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
+ integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
de-indent@^1.0.2:
version "1.0.2"
@@ -6506,10 +6266,10 @@ [email protected]:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
-electron-to-chromium@^1.4.477:
- version "1.4.523"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.523.tgz#f82f99243c827df05c26776d49712cb284972df6"
- integrity sha512-9AreocSUWnzNtvLcbpng6N+GkXnCcBR80IQkxRC9Dfdyg4gaWNUPBujAHUpKkiUkoSoR9UlhA4zD/IgBklmhzg==
+electron-to-chromium@^1.4.526:
+ version "1.4.528"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.528.tgz#7c900fd73d9d2e8bb0dab0e301f25f0f4776ef2c"
+ integrity sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA==
elliptic@^6.5.3:
version "6.5.4"
@@ -6794,9 +6554,9 @@ eslint-import-resolver-node@^0.3.7:
resolve "^1.22.4"
eslint-import-resolver-typescript@^3.6.0:
- version "3.6.0"
- resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.0.tgz#36f93e1eb65a635e688e16cae4bead54552e3bbd"
- integrity sha512-QTHR9ddNnn35RTxlaEnx2gCxqFlF2SEN0SE2d17SqwyM7YOSI2GHWRYp5BiRkObTUNYPupC/3Fq2a0PpT+EKpg==
+ version "3.6.1"
+ resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz#7b983680edd3f1c5bce1a5829ae0bc2d57fe9efa"
+ integrity sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==
dependencies:
debug "^4.3.4"
enhanced-resolve "^5.12.0"
@@ -6813,10 +6573,10 @@ eslint-module-utils@^2.7.4, eslint-module-utils@^2.8.0:
dependencies:
debug "^3.2.7"
- version "0.42.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-antfu/-/eslint-plugin-antfu-0.42.0.tgz#c7f124db7a9522249648ada9c61959ea0fa40de1"
- integrity sha512-Oztd2iw0SiwqCLyy9vygQycITIpH4VTtglUKbPvr6bMs5DfEZE8qpFihcHVyUjAVKJAjzMl+Pkz1hm+HVwT+2g==
+ version "0.42.1"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-antfu/-/eslint-plugin-antfu-0.42.1.tgz#ec75f0274a169823ffc2dcbb16a02792f2f030e0"
+ integrity sha512-uW4Z/j3RSzwloR0Ym4f1rY/ZLrodSC7kd6XTLQccYdhNBgNswTzqPyfPtIeFV0XnlLp/B6AeXfOWcK4c5ZyFkg==
dependencies:
"@typescript-eslint/utils" "^6.7.0"
@@ -6882,9 +6642,9 @@ eslint-plugin-jest@^27.2.3:
"@typescript-eslint/utils" "^5.10.0"
eslint-plugin-jsdoc@^46.6.0:
- version "46.8.1"
- resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.8.1.tgz#cfc649c15d460903fe8e86eda582023bb97f283a"
- integrity sha512-uTce7IBluPKXIQMWJkIwFsI1gv7sZRmLjctca2K5DIxPi8fSBj9f4iru42XmGwuiMyH2f3nfc60sFmnSGv4Z/A==
+ version "46.8.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.8.2.tgz#3e6b1c93e91e38fe01874d45da121b56393c54a5"
+ integrity sha512-5TSnD018f3tUJNne4s4gDWQflbsgOycIKEUBoCLn6XtBMgNHxQFmV8vVxUtiPxAQq8lrX85OaSG/2gnctxw9uQ==
dependencies:
"@es-joy/jsdoccomment" "~0.40.1"
are-docs-informative "^0.0.2"
@@ -7119,15 +6879,15 @@ eslint-webpack-plugin@^4.0.1:
normalize-path "^3.0.0"
schema-utils "^4.0.0"
-eslint@^8.49.0:
- version "8.49.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.49.0.tgz#09d80a89bdb4edee2efcf6964623af1054bf6d42"
- integrity sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==
+eslint@^8.50.0:
+ version "8.50.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.50.0.tgz#2ae6015fee0240fcd3f83e1e25df0287f487d6b2"
+ integrity sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==
dependencies:
"@eslint-community/eslint-utils" "^4.2.0"
"@eslint-community/regexpp" "^4.6.1"
"@eslint/eslintrc" "^2.1.2"
- "@eslint/js" "8.49.0"
+ "@eslint/js" "8.50.0"
"@humanwhocodes/config-array" "^0.11.11"
"@humanwhocodes/module-importer" "^1.0.1"
"@nodelib/fs.walk" "^1.2.8"
@@ -7664,9 +7424,9 @@ flush-write-stream@^1.0.0, flush-write-stream@^1.0.2:
readable-stream "^2.3.6"
follow-redirects@^1.15.0:
- version "1.15.2"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
- integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+ version "1.15.3"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
+ integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
for-each@^0.3.3:
version "0.3.3"
@@ -7711,7 +7471,7 @@ formdata-polyfill@^4.0.10:
dependencies:
fetch-blob "^3.1.2"
-fraction.js@^4.2.0:
+fraction.js@^4.3.6:
version "4.3.6"
resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.6.tgz#e9e3acec6c9a28cf7bc36cbe35eea4ceb2c5c92d"
integrity sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==
@@ -7930,9 +7690,9 @@ get-symbol-description@^1.0.0:
get-intrinsic "^1.1.1"
get-tsconfig@^4.5.0, get-tsconfig@^4.6.2, get-tsconfig@^4.7.0:
- version "4.7.0"
- resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.0.tgz#06ce112a1463e93196aa90320c35df5039147e34"
- integrity sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw==
+ version "4.7.2"
+ resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.2.tgz#0dcd6fb330391d46332f4c6c1bf89a6514c2ddce"
+ integrity sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==
dependencies:
resolve-pkg-maps "^1.0.0"
@@ -8115,9 +7875,9 @@ globals@^11.1.0:
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
globals@^13.19.0:
- version "13.21.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-13.21.0.tgz#163aae12f34ef502f5153cfbdd3600f36c63c571"
- integrity sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==
+ version "13.22.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.22.0.tgz#0c9fcb9c48a2494fbb5edbfee644285543eba9d8"
+ integrity sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==
dependencies:
type-fest "^0.20.2"
@@ -9651,9 +9411,9 @@ lines-and-columns@^1.1.6:
integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
listhen@^1.2.2, listhen@^1.4.8:
- version "1.5.3"
- resolved "https://registry.yarnpkg.com/listhen/-/listhen-1.5.3.tgz#c0c10804c117c6eff0ce6e9781170805d08cbb82"
- integrity sha512-5SitrZRCH4XXHvKSAqwaLURfQ6ZS/BCv+kpPkage5PhSnQPlz5HIVROCEIcMw8YvIF8NhDUAj/HAI/OovJGEpQ==
+ version "1.5.5"
+ resolved "https://registry.yarnpkg.com/listhen/-/listhen-1.5.5.tgz#58915512af70f770aa3e9fb19367adf479bb58c4"
+ integrity sha512-LXe8Xlyh3gnxdv4tSjTjscD1vpr/2PRpzq8YIaMJgyKzRG8wdISlWVWnGThJfHnlJ6hmLt2wq1yeeix0TEbuoA==
dependencies:
"@parcel/watcher" "^2.3.0"
"@parcel/watcher-wasm" "2.3.0"
@@ -10589,7 +10349,7 @@ node-gyp-build@^4.2.2:
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.1.tgz#24b6d075e5e391b8d5539d98c7fc5c210cac8a3e"
integrity sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==
-node-html-parser@^6.1.5, node-html-parser@^6.1.6:
+node-html-parser@^6.1.5:
version "6.1.10"
resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-6.1.10.tgz#5db11eac3ccbea6fc1b04a22c8a0e3a0774cfae6"
integrity sha512-6/uWdWxjQWQ7tMcFK2wWlrflsQUzh1HsEzlIf2j5+TtzfhT2yUvg3DwZYAmjEHeR3uX74ko7exjHW69J0tOzIg==
@@ -10781,27 +10541,6 @@ number-is-nan@^1.0.0:
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
-nuxt-edge@latest:
- version "2.17.2-28247058.53dfec7"
- resolved "https://registry.yarnpkg.com/nuxt-edge/-/nuxt-edge-2.17.2-28247058.53dfec7.tgz#618f975b56335649451ce6cedfdeb43b99bbe2bf"
- integrity sha512-4Exd3OQUNc5mKt+/omcZqdpMH5tRjhav4/GlDiUJKb7Xw+moyfD5CoJYBPylz7aElFrL/ZWeYLFQlBJwAx/3ww==
- dependencies:
- "@nuxt/babel-preset-app-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/builder-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/cli-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/components" "^2.2.1"
- "@nuxt/config-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/core-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/generator-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/loading-screen" "^2.0.4"
- "@nuxt/opencollective" "^0.3.3"
- "@nuxt/server-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/telemetry" "^1.4.1"
- "@nuxt/utils-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/vue-app-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/vue-renderer-edge" "2.17.2-28247058.53dfec7"
- "@nuxt/webpack-edge" "2.17.2-28247058.53dfec7"
-
nuxt-typed-vuex@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/nuxt-typed-vuex/-/nuxt-typed-vuex-0.3.1.tgz#a26f7b92eb19257ccda2c3a1ffaab4303088c7dc"
@@ -11008,9 +10747,9 @@ open@^8.4.0:
is-wsl "^2.2.0"
openapi-typescript@^6.5.4:
- version "6.6.1"
- resolved "https://registry.yarnpkg.com/openapi-typescript/-/openapi-typescript-6.6.1.tgz#663a3197d8cf0d11fccc9dc83e306d46aead3447"
- integrity sha512-jx7bzR6FfkG21icjikrF0k6K8moNg93PuZlfc+zo4Enxwmyw6vAUh4Rl064JN35um/RV8ZX7ANnMrQW8gRsGsQ==
+ version "6.6.2"
+ resolved "https://registry.yarnpkg.com/openapi-typescript/-/openapi-typescript-6.6.2.tgz#12650ae64c258667f96973f9cbb39783f5b79556"
+ integrity sha512-UWeaFmRpiEFAx+LMHhEGs51pXjjToqauUTJOU0ad1RrivCO+mlerUwe2MAxOWDBnqU05UtkGndyij97sbImXuA==
dependencies:
ansi-colors "^4.1.3"
fast-glob "^3.3.1"
@@ -11542,12 +11281,12 @@ postcss-clamp@^4.1.0:
dependencies:
postcss-value-parser "^4.2.0"
-postcss-color-functional-notation@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-6.0.0.tgz#dcc1b8b6273099c597a790dc484d89e2573f5f17"
- integrity sha512-kaWTgnhRKFtfMF8H0+NQBFxgr5CGg05WGe07Mc1ld6XHwwRWlqSbHOW0zwf+BtkBQpsdVUu7+gl9dtdvhWMedw==
+postcss-color-functional-notation@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-6.0.1.tgz#b67d7c71fa1c82b09c130e02a37f0b6ceacbef63"
+ integrity sha512-IouVx77fASIjOChWxkvOjYGnYNKq286cSiKFJwWNICV9NP2xZWVOS9WOriR/8uIB2zt/44bzQyw4GteCLpP2SA==
dependencies:
- "@csstools/postcss-progressive-custom-properties" "^3.0.0"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.1"
postcss-value-parser "^4.2.0"
postcss-color-hex-alpha@^9.0.2:
@@ -11557,10 +11296,10 @@ postcss-color-hex-alpha@^9.0.2:
dependencies:
postcss-value-parser "^4.2.0"
-postcss-color-rebeccapurple@^9.0.0:
- version "9.0.0"
- resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-9.0.0.tgz#317bf718962c70b779efacf3dc040c56f05d03ce"
- integrity sha512-RmUFL+foS05AKglkEoqfx+KFdKRVmqUAxlHNz4jLqIi7046drIPyerdl4B6j/RA2BSP8FI8gJcHmLRrwJOMnHw==
+postcss-color-rebeccapurple@^9.0.1:
+ version "9.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-9.0.1.tgz#d1266b9a9571ca478c8ce7ad97a15727eac3c6b2"
+ integrity sha512-ds4cq5BjRieizVb2PnvbJ0omg9VCo2/KzluvoFZbxuGpsGJ5BQSD93CHBooinEtangCM5YqUOerGDl4xGmOb6Q==
dependencies:
postcss-value-parser "^4.2.0"
@@ -11600,34 +11339,34 @@ postcss-convert-values@^6.0.0:
browserslist "^4.21.4"
postcss-value-parser "^4.2.0"
-postcss-custom-media@^10.0.0:
- version "10.0.0"
- resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-10.0.0.tgz#299781f67d043de7d3eaa13923c26c586d9cd57a"
- integrity sha512-NxDn7C6GJ7X8TsWOa8MbCdq9rLERRLcPfQSp856k1jzMreL8X9M6iWk35JjPRIb9IfRnVohmxAylDRx7n4Rv4g==
- dependencies:
- "@csstools/cascade-layer-name-parser" "^1.0.3"
- "@csstools/css-parser-algorithms" "^2.3.0"
- "@csstools/css-tokenizer" "^2.1.1"
- "@csstools/media-query-list-parser" "^2.1.2"
-
-postcss-custom-properties@^13.2.0, postcss-custom-properties@^13.3.0:
- version "13.3.0"
- resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-13.3.0.tgz#53361280a9ec57c2ac448c0877ba25c4978241ee"
- integrity sha512-q4VgtIKSy5+KcUvQ0WxTjDy9DZjQ5VCXAZ9+tT9+aPMbA0z6s2t1nMw0QHszru1ib5ElkXl9JUpYYU37VVUs7g==
+postcss-custom-media@^10.0.1:
+ version "10.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-10.0.1.tgz#48a4597451a69b1098e6eb11eb1166202171f9ed"
+ integrity sha512-fil7cosvzlIAYmZJPtNFcTH0Er7a3GveEK4q5Y/L24eWQHmiw8Fv/E5DMkVpdbNjkGzJxrvowOSt/Il9HZ06VQ==
dependencies:
"@csstools/cascade-layer-name-parser" "^1.0.4"
"@csstools/css-parser-algorithms" "^2.3.1"
"@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/media-query-list-parser" "^2.1.4"
+
+postcss-custom-properties@^13.2.0, postcss-custom-properties@^13.3.1:
+ version "13.3.2"
+ resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-13.3.2.tgz#88952f883003d897ade5c836e1e005b09a12f02b"
+ integrity sha512-2Coszybpo8lpLY24vy2CYv9AasiZ39/bs8Imv0pWMq55Gl8NWzfc24OAo3zIX7rc6uUJAqESnVOMZ6V6lpMjJA==
+ dependencies:
+ "@csstools/cascade-layer-name-parser" "^1.0.5"
+ "@csstools/css-parser-algorithms" "^2.3.2"
+ "@csstools/css-tokenizer" "^2.2.1"
postcss-value-parser "^4.2.0"
-postcss-custom-selectors@^7.1.4:
- version "7.1.4"
- resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-7.1.4.tgz#5980972353119af0d9725bdcccad46be8cfc9011"
- integrity sha512-TU2xyUUBTlpiLnwyE2ZYMUIYB41MKMkBZ8X8ntkqRDQ8sdBLhFFsPgNcOliBd5+/zcK51C9hRnSE7hKUJMxQSw==
+postcss-custom-selectors@^7.1.5:
+ version "7.1.5"
+ resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-7.1.5.tgz#74e99ef5d7a3f84aaab246ba086975e8279b686e"
+ integrity sha512-0UYtz7GG10bZrRiUdZ/2Flt+hp5p/WP0T7JgAPZ/Xhgb0wFjW/p7QOjE+M58S9Z3x11P9YaNPcrsoOGewWYkcw==
dependencies:
- "@csstools/cascade-layer-name-parser" "^1.0.3"
- "@csstools/css-parser-algorithms" "^2.3.0"
- "@csstools/css-tokenizer" "^2.1.1"
+ "@csstools/cascade-layer-name-parser" "^1.0.4"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
postcss-selector-parser "^6.0.13"
postcss-dir-pseudo-class@^8.0.0:
@@ -11677,12 +11416,12 @@ postcss-discard-overridden@^6.0.0:
resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz#49c5262db14e975e349692d9024442de7cd8e234"
integrity sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==
-postcss-double-position-gradients@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-5.0.0.tgz#cdc11e1210c3fbd3f7bc242a5ee83e5b9d7db8fa"
- integrity sha512-wR8npIkrIVUTicUpCWSSo1f/g7gAEIH70FMqCugY4m4j6TX4E0T2Q5rhfO0gqv00biBZdLyb+HkW8x6as+iJNQ==
+postcss-double-position-gradients@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-5.0.1.tgz#5f28489f5b33ce5e1e97bf1ea6b62cd7a5f9c0c2"
+ integrity sha512-ogcHzfC5q4nfySyZyNF7crvK3/MRDTh+akzE+l7bgJUjVkhgfahBuI+ZAm/5EeaVSVKnCOgqtC6wTyUFgLVLTw==
dependencies:
- "@csstools/postcss-progressive-custom-properties" "^3.0.0"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.1"
postcss-value-parser "^4.2.0"
postcss-focus-visible@^9.0.0:
@@ -11719,10 +11458,10 @@ postcss-html@^1.0.1:
postcss "^8.4.0"
postcss-safe-parser "^6.0.0"
-postcss-image-set-function@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-6.0.0.tgz#a5aba4a805ae903ab8200b584242149c48c481fb"
- integrity sha512-bg58QnJexFpPBU4IGPAugAPKV0FuFtX5rHYNSKVaV91TpHN7iwyEzz1bkIPCiSU5+BUN00e+3fV5KFrwIgRocw==
+postcss-image-set-function@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-6.0.1.tgz#e2bba0a0536a0c70f63933f7c5df68742e9615ca"
+ integrity sha512-VlZncC9hhZ5tg0JllY4g6Z28BeoPO8DIkelioEEkXL0AA0IORlqYpTi2L8TUnl4YQrlwvBgxVy+mdZJw5R/cIQ==
dependencies:
postcss-value-parser "^4.2.0"
@@ -11751,11 +11490,6 @@ postcss-import@^15.1.0:
read-cache "^1.0.0"
resolve "^1.1.7"
-postcss-initial@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42"
- integrity sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==
-
postcss-js@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.1.tgz#61598186f3703bab052f1c4f7d805f3991bee9d2"
@@ -11763,15 +11497,15 @@ postcss-js@^4.0.1:
dependencies:
camelcase-css "^2.0.1"
-postcss-lab-function@^6.0.3:
- version "6.0.3"
- resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-6.0.3.tgz#8fdc2dcb7e47c6ad68ba681fb6ab404c1a6d1452"
- integrity sha512-+0WxmblCb2Khfj9wpJQKd/9QhtHK/ImIqfnXX4HEoTDmjdtI6IUjXnC83bYX0CaHitpPjWnoQjoasW7qb1TCHw==
+postcss-lab-function@^6.0.4:
+ version "6.0.5"
+ resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-6.0.5.tgz#de6b12fb29b591193d53bccf09eba304952224db"
+ integrity sha512-v1NG08v7tN9n76rA5j5HQ4sRu/kqXBuOFNAYhfHqbyDQ1WbsGKfPNN9VnJSSI3V0KIlShodYQPf3ORjMSo1w9g==
dependencies:
- "@csstools/css-color-parser" "^1.3.1"
- "@csstools/css-parser-algorithms" "^2.3.1"
- "@csstools/css-tokenizer" "^2.2.0"
- "@csstools/postcss-progressive-custom-properties" "^3.0.0"
+ "@csstools/css-color-parser" "^1.3.2"
+ "@csstools/css-parser-algorithms" "^2.3.2"
+ "@csstools/css-tokenizer" "^2.2.1"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.1"
postcss-load-config@^4.0.1:
version "4.0.1"
@@ -12120,33 +11854,34 @@ postcss-place@^9.0.0:
dependencies:
postcss-value-parser "^4.2.0"
-postcss-preset-env@^9.0.0, postcss-preset-env@^9.1.1, postcss-preset-env@^9.1.3:
- version "9.1.3"
- resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-9.1.3.tgz#79b89aa7da7984ae7510fc7be6c439821e170b08"
- integrity sha512-h8iPXykc4i/MDkbu8GuROt90mQJcj4//P49keGW+mcfs9xWeUZFotsT0m2YV9zpdCvSNJojOww1Os6BpVTpHbA==
+postcss-preset-env@^9.0.0, postcss-preset-env@^9.1.3:
+ version "9.1.4"
+ resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-9.1.4.tgz#9a4b0b7ac2b2eb2b319fc76fd4ede0dd3e61a524"
+ integrity sha512-k2scWtmYBZhjAzMJw8Fgc4hnfkZa4KpPjK0z6+tTAJ4/3ZAmaJJ1VBQ9T7OS0qvper8AyD+kqN2UB2tYFQ4eeA==
dependencies:
"@csstools/postcss-cascade-layers" "^4.0.0"
- "@csstools/postcss-color-function" "^3.0.3"
- "@csstools/postcss-color-mix-function" "^2.0.3"
+ "@csstools/postcss-color-function" "^3.0.4"
+ "@csstools/postcss-color-mix-function" "^2.0.4"
"@csstools/postcss-exponential-functions" "^1.0.0"
"@csstools/postcss-font-format-keywords" "^3.0.0"
- "@csstools/postcss-gradients-interpolation-method" "^4.0.3"
+ "@csstools/postcss-gradients-interpolation-method" "^4.0.4"
"@csstools/postcss-hwb-function" "^3.0.3"
- "@csstools/postcss-ic-unit" "^3.0.0"
- "@csstools/postcss-is-pseudo-class" "^4.0.1"
+ "@csstools/postcss-ic-unit" "^3.0.1"
+ "@csstools/postcss-initial" "^1.0.0"
+ "@csstools/postcss-is-pseudo-class" "^4.0.2"
"@csstools/postcss-logical-float-and-clear" "^2.0.0"
"@csstools/postcss-logical-resize" "^2.0.0"
- "@csstools/postcss-logical-viewport-units" "^2.0.1"
+ "@csstools/postcss-logical-viewport-units" "^2.0.2"
"@csstools/postcss-media-minmax" "^1.0.7"
"@csstools/postcss-media-queries-aspect-ratio-number-values" "^2.0.2"
"@csstools/postcss-nested-calc" "^3.0.0"
- "@csstools/postcss-normalize-display-values" "^3.0.0"
- "@csstools/postcss-oklab-function" "^3.0.3"
- "@csstools/postcss-progressive-custom-properties" "^3.0.0"
- "@csstools/postcss-relative-color-syntax" "^2.0.3"
+ "@csstools/postcss-normalize-display-values" "^3.0.1"
+ "@csstools/postcss-oklab-function" "^3.0.4"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.1"
+ "@csstools/postcss-relative-color-syntax" "^2.0.4"
"@csstools/postcss-scope-pseudo-class" "^3.0.0"
"@csstools/postcss-stepped-value-functions" "^3.0.1"
- "@csstools/postcss-text-decoration-shorthand" "^3.0.2"
+ "@csstools/postcss-text-decoration-shorthand" "^3.0.3"
"@csstools/postcss-trigonometric-functions" "^3.0.1"
"@csstools/postcss-unset-value" "^3.0.0"
autoprefixer "^10.4.15"
@@ -12154,24 +11889,23 @@ postcss-preset-env@^9.0.0, postcss-preset-env@^9.1.1, postcss-preset-env@^9.1.3:
css-blank-pseudo "^6.0.0"
css-has-pseudo "^6.0.0"
css-prefers-color-scheme "^9.0.0"
- cssdb "^7.7.1"
+ cssdb "^7.7.2"
postcss-attribute-case-insensitive "^6.0.2"
postcss-clamp "^4.1.0"
- postcss-color-functional-notation "^6.0.0"
+ postcss-color-functional-notation "^6.0.1"
postcss-color-hex-alpha "^9.0.2"
- postcss-color-rebeccapurple "^9.0.0"
- postcss-custom-media "^10.0.0"
- postcss-custom-properties "^13.3.0"
- postcss-custom-selectors "^7.1.4"
+ postcss-color-rebeccapurple "^9.0.1"
+ postcss-custom-media "^10.0.1"
+ postcss-custom-properties "^13.3.1"
+ postcss-custom-selectors "^7.1.5"
postcss-dir-pseudo-class "^8.0.0"
- postcss-double-position-gradients "^5.0.0"
+ postcss-double-position-gradients "^5.0.1"
postcss-focus-visible "^9.0.0"
postcss-focus-within "^8.0.0"
postcss-font-variant "^5.0.0"
postcss-gap-properties "^5.0.0"
- postcss-image-set-function "^6.0.0"
- postcss-initial "^4.0.1"
- postcss-lab-function "^6.0.3"
+ postcss-image-set-function "^6.0.1"
+ postcss-lab-function "^6.0.4"
postcss-logical "^7.0.0"
postcss-nesting "^12.0.1"
postcss-opacity-percentage "^2.0.0"
@@ -12311,10 +12045,10 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-"postcss@^7.0.27 || ^8.0.0", postcss@^8.1.10, postcss@^8.2.1, postcss@^8.2.15, postcss@^8.3.11, postcss@^8.4.0, postcss@^8.4.14, postcss@^8.4.19, postcss@^8.4.23, postcss@^8.4.24, postcss@^8.4.26, postcss@^8.4.27, postcss@^8.4.28, postcss@^8.4.29:
- version "8.4.29"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.29.tgz#33bc121cf3b3688d4ddef50be869b2a54185a1dd"
- integrity sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==
+"postcss@^7.0.27 || ^8.0.0", postcss@^8.1.10, postcss@^8.2.1, postcss@^8.2.15, postcss@^8.3.11, postcss@^8.4.0, postcss@^8.4.14, postcss@^8.4.19, postcss@^8.4.23, postcss@^8.4.24, postcss@^8.4.26, postcss@^8.4.27, postcss@^8.4.29:
+ version "8.4.30"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.30.tgz#0e0648d551a606ef2192a26da4cabafcc09c1aa7"
+ integrity sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==
dependencies:
nanoid "^3.3.6"
picocolors "^1.0.0"
@@ -13107,9 +12841,9 @@ rollup@^2.77.2:
fsevents "~2.3.2"
rollup@^3.27.1, rollup@^3.28.1, rollup@^3.29.0:
- version "3.29.2"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.2.tgz#cbc76cd5b03b9f9e93be991d23a1dff9c6d5b740"
- integrity sha512-CJouHoZ27v6siztc21eEQGo0kIcE5D1gVPA571ez0mMYb25LGYGKnVNXpEj5MGlepmDWGXNjDB5q7uNiPHC11A==
+ version "3.29.3"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.3.tgz#97769774ccaa6a3059083d4680fcabd8ead01289"
+ integrity sha512-T7du6Hum8jOkSWetjRgbwpM6Sy0nECYrYRSmZjayFcOddtKJWU4d17AC3HNUk7HRuqy4p+G7aEZclSHytqUmEg==
optionalDependencies:
fsevents "~2.3.2"
@@ -13464,9 +13198,9 @@ slice-ansi@^4.0.0:
is-fullwidth-code-point "^3.0.0"
smob@^1.0.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/smob/-/smob-1.4.0.tgz#ac9751fe54b1fc1fc8286a628d4e7f824273b95a"
- integrity sha512-MqR3fVulhjWuRNSMydnTlweu38UhQ0HXM4buStD/S3mc/BzX3CuM9OmhyQpmtYCvoYdl5ris6TI0ZqH355Ymqg==
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/smob/-/smob-1.4.1.tgz#66270e7df6a7527664816c5b577a23f17ba6f5b5"
+ integrity sha512-9LK+E7Hv5R9u4g4C3p+jjLstaLe11MDsL21UpYaCNmapvMkYhqCV4A/f/3gyH8QjMyh6l68q9xC85vihY9ahMQ==
snapdragon-node@^2.0.1:
version "2.1.1"
@@ -13606,9 +13340,9 @@ spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1:
spdx-license-ids "^3.0.0"
spdx-license-ids@^3.0.0:
- version "3.0.13"
- resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5"
- integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==
+ version "3.0.15"
+ resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz#142460aabaca062bc7cd4cc87b7d50725ed6a4ba"
+ integrity sha512-lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ==
split-string@^3.0.1, split-string@^3.0.2:
version "3.1.0"
@@ -14241,9 +13975,9 @@ terser@^4.1.2, terser@^4.6.3:
source-map-support "~0.5.12"
terser@^5.17.4, terser@^5.19.4, terser@^5.3.4:
- version "5.19.4"
- resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.4.tgz#941426fa482bf9b40a0308ab2b3cd0cf7c775ebd"
- integrity sha512-6p1DjHeuluwxDXcuT9VR8p64klWJKo1ILiy19s6C9+0Bh2+NWTX6nD9EPppiER4ICkHDVB1RkVpin/YW2nQn/g==
+ version "5.20.0"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-5.20.0.tgz#ea42aea62578703e33def47d5c5b93c49772423e"
+ integrity sha512-e56ETryaQDyebBwJIWYB2TT6f2EZ0fL0sW/JRXNMN26zZdKi2u/E/5my5lG6jNxym6qsrVXfFRmOdV42zlAgLQ==
dependencies:
"@jridgewell/source-map" "^0.3.3"
acorn "^8.8.2"
@@ -14708,9 +14442,9 @@ undertaker@^1.2.1:
undertaker-registry "^1.0.0"
undici@^5.23.0:
- version "5.24.0"
- resolved "https://registry.yarnpkg.com/undici/-/undici-5.24.0.tgz#6133630372894cfeb3c3dab13b4c23866bd344b5"
- integrity sha512-OKlckxBjFl0oXxcj9FU6oB8fDAaiRUq+D8jrFWGmOfI/gIyjk/IeS75LMzgYKUaeHzLUcYvf9bbJGSrUwTfwwQ==
+ version "5.25.2"
+ resolved "https://registry.yarnpkg.com/undici/-/undici-5.25.2.tgz#17ddc3e8ab3c77e473ae1547f3f2917a05da2820"
+ integrity sha512-tch8RbCfn1UUH1PeVCXva4V8gDpGAud/w0WubD6sHC46vYQ3KDxL+xv1A2UxK0N6jrVedutuPHxe1XIoqerwMw==
dependencies:
busboy "^1.6.0"
@@ -14835,11 +14569,11 @@ unpipe@~1.0.0:
integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
unplugin@^1.3.1, unplugin@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-1.4.0.tgz#b771373aa1bc664f50a044ee8009bd3a7aa04d85"
- integrity sha512-5x4eIEL6WgbzqGtF9UV8VEC/ehKptPXDS6L2b0mv4FRMkJxRtjaJfOWDd6a8+kYbqsjklix7yWP0N3SUepjXcg==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-1.5.0.tgz#8938ae84defe62afc7757df9ca05d27160f6c20c"
+ integrity sha512-9ZdRwbh/4gcm1JTOkp9lAkIDrtOyOxgHmY7cjuwI8L/2RTikMcVG25GsZwNAgRuap3iDw2jeq7eoqtAsz5rW3A==
dependencies:
- acorn "^8.9.0"
+ acorn "^8.10.0"
chokidar "^3.5.3"
webpack-sources "^3.2.3"
webpack-virtual-modules "^0.5.0"
@@ -14901,10 +14635,10 @@ upath@^2.0.1:
resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
-update-browserslist-db@^1.0.11:
- version "1.0.11"
- resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
- integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
+update-browserslist-db@^1.0.13:
+ version "1.0.13"
+ resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+ integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
dependencies:
escalade "^3.1.1"
picocolors "^1.0.0"
@@ -15104,17 +14838,17 @@ vinyl@^2.0.0, vinyl@^2.0.1:
remove-trailing-separator "^1.0.1"
replace-ext "^1.0.0"
[email protected], vite-node@^0.34.4:
- version "0.34.4"
- resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-0.34.4.tgz#96d5b4dcc5585e3b289390f4e11ed6450978e30e"
- integrity sha512-ho8HtiLc+nsmbwZMw8SlghESEE3KxJNp04F/jPUCLVvaURwt0d+r9LxEqCX5hvrrOQ0GSyxbYr5ZfRYhQ0yVKQ==
[email protected], vite-node@^0.34.4:
+ version "0.34.5"
+ resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-0.34.5.tgz#21d6bd637cb0c14d0edc1d7bdf832a70dc11c427"
+ integrity sha512-RNZ+DwbCvDoI5CbCSQSyRyzDTfFvFauvMs6Yq4ObJROKlIKuat1KgSX/Ako5rlDMfVCyMcpMRMTkJBxd6z8YRA==
dependencies:
cac "^6.7.14"
debug "^4.3.4"
mlly "^1.4.0"
pathe "^1.1.1"
picocolors "^1.0.0"
- vite "^3.0.0 || ^4.0.0"
+ vite "^3.0.0 || ^4.0.0 || ^5.0.0-0"
vite-plugin-eslint@^1.8.1:
version "1.8.1"
@@ -15125,7 +14859,7 @@ vite-plugin-eslint@^1.8.1:
"@types/eslint" "^8.4.5"
rollup "^2.77.2"
-"vite@^3.0.0 || ^4.0.0", "vite@^3.1.0 || ^4.0.0 || ^5.0.0-0", vite@~4.4.9:
+"vite@^3.0.0 || ^4.0.0 || ^5.0.0-0", "vite@^3.1.0 || ^4.0.0 || ^5.0.0-0", vite@~4.4.9:
version "4.4.9"
resolved "https://registry.yarnpkg.com/vite/-/vite-4.4.9.tgz#1402423f1a2f8d66fd8d15e351127c7236d29d3d"
integrity sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==
@@ -15136,19 +14870,19 @@ vite-plugin-eslint@^1.8.1:
optionalDependencies:
fsevents "~2.3.2"
-vitest@^0.34.4:
- version "0.34.4"
- resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.34.4.tgz#c7f40cf7ca3b590bb333b3272a98f49e85f7b958"
- integrity sha512-SE/laOsB6995QlbSE6BtkpXDeVNLJc1u2LHRG/OpnN4RsRzM3GQm4nm3PQCK5OBtrsUqnhzLdnT7se3aeNGdlw==
+vitest@^0.34.5:
+ version "0.34.5"
+ resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.34.5.tgz#c2200566d4b133588d69124bc0fbe8bf179f644f"
+ integrity sha512-CPI68mmnr2DThSB3frSuE5RLm9wo5wU4fbDrDwWQQB1CWgq9jQVoQwnQSzYAjdoBOPoH2UtXpOgHVge/uScfZg==
dependencies:
"@types/chai" "^4.3.5"
"@types/chai-subset" "^1.3.3"
"@types/node" "*"
- "@vitest/expect" "0.34.4"
- "@vitest/runner" "0.34.4"
- "@vitest/snapshot" "0.34.4"
- "@vitest/spy" "0.34.4"
- "@vitest/utils" "0.34.4"
+ "@vitest/expect" "0.34.5"
+ "@vitest/runner" "0.34.5"
+ "@vitest/snapshot" "0.34.5"
+ "@vitest/spy" "0.34.5"
+ "@vitest/utils" "0.34.5"
acorn "^8.9.0"
acorn-walk "^8.2.0"
cac "^6.7.14"
@@ -15163,7 +14897,7 @@ vitest@^0.34.4:
tinybench "^2.5.0"
tinypool "^0.7.0"
vite "^3.1.0 || ^4.0.0 || ^5.0.0-0"
- vite-node "0.34.4"
+ vite-node "0.34.5"
why-is-node-running "^2.2.2"
vm-browserify@^1.0.1:
@@ -15197,28 +14931,28 @@ vscode-json-languageservice@^5.2.0:
vscode-languageserver-types "^3.17.3"
vscode-uri "^3.0.7"
- version "8.1.0"
- resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz#cb9989c65e219e18533cc38e767611272d274c94"
- integrity sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==
+ version "8.2.0"
+ resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz#f43dfa35fb51e763d17cd94dcca0c9458f35abf9"
+ integrity sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==
vscode-languageserver-protocol@^3.17.3:
- version "3.17.3"
- resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.3.tgz#6d0d54da093f0c0ee3060b81612cce0f11060d57"
- integrity sha512-924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==
+ version "3.17.4"
+ resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4.tgz#d667687610a5eff23cb695568974edc1aa61d81e"
+ integrity sha512-IpaHLPft+UBWf4dOIH15YEgydTbXGz52EMU2h16SfFpYu/yOQt3pY14049mtpJu+4CBHn+hq7S67e7O0AwpRqQ==
dependencies:
- vscode-jsonrpc "8.1.0"
- vscode-languageserver-types "3.17.3"
+ vscode-jsonrpc "8.2.0"
+ vscode-languageserver-types "3.17.4"
vscode-languageserver-textdocument@^1.0.8:
version "1.0.8"
resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz#9eae94509cbd945ea44bca8dcfe4bb0c15bb3ac0"
integrity sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==
[email protected], vscode-languageserver-types@^3.17.2, vscode-languageserver-types@^3.17.3:
- version "3.17.3"
- resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz#72d05e47b73be93acb84d6e311b5786390f13f64"
- integrity sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==
[email protected], vscode-languageserver-types@^3.17.2, vscode-languageserver-types@^3.17.3:
+ version "3.17.4"
+ resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4.tgz#0b422ecbc305f364f6579ba9e32b1d7ddb7ca789"
+ integrity sha512-9YXi5pA3XF2V+NUQg6g+lulNS0ncRCKASYdK3Cs7kiH9sVFXWq27prjkC/B8M/xJLRPPRSPCHVMuBTgRNFh2sQ==
vscode-uri@^3.0.7:
version "3.0.7"
@@ -15285,7 +15019,7 @@ vue-i18n@^8.27.2:
resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.28.2.tgz#913558066e274395c0a9f40b2f3393d5c2636840"
integrity sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA==
-vue-loader@^15.10.1, vue-loader@^15.10.2:
+vue-loader@^15.10.1:
version "15.10.2"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.10.2.tgz#6dccfda8661caa7f5415806a5e386fd3258d8112"
integrity sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==