Skip to content

Open source personal finance application

refactor: remove unused files and update configurations

Ilya Komicheva3cdba49d326
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index 08109fd1..00000000
--- a/.prettierrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "tailwindAttributes": ["insideClasses"],
- "tailwindFunctions": ["clsx"]
-}
diff --git a/README.md b/README.md
index a3735dd0..f35ce25c 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ pnpm i
- Open Realtime Database and go to Rules tab.
- Change rules to:
-``` javascript
+``` json
{
"rules": {
"users": {
diff --git a/app/app.config.ts b/app/app.config.ts
index 2169e350..9a195eda 100644
--- a/app/app.config.ts
+++ b/app/app.config.ts
@@ -7,7 +7,7 @@ export default defineAppConfig({
},
ui: {
popover: {
- background: 'bg-foreground-4 min-w-64',
+ background: 'bg-foreground-1 min-w-64',
popper: {
placement: 'bottom-start',
},
diff --git a/app/assets/css/tailwind.css b/app/assets/css/tailwind.css
index f4fffc21..c69ee804 100644
--- a/app/assets/css/tailwind.css
+++ b/app/assets/css/tailwind.css
@@ -12,9 +12,7 @@
}
.absolute-center {
- position: absolute;
- top: 50%;
- left: 50%;
+ @apply absolute top-1/2 left-1/2;
transform: translate(-50%, -50%);
}
@@ -24,63 +22,62 @@
}
}
-html,
-body {
- overscroll-behavior-y: none;
- user-select: none;
-
- @apply bg-foreground-1 font-primary text-1 leading-none antialiased h-dvh;
+@layer base {
+ html,
+ body {
+ @apply bg-foreground-1 font-primary text-1 leading-none antialiased h-dvh select-none;
+ overscroll-behavior-y: none;
+ }
}
-.layoutBase {
- @apply overflow-hidden relative h-dvh;
-}
+@layer components {
+ .layoutBase {
+ @apply overflow-hidden relative h-dvh bg-foreground-2;
+ }
-.pageWrapper {
- @apply max-w-xl grow px-2 lg:px-4 2xl:px-8;
-}
+ .pageWrapper {
+ @apply max-w-xl grow px-2 lg:px-4 2xl:px-8;
+ }
-.bottomSheetDrugClassesCustom {
- @apply bg-foreground-1 max-w-md rounded-xl;
-}
+ .bottomSheetDrugClassesCustom {
+ @apply bg-foreground-1 max-w-md rounded-xl;
+ }
-.bottomSheetContent {
- @apply grid h-full max-h-[90vh] grid-rows-[auto,1fr,auto] overflow-hidden;
-}
+ .bottomSheetContent {
+ @apply grid h-full max-h-[90vh] grid-rows-[auto,1fr,auto] overflow-hidden;
+ }
-.bottomSheetContentInside {
- @apply grid h-full gap-1 overflow-hidden overflow-y-auto px-2 py-px;
-}
+ .bottomSheetContentInside {
+ @apply grid h-full bg-foreground-1 gap-1 overflow-hidden overflow-y-auto px-2 py-px;
+ }
-.bottomSheetContentBottom {
- @apply flex items-center justify-center p-2;
-}
+ .bottomSheetContentBottom {
+ @apply flex items-center justify-center p-2;
+ }
-.trnForm .trnForm__pagination {
- z-index: 2;
- position: absolute;
- left: 50%;
- bottom: 1px;
- display: flex;
- align-items: center;
- justify-content: center;
- width: auto;
- padding: 6px;
- border-radius: 6px;
- transform: translateX(-50%);
- @apply bg-foreground-1;
-}
+ /* Scrollbar styles */
+ .scroll,
+ .scrollbar {
+ @apply h-full overflow-hidden overflow-y-auto;
+ }
-.trnForm .swiper-pagination-bullet {
- display: block;
- opacity: 1;
- width: 6px;
- height: 6px;
- margin: 0 4px;
- border-radius: 50%;
- @apply bg-item-3;
-}
+ .scroll::-webkit-scrollbar,
+ .scrollbar::-webkit-scrollbar {
+ @apply w-1.5 h-1.5;
+ }
+
+ .scroll::-webkit-scrollbar-track,
+ .scrollbar::-webkit-scrollbar-track {
+ @apply bg-transparent rounded-[10px];
+ }
-.trnForm .swiper-pagination-bullet-active {
- @apply bg-accent-1;
+ .scroll::-webkit-scrollbar-thumb,
+ .scrollbar::-webkit-scrollbar-thumb {
+ @apply bg-gray-500 rounded-[10px];
+ }
+
+ .scroll::-webkit-scrollbar-thumb:hover,
+ .scrollbar::-webkit-scrollbar-thumb:hover {
+ @apply bg-gray-600;
+ }
}
diff --git a/app/assets/css/theme.css b/app/assets/css/theme.css
new file mode 100644
index 00000000..a5ef5db1
--- /dev/null
+++ b/app/assets/css/theme.css
@@ -0,0 +1,129 @@
+html {
+ --hue: 220deg;
+ --c-blue-1: hsl(220, 100%, 61%);
+ --alert-primary: #b81414;
+
+ --expense-1: #f92134;
+ --expense-line: oklch(0.37 0.09 20.05);
+
+ --income-1: #2cad22;
+ --income-line: oklch(55.43% 0.13485 122.48);
+}
+
+/*
+ * Light Theme
+*/
+html {
+ --text-1: 64 64 64;
+ --text-2: 0 0 0;
+ --text-2: 0 0 0;
+ --text-3: 64 64 64;
+ --text-4: 0 0 0;
+ --text-icon-primary: theme('colors.neutral.50');
+
+ --foreground-1: 255 255 255;
+ --foreground-2: 245 245 245;
+
+ --accent-1: 0 122 255;
+ --accent-2: 58 125 255;
+ --accent-3: 255 255 255;
+ --accent-4: var(--hue) 100% 61%;
+
+ /* Item */
+ --c-item-1: theme('colors.neutral.700');
+ --c-item-2: theme('colors.neutral.500');
+ --c-item-3: #edeef0;
+ --c-item-4: theme('colors.neutral.100');
+ --c-item-5: theme('colors.gray.200');
+ --c-item-base: theme('colors.neutral.600');
+ --item-6: 237 239 240;
+ --item-8: 25 25 25;
+ --item-9: 245 245 245;
+ --item-10: 28 28 28;
+ --item-11: rgba(190, 190, 190, 1);
+ --item-active: 216 216 220;
+
+ /* Colors */
+ --c-red-1: #b81414;
+ --c-blue-3: #2c74ff;
+ --c-income-1: rgba(44, 173, 34, 1);
+
+ /* Backgrounds */
+ --c-bg-10: rgba(230, 230, 230, 1);
+ --c-bg-11: rgba(0, 0, 0, 0.04);
+ --c-bg-12: rgba(100, 100, 100, 1);
+ --c-bg-13: rgba(120, 120, 120, 1);
+ --c-bg-14: rgba(0, 0, 0, 0.6);
+
+ --c-font-1: #fafafa;
+ --c-font-2: #505050;
+ --c-font-3: #323232;
+ --c-font-4: #6e6e6e;
+ --c-font-5: #969696;
+
+ /* Chart */
+ --chart-bg: var(--c-item-4);
+ --chart-label: var(--c-font-5);
+ --chart-line: var(--c-item-5);
+ --chart-selected: var(--c-item-3);
+ --chart-splitLine: var(--item-3);
+ --chart-tooltip: theme('colors.neutral.800');
+}
+
+/*
+ * Dark Theme
+*/
+html.dark {
+ /* Text */
+ --text-1: 220 220 220;
+ --text-2: 160 160 160;
+ --text-3: 200 200 200;
+ --text-4: 130 130 130;
+ --text-5: 120 120 120;
+
+ --text-icon-primary: theme('colors.neutral.50');
+
+ --foreground-1: 19 19 19;
+ --foreground-2: 22 22 22;
+
+ --accent-1: 56 148 2451;
+ --accent-2: 58 125 255;
+ --accent-3: 255 255 255;
+ --accent-4: var(--hue) 100% 61%;
+
+ /* Item */
+ --c-item-1: theme('colors.neutral.100');
+ --c-item-2: theme('colors.neutral.400');
+ --c-item-3: #232323;
+ --c-item-4: #1c1c1c;
+ --c-item-5: theme('colors.neutral.800');
+ --c-item-base: theme('colors.neutral.200');
+ --item-6: 44 44 44;
+ --item-8: 25 25 25;
+ --item-9: 23 23 23;
+ --item-11: #878787;
+ --item-10: 28 28 28;
+
+ /* Colors */
+ --c-red-1: #b81414;
+ --c-blue-3: #2c74ff;
+ --c-income-1: #2cad22;
+
+ /* Backgrounds */
+ --c-bg-10: #dcdcdc;
+ --c-bg-14: #000000cc;
+
+ --c-font-1: #fafafa;
+ --c-font-2: #dcdcdc;
+ --c-font-3: #bebebe;
+ --c-font-4: #969696;
+ --c-font-5: #646464;
+
+ /* Chart */
+ --chart-bg: var(--c-item-5);
+ --chart-label: var(--c-font-5);
+ --chart-line: var(--c-item-5);
+ --chart-selected: var(--c-item-5);
+ --chart-splitLine: theme('colors.neutral.700');
+ --chart-tooltip: theme('colors.neutral.400');
+}
diff --git a/app/assets/stylus/index.styl b/app/assets/stylus/index.styl
deleted file mode 100644
index d85cef5f..00000000
--- a/app/assets/stylus/index.styl
+++ /dev/null
@@ -1,169 +0,0 @@
-html
- --hue 220deg
- --c-blue-1 hsl(220, 100%, 61%)
- --c-income-opacity rgba(44, 173, 34, .5)
- --text-alert-primary #b81414
- --text-expense-1 #f92134
- --text-expense-2 #ED6660
- --text-expense-line oklch(0.37 0.09 20.05)
- --text-expense-line2 oklch(71.95% 0.13485 33.21) / .06
-
- --text-income-1 #2cad22
- --text-income-2 #22A2D3
- --text-income-line oklch(55.43% 0.13485 122.48)
-
-/*
- * Light Theme
-*/
-html
- --text-1 64 64 64
- --text-2 0 0 0
- --text-2 0 0 0
- --text-3 64 64 64
- --text-4 0 0 0
- --text-icon-primary theme('colors.neutral.50')
-
- --foreground-1 255 255 255
- --foreground-2 245 245 245
- --foreground-3 245 245 245
- --foreground-4 255 255 255
- --foreground-5 27 27 28
-
- --accent-1 0 122 255
- --accent-2 58 125 255
- --accent-3 255 255 255
- --accent-4 var(--hue) 100% 61%
-
-
- // Item
- //-----------------------------------
- --c-item-1 theme('colors.neutral.700')
- --c-item-2 theme('colors.neutral.500')
- --c-item-3 #edeef0
- --c-item-4 theme('colors.neutral.100')
- --c-item-5 theme('colors.gray.200')
- --c-item-base theme('colors.neutral.600')
- --item-10 28 28 28
- --item-6 237 239 240
- --item-8 25 25 25
- --item-9 245 245 245
- --item-active 216 216 220
-
-
- // colors
- //-----------------------------------
- --c-red-1 #b81414
- --c-blue-3 #2c74ff
- --c-income-1 rgba(44, 173, 34, 1)
- --c-expense-1 rgba(249, 33, 52, 1)
-
- // backgrounds
- // --------------------------------------------
- --c-bg-9 rgba(190, 190, 190, 1)
- --c-bg-10 rgba(230, 230, 230, 1)
- --c-bg-11 rgba(0, 0, 0, .04)
- --c-bg-12 rgba(100, 100, 100, 1)
- --c-bg-13 rgba(120, 120, 120, 1)
- --c-bg-14 rgba(0, 0, 0, .6)
-
- --c-font-1 #fafafa
- --c-font-2 #505050
- --c-font-3 #323232
- --c-font-4 #6e6e6e
- --c-font-5 #969696
-
- // Chart
- --chart-bg var(--c-item-4)
- --chart-label var(--c-font-5)
- --chart-line var(--c-item-5)
- --chart-selected var(--c-item-3)
- --chart-splitLine var(--item-3)
- --chart-tooltip theme('colors.neutral.800')
-
-/*
- * Dark Theme
-*/
-html.dark
- /* Text */
- --text-1 220 220 220
- --text-2 160 160 160
- --text-3 200 200 200
- --text-4 130 130 130
- --text-5 120 120 120
-
- --text-icon-primary theme('colors.neutral.50')
-
- --foreground-1 19 19 19
- --foreground-2 16 16 16
- --foreground-3 22 22 22
- --foreground-4 19 19 19
- --foreground-5 27 27 28
-
- --accent-1 56 148 2451
- --accent-2 58 125 255
- --accent-3 255 255 255
- --accent-4 var(--hue) 100% 61%
-
- // Item
- //-----------------------------------
- --c-item-1 theme('colors.neutral.100')
- --c-item-2 theme('colors.neutral.400')
- --c-item-3 #232323
- --c-item-4 #1c1c1c
- --c-item-5 theme('colors.neutral.800')
- --c-item-base theme('colors.neutral.200')
- --item-10 28 28 28
- --item-6 44 44 44
- --item-8 25 25 25
- --item-9 23 23 23
-
- // Colors
- //-----------------------------------
- --c-red-1 #b81414
- --c-blue-3 #2c74ff
- --c-income-1 #2cad22
- --c-expense-1 #b81414
-
- // backgrounds
- // --------------------------------------------
- --c-bg-9 #878787
- --c-bg-10 #dcdcdc
- --c-bg-14 #000000cc
-
- --c-font-1 #fafafa
- --c-font-2 #dcdcdc
- --c-font-3 #bebebe
- --c-font-4 #969696
- --c-font-5 #646464
-
-
- // Chart
- --chart-bg var(--c-item-5)
- --chart-label var(--c-font-5)
- --chart-line var(--c-item-5)
- --chart-selected var(--c-item-5)
- --chart-splitLine theme('colors.neutral.700')
- --chart-tooltip theme('colors.neutral.400')
-
-.scroll
-.scrollbar
- scrollbar()
- height 100%
- overflow hidden
- overflow-y auto
-
-scrollbar()
- &::-webkit-scrollbar
- width 6px
- height 6px
-
- &::-webkit-scrollbar-track
- background transparent
- border-radius 10px
-
- &::-webkit-scrollbar-thumb
- background grey
- border-radius 10px
-
- &:hover
- background darkgrey
diff --git a/app/components/about/About.vue b/app/components/about/About.vue
index 11f3b08d..78c0a59e 100644
--- a/app/components/about/About.vue
+++ b/app/components/about/About.vue
@@ -10,19 +10,19 @@ const { t } = useI18n()
<div class="flex gap-8 pb-3">
<div>
- <div class="subTitle pb-4">
+ <div class="text-font-4 pb-4 text-xs">
{{ t('author') }}
</div>
- <div class="name">
+ <div class="text-font-2 font-secondary text-sm leading-none">
ilkome
</div>
</div>
<div>
- <div class="subTitle pb-4">
+ <div class="text-font-4 pb-4 text-xs">
{{ t('thanks') }}
</div>
- <div class="name">
+ <div class="text-font-2 font-secondary text-sm leading-none">
TheCarolissy, TihomirovPro
</div>
</div>
@@ -30,19 +30,6 @@ const { t } = useI18n()
</div>
</template>
-<style lang="stylus" scoped>
-.subTitle
- padding-bottom 4px
- color var(--c-font-4)
- font-size 12px
-
-.name
- color var(--c-font-2)
- font-size 14px
- line-height 18px
- font-family var(--font-secondary)
-</style>
-
<i18n lang="yaml">
en:
title: Creators
diff --git a/app/components/amount/Amount.vue b/app/components/amount/Amount.vue
index b82eb1ca..0b63e414 100644
--- a/app/components/amount/Amount.vue
+++ b/app/components/amount/Amount.vue
@@ -19,15 +19,12 @@ export type AmountProps = {
variant?: '2xs' | '3xl' | 'base' | 'sm' | 'xl'
}
-const props = withDefaults(
- defineProps<AmountProps>(),
- {
- align: 'right',
- isShowBaseRate: true,
- isShowSymbol: true,
- variant: 'base',
- },
-)
+const props = withDefaults(defineProps<AmountProps>(), {
+ align: 'right',
+ isShowBaseRate: true,
+ isShowSymbol: true,
+ variant: 'base',
+})
const emit = defineEmits<{
click: [e: Event]
@@ -47,7 +44,7 @@ const { baseCurrencyCode, getAmountInBaseRate } = useAmount()
'text-xl': props.variant === 'xl',
'text-base': props.variant === 'base',
}"
- class="font-secondary text-1 grid gap-1 leading-none"
+ class="grid gap-1 font-secondary leading-none text-1 "
@click="(e: Event) => emit('click', e)"
>
<AmountItem
@@ -61,7 +58,9 @@ const { baseCurrencyCode, getAmountInBaseRate } = useAmount()
<template v-if="amount !== 0">
<AmountItem
:align="props.align"
- :amount="formatAmount(amount, currencyCode, { precision: props.precision })"
+ :amount="
+ formatAmount(amount, currencyCode, { precision: props.precision })
+ "
:isShowMinus="props.isShowMinus"
:isShowPlus="props.isShowPlus"
:isShowSymbol="props.isShowSymbol"
diff --git a/app/components/amount/getAmount.test.ts b/app/components/amount/getAmount.test.ts
index 34ad468b..6d643146 100644
--- a/app/components/amount/getAmount.test.ts
+++ b/app/components/amount/getAmount.test.ts
@@ -1,7 +1,8 @@
import { describe, expect, it } from 'vitest'
-import { getAmountInRate } from '~/components/amount/getTotal'
import { ratesBasedOnUsd as rates } from '~~/mocks/rates'
+import { getAmountInRate } from '~/components/amount/getTotal'
+
describe('get amount', () => {
it('get amount in same rate as base rate', () => {
const amountInBaseRate = getAmountInRate({
diff --git a/app/components/amount/getTotal.test.ts b/app/components/amount/getTotal.test.ts
index ea94950d..add1b4b9 100644
--- a/app/components/amount/getTotal.test.ts
+++ b/app/components/amount/getTotal.test.ts
@@ -1,12 +1,14 @@
import { describe, expect, it } from 'vitest'
-import { mockCategories } from '~/components/categories/utils.test'
-import { getTotal } from '~/components/amount/getTotal'
-import { getTransferCategoriesIds } from '~/components/categories/utils'
-import type { TrnId } from '~/components/trns/types'
import { ratesBasedOnUsd as rates } from '~~/mocks/rates'
import { trnsItems } from '~~/mocks/trns'
import { walletsItems } from '~~/mocks/wallets'
+import type { TrnId } from '~/components/trns/types'
+
+import { getTotal } from '~/components/amount/getTotal'
+import { getTransferCategoriesIds } from '~/components/categories/utils'
+import { mockCategories } from '~/components/categories/utils.test'
+
const transferCategoriesIds = getTransferCategoriesIds(mockCategories)
describe('total of Transactions', () => {
diff --git a/app/components/amount/getTotal.ts b/app/components/amount/getTotal.ts
index 73b2951c..33771d72 100644
--- a/app/components/amount/getTotal.ts
+++ b/app/components/amount/getTotal.ts
@@ -1,8 +1,9 @@
import type { CategoryId } from '~/components/categories/types'
+import type { CurrencyCode, Rates } from '~/components/currencies/types'
import type { TrnId, TrnItem } from '~/components/trns/types'
import type { WalletId, WalletItem } from '~/components/wallets/types'
+
import { TrnType } from '~/components/trns/types'
-import type { CurrencyCode, Rates } from '~/components/currencies/types'
export function getAmountInRate({
amount,
diff --git a/app/components/amount/useAmount.ts b/app/components/amount/useAmount.ts
index 470a65a4..77e2681c 100644
--- a/app/components/amount/useAmount.ts
+++ b/app/components/amount/useAmount.ts
@@ -1,7 +1,7 @@
import type { CurrencyCode } from '~/components/currencies/types'
import type { TrnId } from '~/components/trns/types'
-import { type TotalReturns, getAmountInRate, getTotal } from '~/components/amount/getTotal'
+import { getAmountInRate, getTotal, type TotalReturns } from '~/components/amount/getTotal'
import { formatAmount } from '~/components/amount/utils'
import { useCategoriesStore } from '~/components/categories/useCategoriesStore'
import { useCurrenciesStore } from '~/components/currencies/useCurrenciesStore'
diff --git a/app/components/app/Copyright.vue b/app/components/app/Copyright.vue
index f011ec13..f5c65e3b 100644
--- a/app/components/app/Copyright.vue
+++ b/app/components/app/Copyright.vue
@@ -19,20 +19,27 @@ const { t } = useI18n()
</a>
</template>
-<style lang="stylus">
-@keyframes heartbeat
- 0%
- transform scale(.75)
- 20%
- transform scale(1)
- 40%
- transform scale(.75)
- 60%
- transform scale(1.1)
- 80%
- transform scale(.75)
- 100%
- transform scale(.75)
+<style>
+@keyframes heartbeat {
+ 0% {
+ transform: scale(0.75);
+ }
+ 20% {
+ transform: scale(1);
+ }
+ 40% {
+ transform: scale(0.75);
+ }
+ 60% {
+ transform: scale(1.1);
+ }
+ 80% {
+ transform: scale(0.75);
+ }
+ 100% {
+ transform: scale(0.75);
+ }
+}
</style>
<i18n lang="yaml">
diff --git a/app/components/bottomSheet/BottomSheet.vue b/app/components/bottomSheet/BottomSheet.vue
index 993331aa..7064c190 100644
--- a/app/components/bottomSheet/BottomSheet.vue
+++ b/app/components/bottomSheet/BottomSheet.vue
@@ -221,13 +221,15 @@ function onDragging(event: Event): void {
) {
drug.value
?.querySelector('.scrollerBlock')
- ?.classList.add('pointer-events-none')
+ ?.classList
+ .add('pointer-events-none')
drug.value.style.height = `${initialHeight.value - nextCurrentY.value}px`
}
else {
drug.value
?.querySelector('.scrollerBlock')
- ?.classList.remove('pointer-events-none')
+ ?.classList
+ .remove('pointer-events-none')
}
if (isHasScroll && !isHandler.value) {
diff --git a/app/components/bottomSheet/BottomSheetClose.vue b/app/components/bottomSheet/BottomSheetClose.vue
index c4893bec..a386528a 100644
--- a/app/components/bottomSheet/BottomSheetClose.vue
+++ b/app/components/bottomSheet/BottomSheetClose.vue
@@ -1,7 +1,13 @@
+<script setup lang="ts">
+const emit = defineEmits<{
+ onClick: [e: Event]
+}>()
+</script>
+
<template>
<div
- class="bg-item-5 hover:bg-item-6 absolute right-1 top-1 z-30 flex size-8 items-center justify-center rounded-full transition ease-in-out"
- @click="$emit('onClick')"
+ class="absolute right-1 top-1 z-30 flex size-8 items-center justify-center rounded-full bg-item-5 transition ease-in-out hover:bg-item-6"
+ @click="(e: Event) => emit('onClick', e)"
>
<Icon
name="lucide:x"
diff --git a/app/components/bottomSheet/BottomSheetHandler.vue b/app/components/bottomSheet/BottomSheetHandler.vue
index adb225a5..8023313e 100644
--- a/app/components/bottomSheet/BottomSheetHandler.vue
+++ b/app/components/bottomSheet/BottomSheetHandler.vue
@@ -1,9 +1,9 @@
<template>
<div
class="
- flex-center handler hover:bg-item-5 absolute left-0 top-0 z-30
- h-[16px] w-full transition
- after:block after:h-[4px] after:w-[32px] after:rounded after:bg-[var(--c-bg-9)] after:content-['']
+ handler flex-center absolute left-0 top-0 z-30 h-[16px]
+ w-full transition after:block
+ after:h-[4px] after:w-[32px] after:rounded after:bg-item-11 after:content-[''] hover:bg-item-5
"
/>
</template>
diff --git a/app/components/bottomSheet/BottomSheetOrDropdown.vue b/app/components/bottomSheet/BottomSheetOrDropdown.vue
index a287befb..a0afc2d9 100644
--- a/app/components/bottomSheet/BottomSheetOrDropdown.vue
+++ b/app/components/bottomSheet/BottomSheetOrDropdown.vue
@@ -3,6 +3,7 @@ import { usePointer, useWindowSize } from '@vueuse/core'
const props = defineProps<{
bottomSheetStyle?: Record<string, string>
+ drugClassesCustom?: string
isOpen?: boolean
placement?: string
title: string
@@ -49,7 +50,7 @@ const isLaptop = computed(() => width.value >= 766 && pointerType.value === 'mou
<BottomSheet
v-if="props.isOpen"
isShow
- drugClassesCustom="bottomSheetDrugClassesCustom"
+ :drugClassesCustom="`${props.drugClassesCustom ?? ''}`"
:drugStyle="props.bottomSheetStyle"
@closed="emit('onCloseModal')"
>
diff --git a/app/components/categories/Form.vue b/app/components/categories/Form.vue
index e1a6eb09..812ab5df 100644
--- a/app/components/categories/Form.vue
+++ b/app/components/categories/Form.vue
@@ -311,7 +311,7 @@ async function onSave() {
:key="icon"
:class="[{ '!border-accent-1': icon === props.categoryForm.icon }]"
:style="{ background: props.categoryForm.color }"
- class="text-icon-primary flex-center size-10 cursor-pointer rounded-full border-2 border-transparent"
+ class="flex-center size-10 cursor-pointer rounded-full border-2 border-transparent text-icon-primary"
@click="emit('updateValue', 'icon', icon)"
>
<Icon :name="icon" size="20" />
diff --git a/app/components/categories/Header.vue b/app/components/categories/Header.vue
index 8d726bf1..a04f762b 100644
--- a/app/components/categories/Header.vue
+++ b/app/components/categories/Header.vue
@@ -16,7 +16,7 @@ const props = defineProps<{
<div
v-if="props.parentCategory"
- class="text-item-2 flex items-center gap-2 pt-[2px] text-xs font-medium leading-none"
+ class="flex items-center gap-2 pt-[2px] text-xs font-medium leading-none text-item-2"
>
<div class="text-2xs text-4">
•
diff --git a/app/components/categories/Item.vue b/app/components/categories/Item.vue
index 67084149..b4859058 100644
--- a/app/components/categories/Item.vue
+++ b/app/components/categories/Item.vue
@@ -46,7 +46,7 @@ const parentCategory = computed(() => categoriesStore.items[props.category?.pare
/>
</template>
- <div class="text-3 grid grow gap-0.5">
+ <div class="grid grow gap-0.5 text-3">
<CategoriesName
:alt="props.alt"
:category="props.category"
diff --git a/app/components/categories/Name.vue b/app/components/categories/Name.vue
index c84aca81..2ab79844 100644
--- a/app/components/categories/Name.vue
+++ b/app/components/categories/Name.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
import { cn } from '~~/lib/cn'
+
import type { CategoryItem } from '~/components/categories/types'
const props = defineProps<{
@@ -19,18 +20,18 @@ const props = defineProps<{
>
<!-- Parent category name -->
<template v-if="alt && isShowParent && !props.hasChildren && props.category?.parentId">
- <div class="text-2xs text-4 leading-none">
+ <div class="text-2xs leading-none text-4">
{{ props.parentCategory?.name }}
</div>
</template>
<!-- Base name -->
- <div class="text-3 flex items-center gap-2 text-nowrap text-sm leading-none">
+ <div class="flex items-center gap-2 text-nowrap text-sm leading-none text-3">
{{ props.category?.name }}
<!-- Has childs -->
<div
v-if="props.isShowDots && props.hasChildren"
- class="text-4 text-sm leading-none"
+ class="text-sm leading-none text-4"
>
...
</div>
@@ -45,11 +46,11 @@ const props = defineProps<{
<!-- Parent category name -->
<template v-if="!alt && isShowParent && !props.hasChildren && props.category?.parentId">
- <div class="text-2xs text-4 text-nowrap leading-none">
+ <div class="text-nowrap text-2xs leading-none text-4">
•
</div>
- <div class="text-2xs text-4 leading-none">
+ <div class="text-2xs leading-none text-4">
{{ props.parentCategory?.name }}
</div>
</template>
diff --git a/app/components/categories/Selector.vue b/app/components/categories/Selector.vue
index e7705707..0e8cd4c4 100644
--- a/app/components/categories/Selector.vue
+++ b/app/components/categories/Selector.vue
@@ -1,7 +1,6 @@
<script setup lang="ts">
import type { CategoryId } from '~/components/categories/types'
-import { getParentCategory } from '~/components/categories/getCategories'
import { useCategoriesStore } from '~/components/categories/useCategoriesStore'
const props = defineProps<{
@@ -67,9 +66,9 @@ onMounted(() => {
:key="categoryId"
class="group"
:class="{
- 'bg-item-4 relative mb-2 rounded-md': opened.includes(categoryId),
- 'bg-item-4 rounded-md': isChildsSelected(categoryId),
- '!border-accent-1/60 border': isEveryChildsSelected(categoryId),
+ 'relative mb-2 rounded-md bg-item-4': opened.includes(categoryId),
+ 'rounded-md bg-item-4': isChildsSelected(categoryId),
+ 'border !border-accent-1/60': isEveryChildsSelected(categoryId),
}"
>
<CategoriesItem
diff --git a/app/components/categories/Selector2.vue b/app/components/categories/Selector2.vue
index e579548b..2aa93680 100644
--- a/app/components/categories/Selector2.vue
+++ b/app/components/categories/Selector2.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
import type { CategoryId } from '~/components/categories/types'
+
import { useCategoriesStore } from '~/components/categories/useCategoriesStore'
const props = defineProps<{
@@ -35,7 +36,7 @@ function onFilter(id: CategoryId) {
</script>
<template>
- <div class="3sm:grid-cols-2 grid p-2 pt-1">
+ <div class="grid p-2 pt-1 3sm:grid-cols-2">
<CategoriesItem
v-for="categoryId in props.ids"
:key="categoryId"
diff --git a/app/components/categories/getForm.ts b/app/components/categories/getForm.ts
index 4f1ec110..134afe98 100644
--- a/app/components/categories/getForm.ts
+++ b/app/components/categories/getForm.ts
@@ -1,6 +1,7 @@
-import icons from '~/assets/js/icons'
import type { CategoryForm } from '~/components/categories/types'
+
import { random } from '~/assets/js/emo'
+import icons from '~/assets/js/icons'
import { colorsArray } from '~/components/color/colors'
export function getPreparedFormData(values?: any): CategoryForm {
diff --git a/app/components/categories/page/New.vue b/app/components/categories/page/New.vue
index af2ffea7..6ad31e1e 100644
--- a/app/components/categories/page/New.vue
+++ b/app/components/categories/page/New.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
import type { CategoryId } from '~/components/categories/types'
+
import { getPreparedFormData } from '~/components/categories/getForm'
const { t } = useI18n()
diff --git a/app/components/categories/page/id/Edit.vue b/app/components/categories/page/id/Edit.vue
index c958da1a..d0a6c2d8 100644
--- a/app/components/categories/page/id/Edit.vue
+++ b/app/components/categories/page/id/Edit.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { CategoryId, CategoryItem } from '~/components/categories/types'
+
import { getPreparedFormData } from '~/components/categories/getForm'
-import { getParentCategory } from '~/components/categories/getCategories'
import { useCategoriesStore } from '~/components/categories/useCategoriesStore'
const { t } = useI18n()
diff --git a/app/components/categories/useCategoriesStore.ts b/app/components/categories/useCategoriesStore.ts
index 1560e8ed..7f5adf3c 100644
--- a/app/components/categories/useCategoriesStore.ts
+++ b/app/components/categories/useCategoriesStore.ts
@@ -1,7 +1,7 @@
-import { getDataAndWatch, removeData, saveData, unsubscribeData, updateData } from '~~/services/firebase/api'
import localforage from 'localforage'
-import { type ComputedRef, type ShallowRef, computed, shallowRef } from 'vue'
+import { computed, type ComputedRef, type ShallowRef, shallowRef } from 'vue'
import { deepUnref } from 'vue-deepunref'
+import { getDataAndWatch, removeData, saveData, unsubscribeData, updateData } from '~~/services/firebase/api'
import type { AddCategoryParams, Categories, CategoryId, CategoryItem, CategoryItemWithId } from '~/components/categories/types'
import type { TrnId } from '~/components/trns/types'
diff --git a/app/components/categories/utils.test.ts b/app/components/categories/utils.test.ts
index a7e6ec04..30d6926c 100644
--- a/app/components/categories/utils.test.ts
+++ b/app/components/categories/utils.test.ts
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest'
-import { getTransactibleCategoriesIds, getTransferCategoriesIds } from '~/components/categories/utils'
+
import type { Categories } from '~/components/categories/types'
+import { getTransactibleCategoriesIds, getTransferCategoriesIds } from '~/components/categories/utils'
+
export const mockCategories: Categories = {
child1: {
color: 'red',
diff --git a/app/components/color/Palette.vue b/app/components/color/Palette.vue
index 7c096092..0aabee83 100644
--- a/app/components/color/Palette.vue
+++ b/app/components/color/Palette.vue
@@ -52,7 +52,7 @@ function findWalletWithColor(color: string) {
<div
v-if="props.isWallet && findWalletWithColor(color)"
- class="bg-item-3 size-3 rounded-full"
+ class="size-3 rounded-full bg-item-3"
/>
</div>
</div>
@@ -66,7 +66,7 @@ function findWalletWithColor(color: string) {
</template>
<input
:value="activeColor"
- class="border-item-5 focus:text-item-1 focus:bg-item-5 focus:border-accent-4 h-12 w-full rounded-lg border border-solid p-0 transition ease-in-out focus:outline-none"
+ class="h-12 w-full rounded-lg border border-solid border-item-5 p-0 transition ease-in-out focus:border-accent-4 focus:bg-item-5 focus:text-item-1 focus:outline-none"
type="color"
@input="(event: HTMLInputEvent) => emit('click', event.target.value)"
>
diff --git a/app/components/currencies/useCurrenciesStore.ts b/app/components/currencies/useCurrenciesStore.ts
index 511bf669..ba052708 100644
--- a/app/components/currencies/useCurrenciesStore.ts
+++ b/app/components/currencies/useCurrenciesStore.ts
@@ -1,6 +1,6 @@
-import { getDataOnce, saveData } from '~~/services/firebase/api'
import { startOfDay } from 'date-fns'
import localforage from 'localforage'
+import { getDataOnce, saveData } from '~~/services/firebase/api'
import type { CurrencyCode, Rates } from '~/components/currencies/types'
diff --git a/app/components/date/LinkItem.vue b/app/components/date/LinkItem.vue
index 1b647c91..d5923baa 100644
--- a/app/components/date/LinkItem.vue
+++ b/app/components/date/LinkItem.vue
@@ -17,7 +17,7 @@ const emit = defineEmits<{
'!bg-item-5': props.isActive,
},
]"
- class="font-primary text-nowrap rounded-full text-xs leading-none"
+ class="text-nowrap rounded-full font-primary text-xs leading-none"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/date/LinkItemNoBg.vue b/app/components/date/LinkItemNoBg.vue
index 60dde9cf..87ec4d84 100644
--- a/app/components/date/LinkItemNoBg.vue
+++ b/app/components/date/LinkItemNoBg.vue
@@ -16,7 +16,7 @@ const emit = defineEmits<{
'bg-item-5 text-accent-1': props.isActive,
},
]"
- class="text-2xs text-2 font-primary text-nowrap rounded-full leading-none"
+ class="text-nowrap rounded-full font-primary text-2xs leading-none text-2"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/date/Trns.vue b/app/components/date/Trns.vue
index d32d69ad..ad9c712a 100644
--- a/app/components/date/Trns.vue
+++ b/app/components/date/Trns.vue
@@ -16,7 +16,7 @@ const formattedDate = computed(() => formatDate(props.date, 'full'))
</div>
<div class="text-2">
- <div class="text-2xs pb-[2px] leading-none">
+ <div class="pb-[2px] text-2xs leading-none">
{{ formattedDate.weekday }}
</div>
diff --git a/app/components/date/utils.ts b/app/components/date/utils.ts
index 8d7bb2e4..66e0e1d2 100644
--- a/app/components/date/utils.ts
+++ b/app/components/date/utils.ts
@@ -1,8 +1,9 @@
import { differenceInDays, endOfDay, endOfMonth, endOfWeek, endOfYear, format, startOfDay, startOfMonth, startOfWeek, startOfYear, sub } from 'date-fns'
import { ru } from 'date-fns/locale'
+
+import type { LocaleSlug } from '~/components/app/locale/types'
import type { IntervalsInRangeProps, Range } from '~/components/date/types'
import type { PeriodNameWithAll } from '~/components/filter/types'
-import type { LocaleSlug } from '~/components/app/locale/types'
export function formatByLocale(date: Date, formatter: string, locale?: LocaleSlug) {
const formatOptions = locale === 'ru' ? { locale: ru } : {}
diff --git a/app/components/demo/data.ts b/app/components/demo/data.ts
index 6ee984d2..e978f3fd 100644
--- a/app/components/demo/data.ts
+++ b/app/components/demo/data.ts
@@ -6,16 +6,6 @@ const data: {
wallets: Wallets
} = {
categories: {
- '06ca25500ef2': {
- color: '#4fc3f7',
- editedAt: 1585408861256,
- icon: 'mdi:airplane',
- name: 'Travel',
- order: 11,
- parentId: 0,
- showInLastUsed: true,
- showInQuickSelector: false,
- },
'4b6473ee7324': {
color: '#d84315',
editedAt: 1585408887791,
@@ -26,6 +16,16 @@ const data: {
showInLastUsed: true,
showInQuickSelector: false,
},
+ '06ca25500ef2': {
+ color: '#4fc3f7',
+ editedAt: 1585408861256,
+ icon: 'mdi:airplane',
+ name: 'Travel',
+ order: 11,
+ parentId: 0,
+ showInLastUsed: true,
+ showInQuickSelector: false,
+ },
'd564ed02cf7f': {
color: '#8bc34a',
editedAt: 1585408861256,
@@ -186,6 +186,7 @@ const data: {
color: '#1565c0',
currency: 'RUB',
desc: '',
+ editedAt: 1585408895295,
isWithdrawal: true,
name: 'Rubles Cash',
order: 4,
@@ -195,6 +196,7 @@ const data: {
color: '#ef5350',
currency: 'USD',
desc: '',
+ editedAt: 1585408895295,
isWithdrawal: true,
name: 'USD',
order: 10,
@@ -204,6 +206,7 @@ const data: {
color: '#ad1457',
currency: 'USD',
desc: 'Money for study',
+ editedAt: 1585408895295,
isWithdrawal: true,
name: 'Study',
order: 9,
@@ -213,6 +216,7 @@ const data: {
color: '#388e3c',
currency: 'USD',
desc: 'Money for party',
+ editedAt: 1585408895295,
isArchived: true,
isWithdrawal: true,
name: 'Party',
@@ -223,6 +227,7 @@ const data: {
color: '#1565c0',
currency: 'RUB',
desc: 'Money for auto',
+ editedAt: 1585408895295,
isWithdrawal: true,
name: 'Auto',
order: 3,
@@ -233,6 +238,7 @@ const data: {
creditLimit: 160000,
currency: 'RUB',
desc: 'Money for office',
+ editedAt: 1585408895295,
name: 'Credit Card',
order: 1,
type: 'credit',
diff --git a/app/components/demo/useDemo.ts b/app/components/demo/useDemo.ts
index e4c3f7c9..653b2602 100644
--- a/app/components/demo/useDemo.ts
+++ b/app/components/demo/useDemo.ts
@@ -1,12 +1,14 @@
-import localforage from 'localforage'
import { startOfYear, subYears } from 'date-fns'
-import currencies from '~/components/demo/currencies.json'
-import data from '~/components/demo/data'
+import localforage from 'localforage'
+
import type { AddCategoryParams, CategoryId } from '~/components/categories/types'
import type { TrnId, Trns } from '~/components/trns/types'
import type { WalletId, WalletItem, Wallets } from '~/components/wallets/types'
+
import { useCategoriesStore } from '~/components/categories/useCategoriesStore'
import { useCurrenciesStore } from '~/components/currencies/useCurrenciesStore'
+import currencies from '~/components/demo/currencies.json'
+import data from '~/components/demo/data'
import { useTrnsStore } from '~/components/trns/useTrnsStore'
import { useWalletsStore } from '~/components/wallets/useWalletsStore'
@@ -34,7 +36,7 @@ export function useDemo() {
const startDate = subYears(startOfYear(new Date()), config.subtractYears).getTime()
const endDate = new Date().getTime()
- const trns: Trns = [...Array(config.trnsCount)].reduce((acc, _, i) => {
+ const trns: Trns = [...Array.from({ length: config.trnsCount })].reduce((acc, _, i) => {
return {
...acc,
[i]: {
diff --git a/app/components/filter/useFilter.ts b/app/components/filter/useFilter.ts
index be416062..725877a4 100644
--- a/app/components/filter/useFilter.ts
+++ b/app/components/filter/useFilter.ts
@@ -1,5 +1,6 @@
import type { CategoryId } from '~/components/categories/types'
import type { WalletId } from '~/components/wallets/types'
+
import { useCategoriesStore } from '~/components/categories/useCategoriesStore'
import { useWalletsStore } from '~/components/wallets/useWalletsStore'
diff --git a/app/components/form/Switch.vue b/app/components/form/Switch.vue
index ccabdd58..7d63127c 100644
--- a/app/components/form/Switch.vue
+++ b/app/components/form/Switch.vue
@@ -10,44 +10,19 @@ const emit = defineEmits<{
</script>
<template>
- <div class="checkboxBlock" @click="emit('click', !value)">
- <div v-if="title" class="checkbox__title">
+ <div class="flex items-center" @click="emit('click', !value)">
+ <div v-if="title" class="grow pr-4">
{{ title }}
</div>
- <div :class="{ _active: value }" class="checkbox rounded-xl transition ease-in-out">
- <div class="checkbox__in rounded-xl transition ease-in-out" />
+ <div
+ :class="{ 'bg-blue-500': value, 'bg-item-11': !value }"
+ class="relative h-6 w-11 rounded-xl transition-colors ease-in-out"
+ >
+ <div
+ :class="{ 'translate-x-[18px]': value }"
+ class="absolute left-[3px] top-[2px] size-5 rounded-xl bg-white shadow-md transition-transform ease-in-out"
+ />
</div>
</div>
</template>
-
-<style lang="stylus" scoped>
-.checkboxBlock
- display flex
- align-items center
-
-.checkbox
- position relative
- width 44px
- height 24px
- background var(--c-bg-9)
-
- &._active
- background var(--c-blue-3)
-
- &__in
- position absolute
- top 2px
- left 3px
- width 20px
- height 20px
- background var(--c-font-2)
- box-shadow 0 0 4px rgba(0, 0, 0, .25)
-
- ^[0]._active &
- transform translateX(18px)
-
- &__title
- flex-grow 1
- padding-right 16px
-</style>
diff --git a/app/components/icon/3.vue b/app/components/icon/3.vue
deleted file mode 100644
index e401d93f..00000000
--- a/app/components/icon/3.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<script setup lang="ts">
-const props = defineProps<{
- abbr?: string | null
- background?: string
- big?: boolean
- category?: boolean
- color?: string
- icon?: string
- invert?: boolean
- medium?: boolean
- round?: boolean
- small?: boolean
-}>()
-
-const classes = computed(() => ({
- _big: props.big,
- _category: props.category,
- _invert: props.invert,
- _medium: props.medium,
- _round: props.round,
- _small: props.small,
-}))
-</script>
-
-<template>
- <div
- class="icon"
- :class="classes"
- :style="{ background, color }"
- >
- <!-- Wallet -->
- <template v-if="abbr">
- <div class="icon__abbr">
- {{ abbr.substring(0, 2) }}
- </div>
- </template>
-
- <!-- Category -->
- <template v-else>
- <div class="icon__image">
- <template v-if="icon">
- <div :class="icon" />
- </template>
- <template v-else>
- <div class="mdi:folder-star" />
- </template>
- </div>
- </template>
- </div>
-</template>
-
-<style lang="stylus" scoped>
-.icon
- display flex
- align-items center
- justify-content center
- width 32px
- height 32px
- color var(--c-font-1)
- border-radius 6px
-
- &._invert
- color var(--c-font-5)
- background var(--c-bg-10)
- &._round
- border-radius 50%
- &._small
- width 18px
- height 18px
- &._medium
- width 24px
- height 24px
- &._big
- width 48px
- height 48px
- &._category
- width auto
- height auto
- padding-bottom 6px
- &._category._small
- padding-bottom 0
-
- &__image
- font-size 20px
- ^[0]._small &
- font-size 14px
- ^[0]._medium &
- font-size 14px
- ^[0]._big &
- font-size 24px
- ^[0]._category &
- font-size 32px
- ^[0]._category._small &
- font-size 22px
-
- &__abbr
- font-size 12px
- font-weight 400
-
- ^[0]._small &
- font-size 10px
-</style>
diff --git a/app/components/layout/MenuBottom.vue b/app/components/layout/MenuBottom.vue
index 263209e6..9ecf797c 100644
--- a/app/components/layout/MenuBottom.vue
+++ b/app/components/layout/MenuBottom.vue
@@ -6,12 +6,12 @@ const { itemsBottom } = useMenuData()
<template>
<div
- class="sm:bottom-inherit bg-foreground-3/80 absolute bottom-0 left-0 z-20 mx-auto flex w-full items-stretch backdrop-blur sm:hidden lg:hidden"
+ class="sm:bottom-inherit absolute bottom-0 left-0 z-20 mx-auto flex w-full items-stretch bg-foreground-2/80 backdrop-blur sm:hidden lg:hidden"
>
- <LayoutMenuSidebarItem
+ <LayoutSidebarMenuItem
v-for="(item, menuId) in itemsBottom"
:key="menuId"
- :isShowTitle="false"
+ :isShowText="false"
:item
:menuId
class="flex-center is-bigger grow"
diff --git a/app/components/layout/MenuBottomModal.vue b/app/components/layout/MenuBottomModal.vue
index 040cc069..616bb7d8 100644
--- a/app/components/layout/MenuBottomModal.vue
+++ b/app/components/layout/MenuBottomModal.vue
@@ -21,7 +21,7 @@ const { isDemo } = useDemo()
<BottomSheetClose @onClick="close" />
</template>
- <div class="bg-foreground-1 grid gap-3 px-1 py-3">
+ <div class="grid gap-3 bg-foreground-1 px-1 py-3">
<!-- User -->
<div
v-if="userStore.user"
@@ -35,7 +35,7 @@ const { isDemo } = useDemo()
</div>
</div>
- <LayoutMenuSidebar />
+ <LayoutSidebarMenu />
<div class="pl-2">
<AppThemeSwitcher isShowSystem />
diff --git a/app/components/layout/Sidebar.vue b/app/components/layout/Sidebar.vue
index 0423f2f3..24ff7c9f 100644
--- a/app/components/layout/Sidebar.vue
+++ b/app/components/layout/Sidebar.vue
@@ -4,7 +4,6 @@ import { useWindowSize } from '@vueuse/core'
import type { WalletId } from '~/components/wallets/types'
import { useDemo } from '~/components/demo/useDemo'
-import { getStyles } from '~/components/ui/getStyles'
import { useUserStore } from '~/components/user/useUserStore'
const props = defineProps<{
@@ -25,27 +24,22 @@ const { width } = useWindowSize()
<template>
<div
- :class="{ 'translate-x-20': props.isShowTrnForm }"
- class="bg-foreground-3 relative h-full overflow-hidden transition-all duration-300 ease-in-out"
+ :class="{
+ '': props.isShowTrnForm && props.isShowSidebar && width >= 767,
+ 'block w-72': props.isShowSidebar && width >= 767,
+ }"
+ class="fixed inset-y-0 left-0 z-10 hidden h-full w-12 overflow-hidden sm:block"
>
- <div class="absolute bottom-1 left-1 hidden w-full items-center md:flex">
- <UiItem1
- class="text-4 bg-foreground-3 z-10"
- @click="emit('toggleSidebar')"
- >
- <Icon :name="props.isShowSidebar ? 'lucide:panel-left-close' : 'lucide:panel-left'" size="18" />
- </UiItem1>
- </div>
-
- <LayoutMenuSidebar
- :isShowTitle="false"
+ <!-- Small menu -->
+ <LayoutSidebarMenu
+ :isShowText="false"
+ :class="{ 'md:hidden': props.isShowSidebar }"
class="sm:align-center hidden h-full flex-col justify-center gap-1 sm:flex"
- :class="{ 'md:hidden': props.isShowSidebar, '!': !props.isShowSidebar }"
/>
<div
v-if="width >= 768 && props.isShowSidebar"
- class="grid h-full min-w-72 content-start gap-6 overflow-hidden overflow-y-auto"
+ class="grid h-full content-start gap-6 overflow-hidden overflow-y-auto"
>
<div class="flex items-center justify-between pl-4 pr-2 pt-5">
<NuxtLink to="/dashboard" class="block cursor-default">
@@ -77,7 +71,7 @@ const { width } = useWindowSize()
</UiButtonBlue>
</div>
- <LayoutMenuSidebar class="px-2 pb-2" />
+ <LayoutSidebarMenu class="px-2 pb-2" />
<div class="px-2 pb-6">
<UiTitle3 class="pb-2 pl-3">
@@ -96,7 +90,7 @@ const { width } = useWindowSize()
:walletId
:lineWidth="1"
:wallet="walletItem"
- :activeItemId="route.params.id as string"
+ :activeItemId="(route.params.id as string)"
class="group"
isShowIcon
@click="() => walletId === route.params.id ? router.push('/dashboard') : router.push(`/wallets/${walletId}`)"
@@ -114,5 +108,14 @@ const { width } = useWindowSize()
</WalletsList>
</div>
</div>
+
+ <div class="absolute bottom-1 left-1 hidden w-full items-center md:flex">
+ <UiItem1
+ class="z-10 bg-foreground-2 text-4"
+ @click="emit('toggleSidebar')"
+ >
+ <Icon :name="props.isShowSidebar ? 'lucide:panel-left-close' : 'lucide:panel-left'" size="18" />
+ </UiItem1>
+ </div>
</div>
</template>
diff --git a/app/components/layout/MenuSidebar.vue b/app/components/layout/SidebarMenu.vue
similarity index 76%
rename from app/components/layout/MenuSidebar.vue
rename to app/components/layout/SidebarMenu.vue
index a48ac509..50929c31 100644
--- a/app/components/layout/MenuSidebar.vue
+++ b/app/components/layout/SidebarMenu.vue
@@ -2,9 +2,9 @@
import useMenuData from '~/components/layout/useMenuData'
withDefaults(defineProps<{
- isShowTitle?: boolean
+ isShowText?: boolean
}>(), {
- isShowTitle: true,
+ isShowText: true,
})
const { items } = useMenuData()
@@ -12,12 +12,12 @@ const { items } = useMenuData()
<template>
<div>
- <LayoutMenuSidebarItem
+ <LayoutSidebarMenuItem
v-for="(item, menuId) in items"
:key="menuId"
:item
:menuId
- :isShowTitle
+ :isShowText
/>
</div>
</template>
diff --git a/app/components/layout/MenuSidebarItem.vue b/app/components/layout/SidebarMenuItem.vue
similarity index 88%
rename from app/components/layout/MenuSidebarItem.vue
rename to app/components/layout/SidebarMenuItem.vue
index d90db0c6..18256e12 100644
--- a/app/components/layout/MenuSidebarItem.vue
+++ b/app/components/layout/SidebarMenuItem.vue
@@ -3,12 +3,12 @@ import useMenuData, { type MenuItem } from '~/components/layout/useMenuData'
import { getStyles } from '~/components/ui/getStyles'
const props = withDefaults(defineProps<{
- isShowTitle?: boolean
+ isShowText?: boolean
item: MenuItem
menuId: string
position?: 'bottom'
}>(), {
- isShowTitle: true,
+ isShowText: true,
})
const { checkIsActive, onClick } = useMenuData()
@@ -20,7 +20,7 @@ const { checkIsActive, onClick } = useMenuData()
getStyles('item', ['center', 'link', 'minh1', 'rounded', 'padding1']),
{
'!text-1': checkIsActive(props.menuId),
- 'gap-3': props.isShowTitle,
+ 'gap-3': props.isShowText,
},
]"
class="group"
@@ -35,7 +35,7 @@ const { checkIsActive, onClick } = useMenuData()
</div>
<div
- v-if="props.isShowTitle"
+ v-if="props.isShowText"
class="text-sm"
>
{{ item.name }}
diff --git a/app/components/stat/CategoriesButtons.vue b/app/components/stat/CategoriesButtons.vue
index 6fb8db3f..f4004357 100644
--- a/app/components/stat/CategoriesButtons.vue
+++ b/app/components/stat/CategoriesButtons.vue
@@ -201,7 +201,7 @@ const isShow = ref(false)
>
<template #trigger>
<UiItem1
- class="group-data-[headlessui-state='open']:!border-accent-1 border border-transparent"
+ class="border border-transparent group-data-[headlessui-state='open']:!border-accent-1"
>
<Icon name="lucide:circle-ellipsis" size="20" />
</UiItem1>
@@ -210,7 +210,7 @@ const isShow = ref(false)
<template #content="{ close }">
<div class="grid min-w-80 gap-4 px-1 pt-3 md:px-3">
<BottomSheetClose @click="close" />
- <div class="border-item-3 grid gap-4 border-b pb-3">
+ <div class="grid gap-4 border-b border-item-3 pb-3">
<!-- Grouping -->
<div class="grid gap-3">
<UiTitleOption>
@@ -280,7 +280,7 @@ const isShow = ref(false)
<!-- List -->
<div
v-if="statConfig.config.value.catsView === 'list'"
- class="border-item-3 grid gap-3 border-b pb-2 last:border-0"
+ class="grid gap-3 border-b border-item-3 pb-2 last:border-0"
>
<UiTitleOption>{{ t('listItemsOptions') }}</UiTitleOption>
<div class="flex gap-1">
@@ -362,7 +362,7 @@ const isShow = ref(false)
<!-- Vertical -->
<div
v-if="props.catsLength > 1"
- class="border-item-3 grid border-b pb-2 last:border-0 md:pb-0"
+ class="grid border-b border-item-3 pb-2 last:border-0 md:pb-0"
>
<UiTitleOption class="pb-2">
{{ t('stat.config.categories.vertical.label') }}
@@ -418,7 +418,7 @@ const isShow = ref(false)
<!-- TODO: use StatConfig -->
<div
v-if="false"
- class="border-item-3 border-b pb-2 last:border-0 last:pb-0"
+ class="border-b border-item-3 pb-2 last:border-0 last:pb-0"
>
<!-- Favorite -->
<UiElement
diff --git a/app/components/stat/Config.vue b/app/components/stat/Config.vue
index c833147d..068343b5 100644
--- a/app/components/stat/Config.vue
+++ b/app/components/stat/Config.vue
@@ -40,7 +40,7 @@ const isShow = ref(false)
<BottomSheetClose @click="close" />
<!-- Chart -->
- <div class="border-item-3 border-b pb-3">
+ <div class="border-b border-item-3 pb-3">
<UiTitleOption class="pb-2">
{{ t("stat.config.chartShow.title") }}
</UiTitleOption>
@@ -108,7 +108,7 @@ const isShow = ref(false)
<!-- Showed wallets -->
<div
v-if="props.isShowWallets"
- class="border-item-3 border-b pb-3"
+ class="border-b border-item-3 pb-3"
>
<UiTitleOption class="pb-2">
{{ t("stat.config.wallets.title") }}
diff --git a/app/components/stat/Item.vue b/app/components/stat/Item.vue
index 325d3ae0..51918c1a 100644
--- a/app/components/stat/Item.vue
+++ b/app/components/stat/Item.vue
@@ -113,6 +113,7 @@ const averageTotal = computed(() => {
const items = {
month: 0,
+ // eslint-disable-next-line perfectionist/sort-objects
week: 0,
// eslint-disable-next-line perfectionist/sort-objects
day: 0,
@@ -238,7 +239,7 @@ function getIntervalsData(trnsIds: TrnId[], intervalsInRange: Range[]) {
@click="onClickSumItem"
/>
- <div class="grid gap-2 pt-3">
+ <div class="grid w-full gap-2 pt-3">
<StatCategoriesSection
v-if="props.hasChildren || (props.preCategoriesIds ?? []).length > 0"
:isOneCategory="props.isOneCategory"
diff --git a/app/components/stat/Menu.vue b/app/components/stat/Menu.vue
index 9c4f5df0..e46397a3 100644
--- a/app/components/stat/Menu.vue
+++ b/app/components/stat/Menu.vue
@@ -32,7 +32,7 @@ const menu = computed(() => {
name: t('money.income'),
})
- if (width.value > 1024) {
+ if (width.value > 766) {
all.push({
id: 'summary',
name: t('money.split'),
@@ -61,7 +61,7 @@ watch(() => props.active, () => {
<template>
<UiTabs2>
- <UiTabsItem5
+ <UiTabsItem4
v-for="item in menu"
:key="item.id"
:isActive="item.id === props.active"
@@ -69,6 +69,6 @@ watch(() => props.active, () => {
@click="onClickStatMenu(item.id)"
>
{{ item.name }}
- </UiTabsItem5>
+ </UiTabsItem4>
</UiTabs2>
</template>
diff --git a/app/components/stat/categories/Line.vue b/app/components/stat/categories/Line.vue
index 06486ffd..2ac7a15b 100644
--- a/app/components/stat/categories/Line.vue
+++ b/app/components/stat/categories/Line.vue
@@ -92,7 +92,7 @@ onLongPress(
ref="longPressRef"
:class="[props.insideClass, {
'-bg-item-4 ': props.isActive,
- 'bg-item-9 rounded-lg': statConfig.config.value.catsList.isItemsBg,
+ 'rounded-lg bg-item-9': statConfig.config.value.catsList.isItemsBg,
}]"
:style="props.insideStyle"
class="relative"
@@ -109,7 +109,7 @@ onLongPress(
v-if="statConfig.config.value.catsList.isLines"
class="absolute bottom-2 left-0 w-full overflow-hidden rounded-lg pl-[52px] pr-3"
>
- <div class="bg-item-3 overflow-hidden rounded-lg">
+ <div class="overflow-hidden rounded-lg bg-item-3">
<div
:style="getBarStyle()"
class="h-1 opacity-60"
diff --git a/app/components/stat/categories/Round.vue b/app/components/stat/categories/Round.vue
index 6b8d7a45..d4a04184 100644
--- a/app/components/stat/categories/Round.vue
+++ b/app/components/stat/categories/Round.vue
@@ -1,8 +1,10 @@
<script setup lang="ts">
import { onLongPress } from '@vueuse/core'
+
import type { CategoryId } from '~/components/categories/types'
import type { StatDateProvider } from '~/components/date/types'
import type { CategoryWithData } from '~/components/stat/types'
+
import { useCategoriesStore } from '~/components/categories/useCategoriesStore'
import { useCurrenciesStore } from '~/components/currencies/useCurrenciesStore'
import { useTrnsFormStore } from '~/components/trnForm/useTrnsFormStore'
@@ -63,7 +65,7 @@ onLongPress(
v-if="category"
ref="longPressRef"
:class="{ 'opacity-60': props.item.value === 0 }"
- class="text-2 hocus:bg-item-5 bg-item-4 hover:bg-item-5 relative flex items-center gap-2 overflow-hidden rounded-full p-1 pr-2"
+ class="relative flex items-center gap-2 overflow-hidden rounded-full bg-item-4 p-1 pr-2 text-2 hover:bg-item-5 hocus:bg-item-5"
>
<div
:style="{ backgroundColor: category?.color }"
diff --git a/app/components/stat/categories/Section.vue b/app/components/stat/categories/Section.vue
index fc444899..5330754c 100644
--- a/app/components/stat/categories/Section.vue
+++ b/app/components/stat/categories/Section.vue
@@ -189,15 +189,17 @@ function updateState(
<template v-if="categoriesWithData.length > 0">
<div
v-if="statConfig.config.value.vertical.isShow && verticalCategories.length > 1"
- class="flex overflow-y-auto pb-2 pl-1 pt-4"
+ class="grid"
>
- <StatCategoriesVertical
- v-for="item in verticalCategories.filter(c => c.value !== 0)"
- :key="item.id"
- :item="item"
- :biggestCatNumber="verticalBiggestCatNumber"
- @click="$emit('clickCategory', item.id)"
- />
+ <div class="flex overflow-hidden overflow-x-auto pb-2 pl-1 pt-4">
+ <StatCategoriesVertical
+ v-for="item in verticalCategories.filter(c => c.value !== 0)"
+ :key="item.id"
+ :item="item"
+ :biggestCatNumber="verticalBiggestCatNumber"
+ @click="$emit('clickCategory', item.id)"
+ />
+ </div>
</div>
<!-- Lines -->
@@ -246,7 +248,7 @@ function updateState(
</template>
<!-- Inside -->
- <div class="border-item-5 ml-5 mt-[-2px] -translate-x-px border-l pl-3">
+ <div class="ml-5 mt-[-2px] -translate-x-px border-l border-item-5 pl-3">
<div
v-if="!item.categories || item.categories.length === 0"
class="mb-3 ml-11"
@@ -311,7 +313,7 @@ function updateState(
</template>
<!-- Inside -->
- <div class="border-item-5 ml-5 mt-[-2px] -translate-x-px border-l pl-14">
+ <div class="ml-5 mt-[-2px] -translate-x-px border-l border-item-5 pl-14">
<TrnsList
:trnsIds="itemInside.trnsIds"
:size="5"
diff --git a/app/components/stat/categories/Vertical.vue b/app/components/stat/categories/Vertical.vue
index 8446a732..99ccb700 100644
--- a/app/components/stat/categories/Vertical.vue
+++ b/app/components/stat/categories/Vertical.vue
@@ -93,9 +93,9 @@ onLongPress(
<div
v-if="category"
ref="longPressRef"
- class="hocus:bg-item-5 rounded p-1"
+ class="rounded p-1 hocus:bg-item-5"
>
- <div class="bg-item-4 flex h-28 items-end rounded">
+ <div class="flex h-28 items-end rounded bg-item-4">
<div
class="relative w-7 rounded-t"
:style="getBarStyle()"
@@ -104,7 +104,7 @@ onLongPress(
:class="{
'text-income-1': props.item.value > 0,
}"
- class="font-secondary absolute top-[-14px] w-full text-center text-xs leading-none"
+ class="absolute top-[-14px] w-full text-center font-secondary text-xs leading-none"
>
{{ amount }}
</div>
diff --git a/app/components/stat/chart/Button.vue b/app/components/stat/chart/Button.vue
index d04e567d..813c4d26 100644
--- a/app/components/stat/chart/Button.vue
+++ b/app/components/stat/chart/Button.vue
@@ -13,10 +13,10 @@ const emit = defineEmits<{
<div
:class="[
getStyles('item', ['link', 'center2', 'minh3', 'rounded3']), {
- '!text-accent-1 !bg-transparent': props.isActive,
+ '!bg-transparent !text-accent-1': props.isActive,
},
]"
- class="text-2xs px-2.5"
+ class="px-2.5 text-2xs"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/stat/chart/Wrap.vue b/app/components/stat/chart/Wrap.vue
index dc417f15..5532084b 100644
--- a/app/components/stat/chart/Wrap.vue
+++ b/app/components/stat/chart/Wrap.vue
@@ -1,6 +1,5 @@
<script setup lang="ts">
import type { Period, StatDateProvider } from '~/components/date/types'
-import type { ChartType } from '~/components/stat/chart/types'
import type { ChartSeries } from '~/components/stat/types'
import type { StatConfigProvider } from '~/components/stat/useStatConfig'
diff --git a/app/components/stat/chart/config.ts b/app/components/stat/chart/config.ts
index 35aa4360..777bc9b2 100644
--- a/app/components/stat/chart/config.ts
+++ b/app/components/stat/chart/config.ts
@@ -5,14 +5,14 @@ import { getCompactAmount, getLocalAmount } from '~/components/stat/chart/utils'
export const seriesOptions: Record<MoneyTypeSlugNew, { color: string, colorLine?: string, localeKey: string, type: ChartType }> = {
expense: {
- color: 'var(--text-expense-1)',
- colorLine: 'var(--text-expense-line)',
+ color: 'var(--expense-1)',
+ colorLine: 'var(--expense-line)',
localeKey: 'money.expense',
type: 'bar',
},
income: {
- color: 'var(--text-income-1)',
- colorLine: 'var(--text-income-line)',
+ color: 'var(--income-1)',
+ colorLine: 'var(--income-line)',
localeKey: 'money.expense',
type: 'bar',
},
diff --git a/app/components/stat/date/Range.vue b/app/components/stat/date/Range.vue
index bd06681b..7ac91cdb 100644
--- a/app/components/stat/date/Range.vue
+++ b/app/components/stat/date/Range.vue
@@ -30,7 +30,7 @@ const date = computed(() => {
{{ date }}
<data
v-if="statDate.params.value.isShowMaxRange && statDate.params.value.intervalSelected === -1"
- class="bg-item-3 text-2xs text-4 flex items-center rounded px-1 py-px leading-none"
+ class="flex items-center rounded bg-item-3 px-1 py-px text-2xs leading-none text-4"
>max</data>
</div>
</template>
diff --git a/app/components/stat/utils.test.ts b/app/components/stat/utils.test.ts
index ead2f8fe..e174cd85 100644
--- a/app/components/stat/utils.test.ts
+++ b/app/components/stat/utils.test.ts
@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest'
-import { sortCategoriesByAmount } from '~/components/stat/utils'
+
import type { CategoryWithData } from '~/components/stat/types'
+import { sortCategoriesByAmount } from '~/components/stat/utils'
+
describe('sortCategoriesByAmount', () => {
it('sort multiple values in correct order', () => {
const categories: CategoryWithData[] = [
diff --git a/app/components/trnForm/Bottom.vue b/app/components/trnForm/Bottom.vue
index 51f06aaa..cc763461 100644
--- a/app/components/trnForm/Bottom.vue
+++ b/app/components/trnForm/Bottom.vue
@@ -77,7 +77,7 @@ onMounted(init)
<BottomSheetClose @onClick="close" />
</template>
- <div class="trnForm bg-foreground-1">
+ <div class="trnForm @container/trnForm bg-foreground-1">
<div ref="sliderRef" class="swiper-container">
<div class="swiper-wrapper">
<!-- History -->
diff --git a/app/components/trnForm/Calendar.vue b/app/components/trnForm/Calendar.vue
index 0884743b..ebdff170 100644
--- a/app/components/trnForm/Calendar.vue
+++ b/app/components/trnForm/Calendar.vue
@@ -1,6 +1,7 @@
<script setup lang="ts">
import 'v-calendar/style.css'
import { DatePicker } from 'v-calendar'
+
import { useTrnsFormStore } from '~/components/trnForm/useTrnsFormStore'
const props = defineProps<{
diff --git a/app/components/trnForm/Categories.vue b/app/components/trnForm/Categories.vue
index b6bc4f95..ff662fef 100644
--- a/app/components/trnForm/Categories.vue
+++ b/app/components/trnForm/Categories.vue
@@ -39,14 +39,14 @@ onMounted(() => {
</script>
<template>
- <div class="contentWrap grid h-full grid-rows-[1fr,auto]">
- <div class="contentWrap__box">
- <div ref="sliderRef" class="swiper-container">
+ <div class="relative grid h-full grid-rows-[1fr,auto] overflow-hidden">
+ <div class="h-full overflow-hidden">
+ <div ref="sliderRef" class="swiper-container h-full">
<div class="swiper-wrapper">
<!-- Recent -->
- <div class="swiper-slide">
+ <div class="swiper-slide h-full">
<div
- class="scrollBlock overflow-scroll-y scrollerBlock text-item-base bg-foreground-1 font-primary rounded-t-2xl px-3 py-4 text-center text-xl font-semibold"
+ class="scrollBlock overflow-scroll-y scrollerBlock rounded-t-2xl bg-foreground-1 px-3 py-4 text-center font-primary text-xl font-semibold"
>
{{ $t("categories.lastUsedTitle") }}
</div>
@@ -61,9 +61,9 @@ onMounted(() => {
</div>
<!-- Main -->
- <div class="swiper-slide">
+ <div class="swiper-slide h-full">
<div
- class="scrollBlock overflow-scroll-y scrollerBlock text-item-base bg-foreground-1 font-primary rounded-t-2xl px-3 py-4 text-center text-xl font-semibold"
+ class="scrollBlock overflow-scroll-y scrollerBlock rounded-t-2xl bg-foreground-1 px-3 py-4 text-center font-primary text-xl font-semibold"
>
{{ $t("categories.title") }}
</div>
@@ -78,9 +78,9 @@ onMounted(() => {
</div>
<!-- Favorite -->
- <div class="swiper-slide">
+ <div class="swiper-slide h-full">
<div
- class="scrollBlock overflow-scroll-y scrollerBlock text-item-base bg-foreground-1 font-primary rounded-t-2xl px-3 py-4 text-center text-xl font-semibold"
+ class="scrollBlock overflow-scroll-y scrollerBlock rounded-t-2xl bg-foreground-1 px-3 py-4 text-center font-primary text-xl font-semibold"
>
{{ $t("categories.favoriteTitle") }}
</div>
@@ -123,24 +123,3 @@ onMounted(() => {
</div>
</div>
</template>
-
-<style lang="stylus" scoped>
-.contentWrap
- overflow hidden
- position relative
-
- &__box
- overflow hidden
- height 100%
-
- .swiper-container
- .swiper-container .swiper-slide
- height 100%
-
-.scrollBlock
- overflow hidden
- display grid
- align-items flex-end
- width 100%
- height 100%
-</style>
diff --git a/app/components/trnForm/Date.vue b/app/components/trnForm/Date.vue
index f7f67b90..82091355 100644
--- a/app/components/trnForm/Date.vue
+++ b/app/components/trnForm/Date.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
import { addDays, isSameDay, subDays } from 'date-fns'
+
import { useDateFormats } from '~/components/date/useDateFormats'
import { useTrnsFormStore } from '~/components/trnForm/useTrnsFormStore'
@@ -32,7 +33,7 @@ function changeDate(way: 'prev' | 'next' | 'today') {
<div class="-ml-1 flex gap-1">
<UPopover class="grow">
<div
- class="text-3 hocus:bg-item-5 grid gap-1 rounded-md p-2 text-sm font-medium leading-none"
+ class="grid gap-1 rounded-md p-2 text-sm font-medium leading-none text-3 hocus:bg-item-5"
v-html="formattedDate"
/>
diff --git a/app/components/trnForm/FloatOpener.vue b/app/components/trnForm/FloatOpener.vue
index 38c4e6ec..5b052041 100644
--- a/app/components/trnForm/FloatOpener.vue
+++ b/app/components/trnForm/FloatOpener.vue
@@ -7,17 +7,17 @@ const { trnFormCreate } = useTrnsFormStore()
<template>
<div
class="
- flex-end hover:bg-item-5 group absolute bottom-0 right-0 z-20 hidden h-dvh items-end justify-center
- transition 2xl:flex
+ group absolute bottom-0 right-0 z-20 hidden h-dvh items-end justify-center transition
+ hover:bg-item-5 2xl:flex
"
@click="trnFormCreate"
>
<div
class="
- text-icon-primary
- _group-hover:bg-accent-1 flex items-center
- justify-center rounded-full
- px-3 py-4 text-2xl
+ _group-hover:bg-accent-1
+ flex items-center justify-center
+ rounded-full px-3
+ py-4 text-2xl text-icon-primary
transition
group-hover:scale-125
"
diff --git a/app/components/trnForm/Main.vue b/app/components/trnForm/Main.vue
index a21ef941..8256c7a2 100644
--- a/app/components/trnForm/Main.vue
+++ b/app/components/trnForm/Main.vue
@@ -96,7 +96,7 @@ const actions = computed(() => ({
/>
<UiTitle3
- class="bg-foreground-1 sticky top-0 z-10 px-3 pb-3 pt-4"
+ class="sticky top-0 z-10 bg-foreground-1 px-3 pb-3 pt-4 md:text-xl"
@click="trnsFormStore.values.trnId = null"
>
{{ trnsFormStore.values.trnId ? t("trnForm.titleEditTrn") : t("trnForm.createTrn") }}
@@ -108,7 +108,7 @@ const actions = computed(() => ({
>
<TrnsItem
:trnItem="trnsStore.computeTrnItem(trnsFormStore.values.trnId)"
- class="bg-item-4 group rounded-lg"
+ class="group rounded-lg bg-item-4"
@click="trnsFormStore.values.trnId = null"
/>
@@ -116,7 +116,7 @@ const actions = computed(() => ({
v-if="showModalConfirm"
class="absolute -bottom-4 left-0 z-10 w-full px-4"
>
- <div class="text-1 bg-foreground-4 border-accent-1 z-10 grid h-full content-center gap-4 rounded-lg border p-3">
+ <div class="z-10 grid h-full content-center gap-4 rounded-lg border border-accent-1 bg-foreground-1 p-3 text-1">
{{ t('base.sure') }}
<div class="flex gap-2">
@@ -134,7 +134,7 @@ const actions = computed(() => ({
/>
</template>
- <div class="text-2 leading-none">
+ <div class="leading-none text-2">
{{ t(item.localeKey) }}
</div>
</UiElement>
@@ -156,7 +156,7 @@ const actions = computed(() => ({
/>
</template>
- <div class="text-2 leading-none">
+ <div class="leading-none text-2">
{{ t(item.localeKey) }}
</div>
</DateLinkItem>
@@ -215,6 +215,24 @@ const actions = computed(() => ({
</div>
</template>
+<style>
+.trnForm {
+ .trnForm__pagination {
+ @apply absolute left-1/2 bottom-[1px] z-[2] flex items-center justify-center w-auto p-1.5 rounded-md bg-foreground-1;
+ transform: translateX(-50%);
+ }
+
+ .swiper-pagination-bullet {
+ @apply block w-1.5 h-1.5 mx-1 rounded-full bg-item-3;
+ opacity: 1;
+ }
+
+ .swiper-pagination-bullet-active {
+ @apply bg-accent-1;
+ }
+}
+</style>
+
<i18n lang="yaml">
en:
trnForm:
diff --git a/app/components/trnForm/Selection.vue b/app/components/trnForm/Selection.vue
index 6d03f3c6..ab57420e 100644
--- a/app/components/trnForm/Selection.vue
+++ b/app/components/trnForm/Selection.vue
@@ -116,7 +116,7 @@ async function onSelectParentCategory(id: CategoryId) {
>
<div class="scrollerBlock h-full overflow-y-auto pb-3">
<UiTitle3
- class="bg-foreground-1 sticky top-0 z-10 px-3 pb-3 pt-4"
+ class="sticky top-0 z-10 bg-foreground-1 px-3 pb-3 pt-4"
@click="trnsFormStore.ui.catsRootModal = true"
>
{{ $t("categories.title") }}
@@ -140,27 +140,12 @@ async function onSelectParentCategory(id: CategoryId) {
}
</style>
-<style lang="stylus">
-.trnFormSelectionPagination
- &.swiper-pagination-horizontal
- z-index 2
- position absolute
- left 50%
- bottom 1px
- display flex
- align-items center
- justify-content center
- width auto
- padding 6px
- background alpha(#171717, .9)
- border-radius 6px
- transform translateX(-50%)
-
- .swiper-pagination-bullet
- opacity 1
- width 6px
- height 6px
- margin 0 4px
- background var(--c-bg-9)
- border-radius 50%
+<style>
+.trnFormSelectionPagination.swiper-pagination-horizontal {
+ @apply absolute bottom-[1px] left-1/2 z-[2] flex w-auto -translate-x-1/2 items-center justify-center rounded-md bg-[rgba(23,23,23,0.9)] p-1.5;
+}
+
+.trnFormSelectionPagination.swiper-pagination-horizontal .swiper-pagination-bullet {
+ @apply m-1 size-1.5 rounded-full bg-item-11 opacity-100;
+}
</style>
diff --git a/app/components/trnForm/SelectionCategoriesFast.vue b/app/components/trnForm/SelectionCategoriesFast.vue
index 22bb12b1..10e8d050 100644
--- a/app/components/trnForm/SelectionCategoriesFast.vue
+++ b/app/components/trnForm/SelectionCategoriesFast.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
import type { CategoryId } from '~/components/categories/types'
+
import { useCategoriesStore } from '~/components/categories/useCategoriesStore'
import { useTrnsFormStore } from '~/components/trnForm/useTrnsFormStore'
@@ -21,7 +22,7 @@ const trnsFormStore = useTrnsFormStore()
class="pb-6"
>
<UiTitle3
- class="bg-foreground-1 sticky top-0 z-20 px-3 pb-3 pt-4"
+ class="sticky top-0 z-20 bg-foreground-1 px-3 pb-3 pt-4"
@click="trnsFormStore.ui.catsRootModal = true"
>
{{ t("categories.favoriteTitle") }}
@@ -39,7 +40,7 @@ const trnsFormStore = useTrnsFormStore()
<!-- Recent categories -->
<div v-if="categoriesStore.recentCategoriesIds.length > 0">
<UiTitle3
- class="bg-foreground-1 sticky top-0 z-20 px-3 pb-3 pt-4"
+ class="sticky top-0 z-20 bg-foreground-1 px-3 pb-3 pt-4"
@click="trnsFormStore.ui.catsRootModal = true"
>
{{ t("categories.lastUsedTitle") }}
diff --git a/app/components/trnForm/SelectionWalletsAll.vue b/app/components/trnForm/SelectionWalletsAll.vue
index 583eb8c2..7872be33 100644
--- a/app/components/trnForm/SelectionWalletsAll.vue
+++ b/app/components/trnForm/SelectionWalletsAll.vue
@@ -3,12 +3,11 @@ import type { WalletId } from '~/components/wallets/types'
import { useTrnsFormStore } from '~/components/trnForm/useTrnsFormStore'
-const props = defineProps<{
+defineProps<{
maxHeight: string
}>()
const emit = defineEmits<{
- close: []
onSelectWallet: [id: WalletId]
}>()
@@ -22,8 +21,7 @@ const trnsFormStore = useTrnsFormStore()
</UiTitleModal>
<WalletsSelector
- :hide="emit('close')"
- :activeItemId="trnsFormStore.values.walletId"
+ :activeItemId="trnsFormStore.values.walletId ?? undefined"
class="min-w-72 px-2 py-px"
@onSelected="id => emit('onSelectWallet', id)"
/>
diff --git a/app/components/trnForm/SelectorCategory.vue b/app/components/trnForm/SelectorCategory.vue
index dd9030fa..c5e8840f 100644
--- a/app/components/trnForm/SelectorCategory.vue
+++ b/app/components/trnForm/SelectorCategory.vue
@@ -22,6 +22,7 @@ const isShow = ref(false)
:title="props.title"
:isOpen="isShow"
:bottomSheetStyle="props.bottomSheetStyle"
+ drugClassesCustom="h-full max-w-md"
@onOpenModal="isShow = true"
@onCloseModal="isShow = false"
>
diff --git a/app/components/trnForm/SelectorWallet.vue b/app/components/trnForm/SelectorWallet.vue
index 169aa888..2037fe8c 100644
--- a/app/components/trnForm/SelectorWallet.vue
+++ b/app/components/trnForm/SelectorWallet.vue
@@ -25,6 +25,7 @@ const isShow = ref(false)
:title="props.title"
:isOpen="isShow"
:bottomSheetStyle="props.bottomSheetStyle"
+ drugClassesCustom="h-full max-w-md"
@onOpenModal="isShow = true"
@onCloseModal="isShow = false"
>
diff --git a/app/components/trnForm/Sidebar.vue b/app/components/trnForm/Sidebar.vue
index 7effd492..7dbcaa3c 100644
--- a/app/components/trnForm/Sidebar.vue
+++ b/app/components/trnForm/Sidebar.vue
@@ -47,46 +47,48 @@ watch(isShow, (v) => {
<Transition name="fadeIn" appear>
<div
v-if="isShow"
- class="trnForm bg-foreground-1 border-item-5 absolute left-0 top-0 z-50 h-full w-96 overflow-hidden border-r-2 shadow-2xl"
+ class="@container/trnForm trnForm absolute inset-y-0 z-50 h-full w-[360px] py-2"
>
- <div class="absolute right-2 top-2">
- <BottomSheetClose @onClick="trnsFormStore.onClose()" />
- </div>
+ <div class="relative h-full overflow-hidden rounded-r-xl border border-item-6 border-l-foreground-2 bg-foreground-2 shadow-2xl">
+ <div class="absolute right-2 top-2">
+ <BottomSheetClose @onClick="trnsFormStore.onClose()" />
+ </div>
- <div ref="sliderRef2" class="swiper-container h-full">
- <div class="swiper-wrapper">
- <!-- Main -->
- <div class="swiper-slide bg-foreground-1 h-full">
- <div class="scroll scrollerBlock grid grid-rows-[auto,1fr] gap-4">
- <TrnFormMain maxHeight="100vh" class="!pb-0" />
+ <div ref="sliderRef2" class="swiper-container h-full">
+ <div class="swiper-wrapper">
+ <!-- Main -->
+ <div class="swiper-slide h-full bg-foreground-1">
+ <div class="scroll scrollerBlock grid grid-rows-[auto,1fr] gap-4">
+ <TrnFormMain maxHeight="100vh" class="!pb-0" />
- <!-- History -->
- <TrnFormTrnsSlide
- :slider="sliderObj"
- :mainSlideIdx="0"
- class="px-2 pb-6"
- />
+ <!-- History -->
+ <TrnFormTrnsSlide
+ :slider="sliderObj"
+ :mainSlideIdx="0"
+ class="px-2 pb-6"
+ />
+ </div>
</div>
- </div>
- <!-- Quick selector -->
- <div
- class="swiper-slide bg-foreground-1"
- :style="{ height: '100%' }"
- >
- <div class="scroll scrollerBlock">
- <div class="py-4">
- <TrnFormSelectionWalletsFast class="pb-6" />
- <TrnFormSelectionCategoriesFast
- @onSelectCategory="id => trnsFormStore.values.categoryId = id"
- />
+ <!-- Quick selector -->
+ <div
+ class="swiper-slide bg-foreground-1"
+ :style="{ height: '100%' }"
+ >
+ <div class="scroll scrollerBlock">
+ <div class="py-4">
+ <TrnFormSelectionWalletsFast class="pb-6" />
+ <TrnFormSelectionCategoriesFast
+ @onSelectCategory="id => trnsFormStore.values.categoryId = id"
+ />
+ </div>
</div>
</div>
</div>
</div>
- </div>
- <div class="trnForm__pagination" />
+ <div class="trnForm__pagination" />
+ </div>
</div>
</Transition>
diff --git a/app/components/trnForm/main/ActionSide.vue b/app/components/trnForm/main/ActionSide.vue
index 8fec3868..fb248efc 100644
--- a/app/components/trnForm/main/ActionSide.vue
+++ b/app/components/trnForm/main/ActionSide.vue
@@ -30,20 +30,11 @@ async function onClickSubmit() {
<template>
<div
:class="{
- '!bg-accent-1/50 hocus:!bg-accent-1/70 !border-transparent': !isMath && isSubmittable,
- '!text-2 !border-item-4': !isSubmittable,
+ '!border-transparent !bg-accent-1/50 hocus:!bg-accent-1/70': !isMath && isSubmittable,
+ '!border-item-4 !text-2': !isSubmittable,
'!text-2': isMath,
}"
- class="
- text-1 border-item-5 hocus:bg-item-5
- hocus:border[red] hocus:scale-[1.02] _max-w-[56px]
- flex
- size-full
- items-center justify-center
- rounded-xl border p-1
- py-4 text-center text-4xl
- transition
- "
+ class="flex size-full items-center justify-center rounded-xl border border-item-5 p-1 py-4 text-center text-4xl text-1 transition hocus:scale-[1.02] hocus:bg-item-5"
@click="onClickSubmit"
>
<Icon v-if="!isMath && isSubmittable" name="mdi:check" />
diff --git a/app/components/trnForm/main/AmountTransfer.vue b/app/components/trnForm/main/AmountTransfer.vue
index 54bbae3f..e89040b9 100644
--- a/app/components/trnForm/main/AmountTransfer.vue
+++ b/app/components/trnForm/main/AmountTransfer.vue
@@ -73,7 +73,7 @@ watch(
<div class="flex items-center gap-2 whitespace-nowrap">
<div
:class="getStyles('item', ['link', 'rounded'])"
- class=" text-1/70 flex min-h-[44px] w-1/2 grow items-center px-3 py-2 text-sm lg:min-h-[42px]"
+ class=" flex min-h-[44px] w-1/2 grow items-center px-3 py-2 text-sm text-1/70 lg:min-h-[42px]"
>
{{ t(slug) }}
</div>
diff --git a/app/components/trnForm/main/Calculator.vue b/app/components/trnForm/main/Calculator.vue
index 897989fc..964c8389 100644
--- a/app/components/trnForm/main/Calculator.vue
+++ b/app/components/trnForm/main/Calculator.vue
@@ -35,7 +35,14 @@ onLongPress(
</script>
<template>
- <div class="grid grid-cols-[.26fr,1fr,.26fr] justify-between gap-0">
+ <div
+ class="
+ _@sm/trnForm:bg-blue-500
+ _@md/trnForm:bg-red-500
+ _@lg/trnForm:bg-green-500
+ _@xs/trnForm:bg-yellow-500
+ grid grid-cols-[auto,1fr,auto] justify-between gap-0"
+ >
<div class="flex flex-col gap-1">
<TrnFormMainCalculatorButton @click="onClick('*')">
<Icon
@@ -54,7 +61,7 @@ onLongPress(
</TrnFormMainCalculatorButton>
</div>
- <div class="flex flex-col gap-1">
+ <div class="flex flex-col gap-1 px-3">
<div
v-for="(row, rowIdx) in buttons"
:key="rowIdx"
@@ -91,7 +98,7 @@ onLongPress(
<Icon name="mdi:comment-text-outline" />
<div
v-if="!!trnsFormStore.values.desc"
- class="bg-accent-1 absolute right-1 top-1 aspect-square w-2 rounded-full"
+ class="absolute right-1 top-1 aspect-square w-2 rounded-full bg-accent-1"
/>
</TrnFormMainCalculatorButton>
diff --git a/app/components/trnForm/main/CalculatorButton.vue b/app/components/trnForm/main/CalculatorButton.vue
index 74627952..cacfbd4a 100644
--- a/app/components/trnForm/main/CalculatorButton.vue
+++ b/app/components/trnForm/main/CalculatorButton.vue
@@ -7,13 +7,18 @@ const emit = defineEmits<{
<template>
<div
class="
- border-item-6 font-secondary text-2 bg-item-4
- hocus:bg-item-5 hocus:border-item-6 hocus:scale-[1.02] flex aspect-square
- w-full max-w-[64px] grow
- items-center justify-center rounded-full border
- p-1
- text-2xl font-normal transition
- md:max-w-[44px]
+ _md:max-w-[44px] _max-w-[64px] @xs/trnForm:w-14 @sm/trnForm:w-16
+ _@md/trnForm:w-20 flex aspect-square w-12 items-center
+ justify-center
+ rounded-full
+ border
+ border-item-6 bg-item-4 p-1
+ font-secondary
+ text-2xl
+ font-normal text-2 transition
+ hocus:scale-[1.02]
+ hocus:border-item-6
+ hocus:bg-item-5
"
tabindex="0"
@click="() => emit('click')"
diff --git a/app/components/trnForm/main/Input.vue b/app/components/trnForm/main/Input.vue
index 6d80e06d..a237f458 100644
--- a/app/components/trnForm/main/Input.vue
+++ b/app/components/trnForm/main/Input.vue
@@ -24,9 +24,9 @@ const { t } = useI18n()
'left-1/2 -translate-x-1/2': !isTransfer,
}]"
class="
- text-1/60
- pointer-events-none absolute
- top-2 text-center text-sm
+ pointer-events-none
+ absolute top-2
+ text-center text-sm text-1/60
"
tabindex="0"
>
@@ -41,7 +41,7 @@ const { t } = useI18n()
}"
:placeholder="t('enterAmount')"
:value="amountRaw"
- class="font-secondary swiper-no-swiping focus:!border-accent-3 border-transparent bg-transparent pb-2 pt-6 text-center !text-3xl placeholder:text-3xl"
+ class="swiper-no-swiping border-transparent bg-transparent pb-2 pt-6 text-center font-secondary !text-3xl placeholder:text-3xl focus:!border-accent-3"
inputmode="tel"
@updateValue="(value: string) => emit('onChange', value || '')"
/>
diff --git a/app/components/trnForm/main/Types.vue b/app/components/trnForm/main/Types.vue
index 3bd44f3b..e1041f29 100644
--- a/app/components/trnForm/main/Types.vue
+++ b/app/components/trnForm/main/Types.vue
@@ -1,6 +1,7 @@
<script setup lang="ts">
-import { useTrnsFormStore } from '~/components/trnForm/useTrnsFormStore'
import type { TrnType } from '~/components/trns/types'
+
+import { useTrnsFormStore } from '~/components/trnForm/useTrnsFormStore'
import { useWalletsStore } from '~/components/wallets/useWalletsStore'
const trnsFormStore = useTrnsFormStore()
diff --git a/app/components/trnForm/modal/Description.vue b/app/components/trnForm/modal/Description.vue
index 501302a2..7e71aa9c 100644
--- a/app/components/trnForm/modal/Description.vue
+++ b/app/components/trnForm/modal/Description.vue
@@ -31,7 +31,7 @@ function onSave(close: () => void) {
<div class="px-2">
<textarea
v-model="desc"
- class="text-item-base bg-item-4 border-item-5 placeholder:text-item-2 focus:text-item-1 focus:bg-item-5 focus:border-accent-4 m-0 h-28 w-full rounded-lg border border-solid px-4 py-3 text-base font-normal transition ease-in-out focus:outline-none"
+ class="m-0 h-28 w-full rounded-lg border border-solid border-item-5 bg-item-4 px-4 py-3 text-base font-normal transition ease-in-out placeholder:text-item-2 focus:border-accent-4 focus:bg-item-5 focus:text-item-1 focus:outline-none"
:placeholder="$t('trnForm.description.placeholder')"
/>
</div>
diff --git a/app/components/trnForm/types.ts b/app/components/trnForm/types.ts
index bb3b9f9a..0ba4f8c3 100644
--- a/app/components/trnForm/types.ts
+++ b/app/components/trnForm/types.ts
@@ -1,7 +1,3 @@
-import type { CategoryId } from '~/components/categories/types'
-import type { TransferType, TrnId, TrnType } from '~/components/trns/types'
-import type { WalletId } from '~/components/wallets/types'
-
export type TrnFormUi = {
catsRootModal: boolean
isShow: boolean
diff --git a/app/components/trnForm/useTrnsFormStore.ts b/app/components/trnForm/useTrnsFormStore.ts
index b40d179d..f3085592 100644
--- a/app/components/trnForm/useTrnsFormStore.ts
+++ b/app/components/trnForm/useTrnsFormStore.ts
@@ -1,5 +1,5 @@
-import { generateId } from '~~/utils/generateId'
import { defineStore } from 'pinia'
+import { generateId } from '~~/utils/generateId'
import type { CategoryId } from '~/components/categories/types'
import type { TrnFormUi } from '~/components/trnForm/types'
diff --git a/app/components/trnForm/utils/calculate.ts b/app/components/trnForm/utils/calculate.ts
index 0ebcf95b..2cd120dd 100644
--- a/app/components/trnForm/utils/calculate.ts
+++ b/app/components/trnForm/utils/calculate.ts
@@ -28,7 +28,7 @@ function isOperator(value: string): boolean {
}
function isValidAction(value: string): value is CalculatorAction {
- return ['*', '+', '.', '/', '=', '-', 'c'].includes(value)
+ return ['*', '+', '-', '.', '/', '=', 'c'].includes(value)
}
function getLastNumber(expression: string): string {
@@ -46,7 +46,7 @@ export function evaluateExpression(value: string): number {
// Using Function constructor is necessary for dynamic evaluation
// but we ensure input is sanitized
// eslint-disable-next-line no-new-func
- const result = Function(`"use strict";return (${expression})`)()
+ const result = new Function(`"use strict";return (${expression})`)()
return result <= Number.MAX_SAFE_INTEGER ? Math.abs(result) : 0
}
diff --git a/app/components/trnForm/utils/formatData.test.ts b/app/components/trnForm/utils/formatData.test.ts
index 6e5d5b8f..bdd61e2f 100644
--- a/app/components/trnForm/utils/formatData.test.ts
+++ b/app/components/trnForm/utils/formatData.test.ts
@@ -161,10 +161,10 @@ tests.forEach((test) => {
const data = test.id === 'transactions'
? formatTransaction(variant.data.expect)
: formatTransfer(variant.data.expect)
- delete data.edited
+ delete data.editedAt
const res = variant.data.become
- delete res.edited
+ delete res.editedAt
expect(data).toEqual(res)
})
diff --git a/app/components/trns/Header.vue b/app/components/trns/Header.vue
deleted file mode 100644
index b4f34356..00000000
--- a/app/components/trns/Header.vue
+++ /dev/null
@@ -1,6 +0,0 @@
-<script setup lang="ts">
-
-</script>
-
-<template>
-</template>
diff --git a/app/components/trns/Item.vue b/app/components/trns/Item.vue
index e125d7f9..ea4062f5 100644
--- a/app/components/trns/Item.vue
+++ b/app/components/trns/Item.vue
@@ -33,7 +33,7 @@ const emit = defineEmits<{
<template v-if="alt">
<div
v-if="date"
- class="text-2xs min-w-10 truncate leading-none"
+ class="min-w-10 truncate text-2xs leading-none"
>
{{ date }}
</div>
@@ -47,7 +47,7 @@ const emit = defineEmits<{
:color="props.trnItem.category?.color"
size="16"
/>
- <div class="text-2 flex items-center gap-2 text-xs leading-none">
+ <div class="flex items-center gap-2 text-xs leading-none text-2">
{{ trnItem.category.name }}
</div>
</div>
@@ -56,7 +56,7 @@ const emit = defineEmits<{
<div class="grid grow gap-1">
<div
v-if="!alt"
- class="text-3 grid grow gap-0.5"
+ class="grid grow gap-0.5 text-3"
>
<CategoriesName
:category="trnItem.category"
@@ -69,7 +69,7 @@ const emit = defineEmits<{
v-if="trnItem.wallet"
class="flex items-center gap-2"
>
- <div class="text-4 text-xs leading-none">
+ <div class="text-xs leading-none text-4">
{{ trnItem.wallet.name }}
</div>
</div>
diff --git a/app/components/trns/List.vue b/app/components/trns/List.vue
index 6158c3fe..b5ced05a 100644
--- a/app/components/trns/List.vue
+++ b/app/components/trns/List.vue
@@ -80,6 +80,20 @@ const typeFilters = computed(() => {
return [all, expense, income, transfers].filter(item => item.isShow)
})
+const isTrnsWithDesc = computed(() => {
+ let ids = props.trnsIds ?? []
+
+ if (filterBy.value !== 'all') {
+ const typeFilter = typeFilters.value.find(item => item.slug === filterBy.value)
+
+ ids = props.trnsIds.filter(id => trnsStore.items[id].type === typeFilter.type)
+ }
+
+ return (ids).some(
+ id => trnsStore.items[id].desc,
+ )
+})
+
const selectedIds = computed(() => {
let ids = props.trnsIds ?? []
@@ -100,20 +114,6 @@ const paginatedTrnsIds = computed(() => selectedIds.value.slice(0, pageNumber.va
const isShowedAllTrns = computed(() => paginatedTrnsIds.value.length === selectedIds.value.length)
-const isTrnsWithDesc = computed(() => {
- let ids = props.trnsIds ?? []
-
- if (filterBy.value !== 'all') {
- const typeFilter = typeFilters.value.find(item => item.slug === filterBy.value)
-
- ids = props.trnsIds.filter(id => trnsStore.items[id].type === typeFilter.type)
- }
-
- return (ids).some(
- id => trnsStore.items[id].desc,
- )
-})
-
function setFilterBy(type: TrnType | undefined) {
if (filterBy.value === type) {
filterBy.value = 'all'
@@ -164,7 +164,7 @@ const groupedTrns = computed(() => {
v-if="isShowFilterByType && typeFilters.length > 2"
class="mb-2 ml-2"
>
- <UiTabsItem5
+ <UiTabsItem4
v-for="filterItem in typeFilters"
:key="filterItem.slug"
:isActive="filterBy === filterItem.slug"
@@ -174,7 +174,7 @@ const groupedTrns = computed(() => {
@click="setFilterBy(filterItem.slug)"
>
{{ filterItem.name }}
- </UiTabsItem5>
+ </UiTabsItem4>
</UiTabs2>
<!-- With Desc -->
@@ -199,7 +199,7 @@ const groupedTrns = computed(() => {
<!-- Group Sum -->
<div
v-if="isShowGroupSum && paginatedTrnsIds.length > 1"
- class="border-item-5 border-b pb-2 pr-3"
+ class="border-b border-item-5 pb-2 pr-3"
>
<Amount
v-if="getTotalOfTrnsIds(paginatedTrnsIds).income !== 0"
@@ -242,11 +242,11 @@ const groupedTrns = computed(() => {
<div
v-for="(groupTrnsIds, date) in groupedTrns"
:key="date"
- class="bg-item-9 overflow-hidden rounded-lg"
+ class="overflow-hidden rounded-lg bg-item-9"
>
<div
- :class="{ '-border-b border-item-5': isShowGroupSum && groupTrnsIds.length > 1 }"
- class="_bg-item-4 flex items-end gap-2 px-3 py-2 pb-1"
+ :class="{ 'border-item-5': isShowGroupSum && groupTrnsIds.length > 1 }"
+ class="flex items-end gap-2 px-3 py-2 pb-1"
>
<DateTrns
:date="+date"
@@ -301,7 +301,7 @@ const groupedTrns = computed(() => {
class="flex-center pt-1"
>
<div
- class="flex-center bg-item-5 text-2 hocus:bg-item-6 rounded-full px-5 py-2 text-sm"
+ class="flex-center rounded-full bg-item-5 px-5 py-2 text-sm text-2 hocus:bg-item-6"
@click="pageNumber = ++pageNumber"
>
{{ t("trns.more") }} {{ paginatedTrnsIds.length }} /
diff --git a/app/components/trns/NoTrns.vue b/app/components/trns/NoTrns.vue
index 24147193..69c14128 100644
--- a/app/components/trns/NoTrns.vue
+++ b/app/components/trns/NoTrns.vue
@@ -1,5 +1,5 @@
<template>
- <div class="flex-center text-2 flex gap-2 py-3 text-center">
+ <div class="flex-center flex gap-2 py-3 text-center text-2">
<Icon name="lucide:tree-palm" size="22" />
<div class="text-base leading-none">
{{ $t("trns.noTrns") }}
diff --git a/app/components/trns/getTrns.test.ts b/app/components/trns/getTrns.test.ts
index 4a4101d1..248ca96e 100644
--- a/app/components/trns/getTrns.test.ts
+++ b/app/components/trns/getTrns.test.ts
@@ -1,7 +1,8 @@
import { describe, expect, it } from 'vitest'
-import { getTrnsIds } from '~/components/trns/getTrns'
import { trnsItems } from '~~/mocks/trns'
+import { getTrnsIds } from '~/components/trns/getTrns'
+
describe('get Transactions IDs', () => {
it('get Transactions IDs in Wallet Cash USD', () => {
const walletsIds = ['walletCashUSD']
diff --git a/app/components/trns/pages/History.vue b/app/components/trns/pages/History.vue
index 90cc22ca..9c983863 100644
--- a/app/components/trns/pages/History.vue
+++ b/app/components/trns/pages/History.vue
@@ -33,14 +33,14 @@ const trnsIds = computed(() => trnsStore.getStoreTrnsIds({
<template v-if="filter.isShow.value" #selected>
<FilterSelected
- class="bg-foreground-3 sticky top-[40px] z-20"
+ class="sticky top-[40px] z-20 bg-foreground-2"
isShowCategories
isShowWallets
/>
</template>
</UiHeader>
- <div class="pageWrapper pt-3">
+ <div class="pageWrapper mb-4 rounded-xl bg-foreground-1 pb-4 pt-3">
<div class="grid gap-3">
<TrnsList
:trnsIds
diff --git a/app/components/trns/useTrnsStore.ts b/app/components/trns/useTrnsStore.ts
index 4e1468da..d0f92bbb 100644
--- a/app/components/trns/useTrnsStore.ts
+++ b/app/components/trns/useTrnsStore.ts
@@ -1,6 +1,6 @@
-import { getDataAndWatch, removeData, saveData, unsubscribeData, updateData } from '~~/services/firebase/api'
import localforage from 'localforage'
import { deepUnref } from 'vue-deepunref'
+import { getDataAndWatch, removeData, saveData, unsubscribeData, updateData } from '~~/services/firebase/api'
import type { Range } from '~/components/date/types'
import type { TrnId, TrnItem, TrnItemFull, Trns, TrnsGetterProps,
diff --git a/app/components/ui/Checkbox.vue b/app/components/ui/Checkbox.vue
index 3eafe0ca..20a08392 100644
--- a/app/components/ui/Checkbox.vue
+++ b/app/components/ui/Checkbox.vue
@@ -17,7 +17,7 @@ function handleClick() {
<template>
<div
- class="hocus:bg-item-5 flex grow items-center gap-3 rounded-lg p-2 text-sm"
+ class="flex grow items-center gap-3 rounded-lg p-2 text-sm hocus:bg-item-5"
@click="handleClick"
>
<FormSwitch
@@ -25,7 +25,7 @@ function handleClick() {
:value="checkboxValue"
/>
- <div class="text-2 grow">
+ <div class="grow text-2">
{{ title }}
</div>
</div>
diff --git a/app/components/ui/Element.vue b/app/components/ui/Element.vue
index 09b4870f..c1f84fa6 100644
--- a/app/components/ui/Element.vue
+++ b/app/components/ui/Element.vue
@@ -46,7 +46,7 @@ const classes = computed(() => cn(
'ml-[48px] group-last/item:hidden': lineWidth === 4,
'group-last:hidden': lineWidth !== 3 && lineWidth !== 4,
}"
- class="bg-item-5 mx-2 h-px"
+ class="mx-2 h-px bg-item-5"
/>
</div>
</template>
diff --git a/app/components/ui/FormInput.vue b/app/components/ui/FormInput.vue
index b807992c..2480828d 100644
--- a/app/components/ui/FormInput.vue
+++ b/app/components/ui/FormInput.vue
@@ -18,7 +18,7 @@ const emit = defineEmits<{
:value="props.value"
:class="getStyles('item', ['link'])"
:type="props.type ?? 'text'"
- class="text-item-base bg-item-4 border-item-5 placeholder:text-item-2 focus:text-item-1 focus:bg-item-5 focus:border-accent-4 m-0 w-full rounded-lg border border-solid px-4 py-2.5 text-base font-normal focus:outline-none"
+ class="m-0 w-full rounded-lg border border-solid border-item-5 bg-item-4 px-4 py-2.5 text-base font-normal placeholder:text-item-2 focus:border-accent-4 focus:bg-item-5 focus:text-item-1 focus:outline-none"
@input="(event: HTMLInputEvent) => emit('updateValue', event.target.value)"
>
</template>
diff --git a/app/components/ui/Header.vue b/app/components/ui/Header.vue
index 04078b2a..389af6cb 100644
--- a/app/components/ui/Header.vue
+++ b/app/components/ui/Header.vue
@@ -1,6 +1,6 @@
<template>
- <div class="bg-foreground-3/80 border-b-foreground-1 sticky top-0 z-20 border-b-2 px-2 py-1 backdrop-blur lg:px-4 2xl:px-8">
- <div class="flex max-w-5xl items-center gap-2">
+ <div class="@lg:py-3 max-w-7xl px-2 py-1 lg:px-4 2xl:px-8">
+ <div class="flex items-center gap-2">
<slot />
<div v-if="$slots.actions" class="ml-auto flex items-center gap-1">
diff --git a/app/components/ui/HeaderLink.vue b/app/components/ui/HeaderLink.vue
index f38787cf..0858f695 100644
--- a/app/components/ui/HeaderLink.vue
+++ b/app/components/ui/HeaderLink.vue
@@ -1,6 +1,4 @@
<script setup lang="ts">
-import { getStyles } from '~/components/ui/getStyles'
-
const props = defineProps<{
icon?: string
}>()
diff --git a/app/components/ui/HeaderTitle.vue b/app/components/ui/HeaderTitle.vue
index 859c2772..9bc23abe 100644
--- a/app/components/ui/HeaderTitle.vue
+++ b/app/components/ui/HeaderTitle.vue
@@ -1,6 +1,9 @@
<template>
<div
- class="font-tertiary text-3 flex min-h-[30px] grow items-center gap-2 px-0.5 text-lg font-semibold leading-none"
+ class="
+ @lg:text-xl flex min-h-[30px] grow items-center gap-2 px-0.5 font-tertiary text-lg font-semibold leading-none
+ text-3
+ "
>
<slot />
</div>
diff --git a/app/components/ui/IconBase.vue b/app/components/ui/IconBase.vue
index 82a89b01..e93afdd2 100644
--- a/app/components/ui/IconBase.vue
+++ b/app/components/ui/IconBase.vue
@@ -23,7 +23,7 @@ const emit = defineEmits<{
:class="{
[cn('rounded-full w-7 p-1.5', props.class)]: props.invert,
}"
- class="flex-center text-icon-primary aspect-square overflow-hidden"
+ class="flex-center aspect-square overflow-hidden text-icon-primary"
@click="(e: Event) => emit('click', e)"
>
<Icon
diff --git a/app/components/ui/Item2.vue b/app/components/ui/Item2.vue
index b1d28e85..cffefedd 100644
--- a/app/components/ui/Item2.vue
+++ b/app/components/ui/Item2.vue
@@ -9,7 +9,7 @@ const emit = defineEmits<{
<template>
<div
:class="getStyles('item', ['link', 'center', 'minh2', 'minw1', 'rounded'])"
- class="border-item-5 bg-item-4 flex items-center justify-between border px-4 py-2.5"
+ class="flex items-center justify-between border border-item-5 bg-item-4 px-4 py-2.5"
@click="(e: Event) => emit('click', e)"
>
<div class="text-sm">
diff --git a/app/components/ui/Logo.vue b/app/components/ui/Logo.vue
index f2bc8daf..f88bd922 100644
--- a/app/components/ui/Logo.vue
+++ b/app/components/ui/Logo.vue
@@ -1,5 +1,5 @@
<template>
- <div class="font-tertiary first-letter:text-accent-1 text-2xl font-bold">
+ <div class="font-tertiary text-2xl font-bold first-letter:text-accent-1">
{{ $t('appName') }}
</div>
</template>
diff --git a/app/components/ui/Page.vue b/app/components/ui/Page.vue
index 9e34a781..addbadeb 100644
--- a/app/components/ui/Page.vue
+++ b/app/components/ui/Page.vue
@@ -1,7 +1,9 @@
<template>
<div
- id="pageScroll"
- class="relative w-full overflow-y-auto overflow-x-hidden pb-[50px] md:pb-0"
+ class="
+ relative rounded-xl bg-foreground-1 pb-[50px]
+ sm:border sm:border-item-5 sm:p-2 md:p-3 lg:p-4
+ "
>
<slot />
</div>
diff --git a/app/components/ui/Tabs1.global.vue b/app/components/ui/Tabs1.global.vue
index 9ea5ad64..54d87449 100644
--- a/app/components/ui/Tabs1.global.vue
+++ b/app/components/ui/Tabs1.global.vue
@@ -1,14 +1,5 @@
<template>
- <div
- class="
- bg-item-4
- flex
- grow items-center
- overflow-hidden
- overflow-x-auto
- rounded-md
- "
- >
+ <div class="@container/tabs flex grow items-center overflow-hidden overflow-x-auto rounded-md bg-item-4">
<slot />
</div>
</template>
diff --git a/app/components/ui/Tabs3.global.vue b/app/components/ui/Tabs3.global.vue
index 6346c500..df09b65b 100644
--- a/app/components/ui/Tabs3.global.vue
+++ b/app/components/ui/Tabs3.global.vue
@@ -1,16 +1,5 @@
<template>
- <div
- class="
- @container/tabs
- flex
- grow
- flex-wrap
- items-center
- gap-x-2
- gap-y-0.5 overflow-hidden
- overflow-x-auto
- "
- >
+ <div class="@container/tabs flex grow flex-wrap items-center gap-x-2 gap-y-0.5 overflow-hidden overflow-x-auto">
<slot />
</div>
</template>
diff --git a/app/components/ui/TabsItem1.vue b/app/components/ui/TabsItem1.vue
index f25f8a86..df56d3b4 100644
--- a/app/components/ui/TabsItem1.vue
+++ b/app/components/ui/TabsItem1.vue
@@ -10,23 +10,10 @@ const emit = defineEmits(['click'])
<template>
<div
- :class="[
- {
- '!bg-item-3': isActive,
- },
- getStyles('item', ['minh2']),
- ]"
- class="
- text-3
- hocus:bg-item-5 @4xl/tabs_text-lg @4xl/tabs_p-3 flex
- flex-1 grow
- select-none
- items-center
- justify-center gap-1
- rounded-lg
- px-2
- text-sm
- "
+ :class="[getStyles('item', ['minh2']), {
+ '!bg-item-3': isActive,
+ }]"
+ class="flex flex-1 grow select-none items-center justify-center gap-1 rounded-lg px-2 text-sm text-3 hocus:bg-item-5"
@click="emit('click')"
>
<slot />
diff --git a/app/components/ui/TabsItem2.vue b/app/components/ui/TabsItem2.vue
index ff60e927..c55cb476 100644
--- a/app/components/ui/TabsItem2.vue
+++ b/app/components/ui/TabsItem2.vue
@@ -10,16 +10,10 @@ const emit = defineEmits(['click'])
<template>
<div
- :class="[
- getStyles('item', ['link', 'rounded', 'minh2', '_minw2']),
- { '!bg-item-3 !text-1': isActive },
- ]"
- class="
- border-1 text-2 flex items-center
- justify-center gap-1
- rounded-md
- px-2 text-sm leading-none
- "
+ :class="[getStyles('item', ['link', 'rounded', 'minh2', '_minw2']), {
+ '!bg-item-3 !text-1': isActive,
+ }]"
+ class="flex items-center justify-center gap-1 rounded-md border-1 px-2 text-sm leading-none text-2"
@click="emit('click')"
>
<slot />
diff --git a/app/components/ui/TabsItem3.vue b/app/components/ui/TabsItem3.vue
index 3196d1a3..6132d705 100644
--- a/app/components/ui/TabsItem3.vue
+++ b/app/components/ui/TabsItem3.vue
@@ -10,22 +10,10 @@ const emit = defineEmits(['click'])
<template>
<div
- :class="[
- {
- '!bg-item-3 !text-accent-1': isActive,
- },
- getStyles('item', ['minh2']),
- ]"
- class="
- text-3
- hocus:bg-item-5 @4xl/tabs_text-lg @4xl/tabs_p-3
- flex grow
- select-none
- items-center justify-center
- gap-1
- px-2
- text-sm
- "
+ :class="[getStyles('item', ['minh2']), {
+ '!bg-item-3 !text-accent-1': isActive,
+ }]"
+ class="flex grow select-none items-center justify-center gap-1 px-2 text-sm text-3 hocus:bg-item-5"
@click="emit('click')"
>
<slot />
diff --git a/app/components/ui/TabsItem4.vue b/app/components/ui/TabsItem4.vue
new file mode 100644
index 00000000..e92ea13e
--- /dev/null
+++ b/app/components/ui/TabsItem4.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts">
+import { getStyles } from '~/components/ui/getStyles'
+
+defineProps<{
+ isActive?: boolean
+}>()
+
+const emit = defineEmits(['click'])
+</script>
+
+<template>
+ <div
+ :class="[getStyles('item', ['link', 'rounded', 'minh3', 'minw2']), {
+ '!bg-item-3 !text-1': isActive,
+ }]"
+ class="flex shrink-0 items-center justify-center gap-1 rounded-lg border-1 px-3 text-sm leading-none text-2"
+ @click="emit('click')"
+ >
+ <slot />
+ </div>
+</template>
diff --git a/app/components/ui/TabsItem5.vue b/app/components/ui/TabsItem5.vue
deleted file mode 100644
index e273866c..00000000
--- a/app/components/ui/TabsItem5.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<script setup lang="ts">
-import { getStyles } from '~/components/ui/getStyles'
-
-defineProps<{
- isActive?: boolean
-}>()
-
-const emit = defineEmits(['click'])
-</script>
-
-<template>
- <div
- :class="[
- getStyles('item', ['link', 'rounded', 'minh3', 'minw2']),
- { '!bg-item-3 !text-1': isActive },
- ]"
- class="
- text-2 border-1 flex shrink-0 items-center
- justify-center
- gap-1 rounded-lg px-3
- text-sm leading-none
- "
- @click="emit('click')"
- >
- <slot />
- </div>
-</template>
diff --git a/app/components/ui/TextSm1.vue b/app/components/ui/TextSm1.vue
index 6c7abb54..7546d09d 100644
--- a/app/components/ui/TextSm1.vue
+++ b/app/components/ui/TextSm1.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="text-2 font-primary text-xs leading-none"
+ class="font-primary text-xs leading-none text-2"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/ui/TextSm2.vue b/app/components/ui/TextSm2.vue
index e1f3b6b3..b928fc40 100644
--- a/app/components/ui/TextSm2.vue
+++ b/app/components/ui/TextSm2.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="text-2 font-primary text-sm leading-none"
+ class="font-primary text-sm leading-none text-2"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/ui/Title3.vue b/app/components/ui/Title3.vue
index e72c8c7e..7eee4825 100644
--- a/app/components/ui/Title3.vue
+++ b/app/components/ui/Title3.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="font-tertiary text-3 text-base font-semibold leading-none"
+ class="font-tertiary text-base font-semibold leading-none text-3"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/ui/Title6.vue b/app/components/ui/Title6.vue
index 58a7043d..e2c7ac97 100644
--- a/app/components/ui/Title6.vue
+++ b/app/components/ui/Title6.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="text-item-base text-2 text-2xs leading-none"
+ class="text-2xs leading-none text-2"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/ui/Title8.vue b/app/components/ui/Title8.vue
index 56649427..9140675e 100644
--- a/app/components/ui/Title8.vue
+++ b/app/components/ui/Title8.vue
@@ -13,7 +13,7 @@ const emit = defineEmits<{
<template>
<div
:class="getStyles('item', ['link', 'center', 'padding3', 'minh2', 'minw1', 'rounded'])"
- class="!text-3 !font-tertiary flex grow items-center gap-2 pb-0 !text-lg font-bold leading-none"
+ class="flex grow items-center gap-2 pb-0 !font-tertiary !text-lg font-bold leading-none !text-3"
@click="emit('click')"
>
<div><slot /></div>
diff --git a/app/components/ui/TitleDropRight.vue b/app/components/ui/TitleDropRight.vue
index a320170f..eb9424fd 100644
--- a/app/components/ui/TitleDropRight.vue
+++ b/app/components/ui/TitleDropRight.vue
@@ -12,7 +12,7 @@ const emit = defineEmits<{
<template>
<div
:class="getStyles('item', ['link', 'center', 'padding3', 'minh2', 'minw1', 'rounded'])"
- class="!text-3 font-tertiary flex grow items-center gap-2 pb-0 text-base font-semibold leading-none"
+ class="flex grow items-center gap-2 pb-0 font-tertiary text-base font-semibold leading-none !text-3"
@click="emit('click')"
>
<Icon
diff --git a/app/components/ui/TitleModal.vue b/app/components/ui/TitleModal.vue
index 3441555c..58d4a06c 100644
--- a/app/components/ui/TitleModal.vue
+++ b/app/components/ui/TitleModal.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="text-3 font-tertiary bg-foreground-1 sticky top-0 z-20 px-3 pb-3 pt-4 text-lg font-semibold leading-none"
+ class="sticky top-0 z-20 bg-foreground-1 px-3 pb-3 pt-4 font-tertiary text-lg font-semibold leading-none text-3"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/ui/TitleOption.vue b/app/components/ui/TitleOption.vue
index 6ac441d2..c0f7a0ab 100644
--- a/app/components/ui/TitleOption.vue
+++ b/app/components/ui/TitleOption.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="font-tertiary text-3 font-semibold leading-none"
+ class="font-tertiary font-semibold leading-none text-3"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/ui/Toggle2.vue b/app/components/ui/Toggle2.vue
index f90adbe8..6900c021 100644
--- a/app/components/ui/Toggle2.vue
+++ b/app/components/ui/Toggle2.vue
@@ -41,7 +41,7 @@ const isShown = useStorage(`ui-toggle-${props.storageKey}`, props.initStatus)
<div
v-if="lineWidth && !isShown"
- class="bg-item-5 mx-2 h-px group-last:hidden"
+ class="mx-2 h-px bg-item-5 group-last:hidden"
:class="{ 'ml-12': lineWidth === 3, 'ml-11': lineWidth === 2 }"
/>
</div>
diff --git a/app/components/ui/box1.vue b/app/components/ui/box1.vue
index cbb29937..227f5e50 100644
--- a/app/components/ui/box1.vue
+++ b/app/components/ui/box1.vue
@@ -9,7 +9,7 @@ const emit = defineEmits<{
<template>
<div
:class="getStyles('item', ['link', 'alt', 'center', 'minh4', 'minw1', 'rounded'])"
- class="border-item-5 flex items-center border px-5 py-2.5"
+ class="flex items-center border border-item-5 px-5 py-2.5"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/ui/box3.vue b/app/components/ui/box3.vue
index d8812d07..a38fedda 100644
--- a/app/components/ui/box3.vue
+++ b/app/components/ui/box3.vue
@@ -9,7 +9,7 @@ const emit = defineEmits<{
<template>
<div
:class="[getStyles('item', ['link', 'alt', 'padding3', 'center', 'minh1', 'minw1', 'rounded'])]"
- class="text-1 grid grow gap-1 px-3 py-2"
+ class="grid grow gap-1 px-3 py-2 text-1"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/user/useUserStore.ts b/app/components/user/useUserStore.ts
index 4fc44d40..2f562087 100644
--- a/app/components/user/useUserStore.ts
+++ b/app/components/user/useUserStore.ts
@@ -55,8 +55,8 @@ export const useUserStore = defineStore('user', () => {
}
try {
- trnsStore.unsubscribeTrns(null)
- categoriesStore.unsubscribeCategories(null)
+ trnsStore.unsubscribeTrns()
+ categoriesStore.unsubscribeCategories()
walletsStore.unsubscribeWallets()
setUser(null)
diff --git a/app/components/wallets/Form.vue b/app/components/wallets/Form.vue
index 9237119b..011dbbee 100644
--- a/app/components/wallets/Form.vue
+++ b/app/components/wallets/Form.vue
@@ -7,7 +7,6 @@ import { errorEmo, random } from '~/assets/js/emo'
import UiToastContent from '~/components/ui/ToastContent.vue'
import { icons, types } from '~/components/wallets/types'
import { useWalletsStore } from '~/components/wallets/useWalletsStore'
-import { normalizeWalletItem } from '~/components/wallets/utils'
const props = defineProps<{
walletForm: WalletForm
diff --git a/app/components/wallets/Item.vue b/app/components/wallets/Item.vue
index b62c658b..eeecb692 100644
--- a/app/components/wallets/Item.vue
+++ b/app/components/wallets/Item.vue
@@ -54,13 +54,6 @@ if (!props.isSort) {
() => {
activeCreditView.value = creditViews[creditViews.findIndex(i => i === activeCreditView.value) + 1]
},
- {
- onMouseUp: (duration: number, distance: number, isLongPress: boolean) => {
- // if (!isLongPress && distance < 100) {
- // emit('click', props.walletId)
- // }
- },
- },
)
}
</script>
@@ -87,7 +80,7 @@ if (!props.isSort) {
<!-- Main -->
<template v-if="!props.alt">
<div class="grid grow gap-1">
- <div class="text-3 text-sm leading-none">
+ <div class="text-sm leading-none text-3">
{{ wallet.name }}
</div>
<div
@@ -152,14 +145,14 @@ if (!props.isSort) {
/>
</div>
- <div class="text-3 whitespace-nowrap text-sm leading-none">
+ <div class="whitespace-nowrap text-sm leading-none text-3">
{{ wallet.name }}
</div>
</div>
<div
v-if="isSort"
- class="sortHandle insert-0 flex-center group-hocus:bg-item-5 absolute right-0 top-0 h-full rounded-md px-3"
+ class="sortHandle flex-center absolute h-full rounded-md px-3 group-hocus:bg-item-5"
>
<Icon name="lucide:grip-vertical" size="20" />
</div>
diff --git a/app/components/wallets/Total.vue b/app/components/wallets/Total.vue
index fae01ead..6d04fdd0 100644
--- a/app/components/wallets/Total.vue
+++ b/app/components/wallets/Total.vue
@@ -26,7 +26,7 @@ const emit = defineEmits<{
insideClasses="!min-h-[44px]"
@click="emit('click', item.id)"
>
- <div class="text-2 grow pl-1 text-sm leading-none">
+ <div class="grow pl-1 text-sm leading-none text-2">
{{ $t(`money.types.${item.id}`) }}
</div>
diff --git a/app/components/wallets/page/List.vue b/app/components/wallets/page/List.vue
index 204e3f08..877ceab5 100644
--- a/app/components/wallets/page/List.vue
+++ b/app/components/wallets/page/List.vue
@@ -532,7 +532,7 @@ const counts = computed(() => ({
</div>
</template>
- <div class="border-item-5 ml-5 -translate-x-px border-l pl-3">
+ <div class="ml-5 -translate-x-px border-l border-item-5 pl-3">
<template v-if="groupedOptions.currencies === 0">
<WalletsItem
v-for="walletId in walletsIds"
@@ -574,7 +574,7 @@ const counts = computed(() => ({
</div>
</template>
- <div class="border-item-5 ml-5 -translate-x-px border-l pl-3">
+ <div class="ml-5 -translate-x-px border-l border-item-5 pl-3">
<WalletsItem
v-for="walletId in groupedWalletsIds"
:key="walletId"
@@ -622,7 +622,7 @@ const counts = computed(() => ({
</div>
</template>
- <div class="border-item-5 ml-5 -translate-x-px border-l pl-3">
+ <div class="ml-5 -translate-x-px border-l border-item-5 pl-3">
<template v-if="groupedOptions.type === 0">
<WalletsItem
v-for="walletId in walletsIds"
@@ -673,7 +673,7 @@ const counts = computed(() => ({
</div>
</template>
- <div class="border-item-5 ml-5 -translate-x-px border-l pl-3">
+ <div class="ml-5 -translate-x-px border-l border-item-5 pl-3">
<WalletsItem
v-for="walletId in groupedWalletsIds"
:key="walletId"
diff --git a/app/components/wallets/page/New.vue b/app/components/wallets/page/New.vue
index 14d6bca6..5d4f7949 100644
--- a/app/components/wallets/page/New.vue
+++ b/app/components/wallets/page/New.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
import type { WalletId, WalletItem } from '~/components/wallets/types'
+
import { normalizeWalletItem } from '~/components/wallets/utils'
const { t } = useI18n()
diff --git a/app/components/wallets/page/id/Edit.vue b/app/components/wallets/page/id/Edit.vue
index 8808a656..073f11b3 100644
--- a/app/components/wallets/page/id/Edit.vue
+++ b/app/components/wallets/page/id/Edit.vue
@@ -1,6 +1,7 @@
<script setup lang="ts">
-import { useWalletsStore } from '~/components/wallets/useWalletsStore'
import type { WalletItem } from '~/components/wallets/types'
+
+import { useWalletsStore } from '~/components/wallets/useWalletsStore'
import { normalizeWalletItem } from '~/components/wallets/utils'
const { t } = useI18n()
diff --git a/app/components/wallets/types.ts b/app/components/wallets/types.ts
index 3adc9b79..123e0953 100644
--- a/app/components/wallets/types.ts
+++ b/app/components/wallets/types.ts
@@ -1,6 +1,5 @@
import type { DeepPartial } from '~~/utils/types'
-import type { TotalReturns } from '~/components/amount/getTotal'
import type { CurrencyCode } from '~/components/currencies/types'
export const types = [
diff --git a/app/composables/usePageScroll.ts b/app/composables/usePageScroll.ts
index 3483ae06..09f6ee4d 100644
--- a/app/composables/usePageScroll.ts
+++ b/app/composables/usePageScroll.ts
@@ -1,13 +1,14 @@
export function usePageScroll() {
- const scroll = ref(0)
+ const route = useRoute()
+ const scroll = ref<Record<string, number>>({})
- onActivated(() => {
+ onUpdated(() => {
setTimeout(() => {
- document.getElementById('pageScroll')?.scrollTo(scroll.value, scroll.value)
- }, 5)
+ document.getElementById('pageScroll')?.scrollTo(0, scroll.value[route.path] ?? 0)
+ }, 10)
})
- onBeforeRouteLeave(() => {
- scroll.value = document.getElementById('pageScroll')?.scrollTop ?? 0
+ onBeforeUpdate(() => {
+ scroll.value[route.path] = document.getElementById('pageScroll')?.scrollTop ?? 0
})
}
diff --git a/app/layouts/center.vue b/app/layouts/center.vue
index ff1c3265..038ecc0f 100644
--- a/app/layouts/center.vue
+++ b/app/layouts/center.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
-import '~/assets/stylus/index.styl'
+import '~/assets/css/theme.css'
+import '~/assets/css/tailwind.css'
import { usePointerClass } from '~/components/layout/usePointerClass'
import { useGuard } from '~/components/user/useGuard'
diff --git a/app/layouts/default.vue b/app/layouts/default.vue
index 81ff7666..da9bd789 100644
--- a/app/layouts/default.vue
+++ b/app/layouts/default.vue
@@ -1,5 +1,6 @@
<script setup lang="ts">
-import '~/assets/stylus/index.styl'
+import '~/assets/css/theme.css'
+import '~/assets/css/tailwind.css'
import { useStorage, useWindowSize } from '@vueuse/core'
@@ -67,10 +68,15 @@ useSeoMeta({
ogTitle: (chunk?: string) => chunk ? `${chunk} - ${t('appName')}` : t('appName'),
titleTemplate: (chunk?: string) => chunk ? `${chunk} - ${t('appName')}` : t('appName'),
})
+
+usePageScroll()
</script>
<template>
- <div>
+ <div
+ :class="{ 'md:translate-x-20': isShowTrnForm && isShowSidebar && width >= 767 }"
+ class="layoutBase @container/main overflow-hidden transition-all duration-300 ease-in-out"
+ >
<NuxtPwaManifest />
<div v-if="status === 'error'">
@@ -81,35 +87,35 @@ useSeoMeta({
{{ t('base.loading') }}
</div>
- <div v-else-if="status === 'success'" class="layoutBase">
- <!-- Content -->
- <div class="grid h-full grid-cols-[auto_1fr]">
- <LayoutSidebar
- :isShowTrnForm
- :isShowSidebar
- @toggleSidebar="isShowSidebar = !isShowSidebar"
- />
-
- <div
- :class="{ 'md:translate-x-20': isShowTrnForm }"
- class="@container/main _pb-[42px] grid h-full overflow-hidden transition-all duration-300 ease-in-out sm:pb-0 md:pb-0"
- >
- <NuxtPage :keepalive="{ include: keepalive }" />
- </div>
- </div>
+ <template v-else-if="status === 'success'">
+ <LayoutSidebar
+ :isShowTrnForm
+ :isShowSidebar
+ @toggleSidebar="isShowSidebar = !isShowSidebar"
+ />
+
+ <main
+ id="pageScroll"
+ :class="{
+ 'sm:pl-72': isShowSidebar && width >= 767,
+ }"
+ class="grid h-full overflow-hidden overflow-y-auto sm:p-2 sm:pl-12"
+ >
+ <NuxtPage :keepalive="{ include: keepalive }" />
+ </main>
<!-- Menu -->
<LayoutMenuBottom />
<LayoutMenuBottomModal v-if="isModalOpen('menu')" />
<TrnFormFloatOpener />
- </div>
+ </template>
<Teleport
v-if="categoriesStore.hasItems && walletsStore.hasItems"
to="body"
>
<TrnFormBottom v-if="width < 767" />
- <TrnFormSidebar v-if="width >= 767" />
+ <TrnFormSidebar v-if="width > 767" />
</Teleport>
</div>
</template>
diff --git a/app/layouts/error.vue b/app/layouts/error.vue
index dd100eec..f3f873dd 100644
--- a/app/layouts/error.vue
+++ b/app/layouts/error.vue
@@ -1,4 +1,7 @@
<script setup lang="ts">
+import '~/assets/css/tailwind.css'
+import '~/assets/css/theme.css'
+
// TODO: Add locale
defineProps<{
error: unknown
diff --git a/app/pages/categories/[id]/index.vue b/app/pages/categories/[id]/index.vue
index 2d9b837c..4ba4cffb 100644
--- a/app/pages/categories/[id]/index.vue
+++ b/app/pages/categories/[id]/index.vue
@@ -1,6 +1,6 @@
<script setup lang="ts">
defineOptions({ name: 'CategoriesId' })
-usePageScroll()
+// usePageScroll()
</script>
<template>
diff --git a/app/pages/dashboard.vue b/app/pages/dashboard.vue
index 9d32313c..8b1579b2 100644
--- a/app/pages/dashboard.vue
+++ b/app/pages/dashboard.vue
@@ -12,8 +12,6 @@ useSeoMeta({
ogTitle: t('stat.title'),
titleTemplate: t('stat.title'),
})
-
-usePageScroll()
</script>
<template>
diff --git a/app/pages/login.vue b/app/pages/login.vue
index 29d6a5d8..414530ec 100644
--- a/app/pages/login.vue
+++ b/app/pages/login.vue
@@ -66,7 +66,7 @@ async function openDemo() {
</script>
<template>
- <div class="md_p-6 mx-auto grid size-full max-w-xl grid-rows-[auto,1fr,auto] p-2 py-4">
+ <div class="mx-auto grid size-full max-w-xl grid-rows-[auto,1fr,auto] p-2 py-4 md:p-6">
<div class="flex flex-wrap items-start justify-between gap-2">
<AppLocaleSwitcher />
<AppThemeSwitcher class="justify-end" />
diff --git a/app/pages/settings.vue b/app/pages/settings.vue
index 9eaa1714..48f6e094 100644
--- a/app/pages/settings.vue
+++ b/app/pages/settings.vue
@@ -39,7 +39,7 @@ function onGenerateDemoData() {
<UiHeaderTitle>{{ t("settings.title") }}</UiHeaderTitle>
</UiHeader>
- <div class="pageWrapper pt-4">
+ <div class="pageWrapper rounded-xl bg-foreground-1 pt-4">
<div>
<!-- Locale -->
<div class="pb-12">
@@ -82,7 +82,7 @@ function onGenerateDemoData() {
</UiTitle3>
<div
v-if="userStore.user"
- class="text-item-2 pb-4"
+ class="pb-4 text-item-2"
>
{{ userStore.user?.email }}
</div>
@@ -102,7 +102,7 @@ function onGenerateDemoData() {
<UiTitle3 class="pb-2">
{{ t("settings.caution") }}
</UiTitle3>
- <div class="leading-1 text-item-2 pb-4 text-xs">
+ <div class="pb-4 text-xs leading-none text-item-2">
{{ t("alerts.willDeleteEverything") }}
</div>
@@ -138,7 +138,7 @@ function onGenerateDemoData() {
<!-- About -->
<div class="pb-12">
{{ t("app.about") }}
- <div class="text-item-2 pt-4 text-xs">
+ <div class="pt-4 text-xs text-item-2">
{{ t("app.version") }} {{ version }}
</div>
</div>
diff --git a/app/pages/wallets/[id]/index.vue b/app/pages/wallets/[id]/index.vue
index 9167eebe..1ab7ba89 100644
--- a/app/pages/wallets/[id]/index.vue
+++ b/app/pages/wallets/[id]/index.vue
@@ -1,6 +1,6 @@
<script setup lang="ts">
defineOptions({ name: 'WalletsId' })
-usePageScroll()
+// usePageScroll()
</script>
<template>
diff --git a/eslint.config.js b/eslint.config.js
index 83dc1446..60b409ef 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -15,7 +15,7 @@ export default [
rules: {
'@typescript-eslint/consistent-type-definitions': ['error', 'type'],
'import/order': 'off',
- 'no-console': 'warn',
+ 'no-console': 'off',
'no-extra-semi': 'error',
'perfectionist/sort-array-includes': ['error', { order: 'asc', type: 'natural' }],
'perfectionist/sort-enums': ['error', { order: 'asc', type: 'natural' }],
diff --git a/finapp-4.2.0.code-workspace b/finapp-4.2.0.code-workspace
deleted file mode 100644
index 68f638dd..00000000
--- a/finapp-4.2.0.code-workspace
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "folders": [
- {
- "path": "."
- }
- ],
- "settings": {
- },
-}
diff --git a/mocks/categories.ts b/mocks/categories.ts
deleted file mode 100644
index 0c5c04de..00000000
--- a/mocks/categories.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { Categories, CategoryItem } from '~/components/categories/types'
-
-export const categoriesItems: Categories = {
- categoryTransferOld: {
- name: 'Перевод',
- },
-}
diff --git a/package.json b/package.json
index c2f7b12b..9dd3f79d 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,10 @@
"node": ">=v20.0.0"
},
"scripts": {
- "dev": "nuxt dev -p 3050 --host",
"build": "nuxt generate",
+ "dev": "nuxt dev -p 3050 --host",
+ "lint": "eslint .",
+ "lint:fix": "eslint . --fix",
"preview": "nuxt generate && nuxt preview",
"test": "vitest",
"test:coverage": "vitest run --coverage"
@@ -60,7 +62,6 @@
"nuxt": "^3.15.0",
"nuxt-icon": "^0.6.10",
"nuxt-vuefire": "^1.0.5",
- "stylus": "^0.64.0",
"supports-color": "8.1.1",
"tailwind-merge": "^2.6.0",
"tailwindcss": "^3.4.17",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8f7e5abf..6da9176b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,7 +13,7 @@ importers:
version: 0.3.1
'@pinia/nuxt':
specifier: ^0.9.0
currency.js:
specifier: ^2.0.4
version: 2.0.4
@@ -37,7 +37,7 @@ importers:
vite:
specifier: ^6.0.7
vue-deepunref:
specifier: ^1.0.1
version: 1.0.1([email protected])
@@ -50,34 +50,34 @@ importers:
devDependencies:
'@antfu/eslint-config':
specifier: ^3.12.1
'@iconify-json/lucide':
specifier: ^1.2.20
- version: 1.2.20
+ version: 1.2.21
'@nuxt/eslint':
specifier: ^0.7.4
'@nuxt/fonts':
specifier: ^0.10.3
'@nuxt/ui':
specifier: ^2.20.0
'@nuxtjs/i18n':
specifier: ^9.1.1
'@vite-pwa/nuxt':
specifier: ^0.10.6
'@vitest/coverage-v8':
specifier: ^2.1.8
'@vueuse/core':
specifier: ^12.3.0
version: 12.3.0([email protected])
'@vueuse/nuxt':
specifier: ^12.3.0
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -110,16 +110,13 @@ importers:
version: 3.17.5([email protected])
nuxt:
specifier: ^3.15.0
nuxt-icon:
specifier: ^0.6.10
nuxt-vuefire:
specifier: ^1.0.5
- stylus:
- specifier: ^0.64.0
- version: 0.64.0([email protected])
supports-color:
specifier: 8.1.1
version: 8.1.1
@@ -134,7 +131,7 @@ importers:
version: 5.7.2
vitest:
specifier: ^2.1.8
zod:
specifier: ^3.24.1
version: 3.24.1
@@ -778,8 +775,8 @@ packages:
'@dprint/[email protected]':
resolution: {integrity: sha512-ukHFOg+RpG284aPdIg7iPrCYmMs3Dqy43S1ejybnwlJoFiW02b+6Bbr5cfZKFRYNP3dKGM86BqHEnMzBOyLvvA==}
- '@dprint/[email protected]':
- resolution: {integrity: sha512-zQ42I53sb4WVHA+5yoY1t59Zk++Ot02AvUgtNKLzTT8mPyVqVChFcePa3on/xIoKEgH+RoepgPHzqfk9837YFw==}
+ '@dprint/[email protected]':
+ resolution: {integrity: sha512-bZXIUjxr0LIuHWshZr/5mtUkOrnh0NKVZEF6ACojW5z7zkJu7s9sV2mMXm8XQDqN4cJzdHYUYzUyEGdfciaLJA==}
'@es-joy/[email protected]':
resolution: {integrity: sha512-xjZTSFgECpb9Ohuk5yMX5RhUEbfeQcuOp8IF60e+wyzWEF0M5xeSgqsfLtvPEX8BIyOX9saZqzuGPmZ8oWc+5Q==}
@@ -1389,11 +1386,11 @@ packages:
'@iconify-json/[email protected]':
resolution: {integrity: sha512-qoW4pXr5kTTL6juEjgTs83OJIwpePu7q1tdtKVEdj+i0zyyVHgg/dd9grsXJQnpTpBt6/VwNjrXBvFjRsKPENg==}
- '@iconify-json/[email protected]':
- resolution: {integrity: sha512-m/8rqukvQfsE+MYTwNXCxP/K2iucTCGSQfS0XZhYpkZKGRdiEOdAAnd8Vv+E78xKK94Jza2eTc5ihxbw6+i7EQ==}
+ '@iconify-json/[email protected]':
+ resolution: {integrity: sha512-Oi9bVtaDaiUg4DpmuFWO4bihwXvxFW47KYFUWEGRsqAWijnODTXIO24F2YNlz+k9WvdIr3RsOFiuNIoEzMPsRQ==}
- '@iconify/[email protected]':
- resolution: {integrity: sha512-ekvBg6Gf3ychcTdcr8UdkyRG/YUp6001WEL0EcaSNCfp0UAobFbcpnrWYNtndR/Nsq6yTUw6V+E1L3qZOe70Zg==}
+ '@iconify/[email protected]':
+ resolution: {integrity: sha512-cU8zxXlxwHO18+ToinuCyNBTsYe9rM7yAX7kgw+EYVpFAk5pyS37TYE2aVfjO/1zEIT8MJuPGehql6ajcSKLcw==}
'@iconify/[email protected]':
resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
@@ -1401,8 +1398,8 @@ packages:
'@iconify/[email protected]':
resolution: {integrity: sha512-0/7J7hk4PqXmxo5PDBDxmnecw5PxklZJfNjIVG9FM0mEfVrvfudS22rYWsqVk6gR3UJ/mSYS90X4R3znXnqfNA==}
- '@iconify/[email protected]':
- resolution: {integrity: sha512-CMynoz9BDWugDO2B7LU/s8L99dHCiqDGCjCki6bhVx5etZhw9x0BTV7wWRdj82jtl1yQTc+QQRcHQmSvUY6R+g==}
+ '@iconify/[email protected]':
+ resolution: {integrity: sha512-Xq0h6zMrHBbrW8jXJ9fISi+x8oDQllg5hTDkDuxnWiskJ63rpJu9CvJshj8VniHVTbsxCg9fVoPAaNp3RQI5OQ==}
peerDependencies:
vue: '>=3'
@@ -1450,8 +1447,8 @@ packages:
resolution: {integrity: sha512-lH164+aDDptHZ3dBDbIhRa1dOPQUp+83iugpc+1upTOWCnwyC1PVis6rSWNMMJ8VQxvtHQB9JMib48K55y0PvQ==}
engines: {node: '>= 16'}
- '@intlify/[email protected]':
- resolution: {integrity: sha512-5AuwBfdFtA4OSh31tfGpjhvmh7BVCzClHCgFlVdNM3ojyai3UZY4ViYh35TlE1xeWFyduOtUsG12r70xy24nzg==}
+ '@intlify/[email protected]':
+ resolution: {integrity: sha512-9ZDjBlhUHtgjRl23TVcgfJttgu8cNepwVhWvOv3mUMRDAhjW0pur1mWKEUKr1I8PNwE4Gvv2IQ1xcl4RL0nG0g==}
engines: {node: '>= 18'}
peerDependencies:
petite-vue-i18n: '*'
@@ -1467,14 +1464,14 @@ packages:
resolution: {integrity: sha512-8i3uRdAxCGzuHwfmHcVjeLQBtysQB2aXl/ojoagDut5/gY5lvWCQ2+cnl2TiqE/fXj/D8EhWG/SLKA7qz4a3QA==}
engines: {node: '>= 18'}
- '@intlify/[email protected]':
- resolution: {integrity: sha512-MtvfJnb4aklpCU5Q/dkWkBT/vGsp3qERiPIwtTq5lX4PCLHtUprAJZp8wQj5ZcwDaFCU7+yVMjYbeXpIf927cA==}
+ '@intlify/[email protected]':
+ resolution: {integrity: sha512-w0+70CvTmuqbskWfzeYhn0IXxllr6mU+IeM2MU0M+j9OW64jkrvqY+pYFWrUnIIC9bEdij3NICruicwd5EgUuQ==}
engines: {node: '>= 18'}
peerDependencies:
- '@intlify/shared': ^9.0.0 || ^10.0.0
+ '@intlify/shared': ^9.0.0 || ^10.0.0 || ^11.0.0
'@vue/compiler-dom': ^3.0.0
vue: ^3.0.0
- vue-i18n: ^9.0.0 || ^10.0.0
+ vue-i18n: ^9.0.0 || ^10.0.0 || ^11.0.0
peerDependenciesMeta:
'@intlify/shared':
optional: true
@@ -1560,40 +1557,40 @@ packages:
resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
engines: {node: '>= 8'}
- '@nodelib/[email protected]':
- resolution: {integrity: sha512-ktI9+PxfHYtKjF3cLTUAh2N+b8MijCRPNwKJNqTVdL0gB0QxLU2rIRaZ1t71oEa3YBDE6bukH1sR0+CDnpp/Mg==}
- engines: {node: '>=16.14.0'}
+ '@nodelib/[email protected]':
+ resolution: {integrity: sha512-vAkI715yhnmiPupY+dq+xenu5Tdf2TBQ66jLvBIcCddtz+5Q8LbMKaf9CIJJreez8fQ8fgaY+RaywQx8RJIWpw==}
+ engines: {node: '>=18.18.0'}
'@nodelib/[email protected]':
resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
engines: {node: '>= 8'}
- '@nodelib/[email protected]':
- resolution: {integrity: sha512-2tQOI38s19P9i7X/Drt0v8iMA+KMsgdhB/dyPER+e+2Y8L1Z7QvnuRdW/uLuf5YRFUYmnj4bMA6qCuZHFI1GDQ==}
- engines: {node: '>=16.14.0'}
+ '@nodelib/[email protected]':
+ resolution: {integrity: sha512-ctr6bByzksKRCV0bavi8WoQevU6plSp2IkllIsEqaiKe2mwNNnaluhnRhcsgGZHrrHk57B3lf95MkLMO3STYcg==}
+ engines: {node: '>=18.18.0'}
'@nodelib/[email protected]':
resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
engines: {node: '>= 8'}
- '@nodelib/[email protected]':
- resolution: {integrity: sha512-54voNDBobGdMl3BUXSu7UaDh1P85PGHWlJ5e0XhPugo1JulOyCtp2I+5ri4wplGDJ8QGwPEQW7/x3yTLU7yF1A==}
- engines: {node: '>=16.14.0'}
+ '@nodelib/[email protected]':
+ resolution: {integrity: sha512-nIh/M6Kh3ZtOmlY00DaUYB4xeeV6F3/ts1l29iwl3/cfyY/OuCfUx+v08zgx8TKPTifXRcjjqVQ4KB2zOYSbyw==}
+ engines: {node: '>=18.18.0'}
resolution: {integrity: sha512-GBzP8zOc7CGWyFQS6dv1lQz8VVpz5C2yRszbXufwG/9zhStTIH50EtD87NmWbTMwXDvZLNg8GIpb1UFdH93JCA==}
- resolution: {integrity: sha512-jpLYrXFm8T74j8ZjU6lheghe3gdr7PcNluvh/KOl+t6l7AtsQilkTmCZ4YoaiaWLM+5c5mkc72qd7ECgZb0tCw==}
+ resolution: {integrity: sha512-+NgZ2uP5BuneqvQbe7EdOEaFEDy8762c99pLABtn7/Ur0ExEsQJMP7pYjjoTfKubhBqecr5Vo9yHkPBj1eHulQ==}
peerDependencies:
vite: '*'
- resolution: {integrity: sha512-YTInHKL3SnRjczZDIhN8kXaiYf8+ddBMU5nwShPxmutcaVQZ8FMiJHRIzyWnS10AxayPKGVzJh3fLF/BiUwgcg==}
+ resolution: {integrity: sha512-86Gd92uEw0Dh2ErIYT9TMIrMOISE96fCRN4rxeryTvyiowQOsyrbkCeMNYrEehoRL+lohoyK6iDmFajadPNwWQ==}
hasBin: true
- resolution: {integrity: sha512-uzHFXVEQnmxcbtbcpXjDEyILMp/jJNF1DN2/wSBm0r7UD82qaD2Aa66gX7dTY2+E0HG6aSNkZky3Ck8ehSk8nQ==}
+ resolution: {integrity: sha512-uvnjt5Zowkz7tZmnks2cGreg1XZIiSyVzQ2MYiRXACodlXcwJ0dpUS3WTxu8BR562K+772oRdvKie9AQlyZUgg==}
hasBin: true
peerDependencies:
vite: '*'
@@ -1630,20 +1627,12 @@ packages:
resolution: {integrity: sha512-ESIiSIpETLLcn5p4U8S0F3AQ5Mox0MoHAVKczamY4STh3Dwrc8labLhtN6lunwpQEv6UGuiutdvfkJ88zu44Ew==}
- resolution: {integrity: sha512-r9r8bISBBisvfcNgNL3dSIQHSBe0v5YkX5zwNblIC2T0CIEgxEVoM5rq9O5wqgb5OEydsHTtT2hL57vdv6VT2w==}
- engines: {node: ^14.18.0 || >=16.10.0}
-
- resolution: {integrity: sha512-Q7k11wDTLIbBgoTfRYNrciK7PvjKklewrKd5PRMJCpn9Lmuqkq59HErNfJXFrBKHsE3Ld0DB6WUtpPGOvWJZoQ==}
+ resolution: {integrity: sha512-7cVWjzfz3L6CsZrg6ppDZa7zGrZxCSfZjEQDIvVFn4mFKtJlK9k2izf5EewL6luzWwIQojkZAC3iq/1wtgI0Xw==}
engines: {node: '>=18.20.5'}
- resolution: {integrity: sha512-A1d/08ueX8stTXNkvGqnr1eEXZgvKn+vj6s7jXhZNWApUSqMgItU4VK28vrrdpKbjIPwq2SwhnGOHUYvN9HwCQ==}
- engines: {node: ^14.18.0 || >=16.10.0}
-
- resolution: {integrity: sha512-sAgLgSOj/SZxUmlJ/Q3TLRwIAqmiiZ5gCBrT+eq9CowIj7bgxX92pT720pDLEDs4wlXiTTsqC8nyqXQis8pPyA==}
+ resolution: {integrity: sha512-n5kOHt8uUyUM9z4Wu/8tIZkBYh3KTCGvyruG6oD9bfeT4OaS21+X3M7XsTXFMe+eYBZA70IFFlWn1JJZIPsKeA==}
engines: {node: ^14.18.0 || >=16.10.0}
@@ -1654,8 +1643,8 @@ packages:
resolution: {integrity: sha512-MfufGNlMAZgqte1C1WiaWTyz2q3Yun1O1ebsUBDSxdnnOAFFjBVQyjX4N4BGuH6KEMQXladSx3i791EFR7wp2w==}
- resolution: {integrity: sha512-cNwX/Q4nqM4hOHbaLUQWdd/cPn8U00GqkTxdxrpzZqTs+A8d8aJQMpuAY+rXclXoU2t0z90HTdSwtgehHGersQ==}
+ resolution: {integrity: sha512-b9uvLuRSgZy+pvU0rwHOpYo9XmAPibNGFEn0MeG6rUWVee9didV0Q5voAr+/1kq9bIbf6V0QFh9TE+4pCxZuMQ==}
engines: {node: ^18.20.5 || ^20.9.0 || >=22.0.0}
peerDependencies:
vue: ^3.3.4
@@ -1817,8 +1806,8 @@ packages:
'@redocly/[email protected]':
resolution: {integrity: sha512-CEmvaJuG7pm2ylQg53emPmtgm4nW2nxBgwXzbVEHpGas/lGnMyN8Zlkgiz6rPw0unASg6VW3wlz27SOL5XFHYQ==}
- '@redocly/[email protected]':
- resolution: {integrity: sha512-xRuVZqMVRFzqjbUCpOTra4tbnmQMWsya996omZMV3WgD084Z6OWB3FXflhAp93E/yAmbWlWZpddw758AyoaLSw==}
+ '@redocly/[email protected]':
+ resolution: {integrity: sha512-C3EU9NYbo7bCc9SduHrk6/liUuuBqVfJHOhfbscNCR1443Rdpz3s+bB2Xhso9mdQJT0JjklRn2WTANjavl2Zng==}
engines: {node: '>=14.19.0', npm: '>=7.0.0'}
'@rollup/[email protected]':
@@ -1924,98 +1913,98 @@ packages:
rollup:
optional: true
- '@rollup/[email protected]':
- resolution: {integrity: sha512-ssKhA8RNltTZLpG6/QNkCSge+7mBQGUqJRisZ2MDQcEGaK93QESEgWK2iOpIDZ7k9zPVkG5AS3ksvD5ZWxmItw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-qFcFto9figFLz2g25DxJ1WWL9+c91fTxnGuwhToCl8BaqDsDYMl/kOnBXAyAqkkzAWimYMSWNPWEjt+ADAHuoQ==}
cpu: [arm]
os: [android]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-CaRfrV0cd+NIIcVVN/jx+hVLN+VRqnuzLRmfmlzpOzB87ajixsN/+9L5xNmkaUUvEbI5BmIKS+XTwXsHEb65Ew==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-vqrQdusvVl7dthqNjWCL043qelBK+gv9v3ZiqdxgaJvmZyIAAXMjeGVSqZynKq69T7062T5VrVTuikKSAAVP6A==}
cpu: [arm64]
os: [android]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-2ORr7T31Y0Mnk6qNuwtyNmy14MunTAMx06VAPI6/Ju52W10zk1i7i5U3vlDRWjhOI5quBcrvhkCHyF76bI7kEw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-617pd92LhdA9+wpixnzsyhVft3szYiN16aNUMzVkf2N+yAk8UXY226Bfp36LvxYTUt7MO/ycqGFjQgJ0wlMaWQ==}
cpu: [arm64]
os: [darwin]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-j/Ej1oanzPjmN0tirRd5K2/nncAhS9W6ICzgxV+9Y5ZsP0hiGhHJXZ2JQ53iSSjj8m6cRY6oB1GMzNn2EUt6Ng==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-Y3b4oDoaEhCypg8ajPqigKDcpi5ZZovemQl9Edpem0uNv6UUjXv7iySBpGIUTSs2ovWOzYpfw9EbFJXF/fJHWw==}
cpu: [x64]
os: [darwin]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-91C//G6Dm/cv724tpt7nTyP+JdN12iqeXGFM1SqnljCmi5yTXriH7B1r8AD9dAZByHpKAumqP1Qy2vVNIdLZqw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-3REQJ4f90sFIBfa0BUokiCdrV/E4uIjhkWe1bMgCkhFXbf4D8YN6C4zwJL881GM818qVYE9BO3dGwjKhpo2ABA==}
cpu: [arm64]
os: [freebsd]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-hEioiEQ9Dec2nIRoeHUP6hr1PSkXzQaCUyqBDQ9I9ik4gCXQZjJMIVzoNLBRGet+hIUb3CISMh9KXuCcWVW/8w==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-ZtY3Y8icbe3Cc+uQicsXG5L+CRGUfLZjW6j2gn5ikpltt3Whqjfo5mkyZ86UiuHF9Q3ZsaQeW7YswlHnN+lAcg==}
cpu: [x64]
os: [freebsd]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-Py5vFd5HWYN9zxBv3WMrLAXY3yYJ6Q/aVERoeUFwiDGiMOWsMs7FokXihSOaT/PMWUty/Pj60XDQndK3eAfE6A==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-bsPGGzfiHXMhQGuFGpmo2PyTwcrh2otL6ycSZAFTESviUoBOuxF7iBbAL5IJXc/69peXl5rAtbewBFeASZ9O0g==}
cpu: [arm]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-RiWpGgbayf7LUcuSNIbahr0ys2YnEERD4gYdISA06wa0i8RALrnzflh9Wxii7zQJEB2/Eh74dX4y/sHKLWp5uQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-kvyIECEhs2DrrdfQf++maCWJIQ974EI4txlz1nNSBaCdtf7i5Xf1AQCEJWOC5rEBisdaMFFnOWNLYt7KpFqy5A==}
cpu: [arm]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-Z80O+taYxTQITWMjm/YqNoe9d10OX6kDh8X5/rFCMuPqsKsSyDilvfg+vd3iXIqtfmp+cnfL1UrYirkaF8SBZA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-CFE7zDNrokaotXu+shwIrmWrFxllg79vciH4E/zeK7NitVuWEaXRzS0mFfFvyhZfn8WfVOG/1E9u8/DFEgK7WQ==}
cpu: [arm64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-fOHRtF9gahwJk3QVp01a/GqS4hBEZCV1oKglVVq13kcK3NeVlS4BwIFzOHDbmKzt3i0OuHG4zfRP0YoG5OF/rA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-MctNTBlvMcIBP0t8lV/NXiUwFg9oK5F79CxLU+a3xgrdJjfBLVIEHSAjQ9+ipofN2GKaMLnFFXLltg1HEEPaGQ==}
cpu: [arm64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-5a7q3tnlbcg0OodyxcAdrrCxFi0DgXJSoOuidFUzHZ2GixZXQs6Tc3CHmlvqKAmOs5eRde+JJxeIf9DonkmYkw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-fBpoYwLEPivL3q368+gwn4qnYnr7GVwM6NnMo8rJ4wb0p/Y5lg88vQRRP077gf+tc25akuqd+1Sxbn9meODhwA==}
cpu: [loong64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-9b4Mg5Yfz6mRnlSPIdROcfw1BU22FQxmfjlp/CShWwO3LilKQuMISMTtAu/bxmmrE6A902W2cZJuzx8+gJ8e9w==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-1hiHPV6dUaqIMXrIjN+vgJqtfkLpqHS1Xsg0oUfUVD98xGp1wX89PIXgDF2DWra1nxAd8dfE0Dk59MyeKaBVAw==}
cpu: [ppc64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-G5pn0NChlbRM8OJWpJFMX4/i8OEU538uiSv0P6roZcbpe/WfhEO+AT8SHVKfp8qhDQzaz7Q+1/ixMy7hBRidnQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-U0xcC80SMpEbvvLw92emHrNjlS3OXjAM0aVzlWfar6PR0ODWCTQtKeeB+tlAPGfZQXicv1SpWwRz9Hyzq3Jx3g==}
cpu: [riscv64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-WM9lIkNdkhVwiArmLxFXpWndFGuOka4oJOZh8EP3Vb8q5lzdSCBuhjavJsw68Q9AKDGeOOIHYzYm4ZFvmWez5g==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-VU/P/IODrNPasgZDLIFJmMiLGez+BN11DQWfTVlViJVabyF3JaeaJkP6teI8760f18BMGCQOW9gOmuzFaI1pUw==}
cpu: [s390x]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-87xYCwb0cPGZFoGiErT1eDcssByaLX4fc0z2nRM6eMtV9njAfEE6OW3UniAoDhX4Iq5xQVpE6qO9aJbCFumKYQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-laQVRvdbKmjXuFA3ZiZj7+U24FcmoPlXEi2OyLfbpY2MW1oxLt9Au8q9eHd0x6Pw/Kw4oe9gwVXWwIf2PVqblg==}
cpu: [x64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-xufkSNppNOdVRCEC4WKvlR1FBDyqCSCpQeMMgv9ZyXqqtKBfkw1yfGMTUTs9Qsl6WQbJnsGboWCp7pJGkeMhKA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-3wzKzduS7jzxqcOvy/ocU/gMR3/QrHEFLge5CD7Si9fyHuoXcidyYZ6jyx8OPYmCcGm3uKTUl+9jUSAY74Ln5A==}
cpu: [x64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-F2OiJ42m77lSkizZQLuC+jiZ2cgueWQL5YC9tjo3AgaEw+KJmVxHGSyQfDUoYR9cci0lAywv2Clmckzulcq6ig==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-jROwnI1+wPyuv696rAFHp5+6RFhXGGwgmgSfzE8e4xfit6oLRg7GyMArVUoM3ChS045OwWr9aTnU+2c1UdBMyw==}
cpu: [arm64]
os: [win32]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-rYRe5S0FcjlOBZQHgbTKNrqxCBUmgDJem/VQTCcTnA2KCabYSWQDrytOzX7avb79cAAweNmMUb/Zw18RNd4mng==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-duzweyup5WELhcXx5H1jokpr13i3BV9b48FMiikYAwk/MT1LrMYYk2TzenBd0jj4ivQIt58JWSxc19y4SvLP4g==}
cpu: [ia32]
os: [win32]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-+10CMg9vt1MoHj6x1pxyjPSMjHTIlqs8/tBztXvPAx24SKs9jwVnKqHJumlH/IzhaPUaj3T6T6wfZr8okdXaIg==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-DYvxS0M07PvgvavMIybCOBYheyrqlui6ZQBHJs6GqduVzHSZ06TPPvlfvnYstjODHQ8UUXFwt5YE+h0jFI8kwg==}
cpu: [x64]
os: [win32]
@@ -2085,8 +2074,8 @@ packages:
resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
- '@types/[email protected]':
- resolution: {integrity: sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A==}
resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==}
@@ -2094,8 +2083,8 @@ packages:
resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==}
- '@types/[email protected]':
- resolution: {integrity: sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==}
resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
@@ -2118,14 +2107,6 @@ packages:
resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==}
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-Ncvsq5CT3Gvh+uJG0Lwlho6suwDfUXH0HztslDf5I+F2wAFAZMRwYLEorumpKLzmO2suAXZ/td1tBg4NZIi9CQ==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- peerDependencies:
- '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0
- eslint: ^8.57.0 || ^9.0.0
- typescript: '>=4.8.4 <5.8.0'
-
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-NggSaEZCdSrFddbctrVjkVZvFC6KGfKfNK0CU7mNK/iKHGKbzT4Wmgm08dKpcZECBu9f5FypndoMyRHkdqfT1Q==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -2134,13 +2115,6 @@ packages:
eslint: ^8.57.0 || ^9.0.0
typescript: '>=4.8.4 <5.8.0'
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-rBnTWHCdbYM2lh7hjyXqxk70wvon3p2FyaniZuey5TrcGBpfhVp0OxOa6gxr9Q9YhZFKyfbEnxc24ZnVbbUkCA==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- peerDependencies:
- eslint: ^8.57.0 || ^9.0.0
- typescript: '>=4.8.4 <5.8.0'
-
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-6M8taKyOETY1TKHp0x8ndycipTVgmp4xtg5QpEZzXxDhNvvHOJi5rLRkLr8SK3jTgD5l4fTlvBiRdfsuWydxBw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -2148,21 +2122,10 @@ packages:
eslint: ^8.57.0 || ^9.0.0
typescript: '>=4.8.4 <5.8.0'
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-HxfHo2b090M5s2+/9Z3gkBhI6xBH8OJCFjH9MhQ+nnoZqxU3wNxkLT+VWXWSFWc3UF3Z+CfPAyqdCTdoXtDPCQ==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-hkoJiKQS3GQ13TSMEiuNmSCvhz7ujyqD1x3ShbaETATHrck+9RaDdUbt+osXaUuns9OFwrDTTrjtwsU8gJyyRA==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-jAhTdK/Qx2NJPNOTxXpMwlOiSymtR2j283TtPqXkKBdH8OAMmhiUfP0kJjc/qSE51Xrq02Gj9NY7MwK+UxVwHQ==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- peerDependencies:
- eslint: ^8.57.0 || ^9.0.0
- typescript: '>=4.8.4 <5.8.0'
-
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-TZs0I0OSbd5Aza4qAMpp1cdCYVnER94IziudE3JU328YUHgWu9gwiwhag+fuLeJ2LkWLXI+F/182TbG+JaBdTg==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -2170,33 +2133,16 @@ packages:
eslint: ^8.57.0 || ^9.0.0
typescript: '>=4.8.4 <5.8.0'
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-8XQ4Ss7G9WX8oaYvD4OOLCjIQYgRQxO+qCiR2V2s2GxI9AUpo7riNwo6jDhKtTcaJjT8PY54j2Yb33kWtSJsmA==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-z8U21WI5txzl2XYOW7i9hJhxoKKNG1kcU4RzyNvKrdZDmbjkmLBo8bgeiOJmA06kizLI76/CCBAAGlTlEeUfyg==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- peerDependencies:
- typescript: '>=4.8.4 <5.8.0'
-
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-WW9PpDaLIFW9LCbucMSdYUuGeFUz1OkWYS/5fwZwTA+l2RwlWFdJvReQqMUMBw4yJWJOfqd7An9uwut2Oj8sLw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
typescript: '>=4.8.4 <5.8.0'
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-8vikiIj2ebrC4WRdcAdDcmnu9Q/MXXwg+STf40BVfT8exDqBCUPdypvzcUPxEqRGKg9ALagZ0UWcYCtn+4W2iQ==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- peerDependencies:
- eslint: ^8.57.0 || ^9.0.0
- typescript: '>=4.8.4 <5.8.0'
-
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-PTBG+0oEMPH9jCZlfg07LCB2nYI0I317yyvXGfxnvGvw4SHIOuRnQ3kadyyXY6tGdChusIHIbM5zfIbp4M6tCg==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -2204,10 +2150,6 @@ packages:
eslint: ^8.57.0 || ^9.0.0
typescript: '>=4.8.4 <5.8.0'
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-Vj0WLm5/ZsD013YeUKn+K0y8p1M0jPpxOkKdbD1wB0ns53a5piVY02zjf072TblEweAbcYiFiPoSMF3kp+VhhQ==}
- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-mCFtBbFBJDCNCWUl5y6sZSCHXw1DEFEk3c/M3nRK2a4XUB8StGFtmcEMizdjKuBzB6e/smJAAWYug3VrdLMr1w==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -2307,8 +2249,8 @@ packages:
'@vitest/[email protected]':
resolution: {integrity: sha512-dwSoui6djdwbfFmIgbIjX2ZhIoG7Ex/+xpxyiEgIGzjliY8xGkcpITKTlp6B4MgtGkF2ilvm97cPM96XZaAgcA==}
- '@voxpelli/[email protected]':
- resolution: {integrity: sha512-mRqVGLcK+yU+fQyaHAL9Xbhw633spi+VGurX1+gwSiZS8SzX63WzOmGi3qXO7mn4cozJcExyzIC5WmbUFJWQOw==}
+ '@voxpelli/[email protected]':
+ resolution: {integrity: sha512-4BQ9JUC/vBXrLgr8ENMb27TCM1QyNhIfYPPAmzxPoQlUD3nHsBmd04+e6a0f39SHcj4aaoKbzAixCx893ust+w==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
'@eslint/config-array': '>=0.16.0'
@@ -2381,14 +2323,11 @@ packages:
resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==}
- '@vueuse/[email protected]':
- resolution: {integrity: sha512-C12RukhXiJCbx4MGhjmd/gH52TjJsc3G0E0kQj/kb19H3Nt6n1CA4DRWuTdWWcaFRdlTe0npWDS942mvacvNBw==}
-
'@vueuse/[email protected]':
resolution: {integrity: sha512-cnV8QDKZrsyKC7tWjPbeEUz2cD9sa9faxF2YkR8QqNwfofgbOhmfIgvSYmkp+ttSvfOw4E6hLcQx15mRPr0yBA==}
- '@vueuse/[email protected]':
- resolution: {integrity: sha512-M16fkVp+i4je75I7uvifMbJKHFrjx2+0LuHEH9++iPJ11zc4SRy5NdRN0z2NR+a54eQ5Gs2Ds7pby5ST96zxCA==}
+ '@vueuse/[email protected]':
+ resolution: {integrity: sha512-Ha42DSxc87BIf4JONUNammWod5X7iaUVqpYohMgzpDYBjAxhmhWtsMCcFpfUMXZYiMaS2xltUEiRldSXC9kmGw==}
peerDependencies:
async-validator: ^4
axios: ^1
@@ -2428,11 +2367,8 @@ packages:
universal-cookie:
optional: true
- '@vueuse/[email protected]':
- resolution: {integrity: sha512-Eqeqy2WyTJTdd6eAKYNLD4eK9IGKavX3hyRX9mI6VdNMcWQ7wH7M7Cd/vz95eS8Y/mkHumNJrzsWoLY+P2pOTQ==}
-
- '@vueuse/[email protected]':
- resolution: {integrity: sha512-Yzimd1D3sjxTDOlF05HekU5aSGdKjxhuhRFHA7gDWLn57PRbBIh+SF5NmjhJ0WRgF3my7T8LBucyxdFJjIfRJQ==}
+ '@vueuse/[email protected]':
+ resolution: {integrity: sha512-PblV/sohRCf/230BF6didqJhHn6gVlj2V6QdcjrK5YDFqaFKMW9BW+6kCqYkHCRKjauJ+Z6y9FUR8swX3/v2MQ==}
'@vueuse/[email protected]':
resolution: {integrity: sha512-M/iQHHjMffOv2npsw2ihlUx1CTiBwPEgb7DzByLq7zpg1+Ke8r7s9p5ybUWc5OIeGewtpY4Xy0R2cKqFqM8hFg==}
@@ -2442,9 +2378,6 @@ packages:
peerDependencies:
nuxt: ^3.0.0
- '@vueuse/[email protected]':
- resolution: {integrity: sha512-3i6qtcq2PIio5i/vVYidkkcgvmTjCqrf26u+Fd4LhnbBmIT6FN8y6q/GJERp8lfcB9zVEfjdV0Br0443qZuJpw==}
-
'@vueuse/[email protected]':
resolution: {integrity: sha512-X3YD35GUeW0d5Gajcwv9jdLAJTV2Jdb/Ll6Ii2JIYcKLYZqv5wxyLeKtiQkqWmHg3v0J0ZWjDUMVOw2E7RCXfA==}
@@ -2599,8 +2532,8 @@ packages:
resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
- resolution: {integrity: sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==}
+ resolution: {integrity: sha512-Bw2PgKSrZ3uCuSV9WQ998c/GTJTd+9bWj97n7aDQMP8dP/exAZQlJeswPty0ISy+HZD+9Ex+C7CCnc9Q5QJFmQ==}
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
@@ -2657,8 +2590,8 @@ packages:
resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}
engines: {node: '>=18'}
- resolution: {integrity: sha512-GuziW3fSSmopcx4KRymQEJVbZUfqlCqcq7dvs6TYwKRZiegK/2buMxQTPs6MGlNv50wms1699qYO54R8XfRX4w==}
+ resolution: {integrity: sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
peerDependencies:
esbuild: '>=0.18'
@@ -2716,8 +2649,8 @@ packages:
resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
engines: {node: '>=10'}
- resolution: {integrity: sha512-ZkD35Mx92acjB2yNJgziGqT9oKHEOxjTBTDRpOsRWtdecL/0jM3z5kM/CTzHWvHIen1GvkM85p6TuFfDGfc8/Q==}
+ resolution: {integrity: sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==}
engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
@@ -2837,10 +2770,6 @@ packages:
resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
- resolution: {integrity: sha512-kxltocVQCwQNFvw40dlVRYeAkAvtYjMFZYNlOcsF5wExPpGwPxMwgx4IfDJvBRPtBpnQwItd5WkTaR0ZwT/TmQ==}
- engines: {node: ^14.18.0 || >=16.10.0}
-
resolution: {integrity: sha512-Qil5KwghMzlqd51UXM0b6fyaGHtOC22scxrwrz4A2882LyUMwQjnvaedN1HAeXzphspQ6CpHkzMAWxBTUruDLg==}
engines: {node: ^14.18.0 || >=16.10.0}
@@ -2890,8 +2819,8 @@ packages:
resolution: {integrity: sha512-NKgHbWkSZXJUcaBHSsyzC8eegD6bBd4O0oCI6XMIJ+y4Bq3v4w7sY3wfWoKPuVlq9pQHRB6od0lmKpIqi8TlKA==}
hasBin: true
- resolution: {integrity: sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==}
+ resolution: {integrity: sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==}
resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
@@ -3179,8 +3108,8 @@ packages:
engines: {node: '>=0.10.0'}
hasBin: true
- resolution: {integrity: sha512-Lf3++DumRE/QmweGjU+ZcKqQ+3bKkU/qjaKYhIJKEOhgIO9Xs6IiAQFkfFoj+RhgDk4LUeNsLo6plExHqSyu6Q==}
+ resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==}
resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@@ -3225,8 +3154,8 @@ packages:
resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
engines: {node: '>= 0.4'}
- resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==}
+ resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==}
resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
@@ -3324,8 +3253,8 @@ packages:
peerDependencies:
eslint: '*'
- resolution: {integrity: sha512-oOeA6FWU0UJT/Rxc3XF5Cq0nbIZbylm7j8+plqq0CZoE6m4u32OXJrR+9iy4srGMmF6v6pmgvP1zPxSRIGh3sg==}
+ resolution: {integrity: sha512-KRgd6wuxH4U8kczqPp+Oyk4irThIhHWxgFgLDtpgjUGVIS3wGrJntvZW/p6hHq1T4FOwnOtCNkvAI4Kr+mQ/Hw==}
resolution: {integrity: sha512-gZM3jq3ouqaoHmUNszb1Zo2Ux7RckSvkGksjLWz9ipBYGSv1EwwBETN6AdiUXn+RpVHXTbEMPAPlXJazcA6+iA==}
@@ -3538,8 +3467,8 @@ packages:
resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==}
- resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
+ resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
engines: {node: '>=8.6.0'}
@@ -3551,11 +3480,11 @@ packages:
resolution: {integrity: sha512-E+fdxeaOQGo/CMWc9f4uHFfgUPJRAu7N3uB8GBvB3SDPAIWJK4GKyYhkAGFq+GYrcbKNfQIz5VVQyJnDuPPCrg==}
- resolution: {integrity: sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==}
+ resolution: {integrity: sha512-5JnBCWpFlMo0a3ciDy/JckMzzv1U9coZrIhedq+HXxxUfDTAiS0LA8OKVao4G9BxmCVck/jtA5r3KAtRWEyD8Q==}
- resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==}
+ resolution: {integrity: sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==}
resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==}
@@ -3798,9 +3727,6 @@ packages:
resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
engines: {node: '>= 0.4'}
- resolution: {integrity: sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==}
-
resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
engines: {node: '>= 0.4'}
@@ -3866,10 +3792,6 @@ packages:
resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
engines: {node: '>= 4'}
- resolution: {integrity: sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==}
- engines: {node: '>= 4'}
-
resolution: {integrity: sha512-lcX8PNQygAa22u/0BysEY8VhaFRzlOkvdlKczDPnJvrkJD1EuqzEky5VYYKM2iySIuaVIDv9N190DfSreSLw2A==}
engines: {node: '>= 4'}
@@ -3958,8 +3880,8 @@ packages:
resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
engines: {node: '>= 0.4'}
- resolution: {integrity: sha512-urTSINYfAYgcbLb0yDQ6egFm6h3Mo1DcF9EkyXSRjjzdHbsulg01qhwWuXdOoUBuTkbQ80KDboXa0vFJ+BDH+g==}
+ resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==}
engines: {node: '>= 0.4'}
@@ -3992,10 +3914,6 @@ packages:
resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
engines: {node: '>=8'}
- resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
- engines: {node: '>= 0.4'}
-
resolution: {integrity: sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==}
engines: {node: '>= 0.4'}
@@ -4747,8 +4665,8 @@ packages:
firebase-functions:
optional: true
- resolution: {integrity: sha512-pjP/2zEjr57ensZZ1F4b7KldocM9S4SOtukgi9zau1OFlyolUmEgMFbHnwmEKqzuZ1OPTaRS3/1S6B7GUVbbRg==}
+ resolution: {integrity: sha512-8sKgqjhu5JoaVv89TnBW5S0jvsXRrEWGF+CguYUPK+6sRAtNcJAwcWxd4pEmURYQ2D0jjdfgr/VyH0i9CdhkBQ==}
engines: {node: ^18.20.5 || ^20.9.0 || >=22.0.0}
hasBin: true
peerDependencies:
@@ -4822,8 +4740,8 @@ packages:
resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==}
engines: {node: '>=12'}
- resolution: {integrity: sha512-7j3nktnRzlQdlHnHsrcr6Gqz8f80/RhfA2I8s1clPI+jkY0hLNmnYVKBfuUEli5EEgK1B6M+ibdS5REasPlsUw==}
+ resolution: {integrity: sha512-ebOnVlSyfObXR9geTkITBMan2HqmVJV14poVsS2/f2FS1RbiQsZFqh+q5zbrjn1tydSXHE6njUOfEvS3DOVsUQ==}
hasBin: true
peerDependencies:
typescript: ^5.x
@@ -4945,6 +4863,9 @@ packages:
resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
+ resolution: {integrity: sha512-G7n4uhtk9qJt2hlD+UFfsIGY854wpF+zs2bUbQ3CQEUTcn7v25LRsrmurOxTo4bJgjE4qkyshd9ldsEuY9M6xg==}
+
resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==}
engines: {node: '>= 14.16'}
@@ -4980,9 +4901,6 @@ packages:
resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
engines: {node: '>= 6'}
- resolution: {integrity: sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==}
-
resolution: {integrity: sha512-kS7yWjVFCkIw9hqdJBoMxDdzEngmkr5FXeWZZfQ6GoYacjVnsW6l2CcYW/0ThD0vF4LPJgVYnrg4d0uuhwYQbg==}
@@ -5427,8 +5345,8 @@ packages:
engines: {node: '>=10.0.0'}
hasBin: true
- resolution: {integrity: sha512-RaJ45M/kmJUzSWDs1Nnd5DdV4eerC98idtUOVr6FfKcgxqvjwHmxc5upLF9qZU9EpsVzzhleFahrT3shLuJzIw==}
+ resolution: {integrity: sha512-sDnr1pcjTgUT69qBksNF1N1anwfbyYG6TBQ22b03bII8EdiUQ7J0TlozVaTMjT/eEJAO49e1ndV7t+UZfL1+vA==}
engines: {node: '>=18.0.0', npm: '>=8.0.0'}
hasBin: true
@@ -5829,9 +5747,6 @@ packages:
resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
- resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==}
-
resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==}
@@ -5920,8 +5835,8 @@ packages:
resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
engines: {node: '>=8'}
- resolution: {integrity: sha512-UJShLPYi1aWqCdq9HycOL/gwsuqda1OISdBO3t8RlXQC4QvtuIz4b5FCfe2dQIWEpmlRExKmcTBfP1r9bhY7ig==}
+ resolution: {integrity: sha512-yCxltHW07Nkhv/1F6wWBr8kz+5BGMfP+RbRSYFnegVb0qV/UMT0G0ElBloPVerqn4M2ZV80Ir1FtCcYv1cT6vQ==}
engines: {node: '>=16'}
@@ -6045,16 +5960,12 @@ packages:
resolution: {integrity: sha512-2qzQo5LN2DmUZXkWDHvGKLF5BP0WN+KthD6aPnPJ8plRBIjv4lh5O07eYcSxgO2znNw9s4MNhEO1sB+JDllDbQ==}
engines: {node: '>=18.12.0'}
- resolution: {integrity: sha512-us4j03/499KhbGP8BU7Hrzrgseo+KdfJYWcbcajCOqsAyb8Gk0Yn2kiUIcZISYCb1JFaZfIuG3b42HmguVOKCQ==}
- engines: {node: '>=18.12.0'}
-
resolution: {integrity: sha512-Q3LU0e4zxKfRko1wMV2HmP8lB9KWislY7hxXpxd+lGx0PRInE4vhMBVEZwpdVYHvtqzhSrzuIfErsob6bQfCzw==}
engines: {node: '>=18.12.0'}
- resolution: {integrity: sha512-0MBKpoVhNLL/Ixvue9lIsrHkwwWW9/f3TRftsYu1R7nZJJyHSdgPMBDjny2op07nirnS3OX6H3u+YDFGld+1Bg==}
+ resolution: {integrity: sha512-1SYeamwuYeQJtJ/USE1x4l17LkmQBzg7deBJ+U9qOBoHo15d1cDxG4jM31zKRgF7pG0kirZy4wVMX6WL6Zoscg==}
peerDependencies:
'@azure/app-configuration': ^1.8.0
'@azure/cosmos': ^4.2.0
@@ -6072,7 +5983,7 @@ packages:
aws4fetch: ^1.0.20
db0: '>=0.2.1'
idb-keyval: ^6.2.1
- ioredis: ^5.4.1
+ ioredis: ^5.4.2
uploadthing: ^7.4.1
peerDependenciesMeta:
'@azure/app-configuration':
@@ -6227,10 +6138,10 @@ packages:
'@vite-pwa/assets-generator':
optional: true
- resolution: {integrity: sha512-pMrseXIDP1Gb38mOevY+BvtNGNqiqmqa2pKB99lnLsADQww9w9xMbAfT4GB6RUoaOkSPrtlXqpq2Fq+Dj2AgFg==}
+ resolution: {integrity: sha512-cBk172kZKTdvGpJuzCCLg8lJ909wopwsu3Ve9FsL1XsnLBiRT9U3MePcqrgGHgCX2ZgkqZmAGR8taxw+TV6s7A==}
peerDependencies:
- vite: ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0
+ vite: ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0 || ^6.0.0-0
resolution: {integrity: sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==}
@@ -6603,11 +6514,6 @@ packages:
resolution: {integrity: sha512-4wZWvE398hCP7O8n3nXKu/vdq1HcH01ixYlCREaJL5NUMwQ0g3MaGFUBNSlmBtKmhbtVG/Cm6lyYmSVTEVil8A==}
engines: {node: ^14.17.0 || >=16.0.0}
- resolution: {integrity: sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==}
- engines: {node: '>= 14'}
- hasBin: true
-
resolution: {integrity: sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==}
engines: {node: '>= 14'}
@@ -6651,7 +6557,8 @@ packages:
snapshots:
- '@adobe/[email protected]': {}
+ '@adobe/[email protected]':
+ optional: true
'@alloc/[email protected]': {}
@@ -6660,16 +6567,16 @@ snapshots:
'@jridgewell/gen-mapping': 0.3.8
'@jridgewell/trace-mapping': 0.3.25
dependencies:
'@antfu/install-pkg': 0.5.0
'@clack/prompts': 0.9.0
'@eslint-community/eslint-plugin-eslint-comments': 4.4.1([email protected]([email protected])([email protected]))
'@eslint/markdown': 6.2.1([email protected])
eslint-config-flat-gitignore: 0.3.0([email protected]([email protected])([email protected]))
eslint-flat-config-utils: 0.4.0
@@ -6711,12 +6618,12 @@ snapshots:
dependencies:
package-manager-detector: 0.2.8
- tinyexec: 0.3.1
+ tinyexec: 0.3.2
dependencies:
package-manager-detector: 0.2.8
- tinyexec: 0.3.1
+ tinyexec: 0.3.2
'@antfu/[email protected]': {}
@@ -7421,7 +7328,7 @@ snapshots:
'@capsizecss/[email protected]':
dependencies:
blob-to-buffer: 1.2.9
- cross-fetch: 3.1.8
+ cross-fetch: 3.2.0
fontkit: 2.0.4
transitivePeerDependencies:
- encoding
@@ -7453,7 +7360,7 @@ snapshots:
'@dprint/[email protected]': {}
- '@dprint/[email protected]': {}
+ '@dprint/[email protected]': {}
'@es-joy/[email protected]':
dependencies:
@@ -7633,13 +7540,13 @@ snapshots:
dependencies:
'@eslint/config-array': 0.19.1([email protected])
- '@voxpelli/config-array-find-files': 1.2.1(@eslint/[email protected]([email protected]))
- bundle-require: 5.0.0([email protected])
+ '@voxpelli/config-array-find-files': 1.2.2(@eslint/[email protected]([email protected]))
+ bundle-require: 5.1.0([email protected])
cac: 6.7.14
chokidar: 4.0.3
esbuild: 0.24.2
- fast-glob: 3.3.2
+ fast-glob: 3.3.3
find-up: 7.0.0
get-port-please: 3.1.2
h3: 1.13.0
@@ -8011,7 +7918,7 @@ snapshots:
dependencies:
'@grpc/proto-loader': 0.7.13
- '@types/node': 22.10.2
+ '@types/node': 22.10.5
dependencies:
@@ -8046,11 +7953,11 @@ snapshots:
dependencies:
'@iconify/types': 2.0.0
- '@iconify-json/[email protected]':
+ '@iconify-json/[email protected]':
dependencies:
'@iconify/types': 2.0.0
- '@iconify/[email protected]':
+ '@iconify/[email protected]':
dependencies:
'@iconify/types': 2.0.0
@@ -8069,7 +7976,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
'@iconify/types': 2.0.0
vue: 3.5.13([email protected])
@@ -8119,17 +8026,17 @@ snapshots:
'@intlify/[email protected]': {}
dependencies:
'@eslint-community/eslint-utils': 4.4.1([email protected]([email protected])([email protected]))
'@intlify/bundle-utils': 10.0.0([email protected]([email protected]([email protected])))
'@intlify/shared': 11.0.1
- '@rollup/pluginutils': 5.1.4([email protected])
- '@typescript-eslint/scope-manager': 8.18.1
- '@typescript-eslint/typescript-estree': 8.18.1([email protected])([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
+ '@typescript-eslint/scope-manager': 8.19.0
+ '@typescript-eslint/typescript-estree': 8.19.0([email protected])([email protected])
debug: 4.4.0([email protected])
- fast-glob: 3.3.2
+ fast-glob: 3.3.3
js-yaml: 4.1.0
json5: 2.2.3
pathe: 1.1.2
@@ -8148,7 +8055,7 @@ snapshots:
'@intlify/[email protected]': {}
dependencies:
'@babel/parser': 7.26.3
optionalDependencies:
@@ -8229,11 +8136,11 @@ snapshots:
- encoding
- supports-color
dependencies:
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
json5: 2.2.3
- rollup: 4.29.1
+ rollup: 4.30.0
'@netlify/[email protected]':
dependencies:
@@ -8251,39 +8158,39 @@ snapshots:
'@nodelib/fs.stat': 2.0.5
run-parallel: 1.2.0
- '@nodelib/[email protected]':
+ '@nodelib/[email protected]':
dependencies:
- '@nodelib/fs.stat': 3.0.0
+ '@nodelib/fs.stat': 4.0.0
run-parallel: 1.2.0
'@nodelib/[email protected]': {}
- '@nodelib/[email protected]': {}
+ '@nodelib/[email protected]': {}
'@nodelib/[email protected]':
dependencies:
'@nodelib/fs.scandir': 2.1.5
- fastq: 1.17.1
+ fastq: 1.18.0
- '@nodelib/[email protected]':
+ '@nodelib/[email protected]':
dependencies:
- '@nodelib/fs.scandir': 3.0.0
- fastq: 1.17.1
+ '@nodelib/fs.scandir': 4.0.1
+ fastq: 1.18.0
'@nuxt/[email protected]': {}
dependencies:
+ '@nuxt/schema': 3.15.1
execa: 7.2.0
transitivePeerDependencies:
- magicast
- rollup
- supports-color
dependencies:
consola: 3.3.3
diff: 7.0.0
@@ -8296,13 +8203,13 @@ snapshots:
rc9: 2.1.2
semver: 7.6.3
dependencies:
'@antfu/utils': 0.7.10
- '@nuxt/devtools-wizard': 1.6.4
+ '@nuxt/devtools-wizard': 1.7.0
'@vue/devtools-kit': 7.6.8
birpc: 0.2.19
consola: 3.3.3
@@ -8330,10 +8237,10 @@ snapshots:
simple-git: 3.27.0([email protected])
sirv: 3.0.0
tinyglobby: 0.2.10
- unimport: 3.14.5([email protected])
+ unimport: 3.14.5([email protected])
which: 3.0.1
ws: 8.18.0
transitivePeerDependencies:
@@ -8350,8 +8257,8 @@ snapshots:
'@eslint/js': 9.17.0
eslint-config-flat-gitignore: 0.2.0([email protected]([email protected])([email protected]))
eslint-flat-config-utils: 0.4.0
@@ -8375,20 +8282,20 @@ snapshots:
dependencies:
- '@typescript-eslint/types': 8.18.1
+ '@typescript-eslint/types': 8.19.0
transitivePeerDependencies:
- supports-color
- typescript
dependencies:
chokidar: 4.0.3
eslint-flat-config-utils: 0.4.0
@@ -8397,7 +8304,7 @@ snapshots:
get-port-please: 3.1.2
mlly: 1.7.3
pathe: 1.1.2
- unimport: 3.14.5([email protected])
+ unimport: 3.14.5([email protected])
transitivePeerDependencies:
- '@vue/compiler-sfc'
- bufferutil
@@ -8409,11 +8316,11 @@ snapshots:
- utf-8-validate
- vite
dependencies:
- chalk: 5.4.0
+ chalk: 5.4.1
css-tree: 3.1.0
defu: 6.1.4
esbuild: 0.24.2
@@ -8429,8 +8336,8 @@ snapshots:
tinyglobby: 0.2.10
ufo: 1.5.4
unifont: 0.1.7
- unplugin: 2.1.0
+ unplugin: 2.1.2
transitivePeerDependencies:
- '@azure/app-configuration'
- '@azure/cosmos'
@@ -8456,15 +8363,15 @@ snapshots:
- uploadthing
- vite
dependencies:
- '@iconify/collections': 1.0.498
+ '@iconify/collections': 1.0.503
'@iconify/types': 2.0.0
'@iconify/utils': 2.2.1([email protected])
- '@iconify/vue': 4.2.0([email protected]([email protected]))
- consola: 3.3.0
+ '@iconify/vue': 4.3.0([email protected]([email protected]))
+ consola: 3.3.3
local-pkg: 0.5.1
mlly: 1.7.3
ohash: 1.1.4
@@ -8479,36 +8386,9 @@ snapshots:
- vite
- vue
- dependencies:
- c12: 2.0.1([email protected])
- consola: 3.3.0
- defu: 6.1.4
- destr: 2.0.3
- globby: 14.0.2
- hash-sum: 2.0.0
- ignore: 6.0.2
- jiti: 2.4.2
- klona: 2.0.6
- knitwork: 1.2.0
- mlly: 1.7.3
- pathe: 1.1.2
- pkg-types: 1.2.1
- scule: 1.3.0
- semver: 7.6.3
- ufo: 1.5.4
- unctx: 2.4.1
- unimport: 3.14.5([email protected])
- untyped: 1.5.2([email protected])
- transitivePeerDependencies:
- - magicast
- - rollup
- - supports-color
-
dependencies:
+ '@nuxt/schema': 3.15.1
c12: 2.0.1([email protected])
consola: 3.3.3
defu: 6.1.4
@@ -8520,62 +8400,29 @@ snapshots:
knitwork: 1.2.0
mlly: 1.7.3
ohash: 1.1.4
- pathe: 1.1.2
+ pathe: 2.0.0
pkg-types: 1.3.0
scule: 1.3.0
semver: 7.6.3
ufo: 1.5.4
unctx: 2.4.1
- unimport: 3.14.5([email protected])
- untyped: 1.5.2([email protected])
- transitivePeerDependencies:
- - magicast
- - rollup
- - supports-color
-
- dependencies:
- c12: 2.0.1([email protected])
- compatx: 0.1.8
- consola: 3.3.0
- defu: 6.1.4
- hookable: 5.5.3
- pathe: 1.1.2
- pkg-types: 1.2.1
- scule: 1.3.0
- std-env: 3.8.0
- ufo: 1.5.4
- uncrypto: 0.1.3
- unimport: 3.14.5([email protected])
+ unimport: 3.14.5([email protected])
untyped: 1.5.2([email protected])
transitivePeerDependencies:
- magicast
- rollup
- supports-color
dependencies:
- c12: 2.0.1([email protected])
- compatx: 0.1.8
consola: 3.3.3
defu: 6.1.4
- hookable: 5.5.3
- pathe: 1.1.2
- pkg-types: 1.2.1
- scule: 1.3.0
+ pathe: 2.0.0
std-env: 3.8.0
- ufo: 1.5.4
- uncrypto: 0.1.3
- unimport: 3.14.5([email protected])
- untyped: 1.5.2([email protected])
- transitivePeerDependencies:
- - magicast
- - rollup
- - supports-color
dependencies:
citty: 0.1.6
consola: 3.3.3
destr: 2.0.3
@@ -8594,23 +8441,23 @@ snapshots:
- rollup
- supports-color
dependencies:
'@headlessui/tailwindcss': 0.2.1([email protected])
'@headlessui/vue': 1.7.23([email protected]([email protected]))
'@iconify-json/heroicons': 1.2.2
- '@nuxtjs/tailwindcss': 6.12.2([email protected])([email protected])([email protected])
+ '@nuxtjs/tailwindcss': 6.12.2([email protected])([email protected])([email protected])
'@popperjs/core': 2.11.8
'@tailwindcss/aspect-ratio': 0.4.2([email protected])
'@tailwindcss/container-queries': 0.1.1([email protected])
'@tailwindcss/forms': 0.5.9([email protected])
'@tailwindcss/typography': 0.5.15([email protected])
'@vueuse/core': 12.3.0([email protected])
- '@vueuse/integrations': 12.0.0([email protected])([email protected])([email protected])
- '@vueuse/math': 12.0.0([email protected])
+ '@vueuse/integrations': 12.3.0([email protected])([email protected])([email protected])
+ '@vueuse/math': 12.3.0([email protected])
defu: 6.1.4
fuse.js: 7.0.0
ohash: 1.1.4
@@ -8638,12 +8485,12 @@ snapshots:
- vite
- vue
dependencies:
- '@rollup/plugin-replace': 6.0.2([email protected])
+ '@rollup/plugin-replace': 6.0.2([email protected])
autoprefixer: 10.4.20([email protected])
consola: 3.3.3
cssnano: 7.0.6([email protected])
@@ -8658,18 +8505,18 @@ snapshots:
magic-string: 0.30.17
mlly: 1.7.3
ohash: 1.1.4
- pathe: 1.1.2
+ pathe: 2.0.0
perfect-debounce: 1.0.0
pkg-types: 1.3.0
postcss: 8.4.49
- rollup-plugin-visualizer: 5.13.1([email protected])
+ rollup-plugin-visualizer: 5.13.1([email protected])
std-env: 3.8.0
ufo: 1.5.4
unenv: 1.10.0
unplugin: 2.1.2
vue: 3.5.13([email protected])
vue-bundle-renderer: 2.1.1
transitivePeerDependencies:
@@ -8697,26 +8544,26 @@ snapshots:
- vue-tsc
- yaml
dependencies:
pathe: 1.1.2
- pkg-types: 1.2.1
+ pkg-types: 1.3.0
semver: 7.6.3
transitivePeerDependencies:
- magicast
- rollup
- supports-color
dependencies:
'@intlify/h3': 0.6.1
'@intlify/shared': 10.0.5
'@intlify/utils': 0.13.0
- '@miyaneee/rollup-plugin-json5': 1.2.0([email protected])
- '@rollup/plugin-yaml': 4.1.2([email protected])
+ '@miyaneee/rollup-plugin-json5': 1.2.0([email protected])
+ '@rollup/plugin-yaml': 4.1.2([email protected])
'@vue/compiler-sfc': 3.5.13
debug: 4.4.0([email protected])
defu: 6.1.4
@@ -8730,7 +8577,7 @@ snapshots:
sucrase: 3.35.0
ufo: 1.5.4
unplugin: 1.16.0
transitivePeerDependencies:
@@ -8743,11 +8590,11 @@ snapshots:
- typescript
- vue
dependencies:
autoprefixer: 10.4.20([email protected])
- consola: 3.3.0
+ consola: 3.3.3
defu: 6.1.4
h3: 1.13.0
klona: 2.0.6
@@ -8829,9 +8676,9 @@ snapshots:
'@parcel/watcher-win32-ia32': 2.5.0
'@parcel/watcher-win32-x64': 2.5.0
dependencies:
transitivePeerDependencies:
- magicast
@@ -8881,7 +8728,7 @@ snapshots:
'@redocly/[email protected]': {}
dependencies:
'@redocly/ajv': 8.11.2
'@redocly/config': 0.17.1
@@ -8897,9 +8744,9 @@ snapshots:
- encoding
- supports-color
optionalDependencies:
- rollup: 4.29.1
+ rollup: 4.30.0
dependencies:
@@ -8910,9 +8757,9 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
commondir: 1.0.1
estree-walker: 2.0.2
fdir: 6.4.2([email protected])
@@ -8920,21 +8767,21 @@ snapshots:
magic-string: 0.30.17
picomatch: 4.0.2
optionalDependencies:
- rollup: 4.29.1
+ rollup: 4.30.0
dependencies:
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
estree-walker: 2.0.2
magic-string: 0.30.17
optionalDependencies:
- rollup: 4.29.1
+ rollup: 4.30.0
dependencies:
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
optionalDependencies:
- rollup: 4.29.1
+ rollup: 4.30.0
dependencies:
@@ -8946,15 +8793,15 @@ snapshots:
optionalDependencies:
rollup: 2.79.2
dependencies:
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
'@types/resolve': 1.20.2
deepmerge: 4.3.1
is-module: 1.0.0
resolve: 1.22.10
optionalDependencies:
- rollup: 4.29.1
+ rollup: 4.30.0
dependencies:
@@ -8962,12 +8809,12 @@ snapshots:
magic-string: 0.25.9
rollup: 2.79.2
dependencies:
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
magic-string: 0.30.17
optionalDependencies:
- rollup: 4.29.1
+ rollup: 4.30.0
dependencies:
@@ -8977,21 +8824,21 @@ snapshots:
optionalDependencies:
rollup: 2.79.2
dependencies:
serialize-javascript: 6.0.2
smob: 1.5.0
terser: 5.37.0
optionalDependencies:
- rollup: 4.29.1
+ rollup: 4.30.0
dependencies:
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
js-yaml: 4.1.0
tosource: 2.0.0-alpha.3
optionalDependencies:
- rollup: 4.29.1
+ rollup: 4.30.0
dependencies:
@@ -9008,76 +8855,76 @@ snapshots:
optionalDependencies:
rollup: 2.79.2
dependencies:
'@types/estree': 1.0.6
estree-walker: 2.0.2
picomatch: 4.0.2
optionalDependencies:
- rollup: 4.29.1
+ rollup: 4.30.0
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
'@sindresorhus/[email protected]': {}
dependencies:
eslint-visitor-keys: 4.2.0
espree: 10.3.0
@@ -9140,11 +8987,11 @@ snapshots:
dependencies:
- '@types/node': 22.10.2
+ '@types/node': 22.10.5
'@types/[email protected]': {}
- '@types/[email protected]': {}
+ '@types/[email protected]': {}
dependencies:
@@ -9152,7 +8999,7 @@ snapshots:
'@types/[email protected]': {}
- '@types/[email protected]':
+ '@types/[email protected]':
dependencies:
undici-types: 6.20.0
@@ -9170,27 +9017,10 @@ snapshots:
'@types/[email protected]': {}
- dependencies:
- '@eslint-community/regexpp': 4.12.1
- '@typescript-eslint/scope-manager': 8.18.1
- '@typescript-eslint/visitor-keys': 8.18.1
- graphemer: 1.4.0
- ignore: 5.3.2
- natural-compare: 1.4.0
- ts-api-utils: 1.4.3([email protected])
- typescript: 5.7.2
- transitivePeerDependencies:
- - supports-color
-
dependencies:
'@eslint-community/regexpp': 4.12.1
'@typescript-eslint/scope-manager': 8.19.0
@@ -9204,18 +9034,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@typescript-eslint/scope-manager': 8.18.1
- '@typescript-eslint/types': 8.18.1
- '@typescript-eslint/typescript-estree': 8.18.1([email protected])([email protected])
- '@typescript-eslint/visitor-keys': 8.18.1
- debug: 4.4.0([email protected])
- typescript: 5.7.2
- transitivePeerDependencies:
- - supports-color
-
dependencies:
'@typescript-eslint/scope-manager': 8.19.0
@@ -9228,27 +9046,11 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/[email protected]':
- dependencies:
- '@typescript-eslint/types': 8.18.1
- '@typescript-eslint/visitor-keys': 8.18.1
-
'@typescript-eslint/[email protected]':
dependencies:
'@typescript-eslint/types': 8.19.0
'@typescript-eslint/visitor-keys': 8.19.0
- dependencies:
- '@typescript-eslint/typescript-estree': 8.18.1([email protected])([email protected])
- debug: 4.4.0([email protected])
- ts-api-utils: 1.4.3([email protected])
- typescript: 5.7.2
- transitivePeerDependencies:
- - supports-color
-
dependencies:
'@typescript-eslint/typescript-estree': 8.19.0([email protected])([email protected])
@@ -9260,30 +9062,14 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/[email protected]': {}
-
'@typescript-eslint/[email protected]': {}
- dependencies:
- '@typescript-eslint/types': 8.18.1
- '@typescript-eslint/visitor-keys': 8.18.1
- debug: 4.4.0([email protected])
- fast-glob: 3.3.2
- is-glob: 4.0.3
- minimatch: 9.0.5
- semver: 7.6.3
- ts-api-utils: 1.4.3([email protected])
- typescript: 5.7.2
- transitivePeerDependencies:
- - supports-color
-
dependencies:
'@typescript-eslint/types': 8.19.0
'@typescript-eslint/visitor-keys': 8.19.0
debug: 4.4.0([email protected])
- fast-glob: 3.3.2
+ fast-glob: 3.3.3
is-glob: 4.0.3
minimatch: 9.0.5
semver: 7.6.3
@@ -9292,17 +9078,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- '@eslint-community/eslint-utils': 4.4.1([email protected]([email protected])([email protected]))
- '@typescript-eslint/scope-manager': 8.18.1
- '@typescript-eslint/types': 8.18.1
- '@typescript-eslint/typescript-estree': 8.18.1([email protected])([email protected])
- typescript: 5.7.2
- transitivePeerDependencies:
- - supports-color
-
dependencies:
'@eslint-community/eslint-utils': 4.4.1([email protected]([email protected])([email protected]))
@@ -9314,11 +9089,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/[email protected]':
- dependencies:
- '@typescript-eslint/types': 8.18.1
- eslint-visitor-keys: 4.2.0
-
'@typescript-eslint/[email protected]':
dependencies:
'@typescript-eslint/types': 8.19.0
@@ -9352,10 +9122,10 @@ snapshots:
unhead: 1.11.14
vue: 3.5.13([email protected])
dependencies:
'@mapbox/node-pre-gyp': 2.0.0-rc.0([email protected])
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
acorn: 8.14.0
acorn-import-attributes: 1.9.5([email protected])
async-sema: 3.1.1
@@ -9371,12 +9141,12 @@ snapshots:
- rollup
- supports-color
dependencies:
pathe: 1.1.2
ufo: 1.5.4
transitivePeerDependencies:
- magicast
- rollup
@@ -9385,22 +9155,22 @@ snapshots:
- workbox-build
- workbox-window
dependencies:
'@babel/core': 7.26.0([email protected])
'@babel/plugin-transform-typescript': 7.26.3(@babel/[email protected]([email protected]))([email protected])
'@vue/babel-plugin-jsx': 1.2.5(@babel/[email protected]([email protected]))([email protected])
vue: 3.5.13([email protected])
transitivePeerDependencies:
- supports-color
dependencies:
vue: 3.5.13([email protected])
dependencies:
'@ampproject/remapping': 2.3.0
'@bcoe/v8-coverage': 0.2.3
@@ -9414,17 +9184,17 @@ snapshots:
std-env: 3.8.0
test-exclude: 7.0.1
tinyrainbow: 1.2.0
transitivePeerDependencies:
- supports-color
dependencies:
optionalDependencies:
typescript: 5.7.2
'@vitest/[email protected]':
dependencies:
@@ -9433,13 +9203,13 @@ snapshots:
chai: 5.1.2
tinyrainbow: 1.2.0
dependencies:
'@vitest/spy': 2.1.8
estree-walker: 3.0.3
magic-string: 0.30.17
optionalDependencies:
'@vitest/[email protected]':
dependencies:
@@ -9466,15 +9236,15 @@ snapshots:
loupe: 3.1.2
tinyrainbow: 1.2.0
dependencies:
'@eslint/config-array': 0.19.1([email protected])
- '@nodelib/fs.walk': 2.0.0
+ '@nodelib/fs.walk': 3.0.1
dependencies:
'@babel/types': 7.26.3
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
'@vue/compiler-sfc': 3.5.13
ast-kit: 1.3.2
local-pkg: 0.5.1
@@ -9546,14 +9316,14 @@ snapshots:
'@vue/[email protected]': {}
dependencies:
'@vue/devtools-kit': 7.6.8
'@vue/devtools-shared': 7.6.8
mitt: 3.0.1
nanoid: 5.0.9
pathe: 1.1.2
vue: 3.5.13([email protected])
transitivePeerDependencies:
- vite
@@ -9596,15 +9366,6 @@ snapshots:
'@vue/[email protected]': {}
- dependencies:
- '@types/web-bluetooth': 0.0.20
- '@vueuse/metadata': 12.0.0
- '@vueuse/shared': 12.0.0([email protected])
- vue: 3.5.13([email protected])
- transitivePeerDependencies:
- - typescript
-
dependencies:
'@types/web-bluetooth': 0.0.20
@@ -9614,10 +9375,10 @@ snapshots:
transitivePeerDependencies:
- typescript
dependencies:
- '@vueuse/core': 12.0.0([email protected])
- '@vueuse/shared': 12.0.0([email protected])
+ '@vueuse/core': 12.3.0([email protected])
+ '@vueuse/shared': 12.3.0([email protected])
vue: 3.5.13([email protected])
optionalDependencies:
change-case: 5.4.4
@@ -9625,24 +9386,22 @@ snapshots:
transitivePeerDependencies:
- typescript
dependencies:
- '@vueuse/shared': 12.0.0([email protected])
+ '@vueuse/shared': 12.3.0([email protected])
vue: 3.5.13([email protected])
transitivePeerDependencies:
- typescript
- '@vueuse/[email protected]': {}
-
'@vueuse/[email protected]': {}
dependencies:
'@vueuse/core': 12.3.0([email protected])
'@vueuse/metadata': 12.3.0
local-pkg: 0.5.1
vue: 3.5.13([email protected])
transitivePeerDependencies:
- magicast
@@ -9650,12 +9409,6 @@ snapshots:
- supports-color
- typescript
- dependencies:
- vue: 3.5.13([email protected])
- transitivePeerDependencies:
- - typescript
-
dependencies:
vue: 3.5.13([email protected])
@@ -9695,7 +9448,7 @@ snapshots:
dependencies:
fast-deep-equal: 3.1.3
- fast-uri: 3.0.3
+ fast-uri: 3.0.5
json-schema-traverse: 1.0.0
require-from-string: 2.0.2
@@ -9827,7 +9580,7 @@ snapshots:
optional: true
@@ -9864,7 +9617,7 @@ snapshots:
dependencies:
caniuse-lite: 1.0.30001690
- electron-to-chromium: 1.5.75
+ electron-to-chromium: 1.5.76
node-releases: 2.0.19
update-browserslist-db: 1.1.1([email protected])
@@ -9883,7 +9636,7 @@ snapshots:
dependencies:
run-applescript: 7.0.0
dependencies:
esbuild: 0.24.2
load-tsconfig: 0.2.5
@@ -9900,7 +9653,7 @@ snapshots:
ohash: 1.1.4
pathe: 1.1.2
perfect-debounce: 1.0.0
- pkg-types: 1.2.1
+ pkg-types: 1.3.0
rc9: 2.1.2
optionalDependencies:
magicast: 0.3.5
@@ -9957,7 +9710,7 @@ snapshots:
ansi-styles: 4.3.0
supports-color: 7.2.0
@@ -10055,8 +9808,6 @@ snapshots:
-
@@ -10095,7 +9846,7 @@ snapshots:
dependencies:
node-fetch: 2.7.0
transitivePeerDependencies:
@@ -10347,7 +10098,7 @@ snapshots:
dependencies:
- type-fest: 4.30.2
+ type-fest: 4.31.0
@@ -10372,7 +10123,7 @@ snapshots:
dependencies:
jake: 10.9.2
@@ -10455,7 +10206,7 @@ snapshots:
dependencies:
@@ -10583,7 +10334,7 @@ snapshots:
dependencies:
debug: 3.2.7([email protected])
- is-core-module: 2.16.0
+ is-core-module: 2.16.1
resolve: 1.22.10
transitivePeerDependencies:
- supports-color
@@ -10598,7 +10349,7 @@ snapshots:
dependencies:
dependencies:
@@ -10621,18 +10372,18 @@ snapshots:
dependencies:
'@dprint/formatter': 0.3.0
'@dprint/markdown': 0.17.8
- '@dprint/toml': 0.6.3
+ '@dprint/toml': 0.6.4
eslint-formatting-reporter: 0.0.0([email protected]([email protected])([email protected]))
- eslint-parser-plain: 0.1.0
+ eslint-parser-plain: 0.1.1
prettier: 3.4.2
synckit: 0.9.2
dependencies:
'@types/doctrine': 0.0.9
- '@typescript-eslint/scope-manager': 8.18.1
+ '@typescript-eslint/scope-manager': 8.19.0
debug: 4.4.0([email protected])
doctrine: 3.0.0
enhanced-resolve: 5.18.0
@@ -10716,7 +10467,7 @@ snapshots:
dependencies:
- fast-glob: 3.3.2
+ fast-glob: 3.3.3
postcss: 8.4.49
tailwindcss: 3.4.17
@@ -10754,7 +10505,7 @@ snapshots:
dependencies:
optionalDependencies:
dependencies:
@@ -10926,7 +10677,7 @@ snapshots:
dependencies:
'@nodelib/fs.stat': 2.0.5
'@nodelib/fs.walk': 1.2.8
@@ -10940,9 +10691,9 @@ snapshots:
dependencies:
reusify: 1.0.4
@@ -11210,7 +10961,7 @@ snapshots:
dependencies:
'@sindresorhus/merge-streams': 2.3.0
- fast-glob: 3.3.2
+ fast-glob: 3.3.3
ignore: 5.3.2
path-type: 5.0.0
slash: 5.1.0
@@ -11257,8 +11008,6 @@ snapshots:
dependencies:
has-symbols: 1.1.0
-
dependencies:
function-bind: 1.1.2
@@ -11329,8 +11078,6 @@ snapshots:
-
@@ -11342,9 +11089,9 @@ snapshots:
parent-module: 1.0.1
resolve-from: 4.0.0
dependencies:
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
mlly: 1.7.3
pathe: 1.1.2
unenv: 1.10.0
@@ -11427,7 +11174,7 @@ snapshots:
dependencies:
hasown: 2.0.2
@@ -11454,10 +11201,6 @@ snapshots:
- dependencies:
- has-tostringtag: 1.0.2
-
dependencies:
call-bound: 1.0.3
@@ -11710,7 +11453,7 @@ snapshots:
fresh: 0.5.2
http-assert: 1.5.0
http-errors: 1.8.1
- is-generator-function: 1.0.10
+ is-generator-function: 1.1.0
koa-compose: 4.1.0
koa-convert: 2.0.0
on-finished: 2.4.1
@@ -11774,7 +11517,7 @@ snapshots:
dependencies:
mlly: 1.7.3
- pkg-types: 1.2.1
+ pkg-types: 1.3.0
dependencies:
@@ -12240,7 +11983,7 @@ snapshots:
dependencies:
acorn: 8.14.0
pathe: 1.1.2
- pkg-types: 1.2.1
+ pkg-types: 1.3.0
ufo: 1.5.4
@@ -12271,16 +12014,16 @@ snapshots:
dependencies:
'@cloudflare/kv-asset-handler': 0.3.4
'@netlify/functions': 2.8.2
- '@rollup/plugin-alias': 5.1.1([email protected])
- '@rollup/plugin-commonjs': 28.0.2([email protected])
- '@rollup/plugin-inject': 5.0.5([email protected])
- '@rollup/plugin-json': 6.1.0([email protected])
- '@rollup/plugin-node-resolve': 15.3.1([email protected])
- '@rollup/plugin-replace': 6.0.2([email protected])
- '@rollup/plugin-terser': 0.4.4([email protected])
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/plugin-alias': 5.1.1([email protected])
+ '@rollup/plugin-commonjs': 28.0.2([email protected])
+ '@rollup/plugin-inject': 5.0.5([email protected])
+ '@rollup/plugin-json': 6.1.0([email protected])
+ '@rollup/plugin-node-resolve': 15.3.1([email protected])
+ '@rollup/plugin-replace': 6.0.2([email protected])
+ '@rollup/plugin-terser': 0.4.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
'@types/http-proxy': 1.17.15
- '@vercel/nft': 0.27.10([email protected])([email protected])
+ '@vercel/nft': 0.27.10([email protected])([email protected])
archiver: 7.0.1
c12: 2.0.1([email protected])
chokidar: 3.6.0
@@ -12316,14 +12059,14 @@ snapshots:
node-fetch-native: 1.6.4
ofetch: 1.4.1
ohash: 1.1.4
- openapi-typescript: 7.4.4([email protected])
+ openapi-typescript: 7.5.1([email protected])
pathe: 1.1.2
perfect-debounce: 1.0.0
pkg-types: 1.3.0
pretty-bytes: 6.1.1
radix3: 1.1.2
- rollup: 4.29.1
- rollup-plugin-visualizer: 5.13.1([email protected])
+ rollup: 4.30.0
+ rollup-plugin-visualizer: 5.13.1([email protected])
scule: 1.3.0
semver: 7.6.3
serve-placeholder: 2.0.2
@@ -12333,8 +12076,8 @@ snapshots:
uncrypto: 0.1.3
unctx: 2.4.1
unenv: 1.10.0
- unimport: 3.14.5([email protected])
+ unimport: 3.14.5([email protected])
untyped: 1.5.2([email protected])
unwasm: 0.3.9
transitivePeerDependencies:
@@ -12407,12 +12150,12 @@ snapshots:
dependencies:
- '@iconify/collections': 1.0.498
- '@iconify/vue': 4.2.0([email protected]([email protected]))
+ '@iconify/collections': 1.0.503
+ '@iconify/vue': 4.3.0([email protected]([email protected]))
transitivePeerDependencies:
- magicast
- rollup
@@ -12420,9 +12163,9 @@ snapshots:
- vite
- vue
dependencies:
'@posva/lru-cache': 10.0.1
firebase: 11.1.0
lodash-es: 4.17.21
@@ -12435,14 +12178,14 @@ snapshots:
- rollup
- supports-color
dependencies:
'@nuxt/devalue': 2.0.2
+ '@nuxt/schema': 3.15.1
'@unhead/dom': 1.11.14
'@unhead/shared': 1.11.14
'@unhead/ssr': 1.11.14
@@ -12465,7 +12208,7 @@ snapshots:
h3: 1.13.0
hookable: 5.5.3
ignore: 7.0.0
- impound: 0.2.0([email protected])
+ impound: 0.2.0([email protected])
jiti: 2.4.2
klona: 2.0.6
knitwork: 1.2.0
@@ -12477,7 +12220,7 @@ snapshots:
nypm: 0.4.1
ofetch: 1.4.1
ohash: 1.1.4
- pathe: 1.1.2
+ pathe: 2.0.0
perfect-debounce: 1.0.0
pkg-types: 1.3.0
radix3: 1.1.2
@@ -12492,10 +12235,10 @@ snapshots:
unctx: 2.4.1
unenv: 1.10.0
unhead: 1.11.14
- unimport: 3.14.5([email protected])
+ unimport: 3.14.5([email protected])
unplugin: 2.1.2
untyped: 1.5.2([email protected])
vue: 3.5.13([email protected])
vue-bundle-renderer: 2.1.1
@@ -12503,7 +12246,7 @@ snapshots:
optionalDependencies:
'@parcel/watcher': 2.5.0
- '@types/node': 22.10.2
+ '@types/node': 22.10.5
transitivePeerDependencies:
- '@azure/app-configuration'
- '@azure/cosmos'
@@ -12562,7 +12305,7 @@ snapshots:
consola: 3.3.3
execa: 8.0.1
pathe: 1.1.2
- pkg-types: 1.2.1
+ pkg-types: 1.3.0
ufo: 1.5.4
@@ -12631,9 +12374,9 @@ snapshots:
is-docker: 2.2.1
is-wsl: 2.2.0
dependencies:
- '@redocly/openapi-core': 1.26.1([email protected])
+ '@redocly/openapi-core': 1.27.0([email protected])
ansi-colors: 4.1.3
change-case: 5.4.4
parse-json: 8.1.0
@@ -12703,7 +12446,7 @@ snapshots:
dependencies:
- es-module-lexer: 1.5.4
+ es-module-lexer: 1.6.0
slashes: 3.0.12
@@ -12717,7 +12460,7 @@ snapshots:
dependencies:
'@babel/code-frame': 7.26.2
index-to-position: 0.1.2
- type-fest: 4.30.2
+ type-fest: 4.31.0
dependencies:
@@ -12753,6 +12496,8 @@ snapshots:
+
@@ -12777,12 +12522,6 @@ snapshots:
- dependencies:
- confbox: 0.1.8
- mlly: 1.7.3
- pathe: 1.1.2
-
dependencies:
confbox: 0.1.8
@@ -12853,7 +12592,7 @@ snapshots:
dependencies:
lilconfig: 3.1.3
- yaml: 2.6.1
+ yaml: 2.7.0
optionalDependencies:
postcss: 8.4.49
@@ -13037,7 +12776,7 @@ snapshots:
'@protobufjs/path': 1.1.2
'@protobufjs/pool': 1.1.0
'@protobufjs/utf8': 1.1.0
- '@types/node': 22.10.2
+ '@types/node': 22.10.5
long: 5.2.3
@@ -13197,7 +12936,7 @@ snapshots:
dependencies:
- is-core-module: 2.16.0
+ is-core-module: 2.16.1
path-parse: 1.0.7
supports-preserve-symlinks-flag: 1.0.0
@@ -13211,42 +12950,42 @@ snapshots:
dependencies:
glob: 10.4.5
dependencies:
open: 8.4.2
picomatch: 4.0.2
source-map: 0.7.4
yargs: 17.7.2
optionalDependencies:
- rollup: 4.29.1
+ rollup: 4.30.0
optionalDependencies:
fsevents: 2.3.3
dependencies:
'@types/estree': 1.0.6
optionalDependencies:
- '@rollup/rollup-android-arm-eabi': 4.29.1
- '@rollup/rollup-android-arm64': 4.29.1
- '@rollup/rollup-darwin-arm64': 4.29.1
- '@rollup/rollup-darwin-x64': 4.29.1
- '@rollup/rollup-freebsd-arm64': 4.29.1
- '@rollup/rollup-freebsd-x64': 4.29.1
- '@rollup/rollup-linux-arm-gnueabihf': 4.29.1
- '@rollup/rollup-linux-arm-musleabihf': 4.29.1
- '@rollup/rollup-linux-arm64-gnu': 4.29.1
- '@rollup/rollup-linux-arm64-musl': 4.29.1
- '@rollup/rollup-linux-loongarch64-gnu': 4.29.1
- '@rollup/rollup-linux-powerpc64le-gnu': 4.29.1
- '@rollup/rollup-linux-riscv64-gnu': 4.29.1
- '@rollup/rollup-linux-s390x-gnu': 4.29.1
- '@rollup/rollup-linux-x64-gnu': 4.29.1
- '@rollup/rollup-linux-x64-musl': 4.29.1
- '@rollup/rollup-win32-arm64-msvc': 4.29.1
- '@rollup/rollup-win32-ia32-msvc': 4.29.1
- '@rollup/rollup-win32-x64-msvc': 4.29.1
+ '@rollup/rollup-android-arm-eabi': 4.30.0
+ '@rollup/rollup-android-arm64': 4.30.0
+ '@rollup/rollup-darwin-arm64': 4.30.0
+ '@rollup/rollup-darwin-x64': 4.30.0
+ '@rollup/rollup-freebsd-arm64': 4.30.0
+ '@rollup/rollup-freebsd-x64': 4.30.0
+ '@rollup/rollup-linux-arm-gnueabihf': 4.30.0
+ '@rollup/rollup-linux-arm-musleabihf': 4.30.0
+ '@rollup/rollup-linux-arm64-gnu': 4.30.0
+ '@rollup/rollup-linux-arm64-musl': 4.30.0
+ '@rollup/rollup-linux-loongarch64-gnu': 4.30.0
+ '@rollup/rollup-linux-powerpc64le-gnu': 4.30.0
+ '@rollup/rollup-linux-riscv64-gnu': 4.30.0
+ '@rollup/rollup-linux-s390x-gnu': 4.30.0
+ '@rollup/rollup-linux-x64-gnu': 4.30.0
+ '@rollup/rollup-linux-x64-musl': 4.30.0
+ '@rollup/rollup-win32-arm64-msvc': 4.30.0
+ '@rollup/rollup-win32-ia32-msvc': 4.30.0
+ '@rollup/rollup-win32-x64-msvc': 4.30.0
fsevents: 2.3.3
@@ -13278,7 +13017,8 @@ snapshots:
es-errors: 1.3.0
is-regex: 1.2.1
+ optional: true
dependencies:
@@ -13477,7 +13217,7 @@ snapshots:
queue-tick: 1.0.1
text-decoder: 1.2.3
optionalDependencies:
- bare-events: 2.5.0
+ bare-events: 2.5.1
dependencies:
@@ -13583,6 +13323,7 @@ snapshots:
source-map: 0.7.4
transitivePeerDependencies:
- supports-color
+ optional: true
dependencies:
@@ -13661,7 +13402,7 @@ snapshots:
chokidar: 3.6.0
didyoumean: 1.2.2
dlv: 1.1.3
- fast-glob: 3.3.2
+ fast-glob: 3.3.3
glob-parent: 6.0.2
is-glob: 4.0.3
jiti: 1.21.7
@@ -13747,8 +13488,6 @@ snapshots:
-
@@ -13808,7 +13547,7 @@ snapshots:
dependencies:
@@ -13917,19 +13656,19 @@ snapshots:
css-tree: 3.1.0
ohash: 1.1.4
dependencies:
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
acorn: 8.14.0
escape-string-regexp: 5.0.0
estree-walker: 3.0.3
- fast-glob: 3.3.2
+ fast-glob: 3.3.3
local-pkg: 0.5.1
magic-string: 0.30.17
mlly: 1.7.3
pathe: 1.1.2
picomatch: 4.0.2
- pkg-types: 1.2.1
+ pkg-types: 1.3.0
scule: 1.3.0
strip-literal: 2.1.1
unplugin: 1.16.0
@@ -13961,14 +13700,14 @@ snapshots:
dependencies:
'@babel/types': 7.26.3
- '@rollup/pluginutils': 5.1.4([email protected])
- '@vue-macros/common': 1.15.1([email protected])([email protected]([email protected]))
+ '@rollup/pluginutils': 5.1.4([email protected])
+ '@vue-macros/common': 1.15.1([email protected])([email protected]([email protected]))
ast-walker-scope: 0.6.2
chokidar: 3.6.0
- fast-glob: 3.3.2
+ fast-glob: 3.3.3
json5: 2.2.3
local-pkg: 0.5.1
magic-string: 0.30.17
@@ -13976,7 +13715,7 @@ snapshots:
pathe: 1.1.2
scule: 1.3.0
unplugin: 2.0.0-beta.1
- yaml: 2.6.1
+ yaml: 2.7.0
optionalDependencies:
transitivePeerDependencies:
@@ -13993,24 +13732,17 @@ snapshots:
acorn: 8.14.0
webpack-virtual-modules: 0.6.2
- dependencies:
- acorn: 8.14.0
- webpack-virtual-modules: 0.6.2
-
dependencies:
acorn: 8.14.0
webpack-virtual-modules: 0.6.2
dependencies:
anymatch: 3.1.3
chokidar: 3.6.0
- citty: 0.1.6
destr: 2.0.3
h3: 1.13.0
- listhen: 1.9.0
lru-cache: 10.4.3
node-fetch-native: 1.6.4
ofetch: 1.4.1
@@ -14070,7 +13802,7 @@ snapshots:
dependencies:
'@popperjs/core': 2.11.8
- '@types/lodash': 4.17.13
+ '@types/lodash': 4.17.14
'@types/resize-observer-browser': 0.1.11
date-fns: 2.30.0
date-fns-tz: 2.0.1([email protected])
@@ -14085,17 +13817,17 @@ snapshots:
dependencies:
dependencies:
cac: 6.7.14
debug: 4.4.0([email protected])
- es-module-lexer: 1.5.4
+ es-module-lexer: 1.6.0
pathe: 1.1.2
transitivePeerDependencies:
- '@types/node'
- less
@@ -14107,19 +13839,19 @@ snapshots:
- supports-color
- terser
dependencies:
'@babel/code-frame': 7.26.2
ansi-escapes: 4.3.2
chalk: 4.1.2
chokidar: 3.6.0
commander: 8.3.0
- fast-glob: 3.3.2
+ fast-glob: 3.3.3
fs-extra: 11.2.0
npm-run-path: 4.0.1
strip-ansi: 6.0.1
tiny-invariant: 1.3.3
vscode-languageclient: 7.0.0
vscode-languageserver: 7.0.0
vscode-languageserver-textdocument: 1.0.12
@@ -14129,10 +13861,10 @@ snapshots:
optionator: 0.9.4
typescript: 5.7.2
dependencies:
'@antfu/utils': 0.7.10
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
debug: 4.4.0([email protected])
error-stack-parser-es: 0.1.5
fs-extra: 11.2.0
@@ -14140,25 +13872,25 @@ snapshots:
perfect-debounce: 1.0.0
picocolors: 1.1.1
sirv: 3.0.0
optionalDependencies:
transitivePeerDependencies:
- rollup
- supports-color
dependencies:
debug: 4.4.0([email protected])
pretty-bytes: 6.1.1
tinyglobby: 0.2.10
workbox-build: 7.3.0([email protected])
workbox-window: 7.3.0
transitivePeerDependencies:
- supports-color
dependencies:
'@babel/core': 7.26.0([email protected])
'@babel/plugin-proposal-decorators': 7.25.9(@babel/[email protected]([email protected]))([email protected])
@@ -14169,38 +13901,38 @@ snapshots:
'@vue/compiler-dom': 3.5.13
kolorist: 1.8.0
magic-string: 0.30.17
transitivePeerDependencies:
- supports-color
dependencies:
esbuild: 0.21.5
postcss: 8.4.49
- rollup: 4.29.1
+ rollup: 4.30.0
optionalDependencies:
- '@types/node': 22.10.2
+ '@types/node': 22.10.5
fsevents: 2.3.3
stylus: 0.64.0([email protected])
terser: 5.37.0
dependencies:
esbuild: 0.24.2
postcss: 8.4.49
- rollup: 4.29.1
+ rollup: 4.30.0
optionalDependencies:
- '@types/node': 22.10.2
+ '@types/node': 22.10.5
fsevents: 2.3.3
jiti: 2.4.2
stylus: 0.64.0([email protected])
terser: 5.37.0
yaml: 2.7.0
dependencies:
'@vitest/expect': 2.1.8
'@vitest/pretty-format': 2.1.8
'@vitest/runner': 2.1.8
'@vitest/snapshot': 2.1.8
@@ -14213,14 +13945,14 @@ snapshots:
pathe: 1.1.2
std-env: 3.8.0
tinybench: 2.9.0
- tinyexec: 0.3.1
+ tinyexec: 0.3.2
tinypool: 1.0.2
tinyrainbow: 1.2.0
why-is-node-running: 2.3.0
optionalDependencies:
- '@types/node': 22.10.2
+ '@types/node': 22.10.5
transitivePeerDependencies:
- less
- lightningcss
@@ -14563,8 +14295,6 @@ snapshots:
lodash: 4.17.21
yaml: 2.7.0
-
diff --git a/services/firebase/api.js b/services/firebase/api.js
index 82d19582..9b70090e 100644
--- a/services/firebase/api.js
+++ b/services/firebase/api.js
@@ -1,6 +1,6 @@
-import { config } from '~~/services/firebase/config'
import { initializeApp } from 'firebase/app'
import { child, get, getDatabase, off, onValue, ref, remove, set, update } from 'firebase/database'
+import { config } from '~~/services/firebase/config'
export const app = initializeApp(config)
export const db = getDatabase(app)
diff --git a/tailwind.config.ts b/tailwind.config.ts
index b3e37a23..b8593f46 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -24,7 +24,6 @@ export default <Partial<Config>>{
aspectRatio: {
auto: 'auto',
square: '1 / 1',
- video: '16 / 9',
},
colors: {
'1': 'rgb(var(--text-1))',
@@ -38,22 +37,17 @@ export default <Partial<Config>>{
3: 'rgb(var(--accent-3))',
4: 'var(--accent-4)',
},
- 'alert-primary': 'var(--text-alert-primary)',
+ 'alert-primary': 'var(--alert-primary)',
'expense': {
- 1: 'var(--text-expense-1)',
- 2: 'var(--text-expense-2)',
+ 1: 'var(--expense-1)',
},
'foreground': {
1: 'rgb(var(--foreground-1))',
2: 'rgb(var(--foreground-2))',
- 3: 'rgb(var(--foreground-3))',
- 4: 'rgb(var(--foreground-4))',
- 5: 'rgb(var(--foreground-5))',
},
'icon-primary': 'var(--text-icon-primary)',
'income': {
- 1: 'var(--text-income-1)',
- 2: 'var(--text-income-2)',
+ 1: 'var(--income-1)',
},
'item': {
1: 'var(--c-item-1)',
@@ -65,6 +59,7 @@ export default <Partial<Config>>{
8: 'rgba(var(--item-8))',
9: 'rgba(var(--item-9))',
10: 'rgba(var(--item-10))',
+ 11: 'var(--item-11)',
},
},
fontFamily: {