Open source personal finance application
refactor: enhance UI consistency and improve component styling
Ilya Komichevc8c6d0efcf74
diff --git a/app/app.config.ts b/app/app.config.tsindex e7cbe158..b1c72d7e 100644--- a/app/app.config.ts+++ b/app/app.config.ts@@ -26,7 +26,7 @@ export default defineAppConfig({placement: 'bottom-start',},ring: '!ring-2 !ring-item-3',- trigger: 'w-full cursor-default',+ trigger: '!w-full !block !cursor-default',},primary: 'pink',strategy: 'merge',diff --git a/app/components/categories/Header.vue b/app/components/categories/Header.vueindex 469742d1..b7aa770f 100644--- a/app/components/categories/Header.vue+++ b/app/components/categories/Header.vue@@ -32,7 +32,7 @@ function onParentClick() {<divv-if="props.parentCategory"- class="@lg:text-base flex items-center pt-[3px] text-xs font-medium leading-none text-item-2"+ class="@lg:text-base flex items-center pt-[3px] text-xs font-medium leading-none text-2"><div class="text-2xs text-4">•diff --git a/app/components/form/Input.vue b/app/components/form/Input.vueindex e1ff2967..941f6395 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-item-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-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"@input="(event: HTMLInputEvent) => emit('updateValue', event.target.value)"></template>diff --git a/app/components/form/Textarea.vue b/app/components/form/Textarea.vueindex b0b2d038..5770b0a8 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-item-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-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"@input="(event: HTMLInputEvent) => emit('updateValue', event.target.value)"/></template>diff --git a/app/components/layout/MenuBottomModal.vue b/app/components/layout/MenuBottomModal.vueindex ab190cc0..096c7d4a 100644--- a/app/components/layout/MenuBottomModal.vue+++ b/app/components/layout/MenuBottomModal.vue@@ -33,7 +33,7 @@ const { isDemo } = useDemo()v-if="!isDemo"class="border-t border-item-6 px-2 pt-3">- <UserViewLogout />+ <UserViewLogout isShowSignOut /></div><divdiff --git a/app/components/layout/Sidebar.vue b/app/components/layout/Sidebar.vueindex f137bfe9..3d7263bb 100644--- a/app/components/layout/Sidebar.vue+++ b/app/components/layout/Sidebar.vue@@ -53,23 +53,17 @@ const isShowLogoMenu = ref(false)<template #trigger><div:class="getStyles('item', ['link', 'rounded'])"- class="block cursor-default px-3 py-2"+ class="block cursor-default px-3 py-2 group-data-[headlessui-state='open']:!bg-item-3">- <UiLogo class="w-16" />+ <UiLogo /></div></template><template #content><div class="grid gap-2 px-1 py-3 md:px-3 md:!pb-0">+ <UserViewLogout /><AppLocaleSwitcher />-- <div class="h-px bg-item-3" />-- <AppThemeSwitcher- isShowSystem- />-- <UserViewLogout class="mt-3" />+ <AppThemeSwitcher /></div></template></BottomSheetOrDropdown>diff --git a/app/components/user/ViewLogout.vue b/app/components/user/ViewLogout.vueindex af8dd208..2d6c3b23 100644--- a/app/components/user/ViewLogout.vue+++ b/app/components/user/ViewLogout.vue@@ -1,6 +1,10 @@<script lang="ts" setup>import { useUserStore } from '~/components/user/useUserStore'+const props = defineProps<{+ isShowSignOut?: boolean+}>()+const userStore = useUserStore()const { t } = useI18n()</script>@@ -9,18 +13,24 @@ const { t } = useI18n()<div><divv-if="userStore.currentUser"- class="flex items-center gap-3 pb-4 text-sm text-item-2"+ class="flex items-center gap-3 pb-4 text-sm text-2"><img:src="userStore.currentUser?.photoURL"class="size-10 rounded-full">+ <div>+ <div class="text-1">+ {{ userStore.currentUser?.displayName }}+ </div>- {{ userStore.currentUser?.displayName }}<br>- {{ userStore.currentUser?.email }}+ {{ userStore.currentUser?.email }}+ </div></div>+<UiElement- insideClasses="bg-item-4 min-h-[44px] max-w-lg"+ v-if="props.isShowSignOut"+ insideClasses="bg-item-9 min-h-[44px] max-w-lg"@click="userStore.signOut"><template #leftIcon>diff --git a/app/layouts/default.vue b/app/layouts/default.vueindex 8945f165..a41b0656 100644--- a/app/layouts/default.vue+++ b/app/layouts/default.vue@@ -72,9 +72,9 @@ useSeoMeta({usePageScroll()-const { ctrl_d, ctrl_s, escape } = useMagicKeys()+const { escape, shift_d, shift_s } = useMagicKeys()-watch(ctrl_s!, (v) => {+watch(shift_s!, (v) => {if (v) {if (trnsFormStore.ui.isShow)trnsFormStore.ui.isShow = false@@ -88,7 +88,7 @@ watch(escape!, (v) => {trnsFormStore.ui.isShow = false})-watch(ctrl_d!, (v) => {+watch(shift_d!, (v) => {if (v)isShowSidebar.value = !isShowSidebar.value})diff --git a/app/pages/settings.vue b/app/pages/settings.vueindex 59979341..647aefa2 100644--- a/app/pages/settings.vue+++ b/app/pages/settings.vue@@ -41,6 +41,11 @@ function onGenerateDemoData() {<div class="pageWrapper rounded-xl bg-item-5 pt-4"><div class="grid gap-8">+ <!-- User -->+ <div class="pb-6">+ <UserViewLogout isShowSignOut />+ </div>+<AppLocaleSwitcher isShowTitle /><AppThemeSwitcherisShowTitle@@ -60,21 +65,12 @@ function onGenerateDemoData() {</template></UiButtonWithRight>- <!-- User -->- <div class="pb-8">- <UiTitle3 class="pb-2">- {{ t('user') }}- </UiTitle3>-- <UserViewLogout />- </div>-<!-- Delete -->- <div class="pb-8">+ <div class="py-8"><UiTitle3 class="pb-2">{{ t('settings.caution') }}</UiTitle3>- <div class="pb-4 text-xs leading-none text-item-2">+ <div class="pb-4 text-xs leading-none text-alert-1">{{ t('alerts.willDeleteEverything') }}</div>@@ -103,13 +99,13 @@ function onGenerateDemoData() {</UiElement></div></div>- </div>- <!-- About -->- <div class="pb-12">- {{ t('app.about') }}- <div class="pt-4 text-xs text-item-2">- {{ t('app.version') }} {{ version }}+ <!-- About -->+ <div class="pb-12">+ {{ t('app.about') }}+ <div class="pt-4 text-xs text-2">+ {{ t('app.version') }} {{ version }}+ </div></div></div></div>