Skip to content

Open source personal finance application

refactor: improve date range components and chart height

Ilya Komichevf364875be3ec
diff --git a/app/components/date/Ranges.vue b/app/components/date/Ranges.vue
index e187fed5..8b40f9b7 100644
--- a/app/components/date/Ranges.vue
+++ b/app/components/date/Ranges.vue
@@ -105,7 +105,7 @@ function selectMaxRange(isSkipEmpty = false) {
<template>
<div
- class="flex overflow-hidden"
+ class="flex shrink-0"
:class="{
'gap-1': props.itemProps?.variant !== 'small',
}"
diff --git a/app/components/date/useStatDate.test.ts b/app/components/date/useStatDate.test.ts
index 3106d46c..056fb854 100644
--- a/app/components/date/useStatDate.test.ts
+++ b/app/components/date/useStatDate.test.ts
@@ -42,9 +42,9 @@ describe('selectInterval', () => {
beforeEach(() => {
statDate = createStatDate({
- intervalSelected: -1,
intervalsBy: 'month',
intervalsDuration: 1,
+ intervalSelected: -1,
rangeBy: 'year',
rangeDuration: 1,
rangeOffset: 0,
diff --git a/app/components/stat/chart/View.vue b/app/components/stat/chart/View.vue
index 1014aff9..8209ead5 100644
--- a/app/components/stat/chart/View.vue
+++ b/app/components/stat/chart/View.vue
@@ -109,13 +109,13 @@ function buildChartSeries(series: ChartSeries[]) {
<template>
<div
- class="h-40 @3xl/page:h-52"
+ class="h-40 @3xl/stat:h-52"
@click="onClickChart"
>
<VChart
ref="chartRef"
:option
- :update-options="{ notMerge: true }"
+ :updateOptions="{ notMerge: true }"
autoresize
>
<template #tooltip="params">
diff --git a/app/components/stat/date/Quick.vue b/app/components/stat/date/Quick.vue
index 76b118bc..25d08257 100644
--- a/app/components/stat/date/Quick.vue
+++ b/app/components/stat/date/Quick.vue
@@ -1,59 +1,41 @@
<script setup lang="ts">
-import Swiper from 'swiper'
-import 'swiper/css'
-
import { statDateKey } from '~/components/stat/injectionKeys'
const statDate = inject(statDateKey)!
-
-const sliderRef = ref<HTMLElement | null>(null)
-const sliderObj = ref<Swiper | null>(null)
-
-onMounted(() => {
- const initialSlide = 1
-
- sliderObj.value = new Swiper(sliderRef.value!, {
- autoHeight: true,
- initialSlide,
- longSwipesMs: 60,
- longSwipesRatio: 0.1,
- observeParents: true,
- observer: true,
- shortSwipes: false,
- slidesPerView: 1,
- touchStartPreventDefault: false,
- })
-})
+const isExpanded = ref(false)
</script>
<template>
- <div class="relative overflow-hidden">
- <div ref="sliderRef" class="swiper-container">
- <div class="swiper-wrapper">
- <div class="swiper-slide">
- <DateRanges
- :itemProps="{ variant: 'small' }"
- :statDate
- view="periods"
- />
- </div>
-
- <div class="swiper-slide">
- <DateRanges
- :itemProps="{ variant: 'small' }"
- :statDate
- view="presets"
- />
- </div>
-
- <div class="swiper-slide">
- <DateRanges
- :itemProps="{ variant: 'small' }"
- :statDate
- view="maximum"
- />
- </div>
- </div>
- </div>
+ <div class="flex items-center overflow-x-auto">
+ <DateRanges
+ :itemProps="{ variant: 'small' }"
+ :statDate
+ view="periods"
+ />
+
+ <template v-if="isExpanded">
+ <DateRanges
+ :itemProps="{ variant: 'small' }"
+ :statDate
+ view="presets"
+ />
+
+ <DateRanges
+ :itemProps="{ variant: 'small' }"
+ :statDate
+ view="maximum"
+ />
+ </template>
+
+ <button
+ type="button"
+ class="interactive text-muted flex min-h-[32px] min-w-[32px] shrink-0 items-center justify-center rounded-sm"
+ @click="isExpanded = !isExpanded"
+ >
+ <Icon
+ :name="isExpanded ? 'lucide:chevron-left' : 'lucide:chevron-right'"
+ size="16"
+ />
+ </button>
</div>
</template>
diff --git a/app/components/stat/date/Range.vue b/app/components/stat/date/Range.vue
index fa516df4..28cc2caf 100644
--- a/app/components/stat/date/Range.vue
+++ b/app/components/stat/date/Range.vue
@@ -27,7 +27,7 @@ const date = computed(() => {
</script>
<template>
- <div class="flex items-center gap-1 leading-none text-nowrap">
+ <div class="flex items-center gap-1 leading-none text-nowrap capitalize">
{{ date }}
<data
v-if="statDate.params.value.isShowMaxRange && statDate.params.value.intervalSelected === -1"
diff --git a/app/components/stat/date/useGetDateRange.ts b/app/components/stat/date/useGetDateRange.ts
index 7ee9e4ba..d64745cc 100644
--- a/app/components/stat/date/useGetDateRange.ts
+++ b/app/components/stat/date/useGetDateRange.ts
@@ -33,17 +33,17 @@ export function useGetDateRange(t: (key: string, choice?: number) => string, loc
function formatMonthRange({ duration, end, start }: DateFormatParams): string {
if (isSameYear(start, today)) {
if (isSameMonth(start, today) || duration === 1)
- return formatByLocale(start, 'MMMM', locale)
- return `${formatByLocale(start, 'MMM', locale)} - ${formatByLocale(end, 'MMM', locale)}`
+ return formatByLocale(start, 'LLLL', locale)
+ return `${formatByLocale(start, 'LLL', locale)} - ${formatByLocale(end, 'LLL', locale)}`
}
if (isSameYear(start, end)) {
if (isSameMonth(start, end))
- return formatByLocale(start, 'MMM yyyy', locale)
- return `${formatByLocale(start, 'MMM', locale)} - ${formatByLocale(end, 'MMM yyyy', locale)}`
+ return formatByLocale(start, 'LLL yyyy', locale)
+ return `${formatByLocale(start, 'LLL', locale)} - ${formatByLocale(end, 'LLL yyyy', locale)}`
}
- return `${formatByLocale(start, 'MMM yyyy', locale)} - ${formatByLocale(end, 'MMM yyyy', locale)}`
+ return `${formatByLocale(start, 'LLL yyyy', locale)} - ${formatByLocale(end, 'LLL yyyy', locale)}`
}
function formatWeekRange({ end, start }: DateFormatParams): string {
@@ -112,6 +112,13 @@ export function useGetDateRange(t: (key: string, choice?: number) => string, loc
function formatDateToString(params: DateFormatParams): string {
const { by, duration, start } = params
+ if (duration === 1 && isSamePeriod(start, today, by)) {
+ if (by === 'day')
+ return t('dates.day.current')
+ if (by === 'week')
+ return t('dates.week.current')
+ }
+
if (duration === 1 && by === 'day' && isSameYear(start, today))
return formatByLocale(start, 'd MMMM', locale)