A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
UI Updates Including edit / share video while watching another, tag list search, modal scroll lock at current scroll position, thinner scroll bars in some places, tag scrolling, single context menu
aminnausinf0c6e8a78898
diff --git a/resources/css/app.css b/resources/css/app.cssindex a7da045f..d01912ae 100755--- a/resources/css/app.css+++ b/resources/css/app.css@@ -35,4 +35,49 @@[v-cloak] {display: none;}++ @supports (scrollbar-width: thin) {+ .scrollbar-thin {+ scrollbar-width: thin;+ }+ }++ /* Custom scrollbar width */++ /* Scrollbar track */++ @supports selector(::-webkit-scrollbar) {+ .scrollbar-minimal::-webkit-scrollbar {+ width: 0.35rem;+ }+ .scrollbar-minimal::-webkit-scrollbar-track {+ background: transparent;+ border-radius: 9999px;+ }++ .scrollbar-minimal::-webkit-scrollbar-thumb {+ background: #8a8a8a;+ border-radius: 9999px;+ }++ .scrollbar-minimal::-webkit-scrollbar-thumb:hover {+ background: #636363;+ }++ .scrollbar-minimal:is(.dark *)::-webkit-scrollbar-thumb {+ background: #9e9e9e;+ }++ .scrollbar-minimal:is(.dark *)::-webkit-scrollbar-thumb:hover {+ background: #d0d0d0;+ }++ .scrollbar-minimal.scrollbar-hover::-webkit-scrollbar {+ width: 0rem;+ }++ .group:hover .scrollbar-minimal.scrollbar-hover::-webkit-scrollbar {+ width: 0.35rem;+ }+ }}diff --git a/resources/js/App.vue b/resources/js/App.vueindex 522f7b28..3142f49b 100755--- a/resources/js/App.vue+++ b/resources/js/App.vue@@ -1,17 +1,18 @@<script setup lang="ts">import type { ToastPostion } from './types/pinesTypes';-import { onMounted, ref, watch } from 'vue';+import { onMounted, ref, useTemplateRef, watch } from 'vue';import { getScreenSize } from './service/util';import { storeToRefs } from 'pinia';import { useAppStore } from '@/stores/AppStore';import { RouterView } from 'vue-router';import ToastController from '@/components/pinesUI/ToastController.vue';+import ContextMenu from '@/components/pinesUI/ContextMenu.vue';const appStore = useAppStore();const toastPosition = ref<ToastPostion>();-const { lightMode, ambientMode, playbackHeatmap } = storeToRefs(appStore);+const { lightMode, ambientMode, playbackHeatmap, contextMenuItems, contextMenuStyle, contextMenuItemStyle, contextMenuEvent } = storeToRefs(appStore);const { toggleDarkMode, initDarkMode, initAmbientMode, setAmbientMode, initPlaybackHeatmap, setPlaybackHeatmap } = appStore;onMounted(async () => {@@ -35,4 +36,5 @@ watch(playbackHeatmap, setPlaybackHeatmap, { immediate: false });<template><ToastController v-if="toastPosition" :position="toastPosition" /><RouterView />+ <ContextMenu ref="contextMenu" :items="contextMenuItems" :style="contextMenuStyle" :itemStyle="contextMenuItemStyle ?? 'hover:bg-purple-600 hover:text-white'" /></template>diff --git a/resources/js/components/cards/CategoryCard.vue b/resources/js/components/cards/CategoryCard.vueindex b84ffdd0..90abac54 100644--- a/resources/js/components/cards/CategoryCard.vue+++ b/resources/js/components/cards/CategoryCard.vue@@ -75,10 +75,10 @@ watch(</script><template>- <div class="flex flex-col rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-white ring-1 ring-gray-900/5 w-full group">+ <div class="flex flex-col rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-white dark:hover:bg-primary-dark-600 hover:bg-primary-800 ring-1 ring-gray-900/5 w-full group"><RouterLink :to="`/${data?.name}`" class="w-full h-40"><img- class="w-full h-full object-cover rounded-t-md shadow-md mb-auto ring-1 ring-gray-900/5"+ class="w-full h-full object-cover rounded-t-md shadow-sm mb-auto ring-1 ring-gray-900/5":src="defaultFolder?.series?.thumbnail_url ??'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'diff --git a/resources/js/components/cards/DashboardCard.vue b/resources/js/components/cards/DashboardCard.vueindex 0d805880..db24f3bc 100644--- a/resources/js/components/cards/DashboardCard.vue+++ b/resources/js/components/cards/DashboardCard.vue@@ -19,7 +19,7 @@ const props = withDefaults(</script><template><div- :class="`flex col-span-${cols} row-span-${rows} flex-col gap-2 p-3 overflow-clip rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-white ring-1 ring-gray-900/5 w-full ${props.class}`"+ :class="`flex col-span-${cols} row-span-${rows} flex-col gap-2 p-3 overflow-clip rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-white ring-1 ring-gray-900/5 w-full ${props.class ?? ''}`"><header class="flex flex-wrap justify-between items-center gap-4 mb-3 @md:mb-6"><div class="flex-1 basis-0 flex-grow-[10000] max-w-full">diff --git a/resources/js/components/cards/FolderCard.vue b/resources/js/components/cards/FolderCard.vueindex 3dfc706c..cfb83536 100755--- a/resources/js/components/cards/FolderCard.vue+++ b/resources/js/components/cards/FolderCard.vue@@ -51,10 +51,7 @@ const folderLink = ref(`/${props.categoryName}/${props.folder.name}`);</div></section><section class="flex flex-col sm:flex-row sm:justify-between w-full flex-wrap gap-2 text-sm">- <h3- class="text-neutral-500 w-full text-wrap truncate sm:text-nowrap flex-1"- :title="`${props.folder.file_count} Episode${props.folder.file_count !== 1 ? 's' : ''}`"- >+ <h3 class="text-neutral-500 w-full text-wrap truncate sm:text-nowrap flex-1" :title="`${props.folder.file_count} Episode${props.folder.file_count !== 1 ? 's' : ''}`">{{ props.folder.file_count }} Episode{{ props.folder.file_count !== 1 ? 's' : '' }}</h3><h3 class="truncate text-nowrap sm:text-right text-neutral-500 w-fit lg:hidden xl:block">diff --git a/resources/js/components/cards/HoverCard.vue b/resources/js/components/cards/HoverCard.vueindex 5ae5dab4..638517f4 100644--- a/resources/js/components/cards/HoverCard.vue+++ b/resources/js/components/cards/HoverCard.vue@@ -11,7 +11,6 @@ const props = withDefaults(margin?: number;}>(),{- positionClasses: 'z-30 left-20 bottom-10',hoverCardDelay: 600,hoverCardLeaveDelay: 500,margin: 0,@@ -73,7 +72,7 @@ const updateTooltipPosition = (event: MouseEvent) => {@mouseleave="hoverCardLeave"v-show="hoverCardHovered"v-cloak- :class="`flex ${positionClasses} absolute overflow-auto transition-opacity ease-in-out duration-200 md:max-w-xl xl:max-w-3xl text-sm p-3 h-fit bg-white dark:odd:bg-primary-dark-600/70 dark:bg-neutral-800/70 backdrop-blur-lg border dark:border-none rounded-md shadow-md border-neutral-200/70 gap-2 items-center`"+ :class="`${positionClasses ?? ''} flex absolute overflow-auto transition-opacity ease-in-out duration-200 md:max-w-xl xl:max-w-3xl text-sm p-3 h-fit bg-white dark:odd:bg-primary-dark-600/70 dark:bg-neutral-800/70 backdrop-blur-lg border dark:border-none rounded-md shadow-md border-neutral-200/70 gap-2 items-center`":style="tooltipStyles"><slot name="icon">diff --git a/resources/js/components/cards/StatsCard.vue b/resources/js/components/cards/StatsCard.vueindex c3a8fb17..e12c5a9f 100644--- a/resources/js/components/cards/StatsCard.vue+++ b/resources/js/components/cards/StatsCard.vue@@ -2,7 +2,7 @@const props = defineProps<{ title: string; data?: any[]; forceCount?: number; class?: string }>();</script><template>- <div :class="`flex flex-col gap-2 p-3 overflow-clip rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-white ring-1 ring-gray-900/5 flex-1 w-1/3 ${props.class}`">+ <div :class="`flex flex-col gap-2 p-3 overflow-clip rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-white ring-1 ring-gray-900/5 flex-1 w-1/3 ${props.class ?? ''}`"><span><slot name="icon"> </slot><p class="text-sm dark:text-slate-400 text-slate-500 max-w-full text-nowrap">{{ props.title }}</p>diff --git a/resources/js/components/cards/TaskCard.vue b/resources/js/components/cards/TaskCard.vueindex e22d0a50..7486c7d5 100644--- a/resources/js/components/cards/TaskCard.vue+++ b/resources/js/components/cards/TaskCard.vue@@ -120,10 +120,14 @@ watch(: `Created: ${toFormattedDate(new Date(data.created_at), true, within24Hrs(data.created_at) ? { hour: '2-digit', minute: '2-digit' } : undefined)}`}}</h4>- <h4 class="text-xs text-neutral-500 dark:text-neutral-400 truncate capitalize md:ml-auto" title="Time">+ <h4+ v-if="within24Hrs(data.started_at ?? data.created_at) || data.duration"+ class="text-xs text-neutral-500 dark:text-neutral-400 truncate capitalize md:ml-auto"+ title="Time"+ >{{ data.duration ? 'Duration:' : data.started_at ? 'Started: ' : 'Scheduled: ' }}</h4>- <h4 class="text-xs text-neutral-500 dark:text-neutral-400 capitalize md:me-auto" title="Time">+ <h4 class="text-xs text-neutral-500 dark:text-neutral-400 capitalize md:me-auto line-clamp-1" title="Time">{{ data.duration ? toFormattedDuration(data.duration, false) : toTimeSpan(data.started_at ?? data.created_at, ' UTC') }}</h4></span>diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vueindex 4e4e3a25..63c7feaa 100755--- a/resources/js/components/cards/VideoCard.vue+++ b/resources/js/components/cards/VideoCard.vue@@ -1,22 +1,27 @@<script setup lang="ts">+import type { ContextMenuItem } from '@/types/types';+import { useContentStore } from '@/stores/ContentStore';import { toFormattedDate } from '@/service/util';+import { computed, watch } from 'vue';import { storeToRefs } from 'pinia';+import { useAppStore } from '@/stores/AppStore';import { RouterLink } from 'vue-router';-import { watch } from 'vue';+import ContextMenu from '@/components/pinesUI/ContextMenu.vue';import useMetaData from '@/composables/useMetaData';+import HoverCard from '@/components/cards/HoverCard.vue';import ChipTag from '@/components/labels/ChipTag.vue';import ProiconsComment from '~icons/proicons/comment';-import HoverCard from './HoverCard.vue';+import CircumShare1 from '~icons/circum/share-1';+import CircumEdit from '~icons/circum/edit';-const emit = defineEmits(['clickAction']);+const emit = defineEmits(['clickAction', 'otherAction']);const props = defineProps(['data', 'index', 'currentID']);const metaData = useMetaData({ ...props.data, id: props.data.id, skipBaseURL: true });-const ContentStore = useContentStore();--const { stateFolder, stateDirectory } = storeToRefs(ContentStore);+const { stateFolder, stateDirectory } = storeToRefs(useContentStore());+const { setContextMenu } = useAppStore();const handlePlay = () => {emit('clickAction', props.data?.id);@@ -26,6 +31,26 @@ const handlePropsUpdate = () => {metaData.updateData({ ...props.data, id: props.data.id, skipBaseURL: true });};+const contextMenuItems = computed(() => {+ let items: ContextMenuItem[] = [+ {+ text: 'Edit',+ icon: CircumEdit,+ action: () => {+ emit('otherAction', props.data?.id, 'edit');+ },+ },+ {+ text: 'Share',+ icon: CircumShare1,+ action: () => {+ emit('otherAction', props.data?.id, 'share');+ },+ },+ ];+ return items;+});+watch(props, handlePropsUpdate, { immediate: true, deep: true });// @click.left.stop.prevent.capture="handlePlay"</script>@@ -37,6 +62,11 @@ watch(props, handlePropsUpdate, { immediate: true, deep: true });class="relative flex flex-wrap flex-col gap-x-8 gap-y-4 p-3 w-full shadow rounded-md ring-inset cursor-pointer dark:bg-primary-dark-800/70 dark:hover:bg-violet-700/70 bg-gray-100 hover:bg-violet-400/30 odd:bg-violet-100 dark:odd:bg-primary-dark-600":data-id="props.data?.id":data-path="`../${props.data?.path}`"+ @contextmenu="+ (e: any) => {+ setContextMenu(e, { items: contextMenuItems });+ }+ "><section class="flex justify-between gap-4 w-full items-center overflow-hidden group"><HoverCard class="items-end" v-if="metaData?.fields.description" :hover-card-delay="400" :hover-card-leave-delay="300">@@ -65,18 +95,18 @@ watch(props, handlePropsUpdate, { immediate: true, deep: true });{{ metaData?.fields?.duration }}</h4></section>- <section class="flex justify-between gap-4 w-full items-start text-sm sm:w-auto text-neutral-500 dark:text-neutral-400">+ <section class="flex justify-between gap-4 w-full items-start text-sm sm:w-auto text-neutral-500 dark:text-neutral-400 group"><span class="flex gap-2 items-center w-full flex-1"><h4 class="text-nowrap text-start truncate" title="View Count">{{ metaData?.fields?.views }}</h4>- <span class="hidden sm:flex flex-wrap gap-1 max-h-5 h-full sm:max-h-[24px] px-2 flex-1" title="Tags">+ <span class="hidden sm:flex flex-wrap gap-1 max-h-5 h-full sm:max-h-[24px] px-2 flex-1 overflow-y-auto scrollbar-minimal scrollbar-hover" title="Tags"><ChipTagv-for="(tag, index) in props.data?.video_tags"v-bind:key="index":label="tag.name"- :colour="'bg-neutral-200 leading-none text-neutral-500 shadow dark:bg-neutral-900 hover:bg-violet-600 hover:text-neutral-50 hover:dark:bg-violet-600/90 z-20'"+ :colour="'bg-neutral-200 leading-none text-neutral-500 shadow dark:bg-neutral-900 hover:bg-violet-600 hover:text-neutral-50 hover:dark:bg-violet-600/90'"/></span></span>diff --git a/resources/js/components/charts/PulseLineChart.vue b/resources/js/components/charts/PulseLineChart.vueindex 7139ebba..ef5dd345 100644--- a/resources/js/components/charts/PulseLineChart.vue+++ b/resources/js/components/charts/PulseLineChart.vue@@ -62,7 +62,7 @@ const defaultChartOptions = {<template><Line- :class="`${props.class} w-full ring-1 ring-gray-900/5 bg-white dark:bg-primary-dark-800 rounded-md shadow-sm`"+ :class="`${props.class ?? ''} w-full ring-1 ring-gray-900/5 bg-white dark:bg-primary-dark-800 rounded-md shadow-sm`":data="props.chartData ?? defaultChartData":options="props.chartOptions ?? defaultChartOptions"></Line>diff --git a/resources/js/components/inputs/ButtonIcon.vue b/resources/js/components/inputs/ButtonIcon.vueindex 3e98ed96..efca63c1 100755--- a/resources/js/components/inputs/ButtonIcon.vue+++ b/resources/js/components/inputs/ButtonIcon.vue@@ -32,7 +32,7 @@ const props = withDefaults(aria-disabled:cursor-not-allowed aria-disabled:hover:ring-neutral-200 aria-disabled:hover:dark:ring-neutral-700 aria-disabled:ring-1 aria-disabled:opacity-60`: ''}- ${props.class}`"+ ${props.class ?? ''}`":type="props.type":title="props.title ?? 'Button'":aria-disabled="disabled"@@ -55,7 +55,7 @@ const props = withDefaults(disabled:cursor-not-allowed disabled:hover:ring-neutral-200 disabled:hover:dark:ring-neutral-700 disabled:ring-1`: ''}- ${props.class} `"+ ${props.class ?? ''} `":type="props.type":disabled="props.disabled":title="props.title ?? 'Icon'"diff --git a/resources/js/components/inputs/ButtonText.vue b/resources/js/components/inputs/ButtonText.vueindex 3a385916..1f38582a 100755--- a/resources/js/components/inputs/ButtonText.vue+++ b/resources/js/components/inputs/ButtonText.vue@@ -27,7 +27,7 @@ const props = withDefaults(ring-1 ring-neutral-200 dark:ring-neutral-700 hocus:ring-[0.125rem]focus:ring-indigo-400 dark:focus:ring-indigo-500 hover:ring-violet-400 hover:dark:ring-violet-700text-gray-900 dark:text-neutral-100 bg-white dark:bg-primary-dark-800- ${props.class} aria-disabled:cursor-not-allowed aria-disabled:hover:ring-neutral-200 aria-disabled:hover:dark:ring-neutral-700 aria-disabled:ring-1 aria-disabled:opacity-60`"+ aria-disabled:cursor-not-allowed aria-disabled:hover:ring-neutral-200 aria-disabled:hover:dark:ring-neutral-700 aria-disabled:ring-1 aria-disabled:opacity-60 ${props.class ?? ''}`":type="type":title="title":aria-disabled="disabled"@@ -43,7 +43,7 @@ const props = withDefaults(ring-1 ring-neutral-200 dark:ring-neutral-700 hocus:ring-[0.125rem]focus:ring-indigo-400 dark:focus:ring-indigo-500 hover:ring-violet-400 hover:dark:ring-violet-700text-gray-900 dark:text-neutral-100 bg-white dark:bg-primary-dark-800- ${props.class} disabled:cursor-not-allowed disabled:hover:ring-neutral-200 disabled:hover:dark:ring-neutral-700 disabled:ring-1 disabled:opacity-60`"+ disabled:cursor-not-allowed disabled:hover:ring-neutral-200 disabled:hover:dark:ring-neutral-700 disabled:ring-1 disabled:opacity-60 ${props.class ?? ''}`":type="type":disabled="disabled":title="title ?? 'Button'"diff --git a/resources/js/components/inputs/FormTextArea.vue b/resources/js/components/inputs/FormTextArea.vueindex 887be185..de9fb03a 100755--- a/resources/js/components/inputs/FormTextArea.vue+++ b/resources/js/components/inputs/FormTextArea.vue@@ -21,7 +21,8 @@ const resize = () => {disabled:cursor-not-allowed disabled:opacity-50text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-700 placeholder:text-neutral-400ring-inset focus:ring-inset ring-1 ring-neutral-200 dark:ring-neutral-700- focus:ring-[0.125rem] focus:ring-indigo-400 dark:focus:ring-indigo-500`"+ focus:ring-[0.125rem] focus:ring-indigo-400 dark:focus:ring-indigo-500+ scrollbar-thin`":name="field.name":title="field.name":required="field.required"diff --git a/resources/js/components/labels/ChipTag.vue b/resources/js/components/labels/ChipTag.vueindex 13ed1f6a..00905fd7 100644--- a/resources/js/components/labels/ChipTag.vue+++ b/resources/js/components/labels/ChipTag.vue@@ -8,7 +8,7 @@ const props = defineProps(['label', 'colour', 'textClass', 'URL', 'removeable'])<template><RouterLinkv-if="props.URL"- :class="`p-1 px-2 text-sm ${props.textClass} leading-none rounded-xl truncate lowercase text-neutral-100 dark:text-neutral-300 ${props.colour ? `${props.colour}` : 'bg-violet-600 dark:bg-violet-900/90'} shrink-0 transition-colors duration-200 `"+ :class="`p-1 px-2 text-sm ${props.textClass ?? ''} leading-none rounded-xl truncate lowercase text-neutral-100 dark:text-neutral-300 ${props.colour ? `${props.colour}` : 'bg-violet-600 dark:bg-violet-900/90'} shrink-0 transition-colors duration-200 `":to="props.URL">{{ props.label }}@@ -23,13 +23,13 @@ const props = defineProps(['label', 'colour', 'textClass', 'URL', 'removeable'])</RouterLink><pv-else- :class="`${`p-1 px-2 text-sm ${props.textClass} leading-none rounded-xl truncate lowercase text-neutral-100 dark:text-neutral-300 ${props.colour ? `${props.colour}` : 'bg-violet-600 dark:bg-violet-900/90'} shrink-0 transition-colors duration-200 `} cursor-default ${removeable ? 'flex gap-1 items-center justify-between' : ''}`"+ :class="`p-1 px-2 text-sm ${props.textClass ?? ''} leading-none rounded-xl truncate lowercase text-neutral-100 dark:text-neutral-300 ${props.colour ? `${props.colour}` : 'bg-violet-600 dark:bg-violet-900/90'} shrink-0 transition-colors duration-200 cursor-default ${removeable ? 'flex gap-1 items-center justify-between' : ''}`">{{ props.label }}<ButtonCornerv-if="removeable":positionClasses="'w-4 h-4'"- :textClasses="`text-white dark:text-rose-700 ${textClass}`"+ :textClasses="`text-white dark:text-rose-700 ${textClass ?? ''}`":colourClasses="'dark:bg-neutral-900/20 dark:hover:bg-rose-700 hover:bg-rose-300 hover:text-rose-700 dark:hover:text-white drop-shadow'":label="'Remove'"@click.stop.prevent="$emit('clickAction')"diff --git a/resources/js/components/labels/FormInputLabel.vue b/resources/js/components/labels/FormInputLabel.vueindex 3886e0f4..d97852ec 100755--- a/resources/js/components/labels/FormInputLabel.vue+++ b/resources/js/components/labels/FormInputLabel.vue@@ -3,10 +3,7 @@ const props = defineProps(['field', 'textSize', 'class']);</script><template>- <label- :for="field?.name"- :class="`block font-medium text-gray-700 dark:text-neutral-200 ${props.class} ${textSize ? textSize : 'text-sm'}`"- >+ <label :for="field?.name" :class="`block font-medium text-gray-700 dark:text-neutral-200 ${textSize ? textSize : 'text-sm'} ${props.class ?? ''}`">{{ field?.text }}</label><p v-if="field?.subtext" class="text-sm/6 text-gray-500 dark:text-gray-400">{{ field.subtext }}</p>diff --git a/resources/js/components/pinesUI/ContextMenu.vue b/resources/js/components/pinesUI/ContextMenu.vuenew file mode 100644index 00000000..bce8b4d5--- /dev/null+++ b/resources/js/components/pinesUI/ContextMenu.vue@@ -0,0 +1,175 @@+<script setup lang="ts">+import { nextTick, onMounted, onUnmounted, ref, Teleport, useTemplateRef } from 'vue';+import { OnClickOutside } from '@vueuse/components';++import ContextMenuItem from '@/components/pinesUI/ContextMenuItem.vue';+import { useMouseInElement } from '@vueuse/core';+import type { ContextMenu } from '@/types/types';++const props = withDefaults(defineProps<ContextMenu>(), {+ positionClasses: 'z-30 left-20 bottom-10',+ style: '',+ disabled: false,+});++const contextmenu = useTemplateRef('contextmenu');+const { isOutside } = useMouseInElement(contextmenu);++const contextMenuOpen = ref(false);+const menuStyles = ref<Record<string, string>>({});++const contextMenuToggle = async (event: any, override: boolean = true) => {+ if (!override || props.disabled) {+ document.removeEventListener('contextmenu', closeContextMenu);+ contextMenuOpen.value = false;+ return;+ }++ if (!contextMenuOpen.value) {+ document.addEventListener('contextmenu', closeContextMenu);+ contextMenuOpen.value = true;+ }++ event.preventDefault();+ event.stopPropagation();+ contextmenu.value.$el.classList.add('opacity-0');++ await nextTick(() => {+ calculateContextMenuPosition(event);+ calculateSubMenuPosition(event);+ contextmenu.value.$el.classList.remove('opacity-0');+ });+};+function calculateContextMenuPosition(clickEvent: MouseEvent) {+ if (window.innerHeight < clickEvent.clientY + contextmenu.value.$el.offsetHeight) {+ contextmenu.value.$el.style.top = window.innerHeight - contextmenu.value.$el.offsetHeight + window.scrollY + 'px';+ } else {+ contextmenu.value.$el.style.top = clickEvent.clientY + window.scrollY + 'px';+ }+ if (window.innerWidth < clickEvent.clientX + contextmenu.value.$el.offsetWidth) {+ contextmenu.value.$el.style.left = clickEvent.clientX - contextmenu.value.$el.offsetWidth + window.scrollX + 'px';+ } else {+ contextmenu.value.$el.style.left = clickEvent.clientX + 'px';+ }+}+async function calculateSubMenuPosition(clickEvent: MouseEvent) {+ await nextTick();+ let submenus: NodeListOf<HTMLElement> = document.querySelectorAll('[data-submenu]');+ let contextMenuWidth = contextmenu.value.$el.offsetWidth;+ for (let i = 0; i < submenus.length; i++) {+ if (window.innerWidth < clickEvent.clientX + contextMenuWidth + submenus[i].offsetWidth) {+ submenus[i].classList.add('left-0', '-translate-x-full');+ submenus[i].classList.remove('right-0', 'translate-x-full');+ } else {+ submenus[i].classList.remove('left-0', '-translate-x-full');+ submenus[i].classList.add('right-0', 'translate-x-full');+ }++ let previousElementSiblingRect = submenus[i].previousElementSibling?.getBoundingClientRect();+ if (previousElementSiblingRect && window.innerHeight < previousElementSiblingRect.top + submenus[i].offsetHeight) {+ let heightDifference = window.innerHeight - previousElementSiblingRect.top - submenus[i].offsetHeight;+ submenus[i].style.top = heightDifference + 'px';+ } else {+ submenus[i].style.top = '';+ }+ }+}++const closeContextMenu = (e: any) => {+ if (contextMenuOpen.value && isOutside.value) {+ e.preventDefault();+ document.removeEventListener('contextmenu', closeContextMenu);+ contextMenuOpen.value = false;+ }+};++onMounted(() => {+ window.addEventListener('resize', closeContextMenu);+});++onUnmounted(() => {+ window.removeEventListener('resize', closeContextMenu);+ // document.removeEventListener('contextmenu', closeContextMenu);+});++defineExpose({ contextMenuToggle, contextMenuOpen });+</script>+<template>+ <!-- <div+ @contextmenu="(event: any) => contextMenuToggle(event)"+ class="relative z-50 flex h-[150px] w-[300px] text-sm items-center justify-center rounded-md border border-neutral-300 border-dashed text-neutral-800"+ >+ <span class="cursor-default text-neutral-400">Right click here</span>+ </div> -->+ <Transition+ enter-active-class="ease-out duration-150"+ enter-from-class="scale-[0.8] opacity-60"+ enter-to-class="scale-100 opacity-100"+ leave-active-class="ease-in-out duration-100"+ leave-from-class="scale-100 opacity-100"+ leave-to-class="scale-[0.1] opacity-50"+ >+ <Teleport to="body">+ <OnClickOutside+ v-show="contextMenuOpen"+ @trigger="+ (e: any) => {+ contextMenuToggle(e, false);+ }+ "+ ref="contextmenu"+ :class="`absolute z-50 w-48 max-w-[100vw] p-1 transition-all bg-white dark:bg-neutral-800/90 backdrop-blur-sm border border-neutral-200/70 dark:border-neutral-700/10 rounded-md shadow-sm ${style}`"+ :style="menuStyles"+ v-cloak+ >+ <slot name="content">+ <ContextMenuItem+ v-if="items"+ v-for="(item, index) in items"+ v-bind="item"+ :key="index"+ :class="itemStyle"+ @click="+ (e: any) => {+ contextMenuToggle(e, false);+ }+ "+ />+ <span v-else>+ <div+ @click="(e: any) => contextMenuToggle(e, false)"+ class="relative flex cursor-default select-none group items-center rounded px-2 py-1.5 hover:bg-neutral-100 outline-none pl-8 data-[disabled]:opacity-50 data-[disabled]:pointer-events-none"+ >+ <span>Edit</span>+ <span class="ml-auto text-xs tracking-widest text-neutral-400 group-hover:text-neutral-600">⌘[</span>+ </div>+ <div+ @click="(e: any) => contextMenuToggle(e, false)"+ class="relative flex cursor-default select-none group items-center rounded px-2 py-1.5 hover:bg-purple-600 hover:text-white outline-none pl-8 data-[disabled]:opacity-50 data-[disabled]:pointer-events-none"+ >+ <svg class="absolute w-4 h-4 -mt-px left-2" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">+ <path+ stroke-linecap="round"+ stroke-linejoin="round"+ d="M15.75 17.25v3.375c0 .621-.504 1.125-1.125 1.125h-9.75a1.125 1.125 0 01-1.125-1.125V7.875c0-.621.504-1.125 1.125-1.125H6.75a9.06 9.06 0 011.5.124m7.5 10.376h3.375c.621 0 1.125-.504 1.125-1.125V11.25c0-4.46-3.243-8.161-7.5-8.876a9.06 9.06 0 00-1.5-.124H9.375c-.621 0-1.125.504-1.125 1.125v3.5m7.5 10.375H9.375a1.125 1.125 0 01-1.125-1.125v-9.25m12 6.625v-1.875a3.375 3.375 0 00-3.375-3.375h-1.5a1.125 1.125 0 01-1.125-1.125v-1.5a3.375 3.375 0 00-3.375-3.375H9.75"+ />+ </svg>+ <span>Duplicate</span>+ </div>+ <div+ @click="(e: any) => contextMenuToggle(e, false)"+ class="relative flex cursor-default select-none group items-center rounded px-2 py-1.5 hover:bg-purple-600 hover:text-white outline-none pl-8 data-[disabled]:opacity-50 data-[disabled]:pointer-events-none"+ >+ <svg class="absolute w-4 h-4 -mt-px left-2" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">+ <path stroke-linecap="round" stroke-linejoin="round" d="M21 21l-5.197-5.197m0 0A7.5 7.5 0 105.196 5.196a7.5 7.5 0 0010.607 10.607z" />+ </svg>+ <span>Quick Look</span>+ </div>+ <ContextMenuItem text="Edit" class="hover:bg-purple-600 hover:text-white" />+ <ContextMenuItem text="Share" />+ </span>+ </slot>+ </OnClickOutside>+ </Teleport>+ </Transition>+</template>diff --git a/resources/js/components/pinesUI/ContextMenuItem.vue b/resources/js/components/pinesUI/ContextMenuItem.vuenew file mode 100644index 00000000..2e4c9c6a--- /dev/null+++ b/resources/js/components/pinesUI/ContextMenuItem.vue@@ -0,0 +1,87 @@+<script setup lang="ts">+import type { ContextMenuItem } from '@/types/types';++import { RouterLink } from 'vue-router';+const props = withDefaults(defineProps<ContextMenuItem>(), {});+</script>+<template>+ <a+ v-if="external && url"+ :href="url"+ target="_blank"+ :class="`${selected ? (selectedStyle ?? 'font-bold text-violet-500') : ''} cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded px-2 py-1.5 text-sm outline-none transition-colors data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 ${style}`"+ >+ <slot name="icon">+ <component v-if="icon" :is="icon" class="w-4 h-4 mr-2" />+ <span+ v-else+ width="24"+ height="24"+ viewBox="0 0 24 24"+ fill="none"+ stroke="currentColor"+ stroke-width="2"+ stroke-linecap="round"+ stroke-linejoin="round"+ class="w-4 h-4 mr-2"+ >+ </span>+ </slot>+ <span class="text-nowrap">{{ text }}</span+ ><span class="ml-auto text-xs tracking-widest opacity-60">{{ shortcut ?? '' }}</span>+ </a>+ <RouterLink+ v-else-if="url"+ :to="disabled ? '' : url"+ :data-disabled="disabled"+ :class="`${selected ? (selectedStyle ?? 'font-bold text-violet-500') : ''} cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded px-2 py-1.5 text-sm outline-none transition-colors data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 ${style}`"+ >+ <slot name="icon">+ <component v-if="icon" :is="icon" class="w-4 h-4 mr-2" />+ <span+ v-else+ width="24"+ height="24"+ viewBox="0 0 24 24"+ fill="none"+ stroke="currentColor"+ stroke-width="2"+ stroke-linecap="round"+ stroke-linejoin="round"+ class="w-4 h-4 mr-2"+ >+ </span>+ </slot>+ <span class="text-nowrap">{{ text }}</span>+ <span class="ml-auto text-xs tracking-widest opacity-60">{{ shortcut ?? '' }}</span>+ </RouterLink>+ <button+ v-else+ :disabled="disabled"+ :class="`${selected ? (selectedStyle ?? 'font-bold text-violet-500') : ''} cursor-pointer relative w-full flex select-none hover:bg-neutral-100 dark:hover:bg-neutral-900 items-center rounded px-2 py-1.5 text-sm outline-none transition-colors data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 ${style}`"+ :onclick="+ () => {+ if (action) action();+ }+ "+ >+ <slot name="icon">+ <component v-if="icon" :is="icon" class="w-4 h-4 mr-2" />+ <span+ v-else+ width="24"+ height="24"+ viewBox="0 0 24 24"+ fill="none"+ stroke="currentColor"+ stroke-width="2"+ stroke-linecap="round"+ stroke-linejoin="round"+ class="w-4 h-4 mr-2"+ >+ </span>+ </slot>+ <span class="text-nowrap">{{ text }}</span>+ <span class="ml-auto text-xs tracking-widest opacity-60">{{ shortcut ?? '' }}</span>+ </button>+</template>diff --git a/resources/js/components/pinesUI/DropdownMenu.vue b/resources/js/components/pinesUI/DropdownMenu.vueindex ca780ff8..547b1553 100755--- a/resources/js/components/pinesUI/DropdownMenu.vue+++ b/resources/js/components/pinesUI/DropdownMenu.vue@@ -104,8 +104,8 @@ const { userData } = storeToRefs(authStore);leave-from-class="-translate-y-0"leave-to-class="-translate-y-4 opacity-0">- <div v-show="props.dropdownOpen" class="absolute top-0 z-50 max-w-screen mt-12 -right-[0.25rem]" v-cloak id="userDropdown">- <div class="w-56 mx-auto">+ <div v-show="props.dropdownOpen" class="absolute top-0 z-50 mt-12 -right-[0.25rem]" v-cloak id="userDropdown">+ <div class="w-56 max-w-[80vw] mx-auto"><divv-if="userData"class="p-1 mt-1 bg-white dark:bg-neutral-800/70 backdrop-blur-lg border rounded-md shadow-md border-neutral-200/70 dark:border-neutral-700 text-neutral-700 dark:text-neutral-100"diff --git a/resources/js/components/pinesUI/HoverCard.vue b/resources/js/components/pinesUI/HoverCard.vueindex b65c8bca..a6a97ad0 100644--- a/resources/js/components/pinesUI/HoverCard.vue+++ b/resources/js/components/pinesUI/HoverCard.vue@@ -64,18 +64,9 @@ const updateTooltipPosition = (event: MouseEvent) => {<img src="https://cdn.devdojo.com/users/June2022/devdojo.jpg" alt="devdojo image" class="rounded-full w-14 h-14" /><div class="relative"><p class="mb-1 font-bold">@thedevdojo</p>- <p class="mb-1 text-sm text-gray-600">- The creative platform for developers. Community, tools, products, and more- </p>+ <p class="mb-1 text-sm text-gray-600">The creative platform for developers. Community, tools, products, and more</p><p class="flex items-center space-x-1 text-xs text-gray-400">- <svg- xmlns="http://www.w3.org/2000/svg"- fill="none"- viewBox="0 0 24 24"- stroke-width="1.5"- stroke="currentColor"- class="w-5 h-5"- >+ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5"><pathstroke-linecap="round"stroke-linejoin="round"diff --git a/resources/js/components/pinesUI/InputMultiChip.vue b/resources/js/components/pinesUI/InputMultiChip.vueindex c4c96518..0374edd3 100644--- a/resources/js/components/pinesUI/InputMultiChip.vue+++ b/resources/js/components/pinesUI/InputMultiChip.vue@@ -1,5 +1,5 @@<script setup lang="ts">-import { onMounted, ref, useTemplateRef, watch } from 'vue';+import { computed, onMounted, onUnmounted, ref, useTemplateRef, watch } from 'vue';import { OnClickOutside } from '@vueuse/components';import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component.mjs';@@ -74,6 +74,16 @@ const selectableItemsList = useTemplateRef('selectableItemsList');const select = useMultiSelect(props, { selectableItemsList, selectButton });const newValue = ref('');+const filteredItemsList = computed(() => {+ return (+ select.selectableItems.filter((selectable: SelectItem) => {+ console.log(selectable.name, newValue);++ return !select.selectedItems?.find((selected: SelectItem) => selectable.name === selected.name) && selectable.name.includes(newValue.value);+ }) ?? []+ );+});+const handleItemClick = (item: any, setFocus = true, triggerSelect = true) => {if (!item?.name) return;@@ -112,23 +122,13 @@ onMounted(() => {}});}++ // window.addEventListener('resize', select);});-watch(- () => selectButton.value,- (value) => {- if (!value) return;- select.selectButton = selectButton;- },- { immediate: true },-);-watch(- () => selectableItemsList.value,- (value) => {- if (!value) return;- },- { immediate: true },-);+// onUnmounted(() => {+// window.removeEventListener('resize', popoverPositionCalculate);+// });watch([() => selectButton.value, () => selectableItemsList.value], ([newSelectButton, newSelectableItemsList]) => {// console.log(newSelectButton, newSelectableItemsList, { selectButton, selectableItemsList });@@ -187,8 +187,8 @@ watch('bottom-0 mb-11': select.selectDropdownPosition == 'top','top-0 mt-11': select.selectDropdownPosition == 'bottom',}"- class="z-30 absolute w-full mt-1 overflow-auto text-sm rounded-md shadow-md max-h-56 focus:outline-none ring-1 ring-opacity-5 ring-black dark:ring-neutral-700 bg-white dark:bg-neutral-800/70 backdrop-blur-lg"- :options="{ allowOutsideClick: true, initialFocus: selectInput?.$el }"+ class="z-30 absolute w-full mt-1 overflow-auto scrollbar-thin text-sm rounded-md shadow-md max-h-56 focus:outline-none ring-1 ring-opacity-5 ring-black dark:ring-neutral-700 bg-white dark:bg-neutral-800/70 backdrop-blur-lg"+ :options="{ allowOutsideClick: true, initialFocus: selectInput?.$el, returnFocusOnDeactivate: false }"><OnClickOutside@trigger.stop="select.toggleSelect(false)"@@ -236,20 +236,15 @@ watch(ref="selectInput"class="scroll-m-4"@change="selectInput?.$el.scrollIntoView({ behavior: 'smooth', block: 'center' })"- @focus="selectInput?.$el.scrollIntoView({ behavior: 'smooth', block: 'center' })"+ @focus="selectButton?.scrollIntoView({ behavior: 'smooth', block: 'center' })"/>- <ButtonIcon :type="'button'" tabindex="549" :disabled="!newValue" @click="handleCreate">+ <ButtonIcon :type="'button'" tabindex="549" :disabled="!newValue" @click="handleCreate" class="ring-inset"><template #icon><MdiLightPlus class="w-6 h-6" /></template></ButtonIcon></li>- <template- v-for="(item, index) in select.selectableItems.filter(- (selectable: SelectItem) => !select.selectedItems?.find((selected: SelectItem) => selectable.name === selected.name),- )"- :key="item.value"- >+ <template v-for="(item, index) in filteredItemsList" :key="item.value"><li@click="handleItemClick(item)"@focus="select.selectableItemActive = item"@@ -267,9 +262,12 @@ watch(class="relative flex items-center h-full py-2 pl-8 cursor-pointer select-none data-[disabled=true]:opacity-50 data-[disabled=true]:pointer-events-none":tabindex="`55${index}`">- <span class="block font-medium truncate">{{ item.name }}</span>+ <span class="block truncate">{{ item.name }}</span></li></template>+ <li v-show="filteredItemsList.length == 0" class="text-gray-700 dark:text-neutral-300 relative flex items-center h-full py-2 pl-8 select-none">+ <span class="block truncate">No Results</span>+ </li></ul></OnClickOutside></UseFocusTrap>diff --git a/resources/js/components/pulseCards/PulseServers.vue b/resources/js/components/pulseCards/PulseServers.vueindex ec0cf2f5..77dc6aab 100644--- a/resources/js/components/pulseCards/PulseServers.vue+++ b/resources/js/components/pulseCards/PulseServers.vue@@ -251,7 +251,7 @@ watch(<template><section- :class="`overflow-x-auto overflow-y-hidden max-w-full pb-px default:col-span-full default:lg:col-span-${props.cols} default:row-span-${props.rows} ${props.class} ${isLoading && 'opacity-25 animate-pulse'}`"+ :class="`overflow-x-auto overflow-y-hidden max-w-full pb-px default:col-span-full default:lg:col-span-${props.cols} default:row-span-${props.rows} ${isLoading ? 'opacity-25 animate-pulse ' : ''}${props.class ?? ''}`"><divv-if="servers"@@ -265,10 +265,7 @@ watch(<div></div><div class="text-xs uppercase text-left text-gray-500 dark:text-gray-400 font-bold">Storage</div><template v-for="server in Object.keys(servers)" :key="`${server}-indicator`" class="flex">- <div- :class="`flex items-center ${(Object.keys(servers).length ?? 0) > 1 ? 'py-2' : ''}`"- :title="`${toTimeSpan(servers[server].updated_at)}`"- >+ <div :class="`flex items-center ${(Object.keys(servers).length ?? 0) > 1 ? 'py-2' : ''}`" :title="`${toTimeSpan(servers[server].updated_at)}`"><div v-if="servers[server]?.recently_reported" class="w-5 flex justify-center mr-1"><div class="h-1 w-1 bg-green-500 rounded-full animate-pulse"></div></div>@@ -290,9 +287,7 @@ watch(:id="`${server}-cpu`":class="`flex items-center ${(Object.keys(servers).length ?? 0) > 1 ? 'py-2' : ''} ${!servers[server].recently_reported ? 'opacity-25 animate-pulse' : ''}`">- <div class="text-lg font-bold text-gray-700 dark:text-gray-200 w-14 whitespace-nowrap tabular-nums">- {{ servers[server].cpu_current }}%- </div>+ <div class="text-lg font-bold text-gray-700 dark:text-gray-200 w-14 whitespace-nowrap tabular-nums">{{ servers[server].cpu_current }}%</div></div><div:id="`${server}-cpu-graph`"@@ -364,9 +359,7 @@ watch(<span class="text-lg font-bold text-gray-700 dark:text-gray-200">{{ friendlySize(servers[server].memory_current, 1) }}</span>- <span class="text-sm font-medium text-gray-500 dark:text-gray-400">- / {{ friendlySize(servers[server].memory_total, 1) }}- </span>+ <span class="text-sm font-medium text-gray-500 dark:text-gray-400"> / {{ friendlySize(servers[server].memory_total, 1) }} </span></div></div><divdiff --git a/resources/js/components/pulseCards/PulseUsage.vue b/resources/js/components/pulseCards/PulseUsage.vueindex 029ee8ae..a0507570 100644--- a/resources/js/components/pulseCards/PulseUsage.vue+++ b/resources/js/components/pulseCards/PulseUsage.vue@@ -74,7 +74,7 @@ watch([() => props.pulseData, type], () => {<DashboardCard:cols="cols":rows="rows"- :class="`${props.class} col-span-2 lg:col-span-4`"+ :class="`${props.class ?? ''} col-span-2 lg:col-span-4`":name="`${'Application Usage'}`":title="`Time: ${format_number(pulseData?.queues?.time ?? 0)}ms; Run at: ${pulseData?.servers?.runAt ? new Date(pulseData?.servers?.runAt).toLocaleDateString() : ''};`":details="`past ${validPeriods.indexOf(period) !== -1 ? periodForHumans(period) : periodForHumans(validPeriods[0])}`"@@ -107,15 +107,9 @@ watch([() => props.pulseData, type], () => {<template #slot><PulseNoResults v-if="userRequestCounts?.length === 0" /><div v-else class="grid grid-cols-1 @lg:grid-cols-2 @3xl:grid-cols-3 @6xl:grid-cols-4 gap-2 overflow-visible">- <PulseUserCard- v-for="userRequestCount in userRequestCounts"- :key="userRequestCount.key"- :user="userRequestCount.user"- >+ <PulseUserCard v-for="userRequestCount in userRequestCounts" :key="userRequestCount.key" :user="userRequestCount.user"><template #stats>- <span- v-if="sampleRate() < 1"- title="Sample rate: {{ $sampleRate }}, Raw value: {{ number_format($userRequestCount->count) }}"+ <span v-if="sampleRate() < 1" title="Sample rate: {{ $sampleRate }}, Raw value: {{ number_format($userRequestCount->count) }}">~{{ format_number(userRequestCount.count * (1 / sampleRate())) }}</span><template v-else>diff --git a/resources/js/components/table/TableBase.vue b/resources/js/components/table/TableBase.vueindex 90f4bab6..0eb81a89 100755--- a/resources/js/components/table/TableBase.vue+++ b/resources/js/components/table/TableBase.vue@@ -89,6 +89,7 @@ onMounted(() => {":title="`Sort Results`":aria-label="`Sort Results`"+ class="ring-inset"><template #icon><!-- Arrow Pointing Down if ascending and then Up otherwise (arrow shows what to change to ?? idk descending points up actually)-->@@ -98,7 +99,7 @@ onMounted(() => {</ButtonIcon></span></section>- <tbody :class="`${useGrid ? useGrid : `flex w-full flex-wrap gap-2 ${tableStyles}`}`">+ <tbody :class="`${useGrid ? useGrid : `flex w-full flex-wrap gap-2 ${tableStyles ?? ''}`}`"><divv-if="loading || tableData.filteredPage.length === 0"class="col-span-full flex items-center justify-center text-center text-lg text-gray-500 dark:text-gray-400 uppercase tracking-wider w-full gap-2"@@ -116,7 +117,7 @@ onMounted(() => {:currentID="props.selectedID ?? null"v-bind="rowAttributes"@clickAction="(...args: any[]) => props.clickAction?.(row?.id, ...args)"- @otherAction="$emit('otherAction', $event)"+ @otherAction="(...args: any[]) => props.otherAction?.(row?.id, ...args)"></component></tbody><!-- <hr class="p-0" /> -->diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex 92a48984..78e15e31 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -1,29 +1,26 @@<script setup>-import { useContentStore } from '../../stores/ContentStore';-import { useAuthStore } from '../../stores/AuthStore';+import { useContentStore } from '@/stores/ContentStore';+import { useAuthStore } from '@/stores/AuthStore';import { storeToRefs } from 'pinia';import { watch } from 'vue';-import ButtonClipboard from '../pinesUI/ButtonClipboard.vue';-import useMetaData from '../../composables/useMetaData';-import EditFolder from '../forms/EditFolder.vue';-import ButtonIcon from '../inputs/ButtonIcon.vue';-import ButtonText from '../inputs/ButtonText.vue';-import EditVideo from '../forms/EditVideo.vue';-import ModalBase from '../pinesUI/ModalBase.vue';-import useModal from '../../composables/useModal';-import ChipTag from '../labels/ChipTag.vue';+import ButtonClipboard from '@/components/pinesUI/ButtonClipboard.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 CircumShare1 from '~icons/circum/share-1';import CircumEdit from '~icons/circum/edit';-import HoverCard from '../cards/HoverCard.vue';-const ContentStore = useContentStore();-const AuthStore = useAuthStore();--const { stateVideo, stateFolder } = storeToRefs(ContentStore);-const { userData } = storeToRefs(AuthStore);-const { updateVideoData, updateFolderData } = ContentStore;+const { stateVideo, stateFolder } = storeToRefs(useContentStore());+const { userData } = storeToRefs(useAuthStore());+const { updateVideoData, updateFolderData } = useContentStore();const defaultDescription = `After defeating theDemon Lord, Himmel the Hero, priest Heiter, dwarf warrior Eisen, and elf mage@@ -109,14 +106,7 @@ watch(() => stateVideo.value, handlePropsUpdate, { immediate: true, deep: true }</h2><HoverCard :content="metaData?.fields?.description ?? defaultDescription" :hover-card-delay="800" :margin="10"><template #trigger>- <div- :class="`h-[3.75rem] overflow-y-auto cursor-pointer- [&::-webkit-scrollbar]:w-2- [&::-webkit-scrollbar-track]:bg-transparent dark:[&::-webkit-scrollbar-track]:bg-transparent [&::-webkit-scrollbar-track]:rounded-full- group-hover:[&::-webkit-scrollbar-thumb]:bg-gray-300 group-hover:dark:[&::-webkit-scrollbar-thumb]:bg-neutral-500 [&::-webkit-scrollbar-thumb]:rounded-full- [&::-webkit-scrollbar-thumb]:bg-transparent- dark:text-slate-400 text-slate-500 text-sm whitespace-pre-wrap`"- >+ <div :class="`h-[3.75rem] overflow-y-auto cursor-pointer dark:text-slate-400 text-slate-500 text-sm whitespace-pre-wrap scrollbar-minimal scrollbar-hover`">{{ metaData?.fields?.description ?? defaultDescription }}</div></template>diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex b33e5a67..118f9ceb 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -28,8 +28,16 @@ const appStore = useAppStore();const progressCache = ref<{ metadata_id: number; progress: number }[]>([]);const metadata_id = ref<number>(NaN);const currentID = ref(-1);-const isAudio = ref(false);-const audioPoster = ref('https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg');+const isAudio = computed(() => {+ return stateVideo.value.metadata?.mime_type?.startsWith('audio') ?? false;+});+const audioPoster = computed(() => {+ return (+ handleStorageURL(stateVideo.value?.metadata?.poster_url) ??+ handleStorageURL(stateFolder.value.series?.thumbnail_url) ??+ 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'+ );+});const player = ref<null | HTMLVideoElement>(null);// const url = ref('');@@ -147,11 +155,6 @@ const initVideoPlayer = async () => {}metadata_id.value = stateVideo.value?.metadata ? stateVideo.value?.metadata.id : NaN;- isAudio.value = stateVideo.value.metadata?.mime_type?.startsWith('audio') ?? false;- audioPoster.value =- handleStorageURL(stateVideo.value?.metadata?.poster_url) ??- handleStorageURL(stateFolder.value.series?.thumbnail_url) ??- 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg';// url.value = await getMediaUrl(stateVideo.value.path ?? '');};@@ -277,8 +280,6 @@ onMounted(() => {player.value.volume = parseFloat(savedVolume);}- isAudio.value = stateVideo.value?.metadata?.mime_type?.startsWith('audio') ?? false;-// document.querySelector('video')?.addEventListener('ended', function () {// console.count('loop restart');// this.play();diff --git a/resources/js/layouts/LayoutBase.vue b/resources/js/layouts/LayoutBase.vueindex 948cc275..1a2fd874 100755--- a/resources/js/layouts/LayoutBase.vue+++ b/resources/js/layouts/LayoutBase.vue@@ -1,20 +1,39 @@<script setup lang="ts">import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';-import { ref } from 'vue';+import { nextTick, ref, watch } from 'vue';import NavBar from '@/components/panels/NavBar.vue';-const appStore = useAppStore();-const { selectedSideBar, sideBarTarget, scrollLock } = storeToRefs(appStore);+const { selectedSideBar, sideBarTarget, scrollLock } = storeToRefs(useAppStore());++const bodyStyles = ref<Record<string, string>>({});const scrollBody = ref(null);++watch(+ () => scrollLock.value,+ async (newVal) => {+ if (newVal) {+ const scrollY = window.scrollY;++ bodyStyles.value.top = `-${scrollY}px`;+ document.body.style.overflow = 'hidden';+ } else {+ const scrollY = parseInt(bodyStyles.value.top.replaceAll('px', '')) * -1;+ bodyStyles.value.top = `0px`;+ document.body.style.overflow = 'auto';++ window.scrollTo(0, scrollY);+ }+ },+);</script><template><divclass="h-screen"- :class="{ 'overflow-y-hidden': scrollLock }"+ :style="bodyStyles"@scroll="(e) => {if (scrollLock) {diff --git a/resources/js/stores/AppStore.ts b/resources/js/stores/AppStore.tsindex 6970181f..53f61e58 100644--- a/resources/js/stores/AppStore.ts+++ b/resources/js/stores/AppStore.ts@@ -1,5 +1,8 @@-import { nextTick, ref } from 'vue';+import { nextTick, ref, useTemplateRef } from 'vue';import { defineStore } from 'pinia';+import { type ContextMenu as ContextMenuType, type ContextMenuItem } from '@/types/types';++import ContextMenu from '@/components/pinesUI/ContextMenu.vue';export const useAppStore = defineStore('App', () => {const pageTitle = ref('');@@ -10,6 +13,13 @@ export const useAppStore = defineStore('App', () => {const sideBarTarget = ref('');const scrollLock = ref(false);+ const contextMenuItems = ref<ContextMenuItem[]>([]);+ const contextMenuStyle = ref('');+ const contextMenuItemStyle = ref('');+ const contextMenuEvent = ref<MouseEvent>();++ const contextMenu = useTemplateRef<InstanceType<typeof ContextMenu> | null>('contextMenu');+function toggleDarkMode() {let rootHTML = document.querySelector('html');@@ -75,6 +85,15 @@ export const useAppStore = defineStore('App', () => {return val ? 'true' : 'false';}+ const setContextMenu = (event: MouseEvent, options: ContextMenuType) => {+ contextMenuEvent.value = event;+ contextMenuItems.value = options.items ?? contextMenuItems.value;+ contextMenuStyle.value = options.style ?? '';+ contextMenuItemStyle.value = options.itemStyle ?? '';++ if (contextMenu.value) contextMenu.value.contextMenuToggle(event);+ };+return {initDarkMode,toggleDarkMode,@@ -91,5 +110,10 @@ export const useAppStore = defineStore('App', () => {pageTitle,scrollLock,setScrollLock,+ contextMenuItems,+ contextMenuStyle,+ contextMenuItemStyle,+ contextMenuEvent,+ setContextMenu,};});diff --git a/resources/js/types/types.ts b/resources/js/types/types.tsindex ab233185..4d66b503 100644--- a/resources/js/types/types.ts+++ b/resources/js/types/types.ts@@ -1,3 +1,5 @@+import type { Component } from 'vue';+export interface HttpResponse {success?: 'true' | 'false';status?: string;@@ -138,3 +140,23 @@ export interface FormField {}export type TaskStatus = 'pending' | 'processing' | 'completed' | 'cancelled' | 'failed' | 'incomplete';++export interface ContextMenuItem {+ text?: string;+ shortcut?: string;+ url?: string;+ external?: boolean;+ action?: () => void;+ style?: string;+ selectedStyle?: string;+ selected?: boolean;+ disabled?: boolean;+ icon?: Component;+}++export interface ContextMenu {+ disabled?: boolean;+ style?: string;+ itemStyle?: string;+ items?: ContextMenuItem[];+}diff --git a/resources/js/views/VideoView.vue b/resources/js/views/VideoView.vueindex 3f643d75..cccd0d0d 100755--- a/resources/js/views/VideoView.vue+++ b/resources/js/views/VideoView.vue@@ -2,7 +2,7 @@import type { CategoryResource, FolderResource, VideoResource } from '@/types/resources';import type { Metadata } from '@/types/model';-import { onMounted, ref, watch, type Ref } from 'vue';+import { computed, onMounted, ref, watch, type Ref } from 'vue';import { useContentStore } from '@/stores/ContentStore';import { useAppStore } from '@/stores/AppStore';import { storeToRefs } from 'pinia';@@ -14,21 +14,37 @@ import VideoSidebar from '@/components/panels/VideoSidebar.vue';import LayoutBase from '@/layouts/LayoutBase.vue';import VideoCard from '@/components/cards/VideoCard.vue';import TableBase from '@/components/table/TableBase.vue';+import useModal from '@/composables/useModal';+import ModalBase from '@/components/pinesUI/ModalBase.vue';+import EditVideo from '@/components/forms/EditVideo.vue';+import ButtonClipboard from '@/components/pinesUI/ButtonClipboard.vue';+import useMetaData from '@/composables/useMetaData';-const ContentStore = useContentStore();-const appStore = useAppStore();const route = useRoute();const loading = ref(true);-const { getFolder, getCategory, getRecords, playlistFind, playlistSort } = ContentStore;-const { searchQuery, stateFilteredPlaylist, stateDirectory, stateVideo, stateFolder } = storeToRefs(ContentStore) as unknown as {+const editVideoModal = useModal({ title: 'Edit Video Details', submitText: 'Submit Details' });+const shareVideoModal = useModal({ title: 'Share Video' });++const cachedVideo = ref<VideoResource>();+const cachedVideoUrl = computed(() => {+ if (!cachedVideo.value) return null;+ return encodeURI(document.location.origin + route.path + `?video=${cachedVideo.value.id}`);+});+const { selectedSideBar } = storeToRefs(useAppStore());+const { getFolder, getCategory, getRecords, playlistFind, playlistSort, updateVideoData } = useContentStore();+const { searchQuery, stateFilteredPlaylist, stateDirectory, stateVideo, stateFolder } = storeToRefs(useContentStore()) as unknown as {searchQuery: Ref<string>;stateFilteredPlaylist: Ref<VideoResource[]>;stateDirectory: Ref<CategoryResource>;stateVideo: Ref<VideoResource | { id?: number; metadata?: Metadata; path?: string }>;stateFolder: Ref<FolderResource | any>;};-const { selectedSideBar } = storeToRefs(appStore);++const handleVideoDetailsUpdate = (res: any) => {+ updateVideoData(res?.data);+ editVideoModal.toggleModal(false);+};async function cycleSideBar(state: string) {if (state === 'history') {@@ -99,6 +115,14 @@ const handleSearch = (query: string) => {searchQuery.value = query;};+const handleVideoAction = (e: Event, id: number, action: 'edit' | 'share') => {+ let video = stateFolder.value?.videos.find((video: VideoResource) => video.id === id);+ if (video) cachedVideo.value = video;++ if (action === 'edit') editVideoModal.toggleModal();+ else shareVideoModal.toggleModal();+};+//#endregiononMounted(async () => {@@ -133,6 +157,7 @@ watch(() => selectedSideBar.value, cycleSideBar, { immediate: false });:data="stateFilteredPlaylist":row="VideoCard":clickAction="playlistFind"+ :otherAction="handleVideoAction":loading="loading":useToolbar="true":sortAction="handleSort"@@ -141,6 +166,22 @@ watch(() => selectedSideBar.value, cycleSideBar, { immediate: false });:startAscending="true"@search="handleSearch"/>++ <ModalBase :modalData="editVideoModal" :useControls="false">+ <template #content>+ <div class="pt-2">+ <EditVideo :video="cachedVideo" @handleFinish="handleVideoDetailsUpdate" />+ </div>+ </template>+ </ModalBase>+ <ModalBase :modalData="shareVideoModal">+ <template #content>+ <div class="py-3">Copy link to clipboard to share it.</div>+ </template>+ <template #controls>+ <ButtonClipboard :text="cachedVideoUrl" tabindex="1" />+ </template>+ </ModalBase></section></template><template v-slot:sidebar>