Skip to content

Open source personal finance application

feat: enhance user experience with logout functionality and user data handling

Ilya Komichev4dbc7929f11e
diff --git a/app/components/layout/Sidebar.vue b/app/components/layout/Sidebar.vue
index 0ccf054f..f6e163b0 100644
--- a/app/components/layout/Sidebar.vue
+++ b/app/components/layout/Sidebar.vue
@@ -69,6 +69,8 @@ const isShowLogoMenu = ref(false)
isShowSystem
component="UiTabs2"
/>
+
+ <UserViewLogout class="mt-6" />
</div>
</template>
</BottomSheetOrDropdown>
diff --git a/app/components/user/ViewLogout.vue b/app/components/user/ViewLogout.vue
new file mode 100644
index 00000000..af8dd208
--- /dev/null
+++ b/app/components/user/ViewLogout.vue
@@ -0,0 +1,32 @@
+<script lang="ts" setup>
+import { useUserStore } from '~/components/user/useUserStore'
+
+const userStore = useUserStore()
+const { t } = useI18n()
+</script>
+
+<template>
+ <div>
+ <div
+ v-if="userStore.currentUser"
+ class="flex items-center gap-3 pb-4 text-sm text-item-2"
+ >
+ <img
+ :src="userStore.currentUser?.photoURL"
+ class="size-10 rounded-full"
+ >
+
+ {{ userStore.currentUser?.displayName }}<br>
+ {{ userStore.currentUser?.email }}
+ </div>
+ <UiElement
+ insideClasses="bg-item-4 min-h-[44px] max-w-lg"
+ @click="userStore.signOut"
+ >
+ <template #leftIcon>
+ <Icon name="lucide:log-out" size="20" />
+ </template>
+ <div>{{ t('userLogout') }}</div>
+ </UiElement>
+ </div>
+</template>
diff --git a/app/components/user/useGuard.ts b/app/components/user/useGuard.ts
index a09308f6..0828f65d 100644
--- a/app/components/user/useGuard.ts
+++ b/app/components/user/useGuard.ts
@@ -10,7 +10,7 @@ export function useGuard() {
const { clearLocalData } = useInitApp()
onMounted(() => {
- watch(() => userStore.user, (user, prevUser) => {
+ watch(() => userStore.currentUser, (user, prevUser) => {
if (user?.uid && user?.uid !== localAuthUid.value) {
clearLocalData()
}
diff --git a/app/components/user/useUserStore.ts b/app/components/user/useUserStore.ts
index 2f562087..d898fda3 100644
--- a/app/components/user/useUserStore.ts
+++ b/app/components/user/useUserStore.ts
@@ -12,6 +12,7 @@ import { useWalletsStore } from '~/components/wallets/useWalletsStore'
export type User = {
displayName?: string | null
email?: string | null
+ photoURL?: string | null
uid: string
}
@@ -29,6 +30,8 @@ export const useUserStore = defineStore('user', () => {
const isDevUser = computed(() => !!$config.public.ratesApiKey.includes(user.value?.email ?? ''))
const uid = computed<string | null>(() => currentUser.value?.uid || user.value?.uid || null)
+ watch(() => currentUser.value, user => setUser(user))
+
function setUser(values: User | null) {
if (!values || values === null) {
user.value = null
@@ -37,6 +40,7 @@ export const useUserStore = defineStore('user', () => {
user.value = {
displayName: values?.displayName,
email: values?.email,
+ photoURL: values?.photoURL,
uid: values.uid,
}
}
@@ -88,6 +92,7 @@ export const useUserStore = defineStore('user', () => {
}
return {
+ currentUser,
isDevUser,
removeUserData,
setUser,
diff --git a/app/layouts/default.vue b/app/layouts/default.vue
index d58a42e2..258d3769 100644
--- a/app/layouts/default.vue
+++ b/app/layouts/default.vue
@@ -44,7 +44,7 @@ const { error, status } = await useAsyncData(
if (isDemo.value) {
await loadDataFromCache()
}
- else if (userStore.user || localAuthUid.value) {
+ else if (userStore.currentUser || localAuthUid.value) {
await loadDataFromCache()
loadDataFromDB()
}
diff --git a/app/pages/login.vue b/app/pages/login.vue
index 414530ec..ec30a369 100644
--- a/app/pages/login.vue
+++ b/app/pages/login.vue
@@ -10,7 +10,7 @@ definePageMeta({
layout: 'center',
})
-const { t } = useI18n()
+const { locale, t } = useI18n()
useSeoMeta({
description: t('app.desc'),
@@ -60,7 +60,7 @@ onMounted(() => {
async function openDemo() {
isDemo.value = 'true'
- await generateDemoData()
+ await generateDemoData(locale.value)
router.push(typeof route.query.redirect === 'string' ? route.query.redirect : '/dashboard')
}
</script>
diff --git a/app/pages/settings.vue b/app/pages/settings.vue
index 09c70def..174b118a 100644
--- a/app/pages/settings.vue
+++ b/app/pages/settings.vue
@@ -6,7 +6,7 @@ import { useDemo } from '~/components/demo/useDemo'
import { useUserStore } from '~/components/user/useUserStore'
const { $toast } = useNuxtApp()
-const { t } = useI18n()
+const { locale, t } = useI18n()
const userStore = useUserStore()
const currenciesStore = useCurrenciesStore()
const { generateDemoData } = useDemo()
@@ -28,7 +28,7 @@ function removeUserData() {
}
function onGenerateDemoData() {
- generateDemoData()
+ generateDemoData(locale.value)
$toast.success(t('demo.updated'))
}
</script>
@@ -39,7 +39,7 @@ function onGenerateDemoData() {
<UiHeaderTitle>{{ t('settings.title') }}</UiHeaderTitle>
</UiHeader>
- <div class="pageWrapper bg-foreground-1 rounded-xl pt-4">
+ <div class="pageWrapper rounded-xl bg-foreground-1 pt-4">
<div>
<!-- Locale -->
<div class="pb-12">
@@ -80,21 +80,8 @@ function onGenerateDemoData() {
<UiTitle3 class="pb-2">
{{ t('user') }}
</UiTitle3>
- <div
- v-if="userStore.user"
- class="text-item-2 pb-4"
- >
- {{ userStore.user?.email }}
- </div>
- <UiElement
- insideClasses="bg-item-4 min-h-[44px] max-w-lg"
- @click="userStore.signOut"
- >
- <template #leftIcon>
- <Icon name="lucide:log-out" size="20" />
- </template>
- <div>{{ t('userLogout') }}</div>
- </UiElement>
+
+ <UserViewLogout />
</div>
<!-- Delete -->
@@ -102,7 +89,7 @@ function onGenerateDemoData() {
<UiTitle3 class="pb-2">
{{ t('settings.caution') }}
</UiTitle3>
- <div class="text-item-2 pb-4 text-xs leading-none">
+ <div class="pb-4 text-xs leading-none text-item-2">
{{ t('alerts.willDeleteEverything') }}
</div>
@@ -138,7 +125,7 @@ function onGenerateDemoData() {
<!-- About -->
<div class="pb-12">
{{ t('app.about') }}
- <div class="text-item-2 pt-4 text-xs">
+ <div class="pt-4 text-xs text-item-2">
{{ t('app.version') }} {{ version }}
</div>
</div>