Open source personal finance application
feat: add search to mobile menu and header, adjust ActionButton height
Ilya Komichevd3848d4e6325
diff --git a/app/components/layout/MenuBottomModal.vue b/app/components/layout/MenuBottomModal.vueindex e1799db9..034407e5 100644--- a/app/components/layout/MenuBottomModal.vue+++ b/app/components/layout/MenuBottomModal.vue@@ -1,9 +1,11 @@<script setup lang="ts">import { useDemo } from '~/components/demo/useDemo'+import { useSearch } from '~/components/search/useSearch'import { useUserStore } from '~/components/user/useUserStore'const emit = defineEmits<{ close: [] }>()const { t } = useI18n()+const { isSearchOpen } = useSearch()const userStore = useUserStore()const { isDemo } = useDemo()</script>@@ -28,6 +30,18 @@ const { isDemo } = useDemo()<UserViewLogout /></div>+ <div+ class="interactive text-muted mx-2 flex min-h-[44px] items-center gap-3 rounded-sm px-2 py-1.5"+ @click="isSearchOpen = true; emit('close')"+ >+ <div class="flex min-w-8 items-center justify-center">+ <Icon name="lucide:search" size="22" />+ </div>+ <div class="text-sm font-medium">+ {{ t('search.title') }}+ </div>+ </div>+<LayoutSidebarMenu class="py-4" /><divdiff --git a/app/components/search/SearchModal.vue b/app/components/search/SearchModal.vuenew file mode 100644index 00000000..b60902bd--- /dev/null+++ b/app/components/search/SearchModal.vue@@ -0,0 +1,88 @@+<script setup lang="ts">+import type { SearchResultItem } from '~/components/search/useSearch'++import { useSearch } from '~/components/search/useSearch'+import { useTrnsFormStore } from '~/components/trnForm/useTrnsFormStore'++const { t } = useI18n()+const { isSearchOpen, onMenuClick, searchTerm } = useSearch()+const trnsFormStore = useTrnsFormStore()++const { width } = useWindowSize()+const { pointerType } = usePointer()+const isDesktop = computed(() => width.value >= 766 && pointerType.value === 'mouse')++function onSelect(item: SearchResultItem) {+ isSearchOpen.value = false+ searchTerm.value = ''++ switch (item.entityType) {+ case 'menu':+ onMenuClick(item.entityId)+ break++ case 'category':+ navigateTo(`/categories/${item.entityId}`)+ break++ case 'wallet':+ navigateTo(`/wallets/${item.entityId}`)+ break++ case 'trn':+ trnsFormStore.openFormForEdit(item.entityId)+ break+ }+}++function onBottomSheetClosed() {+ isSearchOpen.value = false+ searchTerm.value = ''+}+</script>++<template>+ <!-- Desktop: UModal -->+ <UModal+ v-if="isDesktop"+ v-model:open="isSearchOpen"+ :title="t('search.title')"+ :description="t('search.placeholder')"+ :ui="{+ content: 'sm:max-w-xl sm:max-h-[80dvh]',+ }"+ >+ <template #content>+ <SearchCommandPalette+ class="h-[70dvh] min-h-[400px] px-2"+ @select="onSelect"+ />+ </template>+ </UModal>++ <!-- Mobile: BottomSheet -->+ <Teleport to="body">+ <BottomSheet+ v-if="!isDesktop && isSearchOpen"+ isShow+ dragClassesCustom="bottomSheetDragClassesCustom"+ @closed="onBottomSheetClosed"+ >+ <template #handler="{ close }">+ <BottomSheetHandler />+ <BottomSheetClose @click="close" />+ </template>++ <template #default>+ <div class="bottomSheetContent">+ <UiTitleModal>{{ t('search.title') }}</UiTitleModal>++ <SearchCommandPalette+ class="h-[70dvh] px-2"+ @select="onSelect"+ />+ </div>+ </template>+ </BottomSheet>+ </Teleport>+</template>diff --git a/app/components/ui/ActionButton.vue b/app/components/ui/ActionButton.vueindex cea0320d..645e549d 100644--- a/app/components/ui/ActionButton.vue+++ b/app/components/ui/ActionButton.vue@@ -17,7 +17,7 @@ const emit = defineEmits<{:aria-label="ariaLabel":class="cn('interactive data-[state=open]:!bg-item-4 flex min-w-[42px] cursor-default items-center justify-center rounded-sm',- size === 'md' ? 'min-h-[38px]' : 'min-h-[32px]',+ size === 'md' ? 'min-h-[42px]' : 'min-h-[32px]',variant === 'icon' && 'text-muted text-xl',variant === 'text' && 'text-1 px-3 text-sm',isActive && 'bg-item-3',diff --git a/app/components/ui/Header.vue b/app/components/ui/Header.vueindex 6656f2e7..0541dc00 100644--- a/app/components/ui/Header.vue+++ b/app/components/ui/Header.vue@@ -1,10 +1,28 @@+<script setup lang="ts">+import { useSearch } from '~/components/search/useSearch'++const { isSearchOpen } = useSearch()+</script>+<template><div class="bg-default/90 sticky top-0 z-20 mb-2 backdrop-blur"><div class="border-item-4 grid min-h-12 max-w-7xl items-center border-b px-2 py-2 lg:px-4 lg:py-4"><div class="flex grow items-center gap-2"><slot />- <div v-if="$slots.actions" class="ml-auto flex items-center">+ <div class="ml-auto flex items-center gap-1">+ <UTooltip+ :text="$t('search.title')"+ :kbds="['meta', 'K']"+ >+ <UiActionButton+ :ariaLabel="$t('search.title')"+ @click="isSearchOpen = true"+ >+ <Icon name="lucide:search" size="20" />+ </UiActionButton>+ </UTooltip>+<slot name="actions" /></div></div>diff --git a/app/layouts/default.vue b/app/layouts/default.vueindex 4d336a8b..8490e1e7 100644--- a/app/layouts/default.vue+++ b/app/layouts/default.vue@@ -3,6 +3,7 @@ import { useInitApp } from '~/components/app/useInitApp'import { useCategoriesStore } from '~/components/categories/useCategoriesStore'import { useDemo } from '~/components/demo/useDemo'import { useMenuData } from '~/components/layout/useMenuData'+import { useSearch } from '~/components/search/useSearch'import { useTrnsFormStore } from '~/components/trnForm/useTrnsFormStore'import { useTrnsStore } from '~/components/trns/useTrnsStore'import { useUserStore } from '~/components/user/useUserStore'@@ -17,6 +18,7 @@ const walletsStore = useWalletsStore()const trnsStore = useTrnsStore()const { isDemo } = useDemo()const { isMenuOpen } = useMenuData()+const { isSearchOpen } = useSearch()const { loadDataFromCache, loadDataFromDB } = useInitApp()const { width } = useWindowSize()@@ -54,6 +56,9 @@ defineShortcuts({? trnsFormStore.ui.isShow = false: trnsFormStore.openFormForCreate()},+ 'meta_k': () => {+ isSearchOpen.value = !isSearchOpen.value+ },})</script>@@ -91,6 +96,8 @@ defineShortcuts({</div></div>+ <SearchModal v-if="isOnboarded" />+<template v-if="isOnboarded"><TrnFormFloatOpener v-if="width >= 767" />