Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.
TypeScript albumsexif-extractiongeocodinglive-photomotion-photophoto-galleryphoto-sharingwebgl-viewer
fix: address second round of review comments (remove invalid prop, fix translation inconsistency)
懒羊羊喝咖啡69e725e6cb8c
diff --git a/app/pages/dashboard/settings/storage.vue b/app/pages/dashboard/settings/storage.vueindex 2ec5eeb2..70108258 100644--- a/app/pages/dashboard/settings/storage.vue+++ b/app/pages/dashboard/settings/storage.vue@@ -26,10 +26,9 @@ const {data: availableStorage,refresh: refreshAvailableStorage,status: availableStorageStatus,-} =- await useFetch<SettingStorageProvider[]>(- '/api/system/settings/storage-config',- )+} = await useFetch<SettingStorageProvider[]>(+ '/api/system/settings/storage-config',+)const PROVIDER_ICON = {s3: 'tabler:brand-aws',@@ -39,62 +38,65 @@ const PROVIDER_ICON = {const availableStorageColumns = computed<TableColumn<SettingStorageProvider>[]>(() => [- {- accessorKey: 'status',- header: '',- meta: {- class: {- th: 'w-10',+ {+ accessorKey: 'status',+ header: '',+ meta: {+ class: {+ th: 'w-10',+ },+ },+ cell: (cell) => {+ const isActive =+ currentStorageProvider.value?.value === cell.row.original.id+ return h(UChip, {+ size: 'md',+ inset: true,+ standalone: true,+ color: isActive ? 'success' : undefined,+ ui: {+ base: !isActive ? 'bg-neutral-200 dark:bg-neutral-700' : '',+ },+ })},},- cell: (cell) => {- const isActive =- currentStorageProvider.value?.value === cell.row.original.id- return h(UChip, {- size: 'md',- inset: true,- standalone: true,- color: isActive ? 'success' : undefined,- ui: {- base: !isActive ? 'bg-neutral-200 dark:bg-neutral-700' : '',- },- })+ { accessorKey: 'name', header: $t('settings.storage.table.columns.name') },+ {+ accessorKey: 'provider',+ header: $t('settings.storage.table.columns.type'),},- },- { accessorKey: 'name', header: $t('settings.storage.table.columns.name') },- { accessorKey: 'provider', header: $t('settings.storage.table.columns.type') },- {- accessorKey: 'actions',- header: $t('settings.storage.table.columns.actions'),- cell: (cell) => {- return h('div', { class: 'flex items-center gap-2' }, [- h(- UButton,- {- size: 'sm',- variant: 'soft',- color: 'info',- icon: 'tabler:pencil',- onClick: () => onStorageEdit(cell.row.original),- },- { default: () => $t('common.actions.edit') },- ),- h(- UButton,- {- size: 'sm',- variant: 'soft',- color: 'error',- icon: 'tabler:trash',- disabled:- currentStorageProvider.value?.value === cell.row.original.id,- onClick: () => openStorageDeleteConfirm(cell.row.original),- },- { default: () => $t('common.actions.delete') },- ),- ])+ {+ accessorKey: 'actions',+ header: $t('settings.storage.table.columns.actions'),+ cell: (cell) => {+ return h('div', { class: 'flex items-center gap-2' }, [+ h(+ UButton,+ {+ size: 'sm',+ variant: 'soft',+ color: 'info',+ icon: 'tabler:pencil',+ onClick: () => onStorageEdit(cell.row.original),+ },+ { default: () => $t('common.actions.edit') },+ ),+ h(+ UButton,+ {+ size: 'sm',+ variant: 'soft',+ color: 'error',+ icon: 'tabler:trash',+ disabled:+ currentStorageProvider.value?.value === cell.row.original.id,+ onClick: () => openStorageDeleteConfirm(cell.row.original),+ },+ { default: () => $t('common.actions.delete') },+ ),+ ])+ },},- },],)@@ -107,7 +109,9 @@ const storageSettingsState = reactive<{})const isStorageDefaultDirty = computed(() => {- return storageSettingsState.storageConfigId !== currentStorageProvider.value?.value+ return (+ storageSettingsState.storageConfigId !== currentStorageProvider.value?.value+ )})const resetStorageDefault = () => {@@ -140,23 +144,23 @@ const handleStorageSettingsSubmit = async (close?: () => void) => {}const providerOptions = computed(() => [- { label: $t('settings.storage.providers.s3'), value: 's3', icon: PROVIDER_ICON.s3 },- { label: $t('settings.storage.providers.local'), value: 'local', icon: PROVIDER_ICON.local },- { label: $t('settings.storage.providers.openlist'), value: 'openlist', icon: PROVIDER_ICON.openlist },+ {+ label: $t('settings.storage.providers.s3'),+ value: 's3',+ icon: PROVIDER_ICON.s3,+ },+ {+ label: $t('settings.storage.providers.local'),+ value: 'local',+ icon: PROVIDER_ICON.local,+ },+ {+ label: $t('settings.storage.providers.openlist'),+ value: 'openlist',+ icon: PROVIDER_ICON.openlist,+ },])-// Translate zod validation error messages-const translateStorageError = (message: string, name?: string): string => {- const field = name || ''- if (message.includes('expected string, received undefined')) {- return t('settings.storage.form.isrequired', { field })- }- if (message.includes('Too small') || message.includes('too_small') || message.includes('at least 1 character')) {- return t('settings.storage.form.isrequired', { field })- }- return message-}-const storageConfigState = reactive<{name: stringprovider: string@@ -397,7 +401,9 @@ const onStorageConfigSubmit = async (close?: () => void,) => {if (!storageConfigState.name.trim()) {- nameError.value = t('settings.storage.form.isrequired', { field: t('settings.storage.form.nameLabel') })+ nameError.value = t('settings.storage.form.isrequired', {+ field: t('settings.storage.form.nameLabel'),+ })return}nameError.value = ''@@ -474,7 +480,9 @@ const onStorageConfigUpdate = async () => {if (!editingStorage.value) returnif (!storageConfigState.name.trim()) {- nameError.value = t('settings.storage.form.isrequired', { field: t('settings.storage.form.nameLabel') })+ nameError.value = t('settings.storage.form.isrequired', {+ field: t('settings.storage.form.nameLabel'),+ })return}nameError.value = ''@@ -485,10 +493,13 @@ const onStorageConfigUpdate = async (config: event.data,}- await $fetch(`/api/system/settings/storage-config/${editingStorage.value.id}`, {- method: 'PUT',- body: payload,- })+ await $fetch(+ `/api/system/settings/storage-config/${editingStorage.value.id}`,+ {+ method: 'PUT',+ body: payload,+ },+ )refreshAvailableStorage()refreshCurrentStorageProvider()toast.add({@@ -521,8 +532,12 @@ const resetStorageConfigForm = () => {<template #body><div class="mx-auto w-full max-w-5xl space-y-6">- <section class="space-y-2 border-b border-neutral-200 pb-4 dark:border-neutral-800">- <h2 class="text-xl font-semibold text-neutral-900 dark:text-neutral-100">+ <section+ class="space-y-2 border-b border-neutral-200 pb-4 dark:border-neutral-800"+ >+ <h2+ class="text-xl font-semibold text-neutral-900 dark:text-neutral-100"+ >{{ $t('title.storageSettings') }}</h2><p class="text-sm text-neutral-600 dark:text-neutral-400">@@ -530,9 +545,15 @@ const resetStorageConfigForm = () => {</p></section>- <section class="rounded-md border border-neutral-200 bg-white dark:border-neutral-800 dark:bg-neutral-950">- <header class="border-b border-neutral-200 px-5 py-4 dark:border-neutral-800">- <h3 class="text-base font-semibold text-neutral-900 dark:text-neutral-100">+ <section+ class="rounded-md border border-neutral-200 bg-white dark:border-neutral-800 dark:bg-neutral-950"+ >+ <header+ class="border-b border-neutral-200 px-5 py-4 dark:border-neutral-800"+ >+ <h3+ class="text-base font-semibold text-neutral-900 dark:text-neutral-100"+ >{{ $t('settings.storage.sections.currentDefault') }}</h3></header>@@ -581,7 +602,9 @@ const resetStorageConfigForm = () => {</UFormField></div>- <footer class="border-t border-neutral-200 px-5 py-4 dark:border-neutral-800">+ <footer+ class="border-t border-neutral-200 px-5 py-4 dark:border-neutral-800"+ ><divv-if="isStorageDefaultDirty"class="mb-3 rounded-md border border-warning-200 bg-warning-50 px-3 py-2 text-sm text-warning-800 dark:border-warning-900/60 dark:bg-warning-950/30 dark:text-warning-200"@@ -614,7 +637,9 @@ const resetStorageConfigForm = () => {color="neutral"variant="subtle":title="$t('settings.storage.changeModal.alertTitle')"- :description="$t('settings.storage.changeModal.alertDescription')"+ :description="+ $t('settings.storage.changeModal.alertDescription')+ "icon="tabler:arrows-exchange"/></template>@@ -640,9 +665,15 @@ const resetStorageConfigForm = () => {</footer></section>- <section class="rounded-md border border-neutral-200 bg-white dark:border-neutral-800 dark:bg-neutral-950">- <header class="flex w-full items-center justify-between border-b border-neutral-200 px-5 py-4 dark:border-neutral-800">- <h3 class="text-base font-semibold text-neutral-900 dark:text-neutral-100">+ <section+ class="rounded-md border border-neutral-200 bg-white dark:border-neutral-800 dark:bg-neutral-950"+ >+ <header+ class="flex w-full items-center justify-between border-b border-neutral-200 px-5 py-4 dark:border-neutral-800"+ >+ <h3+ class="text-base font-semibold text-neutral-900 dark:text-neutral-100"+ >{{ $t('settings.storage.sections.management') }}</h3><div>@@ -679,7 +710,9 @@ const resetStorageConfigForm = () => {:items="providerOptions"label-key="label"value-key="value"- :placeholder="$t('settings.storage.form.typePlaceholder')"+ :placeholder="+ $t('settings.storage.form.typePlaceholder')+ "@update:model-value="(val: string) => {storageConfigState.provider = val@@ -698,7 +731,10 @@ const resetStorageConfigForm = () => {container: 'sm:max-w-full',}">- <UInput v-model="storageConfigState.name" @update:model-value="nameError = ''" />+ <UInput+ v-model="storageConfigState.name"+ @update:model-value="nameError = ''"+ /></UFormField><AlbumProtectionWarning@@ -712,7 +748,6 @@ const resetStorageConfigForm = () => {:schema="currentStorageSchema":state="storageConfigState.config":fields-config="storageFieldsConfig"- :translate-error="translateStorageError"@submit="onStorageConfigSubmit($event, close)"/></div>@@ -795,7 +830,10 @@ const resetStorageConfigForm = () => {container: 'sm:max-w-full',}">- <UInput v-model="storageConfigState.name" @update:model-value="nameError = ''" />+ <UInput+ v-model="storageConfigState.name"+ @update:model-value="nameError = ''"+ /></UFormField><USeparator />@@ -805,7 +843,6 @@ const resetStorageConfigForm = () => {:schema="currentStorageSchema":state="storageConfigState.config":fields-config="storageFieldsConfig"- :translate-error="translateStorageError"@submit="onStorageConfigUpdate($event, close)"/></div>@@ -845,7 +882,9 @@ const resetStorageConfigForm = () => {<span>{{ $t('settings.storage.deleteModal.title') }}</span></template><template #body>- <p class="text-sm leading-relaxed text-neutral-500 dark:text-neutral-400">+ <p+ class="text-sm leading-relaxed text-neutral-500 dark:text-neutral-400"+ >{{$t('settings.storage.deleteModal.message', {name: storagePendingDelete?.name,diff --git a/app/pages/onboarding/admin.vue b/app/pages/onboarding/admin.vueindex 761276e3..2e743966 100644--- a/app/pages/onboarding/admin.vue+++ b/app/pages/onboarding/admin.vue@@ -28,7 +28,9 @@ const schema = zusername: z.string().min(2, $t('onboarding.admin.invalidUsername')),email: z.email($t('onboarding.admin.invalidEmail')),password: z.string().min(6, $t('onboarding.admin.invalidPassword')),- confirmPassword: z.string().min(6, $t('onboarding.admin.invalidConfirmPassword')),+ confirmPassword: z+ .string()+ .min(6, $t('onboarding.admin.invalidConfirmPassword')),}).refine((data) => data.password === data.confirmPassword, {message: $t('onboarding.admin.passwordMismatch'),@@ -87,7 +89,8 @@ function onSubmit() {<template #actions><WizardButtonto="/onboarding"- color="outline"+ variant="outline"+ color="primary"size="lg"leading-icon="tabler:arrow-left">diff --git a/app/pages/onboarding/map.vue b/app/pages/onboarding/map.vueindex e28504f7..878a14db 100644--- a/app/pages/onboarding/map.vue+++ b/app/pages/onboarding/map.vue@@ -121,7 +121,8 @@ function onSubmit() {<template #actions><WizardButtonto="/onboarding/storage"- color="outline"+ variant="outline"+ color="primary"size="lg"leading-icon="tabler:arrow-left">diff --git a/app/pages/onboarding/site.vue b/app/pages/onboarding/site.vueindex 013c425d..9f8fdb17 100644--- a/app/pages/onboarding/site.vue+++ b/app/pages/onboarding/site.vue@@ -25,7 +25,11 @@ const schema = z.object({title: z.string().min(1, $t('onboarding.site.invalidTitle')),slogan: z.string().optional(),author: z.string().optional(),- avatarUrl: z.string().url($t('onboarding.site.invalidAvatarUrl')).optional().or(z.literal('')),+ avatarUrl: z+ .string()+ .url($t('onboarding.site.invalidAvatarUrl'))+ .optional()+ .or(z.literal('')),})function onSubmit() {@@ -93,7 +97,8 @@ function onSubmit() {<template #actions><WizardButtonto="/onboarding/admin"- color="outline"+ variant="outline"+ color="primary"size="lg"leading-icon="tabler:arrow-left">diff --git a/app/pages/onboarding/storage.vue b/app/pages/onboarding/storage.vueindex af47efb6..409bc6fa 100644--- a/app/pages/onboarding/storage.vue+++ b/app/pages/onboarding/storage.vue@@ -62,7 +62,11 @@ const schema = computed(() => {if (field.ui.required) {validator = z.string().url($t('onboarding.storage.invalidUrl'))} else {- validator = z.string().url($t('onboarding.storage.invalidUrl')).optional().or(z.literal(''))+ validator = z+ .string()+ .url($t('onboarding.storage.invalidUrl'))+ .optional()+ .or(z.literal(''))}}@@ -154,7 +158,8 @@ function onSubmit() {<template #actions><WizardButtonto="/onboarding/site"- color="outline"+ variant="outline"+ color="primary"size="lg"leading-icon="tabler:arrow-left">diff --git a/i18n/locales/ru.json b/i18n/locales/ru.jsonindex 76b69e83..c659e748 100644--- a/i18n/locales/ru.json+++ b/i18n/locales/ru.json@@ -1555,7 +1555,7 @@"site": {"title": "Сведения о сайте","description": "Настройте основную информацию о сайте",- "invalidTitle": "Название сайта должно содержать хотя бы 2 символа",+ "invalidTitle": "Название сайта должно содержать хотя бы 1 символа","invalidAvatarUrl": "Невалидный адрес аватара URL"},"storage": {diff --git a/i18n/locales/zh-Hant-HK.json b/i18n/locales/zh-Hant-HK.jsonindex c68fdb8c..b896b5a3 100644--- a/i18n/locales/zh-Hant-HK.json+++ b/i18n/locales/zh-Hant-HK.json@@ -1481,7 +1481,7 @@"site": {"title": "站點資訊","description": "設定站點基本資訊",- "invalidTitle": "站點標題必須包含至少2個字元",+ "invalidTitle": "站點標題必須包含至少1個字元","invalidAvatarUrl": "無效的頭像 URL"},"storage": {diff --git a/i18n/locales/zh-Hant-TW.json b/i18n/locales/zh-Hant-TW.jsonindex 752aea24..352c36b3 100644--- a/i18n/locales/zh-Hant-TW.json+++ b/i18n/locales/zh-Hant-TW.json@@ -1481,7 +1481,7 @@"site": {"title": "站點資訊","description": "設定站點基本資訊",- "invalidTitle": "站點標題必須包含至少2個字元",+ "invalidTitle": "站點標題必須包含至少1個字元","invalidAvatarUrl": "無效的頭像 URL"},"storage": {