Skip to content

Open source personal finance application

feat: redesign mobile bottom navigation - Floating pill design with icon + optional labels - New isShowMenuLabels toggle persisted via useStorage - Settings page: add mobile menu labels toggle - SidebarMenu: source prop to render items or itemsModal - useMenuData: add itemsModal (excludes bottom nav items) md breakpoints, refactor layout classes - Bottom menu now shows 'Add' label on trnForm, 'Menu' on menu button

Ilya Komichev24d6f7cc6b9c
diff --git a/app/components/layout/MenuBottom.vue b/app/components/layout/MenuBottom.vue
index 2dcc0319..bc4bbd42 100644
--- a/app/components/layout/MenuBottom.vue
+++ b/app/components/layout/MenuBottom.vue
@@ -1,22 +1,47 @@
<script setup lang="ts">
+import { useStorage } from '@vueuse/core'
+
import { useMenuData } from '~/components/layout/useMenuData'
-const { itemsBottom } = useMenuData()
+const { checkIsActive, itemsBottom, onClick } = useMenuData()
+const isShowMenuLabels = useStorage('finapp.isShowMenuLabels', true)
</script>
<template>
- <div
- class="sm:bottom-inherit bg-default/90 sticky bottom-0 left-0 z-20 mx-auto flex w-full items-stretch backdrop-blur sm:hidden lg:hidden"
- style="padding-bottom: calc(env(safe-area-inset-bottom) - 16px)"
- >
- <LayoutSidebarMenuItem
- v-for="(item, menuId) in itemsBottom"
- :key="menuId"
- :isShowText="false"
- :item
- :menuId
- class="flex-center is-bigger grow"
- position="bottom"
+ <div class="pointer-events-none fixed bottom-0 left-0 z-20 w-full md:hidden">
+ <div
+ class="absolute bottom-0 left-0 h-12 w-full"
+ style="background: linear-gradient(to bottom, transparent, var(--ui-bg))"
/>
+ <div
+ class="pointer-events-auto w-full"
+ :style="{ paddingBottom: `max(8px, calc(env(safe-area-inset-bottom) - 8px))` }"
+ >
+ <div
+ class="border-default/50 bg-default/10 mx-auto flex max-w-sm items-stretch rounded-2xl border shadow-lg backdrop-blur-xl dark:bg-neutral-800/50"
+ >
+ <div
+ v-for="(item, menuId) in itemsBottom"
+ :key="menuId"
+ :class="cn(
+ 'interactive flex min-h-[44px] basis-0 grow cursor-pointer flex-col items-center justify-center gap-0.5 rounded-2xl py-1.5',
+ checkIsActive(String(menuId)) ? 'text-primary' : 'text-muted',
+ )"
+ @click="onClick(String(menuId))"
+ >
+ <Icon
+ :name="item.icon"
+ class="leading-none"
+ size="22"
+ />
+ <span
+ v-if="isShowMenuLabels"
+ class="text-2xs leading-tight font-medium"
+ >
+ {{ item.name }}
+ </span>
+ </div>
+ </div>
+ </div>
</div>
</template>
diff --git a/app/components/layout/MenuBottomModal.vue b/app/components/layout/MenuBottomModal.vue
index 940c57dc..60fd324b 100644
--- a/app/components/layout/MenuBottomModal.vue
+++ b/app/components/layout/MenuBottomModal.vue
@@ -3,6 +3,7 @@ import { useDemo } from '~/components/demo/useDemo'
import { useUserStore } from '~/components/user/useUserStore'
const emit = defineEmits<{ close: [] }>()
+const { t } = useI18n()
const userStore = useUserStore()
const { isDemo } = useDemo()
</script>
@@ -28,7 +29,7 @@ const { isDemo } = useDemo()
<UserViewLogout />
</div>
- <LayoutSidebarMenu class="py-4" />
+ <LayoutSidebarMenu class="py-4" source="itemsModal" />
<div
v-if="isDemo"
diff --git a/app/components/layout/Sidebar.vue b/app/components/layout/Sidebar.vue
index 83b9788c..c3284112 100644
--- a/app/components/layout/Sidebar.vue
+++ b/app/components/layout/Sidebar.vue
@@ -58,13 +58,13 @@ const sidebarCategoryIds = computed(() => {
:class="{
'md:w-72': props.isShowSidebar,
}"
- class="fixed inset-y-0 left-0 z-40 hidden h-dvh w-12 overflow-hidden transition-all duration-300 ease-in-out sm:block"
+ class="fixed inset-y-0 left-0 z-40 hidden h-dvh w-12 overflow-hidden transition-all duration-300 ease-in-out md:block"
>
<div class="relative h-full overflow-hidden overflow-y-auto overscroll-contain">
<LayoutSidebarMenu
:isShowText="false"
- :class="{ 'md:hidden': props.isShowSidebar }"
- class="sm:align-center hidden h-full flex-col justify-center gap-1 sm:flex"
+ :class="{ hidden: props.isShowSidebar }"
+ class="flex h-full flex-col items-center justify-center gap-1"
/>
<div
diff --git a/app/components/layout/SidebarMenu.vue b/app/components/layout/SidebarMenu.vue
index 1caf68c2..91bd04c1 100644
--- a/app/components/layout/SidebarMenu.vue
+++ b/app/components/layout/SidebarMenu.vue
@@ -1,17 +1,19 @@
<script setup lang="ts">
import { useMenuData } from '~/components/layout/useMenuData'
-const { isShowText = true } = defineProps<{
+const { isShowText = true, source = 'items' } = defineProps<{
isShowText?: boolean
+ source?: 'items' | 'itemsModal'
}>()
-const { items } = useMenuData()
+const { items, itemsModal } = useMenuData()
+const menuItems = computed(() => source === 'itemsModal' ? itemsModal.value : items.value)
</script>
<template>
<div>
<UTooltip
- v-for="(item, menuId) in items"
+ v-for="(item, menuId) in menuItems"
:key="menuId"
:disabled="!item.tooltip"
:text="item.tooltip?.text"
diff --git a/app/components/layout/useMenuData.ts b/app/components/layout/useMenuData.ts
index 1566f3e0..c63657d0 100644
--- a/app/components/layout/useMenuData.ts
+++ b/app/components/layout/useMenuData.ts
@@ -72,12 +72,24 @@ export function useMenuData() {
const itemsBottom = computed<Record<string, MenuItem>>(() => ({
wallets: items.value.wallets!,
categories: items.value.categories!,
- trnForm: items.value.trnForm!,
+ trnForm: { ...items.value.trnForm!, name: t('base.add') },
dashboard: items.value.dashboard!,
- menu: { icon: 'hugeicons:menu-01', name: '' },
+ menu: { icon: 'hugeicons:menu-01', name: t('base.menu') },
}))
+ const bottomKeys = new Set(['wallets', 'categories', 'trnForm', 'dashboard'])
+ const itemsModal = computed<Record<string, MenuItem>>(() =>
+ Object.fromEntries(
+ Object.entries(items.value).filter(([key]) => !bottomKeys.has(key)),
+ ),
+ )
+
function onClick(menuId: string) {
+ if (menuId === 'menu') {
+ isMenuOpen.value = true
+ return
+ }
+
isMenuOpen.value = false
if (menuId === 'trnForm') {
@@ -90,11 +102,6 @@ export function useMenuData() {
return
}
- if (menuId === 'menu') {
- isMenuOpen.value = true
- return
- }
-
navigateTo(`/${menuId}`)
}
@@ -105,6 +112,7 @@ export function useMenuData() {
return {
items,
itemsBottom,
+ itemsModal,
onClick,
checkIsActive,
isMenuOpen,
diff --git a/app/layouts/default.vue b/app/layouts/default.vue
index 0546bc1d..aafac53e 100644
--- a/app/layouts/default.vue
+++ b/app/layouts/default.vue
@@ -19,7 +19,7 @@ const trnsStore = useTrnsStore()
const { isDemo } = useDemo()
const { isMenuOpen } = useMenuData()
const { isSearchOpen } = useSearch()
-const { isDbLoading, loadDataFromCache, loadDataFromDB } = useInitApp()
+const { loadDataFromCache, loadDataFromDB } = useInitApp()
const { width } = useWindowSize()
const isShowSidebar = useCookie('finapp.isShowSidebar', { default: () => true })
@@ -27,6 +27,13 @@ const isOnboardedHint = useCookie('finapp.isOnboarded', { default: () => false }
const isOnboarded = computed(() => walletsStore.hasItems && categoriesStore.hasItems && trnsStore.hasItems)
watch(isOnboarded, val => (isOnboardedHint.value = val))
+const hasSidebar = computed(() => isOnboardedHint.value || isOnboarded.value)
+const layoutClasses = computed(() => cn(
+ 'flex min-h-dvh flex-col transition-all duration-300 ease-in-out',
+ hasSidebar.value && (isShowSidebar.value ? 'md:pl-72' : 'md:pl-12'),
+ isOnboarded.value && trnsFormStore.ui.isShow && 'md:pr-[360px]',
+))
+
const { error, status } = useAsyncData(
'app',
async () => {
@@ -71,12 +78,7 @@ defineShortcuts({
<template>
<div
- class="flex min-h-dvh flex-col transition-all duration-300 ease-in-out"
- :class="{
- 'sm:pl-12': isOnboardedHint || isOnboarded,
- 'md:pl-72': (isOnboardedHint || isOnboarded) && isShowSidebar,
- 'md:pr-[360px]': isOnboarded && trnsFormStore.ui.isShow,
- }"
+ :class="layoutClasses"
style="margin-left: env(safe-area-inset-left)"
>
<div v-if="status === 'pending' && !isOnboardedHint" class="flex-center h-dvh">
@@ -96,11 +98,11 @@ defineShortcuts({
</template>
<div :class="isOnboarded ? 'flex min-h-dvh flex-col md:py-4 md:pr-4' : 'flex flex-1 items-center justify-center'">
- <div :class="isOnboarded ? 'bg-default sm:border-item-4 relative z-10 flex max-w-5xl flex-1 flex-col contain-paint sm:rounded-md sm:border lg:rounded-2xl' : 'w-full max-w-lg px-4'">
+ <div :class="isOnboarded ? 'bg-default md:border-item-4 relative z-10 flex max-w-5xl flex-1 flex-col contain-paint md:rounded-md md:border lg:rounded-2xl' : 'w-full max-w-lg px-4'">
<main
id="pageScroll"
- :style="isOnboarded ? 'padding-bottom: calc(50px + env(safe-area-inset-bottom))' : ''"
- class="@container/main flex-1 contain-paint"
+ :style="isOnboarded ? 'padding-bottom: calc(64px + env(safe-area-inset-bottom))' : ''"
+ class="@container/main flex-1 contain-paint md:!pb-0"
>
<slot :keepalive="{ include: keepalive }" />
</main>
diff --git a/app/pages/settings.vue b/app/pages/settings.vue
index 622c62a2..6a1d9caf 100644
--- a/app/pages/settings.vue
+++ b/app/pages/settings.vue
@@ -1,4 +1,6 @@
<script setup lang="ts">
+import { useStorage } from '@vueuse/core'
+
import pkg from '~~/package.json'
import type { LocaleSlug } from '~/components/locale/types'
@@ -14,6 +16,7 @@ const currenciesStore = useCurrenciesStore()
const { generateDemoData } = useDemo()
const { isDemo } = useDemo()
const isShowBaseCurrencyModal = ref(false)
+const isShowMenuLabels = useStorage('finapp.isShowMenuLabels', true)
useSeoMeta({
ogTitle: t('settings.title'),
@@ -59,6 +62,17 @@ function onGenerateDemoData() {
/>
</UiSettingsCard>
+ <!-- Menu labels -->
+ <UiSettingsCard :title="t('settings.mobileMenu')" class="md:hidden">
+ <template #content>
+ <UiSwitchItem
+ :checkboxValue="isShowMenuLabels"
+ :title="t('settings.menuLabels')"
+ @click="isShowMenuLabels = !isShowMenuLabels"
+ />
+ </template>
+ </UiSettingsCard>
+
<!-- Currency -->
<UiSettingsCard :title="t('currencies.base')">
<button
diff --git a/i18n/locales/en-US.js b/i18n/locales/en-US.js
index c7d59ae1..204f8946 100644
--- a/i18n/locales/en-US.js
+++ b/i18n/locales/en-US.js
@@ -268,6 +268,8 @@ export default {
errors: {
saveFailed: 'Failed to save settings',
},
+ menuLabels: 'Show labels in bottom menu',
+ mobileMenu: 'Interface',
title: 'Settings',
},
diff --git a/i18n/locales/ru-RU.js b/i18n/locales/ru-RU.js
index 920bd55c..9da33769 100644
--- a/i18n/locales/ru-RU.js
+++ b/i18n/locales/ru-RU.js
@@ -268,6 +268,8 @@ export default {
errors: {
saveFailed: 'Не удалось сохранить настройки',
},
+ menuLabels: 'Подписи в нижнем меню',
+ mobileMenu: 'Интерфейс',
title: 'Настройки',
},