Skip to content

Open source personal finance application

fix: move edit/delete actions to three-dot menu, unify section titles

Ilya Komichev594fb792cfd9
diff --git a/app/components/stat/Header.vue b/app/components/stat/Header.vue
index 17caeffd..02881244 100644
--- a/app/components/stat/Header.vue
+++ b/app/components/stat/Header.vue
@@ -39,6 +39,8 @@ const statConfigModal: Ref<StatConfigModal> = ref({
isShow: false,
show: () => statConfigModal.value.isShow = true,
})
+
+const isPopoverOpen = ref(false)
</script>
<template>
@@ -47,7 +49,7 @@ const statConfigModal: Ref<StatConfigModal> = ref({
<template #actions>
<div
- v-if="props.filter || props.config"
+ v-if="props.filter || props.config || $slots.popover"
class="ml-auto flex items-center gap-1"
>
<StatFilterSelector
@@ -57,25 +59,33 @@ const statConfigModal: Ref<StatConfigModal> = ref({
/>
<StatConfigModal
- v-if="props.config"
- :isShowWallets="!!props.config.isShowWallets"
+ v-if="props.config || $slots.popover"
+ :isShowWallets="!!props.config?.isShowWallets"
:statConfigModal
+ />
+
+ <BottomSheetOrDropdown
+ v-if="$slots.popover"
+ :isOpen="isPopoverOpen"
+ isShowCloseBtn
+ @openModal="isPopoverOpen = true"
+ @closeModal="isPopoverOpen = false"
>
- <template
- v-if="$slots.popover"
- #default="{ close }"
- >
- <div>
+ <template #trigger>
+ <UiActionButton :ariaLabel="$t('base.moreOptions')">
+ <Icon name="lucide:ellipsis-vertical" size="20" />
+ </UiActionButton>
+ </template>
+
+ <template #content>
+ <div class="min-w-52 p-1 pt-4 pb-3">
<slot
name="popover"
- :close="() => {
- statConfigModal.close()
- close()
- }"
+ :close="() => isPopoverOpen = false"
/>
</div>
</template>
- </StatConfigModal>
+ </BottomSheetOrDropdown>
</div>
</template>
diff --git a/app/components/trnForm/SelectionCategoriesFast.vue b/app/components/trnForm/SelectionCategoriesFast.vue
index fa1d59e6..89be8968 100644
--- a/app/components/trnForm/SelectionCategoriesFast.vue
+++ b/app/components/trnForm/SelectionCategoriesFast.vue
@@ -25,9 +25,9 @@ const isShowAllCategoriesFallback = computed(() =>
v-if="categoriesStore.favoriteCategoriesIds.length > 0"
class="pt-2"
>
- <UiTitleCollapse arrow="right" class="mx-2">
+ <UiTitleModal>
{{ t('categories.favoriteCategories') }}
- </UiTitleCollapse>
+ </UiTitleModal>
<CategoriesSelectorGrid
:activeItemId="trnsFormStore.values.categoryId ?? undefined"
diff --git a/app/components/wallets/page/List.vue b/app/components/wallets/page/List.vue
index d500c3b8..de6faf9a 100644
--- a/app/components/wallets/page/List.vue
+++ b/app/components/wallets/page/List.vue
@@ -74,6 +74,7 @@ function hasGroups(groups: Record<string, unknown> | undefined) {
</UiActionButton>
<BottomSheetOrDropdown
+ v-if="walletsStore.sortedIds.length > 1"
:isOpen="isOpen"
isShowCloseBtn
@closeModal="isOpen = false"
@@ -88,7 +89,6 @@ function hasGroups(groups: Record<string, unknown> | undefined) {
<template #content>
<div class="p-1 pt-4 pb-3">
<UiHeaderLink
- v-if="walletsStore.sortedIds.length > 1"
icon="lucide:arrow-down-up"
@click="isSortModalOpen = true"
>
diff --git a/app/components/wallets/page/id/Index.vue b/app/components/wallets/page/id/Index.vue
index d129d57c..67cb533f 100644
--- a/app/components/wallets/page/id/Index.vue
+++ b/app/components/wallets/page/id/Index.vue
@@ -112,7 +112,6 @@ async function onDeleteConfirm() {
<template>
<UiPage v-if="wallet">
<StatHeader
- :config="{}"
:filter="{ isShowCategories: true }"
>
<template #title>