Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

refactor(upload queue): remove footer stats and update button layout in UploadQueuePanel

Ahmet Ömer410aee9e1ea5
diff --git a/app/components/ui/UploadQueuePanel.vue b/app/components/ui/UploadQueuePanel.vue
index ebdbce33..39f5d466 100644
--- a/app/components/ui/UploadQueuePanel.vue
+++ b/app/components/ui/UploadQueuePanel.vue
@@ -67,35 +67,6 @@ const stats = computed(() => {
}
})
-const footerStats = computed(() =>
- [
- {
- key: 'completed',
- count: stats.value.completed,
- icon: 'tabler:circle-check',
- class: 'bg-green-500/10 text-green-600 dark:text-green-400',
- },
- {
- key: 'error',
- count: stats.value.error,
- icon: 'tabler:circle-x',
- class: 'bg-red-500/10 text-red-600 dark:text-red-400',
- },
- {
- key: 'skipped',
- count: stats.value.skipped,
- icon: 'tabler:player-skip-forward',
- class: 'bg-yellow-500/10 text-yellow-600 dark:text-yellow-400',
- },
- {
- key: 'blocked',
- count: stats.value.blocked,
- icon: 'tabler:ban',
- class: 'bg-red-500/10 text-red-600 dark:text-red-400',
- },
- ].filter((chip) => chip.count > 0),
-)
-
// 计算整体进度
const overallProgress = computed(() => {
const files = Array.from(props.uploadingFiles.values())
@@ -336,65 +307,43 @@ const clearAllFiles = () => {
style="transform-origin: bottom"
class="p-3 border-t border-neutral-200 dark:border-neutral-700 bg-neutral-50 dark:bg-neutral-800/50"
>
- <div class="flex flex-col gap-3">
- <div
- class="flex flex-wrap items-center justify-center gap-1.5"
- role="status"
- :aria-label="$t('dashboard.photos.uploadQueuePanel.summary', { completed: stats.completed, error: stats.error, skipped: stats.skipped, blocked: stats.blocked })"
+ <div class="flex items-stretch gap-1.5">
+ <UButton
+ v-if="stats.completed > 0"
+ size="xs"
+ variant="soft"
+ color="neutral"
+ icon="tabler:clear-all"
+ block
+ class="flex-1 min-w-0 py-2"
+ @click="clearCompletedFiles"
>
- <span
- v-for="chip in footerStats"
- :key="chip.key"
- class="inline-flex items-center gap-1 h-6 px-2 rounded-md text-xs font-medium tabular-nums"
- :class="chip.class"
- aria-hidden="true"
- >
- <Icon
- :name="chip.icon"
- class="size-3.5"
- />
- {{ chip.count }} {{ $t(`dashboard.photos.uploadQueuePanel.stats.${chip.key}`) }}
- </span>
- </div>
-
- <div class="flex items-stretch gap-1.5">
- <UButton
- v-if="stats.completed > 0"
- size="xs"
- variant="soft"
- color="neutral"
- icon="tabler:clear-all"
- block
- class="flex-1 min-w-0"
- @click="clearCompletedFiles"
- >
- {{ $t('dashboard.photos.uploadQueuePanel.actions.clearCompleted') }}
- </UButton>
+ {{ $t('dashboard.photos.uploadQueuePanel.actions.clearCompleted') }}
+ </UButton>
- <UButton
- size="xs"
- variant="soft"
- color="error"
- icon="tabler:trash"
- block
- class="flex-1 min-w-0"
- @click="clearAllFiles"
- >
- {{ $t('dashboard.photos.uploadQueuePanel.actions.clearAll') }}
- </UButton>
+ <UButton
+ size="xs"
+ variant="soft"
+ color="error"
+ icon="tabler:trash"
+ block
+ class="flex-1 min-w-0 py-2"
+ @click="clearAllFiles"
+ >
+ {{ $t('dashboard.photos.uploadQueuePanel.actions.clearAll') }}
+ </UButton>
- <UButton
- size="xs"
- variant="soft"
- color="info"
- icon="tabler:list-check"
- block
- class="flex-1 min-w-0"
- @click="emit('goToQueue')"
- >
- {{ $t('dashboard.photos.uploadQueuePanel.actions.goToQueue') }}
- </UButton>
- </div>
+ <UButton
+ size="xs"
+ variant="soft"
+ color="info"
+ icon="tabler:list-check"
+ block
+ class="flex-1 min-w-0 py-2"
+ @click="emit('goToQueue')"
+ >
+ {{ $t('dashboard.photos.uploadQueuePanel.actions.goToQueue') }}
+ </UButton>
</div>
</motion.div>
</AnimatePresence>
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index 22fa5dea..c7a09958 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -835,7 +835,6 @@
"skipped": "skipped",
"blocked": "blocked"
},
- "summary": "{completed} completed, {error} failed, {skipped} skipped, {blocked} blocked",
"actions": {
"clearCompleted": "Clear Completed",
"clearAll": "Clear All",
diff --git a/i18n/locales/ja.json b/i18n/locales/ja.json
index af253cac..689465b6 100644
--- a/i18n/locales/ja.json
+++ b/i18n/locales/ja.json
@@ -761,7 +761,6 @@
"skipped": "スキップ",
"blocked": "ブロック"
},
- "summary": "{completed} 完了, {error} 失敗, {skipped} スキップ, {blocked} ブロック",
"actions": {
"clearCompleted": "完了済みを削除",
"clearAll": "すべて削除",
diff --git a/i18n/locales/ru.json b/i18n/locales/ru.json
index bdcaf967..328ecb5e 100644
--- a/i18n/locales/ru.json
+++ b/i18n/locales/ru.json
@@ -834,7 +834,6 @@
"skipped": "пропущены",
"blocked": "заблокированы"
},
- "summary": "Завершено: {completed}, с ошибкой: {error}, пропущено: {skipped}, заблокировано: {blocked}",
"actions": {
"clearCompleted": "Удалить завершённые",
"clearAll": "Удалить все",
diff --git a/i18n/locales/zh-Hans.json b/i18n/locales/zh-Hans.json
index 53c8cb14..f5bdd473 100644
--- a/i18n/locales/zh-Hans.json
+++ b/i18n/locales/zh-Hans.json
@@ -835,7 +835,6 @@
"skipped": "跳过",
"blocked": "被阻止"
},
- "summary": "{completed} 完成, {error} 失败, {skipped} 跳过, {blocked} 阻止",
"actions": {
"clearCompleted": "清除已完成",
"clearAll": "清除全部",
diff --git a/i18n/locales/zh-Hant-HK.json b/i18n/locales/zh-Hant-HK.json
index cad09b25..9ded0079 100644
--- a/i18n/locales/zh-Hant-HK.json
+++ b/i18n/locales/zh-Hant-HK.json
@@ -761,7 +761,6 @@
"skipped": "跳過",
"blocked": "被阻止"
},
- "summary": "{completed} 完成, {error} 失敗, {skipped} 跳過, {blocked} 阻止",
"actions": {
"clearCompleted": "清除已完成",
"clearAll": "清除全部",
diff --git a/i18n/locales/zh-Hant-TW.json b/i18n/locales/zh-Hant-TW.json
index 4bf9e15f..cd7b441d 100644
--- a/i18n/locales/zh-Hant-TW.json
+++ b/i18n/locales/zh-Hant-TW.json
@@ -761,7 +761,6 @@
"skipped": "跳過",
"blocked": "被阻止"
},
- "summary": "{completed} 完成, {error} 失敗, {skipped} 跳過, {blocked} 阻止",
"actions": {
"clearCompleted": "清除已完成",
"clearAll": "清除全部",