Skip to content

A self-hosted media server and file management system

fix: personal view count tag is blank on small screens when not logged in

aminnausin70e3c934df29
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index 40156891..85ad67c1 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -2,7 +2,7 @@
import type { AxiosError } from 'axios';
import { computed, onMounted, ref, useTemplateRef, watch, nextTick } from 'vue';
-import { handleStorageURL, toTimeSpan, formatFileSize } from '@/service/util';
+import { handleStorageURL, toTimeSpan, formatFileSize, toPlural } from '@/service/util';
import { getMediaDateDescription } from '@/service/media/mediaFormatter';
import { runRegenerateStoryboard } from '@/service/media/storyboard';
import { handleEditFolderImages } from '@/service/folder/folderActions';
@@ -21,7 +21,7 @@ import { BadgeTag } from '@/components/cedar-ui/badge';
import { emitSeek } from '@/service/player/seekBus';
import { useRoute } from 'vue-router';
import { useAuth } from '@/composables/auth/useAuth';
-import { toast } from '@aminnausin/cedar-ui';
+import { cn, toast } from '@aminnausin/cedar-ui';
import EditFolderModal from '@/components/modals/EditFolderModal.vue';
import EditMediaModal from '@/components/modals/EditMediaModal.vue';
@@ -266,37 +266,41 @@ onMounted(() => {
</BasePopover>
<ul class="flex max-h-5 w-full flex-wrap gap-1 gap-y-4 overflow-clip [overflow-clip-margin:4px] *:*:shadow-sm **:flex **:items-center **:text-xs sm:hidden">
- <li>
- <BadgeTag :class="'meta-badge gap-0.5 pe-1'">
- <HoverCard
- v-if="personalViewCount"
- class="flex items-center gap-0.5"
- :content="`You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}`"
- >
- <template #trigger>
+ <template v-if="stateVideo.metadata">
+ <li>
+ <BadgeTag :class="cn('meta-badge gap-0.5', { 'pe-1': isAuthenticated && personalViewCount })">
+ <HoverCard
+ v-if="isAuthenticated"
+ class="flex items-center gap-0.5"
+ :content="personalViewCount ? `You've watched this ${personalViewCount} time${toPlural(personalViewCount)}` : `You haven't watched this yet`"
+ >
+ <template #trigger>
+ {{ views }}
+ <IconEye v-if="personalViewCount" class="size-4" />
+ </template>
+ </HoverCard>
+ <span v-else>
{{ views }}
- <IconEye class="size-4" />
+ </span>
+ </BadgeTag>
+ </li>
+
+ <li>
+ <HoverCard :class="'shadow-none!'">
+ <template #trigger>
+ <BadgeTag v-if="stateVideo.metadata.resolution_height" :label="stateVideo.metadata.resolution_height + 'p'" :class="'meta-badge shadow-sm'" />
+ <BadgeTag v-else :label="formatFileSize(stateVideo.file_size ?? 0)" :class="'meta-badge shadow-sm'" />
+ </template>
+ <template #content>
+ <p class="text-foreground-1" v-if="stateVideo.metadata.resolution_height">
+ Resolution: {{ `${stateVideo.metadata.resolution_width}x${stateVideo.metadata.resolution_height}` }}
+ </p>
+ <p class="text-foreground-1" v-if="stateVideo.file_size">Size: {{ formatFileSize(stateVideo.file_size) }}</p>
+ <p class="text-foreground-1">Codec: {{ stateVideo.metadata.codec ?? 'Unknown' }}</p>
</template>
</HoverCard>
- </BadgeTag>
- </li>
-
- <li v-if="stateVideo.metadata">
- <HoverCard :class="'shadow-none!'">
- <template #trigger>
- <BadgeTag v-if="stateVideo.metadata.resolution_height" :label="stateVideo.metadata.resolution_height + 'p'" :class="'meta-badge shadow-sm'" />
- <BadgeTag v-else :label="formatFileSize(stateVideo.file_size ?? 0)" :class="'meta-badge shadow-sm'" />
- </template>
- <template #content>
- <p class="text-foreground-1" v-if="stateVideo.metadata.resolution_height">
- Resolution: {{ `${stateVideo.metadata.resolution_width}x${stateVideo.metadata.resolution_height}` }}
- </p>
- <p class="text-foreground-1" v-if="stateVideo.file_size">Size: {{ formatFileSize(stateVideo.file_size) }}</p>
- <p class="text-foreground-1">Codec: {{ stateVideo.metadata.codec ?? 'Unknown' }}</p>
- </template>
- </HoverCard>
- </li>
-
+ </li>
+ </template>
<li v-if="stateVideo.file_modified_at">
<HoverCard :content="mediaDateDescription" :class="'shadow-none!'">
<template #trigger>