Skip to content

Open source personal finance application

refactor: ui colors

Ilya Komichev5c2b973f3ff1
diff --git a/app/app.config.ts b/app/app.config.ts
index a83b9831..8e87b5c1 100644
--- a/app/app.config.ts
+++ b/app/app.config.ts
@@ -21,11 +21,11 @@ export default defineAppConfig({
gray: 'cool',
popover: {
- background: '!bg-item-5 min-w-64',
+ background: '!bg-item-1 min-w-64',
popper: {
placement: 'bottom-start',
},
- ring: '!ring-2 !ring-item-3',
+ ring: '!ring-2 !ring-item-4',
trigger: '!w-full !block !cursor-default',
},
primary: 'pink',
diff --git a/app/assets/css/others.css b/app/assets/css/others.css
index 84f01740..69491dd8 100644
--- a/app/assets/css/others.css
+++ b/app/assets/css/others.css
@@ -3,7 +3,7 @@
}
.Toastify__toast {
- @apply cursor-default bg-item-5 !ring-2 !ring-item-3 text-1 p-0 min-h-6 rounded-lg hover:bg-item-3;
+ @apply cursor-default bg-item-1 !ring-2 !ring-item-4 text-1 p-0 min-h-6 rounded-lg hover:bg-item-4;
}
.Toastify__toast-body {
diff --git a/app/assets/css/tailwind.css b/app/assets/css/tailwind.css
index 3ed02f03..c298e5bc 100644
--- a/app/assets/css/tailwind.css
+++ b/app/assets/css/tailwind.css
@@ -20,14 +20,14 @@
@layer base {
html,
body {
- @apply bg-item-5 font-primary text-1 leading-none antialiased select-none;
+ @apply bg-item-1 font-primary text-1 leading-none antialiased select-none;
overscroll-behavior-y: none;
}
}
@layer components {
.layoutBase {
- @apply overflow-hidden relative h-dvh bg-item-9;
+ @apply overflow-hidden relative h-dvh bg-item-2;
}
.pageWrapper {
@@ -35,7 +35,7 @@
}
.bottomSheetDrugClassesCustom {
- @apply bg-item-5 max-w-md rounded-xl;
+ @apply bg-item-1 max-w-md rounded-xl;
}
.bottomSheetContent {
@@ -44,7 +44,7 @@
}
.bottomSheetContentInside {
- @apply grid h-full bg-item-5 gap-1 overflow-hidden overflow-y-auto px-2 py-px;
+ @apply grid h-full bg-item-1 gap-1 overflow-hidden overflow-y-auto px-2 py-px;
}
.bottomSheetContentBottom {
diff --git a/app/assets/css/theme.css b/app/assets/css/theme.css
index af86fe58..39399724 100644
--- a/app/assets/css/theme.css
+++ b/app/assets/css/theme.css
@@ -1,36 +1,34 @@
@import 'others.css';
/*
- * Dark Theme
+ * Dark Theme
*/
html.dark,
html.dark-pink,
html.dark-blue {
color-scheme: dark;
- /* Text */
- --text-1: 220 220 220;
- --text-2: 160 160 160;
- --text-3: 200 200 200;
- --text-4: 130 130 130;
-
- --text-icon-primary: theme('colors.neutral.50');
--accent-1: 219 39 119;
- --c-item-2: #a3a3a3;
- --c-item-3: #232323;
- --c-item-4: #1c1c1c;
- --c-item-base: #e5e5e5;
- --item-5: 19 19 19;
+ --item-1: 19 19 19;
+ --item-2: 23 23 23;
+ --item-3: #1c1c1c;
+ --item-4: #232323;
+ --item-5: #262626;
--item-6: 44 44 44;
--item-7: #878787;
- --item-9: 23 23 23;
- --item-hover: #262626;
+
--overlay: #000000cc;
+
+ --text-1: 220 220 220;
+ --text-2: 160 160 160;
+ --text-3: 200 200 200;
+ --text-4: 130 130 130;
+ --text-icon-primary: theme('colors.neutral.50');
}
/*
-* Light Theme
+ * Light Theme
*/
html.light,
html.light-pink,
@@ -38,18 +36,17 @@ html.light-blue {
color-scheme: light;
--accent-1: 219 39 119;
- --c-item-2: theme('colors.neutral.500');
- --c-item-4: theme('colors.neutral.100');
- --c-item-base: theme('colors.neutral.600');
- --item-3: #f0edef;
- --item-5: 255 255 255;
- --item-6: 240 237 240;
- --item-7: rgba(190, 190, 190, 1);
- --c-item-3: #f0edf0;
- --item-9: 250 250 250;
- --item-active: 216 216 220;
- --item-hover: #f3eff2;
+
+ --item-1: 255 255 255;
+ --item-2: 250 250 250;
+ --item-3: #f5f5f5;
+ --item-4: #f3eff2;
+ --item-5: #f0edf0;
+ --item-6: 225 225 225;
+ --item-7: #bebebe;
+
--overlay: #00000099;
+
--text-1: 0 0 0;
--text-2: 80 80 80;
--text-3: 64 64 64;
@@ -58,13 +55,12 @@ html.light-blue {
}
/*
- * Blue Theme
+ * Blue
*/
html.light,
html.light-blue {
- --c-item-3: #f0edf0;
- --item-6: 237 239 240;
- --item-hover: #ebecef;
+ --item-4: rgb(237 238 240);
+ --item-5: rgb(235, 236, 239);
}
html.light-blue,
@@ -73,19 +69,18 @@ html.dark-blue {
}
/*
- Common
+ * Common
*/
html {
- --expense-1: #f92134;
- --expense-2: oklch(0.37 0.09 20.05);
- --income-1: #2cad22;
- --income-2: oklch(55.43% 0.13485 122.48);
+ --expense-1: 0.63 0.24 24.81;
+ --expense-2: oklch(0.63 0.24 24.81 / 0.5);
+ --income-1: 0.65 0.2 142.06;
+ --income-2: oklch(0.65 0.2 142.06 / 0.5);
- --text-alert-1: #b81414;
+ --text-alert-1: oklch(0.63 0.24 24.81);
- /* Chart */
--chart-label: rgb(var(--text-4));
- --chart-line: var(--item-hover);
+ --chart-line: var(--item-5);
--chart-splitLine: rgb(var(--item-6));
--chart-tooltip: rgb(var(--text-2));
--chart-axisLabel: rgb(var(--text-1));
diff --git a/app/components/about/About.vue b/app/components/about/About.vue
index 78c0a59e..ce22e957 100644
--- a/app/components/about/About.vue
+++ b/app/components/about/About.vue
@@ -8,7 +8,7 @@ const { t } = useI18n()
{{ t('title') }}
</UiTitle3>
- <div class="flex gap-8 pb-3">
+ <div class="grid gap-8 pb-3">
<div>
<div class="text-font-4 pb-4 text-xs">
{{ t('author') }}
diff --git a/app/components/bottomSheet/BottomSheetClose.vue b/app/components/bottomSheet/BottomSheetClose.vue
index 6bae618c..f80e754f 100644
--- a/app/components/bottomSheet/BottomSheetClose.vue
+++ b/app/components/bottomSheet/BottomSheetClose.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="absolute right-1 top-1 z-30 flex size-8 items-center justify-center rounded-full bg-item-4 transition ease-in-out hover:bg-item-hover"
+ class="absolute right-1 top-1 z-30 flex size-8 items-center justify-center rounded-full bg-item-3 transition ease-in-out hover:bg-item-5"
@click="(e: Event) => emit('onClick', e)"
>
<Icon
diff --git a/app/components/bottomSheet/BottomSheetHandler.vue b/app/components/bottomSheet/BottomSheetHandler.vue
index 643541ce..43123c85 100644
--- a/app/components/bottomSheet/BottomSheetHandler.vue
+++ b/app/components/bottomSheet/BottomSheetHandler.vue
@@ -3,7 +3,7 @@
class="
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-7 after:content-[''] hover:bg-item-hover
+ after:h-[4px] after:w-[32px] after:rounded after:bg-item-7 after:content-[''] hover:bg-item-5
"
/>
</template>
diff --git a/app/components/categories/Header.vue b/app/components/categories/Header.vue
index b7aa770f..e69e44db 100644
--- a/app/components/categories/Header.vue
+++ b/app/components/categories/Header.vue
@@ -39,7 +39,7 @@ function onParentClick() {
</div>
<div
- class="flex items-center gap-2 rounded-lg px-3 py-1 hocus:bg-item-hover"
+ class="flex items-center gap-2 rounded-lg px-3 py-1 hocus:bg-item-5"
@click="onParentClick"
>
{{ props.parentCategory.name }}
diff --git a/app/components/categories/Selector.vue b/app/components/categories/Selector.vue
index 4e0e2970..4f91b7b4 100644
--- a/app/components/categories/Selector.vue
+++ b/app/components/categories/Selector.vue
@@ -66,8 +66,8 @@ onMounted(() => {
:key="categoryId"
class="group"
:class="{
- 'relative mb-2 rounded-md bg-item-4': opened.includes(categoryId),
- 'rounded-md bg-item-4': isChildsSelected(categoryId),
+ 'relative mb-2 rounded-md bg-item-3': opened.includes(categoryId),
+ 'rounded-md bg-item-3': isChildsSelected(categoryId),
'border !border-accent-1/60': isEveryChildsSelected(categoryId),
}"
>
diff --git a/app/components/categories/StatPage.vue b/app/components/categories/StatPage.vue
index c73979a2..615c2eab 100644
--- a/app/components/categories/StatPage.vue
+++ b/app/components/categories/StatPage.vue
@@ -112,9 +112,10 @@ useHead({ title: category.value?.name })
<StatItemWrap
:activeTab
- :trnsIds
- :storageKey
:hasChildren="categoriesIdsOrParent.length > 1"
+ :range="statDate.range.value"
+ :storageKey
+ :trnsIds
isOneCategory
/>
</UiPage>
diff --git a/app/components/categories/page/List.vue b/app/components/categories/page/List.vue
index 54107515..c296d6a7 100644
--- a/app/components/categories/page/List.vue
+++ b/app/components/categories/page/List.vue
@@ -61,7 +61,7 @@ const categoriesView = useStorage<'list' | 'grid'>('finapp.categoriesView', 'lis
:class="{
'@2xl/page:grid-cols-3 @sm:grid-cols-2 grid gap-1.5': categoriesView === 'grid',
}"
- :insideClasses="categoriesView === 'grid' ? 'bg-item-9' : ''"
+ :insideClasses="categoriesView === 'grid' ? 'bg-item-2' : ''"
@click="(categoryId: CategoryId) => router.push(`/categories/${categoryId}`)"
/>
</div>
diff --git a/app/components/categories/page/id/Index.vue b/app/components/categories/page/id/Index.vue
index 9192ec7e..93e1b56a 100644
--- a/app/components/categories/page/id/Index.vue
+++ b/app/components/categories/page/id/Index.vue
@@ -109,10 +109,11 @@ useHead({ title: category.value?.name })
<StatItemWrap
:activeTab
- :trnsIds
- :storageKey
- :preCategoriesIds
:hasChildren="categoriesIdsOrParent.length > 1"
+ :preCategoriesIds
+ :range="statDate.range.value"
+ :storageKey
+ :trnsIds
isOneCategory
/>
</UiPage>
diff --git a/app/components/color/Palette.vue b/app/components/color/Palette.vue
index 7dde48c4..34652eba 100644
--- a/app/components/color/Palette.vue
+++ b/app/components/color/Palette.vue
@@ -53,7 +53,7 @@ function findWalletWithColor(color: string) {
<div
v-if="props.isWallet && findWalletWithColor(color)"
- class="size-3 rounded-full bg-item-3"
+ class="size-3 rounded-full bg-item-4"
/>
</div>
</div>
diff --git a/app/components/date/LinkItemNoBg.vue b/app/components/date/LinkItemNoBg.vue
index 0c3c6aa1..bfca5945 100644
--- a/app/components/date/LinkItemNoBg.vue
+++ b/app/components/date/LinkItemNoBg.vue
@@ -13,7 +13,7 @@ const emit = defineEmits<{
<div
:class="[
getStyles('item', ['center2', 'padding4', 'minh3']), {
- 'bg-item-hover text-accent-1': props.isActive,
+ 'bg-item-5 text-accent-1': props.isActive,
},
]"
class="text-nowrap rounded-full font-primary text-2xs leading-none text-2"
diff --git a/app/components/date/Picker.vue b/app/components/date/Picker.vue
index ba56cdb6..f3a40cab 100644
--- a/app/components/date/Picker.vue
+++ b/app/components/date/Picker.vue
@@ -83,11 +83,11 @@ const matchTheme = {
<style>
html .vc-dark,
html .vc-light {
- --vc-popover-content-bg: theme('colors.item.5');
+ --vc-popover-content-bg: theme('colors.item.1');
--vc-accent-500: theme('colors.accent.1');
--vc-focus-ring: theme('colors.accent.1');
--vc-nav-item-active-bg: theme('colors.accent.1');
- --vc-nav-hover-bg: theme('colors.item.hover');
+ --vc-nav-hover-bg: theme('colors.item.5');
--vc-color: theme('colors.1');
--vc-day-content-disabled-color: theme('colors.1/.40');
--vc-weekday-color: theme('colors.2');
@@ -99,6 +99,6 @@ html .vc-light {
}
.vc-popover-content {
- @apply border-2 border-item-3;
+ @apply border-2 border-item-4;
}
</style>
diff --git a/app/components/form/Input.vue b/app/components/form/Input.vue
index 941f6395..0e8d93da 100644
--- a/app/components/form/Input.vue
+++ b/app/components/form/Input.vue
@@ -18,7 +18,7 @@ const emit = defineEmits<{
:value="props.value"
:class="getStyles('item', ['link', 'rounded'])"
:type="props.type ?? 'text'"
- class="m-0 w-full border border-solid border-item-6 bg-item-4 px-3 py-2 text-base font-normal placeholder:text-2 focus:border-accent-1 focus:bg-item-hover focus:text-1 focus:outline-none"
+ class="m-0 w-full border border-solid border-item-6 bg-item-3 px-3 py-2 text-base font-normal placeholder:text-2 focus:border-accent-1 focus:bg-item-5 focus:text-1 focus:outline-none"
@input="(event: HTMLInputEvent) => emit('updateValue', event.target.value)"
>
</template>
diff --git a/app/components/form/Select.vue b/app/components/form/Select.vue
index 21abaca1..d256f5ac 100644
--- a/app/components/form/Select.vue
+++ b/app/components/form/Select.vue
@@ -34,6 +34,6 @@ select {
background-position: right 0.7rem center;
background-repeat: no-repeat;
background-size: 1.25em 1.25em;
- @apply hocus:bg-item-hover bg-item-4 focus:outline-none border border-transparent focus:border-accent-1 -my-px block min-h-[42px] w-full max-w-lg grow items-center gap-0 gap-x-2 overflow-hidden rounded-md px-4 pr-10 py-2 ring-0;
+ @apply hocus:bg-item-5 bg-item-3 focus:outline-none border border-transparent focus:border-accent-1 -my-px block min-h-[42px] w-full max-w-lg grow items-center gap-0 gap-x-2 overflow-hidden rounded-md px-4 pr-10 py-2 ring-0;
}
</style>
diff --git a/app/components/form/Textarea.vue b/app/components/form/Textarea.vue
index 5770b0a8..12b745f7 100644
--- a/app/components/form/Textarea.vue
+++ b/app/components/form/Textarea.vue
@@ -17,7 +17,7 @@ const emit = defineEmits<{
:placeholder="props.placeholder"
:value="props.value"
:class="getStyles('item', ['link', 'rounded'])"
- class="m-0 w-full border border-solid border-item-6 bg-item-4 px-3 py-2 text-base font-normal placeholder:text-2 focus:border-accent-1 focus:bg-item-hover focus:text-1 focus:outline-none"
+ class="m-0 w-full border border-solid border-item-6 bg-item-3 px-3 py-2 text-base font-normal placeholder:text-2 focus:border-accent-1 focus:bg-item-5 focus:text-1 focus:outline-none"
@input="(event: HTMLInputEvent) => emit('updateValue', event.target.value)"
/>
</template>
diff --git a/app/components/layout/ConfirmModal.vue b/app/components/layout/ConfirmModal.vue
index 19675acf..d54be95b 100644
--- a/app/components/layout/ConfirmModal.vue
+++ b/app/components/layout/ConfirmModal.vue
@@ -62,7 +62,7 @@ const items = computed(() => ({
v-for="(item, slug) in items"
:key="slug"
class="grow"
- insideClasses="!min-h-[44px] bg-item-4"
+ insideClasses="!min-h-[44px] bg-item-3"
@click="item.click(close)"
>
<template #leftIcon>
diff --git a/app/components/layout/MenuBottom.vue b/app/components/layout/MenuBottom.vue
index dd4f09a9..d50bd8b7 100644
--- a/app/components/layout/MenuBottom.vue
+++ b/app/components/layout/MenuBottom.vue
@@ -6,7 +6,7 @@ const { itemsBottom } = useMenuData()
<template>
<div
- class="sm:bottom-inherit sticky bottom-0 left-0 z-20 mx-auto flex w-full items-stretch bg-item-9/80 backdrop-blur sm:hidden lg:hidden"
+ class="sm:bottom-inherit sticky bottom-0 left-0 z-20 mx-auto flex w-full items-stretch bg-item-2/80 backdrop-blur sm:hidden lg:hidden"
style="padding-bottom: calc(env(safe-area-inset-bottom) - 16px)"
>
<LayoutSidebarMenuItem
diff --git a/app/components/layout/MenuBottomModal.vue b/app/components/layout/MenuBottomModal.vue
index 096c7d4a..9988837b 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="grid gap-3 bg-item-5 px-1 py-3">
+ <div class="grid gap-3 bg-item-1 px-1 py-3">
<LayoutSidebarMenu />
<div class="pl-2 pt-2">
diff --git a/app/components/layout/Sidebar.vue b/app/components/layout/Sidebar.vue
index 3d7263bb..f26d97f1 100644
--- a/app/components/layout/Sidebar.vue
+++ b/app/components/layout/Sidebar.vue
@@ -53,7 +53,7 @@ const isShowLogoMenu = ref(false)
<template #trigger>
<div
:class="getStyles('item', ['link', 'rounded'])"
- class="block cursor-default px-3 py-2 group-data-[headlessui-state='open']:!bg-item-3"
+ class="block cursor-default px-3 py-2 group-data-[headlessui-state='open']:!bg-item-4"
>
<UiLogo />
</div>
diff --git a/app/components/stat/Average.vue b/app/components/stat/Average.vue
index a950e815..1b0a84d6 100644
--- a/app/components/stat/Average.vue
+++ b/app/components/stat/Average.vue
@@ -27,7 +27,7 @@ const trnsStore = useTrnsStore()
const { getTotalOfTrnsIds } = useAmount()
const averageConfig = useStorage('averageConfig', {
- count: 1,
+ count: 10,
})
const untilDate = computed(() => getEndOf(sub(new Date(), { [`${props.statDate.params.value.rangeBy}s`]: props.statDate.params.value.rangeDuration }), props.statDate.params.value.rangeBy))
@@ -55,22 +55,8 @@ const total = computed(() => getTotalOfTrnsIds(datedTrnsIds.value))
const last = computed(() => {
const rangeBy = props.statDate.params.value.rangeBy
- const rangeDuration = props.statDate.params.value.rangeDuration
- const count = averageConfig.value.count
-
- const getCount = () => {
- const value = count * rangeDuration
- return `${value} ${t(`dates.${rangeBy}.plural`, value)}`
- }
-
- const periods = {
- day: { count: getCount() },
- month: { count: getCount() },
- week: { count: getCount() },
- year: { count: getCount() },
- }
-
- return periods[rangeBy]
+ const value = averageConfig.value.count * props.statDate.params.value.rangeDuration
+ return `${value} ${t(`dates.${rangeBy}.plural`, value)}`
})
</script>
@@ -79,7 +65,7 @@ const last = computed(() => {
<div class="grid w-full grow gap-1 pb-[2px]">
<UiTitle6 class="text-nowrap !leading-3">
{{ t('money.average') }}
- <br>{{ t('for') }} ~{{ last.count }}
+ <br>{{ t('for') }} {{ last }}
<br>{{ getStringDateRange(dates, props.statDate.params.value.rangeBy, props.statDate.params.value.rangeDuration) }}
</UiTitle6>
diff --git a/app/components/stat/CategoriesButtons.vue b/app/components/stat/CategoriesButtons.vue
index ffab88df..b0ae8f71 100644
--- a/app/components/stat/CategoriesButtons.vue
+++ b/app/components/stat/CategoriesButtons.vue
@@ -194,7 +194,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="grid gap-4 border-b border-item-3 pb-3">
+ <div class="grid gap-4 border-b border-item-4 pb-3">
<!-- Grouping -->
<div class="grid gap-3">
<UiTitleOption>
@@ -264,7 +264,7 @@ const isShow = ref(false)
<!-- List -->
<div
v-if="statConfig.config.value.catsView === 'list'"
- class="grid gap-3 border-b border-item-3 pb-2 last:border-0"
+ class="grid gap-3 border-b border-item-4 pb-2 last:border-0"
>
<UiTitleOption>{{ t('listItemsOptions') }}</UiTitleOption>
<div class="flex gap-1">
@@ -346,7 +346,7 @@ const isShow = ref(false)
<!-- Vertical -->
<div
v-if="props.catsLength > 1"
- class="grid border-b border-item-3 pb-2 last:border-0 md:pb-0"
+ class="grid border-b border-item-4 pb-2 last:border-0 md:pb-0"
>
<UiTitleOption class="pb-2">
{{ t('stat.config.categories.vertical.label') }}
@@ -402,7 +402,7 @@ const isShow = ref(false)
<!-- TODO: use StatConfig -->
<div
v-if="false"
- class="border-b border-item-3 pb-2 last:border-0 last:pb-0"
+ class="border-b border-item-4 pb-2 last:border-0 last:pb-0"
>
<!-- Favorite -->
<UiElement
diff --git a/app/components/stat/Dashboard.vue b/app/components/stat/Dashboard.vue
index 18fc8794..7d1771c8 100644
--- a/app/components/stat/Dashboard.vue
+++ b/app/components/stat/Dashboard.vue
@@ -60,8 +60,9 @@ watch(filter.categoriesIds, () => {
<StatItemWrap
:activeTab
- :trnsIds
+ :range="statDate.range.value"
:storageKey
+ :trnsIds
hasChildren
/>
</UiPage>
diff --git a/app/components/stat/Item.vue b/app/components/stat/Item.vue
index f458d7b1..baae123f 100644
--- a/app/components/stat/Item.vue
+++ b/app/components/stat/Item.vue
@@ -128,34 +128,28 @@ const averageTotal = computed(() => {
return Object.fromEntries(Object.entries(items).filter(([_, value]) => value !== 0))
})
+const typesToShow = computed(() => {
+ const isAnyExpense = rangeTrnsIds.value.some(id => trnsStore.items?.[id]?.type === 0)
+ const isAnyIncome = rangeTrnsIds.value.some(id => trnsStore.items?.[id]?.type === 1)
+
+ return props.type === 'netIncome' || props.type === 'periods'
+ ? [
+ ...(isAnyIncome ? ['income'] : []),
+ ...(isAnyExpense ? ['expense'] : []),
+ ] as StatTabSlug[]
+ : [props.type]
+})
+
const chart = {
series: computed<ChartSeries[]>(() => {
- const intervalsChartData = getIntervalsData(rangeTrnsIds.value, statDate.intervalsInRange.value)
- const transactionTypes = {
- hasExpense: rangeTrnsIds.value.some(id => trnsStore.items?.[id]?.type === 0),
- hasIncome: rangeTrnsIds.value.some(id => trnsStore.items?.[id]?.type === 1),
- }
-
- const typesToShow = props.type === 'netIncome' || props.type === 'periods'
- ? [
- ...(transactionTypes.hasIncome ? ['income'] : []),
- ...(transactionTypes.hasExpense ? ['expense'] : []),
- ] as StatTabSlug[]
- : [props.type]
-
- const intervalTotals = intervalsChartData.map(g => g.total)
- const baseSeries = typesToShow.map(type => createSeriesItem(type, intervalTotals, statConfig.config.value.chart.isShowAverage ? intervalsData.value.reduce((acc, i) => acc + i.total[type], 0) / (intervalsData.value.length) : false))
-
- const selectedInterval = intervalsChartData?.[statDate.params.value.intervalSelected]
- if (!selectedInterval?.range.start || statDate.params.value.intervalSelected < 0) {
+ const intervalTotals = intervalsData.value.map(g => g.total)
+ const baseSeries = typesToShow.value.map(type => createSeriesItem(type, intervalTotals, statConfig.config.value.chart.isShowAverage ? intervalsData.value.reduce((acc, i) => acc + i.total[type], 0) / (intervalsData.value.length) : false))
+
+ const selectedInterval = intervalsData.value?.[statDate.params.value.intervalSelected]
+ if (!selectedInterval?.range.start || statDate.params.value.intervalSelected < 0)
return baseSeries
- }
- return addMarkArea(
- baseSeries,
- selectedInterval.range.start,
- statConfig.config.value?.chartType,
- )
+ return addMarkArea(baseSeries, selectedInterval.range.start, statConfig.config.value?.chartType)
}),
xAxisLabels: computed(() => intervalsData.value.map(i => +i.range.start) ?? []),
}
@@ -215,6 +209,7 @@ function getIntervalsData(trnsIds: TrnId[], intervalsInRange: Range[]) {
<div class="@container/stat">
<StatChartWrap
v-if="!props.isOneCategory || (props.isOneCategory && !categoriesStore.transferCategoriesIds.includes(categoryId))"
+ :chartView="statConfig.config.value.chartView"
:series="chart.series.value"
:xAxisLabels="chart.xAxisLabels.value"
>
diff --git a/app/components/stat/ItemWrap.vue b/app/components/stat/ItemWrap.vue
index 0bc816dc..3e2ebff1 100644
--- a/app/components/stat/ItemWrap.vue
+++ b/app/components/stat/ItemWrap.vue
@@ -1,6 +1,6 @@
<script setup lang="ts">
import type { CategoryId } from '~/components/categories/types'
-import type { StatDateProvider } from '~/components/date/types'
+import type { Range } from '~/components/date/types'
import type { StatTabSlug } from '~/components/stat/types'
import type { TrnId } from '~/components/trns/types'
import type { WalletId } from '~/components/wallets/types'
@@ -12,18 +12,18 @@ const props = defineProps<{
hasChildren?: boolean
isOneCategory?: boolean
preCategoriesIds?: CategoryId[]
+ range: Range
storageKey: string
trnsIds: TrnId[]
walletId?: WalletId
}>()
const trnsStore = useTrnsStore()
-const statDate = inject('statDate') as StatDateProvider
const datedTrnsIds = computed(() => trnsStore.getStoreTrnsIds({
dates: {
- from: statDate.range.value.start,
- until: statDate.range.value.end,
+ from: props.range.start,
+ until: props.range.end,
},
trnsIds: props.trnsIds,
}))
diff --git a/app/components/stat/categories/Line.vue b/app/components/stat/categories/Line.vue
index 2ac7a15b..86c19945 100644
--- a/app/components/stat/categories/Line.vue
+++ b/app/components/stat/categories/Line.vue
@@ -91,8 +91,8 @@ onLongPress(
v-if="category"
ref="longPressRef"
:class="[props.insideClass, {
- '-bg-item-4 ': props.isActive,
- 'rounded-lg bg-item-9': statConfig.config.value.catsList.isItemsBg,
+ '-bg-item-3 ': props.isActive,
+ 'rounded-lg bg-item-2': 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="overflow-hidden rounded-lg bg-item-3">
+ <div class="overflow-hidden rounded-lg bg-item-4">
<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 378bc6a1..25971226 100644
--- a/app/components/stat/categories/Round.vue
+++ b/app/components/stat/categories/Round.vue
@@ -65,7 +65,7 @@ onLongPress(
v-if="category"
ref="longPressRef"
:class="{ 'opacity-60': props.item.value === 0 }"
- class="relative flex items-center gap-2 overflow-hidden rounded-full bg-item-4 p-1 pr-2 text-2 hover:bg-item-hover hocus:bg-item-hover"
+ class="relative flex items-center gap-2 overflow-hidden rounded-full bg-item-3 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 0d23318a..fa655cff 100644
--- a/app/components/stat/categories/Section.vue
+++ b/app/components/stat/categories/Section.vue
@@ -252,7 +252,7 @@ function updateState(
</template>
<!-- Inside -->
- <div class="ml-5 mt-[-2px] -translate-x-px border-l border-item-3 pl-3">
+ <div class="ml-5 mt-[-2px] -translate-x-px border-l border-item-4 pl-3">
<div
v-if="!item.categories || item.categories.length === 0"
class="mb-3 ml-11"
@@ -317,7 +317,7 @@ function updateState(
</template>
<!-- Inside -->
- <div class="ml-5 mt-[-2px] -translate-x-px border-l border-item-3 pl-14">
+ <div class="ml-5 mt-[-2px] -translate-x-px border-l border-item-4 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 2c332ca1..1f9f565d 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="rounded p-1 hocus:bg-item-hover"
+ class="rounded p-1 hocus:bg-item-5"
>
- <div class="flex h-28 items-end rounded bg-item-4">
+ <div class="flex h-28 items-end rounded bg-item-3">
<div
class="relative w-7 rounded-t"
:style="getBarStyle()"
diff --git a/app/components/stat/chart/View.vue b/app/components/stat/chart/View.vue
index 60c26527..684440b5 100644
--- a/app/components/stat/chart/View.vue
+++ b/app/components/stat/chart/View.vue
@@ -8,7 +8,6 @@ import VChart from 'vue-echarts'
import type { Period } from '~/components/date/types'
import type { ChartType } from '~/components/stat/chart/types'
-import type { StatConfigProvider } from '~/components/stat/useStatConfig'
import { formatByLocale, getFormatForChart } from '~/components/date/utils'
import { config, lineConfig } from '~/components/stat/chart/config'
@@ -58,14 +57,11 @@ use([
])
const { locale } = useI18n()
-const statConfig = inject('statConfig') as StatConfigProvider
const chartRef = ref()
const option = computed(() => {
const data = defu(config, {
series: setChartSeries(props.series),
- xAxis: setChartXAxis(props.xAxisLabels),
- ...statConfig.config.value,
tooltip: {
...config.tooltip,
formatter(params: ChartParams[]) {
@@ -95,6 +91,7 @@ const option = computed(() => {
return `${content}</div></div>`
},
},
+ xAxis: setChartXAxis(props.xAxisLabels),
})
data.xAxis.axisLabel.formatter = (date: string) => {
diff --git a/app/components/stat/chart/Wrap.vue b/app/components/stat/chart/Wrap.vue
index 69250348..b804bb6e 100644
--- a/app/components/stat/chart/Wrap.vue
+++ b/app/components/stat/chart/Wrap.vue
@@ -1,11 +1,12 @@
<script setup lang="ts">
import type { Period, StatDateProvider } from '~/components/date/types'
import type { ChartSeries } from '~/components/stat/types'
-import type { StatConfigProvider } from '~/components/stat/useStatConfig'
+import type { MiniItemConfig, StatConfigProvider } from '~/components/stat/useStatConfig'
import { useTrnsFormStore } from '~/components/trnForm/useTrnsFormStore'
const props = defineProps<{
+ chartView: MiniItemConfig['chartView']
series: ChartSeries[]
xAxisLabels: number[]
}>()
@@ -52,8 +53,7 @@ function onChangePeriod(period: Period) {
<template>
<div
:class="{
- '': statConfig.config.value?.chartView === 'full',
- 'md:max-w-lg': statConfig.config.value?.chartView === 'half',
+ 'md:max-w-lg': props.chartView === 'half',
}"
>
<div
@@ -64,9 +64,7 @@ function onChangePeriod(period: Period) {
<slot />
<StatChartIntervals
- :class="{
- 'border-l border-item-3': statConfig.config.value?.date.isShowQuick,
- }"
+ :class="{ 'border-l border-item-4': statConfig.config.value?.date.isShowQuick }"
:period="statDate.params.value.intervalsBy"
:range="statDate.range.value"
@onChangePeriod="onChangePeriod"
@@ -74,7 +72,7 @@ function onChangePeriod(period: Period) {
</div>
<StatChartView
- :xAxisLabels
+ :xAxisLabels="props.xAxisLabels"
:chartType="statConfig.config.value?.chartType"
:period="statDate.params.value.intervalsBy"
:series="props.series"
diff --git a/app/components/stat/chart/config.ts b/app/components/stat/chart/config.ts
index 361071bd..dac16c88 100644
--- a/app/components/stat/chart/config.ts
+++ b/app/components/stat/chart/config.ts
@@ -5,13 +5,13 @@ import { getCompactAmount, getLocalAmount } from '~/components/stat/chart/utils'
export const seriesOptions: Record<StatTabSlug, { color: string, colorLine?: string, localeKey: string, type: ChartType }> = {
expense: {
- color: 'var(--expense-1)',
+ color: 'oklch(var(--expense-1))',
colorLine: 'var(--expense-2)',
localeKey: 'money.expense',
type: 'bar',
},
income: {
- color: 'var(--income-1)',
+ color: 'oklch(var(--income-1))',
colorLine: 'var(--income-2)',
localeKey: 'money.expense',
type: 'bar',
diff --git a/app/components/stat/chart/useStatChart.ts b/app/components/stat/chart/useStatChart.ts
index dae67d86..aa9379be 100644
--- a/app/components/stat/chart/useStatChart.ts
+++ b/app/components/stat/chart/useStatChart.ts
@@ -49,20 +49,20 @@ export function useStatChart() {
}
}
- function addMarkArea(series: ChartSeries[], selectedDate: DateUTC, chartType?: ChartType) {
- if (!selectedDate)
+ function addMarkArea(series: ChartSeries[], markedDate: DateUTC, chartType?: ChartType) {
+ if (!markedDate)
return series
if (chartType === 'bar') {
if (series[0])
- series[0].markArea = markArea(selectedDate)
+ series[0].markArea = markArea(markedDate)
return series
}
const markAreaIdx = series.findIndex(s => s.markedArea === 'markedArea')
const markAreaSeries: ChartSeries = {
data: [],
- markArea: markArea(selectedDate),
+ markArea: markArea(markedDate),
markedArea: 'markedArea',
name: 'markArea',
type: 'bar',
diff --git a/app/components/stat/date/Range.vue b/app/components/stat/date/Range.vue
index 7ac91cdb..72016ba8 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="flex items-center rounded bg-item-3 px-1 py-px text-2xs leading-none text-4"
+ class="flex items-center rounded bg-item-4 px-1 py-px text-2xs leading-none text-4"
>max</data>
</div>
</template>
diff --git a/app/components/stat/sum/Item.vue b/app/components/stat/sum/Item.vue
index 29113b3f..e377b085 100644
--- a/app/components/stat/sum/Item.vue
+++ b/app/components/stat/sum/Item.vue
@@ -26,7 +26,7 @@ const currenciesStore = useCurrenciesStore()
<div
class="grid gap-1 border border-transparent px-3 pt-2"
:class="{
- '!border-accent-1/40 !bg-item-9': props.isActive,
+ '!border-accent-1/40 !bg-item-2': props.isActive,
}"
@click="(e: Event) => emit('click', e)"
>
diff --git a/app/components/trnForm/Bottom.vue b/app/components/trnForm/Bottom.vue
index 47ed2c8a..2c5581ca 100644
--- a/app/components/trnForm/Bottom.vue
+++ b/app/components/trnForm/Bottom.vue
@@ -78,12 +78,12 @@ onMounted(init)
<BottomSheetClose @onClick="close" />
</template>
- <div class="trnForm @container/trnForm bg-item-5">
+ <div class="trnForm @container/trnForm bg-item-1">
<div ref="sliderRef" class="swiper-container">
<div class="swiper-wrapper">
<!-- History -->
<div
- class="swiper-slide h-full overflow-y-auto bg-item-5"
+ class="swiper-slide h-full overflow-y-auto bg-item-1"
:style="{ height: maxHeight }"
>
<TrnFormTrnsSlide
@@ -94,7 +94,7 @@ onMounted(init)
</div>
<!-- Main -->
- <div class="swiper-slide getHeight bg-item-5">
+ <div class="swiper-slide getHeight bg-item-1">
<div class="scrollerBlock h-full overflow-y-auto">
<div class="max-h-[98dvh]">
<TrnFormMain :maxHeight />
@@ -104,7 +104,7 @@ onMounted(init)
<!-- Quick selector -->
<div
- class="swiper-slide bg-item-5"
+ class="swiper-slide bg-item-1"
:style="{ height: maxHeight }"
>
<div class="scrollerBlock h-full overflow-y-auto">
diff --git a/app/components/trnForm/Categories.vue b/app/components/trnForm/Categories.vue
index c8c7c8b5..886657f0 100644
--- a/app/components/trnForm/Categories.vue
+++ b/app/components/trnForm/Categories.vue
@@ -46,7 +46,7 @@ onMounted(() => {
<!-- Recent -->
<div class="swiper-slide h-full">
<div
- class="scrollerBlock rounded-t-2xl bg-item-5 px-3 py-4 text-center font-primary text-xl font-semibold"
+ class="scrollerBlock rounded-t-2xl bg-item-1 px-3 py-4 text-center font-primary text-xl font-semibold"
>
{{ $t("categories.lastUsedTitle") }}
</div>
@@ -63,7 +63,7 @@ onMounted(() => {
<!-- Main -->
<div class="swiper-slide h-full">
<div
- class="scrollerBlock rounded-t-2xl bg-item-5 px-3 py-4 text-center font-primary text-xl font-semibold"
+ class="scrollerBlock rounded-t-2xl bg-item-1 px-3 py-4 text-center font-primary text-xl font-semibold"
>
{{ $t("categories.title") }}
</div>
@@ -79,7 +79,7 @@ onMounted(() => {
<!-- Favorite -->
<div class="swiper-slide h-full">
- <div class="scrollerBlock rounded-t-2xl bg-item-5 px-3 py-4 text-center font-primary text-xl font-semibold">
+ <div class="scrollerBlock rounded-t-2xl bg-item-1 px-3 py-4 text-center font-primary text-xl font-semibold">
{{ $t("categories.favoriteTitle") }}
</div>
<div class="px-3 pb-1">
diff --git a/app/components/trnForm/Date.vue b/app/components/trnForm/Date.vue
index d328b14d..82091355 100644
--- a/app/components/trnForm/Date.vue
+++ b/app/components/trnForm/Date.vue
@@ -33,7 +33,7 @@ function changeDate(way: 'prev' | 'next' | 'today') {
<div class="-ml-1 flex gap-1">
<UPopover class="grow">
<div
- class="grid gap-1 rounded-md p-2 text-sm font-medium leading-none text-3 hocus:bg-item-hover"
+ 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 fcc0d67d..5b052041 100644
--- a/app/components/trnForm/FloatOpener.vue
+++ b/app/components/trnForm/FloatOpener.vue
@@ -8,7 +8,7 @@ const { trnFormCreate } = useTrnsFormStore()
<div
class="
group absolute bottom-0 right-0 z-20 hidden h-dvh items-end justify-center transition
- hover:bg-item-hover 2xl:flex
+ hover:bg-item-5 2xl:flex
"
@click="trnFormCreate"
>
diff --git a/app/components/trnForm/Main.vue b/app/components/trnForm/Main.vue
index eeb79386..d661bd08 100644
--- a/app/components/trnForm/Main.vue
+++ b/app/components/trnForm/Main.vue
@@ -96,7 +96,7 @@ const actions = computed(() => ({
/>
<UiTitle3
- class="sticky top-0 z-10 bg-item-5 px-3 pb-3 pt-4 md:text-xl"
+ class="sticky top-0 z-10 bg-item-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="group rounded-lg bg-item-4"
+ class="group rounded-lg bg-item-3"
@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="z-10 grid h-full content-center gap-4 rounded-lg border border-accent-1 bg-item-5 p-3 text-1">
+ <div class="z-10 grid h-full content-center gap-4 rounded-lg border border-accent-1 bg-item-1 p-3 text-1">
{{ t('base.sure') }}
<div class="flex gap-2">
@@ -124,7 +124,7 @@ const actions = computed(() => ({
v-for="(item, slug) in actions"
:key="slug"
class="grow"
- insideClasses="!min-h-[44px] bg-item-4"
+ insideClasses="!min-h-[44px] bg-item-3"
@click="item.click"
>
<template #leftIcon>
@@ -221,13 +221,13 @@ const actions = computed(() => ({
padding-bottom: calc(env(safe-area-inset-bottom) - 16px);
.trnForm__pagination {
- @apply absolute left-1/2 z-[2] flex items-center justify-center w-auto p-1.5 rounded-md bg-item-5;
+ @apply absolute left-1/2 z-[2] flex items-center justify-center w-auto p-1.5 rounded-md bg-item-1;
transform: translateX(-50%);
bottom: 1px;
}
.swiper-pagination-bullet {
- @apply block w-1.5 h-1.5 mx-1 rounded-full bg-item-3;
+ @apply block w-1.5 h-1.5 mx-1 rounded-full bg-item-4;
opacity: 1;
}
diff --git a/app/components/trnForm/Selection.vue b/app/components/trnForm/Selection.vue
index 7e95b40e..3a165bf4 100644
--- a/app/components/trnForm/Selection.vue
+++ b/app/components/trnForm/Selection.vue
@@ -73,7 +73,7 @@ async function onSelectParentCategory(id: CategoryId) {
<Teleport to="body">
<BottomSheet
:isShow="isShow"
- drugClassesCustom="bg-item-5 max-w-md"
+ drugClassesCustom="bg-item-1 max-w-md"
@closed="isShow = false"
>
<template #handler="{ close }">
@@ -117,7 +117,7 @@ async function onSelectParentCategory(id: CategoryId) {
>
<div class="scrollerBlock h-full overflow-y-auto pb-3">
<UiTitle3
- class="sticky top-0 z-10 bg-item-5 px-3 pb-3 pt-4"
+ class="sticky top-0 z-10 bg-item-1 px-3 pb-3 pt-4"
@click="trnsFormStore.ui.catsRootModal = true"
>
{{ $t("categories.title") }}
diff --git a/app/components/trnForm/SelectionCategoriesFast.vue b/app/components/trnForm/SelectionCategoriesFast.vue
index 1942a890..a9c370c7 100644
--- a/app/components/trnForm/SelectionCategoriesFast.vue
+++ b/app/components/trnForm/SelectionCategoriesFast.vue
@@ -22,7 +22,7 @@ const trnsFormStore = useTrnsFormStore()
class="pb-6"
>
<UiTitle3
- class="sticky top-0 z-20 bg-item-5 px-3 pb-3 pt-4"
+ class="sticky top-0 z-20 bg-item-1 px-3 pb-3 pt-4"
@click="trnsFormStore.ui.catsRootModal = true"
>
{{ t("categories.favoriteTitle") }}
@@ -40,7 +40,7 @@ const trnsFormStore = useTrnsFormStore()
<!-- Recent categories -->
<div v-if="categoriesStore.recentCategoriesIds.length > 0">
<UiTitle3
- class="sticky top-0 z-20 bg-item-5 px-3 pb-3 pt-4"
+ class="sticky top-0 z-20 bg-item-1 px-3 pb-3 pt-4"
@click="trnsFormStore.ui.catsRootModal = true"
>
{{ t("categories.lastUsedTitle") }}
diff --git a/app/components/trnForm/SelectorCategory.vue b/app/components/trnForm/SelectorCategory.vue
index c5e8840f..727f6e2d 100644
--- a/app/components/trnForm/SelectorCategory.vue
+++ b/app/components/trnForm/SelectorCategory.vue
@@ -31,7 +31,7 @@ const isShow = ref(false)
:category="props.category"
:categoryId="props.categoryId"
alt
- insideClasses="bg-item-4 min-h-[42px] py-2"
+ insideClasses="bg-item-3 min-h-[42px] py-2"
/>
</template>
diff --git a/app/components/trnForm/Sidebar.vue b/app/components/trnForm/Sidebar.vue
index 894d404c..dff50f5e 100644
--- a/app/components/trnForm/Sidebar.vue
+++ b/app/components/trnForm/Sidebar.vue
@@ -50,7 +50,7 @@ watch(isShow, (v) => {
v-if="isShow"
class="@container/trnForm trnForm absolute inset-y-0 z-50 h-full w-[360px] py-2"
>
- <div class="border-left relative h-full overflow-hidden rounded-r-xl border-item-6 bg-item-9 shadow-2xl">
+ <div class="border-left relative h-full overflow-hidden rounded-r-xl border-item-6 bg-item-2 shadow-2xl">
<div class="absolute right-2 top-2">
<BottomSheetClose @onClick="trnsFormStore.onClose()" />
</div>
@@ -58,7 +58,7 @@ watch(isShow, (v) => {
<div ref="sliderRef2" class="swiper-container h-full">
<div class="swiper-wrapper">
<!-- Main -->
- <div class="swiper-slide h-full bg-item-5">
+ <div class="swiper-slide h-full bg-item-1">
<div class="scrollerBlock grid h-full grid-rows-[auto,1fr] gap-4 overflow-y-auto">
<TrnFormMain maxHeight="100vh" class="!pb-0" />
@@ -73,7 +73,7 @@ watch(isShow, (v) => {
<!-- Quick selector -->
<div
- class="swiper-slide bg-item-5"
+ class="swiper-slide bg-item-1"
:style="{ height: '100%' }"
>
<div class="scrollerBlock h-full overflow-y-auto">
diff --git a/app/components/trnForm/main/ActionSide.vue b/app/components/trnForm/main/ActionSide.vue
index 086d8726..4db19330 100644
--- a/app/components/trnForm/main/ActionSide.vue
+++ b/app/components/trnForm/main/ActionSide.vue
@@ -31,10 +31,10 @@ async function onClickSubmit() {
<div
:class="{
'!border-transparent !bg-accent-1/80 !text-icon-primary hocus:!bg-accent-1': !isMath && isSubmittable,
- '!border-item-4 !text-2': !isSubmittable,
+ '!border-item-3 !text-2': !isSubmittable,
'!text-2': isMath,
}"
- class="flex size-full items-center justify-center rounded-xl border border-item-3 p-1 py-4 text-center text-4xl text-1 transition hocus:scale-[1.02] hocus:bg-item-hover"
+ class="flex size-full items-center justify-center rounded-xl border border-item-4 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 7995bf33..5a05d07a 100644
--- a/app/components/trnForm/main/AmountTransfer.vue
+++ b/app/components/trnForm/main/AmountTransfer.vue
@@ -66,7 +66,7 @@ watch(
<div class="flex items-center gap-2 whitespace-nowrap">
<div
:class="[getStyles('item', ['bg2', 'link', 'rounded']), {
- 'bg-item-hover': trnsFormStore.values.transferType === item.transferType,
+ 'bg-item-5': trnsFormStore.values.transferType === item.transferType,
}]"
class="flex min-h-[44px] w-1/2 grow items-center px-3 py-2 text-sm text-1/70 lg:min-h-[42px]"
>
diff --git a/app/components/trnForm/main/CalculatorButton.vue b/app/components/trnForm/main/CalculatorButton.vue
index 071fbddc..cc9e4c80 100644
--- a/app/components/trnForm/main/CalculatorButton.vue
+++ b/app/components/trnForm/main/CalculatorButton.vue
@@ -12,13 +12,13 @@ const emit = defineEmits<{
items-center
justify-center
rounded-full
- bg-item-4 p-1 font-secondary
+ bg-item-3 p-1 font-secondary
text-2xl
font-normal
text-2 transition
hocus:scale-[1.02]
hocus:border-item-6
- hocus:bg-item-hover
+ 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 332e2b6f..b91eb4e2 100644
--- a/app/components/trnForm/main/Input.vue
+++ b/app/components/trnForm/main/Input.vue
@@ -41,7 +41,7 @@ const { t } = useI18n()
}"
:placeholder="t('enterAmount')"
:value="amountRaw"
- class="swiper-no-swiping border-transparent bg-item-9 pb-2 pt-6 text-center font-secondary !text-3xl placeholder:text-3xl"
+ class="swiper-no-swiping border-transparent bg-item-2 pb-2 pt-6 text-center font-secondary !text-3xl placeholder:text-3xl"
inputmode="tel"
@updateValue="(value: string) => emit('onChange', value || '')"
/>
diff --git a/app/components/trns/List.vue b/app/components/trns/List.vue
index d68c28fa..093d3211 100644
--- a/app/components/trns/List.vue
+++ b/app/components/trns/List.vue
@@ -209,7 +209,7 @@ const groupedTrns = computed(() => paginatedTrnsIds.value
<!-- Group Sum -->
<div
v-if="isShowGroupSum && paginatedTrnsIds.length > 1"
- class="border-b border-item-3 pb-2 pr-3"
+ class="border-b border-item-4 pb-2 pr-3"
>
<Amount
v-if="getTotalOfTrnsIds(paginatedTrnsIds).income !== 0"
@@ -252,10 +252,10 @@ const groupedTrns = computed(() => paginatedTrnsIds.value
<div
v-for="(groupTrnsIds, date) in groupedTrns"
:key="date"
- class="overflow-hidden rounded-lg bg-item-9"
+ class="overflow-hidden rounded-lg bg-item-2"
>
<div
- :class="{ 'border-item-3': isShowGroupSum && groupTrnsIds.length > 1 }"
+ :class="{ 'border-item-4': isShowGroupSum && groupTrnsIds.length > 1 }"
class="flex items-end gap-2 px-3 py-2 pb-1"
>
<DateTrns
@@ -311,7 +311,7 @@ const groupedTrns = computed(() => paginatedTrnsIds.value
class="flex-center pt-1"
>
<div
- class="flex-center rounded-full bg-item-hover px-5 py-2 text-sm text-2 hocus:bg-item-6"
+ 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/pages/History.vue b/app/components/trns/pages/History.vue
index 73c18038..21f862f1 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="sticky top-[40px] z-20 bg-item-9"
+ class="sticky top-[40px] z-20 bg-item-2"
isShowCategories
isShowWallets
/>
</template>
</UiHeader>
- <div class="pageWrapper mb-4 rounded-xl bg-item-5 pb-4 pt-3">
+ <div class="pageWrapper mb-4 rounded-xl bg-item-1 pb-4 pt-3">
<div class="grid gap-3">
<TrnsList
:trnsIds
diff --git a/app/components/ui/ButtonWithRight.vue b/app/components/ui/ButtonWithRight.vue
index ed6d820d..aee91e77 100644
--- a/app/components/ui/ButtonWithRight.vue
+++ b/app/components/ui/ButtonWithRight.vue
@@ -19,7 +19,7 @@ const emit = defineEmits<{
<UiElement
class="@container/element"
- insideClasses="max-w-lg w-full !min-h-[42px] bg-item-4 px-2 @xs/element:pl-4 @xs/element:pr-3 block @xs/element:flex @xs/element:flex-wrap gap-0 gap-x-2"
+ insideClasses="max-w-lg w-full !min-h-[42px] bg-item-3 px-2 @xs/element:pl-4 @xs/element:pr-3 block @xs/element:flex @xs/element:flex-wrap gap-0 gap-x-2"
@click="(e: Event) => emit('click', e)"
>
<div
diff --git a/app/components/ui/Checkbox.vue b/app/components/ui/Checkbox.vue
index 268793e1..20a08392 100644
--- a/app/components/ui/Checkbox.vue
+++ b/app/components/ui/Checkbox.vue
@@ -17,7 +17,7 @@ function handleClick() {
<template>
<div
- class="flex grow items-center gap-3 rounded-lg p-2 text-sm hocus:bg-item-hover"
+ class="flex grow items-center gap-3 rounded-lg p-2 text-sm hocus:bg-item-5"
@click="handleClick"
>
<FormSwitch
diff --git a/app/components/ui/Element.vue b/app/components/ui/Element.vue
index beb3416f..b06f81c5 100644
--- a/app/components/ui/Element.vue
+++ b/app/components/ui/Element.vue
@@ -46,13 +46,13 @@ const classes = computed(() => cn(
'ml-[48px] group-last/item:hidden': lineWidth === 4,
'group-last:hidden': lineWidth !== 3 && lineWidth !== 4,
}"
- class="mx-2 h-px bg-item-hover"
+ class="mx-2 h-px bg-item-5"
/>
</div>
</template>
<style>
.v-popper--shown .uiElement {
- @apply !bg-item-3;
+ @apply !bg-item-4;
}
</style>
diff --git a/app/components/ui/Header.vue b/app/components/ui/Header.vue
index 3dfd454e..4c7788ee 100644
--- a/app/components/ui/Header.vue
+++ b/app/components/ui/Header.vue
@@ -1,5 +1,5 @@
<template>
- <div class="mb-2 flex min-h-12 max-w-7xl items-center border-b border-item-3 px-2 sm:min-h-14 lg:px-4 2xl:px-8">
+ <div class="mb-2 flex min-h-12 max-w-7xl items-center border-b border-item-4 px-2 sm:min-h-14 lg:px-4 2xl:px-8">
<div class="flex grow items-center gap-2">
<slot />
diff --git a/app/components/ui/Item1.vue b/app/components/ui/Item1.vue
index 8d62e7b6..b47a4811 100644
--- a/app/components/ui/Item1.vue
+++ b/app/components/ui/Item1.vue
@@ -9,7 +9,7 @@ const emit = defineEmits<{
<template>
<div
:class="getStyles('item', ['link', '_bg', 'center', 'minh2', 'minw1', 'rounded'])"
- class="justify-center text-xl group-data-[headlessui-state='open']:!bg-item-3"
+ class="justify-center text-xl group-data-[headlessui-state='open']:!bg-item-4"
@click="(e: Event) => emit('click', e)"
>
<slot />
diff --git a/app/components/ui/Page.vue b/app/components/ui/Page.vue
index 8335653c..fee78b23 100644
--- a/app/components/ui/Page.vue
+++ b/app/components/ui/Page.vue
@@ -2,8 +2,8 @@
<div
class="
@container/page
- relative rounded-xl bg-item-5
- sm:border sm:border-item-3 sm:p-2 md:p-3 lg:p-4
+ relative rounded-xl bg-item-1
+ sm:border sm:border-item-4 sm:p-2 md:p-3 lg:p-4
"
style="padding-bottom: calc(50px + env(safe-area-inset-bottom))"
>
diff --git a/app/components/ui/Tabs1.global.vue b/app/components/ui/Tabs1.global.vue
index 4ac942a8..bb9ccae0 100644
--- a/app/components/ui/Tabs1.global.vue
+++ b/app/components/ui/Tabs1.global.vue
@@ -1,5 +1,5 @@
<template>
- <div class="flex grow items-center overflow-hidden overflow-x-auto rounded-md bg-item-9">
+ <div class="flex grow items-center overflow-hidden overflow-x-auto rounded-md bg-item-2">
<slot />
</div>
</template>
diff --git a/app/components/ui/TabsItem1.vue b/app/components/ui/TabsItem1.vue
index 3d30e1ec..7867aab3 100644
--- a/app/components/ui/TabsItem1.vue
+++ b/app/components/ui/TabsItem1.vue
@@ -11,9 +11,9 @@ const emit = defineEmits(['click'])
<template>
<div
:class="[getStyles('item', ['minh2']), {
- '!bg-item-3': isActive,
+ '!bg-item-4': 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-hover"
+ 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/TabsItem3.vue b/app/components/ui/TabsItem3.vue
index 76cde982..7c3721be 100644
--- a/app/components/ui/TabsItem3.vue
+++ b/app/components/ui/TabsItem3.vue
@@ -11,9 +11,9 @@ const emit = defineEmits(['click'])
<template>
<div
:class="[getStyles('item', ['minh2']), {
- '!bg-item-3 !text-accent-1': isActive,
+ '!bg-item-4 !text-accent-1': isActive,
}]"
- class="flex grow select-none items-center justify-center gap-1 px-2 text-sm leading-none text-2 hocus:bg-item-hover"
+ class="flex grow select-none items-center justify-center gap-1 px-2 text-sm leading-none text-2 hocus:bg-item-5"
@click="emit('click')"
>
<slot />
diff --git a/app/components/ui/TabsItem4.vue b/app/components/ui/TabsItem4.vue
index e92ea13e..d3b0013f 100644
--- a/app/components/ui/TabsItem4.vue
+++ b/app/components/ui/TabsItem4.vue
@@ -11,7 +11,7 @@ const emit = defineEmits(['click'])
<template>
<div
:class="[getStyles('item', ['link', 'rounded', 'minh3', 'minw2']), {
- '!bg-item-3 !text-1': isActive,
+ '!bg-item-4 !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')"
diff --git a/app/components/ui/TitleModal.vue b/app/components/ui/TitleModal.vue
index 82210ba3..11d8a991 100644
--- a/app/components/ui/TitleModal.vue
+++ b/app/components/ui/TitleModal.vue
@@ -6,7 +6,7 @@ const emit = defineEmits<{
<template>
<div
- class="sticky top-0 z-20 bg-item-5 px-3 pb-3 pt-4 font-tertiary text-lg font-semibold leading-none text-3"
+ class="sticky top-0 z-20 bg-item-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/Toggle2.vue b/app/components/ui/Toggle2.vue
index 8b624c4e..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="mx-2 h-px bg-item-hover 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/getStyles.ts b/app/components/ui/getStyles.ts
index 2a1af320..740e649a 100644
--- a/app/components/ui/getStyles.ts
+++ b/app/components/ui/getStyles.ts
@@ -1,16 +1,16 @@
export const classes = {
item: {
- alt: 'bg-item-4',
+ alt: 'bg-item-3',
base: '',
- bg: 'bg-item-9',
- bg2: 'bg-item-4',
+ bg: 'bg-item-2',
+ bg2: 'bg-item-3',
center: 'flex items-center',
center2: 'flex items-center justify-center',
center3: 'flex-center',
gap1: 'gap-3',
link: `
select-none
- hocus:bg-item-hover
+ hocus:bg-item-5
`,
minh1: 'min-h-[42px]',
minh2: 'min-h-[38px]',
@@ -38,7 +38,7 @@ export const classes = {
},
modal: {
- bg: 'bg-item-4',
+ bg: 'bg-item-3',
padding1: 'px-2 pt-6 !pb-2',
rounded: 'rounded-xl',
},
diff --git a/app/components/user/ViewLogout.vue b/app/components/user/ViewLogout.vue
index 2d6c3b23..81562d31 100644
--- a/app/components/user/ViewLogout.vue
+++ b/app/components/user/ViewLogout.vue
@@ -30,7 +30,7 @@ const { t } = useI18n()
<UiElement
v-if="props.isShowSignOut"
- insideClasses="bg-item-9 min-h-[44px] max-w-lg"
+ insideClasses="bg-item-2 min-h-[44px] max-w-lg"
@click="userStore.signOut"
>
<template #leftIcon>
diff --git a/app/components/wallets/Item.vue b/app/components/wallets/Item.vue
index 89720233..6456eb5c 100644
--- a/app/components/wallets/Item.vue
+++ b/app/components/wallets/Item.vue
@@ -152,7 +152,7 @@ if (!props.isSort) {
<div
v-if="isSort"
- class="sortHandle flex-center absolute right-0 h-full rounded-md px-3 group-hocus:bg-item-hover"
+ class="sortHandle flex-center absolute right-0 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/page/List.vue b/app/components/wallets/page/List.vue
index fed9ef20..ac904a56 100644
--- a/app/components/wallets/page/List.vue
+++ b/app/components/wallets/page/List.vue
@@ -550,7 +550,7 @@ const counts = computed(() => ({
</div>
</template>
- <div class="ml-5 -translate-x-px border-l border-item-3 pl-3">
+ <div class="ml-5 -translate-x-px border-l border-item-4 pl-3">
<template v-if="groupedOptions.currencies === 0">
<WalletsItem
v-for="walletId in walletsIds"
@@ -592,7 +592,7 @@ const counts = computed(() => ({
</div>
</template>
- <div class="ml-5 -translate-x-px border-l border-item-3 pl-3">
+ <div class="ml-5 -translate-x-px border-l border-item-4 pl-3">
<WalletsItem
v-for="walletId in groupedWalletsIds"
:key="walletId"
@@ -640,7 +640,7 @@ const counts = computed(() => ({
</div>
</template>
- <div class="ml-5 -translate-x-px border-l border-item-3 pl-3">
+ <div class="ml-5 -translate-x-px border-l border-item-4 pl-3">
<template v-if="groupedOptions.type === 0">
<WalletsItem
v-for="walletId in walletsIds"
@@ -691,7 +691,7 @@ const counts = computed(() => ({
</div>
</template>
- <div class="ml-5 -translate-x-px border-l border-item-3 pl-3">
+ <div class="ml-5 -translate-x-px border-l border-item-4 pl-3">
<WalletsItem
v-for="walletId in groupedWalletsIds"
:key="walletId"
diff --git a/app/components/wallets/page/id/Index.vue b/app/components/wallets/page/id/Index.vue
index 070a104f..c5f756e9 100644
--- a/app/components/wallets/page/id/Index.vue
+++ b/app/components/wallets/page/id/Index.vue
@@ -139,6 +139,7 @@ useHead({ title: wallet.value?.name })
<StatItemWrap
:activeTab
+ :range="statDate.range.value"
:storageKey
:trnsIds
:walletId
diff --git a/app/pages/dev.vue b/app/pages/dev.vue
index abe5650f..93d10535 100644
--- a/app/pages/dev.vue
+++ b/app/pages/dev.vue
@@ -19,14 +19,27 @@
Backgrounds
</div>
<div class="flex flex-wrap gap-0">
- <div class="size-20 bg-item-2" />
- <div class="size-20 bg-item-7" />
- <div class="size-20 bg-item-6" />
- <div class="size-20 bg-item-hover" />
- <div class="size-20 bg-item-3" />
- <div class="size-20 bg-item-4" />
- <div class="size-20 bg-item-9" />
- <div class="size-20 bg-item-5" />
+ <div class="flex-center size-20 bg-item-1">
+ 1
+ </div>
+ <div class="flex-center size-20 bg-item-2">
+ 2
+ </div>
+ <div class="flex-center size-20 bg-item-3">
+ 3
+ </div>
+ <div class="flex-center size-20 bg-item-4">
+ 4
+ </div>
+ <div class="flex-center size-20 bg-item-5">
+ 5
+ </div>
+ <div class="flex-center size-20 bg-item-6">
+ 6
+ </div>
+ <div class="flex-center size-20 bg-item-7">
+ 7
+ </div>
</div>
</div>
@@ -35,10 +48,18 @@
Texts
</div>
<div class="flex flex-wrap gap-0">
- <div class="size-20 bg-1" />
- <div class="size-20 bg-3" />
- <div class="size-20 bg-2" />
- <div class="size-20 bg-4" />
+ <div class="flex-center size-20 bg-1 text-icon-primary">
+ 1
+ </div>
+ <div class="flex-center size-20 bg-3">
+ 3
+ </div>
+ <div class="flex-center size-20 bg-2">
+ 2
+ </div>
+ <div class="flex-center size-20 bg-4">
+ 4
+ </div>
</div>
</div>
@@ -52,6 +73,17 @@
</div>
</div>
+ <div class="grid gap-2">
+ <div class="text-sm text-2">
+ Icon primary
+ </div>
+ <div class="flex flex-wrap gap-0">
+ <div class="flex-center size-20 bg-icon-primary">
+ 1
+ </div>
+ </div>
+ </div>
+
<div class="grid gap-2">
<div class="text-sm text-2">
Alert
diff --git a/app/pages/settings.vue b/app/pages/settings.vue
index 647aefa2..724a0efd 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 rounded-xl bg-item-5 pt-4">
+ <div class="pageWrapper rounded-xl bg-item-1 pt-4">
<div class="grid gap-8">
<!-- User -->
<div class="pb-6">
@@ -78,7 +78,7 @@ function onGenerateDemoData() {
<UiElement
v-if="isDemo"
class="group"
- insideClasses="min-h-[44px] bg-item-4 max-w-lg"
+ insideClasses="min-h-[44px] bg-item-3 max-w-lg"
@click="onGenerateDemoData"
>
<template #leftIcon>
@@ -89,7 +89,7 @@ function onGenerateDemoData() {
<UiElement
class="group"
- insideClasses="min-h-[44px] bg-item-4 max-w-lg"
+ insideClasses="min-h-[44px] bg-item-3 max-w-lg"
@click="confirmRemoveUserData = true"
>
<template #leftIcon>
@@ -105,6 +105,7 @@ function onGenerateDemoData() {
{{ t('app.about') }}
<div class="pt-4 text-xs text-2">
{{ t('app.version') }} {{ version }}
+ <!-- <About /> -->
</div>
</div>
</div>
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 35f8104c..cf592699 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -37,23 +37,22 @@ export default <Partial<Config>>{
1: 'var(--text-alert-1)',
},
'expense': {
- 1: 'var(--expense-1)',
+ 1: 'oklch(var(--expense-1) / <alpha-value>)',
2: 'var(--expense-2)',
},
'icon-primary': 'var(--text-icon-primary)',
'income': {
- 1: 'var(--income-1)',
+ 1: 'oklch(var(--income-1) / <alpha-value>)',
2: 'var(--income-2)',
},
'item': {
- 2: 'var(--c-item-2)',
- 3: 'var(--c-item-3)',
- 4: 'var(--c-item-4)',
- 5: 'rgb(var(--item-5))',
+ 1: 'rgb(var(--item-1))',
+ 2: 'rgba(var(--item-2))',
+ 3: 'var(--item-3)',
+ 4: 'var(--item-4)',
+ 5: 'var(--item-5)',
6: 'rgba(var(--item-6))',
7: 'var(--item-7)',
- 9: 'rgba(var(--item-9))',
- hover: 'var(--item-hover)',
},
},
fontFamily: {