A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
UI Updates and start multiselect for tags
aminnausin077cd0656b9f
diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vueindex e843ccdc..ba0cfd1d 100755--- a/resources/js/components/cards/VideoCard.vue+++ b/resources/js/components/cards/VideoCard.vue@@ -23,27 +23,42 @@ watch(props, handlePropsUpdate, { immediate: true });<RouterLink:class="{ 'ring-violet-600/70 ring-[0.125rem]': props?.currentID === props.data?.id }":to="metaData.fields.url"- class="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"+ class="relative group 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}`"@click.left.stop.prevent.capture="handlePlay">- <section class="flex justify-between gap-4 w-full items-start">- <h3 class="w-full line-clamp-2 sm:line-clamp-1">- {{ metaData?.fields?.title }}+ <section class="flex justify-between gap-4 w-full items-start overflow-hidden" :title="metaData?.fields?.description">+ <h3 class="w-full line-clamp-1 flex gap-8 items-end min-w-fit max-w-[30%]">+ <span>{{ metaData?.fields?.title }}</span>+ <!-- <span class="text-ellipsis text-wrap line-clamp-1 text-sm sm:text-base text-neutral-500 dark:text-neutral-400">{{+ metaData?.fields?.description+ }}</span> --></h3>- <h3 class="text-nowrap text-neutral-500 dark:text-neutral-400">+ <h3 class="text-ellipsis text-wrap line-clamp-1 text-neutral-500 dark:text-neutral-400">{{ metaData?.fields?.duration }}</h3></section>- <section class="text-sm sm:text-base flex justify-between sm:w-auto items-center text-neutral-500 dark:text-neutral-400 gap-8">+ <section+ class="flex justify-between gap-4 w-full items-start text-sm sm:text-base sm:w-auto text-neutral-500 dark:text-neutral-400 overflow-hidden"+ ><h3 class="text-sm sm:text-base flex justify-end text-nowrap">{{ metaData?.fields?.views }}</h3>- <h3 class="line-clamp-1 text-end">+ <h3 class="text-end truncate">{{ toFormattedDate(new Date(props.data?.date + ' GMT')) }}</h3></section>+ <div+ v-if="metaData?.fields?.description?.length > 0"+ class="z-30 left-20 bottom-5 absolute opacity-0 group-hover:opacity-100 transition-opacity ease-in-out duration-500 w-1/2"+ >+ <div+ class="p-3 shadow rounded-md ring-inset dark:bg-primary-dark-800 bg-gray-100 odd:bg-violet-100 dark:odd:bg-primary-dark-600"+ >+ {{ metaData?.fields?.description }}+ </div>+ </div></RouterLink></template>diff --git a/resources/js/components/pinesUI/InputMultiChip.vue b/resources/js/components/pinesUI/InputMultiChip.vuenew file mode 100644index 00000000..bd2d9cc5--- /dev/null+++ b/resources/js/components/pinesUI/InputMultiChip.vue@@ -0,0 +1,231 @@+<script setup>+import useMultiSelect from '../../composables/useMultiSelect';+import ButtonIcon from '../inputs/ButtonIcon.vue';+import TextInput from '../inputs/TextInput.vue';+import ChipTag from '../labels/ChipTag.vue';++import MdiLightPlus from '~icons/mdi-light/plus';++import { onMounted, ref, watch } from 'vue';+import { OnClickOutside } from '@vueuse/components';+import { UseFocusTrap } from '@vueuse/integrations/useFocusTrap/component.mjs';++// import CircumCirclePlus from '~icons/circum/circle-plus';++const props = defineProps({+ placeholder: {+ type: String,+ default: 'Select Item',+ },+ defaultItems: {+ type: Array,+ default: () => [],+ },+ options: {+ type: Array,+ default: () => {+ return [+ {+ name: 'name',+ value: 'name',+ disabled: false,+ },+ {+ name: 'Date Uploaded',+ value: 'date',+ disabled: false,+ },+ {+ name: 'Date released',+ value: 'date_released',+ disabled: false,+ },+ {+ name: 'Episode',+ value: 'episode',+ disabled: false,+ },+ {+ name: 'Season',+ value: 'season',+ disabled: false,+ },+ ];+ },+ },+});++const emit = defineEmits(['selectItem']);+const selectButton = ref(null);+const selectableItemsList = ref(null);+const select = useMultiSelect(props, { selectableItemsList, selectButton });++const handleItemClick = (item, setFocus = true) => {+ if (!item?.name) return;++ select.selectedItems = [...select.selectedItems, item];+ // select.selectableItems = select.selectableItems.filter((otherItem) => otherItem.name != item.name);+ select.toggleSelect(false);+ if (setFocus) selectButton.value?.focus();+ emit('selectItem', select.selectedItems);+};++const handleRemoveChip = (name) => {+ select.selectedItems = select.selectedItems.filter((item) => item.name !== name);+};++onMounted(() => {+ if (props.defaultItem != undefined && props.defaultItem < props.options.length && props.defaultItem >= 0) {+ handleItemClick(props.options[props.defaultItem], false);+ }+});++watch(+ selectButton,+ () => {+ select.selectButton = selectButton;+ },+ { immediate: true },+);+watch(+ selectableItemsList,+ () => {+ select.selectableItemsList = selectableItemsList;+ },+ { immediate: true },+);+watch(+ props,+ () => {+ select.selectedItems = props.defaultItems ?? [];++ if (props.defaultItems && props.options) {+ select.selectableItems = props.options?.filter((option) =>+ !props.defaultItems ? true : !props.defaultItems.find((item) => item.name === option.name),+ );+ }+ },+ { immediate: false },+);+</script>+<template>+ <div+ @keydown.esc="+ if (select.selectOpen) {+ select.toggleSelect(false);+ }+ "+ @keydown.down="+ if (select.selectOpen) {+ select.selectableItemActiveNext();+ } else {+ select.toggleSelect(true);+ }+ event.preventDefault();+ "+ @keydown.up="+ if (select.selectOpen) {+ select.selectableItemActivePrevious();+ } else {+ select.toggleSelect(true);+ }+ event.preventDefault();+ "+ @keydown.enter="handleItemClick(select.selectableItemActive)"+ @keydown.space="handleItemClick(select.selectableItemActive)"+ @keydown="select.selectKeydown($event)"+ class="relative"+ >+ <OnClickOutside @trigger="select.toggleSelect(false)" class="relative">+ <button+ ref="selectButton"+ @click="select.toggleSelect()"+ :class="+ 'relative h-10 py-2 pl-3 pr-10 rounded-md shadow-sm mt-1 w-full flex items-center justify-between' ++ 'focus:outline-none border-none cursor-pointer ' ++ 'disabled:cursor-not-allowed disabled:opacity-50 ' ++ 'text-left text-gray-900 dark:text-neutral-100 bg-white dark:bg-neutral-700 placeholder:text-neutral-400 ' ++ 'ring-inset ring-[1px] ring-neutral-200 dark:ring-neutral-700 ' ++ `${select.selectOpen ? 'hocus:ring-0' : 'hocus:ring-[0.125rem]'} hover:ring-violet-400 hover:dark:ring-violet-700 focus:ring-indigo-400 dark:focus:ring-indigo-500`+ "+ type="button"+ >+ <span class="truncate">{{ placeholder }}</span>+ <span class="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">+ <svg+ xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 20 20"+ fill="currentColor"+ aria-hidden="true"+ class="w-5 h-5 text-gray-400"+ >+ <path+ fill-rule="evenodd"+ d="M10 3a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L10 4.852 7.3 7.76a.75.75 0 01-1.1-1.02l3.25-3.5A.75.75 0 0110 3zm-3.76 9.2a.75.75 0 011.06.04l2.7 2.908 2.7-2.908a.75.75 0 111.1 1.02l-3.25 3.5a.75.75 0 01-1.1 0l-3.25-3.5a.75.75 0 01.04-1.06z"+ clip-rule="evenodd"+ ></path>+ </svg>+ </span>+ </button>++ <Transition+ enter-active-class="transition ease-out duration-50"+ enter-from-class="opacity-0 -translate-y-1"+ enter-to-class="opacity-100"+ >+ <ul+ v-show="select.selectOpen"+ ref="selectableItemsList"+ :class="{+ 'bottom-0 mb-10': select.selectDropdownPosition == 'top',+ 'top-0 mt-10': 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"+ v-cloak+ >+ <UseFocusTrap v-if="select.selectOpen" :options="{ immediate: true }">+ <li class="p-2 flex gap-2 w-full">+ <TextInput :placeholder="props.options.length" tabindex="548" />+ <ButtonIcon :type="'button'" tabindex="549">+ <template #icon>+ <MdiLightPlus class="w-6 h-6" />+ </template>+ </ButtonIcon>+ </li>+ <template+ v-for="(item, index) in select.selectableItems.filter(+ (selectable) => !select.selectedItems?.find((selected) => selectable.name === selected.name),+ )"+ :key="item.value"+ >+ <li+ @click="handleItemClick(item)"+ :id="item.value + '-' + select.selectId"+ :data-disabled="item.disabled ? item.disabled : ''"+ :class="{+ 'bg-neutral-100 dark:bg-neutral-900/70 text-gray-900 dark:text-neutral-100':+ select.selectableItemIsActive(item),+ 'text-gray-700 dark:text-neutral-300': !select.selectableItemIsActive(item),+ }"+ @mousemove="select.selectableItemActive = item"+ 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>+ </li>+ </template>+ </UseFocusTrap>+ </ul>+ </Transition>+ </OnClickOutside>+ <span v-if="select.selectedItems?.length > 0" class="flex flex-wrap gap-1 pt-2 pb-1">+ <ChipTag+ v-for="(chip, index) in select.selectedItems"+ v-bind:key="index"+ :label="chip.name"+ :removeable="true"+ @clickAction="handleRemoveChip(chip.name)"+ />+ </span>+ </div>+</template>diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex 61ae03e2..929358f1 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -85,33 +85,44 @@ watch(() => stateVideo.value, handlePropsUpdate, { immediate: true, deep: true }</div><div id="mp4-description-desktop" class="flex gap-4 sm:flex-1 shrink-0">- <img- id="folder-thumbnail"- class="h-28 object-cover rounded-md shadow-md aspect-2/3 mb-auto"- :src="- stateFolder?.series?.thumbnail_url ??- 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'- "- alt="Folder Cover Art"- @click="- () => {- if (userData) editFolderModal.toggleModal();- }- "- title="Edit Folder Details"- />+ <div class="h-28 object-cover rounded-md shadow-md aspect-2/3 mb-auto relative group">+ <img+ id="folder-thumbnail"+ class="h-28 object-cover rounded-md aspect-2/3"+ :src="+ stateFolder?.series?.thumbnail_url ??+ 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'+ "+ alt="Folder Cover Art"+ />++ <ButtonIcon+ class="absolute bottom-1 right-1 h-8 shadow-md shadow-violet-700 opacity-0 group-hover:opacity-100 transition-opacity duration-200 ease-in-out"+ title="Edit Folder Details"+ @click="+ () => {+ if (userData) editFolderModal.toggleModal();+ }+ "+ >+ <template #icon>+ <CircumEdit height="16" width="16" />+ </template>+ </ButtonIcon>+ </div><div class="flex flex-col gap-2 w-full"><div id="mp4-title" class="text-xl font-medium line-clamp-1 capitalize hidden sm:block h-8">{{ metaData?.fields.title ?? '[Video Name]' }}</div>- <p class="dark:text-slate-400 text-slate-500 line-clamp-3 text-sm">+ <p class="dark:text-slate-400 text-slate-500 line-clamp-2 text-sm">{{ metaData?.fields?.description ?? defaultDescription }}</p>- <span class="flex flex-1 gap-2 items-end justify-between text-sm dark:text-slate-400 text-slate-500 max-w-full sm:hidden">++ <span class="flex flex-1 gap-2 items-end justify-between text-sm dark:text-slate-400 text-slate-500 max-w-full"><p class="text-nowrap text-ellipsis flex-1 h-[22px]">{{ metaData?.fields.views }}</p>- <section class="flex gap-2 justify-end h-8">+ <section class="flex gap-2 justify-end h-8 sm:hidden"><ButtonIconv-if="userData"aria-label="edit details"@@ -153,9 +164,6 @@ watch(() => stateVideo.value, handlePropsUpdate, { immediate: true, deep: true }</ButtonIcon></section><section class="flex flex-col justify-end text-end text-sm dark:text-slate-400 text-slate-500 max-w-full overflow-clip gap-1">- <p>- {{ metaData.fields.views }}- </p><span class="flex gap-1 flex-row flex-wrap max-h-[22px] overflow-hidden justify-end"><ChipTagv-for="(tag, index) in (stateVideo?.tags ? stateVideo.tags : '#atmospheric #sad #action')diff --git a/resources/js/composables/useMultiSelect.js b/resources/js/composables/useMultiSelect.jsnew file mode 100644index 00000000..273a01db--- /dev/null+++ b/resources/js/composables/useMultiSelect.js@@ -0,0 +1,130 @@+import { reactive, watch } from 'vue';++export default function useMultiSelect({ options, defaultItems }, refs) {+ const select = reactive({+ selectOpen: false,+ selectedItems: defaultItems,+ selectableItems: options,+ selectableItemActive: null,+ selectId: 'select-12',+ selectKeydownValue: '',+ selectKeydownTimeout: 1000,+ selectKeydownClearTimeout: null,+ selectDropdownPosition: 'bottom',+ selectableItemsList: refs.selectableItemsList,+ selectButton: refs.selectButton,+ toggleSelect(state) {+ if (state !== undefined) this.selectOpen = state === true;+ else this.selectOpen = !this.selectOpen;+ },+ updateRefs(values) {+ this.selectButton = values.selectButton;+ this.selectableItemsList = values.selectableItemsList;+ },+ selectableItemIsActive(item) {+ return this.selectableItemActive && this.selectableItemActive.value == item.value;+ },+ selectableItemActiveNext() {+ let index = this.selectableItems.indexOf(this.selectableItemActive);+ if (index < this.selectableItems.length - 1) {+ this.selectableItemActive = this.selectableItems[index + 1];+ this.selectScrollToActiveItem();+ }+ },+ selectableItemActivePrevious() {+ let index = this.selectableItems.indexOf(this.selectableItemActive);+ if (index > 0) {+ this.selectableItemActive = this.selectableItems[index - 1];+ this.selectScrollToActiveItem();+ }+ },+ selectScrollToActiveItem() {+ if (this.selectableItemActive) {+ let activeElement = document.getElementById(this.selectableItemActive.value + '-' + this.selectId);+ if (!activeElement) return;+ let newScrollPos = activeElement.offsetTop + activeElement.offsetHeight - this.selectableItemsList.offsetHeight;+ if (newScrollPos > 0) {+ this.selectableItemsList.scrollTop = newScrollPos;+ } else {+ this.selectableItemsList.scrollTop = 0;+ }+ }+ },+ selectKeydown(event) {+ if (event.keyCode >= 65 && event.keyCode <= 90) {+ this.selectKeydownValue += event.key;+ let selectedItemBestMatch = this.selectItemsFindBestMatch();+ if (selectedItemBestMatch) {+ if (this.selectOpen) {+ this.selectableItemActive = selectedItemBestMatch;+ this.selectScrollToActiveItem();+ } else {+ // this.selectedItem = this.selectableItemActive === selectedItemBestMatch; // What does this line do there was only 1 equal+ }+ }++ if (this.selectKeydownValue != '') {+ clearTimeout(this.selectKeydownClearTimeout);+ this.selectKeydownClearTimeout = setTimeout(() => {+ this.selectKeydownValue = '';+ }, this.selectKeydownTimeout);+ }+ }+ },+ selectItemsFindBestMatch() {+ let typedValue = this.selectKeydownValue.toLowerCase();+ var bestMatch = null;+ var bestMatchIndex = -1;+ for (var i = 0; i < this.selectableItems.length; i++) {+ var name = this.selectableItems[i].name.toLowerCase();+ var index = name.indexOf(typedValue);+ if (index > -1 && (bestMatchIndex == -1 || index < bestMatchIndex) && !this.selectableItems[i].disabled) {+ bestMatch = this.selectableItems[i];+ bestMatchIndex = index;+ }+ }+ return bestMatch;+ },+ selectPositionUpdate() {+ let selectDropdownBottomPos =+ this.selectButton.getBoundingClientRect().top ++ this.selectButton.offsetHeight ++ parseInt(window.getComputedStyle(this.selectableItemsList).maxHeight);+ if (window.innerHeight < selectDropdownBottomPos) {+ this.selectDropdownPosition = 'top';+ } else {+ this.selectDropdownPosition = 'bottom';+ }+ },+ setOptions(options) {+ if (Array.isArray(options)) this.selectableItems = options;+ },+ });++ const updatePosition = () => {+ if (!select.selectOpen) return;+ select.selectPositionUpdate();+ };++ watch(+ () => select.selectOpen,+ function (value) {+ if (!select.selectedItems) {+ select.selectableItemActive = select.selectableItems[0];+ } else {+ select.selectableItemActive = select.selectedItem;+ }++ if (!value) {+ window.removeEventListener('resize', updatePosition);+ return;+ }++ updatePosition();+ window.addEventListener('resize', updatePosition);+ },+ { immediate: false },+ );++ return select;+}