Skip to content

A self-hosted media server and file management system

feat: use cedar components on video cards and info panel

aminnausincfeac9d814e0
diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vue
index c5e2e56c..4b7a0673 100755
--- a/resources/js/components/cards/VideoCard.vue
+++ b/resources/js/components/cards/VideoCard.vue
@@ -13,7 +13,7 @@ import { MediaType } from '@/types/types';
import useMetaData from '@/composables/useMetaData';
import HoverCard from '@/components/cards/HoverCard.vue';
-import ChipTag from '@/components/labels/ChipTag.vue';
+import MediaTag from '@/components/labels/MediaTag.vue';
import TablerMicrophone2 from '~icons/tabler/microphone-2';
import ProiconsComment from '~icons/proicons/comment';
@@ -57,7 +57,7 @@ const contextMenuItems = computed(() => {
<template>
<RouterLink
- :class="{ 'ring-2 ring-violet-700': currentID === videoData.id }"
+ :class="{ 'ring-primary-active ring-2': currentID === videoData.id }"
:to="encodeURI(`/${stateDirectory.name}/${stateFolder.name}?video=${videoData.id}`)"
class="dark:bg-primary-dark-800/70 dark:odd:bg-primary-dark-600 relative flex w-full cursor-pointer flex-col flex-wrap gap-x-8 gap-y-4 rounded-md bg-neutral-50 p-3 shadow-sm ring-inset odd:bg-neutral-100 hover:bg-violet-400/30 dark:hover:bg-violet-700/70"
:videoData-id="videoData.id"
@@ -82,7 +82,7 @@ const contextMenuItems = computed(() => {
<h3 class="line-clamp-1 break-all" :title="`Title: ${videoData.title}${videoData.name !== videoData.title ? `\nFile: ${videoData.name}` : ''}`">
{{ title }}
</h3>
- <ProiconsComment class="my-auto ms-4 h-5 w-5 shrink-0 opacity-100 transition-opacity duration-300 group-hover:opacity-20" title="Description" />
+ <ProiconsComment class="my-auto ms-4 size-5 shrink-0 opacity-100 transition-opacity duration-300 group-hover:opacity-20" title="Description" />
</span>
</template>
</HoverCard>
@@ -97,11 +97,11 @@ const contextMenuItems = computed(() => {
:hover-card-leave-delay="300"
>
<template #trigger>
- <TablerMicrophone2 class="h-5 w-5 shrink-0 opacity-100 transition-opacity duration-300 *:stroke-[1.4px] hover:opacity-20" title="Has Lyrics" v-if="isAudio" />
+ <TablerMicrophone2 class="size-5 shrink-0 opacity-100 transition-opacity duration-300 *:stroke-[1.4px] hover:opacity-20" title="Has Lyrics" v-if="isAudio" />
</template>
</HoverCard>
- <span class="flex min-w-fit gap-1 truncate text-sm text-neutral-600 uppercase dark:text-neutral-400">
+ <span class="text-foreground-1 flex min-w-fit gap-1 truncate text-sm uppercase">
<h4 v-if="videoData.file_size" class="truncate text-nowrap" :title="`File Size: ${formatFileSize(videoData.file_size)}`">
{{ formatFileSize(videoData.file_size) }}
</h4>
@@ -118,7 +118,7 @@ const contextMenuItems = computed(() => {
</h4>
</span>
</section>
- <section class="group flex w-full flex-wrap items-start justify-between gap-x-4 gap-y-2 text-sm text-neutral-600 sm:w-auto dark:text-neutral-400">
+ <section class="group text-foreground-1 flex w-full flex-wrap items-start justify-between gap-x-4 gap-y-2 text-sm sm:w-auto">
<span class="flex w-full flex-1 items-center gap-2">
<span class="flex gap-1">
<h4 class="min-w-fit" :title="`View Count: ${views}`">
@@ -132,12 +132,7 @@ const contextMenuItems = computed(() => {
</span>
<span v-if="videoData.video_tags.length" class="hidden max-h-[22px] flex-1 flex-wrap gap-1 overflow-clip px-2 [overflow-clip-margin:4px] sm:flex" title="Tags">
- <ChipTag
- v-for="(tag, index) in videoData.video_tags"
- :key="index"
- :label="tag.name"
- :colour="'bg-neutral-200 leading-none text-neutral-500 shadow-sm dark:bg-neutral-900 hover:bg-violet-600 hover:text-neutral-50 dark:hover:bg-violet-600/90'"
- />
+ <MediaTag v-for="(tag, index) in videoData.video_tags" :key="index" :label="tag.name" />
</span>
</span>
@@ -149,12 +144,7 @@ const contextMenuItems = computed(() => {
</h4>
<span v-if="videoData.video_tags.length" class="flex w-full flex-wrap gap-1 overflow-clip [overflow-clip-margin:4px] sm:hidden" title="Tags">
- <ChipTag
- v-for="(tag, index) in videoData.video_tags"
- :key="index"
- :label="tag.name"
- :colour="'bg-neutral-200 leading-none text-neutral-500 shadow-sm dark:bg-neutral-900 hover:bg-violet-600 hover:text-neutral-50 dark:hover:bg-violet-600/90'"
- />
+ <MediaTag v-for="(tag, index) in videoData.video_tags" :key="index" :label="tag.name" />
</span>
</section>
</RouterLink>
diff --git a/resources/js/components/cards/sidebar/FolderCard.vue b/resources/js/components/cards/sidebar/FolderCard.vue
index 32b7224c..6de6f9e4 100644
--- a/resources/js/components/cards/sidebar/FolderCard.vue
+++ b/resources/js/components/cards/sidebar/FolderCard.vue
@@ -7,11 +7,11 @@ import { ButtonCorner } from '@/components/cedar-ui/button';
import { useAuthStore } from '@/stores/AuthStore';
import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
-import { BadgeTag } from '@/components/cedar-ui/badge';
import { computed } from 'vue';
import { cn } from '@aminnausin/cedar-ui';
import SidebarCard from '@/components/cards/sidebar/SidebarCard.vue';
+import MediaTag from '@/components/labels/MediaTag.vue';
import CircumFolderOn from '~icons/circum/folder-on';
import CircumShare1 from '~icons/circum/share-1';
@@ -122,18 +122,7 @@ const mediaType = computed(() => {
class="flex w-full flex-wrap gap-1 overflow-clip p-3 pt-0 transition-all group-hover:[overflow-clip-margin:4px] sm:max-h-0 sm:p-0 sm:group-hover:max-h-[26px] sm:group-hover:pt-1"
title="Tags"
>
- <BadgeTag
- v-for="(tag, index) in data.series.folder_tags"
- :key="index"
- :label="tag.name"
- :class="
- cn(
- 'dark:hover:bg-primary/90 dark:hover:text-foreground-0 dark:bg-neutral-900',
- 'hover:text-foreground-i text-foreground-7 hover:bg-primary bg-neutral-200',
- 'max-h-[22px]! leading-none shadow-sm select-none',
- )
- "
- />
+ <MediaTag v-for="(tag, index) in data.series.folder_tags" :key="index" :label="tag.name" />
</section>
</SidebarCard>
</template>
diff --git a/resources/js/components/cedar-ui/badge/BadgeTag.vue b/resources/js/components/cedar-ui/badge/BadgeTag.vue
index 626892b7..0498a8d9 100644
--- a/resources/js/components/cedar-ui/badge/BadgeTag.vue
+++ b/resources/js/components/cedar-ui/badge/BadgeTag.vue
@@ -20,10 +20,10 @@ const wrapperProps = computed(() => (props.URL ? { to: props.URL } : {}));
:is="wrapper"
:class="
cn(
- 'p-1 px-2 text-sm leading-none rounded-xl truncate lowercase text-foreground-4 bg-primary dark:bg-primary-dark shrink-0 transition-colors duration-300',
+ 'text-foreground-4 bg-primary dark:bg-primary-dark shrink-0 truncate rounded-xl p-1 px-2 text-sm leading-none lowercase transition-colors duration-200',
{
'cursor-default': props.URL,
- 'flex gap-1 items-center justify-between': removeable,
+ 'flex items-center justify-between gap-1': removeable,
},
props.class,
)
@@ -37,8 +37,8 @@ const wrapperProps = computed(() => (props.URL ? { to: props.URL } : {}));
:colourClasses="''"
:class="
cn(
- 'text-white hover:text-white hover:bg-danger-2',
- 'dark:text-danger-2 dark:hover:text-foreground bg-neutral-900/20 dark:hover:bg-danger-2 drop-shadow-sm',
+ 'hover:bg-danger-2 text-white hover:text-white',
+ 'dark:text-danger-2 dark:hover:text-foreground dark:hover:bg-danger-2 bg-neutral-900/20 drop-shadow-sm',
btnClass,
)
"
diff --git a/resources/js/components/labels/MediaTag.vue b/resources/js/components/labels/MediaTag.vue
new file mode 100644
index 00000000..ed16bfae
--- /dev/null
+++ b/resources/js/components/labels/MediaTag.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+import { BadgeTag } from '@/components/cedar-ui/badge';
+import { cn } from '@aminnausin/cedar-ui';
+const props = defineProps<{ class?: string }>();
+</script>
+<template>
+ <BadgeTag
+ :class="
+ cn(
+ 'dark:hover:bg-primary/90 dark:hover:text-foreground-0 dark:bg-neutral-900',
+ 'hover:text-foreground-i text-foreground-7 hover:bg-primary bg-neutral-200',
+ 'max-h-[22px]! leading-none shadow-sm select-none',
+ props.class,
+ )
+ "
+ v-bind="$attrs"
+ >
+ <slot />
+ </BadgeTag>
+</template>
diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vue
index 83ce5620..84f0ebef 100755
--- a/resources/js/components/video/VideoInfoPanel.vue
+++ b/resources/js/components/video/VideoInfoPanel.vue
@@ -1,10 +1,12 @@
<script setup lang="ts">
import { computed, onMounted, ref, useTemplateRef, watch, nextTick } from 'vue';
import { handleStorageURL, toFormattedDate, toTimeSpan } from '@/service/util';
+import { ButtonIcon, ButtonText } from '@/components/cedar-ui/button';
import { getUserViewCount } from '@/service/mediaAPI';
import { useContentStore } from '@/stores/ContentStore';
import { useAuthStore } from '@/stores/AuthStore';
import { storeToRefs } from 'pinia';
+import { BadgeTag } from '@/components/cedar-ui/badge';
import { emitSeek } from '@/service/player/seekBus';
import { useRoute } from 'vue-router';
@@ -13,13 +15,10 @@ import ContextMenuItem from '@/components/pinesUI/ContextMenuItem.vue';
import BasePopover from '@/components/pinesUI/BasePopover.vue';
import useMetaData from '@/composables/useMetaData';
import EditFolder from '@/components/forms/EditFolder.vue';
-import ButtonIcon from '@/components/inputs/ButtonIcon.vue';
-import ButtonText from '@/components/inputs/ButtonText.vue';
import ModalBase from '@/components/pinesUI/ModalBase.vue';
import EditVideo from '@/components/forms/EditVideo.vue';
import HoverCard from '@/components/cards/HoverCard.vue';
import useModal from '@/composables/useModal';
-import ChipTag from '@/components/labels/ChipTag.vue';
import ProiconsArrowDownload from '~icons/proicons/arrow-download';
import ProiconsMoreVertical from '~icons/proicons/more-vertical';
@@ -28,11 +27,10 @@ import ProiconsEye from '~icons/proicons/eye';
import CircumEdit from '~icons/circum/edit';
const defaultDescription = `No description yet.`;
-const showInfoAsChips = false;
-const { userData } = storeToRefs(useAuthStore());
const { updateVideoData, updateFolderData } = useContentStore();
const { stateVideo, stateFolder } = storeToRefs(useContentStore());
+const { userData } = storeToRefs(useAuthStore());
const descriptionRef = useTemplateRef('description');
const popover = useTemplateRef('popover');
@@ -97,7 +95,7 @@ watch(
},
);
-watch([() => stateVideo.value.description, () => isExpanded], () => {
+watch([() => stateVideo.value.description, () => isExpanded.value], () => {
nextTick(() => checkOverflow());
});
@@ -107,144 +105,127 @@ onMounted(() => {
</script>
<template>
- <section class="bg-primary-800 dark:bg-primary-dark-800/70 z-3 flex w-full flex-wrap gap-4 rounded-xl p-3 text-neutral-600 shadow-lg dark:text-neutral-400">
- <section id="mp4-header-mobile" class="flex w-full flex-wrap items-center gap-1 gap-x-2 sm:hidden">
+ <section class="bg-primary-800 dark:bg-primary-dark-800/70 text-foreground-0 z-3 flex w-full flex-wrap gap-4 rounded-xl p-3 text-sm shadow-lg" aria-labelledby="mp4-title">
+ <section id="mp4-header-mobile" aria-labelledby="mp4-title-mobile" class="flex w-full flex-wrap items-center gap-1 gap-x-2 sm:hidden">
<HoverCard :content="title ?? '[File Not Found]'" class="min-w-10 flex-1">
<template #trigger>
<h2
- :class="[
- 'truncate text-xl text-gray-900 capitalize dark:text-white',
- { 'my-auto h-5 w-full animate-pulse rounded-full bg-neutral-300 dark:bg-neutral-700': !stateVideo.id },
- ]"
+ id="mp4-title-mobile"
+ :class="['truncate text-xl capitalize', { 'my-auto h-5 w-full animate-pulse rounded-full bg-neutral-300 dark:bg-neutral-700': !stateVideo.id }]"
>
{{ !stateVideo.id ? '' : (title ?? '[File Not Found]') }}
</h2>
</template>
</HoverCard>
- <section :class="`contents text-gray-900 sm:hidden dark:text-white`">
- <BasePopover popoverClass="max-w-32! p-1! rounded-md! shadow-xs!" :vertical-offset-pixels="36" :buttonClass="'p-1! size-6! ml-auto mt-auto'" ref="popover">
- <template #buttonIcon>
- <ProiconsMoreVertical class="h-4 w-4" />
- </template>
- <template #content>
- <ContextMenuItem
- :icon="CircumEdit"
- :text="'Edit'"
- :action="
- () => {
- popover?.handleClose();
- editVideoModal.toggleModal();
- }
- "
- />
- <ContextMenuItem
- :icon="CircumShare1"
- :text="'Share'"
- :action="
- () => {
- popover?.handleClose();
- shareVideoModal.toggleModal();
- }
- "
- />
- <ContextMenuItem
- disabled
- :icon="ProiconsArrowDownload"
- :text="'Download'"
- :action="
- () => {
- popover?.handleClose();
- }
- "
- />
- </template>
- </BasePopover>
- </section>
-
- <span class="flex max-h-5 w-full flex-wrap gap-1 gap-y-4 overflow-clip text-sm [overflow-clip-margin:4px] sm:hidden">
- <span class="contents" v-if="showInfoAsChips || true">
- <ChipTag
- :class="'flex items-center gap-0.5'"
- :colour="'bg-neutral-800 opacity-70 hover:opacity-100 transition-opacity leading-none shadow-sm dark:bg-neutral-900 text-neutral-50 dark:hover:bg-neutral-600/90 max-h-[22px]! text-xs flex items-center'"
- >
- <template #content>
- {{ views }}
- <HoverCard :content="`You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}`">
- <template #trigger>
- <ProiconsEye
- class="h-4 w-4 scale-90 transition-all hover:scale-100 hover:text-neutral-400 dark:hover:text-white"
- v-if="personalViewCount > 0"
- />
- </template>
- </HoverCard>
- </template>
- </ChipTag>
-
- <ChipTag
- v-if="stateVideo?.metadata?.resolution_height"
- :label="stateVideo?.metadata?.resolution_height + 'p'"
- :colour="'bg-neutral-800 opacity-70 hover:opacity-100 transition-opacity leading-none shadow-sm dark:bg-neutral-900 text-neutral-50 dark:hover:bg-neutral-600/90 max-h-[22px]! text-xs flex items-center'"
+ <BasePopover
+ class="sm:hidden"
+ popoverClass="max-w-32! p-1! rounded-md! shadow-xs!"
+ :vertical-offset-pixels="36"
+ :buttonClass="'p-1! size-6! ml-auto mt-auto'"
+ ref="popover"
+ >
+ <template #buttonIcon>
+ <ProiconsMoreVertical class="h-4 w-4" />
+ </template>
+ <template #content>
+ <ContextMenuItem
+ :icon="CircumEdit"
+ :text="'Edit'"
+ :action="
+ () => {
+ popover?.handleClose();
+ editVideoModal.toggleModal();
+ }
+ "
+ />
+ <ContextMenuItem
+ :icon="CircumShare1"
+ :text="'Share'"
+ :action="
+ () => {
+ popover?.handleClose();
+ shareVideoModal.toggleModal();
+ }
+ "
/>
+ <ContextMenuItem
+ disabled
+ :icon="ProiconsArrowDownload"
+ :text="'Download'"
+ :action="
+ () => {
+ popover?.handleClose();
+ }
+ "
+ />
+ </template>
+ </BasePopover>
- <ChipTag
- v-if="stateVideo.date_uploaded"
+ <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 max-h-[22px]! gap-0.5'">
+ {{ views }}
+ <HoverCard :content="`You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}`">
+ <template #trigger>
+ <ProiconsEye class="size-4 scale-90 transition-all hover:scale-100 hover:text-neutral-400 dark:hover:text-white" v-if="personalViewCount > 0" />
+ </template>
+ </HoverCard>
+ </BadgeTag>
+ </li>
+
+ <li v-if="stateVideo?.metadata?.resolution_height">
+ <BadgeTag :label="stateVideo?.metadata?.resolution_height + 'p'" :class="'meta-badge'" />
+ </li>
+ <li v-if="stateVideo.date_uploaded">
+ <BadgeTag
:title="`Date Uploaded: ${toFormattedDate(new Date(stateVideo.date_uploaded))}\nDate Added: ${toFormattedDate(new Date(stateVideo.date_created))}`"
:label="toTimeSpan(stateVideo.date_uploaded, '')"
- :colour="'bg-neutral-800 opacity-70 hover:opacity-100 transition-opacity leading-none shadow-sm dark:bg-neutral-900 text-neutral-50 dark:hover:bg-neutral-600/90 max-h-[22px]! text-xs flex items-center'"
+ :class="'meta-badge'"
/>
+ </li>
- <ChipTag
- v-if="stateVideo.metadata?.codec"
- :title="`Media Codec: ${stateVideo.metadata?.codec}`"
- :label="stateVideo.metadata?.codec"
- :colour="' bg-neutral-800 opacity-70 hover:opacity-100 transition-opacity leading-none shadow-sm dark:bg-neutral-900 text-neutral-50 dark:hover:bg-neutral-600/90 max-h-[22px]! text-xs flex items-center'"
- />
- </span>
- </span>
+ <li v-if="stateVideo.metadata?.codec">
+ <BadgeTag :title="`Media Codec: ${stateVideo.metadata?.codec}`" :label="stateVideo.metadata?.codec" :class="'meta-badge uppercase'" />
+ </li>
+ </ul>
</section>
- <section id="mp4-folder-info" class="group xs:block aspect-2-3 relative hidden h-32 rounded-md object-cover shadow-md">
+ <div id="mp4-folder-info" class="group xs:block aspect-2-3 relative hidden h-32 rounded-md object-cover shadow-md">
<img
id="folder-thumbnail"
class="aspect-2-3 h-full rounded-md object-cover ring-1 ring-gray-900/5"
- :src="handleStorageURL(stateFolder?.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"
alt="Folder Cover Art"
fetchpriority="high"
+ :src="handleStorageURL(stateFolder?.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'"
/>
<ButtonIcon
v-if="userData"
- class="absolute right-1 bottom-1 h-8 opacity-0 shadow-md shadow-violet-700 transition-opacity duration-200 ease-in-out group-hover:opacity-100"
+ class="absolute right-1 bottom-1 size-6 p-0 opacity-0 shadow-md transition-opacity group-hover:opacity-100 focus:opacity-100"
title="Edit Folder Metadata"
- @click="
- () => {
- if (userData) editFolderModal.toggleModal();
- }
- "
+ @click="if (userData) editFolderModal.toggleModal();"
>
<template #icon>
<CircumEdit height="16" width="16" />
</template>
</ButtonIcon>
- </section>
- <section class="group flex w-full min-w-0 flex-1 flex-col gap-2">
- <section class="hidden justify-between gap-2 sm:flex">
+ </div>
+ <div class="group flex w-full min-w-0 flex-1 flex-col gap-2">
+ <header class="hidden justify-between gap-2 sm:flex">
<h2
id="mp4-title"
:class="[
- 'flex-1 truncate text-xl text-gray-900 capitalize dark:text-white',
+ 'flex-1 truncate text-xl capitalize',
{ 'my-auto h-5 animate-pulse rounded-full bg-neutral-300 dark:bg-neutral-700': !stateVideo.id },
{ 'h-8': stateVideo.id },
]"
- :title="title ?? 'no file was found at this location'"
+ :title="title ?? 'No file was found at this location'"
>
{{ !stateVideo.id ? '' : (title ?? '[File Not Found]') }}
</h2>
- <section class="flex h-8 w-fit justify-end gap-2 lg:min-w-32">
- <ButtonText v-if="userData" aria-label="edit details" title="Edit Metadata" @click="editVideoModal.toggleModal()" class="text-sm">
- <template #text>
- <p class="text-nowrap">Edit Metadata</p>
- </template>
+ <div class="flex h-8 w-fit justify-end gap-2 *:ring-inset lg:min-w-32">
+ <ButtonText v-if="userData" aria-label="edit details" title="Edit Metadata" @click="editVideoModal.toggleModal()">
+ <p class="text-nowrap">Edit Metadata</p>
</ButtonText>
<ButtonIcon aria-label="download" title="Download Video" class="hidden">
<template #icon>
@@ -256,16 +237,17 @@ onMounted(() => {
<CircumShare1 height="16" width="16" />
</template>
</ButtonIcon>
- </section>
- </section>
- <section :class="['flex w-full flex-1 flex-col justify-between gap-1', { 'max-h-32': !isExpanded }]">
+ </div>
+ </header>
+ <article :class="['text-foreground-1 flex w-full flex-1 flex-col justify-between gap-1', { 'max-h-32': !isExpanded }]">
<div
:class="[
- `scrollbar-minimal scrollbar-hover overflow-x-clip overflow-y-auto text-sm whitespace-pre-wrap`,
+ `scrollbar-minimal scrollbar-hover overflow-x-clip overflow-y-auto whitespace-pre-wrap`,
{ 'h-20 sm:h-10': !isExpanded && isOverflowing }, // h-16 and 2.5rem on big screens if show more button exists and not expanded
{ 'h-[102px] sm:h-15': !isOverflowing }, // otherwise, fill space... I think this makes sense?
]"
ref="description"
+ id="media-description"
>
<template v-if="stateVideo.description && parsedDescription">
<span v-for="(segment, i) in parsedDescription" :key="i">
@@ -273,7 +255,7 @@ onMounted(() => {
<a
:href="`?video=${stateVideo.id}&t=${segment.seconds}`"
@click.prevent="handleSeek(segment.seconds)"
- class="text-purple-600 hover:underline dark:text-white"
+ class="text-primary dark:text-foreground-0 hover:underline"
:title="`Seek to ${segment.seconds}`"
>
{{ segment.raw }}
@@ -288,16 +270,19 @@ onMounted(() => {
{{ defaultDescription }}
</template>
</div>
- <button
+ <ButtonText
v-if="isOverflowing || isExpanded"
@click="isExpanded = !isExpanded"
- :class="['text-left text-sm transition-colors duration-300 hover:text-gray-900 dark:hover:text-white', { 'leading-none': !isExpanded }]"
+ :class="['hocus:text-foreground-0 block h-auto w-fit p-0 transition-colors', { 'leading-none': !isExpanded }]"
:title="isExpanded ? 'Hide expanded description' : 'Show expanded description'"
+ :variant="'ghost'"
+ :aria-expanded="isExpanded"
+ aria-controls="media-description"
>
{{ isExpanded ? 'Show less' : '...more' }}
- </button>
- <span class="flex w-full flex-1 items-end justify-between gap-2 text-sm">
- <span class="hidden h-[22px] items-center justify-start gap-1 truncate sm:flex">
+ </ButtonText>
+ <div class="flex w-full flex-1 items-end justify-between gap-2">
+ <div class="hidden h-[22px] items-center justify-start gap-1 truncate sm:flex">
<p class="lowercase">{{ views }}</p>
<HoverCard :content="`You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}`">
@@ -316,7 +301,6 @@ onMounted(() => {
</template>
</HoverCard>
</template>
- <template> </template>
<template v-if="stateVideo.date_uploaded">
<p>|</p>
<p
@@ -326,18 +310,18 @@ onMounted(() => {
{{ toTimeSpan(stateVideo.date_uploaded, '') }}
</p>
</template>
- </span>
- <section class="flex max-h-[22px] max-w-full flex-wrap justify-end gap-1 overflow-clip text-end text-sm [overflow-clip-margin:4px]">
- <ChipTag v-for="(tag, index) in stateVideo?.video_tags" :key="index" :label="tag.name" />
- </section>
- </span>
- </section>
- </section>
+ </div>
+ <div class="flex max-h-[22px] max-w-full flex-wrap justify-end gap-1 overflow-clip text-end [overflow-clip-margin:4px]">
+ <BadgeTag v-for="(tag, index) in stateVideo?.video_tags" :key="index" :label="tag.name" />
+ </div>
+ </div>
+ </article>
+ </div>
</section>
<ModalBase :modalData="editFolderModal" :useControls="false">
<template #description v-if="stateFolder.series?.editor_id && stateFolder.series.date_updated">
Last edited by
- <a title="Editor profile" target="_blank" :href="`/profile/${stateFolder.series.editor_id}`" class="hover:text-purple-600 dark:hover:text-purple-500"
+ <a title="Editor profile" target="_blank" :href="`/profile/${stateFolder.series.editor_id}`" class="hover:text-primary dark:hover:text-primary-muted"
>@{{ stateFolder.series.editor_id }}</a
>
at
@@ -350,7 +334,7 @@ onMounted(() => {
<ModalBase :modalData="editVideoModal" :useControls="false">
<template #description v-if="stateVideo.metadata?.editor_id && stateVideo.metadata.updated_at">
Last edited by
- <a title="Editor profile" target="_blank" :href="`/profile/${stateVideo.metadata.editor_id}`" class="hover:text-purple-600 dark:hover:text-purple-500">
+ <a title="Editor profile" target="_blank" :href="`/profile/${stateVideo.metadata.editor_id}`" class="hover:text-primary dark:hover:text-primary-muted">
@{{ stateVideo.metadata.editor_id }}
</a>
at
@@ -392,3 +376,10 @@ onMounted(() => {
display: none;
}
</style>
+
+<style lang="css" scoped>
+@reference "../../../css/app.css";
+.meta-badge {
+ @apply bg-neutral-800 opacity-70 transition-opacity hover:text-white hover:opacity-100 dark:bg-neutral-900 dark:hover:bg-neutral-600/90;
+}
+</style>