A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: standardise caption and share icons
aminnausinede7c60c33b9
diff --git a/resources/js/components/cards/data/FolderCard.vue b/resources/js/components/cards/data/FolderCard.vueindex 3991e249..bf26242c 100644--- a/resources/js/components/cards/data/FolderCard.vue+++ b/resources/js/components/cards/data/FolderCard.vue@@ -12,13 +12,13 @@ import { useAuth } from '@/composables/auth/useAuth';import { cn } from '@aminnausin/cedar-ui';import SidebarCard from '@/components/cards/sidebar/SidebarCard.vue';+import IconShare from '@/components/icons/IconShare.vue';import LazyImage from '@/components/lazy/LazyImage.vue';import MediaTag from '@/components/labels/MediaTag.vue';import ProiconsInfoSquare from '~icons/proicons/info-square';import CircumFolderOn from '~icons/circum/folder-on';import ProiconsPhoto from '~icons/proicons/photo';-import CircumShare1 from '~icons/circum/share-1';import CircumEdit from '~icons/circum/edit';const emit = defineEmits(['clickAction', 'otherAction']);@@ -141,7 +141,7 @@ const mediaType = computed(() => {>{{ data.series?.title || data.name }}</h3>- <div class="flex justify-end gap-1">+ <div class="flex justify-end"><ButtonCornerclass="hover:text-primary dark:hover:text-primary-muted hover:dark:bg-surface-1 hover:bg-surface-6 size-7":label="'Share Folder'"@@ -149,7 +149,7 @@ const mediaType = computed(() => {@click.stop.prevent="emit('otherAction', data.id, 'share')"><template #icon>- <CircumShare1 width="20" height="20" stroke-width="1" stroke="currentColor" />+ <IconShare class="size-5" /></template></ButtonCorner><ButtonCorner@@ -163,7 +163,7 @@ const mediaType = computed(() => {:use-default-style="false"><template #icon>- <CircumFolderOn width="20" height="20" stroke-width="1" stroke="currentColor" />+ <CircumFolderOn class="size-5" stroke-width="0.5" stroke="currentColor" /></template></ButtonCorner></div>diff --git a/resources/js/components/cards/data/LibraryCard.vue b/resources/js/components/cards/data/LibraryCard.vueindex 4bbca9e2..025cf06e 100644--- a/resources/js/components/cards/data/LibraryCard.vue+++ b/resources/js/components/cards/data/LibraryCard.vue@@ -14,10 +14,10 @@ import { cn, toast } from '@aminnausin/cedar-ui';import LibraryCardMenu from '@/components/menus/LibraryCardMenu.vue';import TablerDownload from '@/components/icons/TablerDownload.vue';import ProIconsPhoto from '@/components/icons/ProIconsPhoto.vue';+import IconShare from '@/components/icons/IconShare.vue';import LazyImage from '@/components/lazy/LazyImage.vue';import ProiconsMoreVertical from '~icons/proicons/more-vertical';-import CircumShare1 from '~icons/circum/share-1';import ProiconsLock from '~icons/proicons/lock';const props = defineProps<{ data?: CategoryResource }>();@@ -169,7 +169,7 @@ watch(</RouterLink><span class="flex gap-2 text-sm *:h-6"><ButtonIcon :title="'Open Default Folder In New Tab'" :to="`/${data?.name}`" :target="'_blank'" class="size-6 p-0">- <template #icon><CircumShare1 class="size-4" /></template>+ <template #icon><IconShare class="size-4" /></template></ButtonIcon><BasePopover popoverClass="max-w-50 lg:max-w-56 rounded-lg" :buttonClass="'p-1'" ref="popover"><template #buttonIcon>diff --git a/resources/js/components/cards/data/LibraryFolderCard.vue b/resources/js/components/cards/data/LibraryFolderCard.vueindex 5dfe4a26..509256fc 100644--- a/resources/js/components/cards/data/LibraryFolderCard.vue+++ b/resources/js/components/cards/data/LibraryFolderCard.vue@@ -13,11 +13,11 @@ import { HoverCard } from '@/components/cedar-ui/hover-card';import { cn, toast } from '@aminnausin/cedar-ui';import LibraryFolderCardMenu from '@/components/menus/LibraryFolderCardMenu.vue';-import TablerDownload from '@/components/icons/TablerDownload.vue';import LazyImage from '@/components/lazy/LazyImage.vue';import ProiconsMoreVertical from '~icons/proicons/more-vertical';-import CircumShare1 from '~icons/circum/share-1';+import TablerDownload from '@/components/icons/TablerDownload.vue';+import IconShare from '@/components/icons/IconShare.vue';const { stateLibraryId, stateLibraries } = storeToRefs(useDashboardStore());@@ -88,7 +88,7 @@ const handleToggleDownloads = async (id: number, currentValue: boolean) => {</RouterLink><span class="flex gap-2 text-sm *:h-6"><ButtonIcon :title="'Open Folder In New Tab'" :to="`/${encodeURI(data.path)}`" :target="'_blank'" class="size-6 p-0">- <template #icon><CircumShare1 class="size-4" /></template>+ <template #icon><IconShare class="size-4" /></template></ButtonIcon><BasePopover popoverClass="max-w-48 lg:max-w-56 rounded-lg" :buttonClass="'p-1'" ref="popover"><template #buttonIcon>diff --git a/resources/js/components/cards/data/RecordCard.vue b/resources/js/components/cards/data/RecordCard.vueindex 8ea5d046..e89e0f2f 100644--- a/resources/js/components/cards/data/RecordCard.vue+++ b/resources/js/components/cards/data/RecordCard.vue@@ -7,8 +7,8 @@ import { ButtonCorner } from '@/components/cedar-ui/button';import SidebarCard from '@/components/cards/sidebar/SidebarCard.vue';-import CircumShare1 from '~icons/circum/share-1';import CircumPlay1 from '~icons/circum/play-1';+import IconShare from '@/components/icons/IconShare.vue';const props = defineProps<{record: RecordResource;@@ -36,7 +36,7 @@ watch(<h3 class="text-foreground-0 w-full truncate" :title="record.video_name ?? record.file_name">{{ record.video_name ?? `[Deleted] ${record.file_name}` }}</h3>- <div class="flex justify-end gap-1" v-if="videoLink">+ <div class="flex justify-end" v-if="videoLink"><ButtonCorner:class="'hover:text-primary dark:hover:text-primary-muted hover:dark:bg-surface-1 hover:bg-surface-6 size-7'":label="'Share Track/Video'"@@ -44,7 +44,7 @@ watch(@click.stop.prevent="$emit('clickAction', videoLink)"><template #icon>- <CircumShare1 width="20" height="20" stroke-width="1" stroke="currentColor" />+ <IconShare class="size-5" /></template></ButtonCorner><ButtonCorner@@ -54,7 +54,7 @@ watch(:use-default-style="false"><template #icon>- <CircumPlay1 width="20" height="20" stroke-width="1" stroke="currentColor" />+ <CircumPlay1 class="size-4.5" stroke-width="0.5" stroke="currentColor" /></template></ButtonCorner></div>diff --git a/resources/js/components/cards/data/VideoCard.vue b/resources/js/components/cards/data/VideoCard.vueindex aa30a0b9..c857a5e5 100644--- a/resources/js/components/cards/data/VideoCard.vue+++ b/resources/js/components/cards/data/VideoCard.vue@@ -3,7 +3,7 @@ import type { ContextMenuItem } from '@/types/types';import type { VideoResource } from '@/types/resources';import { formatFileSize, handleStorageURL, toFormattedDate, toPlural } from '@/service/util';-import { computed, toRef, useTemplateRef } from 'vue';+import { computed, markRaw, toRef, useTemplateRef } from 'vue';import { getMediaDateDescription } from '@/service/media/mediaFormatter';import { handleEditMediaImages } from '@/service/media/mediaActions';import { useContentStore } from '@/stores/ContentStore';@@ -16,7 +16,6 @@ import { HoverCard } from '@/components/cedar-ui/hover-card';import { MediaType } from '@/types/types';import { cn } from '@aminnausin/cedar-ui';-import TablerSubtitles from '@/components/icons/TablerSubtitles.vue';import VideoPreview from '@/components/video/VideoPreview.vue';import useMetaData from '@/composables/useMetaData';import MediaTag from '@/components/labels/MediaTag.vue';@@ -26,9 +25,10 @@ import TablerMicrophone2 from '~icons/tabler/microphone-2';import ProiconsCheckmark from '~icons/proicons/checkmark';import ProiconsComment from '~icons/proicons/comment';import ProiconsPhoto from '~icons/proicons/photo';-import CircumShare1 from '~icons/circum/share-1';+import IconCaptions from '@/components/icons/IconCaptions.vue';import ProiconsPlay from '~icons/proicons/play';import CircumEdit from '~icons/circum/edit';+import IconShare from '@/components/icons/IconShare.vue';const emit = defineEmits(['clickAction', 'otherAction']);@@ -68,7 +68,7 @@ const contextMenuItems = computed<ContextMenuItem[]>(() => [},{text: 'Share',- icon: CircumShare1,+ icon: markRaw(IconShare),action: () => {emit('otherAction', videoData?.id, 'share');},@@ -139,7 +139,7 @@ const dateInformation = computed(() => getMediaDateDescription(videoData));</template></HoverCard>- <div class="-ms-2 flex shrink-0 gap-1">+ <div class="-ms-2 flex h-full shrink-0 items-center gap-1"><HoverCardclass="items-end"v-if="videoData.description"@@ -168,8 +168,8 @@ const dateInformation = computed(() => getMediaDateDescription(videoData));:hover-card-leave-delay="300"><template #trigger>- <TablerSubtitles- class="size-4 shrink-0 opacity-100 transition-opacity duration-300 *:stroke-[1.4px] hover:opacity-20 sm:size-5"+ <IconCaptions+ class="mb-0.5 size-4 shrink-0 opacity-100 transition-opacity duration-300 *:stroke-[1.4px] hover:opacity-20 sm:size-5"title="Has Subtitles"/></template>diff --git a/resources/js/components/folders/FolderInfoRow.vue b/resources/js/components/folders/FolderInfoRow.vueindex bad3ee36..83bce220 100644--- a/resources/js/components/folders/FolderInfoRow.vue+++ b/resources/js/components/folders/FolderInfoRow.vue@@ -2,7 +2,7 @@import { RouterLink } from 'vue-router';import { cn } from '@aminnausin/cedar-ui';-import CircumShare1 from '~icons/circum/share-1';+import IconShare from '@/components/icons/IconShare.vue';defineProps<{ title: string; value?: any; to?: string; valueClass?: string; iconClass?: string; tooltip?: string }>();</script>@@ -16,7 +16,7 @@ defineProps<{ title: string; value?: any; to?: string; valueClass?: string; icon:to="to">{{ value ?? '—' }}- <CircumShare1 v-if="to" :class="cn('size-4', iconClass)" />+ <IconShare v-if="to" :class="cn('size-4', iconClass)" /></component></slot></div>diff --git a/resources/js/components/forms/EditImages.vue b/resources/js/components/forms/EditImages.vueindex 9ce62c64..0428ca7a 100644--- a/resources/js/components/forms/EditImages.vue+++ b/resources/js/components/forms/EditImages.vue@@ -11,14 +11,14 @@ import { FormErrorList } from '@/components/cedar-ui/form';import { cn, toast } from '@aminnausin/cedar-ui';import { toPlural } from '@/service/util';-import ProIconsPhotoOff from '@/components/icons/ProIconsPhotoOff.vue';import ModalFormFooter from '@/components/forms/ModalFormFooter.vue';-import ProIconsPhoto from '@/components/icons/ProIconsPhoto.vue';-import TablerUpload from '@/components/icons/TablerUpload.vue';import ImageCard from '@/components/cards/data/ImageCard.vue';import useForm from '@/composables/useForm';-import CircumShare1 from '~icons/circum/share-1';+import ProIconsPhotoOff from '@/components/icons/ProIconsPhotoOff.vue';+import ProIconsPhoto from '@/components/icons/ProIconsPhoto.vue';+import TablerUpload from '@/components/icons/TablerUpload.vue';+import IconShare from '@/components/icons/IconShare.vue';const { pending, addFile, addUrl, removePending, cleanup } = useImageManager();@@ -492,7 +492,7 @@ onUnmounted(() => {:to="generatableFilters[filteredType].url":target="generatableFilters[filteredType].target ?? '_blank'">- <CircumShare1 class="size-3.5" /> {{ generatableFilters[filteredType].text }}+ <IconShare class="size-3.5" /> {{ generatableFilters[filteredType].text }}</ButtonBase></template></ModalFormFooter>diff --git a/resources/js/components/icons/IconCaptions.vue b/resources/js/components/icons/IconCaptions.vuenew file mode 100644index 00000000..3ae376e3--- /dev/null+++ b/resources/js/components/icons/IconCaptions.vue@@ -0,0 +1,25 @@+<script setup lang="ts">+import ProiconsClosedCaptions from '~icons/proicons/closed-captions';+withDefaults(defineProps<{ variant?: 'Proicons' | 'Lucide' | 'Tabler' }>(), { variant: 'Lucide' });+</script>+<template>+ <svg v-if="variant === 'Lucide'" xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">+ <path d="M0 0h24v24H0z" fill="none" />+ <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5">+ <rect width="18" height="14" x="3" y="5" rx="3" ry="3" />+ <path d="M7 15h4m4 0h2M7 11h2m4 0h4" />+ </g>+ </svg>+ <ProiconsClosedCaptions v-else-if="variant === 'Proicons'" />+ <svg v-else xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">+ <!-- Tabler -->+ <path+ fill="none"+ stroke="currentColor"+ stroke-linecap="round"+ stroke-linejoin="round"+ stroke-width="2"+ d="M18 5a3 3 0 0 1 3 3v8a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3V8a3 3 0 0 1 3-3zM7 15h5m3 0h2m0-3h-3m-3 0h-1"+ />+ </svg>+</template>diff --git a/resources/js/components/icons/IconCaptionsOff.vue b/resources/js/components/icons/IconCaptionsOff.vuenew file mode 100644index 00000000..c7f19f16--- /dev/null+++ b/resources/js/components/icons/IconCaptionsOff.vue@@ -0,0 +1,13 @@+<template>+ <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">+ <path d="M0 0h24v24H0z" fill="none" />+ <path+ fill="none"+ stroke="currentColor"+ stroke-linecap="round"+ stroke-linejoin="round"+ stroke-width="1.5"+ d="M10.5 5H18a3 3 0 0 1 3 3v8.5M17 11h-.5m2.5 8H6a3 3 0 0 1-3-3V8a3 3 0 0 1 3-3M2 2l20 20M7 11h4m-4 4h2.5"+ />+ </svg>+</template>diff --git a/resources/js/components/icons/IconShare.vue b/resources/js/components/icons/IconShare.vuenew file mode 100644index 00000000..1095ee13--- /dev/null+++ b/resources/js/components/icons/IconShare.vue@@ -0,0 +1,10 @@+<script setup lang="ts">+import CircumShare1 from '~icons/circum/share-1';+import ProiconsOpen from '~icons/proicons/open';++withDefaults(defineProps<{ variant?: 'Proicons' | 'Circum' }>(), { variant: 'Proicons' });+</script>+<template>+ <ProiconsOpen v-if="variant === 'Proicons'" />+ <CircumShare1 v-else />+</template>diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex 0549be1d..337908ba 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -25,18 +25,18 @@ import { toast } from '@aminnausin/cedar-ui';import EditFolderModal from '@/components/modals/EditFolderModal.vue';import EditMediaModal from '@/components/modals/EditMediaModal.vue';-import TablerDownload from '@/components/icons/TablerDownload.vue';import useMetaData from '@/composables/useMetaData';import ShareModal from '@/components/modals/ShareModal.vue';import LazyImage from '@/components/lazy/LazyImage.vue';import ProiconsMoreVertical from '~icons/proicons/more-vertical';import ProiconsInfoSquare from '~icons/proicons/info-square';-import LucideCaptions from '~icons/lucide/captions';+import TablerDownload from '@/components/icons/TablerDownload.vue';import ProiconsPhoto from '~icons/proicons/photo';-import CircumShare1 from '~icons/circum/share-1';+import IconCaptions from '@/components/icons/IconCaptions.vue';import ProiconsEye from '~icons/proicons/eye';import CircumEdit from '~icons/circum/edit';+import IconShare from '@/components/icons/IconShare.vue';const defaultDescription = `No description yet.`;@@ -60,7 +60,7 @@ const isExpanded = ref(false);const popoverItems = computed(() => {return [{- icon: CircumShare1,+ icon: IconShare,text: 'Share',action: handleShare,},@@ -91,7 +91,7 @@ const popoverItems = computed(() => {hidden: !isAuthenticated.value,},{- icon: LucideCaptions,+ icon: IconCaptions,text: 'Reset Subtitles',hidden: stateVideo.value.metadata?.media_type === 1 || !isAuthenticated.value,action: handleResetSubtitles,@@ -324,18 +324,18 @@ onMounted(() => {<div class="absolute right-1 bottom-1 space-y-1.5 opacity-0 transition-opacity group-hover:opacity-100 focus-within:opacity-100"><ButtonIcon class="size-7 p-0 shadow-md" title="Folder Details" :to="`/${stateFolder.category_id}/${stateFolder.title}/details`"><template #icon>- <ProiconsInfoSquare class="size-4.5" />+ <ProiconsInfoSquare class="size-5" /></template></ButtonIcon><template v-if="isAuthenticated"><ButtonIcon class="size-7 p-0 shadow-md" title="Edit Folder Images" @click="handleEditFolderImages(stateFolder)"><template #icon>- <ProiconsPhoto height="16" width="16" />+ <ProiconsPhoto class="size-5" /></template></ButtonIcon><ButtonIcon class="size-7 p-0 shadow-md" title="Edit Folder Metadata" @click="modal.open(EditFolderModal, { cachedFolder: stateFolder })"><template #icon>- <CircumEdit height="16" width="16" />+ <CircumEdit class="size-5" /></template></ButtonIcon></template>diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex 7b53dc03..8c8e9e30 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -55,17 +55,17 @@ import ProiconsFastForward from '~icons/proicons/fast-forward';import ProiconsVolumeMute from '~icons/proicons/volume-mute';import ProiconsVolumeLow from '~icons/proicons/volume-low';import ProiconsCheckmark from '~icons/proicons/checkmark';-import LucideCaptionsOff from '~icons/lucide/captions-off';import TablerMicrophone2 from '~icons/tabler/microphone-2';import IconSpectrograph from '@/components/icons/IconSpectrograph.vue';import ProiconsSparkle2 from '~icons/proicons/sparkle-2';import ProiconsSettings from '~icons/proicons/settings';+import IconCaptionsOff from '@/components/icons/IconCaptionsOff.vue';import ProiconsSpinner from '~icons/proicons/spinner';import ProiconsReverse from '~icons/proicons/reverse';import ProiconsVolume from '~icons/proicons/volume';import IconTheatreOff from '@/components/icons/IconTheatreOff.vue';-import LucideCaptions from '~icons/lucide/captions';import IconTheatreOn from '@/components/icons/IconTheatreOn.vue';+import IconCaptions from '@/components/icons/IconCaptions.vue';import ProiconsPlay from '~icons/proicons/play';import MagePlaylist from '~icons/mage/playlist';import CircumTimer from '~icons/circum/timer';@@ -401,7 +401,7 @@ const videoPopoverItems = computed(() => {{text: 'Auto Subtitles',title: `Automatically select the default subtitle track`,- icon: showAutoSubtitles.value ? LucideCaptions : LucideCaptionsOff,+ icon: showAutoSubtitles.value ? IconCaptions : IconCaptionsOff,selectedIcon: ProiconsCheckmark,selected: showAutoSubtitles.value,action: () => (showAutoSubtitles.value = !showAutoSubtitles.value),diff --git a/resources/js/components/video/subtitles/PlayerSubtitles.vue b/resources/js/components/video/subtitles/PlayerSubtitles.vueindex d7fd7198..a8171b6c 100644--- a/resources/js/components/video/subtitles/PlayerSubtitles.vue+++ b/resources/js/components/video/subtitles/PlayerSubtitles.vue@@ -16,8 +16,8 @@ import VideoPopover from '@/components/video/popover/VideoPopover.vue';import ProiconsTextFontSize from '~icons/proicons/text-font-size';import ProiconsCheckmark from '~icons/proicons/checkmark';-import LucideCaptionsOff from '~icons/lucide/captions-off';-import LucideCaptions from '~icons/lucide/captions';+import IconCaptionsOff from '@/components/icons/IconCaptionsOff.vue';+import IconCaptions from '@/components/icons/IconCaptions.vue';interface PlayerSubtitlesProps {videoButtonOffset: number;@@ -59,7 +59,7 @@ const playerSubtitleItems = computed(() => {const text = [capitalisedLang, isDefault, isForced, isExternal].filter(Boolean).join(' ');return {- icon: LucideCaptions,+ icon: IconCaptions,text,title: [text, `Title: ${track.title ?? 'und'}`, `Track: ${track.track_id}`, `Codec: ${codec}`].join('\n'),selected: isCurrentTrack,@@ -72,7 +72,7 @@ const playerSubtitleItems = computed(() => {});const subtitlesOff: PopoverItem = {- icon: LucideCaptionsOff,+ icon: IconCaptionsOff,text: 'Off',selected: !isShowingSubtitles.value,selectedIcon: ProiconsCheckmark,@@ -236,12 +236,13 @@ defineExpose({'target-element': player,'use-tooltip': !subtitlesPopover?.popoverOpen,offset: videoButtonOffset,+ class: 'p-1',}"title="Subtitles"><template #buttonIcon>- <LucideCaptions v-if="isShowingSubtitles" class="size-4" />- <LucideCaptionsOff v-else class="size-4" />+ <IconCaptions v-if="isShowingSubtitles" class="*:stroke-1.5 size-4" />+ <IconCaptionsOff v-else class="*:stroke-1.5 size-4" /></template><template #content><section :class="['scrollbar-minimal flex h-fit max-h-21 flex-col overflow-y-auto transition-transform md:max-h-35', { 'pe-0.5': playerSubtitleItems.length > 3 }]">diff --git a/resources/js/views/FolderView.vue b/resources/js/views/FolderView.vueindex 8046f0c2..e84f5231 100644--- a/resources/js/views/FolderView.vue+++ b/resources/js/views/FolderView.vue@@ -30,8 +30,8 @@ import ProiconsArrowSync from '~icons/proicons/arrow-sync';import ProiconsPhoto from '~icons/proicons/photo';import CircumMonitor from '~icons/circum/monitor';import ProiconsMenu from '~icons/proicons/menu';-import CircumShare1 from '~icons/circum/share-1';import CircumEdit from '~icons/circum/edit';+import IconShare from '@/components/icons/IconShare.vue';const VALID_TABS = new Set(['overview', 'files', 'images', 'metadata', 'stats']);@@ -78,7 +78,7 @@ const popoverItems = computed<PopoverItem[]>(() => [hidden: !isAuthenticated.value || activeFolderTab.value?.name === 'metadata',},{- icon: CircumShare1,+ icon: IconShare,text: 'Share',action: () => modal.open(ShareModal, { title: 'Share Folder', shareLink: window.location.href }),},