A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: home cards scale poorly based on type
aminnausinf62f5a37d2a3
diff --git a/resources/js/components/cards/data/BrowseFolderCard.vue b/resources/js/components/cards/data/BrowseFolderCard.vueindex c6ecf3c5..a9df651f 100644--- a/resources/js/components/cards/data/BrowseFolderCard.vue+++ b/resources/js/components/cards/data/BrowseFolderCard.vue@@ -2,6 +2,7 @@import type { FolderResource } from '@/contracts/media';import { handleStorageURL } from '@/service/util';+import { FLAGS } from '@/config/featureFlags';import { cn } from '@aminnausin/cedar-ui';import PlayerOSDBase from '@/components/video/OSD/PlayerOSDBase.vue';@@ -12,8 +13,17 @@ import IconFolder from '@/components/icons/IconFolder.vue';defineProps<{ folder: FolderResource }>();</script><template>- <RouterLink :to="`/${folder.category_id}/${folder.id}`" class="group flex w-40 shrink-0 snap-start flex-col gap-2">- <div class="relative overflow-clip rounded-md shadow-sm">+ <RouterLink+ :to="`/${folder.category_id}/${folder.id}`"+ :class="+ cn(+ 'group data-card flex w-40 shrink-0 snap-start flex-col gap-2 rounded-md',+ { 'rounded-none bg-transparent shadow-none': FLAGS.USE_TRANSPARENT_HOME_CARDS },+ $attrs.class,+ )+ "+ >+ <div :class="cn('relative overflow-clip rounded-t-md shadow-sm', { 'rounded-b-md': FLAGS.USE_TRANSPARENT_HOME_CARDS })"><LazyImage:src="folder.series?.poster_image?.path ?? handleStorageURL(folder.series?.thumbnail_url) ?? '/storage/thumbnails/default.webp'":class="'aspect-2-3 w-full object-cover'"@@ -40,7 +50,7 @@ defineProps<{ folder: FolderResource }>();</div></slot></div>- <div class="flex w-full flex-col text-xs">+ <div :class="cn('flex w-full flex-col px-2 pb-2 text-xs', { 'p-0': FLAGS.USE_TRANSPARENT_HOME_CARDS })"><slot name="title"><p class="truncate">{{ folder.title }}</p></slot>diff --git a/resources/js/components/cards/data/BrowseMediaCard.vue b/resources/js/components/cards/data/BrowseMediaCard.vueindex 5f73421e..955d95ea 100644--- a/resources/js/components/cards/data/BrowseMediaCard.vue+++ b/resources/js/components/cards/data/BrowseMediaCard.vue@@ -3,6 +3,7 @@ import type { VideoResource } from '@/contracts/media';import { MediaType } from '@/types/types';import { computed } from 'vue';+import { FLAGS } from '@/config/featureFlags';import { cn } from '@aminnausin/cedar-ui';import PlayerOSDBase from '@/components/video/OSD/PlayerOSDBase.vue';@@ -10,7 +11,7 @@ import VideoPreview from '@/components/video/VideoPreview.vue';import CircumPlay1 from '~icons/circum/play-1';-const props = defineProps<{ video: VideoResource }>();+const props = defineProps<{ video: VideoResource; forceAudio?: boolean }>();const mediaUrl = computed(() => {if (!props.video.url) return '/';@@ -28,17 +29,26 @@ const mediaUrl = computed(() => {<template><RouterLink:to="mediaUrl"- :class="cn('group relative flex flex-col gap-2', 'max-w-56 focus-within:outline-none', 'data-card hover:data-card-hover', 'bg-transparent shadow-none')"+ :class="+ cn(+ 'group relative flex flex-col gap-2',+ 'focus-within:outline-none',+ 'data-card hover:data-card-hover',+ 'w-56 shrink-0 rounded-md',+ { 'rounded-none bg-transparent shadow-none': FLAGS.USE_TRANSPARENT_HOME_CARDS },+ $attrs.class,+ )+ ">- <div class="relative overflow-clip rounded-md shadow-sm">+ <div :class="cn('relative overflow-clip rounded-t-md shadow-sm', { 'rounded-b-md': FLAGS.USE_TRANSPARENT_HOME_CARDS })"><VideoPreview:data="video":data-active="false":poster-url="video.metadata?.poster_image?.path":is-audio="video.metadata?.media_type === MediaType.AUDIO"- :is-folder-majority-audio="false"- :class="cn('h-auto shrink-0', video.metadata?.media_type === MediaType.AUDIO ? 'w-56' : 'w-56')"- :wrapper-class="'peer aspect-video'"+ :is-folder-majority-audio="forceAudio"+ :class="cn('shrink-0', 'h-full w-full flex-1')"+ :wrapper-class="cn('peer', forceAudio ? 'aspect-square' : 'aspect-video')"ref="preview"/><div@@ -84,7 +94,7 @@ const mediaUrl = computed(() => {</div></div></div>- <div class="flex w-full flex-col text-xs">+ <div class="flex w-full flex-col px-2 pb-2 text-xs"><slot name="title"><p class="truncate" :title="video.title">{{ video.title }}diff --git a/resources/js/components/cards/data/RecentlyUploadedCard.vue b/resources/js/components/cards/data/RecentlyUploadedCard.vueindex 71761474..75902d3c 100644--- a/resources/js/components/cards/data/RecentlyUploadedCard.vue+++ b/resources/js/components/cards/data/RecentlyUploadedCard.vue@@ -9,7 +9,7 @@ defineProps<{ video: VideoResource }>();</script><template>- <BrowseMediaCard :video="video">+ <BrowseMediaCard :video="video" v-bind="$attrs"><span class="text-foreground-1">Uploaded {{ toTimeSpan(video.created_at, '') }}</span></BrowseMediaCard></template>diff --git a/resources/js/config/featureFlags.ts b/resources/js/config/featureFlags.tsindex fe26d276..1d632c86 100644--- a/resources/js/config/featureFlags.ts+++ b/resources/js/config/featureFlags.ts@@ -10,6 +10,8 @@ export const FLAGS = {USE_APP_VERSION_CARD: true, // show app manifest/version card in sidebars (settings and dashboard)USE_ASYMMETRICAL_PLAYER: false,+ USE_TRANSPARENT_HOME_CARDS: true,+CONFIG: {USE_MEDIA_EXTENSION_CONFIG: true, // Allow setting supported extensionsUSE_SUBTITLE_EXTENSION_CONFIG: false, // Allow setting supported subtitle extensions