A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix: video and folder context menus have options when user isn't logged in, and the folder edit option opens the share modal
aminnausin1d3425f78e59
diff --git a/resources/js/components/cards/FolderCard.vue b/resources/js/components/cards/FolderCard.vueindex 6df6a01d..30140656 100755--- a/resources/js/components/cards/FolderCard.vue+++ b/resources/js/components/cards/FolderCard.vue@@ -1,9 +1,10 @@<script setup lang="ts">-import type { ContextMenuItem } from '@/types/types';import type { FolderResource } from '@/types/resources';import { formatFileSize, handleStorageURL } from '@/service/util';+import { useAuthStore } from '@/stores/AuthStore';import { useAppStore } from '@/stores/AppStore';+import { storeToRefs } from 'pinia';import { RouterLink } from 'vue-router';import { computed } from 'vue';@@ -22,20 +23,21 @@ const props = defineProps<{stateFolderName: string;}>();+const { userData } = storeToRefs(useAuthStore());const { setContextMenu } = useAppStore();const contextMenuItems = computed(() => {- const items: ContextMenuItem[] = [+ if (!userData.value) return [];+ return [{text: 'Edit',icon: CircumEdit,action: () => {if (!props.data?.id) return;- emit('clickAction', props.data.id, 'edit');+ emit('otherAction', props.data.id, 'edit');},},];- return items;});</script>@@ -74,7 +76,7 @@ const contextMenuItems = computed(() => {:textClasses="'hover:text-violet-600 dark:hover:text-violet-500'":colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'":label="'Share Folder'"- @click.stop.prevent="emit('clickAction', props.data.id, 'share')"+ @click.stop.prevent="emit('otherAction', props.data.id, 'share')"><template #icon><CircumShare1 width="20" height="20" stroke-width="1" stroke="currentColor" />diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vueindex 3892b42e..a7de55a8 100755--- a/resources/js/components/cards/VideoCard.vue+++ b/resources/js/components/cards/VideoCard.vue@@ -18,6 +18,7 @@ import TablerMicrophone2 from '~icons/tabler/microphone-2';import ProiconsComment from '~icons/proicons/comment';import CircumShare1 from '~icons/circum/share-1';import CircumEdit from '~icons/circum/edit';+import { useAuthStore } from '@/stores/AuthStore';const emit = defineEmits(['clickAction', 'otherAction']);const { data: videoData, index, currentID } = defineProps<{ data: VideoResource; index: number; currentID: any }>();@@ -25,6 +26,7 @@ const metaData = useMetaData({ ...videoData }, true);const { stateFolder, stateDirectory } = storeToRefs(useContentStore());const { setContextMenu } = useAppStore();+const { userData } = storeToRefs(useAuthStore());const isAudio = computed(() => {return videoData.metadata?.media_type === MediaType.AUDIO;@@ -35,6 +37,7 @@ const contextMenuItems = computed(() => {{text: 'Edit',icon: CircumEdit,+ hidden: !userData.value,action: () => {emit('otherAction', videoData?.id, 'edit');},diff --git a/resources/js/components/panels/VideoSidebar.vue b/resources/js/components/panels/VideoSidebar.vueindex 9f9ca6f1..9c719fd9 100755--- a/resources/js/components/panels/VideoSidebar.vue+++ b/resources/js/components/panels/VideoSidebar.vue@@ -35,7 +35,7 @@ const handleShare = (link: string) => {shareModal.toggleModal(true);};-const handleFolderAction = (id: number, action: 'edit' | 'share' = 'edit') => {+const handleFolderAction = (e: Event, id: number, action: 'edit' | 'share' = 'edit') => {const folder = stateDirectory.value?.folders?.find((folder: FolderResource) => folder.id === id);if (!folder?.id) return;@@ -71,7 +71,7 @@ watch(id="list-content-folders":data="stateDirectory.folders":row="FolderCard"- :clickAction="handleFolderAction"+ :otherAction="handleFolderAction":useToolbar="false":startAscending="true":row-attributes="{diff --git a/resources/js/components/pinesUI/ContextMenu.vue b/resources/js/components/pinesUI/ContextMenu.vueindex abdb140d..c98ba95c 100644--- a/resources/js/components/pinesUI/ContextMenu.vue+++ b/resources/js/components/pinesUI/ContextMenu.vue@@ -127,7 +127,7 @@ defineExpose({ contextMenuToggle, contextMenuOpen });><slot name="content"><ContextMenuItem- v-for="(item, index) in items ?? []"+ v-for="(item, index) in (items ?? []).filter((item) => !item.hidden)"v-bind="item":key="index":class="itemStyle"diff --git a/resources/js/stores/AppStore.ts b/resources/js/stores/AppStore.tsindex 76857ac4..d23b8a88 100644--- a/resources/js/stores/AppStore.ts+++ b/resources/js/stores/AppStore.ts@@ -119,6 +119,7 @@ export const useAppStore = defineStore('App', () => {}const setContextMenu = (event: MouseEvent, options: ContextMenuType) => {+ if (!options.items || options.items.length === 0) return;contextMenuEvent.value = event;contextMenuItems.value = options.items ?? contextMenuItems.value;contextMenuStyle.value = options.style ?? '';diff --git a/resources/js/types/types.ts b/resources/js/types/types.tsindex 03632ce1..35076dec 100644--- a/resources/js/types/types.ts+++ b/resources/js/types/types.ts@@ -59,6 +59,7 @@ export interface ContextMenuItem {selectedStyle?: string;selected?: boolean;disabled?: boolean;+ hidden?: boolean;icon?: Component;}diff --git a/resources/js/views/VideoView.vue b/resources/js/views/VideoView.vueindex b46064e6..e3f672de 100755--- a/resources/js/views/VideoView.vue+++ b/resources/js/views/VideoView.vue@@ -176,7 +176,7 @@ watch(watch(() => [route.params.category, route.params.folder],- async ([newCategory, newFolder]) => {+ async () => {await reload();},{ immediate: false },