A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
feat: standardise folder, captions, edit, and eye icons
aminnausinca8f93d0a4ca
diff --git a/resources/js/components/cards/data/FolderCard.vue b/resources/js/components/cards/data/FolderCard.vueindex bf26242c..0aaff512 100644--- a/resources/js/components/cards/data/FolderCard.vue+++ b/resources/js/components/cards/data/FolderCard.vue@@ -5,9 +5,9 @@ import { formatFileSize, handleStorageURL, toFormattedDate } from '@/service/utiimport { breakpointsTailwind, useBreakpoints } from '@vueuse/core';import { handleEditFolderImages } from '@/service/folder/folderActions';import { RelativeHoverCard } from '@/components/cedar-ui/hover-card';+import { computed, markRaw } from 'vue';import { ButtonCorner } from '@/components/cedar-ui/button';import { useAppStore } from '@/stores/AppStore';-import { computed } from 'vue';import { useAuth } from '@/composables/auth/useAuth';import { cn } from '@aminnausin/cedar-ui';@@ -17,9 +17,9 @@ 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 CircumEdit from '~icons/circum/edit';+import IconFolder from '@/components/icons/IconFolder.vue';+import IconEdit from '@/components/icons/IconEdit.vue';const emit = defineEmits(['clickAction', 'otherAction']);const props = defineProps<{@@ -41,7 +41,7 @@ const contextMenuItems = computed(() => {return [{text: 'Edit',- icon: CircumEdit,+ icon: markRaw(IconEdit),hidden: !isAuthenticated.value,action: () => {if (!props.data?.id) return;@@ -58,7 +58,7 @@ const contextMenuItems = computed(() => {},{text: 'Open in New Tab',- icon: CircumFolderOn,+ icon: markRaw(IconFolder),action: () => {if (!props.data?.id) return;window.open(folderUrl.value, '_blank');@@ -163,7 +163,7 @@ const mediaType = computed(() => {:use-default-style="false"><template #icon>- <CircumFolderOn class="size-5" stroke-width="0.5" stroke="currentColor" />+ <IconFolder class="size-5" /></template></ButtonCorner></div>diff --git a/resources/js/components/cards/data/LrcLibCard.vue b/resources/js/components/cards/data/LrcLibCard.vueindex efeaa9c0..9a942860 100644--- a/resources/js/components/cards/data/LrcLibCard.vue+++ b/resources/js/components/cards/data/LrcLibCard.vue@@ -10,8 +10,8 @@ import { cn } from '@aminnausin/cedar-ui';import MediaTag from '@/components/labels/MediaTag.vue';-import ProiconsEye from '~icons/proicons/eye';import PrimeSave from '~icons/prime/save';+import IconEye from '@/components/icons/IconEye.vue';const { dirtyLyric } = storeToRefs(useLyricStore());@@ -56,7 +56,7 @@ const tags = computed(() => {</ButtonIcon><ButtonIcon v-if="data.syncedLyrics" class="size-6 bg-transparent p-1 shadow-none ring-transparent" type="button" title="Preview" @click="$emit('preview')"><template #icon>- <ProiconsEye class="size-4" />+ <IconEye class="size-4" /></template></ButtonIcon></section>diff --git a/resources/js/components/cards/data/VideoCard.vue b/resources/js/components/cards/data/VideoCard.vueindex c857a5e5..f9b77417 100644--- a/resources/js/components/cards/data/VideoCard.vue+++ b/resources/js/components/cards/data/VideoCard.vue@@ -27,8 +27,8 @@ import ProiconsComment from '~icons/proicons/comment';import ProiconsPhoto from '~icons/proicons/photo';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';+import IconEdit from '@/components/icons/IconEdit.vue';const emit = defineEmits(['clickAction', 'otherAction']);@@ -60,7 +60,7 @@ const resumeOffset = computed(() => (videoData.progress_offset && videoData.progconst contextMenuItems = computed<ContextMenuItem[]>(() => [{text: 'Edit',- icon: CircumEdit,+ icon: markRaw(IconEdit),hidden: !isAuthenticated.value,action: () => {emit('otherAction', videoData?.id, 'edit');diff --git a/resources/js/components/icons/IconCaptions.vue b/resources/js/components/icons/IconCaptions.vueindex 3ae376e3..9d2e72c3 100644--- a/resources/js/components/icons/IconCaptions.vue+++ b/resources/js/components/icons/IconCaptions.vue@@ -6,8 +6,10 @@ withDefaults(defineProps<{ variant?: 'Proicons' | 'Lucide' | 'Tabler' }>(), { va<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" />+ <rect width="20" height="16" x="2" y="4" rx="3" ry="3" />+ </g>+ <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.75">+ <path d="M6 15h5m4 0h3M6 11h2m4 0h6" /></g></svg><ProiconsClosedCaptions v-else-if="variant === 'Proicons'" />diff --git a/resources/js/components/icons/IconEdit.vue b/resources/js/components/icons/IconEdit.vuenew file mode 100644index 00000000..ae4a47ad--- /dev/null+++ b/resources/js/components/icons/IconEdit.vue@@ -0,0 +1,11 @@+<template>+ <!-- <CircumEdit /> -->+ <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="currentColor"+ d="M9.71 17.18a2.6 2.6 0 0 0 1.12-.65l9.54-9.54a1.75 1.75 0 0 0 0-2.47l-.94-.93a1.79 1.79 0 0 0-2.47 0l-9.54 9.53a2.5 2.5 0 0 0-.64 1.12L6.04 17a.74.74 0 0 0 .19.72a.77.77 0 0 0 .53.22Zm.41-1.36a1.47 1.47 0 0 1-.67.39l-.97.26l-1-1l.26-.97a1.5 1.5 0 0 1 .39-.67l.38-.37l1.99 1.99Zm1.09-1.08l-1.99-1.99l6.73-6.73l1.99 1.99Zm8.45-8.45L18.65 7.3l-1.99-1.99l1.01-1.02a.75.75 0 0 1 1.06 0l.93.94a.754.754 0 0 1 0 1.06"+ />+ <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M3.548 20.938h16.9" />+ </svg>+</template>diff --git a/resources/js/components/icons/IconEye.vue b/resources/js/components/icons/IconEye.vuenew file mode 100644index 00000000..d7d196da--- /dev/null+++ b/resources/js/components/icons/IconEye.vue@@ -0,0 +1,11 @@+<template>+ <!-- <ProiconsEye /> -->+ <!-- <IconoirEye /> -->+ <svg 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">+ <path d="M3 13c3.6-8 14.4-8 18 0" />+ <path d="M12 17a3 3 0 1 1 0-6a3 3 0 0 1 0 6" />+ </g>+ </svg>+</template>diff --git a/resources/js/components/icons/IconFolder.vue b/resources/js/components/icons/IconFolder.vuenew file mode 100644index 00000000..a7205a0a--- /dev/null+++ b/resources/js/components/icons/IconFolder.vue@@ -0,0 +1,8 @@+<script setup lang="ts">+import CircumFolderOn from '~icons/circum/folder-on';++withDefaults(defineProps<{ variant?: 'Proicons' | 'Circum' }>(), { variant: 'Proicons' });+</script>+<template>+ <CircumFolderOn stroke-width="0.5" stroke="currentColor" />+</template>diff --git a/resources/js/components/menus/LibraryFolderCardMenu.vue b/resources/js/components/menus/LibraryFolderCardMenu.vueindex 0acab2f5..cf967d79 100644--- a/resources/js/components/menus/LibraryFolderCardMenu.vue+++ b/resources/js/components/menus/LibraryFolderCardMenu.vue@@ -12,7 +12,7 @@ import TablerDownload from '@/components/icons/TablerDownload.vue';import ProiconsInfoSquare from '~icons/proicons/info-square';import ProiconsDelete from '~icons/proicons/delete';import ProiconsPhoto from '~icons/proicons/photo';-import CircumEdit from '~icons/circum/edit';+import IconEdit from '@/components/icons/IconEdit.vue';const props = withDefaults(defineProps<{@@ -51,7 +51,7 @@ const { isAdmin, isAuthenticated } = useAuth();"><p class="flex-1 text-start">Edit Folder</p>- <template #icon> <CircumEdit class="size-4" /></template>+ <template #icon> <IconEdit class="size-4" /></template></ButtonText><ButtonTextdiff --git a/resources/js/components/panels/NavBar.vue b/resources/js/components/panels/NavBar.vueindex 18e51945..4004ae43 100755--- a/resources/js/components/panels/NavBar.vue+++ b/resources/js/components/panels/NavBar.vue@@ -18,10 +18,9 @@ import SidebarDrawer from '@/components/drawers/SidebarDrawer.vue';import LazyImage from '@/components/lazy/LazyImage.vue';import MaterialSymbolsLightHistory from '~icons/material-symbols-light/history';-import CircumFolderOn from '~icons/circum/folder-on';-import CircumInboxIn from '~icons/circum/inbox-in';import CircumMonitor from '~icons/circum/monitor';import ProiconsMenu from '~icons/proicons/menu';+import IconFolder from '@/components/icons/IconFolder.vue';const { dropdownItems, dropdownItemsAuth } = useDropdownMenuItems();const { userData, isLoadingUserData } = storeToRefs(useAuthStore());@@ -155,12 +154,9 @@ watch(isDesktop, (now) => {<div class="ml-auto flex flex-wrap items-center justify-end gap-1 sm:w-auto sm:max-w-sm sm:shrink-0 sm:flex-nowrap sm:justify-normal"><span id="video-navbar" class="flex items-center gap-1 antialiased">- <NavButton v-if="userData" @click="cycleSideBar('notifications')" :label="'notifications'" class="hidden" active>- <CircumInboxIn height="24" width="24" />- </NavButton><template v-if="$route.name === 'home' || $route.name === 'folder-details'"><NavButton @click="toggleVideoSidebar('folders')" :label="'folders'" :active="selectedSideBar == 'folders'" title="Toggle folder browser" class="p-0">- <CircumFolderOn height="24" width="24" />+ <IconFolder class="size-6" stroke-width="0.0" /></NavButton><NavButtonv-if="userData"@@ -170,7 +166,7 @@ watch(isDesktop, (now) => {title="Toggle recent watch history"class="p-0">- <MaterialSymbolsLightHistory height="24" width="24" />+ <MaterialSymbolsLightHistory class="size-6" stroke-width="0.25" stroke="currentColor" /></NavButton></template><NavButton@@ -204,7 +200,7 @@ watch(isDesktop, (now) => {<ProiconsMenu height="20" width="20" /></NavButton><NavLink v-if="$route.name != 'home'" label="home" to="/" title="Return to home library" class="p-0">- <CircumMonitor height="24" width="24" />+ <CircumMonitor class="size-6" /></NavLink></span><ToggleLightMode class="dark:hover:border-primary w-17 border-gray-900/5 shadow-sm" />diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex 337908ba..c0098064 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -34,9 +34,9 @@ import ProiconsInfoSquare from '~icons/proicons/info-square';import TablerDownload from '@/components/icons/TablerDownload.vue';import ProiconsPhoto from '~icons/proicons/photo';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';+import IconEdit from '@/components/icons/IconEdit.vue';+import IconEye from '@/components/icons/IconEye.vue';const defaultDescription = `No description yet.`;@@ -79,7 +79,7 @@ const popoverItems = computed(() => {disabled: !stateVideo.value.id,},{- icon: CircumEdit,+ icon: IconEdit,text: 'Edit Metadata',action: handleEdit,hidden: !isAuthenticated.value,@@ -271,7 +271,7 @@ onMounted(() => {{{ views }}<HoverCard :content="`You have viewed this ${personalViewCount} time${personalViewCount == 1 ? '' : 's'}`" v-if="personalViewCount"><template #trigger>- <ProiconsEye class="size-4 scale-90 transition-all hover:scale-100 hover:text-neutral-400 dark:hover:text-white" />+ <IconEye class="size-4 scale-90 transition-all hover:scale-100 hover:text-neutral-400 dark:hover:text-white" /></template></HoverCard></BadgeTag>@@ -335,7 +335,7 @@ onMounted(() => {</ButtonIcon><ButtonIcon class="size-7 p-0 shadow-md" title="Edit Folder Metadata" @click="modal.open(EditFolderModal, { cachedFolder: stateFolder })"><template #icon>- <CircumEdit class="size-5" />+ <IconEdit class="size-5" /></template></ButtonIcon></template>@@ -443,7 +443,7 @@ onMounted(() => {<template #trigger><div class="hover:text-primary group flex cursor-default items-center justify-start gap-1 transition-colors"><span class="text-nowrap lowercase">{{ views }}</span>- <ProiconsEye class="size-4 scale-90 transition-transform group-hover:scale-100" />+ <IconEye class="size-4 scale-90 transition-transform group-hover:scale-100" /></div></template></HoverCard>diff --git a/resources/js/components/video/audio/PlayerAudioTracks.vue b/resources/js/components/video/audio/PlayerAudioTracks.vueindex 4b1adbeb..9fb5be0d 100644--- a/resources/js/components/video/audio/PlayerAudioTracks.vue+++ b/resources/js/components/video/audio/PlayerAudioTracks.vue@@ -93,6 +93,7 @@ defineExpose({ audioTracksPopover });'target-element': player,'use-tooltip': !audioTracksPopover?.popoverOpen,offset: videoButtonOffset,+ class: 'size-6 flex items-center justify-center',}"title="Audio Tracks">diff --git a/resources/js/components/video/plugins/party/VideoPartyPanel.vue b/resources/js/components/video/plugins/party/VideoPartyPanel.vueindex 269a9833..372404bc 100644--- a/resources/js/components/video/plugins/party/VideoPartyPanel.vue+++ b/resources/js/components/video/plugins/party/VideoPartyPanel.vue@@ -11,8 +11,8 @@ import VideoPartyItem from '@/components/video/plugins/party/VideoPartyItem.vue'import VideoButton from '@/components/video/button/VideoButton.vue';import LucideLogOut from '~icons/lucide/log-out';-import ProiconsEye from '~icons/proicons/eye';import ProiconsAdd from '~icons/proicons/add';+import IconEye from '@/components/icons/IconEye.vue';defineProps<{ isShowingParty?: boolean }>();@@ -45,7 +45,7 @@ const handleKickUser = (id: number) => {<template><Teleport defer to="#player-toolbar" v-if="userData?.id && isShowingParty"><PlayerToolbarButton @click="isShowingPanel = !isShowingPanel" :is-active="isShowingPanel" :class="['ps-1']" title="Open watch party panel">- <ProiconsEye class="size-4" />+ <IconEye class="size-4" /><p>{{ 1 + partyUsers.length }}</p></PlayerToolbarButton></Teleport>diff --git a/resources/js/views/FolderView.vue b/resources/js/views/FolderView.vueindex e84f5231..5471f33f 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 CircumEdit from '~icons/circum/edit';import IconShare from '@/components/icons/IconShare.vue';+import IconEdit from '@/components/icons/IconEdit.vue';const VALID_TABS = new Set(['overview', 'files', 'images', 'metadata', 'stats']);@@ -72,7 +72,7 @@ const activeComponent = computed(() => {const popoverItems = computed<PopoverItem[]>(() => [{- icon: CircumEdit,+ icon: IconEdit,text: 'Edit',action: () => modal.open(EditFolderModal, { cachedFolder: stateFolder }),hidden: !isAuthenticated.value || activeFolderTab.value?.name === 'metadata',@@ -232,14 +232,14 @@ provide(<span class="hidden leading-none sm:block">Watch</span></ButtonText><ButtonIcon v-if="activeFolderTab?.name === 'images' && isAuthenticated" title="Edit Folder Images" @click="handleEditFolderImages(stateFolder)">- <CircumEdit class="size-4" />+ <IconEdit class="size-4" /></ButtonIcon><ButtonIconv-if="activeFolderTab?.name === 'metadata' && isAuthenticated"title="Edit Folder Metadata"@click="modal.open(EditFolderModal, { cachedFolder: stateFolder })">- <CircumEdit class="size-4" />+ <IconEdit class="size-4" /></ButtonIcon><BasePopover ref="popover" popoverClass="max-w-38 p-1 text-xs" :buttonClass="'size-7 p-0'" :button-component="ButtonIcon"><template #buttonIcon>