A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
update modals, add edit and video share modals
aminnausin9674e6d90e0b
diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vuenew file mode 100644index 00000000..4c605acb--- /dev/null+++ b/resources/js/components/forms/EditVideo.vue@@ -0,0 +1,98 @@+<script setup>+import useForm from '../../composables/useForm';+import mediaAPI from '../../service/mediaAPI';+import FormInput from '../inputs/FormInput.vue';+import FormTextArea from '../inputs/FormTextArea.vue';+import FormInputLabel from '../labels/FormInputLabel.vue';++import { reactive } from 'vue';+import { useContentStore } from '../../stores/ContentStore';+++const props = defineProps(['video']);+const emit = defineEmits(['handleFinish']);++const fields = reactive([+ {+ name: 'title',+ text: 'Title',+ type: 'text',+ required: true,+ value: props.video?.attributes.title,+ default: props.video?.attributes.name,+ subtext: 'The intended title of the episode',+ max: 255+ },+ {+ name: 'description',+ text: 'Description',+ type: 'textArea',+ value: props.video?.attributes.description,+ default: ''+ },+ {+ name: 'episode',+ text: 'Episode',+ type: 'number',+ value: props.video?.attributes.episode ?? 1,+ default: 0,+ min: 0,+ },+ {+ name: 'season',+ text: 'Season',+ type: 'number',+ value: props.video?.attributes.season ?? 1,+ default: 0,+ min: 0,+ },+]);++const form = useForm({+ title: props.video?.attributes.title ?? props.video?.attributes.name,+ description: props.video?.attributes.description ?? '',+ episode: props.video?.attributes.episode ?? null,+ season: props.video?.attributes.season ?? null,+});++const handleSubmit = async () => {+ form.submit(+ async (fields) => {+ return mediaAPI.updateVideo(props.video.id, fields);+ },+ {+ onSuccess: (response) => {+ emit('handleFinish', response?.data);+ },+ onError: () => {+ // eslint-disable-next-line no-undef+ toastr.error('Unable to update video details.');+ },+ }+ )+}+</script>++<template>+ <form class="flex flex-col sm:flex-row sm:justify-between flex-wrap gap-4" @submit.prevent="handleSubmit">+ <div v-for="(field, index) in fields" :key="index" class='w-full' :class="field.class">++ <FormInputLabel :field="field"/>++ <FormTextArea v-if="field.type === 'textArea'" v-model="form.fields[field.name]" :field="field"/>+ <FormInput v-else v-model="form.fields[field.name]" :field="field" />++ <ul class="text-sm text-red-600 dark:text-red-400">+ <li v-for="(item, index) in form.errors[field.name]" :key="index">{{ item }}</li>+ </ul>+ </div>+ <div class="relative flex flex-col-reverse sm:flex-row sm:justify-end gap-2 pt-1 w-full">+ <button @click="$emit('handleFinish')" type="button"+ class="inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium transition-colors border dark:border-neutral-600 rounded-md focus:outline-none "+ :class="'focus:ring-1 focus:ring-neutral-100 dark:focus:ring-neutral-400 focus:ring-offset-1 hover:bg-neutral-100 dark:hover:bg-neutral-900'">Cancel</button>+ <button @click="handleSubmit" type="button"+ class="inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium text-white transition-colors border border-transparent rounded-md focus:outline-none "+ :class="'focus:ring-1 focus:ring-violet-900 focus:ring-offset-1 bg-neutral-950 hover:bg-neutral-800 dark:hover:bg-neutral-900 '">Submit Details</button>+ </div>+ </form>+</template>\ No newline at end of filediff --git a/resources/js/components/pinesUI/CopyToClipboardSmall.vue b/resources/js/components/pinesUI/CopyToClipboardSmall.vuenew file mode 100644index 00000000..b163875d--- /dev/null+++ b/resources/js/components/pinesUI/CopyToClipboardSmall.vue@@ -0,0 +1,51 @@+<script setup>+import useClipboard from '../../composables/useClipboard';++const props = defineProps(['text']);+const clipboard = useClipboard(props.text)+</script>++<template>+ <div class="flex justify-between gap-4">+ <input :value="props.text" disabled+ class="border-gray-300 dark:border-gray-600 dark:text-gray-300 dark:bg-input-900 rounded-md shadow-sm block h-8 w-full">+ <div class="relative z-20 flex items-center ">+ <Transition+ enter-active-class="transition ease-out duration-300"+ enter-from-class="opacity-0 translate-x-2"+ enter-to-class="opacity-100 translate-x-0"+ leave-active-class="transition ease-in duration-300"+ leave-from-class="opacity-100 translate-x-0"+ leave-to-class="opacity-0 translate-x-2">+ <div v-if="clipboard.copyNotification"+ class="absolute left-0" v-cloak>+ <div class="px-3 h-7 -ml-1.5 items-center flex text-xs bg-indigo-500 border-r border-indigo-500 -translate-x-full text-white rounded">+ <span>Copied!</span>+ <div class="absolute right-0 inline-block h-full -mt-px overflow-hidden translate-x-3 -translate-y-2 top-1/2">+ <div class="w-3 h-3 origin-top-left transform rotate-45 bg-indigo-500 border border-transparent"></div>+ </div>+ </div>+ </div>+ </Transition>+ <button @click="clipboard.copyToClipboard();"+ class="flex items-center justify-center h-8 w-9 text-xs border rounded-md cursor-pointer bg-white dark:bg-neutral-900 border-gray-300 dark:border-gray-600 hover:bg-neutral-100 hover:dark:bg-neutral-950 active:bg-white focus:bg-white focus:outline-none text-neutral-500 hover:text-neutral-600 dark:text-gray-300 dark:hover:text-gray-400 group">+ <svg v-if="clipboard.copyNotification" class="w-4 h-4 text-green-500 stroke-current"+ xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"+ stroke="currentColor" x-cloak>+ <path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5" />+ </svg>+ <svg v-if="!clipboard.copyNotification" class="w-4 h-4 stroke-current" viewBox="0 0 24 24"+ xmlns="http://www.w3.org/2000/svg">+ <g fill="none" stroke="none">+ <path d="M7.75 7.757V6.75a3 3 0 0 1 3-3h6.5a3 3 0 0 1 3 3v6.5a3 3 0 0 1-3 3h-.992"+ stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">+ </path>+ <path d="M3.75 10.75a3 3 0 0 1 3-3h6.5a3 3 0 0 1 3 3v6.5a3 3 0 0 1-3 3h-6.5a3 3 0 0 1-3-3v-6.5z"+ stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">+ </path>+ </g>+ </svg>+ </button>+ </div>+ </div>+</template>\ No newline at end of filediff --git a/resources/js/components/pinesUI/ModalBase.vue b/resources/js/components/pinesUI/ModalBase.vueindex dd020e61..282baea1 100644--- a/resources/js/components/pinesUI/ModalBase.vue+++ b/resources/js/components/pinesUI/ModalBase.vue@@ -1,49 +1,56 @@<script setup>import ButtonCorner from '../inputs/ButtonCorner.vue';-const props = defineProps(['modalData', 'action'])-const toggleModal = props.modalData.toggleModal;+defineProps({+ modalData: {+ required: true+ },+ action: {+ require: false,+ type: Function,+ default: () => {}+ },+ useControls: {+ type: Boolean,+ required: false,+ default: true+ }+})-const submitModal = async () => {- await props.action();- toggleModal(false);+const submitModal = async (action, modalData) => {+ console.log(action);+ await action();+ modalData.toggleModal(false);}</script><template>- <div @keydown.escape="toggleModal(false)" :class="{ 'z-40': modalData.modalOpen }" class="relative w-auto h-auto">+ <div @keydown.escape="modalData.toggleModal(false)" :class="{ 'z-40': modalData.modalOpen }" class="relative w-auto h-auto"><Teleport to="body">- <div v-if="modalData.modalOpen"- class="fixed top-0 left-0 z-[99] flex items-center justify-center w-screen h-screen text-neutral-900 dark:text-neutral-200"+ <div v-show="modalData.modalOpen || modalData.isAnimating"+ class="fixed top-0 left-0 z-[99] flex items-center justify-center w-full h-screen text-neutral-900 dark:text-neutral-200"v-cloak><Transition enter-active-class="ease-out duration-300" enter-from-class="opacity-0" enter-to-class="opacity-100" leave-active-class="ease-in duration-300" leave-from-class="opacity-100" leave-to-class="opacity-0">- <div v-if="modalData.modalOpen" @click="toggleModal(false)" class="absolute inset-0 w-full h-full backdrop-blur-sm bg-opacity-70"></div>+ <div v-if="modalData.modalOpen" @click="modalData.toggleModal(false)" class="absolute inset-0 w-full h-full backdrop-blur-sm bg-opacity-70"></div></Transition><Transition enter-active-class="ease-out duration-300" enter-from-class="opacity-0 -translate-y-2 sm:scale-95" enter-to-class="opacity-100 translate-y-0 sm:scale-100" leave-active-class="ease-in duration-200" leave-from-class="opacity-100 translate-y-0 sm:scale-100" leave-to-class="opacity-0 -translate-y-2 sm:scale-95">- <div v-if="modalData.modalOpen" x-trap.inert.noscroll="modalOpen" class="relative w-full m-6 p-6 bg-white dark:bg-neutral-800 border shadow-lg border-neutral-200 dark:border-neutral-700 sm:max-w-lg rounded-md sm:rounded-lg">+ <div v-if="modalData.modalOpen" x-trap.inert.noscroll="modalOpen" class="relative w-full m-6 p-6 bg-white dark:bg-neutral-800 border shadow-lg border-neutral-200 dark:border-neutral-700 sm:max-w-lg rounded-md sm:rounded-lg"><div class="flex items-center justify-between pb-3">- <h3 class="text-lg font-semibold">{{ modalData?.props.title ?? 'Modal Title' }}</h3>- <ButtonCorner @click="toggleModal(false)"/>- <!-- <button @click="toggleModal(false)"- class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 text-gray-600 dark:text-gray-400 rounded-full hover:text-gray-800 hover:dark:text-gray-200 hover:bg-gray-50 hover:dark:bg-gray-700">- <svg class="w-5 h-5" 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="M6 18L18 6M6 6l12 12" />- </svg>- </button> -->+ <h3 class="text-lg font-semibold">{{ modalData?.title ?? 'Modal Title' }}</h3>+ <ButtonCorner @click="modalData.toggleModal(false)"/></div><slot name="content"><div class="relative w-auto pb-8"><p>This is placeholder text. Replace it with your own content.</p></div></slot>- <slot name="controls">+ <slot v-if="useControls" name="controls"><div class="relative flex flex-col-reverse sm:flex-row sm:justify-end gap-2">- <button @click="toggleModal(false)" type="button"+ <button @click="modalData.toggleModal(false)" type="button"class="inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium transition-colors border dark:border-neutral-600 rounded-md focus:outline-none ":class="'focus:ring-1 focus:ring-neutral-100 dark:focus:ring-neutral-400 focus:ring-offset-1 hover:bg-neutral-100 dark:hover:bg-neutral-900'">Cancel</button>- <button @click="submitModal" type="button"+ <button @click="submitModal(action, modalData)" type="button"class="inline-flex items-center justify-center h-10 px-4 py-2 text-sm font-medium text-white transition-colors border border-transparent rounded-md focus:outline-none "- :class="'focus:ring-1 focus:ring-violet-900 focus:ring-offset-1 bg-neutral-950 hover:bg-neutral-800 dark:hover:bg-neutral-900 '">{{ modalData.props.submitText }}</button>+ :class="'focus:ring-1 focus:ring-violet-900 focus:ring-offset-1 bg-neutral-950 hover:bg-neutral-800 dark:hover:bg-neutral-900 '">{{ modalData.submitText }}</button></div></slot></div>diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex 608e8126..d0b5e654 100644--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -1,15 +1,20 @@<script setup>+import CopyToClipboardSmall from '../pinesUI/CopyToClipboardSmall.vue';import useMetaData from '../../composables/useMetaData';+import ModalBase from '../pinesUI/ModalBase.vue';+import useModal from '../../composables/useModal';+import EditVideo from '../forms/EditVideo.vue';import CircumShare1 from '~icons/circum/share-1';import { watch } from 'vue';import { storeToRefs } from 'pinia';import { useContentStore } from '../../stores/ContentStore';-import ModalBase from '../pinesUI/ModalBase.vue';-import useModal from '../../composables/useModal';+const ContentStore = useContentStore();+const { stateVideo } = storeToRefs(ContentStore);+const defaultDescription = `After defeating theDemon Lord, Himmel the Hero, priest Heiter, dwarf warrior Eisen, and elf mageFrieren return to the royal capital. After their procession, they view a meteor@@ -27,19 +32,21 @@ const defaultDescription = `After defeating thesuffering from death anxiety in his advanced age, asks Frieren to researchlife-extending magic and tutor Fern in magic in her spare time. She agrees afterseeing Fern is already remarkably skilled despite her youth.`;--const ContentStore = useContentStore();-const { stateVideo } = storeToRefs(ContentStore);-const editModal = useModal({title: 'Edit Video Details', submitText: 'Submit Details'});-const shareModal = useModal({title: 'Share Video'});-const metaData = useMetaData({...stateVideo.value.attributes, id: stateVideo.value.id});+const metaData = useMetaData({ ...stateVideo.value.attributes, id: stateVideo.value.id}, stateVideo.value);+const editModal = useModal({ title: 'Edit Video Details', submitText: 'Submit Details' });+const shareModal = useModal({ title: 'Share Video' });const handlePropsUpdate = () => {- metaData.updateData({...stateVideo.value.attributes, id: stateVideo.value.id});+ metaData.updateData({ ...stateVideo.value.attributes, id: stateVideo.value.id });+}++const handleVideoDetailsUpdate = (res) => {+ if(res?.data) stateVideo.value = {index: stateVideo.index, ...res.data}+ editModal.toggleModal(false);}-watch(() => stateVideo.value, handlePropsUpdate, {immediate: true});+watch(() => stateVideo.value, handlePropsUpdate, { immediate: true, deep: true });</script><template>@@ -50,53 +57,54 @@ watch(() => stateVideo.value, handlePropsUpdate, {immediate: true});:src="stateVideo?.attributes?.thumbnail?.url ?? 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'"alt="Folder Cover Art"><div class="h-full flex flex-col gap-2">- <div id="mp4-title" class="text-xl font-medium line">{{ stateVideo?.attributes?.name ?? '[Video Name]' }}+ <div id="mp4-title" class="text-xl font-medium line">{{ metaData?.fields.title ?? '[Video Name]' }}</div>- <p class="dark:text-slate-400 text-slate-500 line-clamp-3 text-sm">{{ defaultDescription }}</p>+ <p class="dark:text-slate-400 text-slate-500 line-clamp-3 text-sm">{{ metaData?.fields?.description ?? defaultDescription }}</p></div></div>- <div id="mp4-description-mobile" class="flex sm:hidden items-center gap-4 flex-col ">+ <div id="mp4-description-mobile" class="flex sm:hidden items-center gap-4 flex-col w-full"><div id="mp4-title" class="text-xl font-medium w-full">{{ metaData?.fields.title ?? '[Video Name]' }}</div>- <div class="flex items-start gap-4 md:w-2/3">+ <div class="flex items-start gap-4 w-full"><img id="folder-thumbnail" class="h-28 object-contain rounded-md shadow-sm":src="stateVideo?.attributes?.thumbnail?.url ?? 'https://m.media-amazon.com/images/M/MV5BMjVjZGU5ZTktYTZiNC00N2Q1LThiZjMtMDVmZDljN2I3ZWIwXkEyXkFqcGdeQXVyMTUzMTg2ODkz._V1_.jpg'"alt="Folder Cover Art">- <p class="dark:text-slate-400 text-slate-500 line-clamp-3 text-sm">{{ defaultDescription }}</p>+ <p class="dark:text-slate-400 text-slate-500 line-clamp-3 text-sm">{{ metaData?.fields?.description ?? 'No Description Yet' }}</p></div></div><div id="mp4-details"class="container flex sm:w-auto sm:flex-col justify-between lg:min-w-32 items-center sm:items-end gap-3 flex-wrap flex-1 w-full"role="group"><section class="flex gap-2">- <button aria-label="edit details" @click="editModal.toggleModal()"+ <button aria-label="edit details" title="Edit Video Details" @click="editModal.toggleModal()"class="p-2 bg-button-100 dark:bg-button-900 rounded-lg ring-violet-500 hover:ring-violet-700 hover:bg-violet-400/50 ring-[0.125rem] ring-inset shadow">EditDetails</button>- <button aria-label="share" @click="shareModal.toggleModal()"+ <button aria-label="share" title="Share Video" @click="shareModal.toggleModal()"class="p-2 bg-button-100 dark:bg-button-900 rounded-lg ring-neutral-700 hover:ring-violet-700 hover:bg-violet-400/50 dark:ring-[0.125rem] hover:ring-[0.125rem] ring-inset shadow"><CircumShare1 height="24" width="24" /></button></section>- <section class="flex gap flex-col items-end text-sm dark:text-slate-400 text-slate-500 justify-between max-w-full">+ <section+ class="flex gap flex-col items-end text-sm dark:text-slate-400 text-slate-500 justify-between max-w-full"><p>{{ metaData?.fields.views }}</p><p class="line-clamp-1 truncate">{{ stateVideo?.tags ?? '#atmospheroc #sad #rocky' }}</p></section></div></div>- <ModalBase :modalData="editModal" :action="() => { console.log('submit'); }">+ <ModalBase :modalData="editModal" :useControls="false"><template #content>- <div class="py-6">- !! FORM !!+ <div class="pt-3">+ <EditVideo :video="stateVideo" @handleFinish="handleVideoDetailsUpdate"/></div></template></ModalBase>- <ModalBase :modalData="shareModal" :action="() => { console.log('submit'); }">+ <ModalBase :modalData="shareModal"><template #content><div class="py-3">Copy link to clipboard to share it.</div></template><template #controls>- <p>{{ metaData.fields.url }}</p>+ <CopyToClipboardSmall :text="metaData.fields.url" /></template></ModalBase>-</template>\ No newline at end of file+</template>diff --git a/resources/js/composables/useClipboard.js b/resources/js/composables/useClipboard.jsnew file mode 100644index 00000000..b855748d--- /dev/null+++ b/resources/js/composables/useClipboard.js@@ -0,0 +1,16 @@+import { reactive } from "vue";++export default function useClipboard(copyText) {+ return reactive({+ copyText,+ copyNotification: false,+ copyToClipboard() {+ navigator.clipboard.writeText(this.copyText);+ this.copyNotification = true;+ let that = this;+ setTimeout(function () {+ that.copyNotification = false;+ }, 3000);+ }+ });+}\ No newline at end of filediff --git a/resources/js/composables/useMetaData.js b/resources/js/composables/useMetaData.jsindex f66546fa..6998e423 100644--- a/resources/js/composables/useMetaData.js+++ b/resources/js/composables/useMetaData.js@@ -1,39 +1,26 @@-import { reactive, ref } from "vue";+import { reactive } from "vue";import { toFormattedDuration } from "@/service/util";import { useRoute } from "vue-router";// This so does not work lolexport default function useMetaData(data) {const route = useRoute();- const fields = ref({- title: data?.title ?? data?.name,- duration: toFormattedDuration(data?.duration) ?? 'N/A',- views: data?.view_count ? `${data?.view_count} View${data?.view_count !== 1 ? 's' : ''}` : '0 Views',- url: document.location.origin + route.path + `?video=${data.id}`- })- const updateData = (props) => {- fields.value = {- title: props?.title ?? props?.name,- duration: toFormattedDuration(props?.duration) ?? 'N/A',- views: props?.view_count ? `${props?.view_count} View${props?.view_count !== 1 ? 's' : ''}` : '0 Views',- url: document.location.origin + route.path + `?video=${data.id}`- }- }-return reactive({- fields,- updateData+ data,+ fields: {+ title: data?.title ?? data?.name,+ duration: toFormattedDuration(data?.duration) ?? 'N/A',+ views: data?.view_count ? `${data?.view_count} View${data?.view_count !== 1 ? 's' : ''}` : '0 Views',+ description: data.description ?? '',+ url: document.location.origin + route.path + `?video=${data.id}`,+ },+ updateData(props){+ this.fields.title = props?.title ?? props?.name,+ this.fields.duration = toFormattedDuration(props?.duration) ?? 'N/A',+ this.fields.views = props?.view_count ? `${props?.view_count} View${props?.view_count !== 1 ? 's' : ''}` : '0 Views',+ this.fields.description = props.description ?? '',+ this.fields.url = document.location.origin + route.path + `?video=${props.id}`+ }});-}--// const videoMetaData = computed(() => {-// const fields = props.video.attributes;-// const output = {-// title: fields?.title ?? fields?.name,-// duration: toFormattedDuration(fields?.duration) ?? 'N/A',-// views: fields?.view_count ? `${fields?.view_count} View${fields?.view_count !== 1 ? 's' : ''}` : '0 Views',-// }--// return output;-// })\ No newline at end of file+}\ No newline at end of filediff --git a/resources/js/composables/useModal.js b/resources/js/composables/useModal.jsindex f55c4427..a9588f0a 100644--- a/resources/js/composables/useModal.js+++ b/resources/js/composables/useModal.js@@ -1,16 +1,25 @@-import { reactive, ref } from "vue";+import { reactive } from "vue";export default function useModal(props){- const modalOpen = ref(false);+ let closingTimeoutID;+ const modal = reactive({+ ...props,+ modalOpen: false,+ isAnimating: false,+ animationTime: props.animationTime ?? 300,+ toggleModal(state = null) {+ if(this.isAnimating) return;+ clearTimeout(closingTimeoutID);- const toggleModal = (state = null) => {- if (state != null) modalOpen.value = state;- else modalOpen.value = !modalOpen.value;- }+ if (state != null) this.modalOpen = state;+ else this.modalOpen = !this.modalOpen;- return reactive({- props,- modalOpen,- toggleModal+ this.isAnimating = true;++ closingTimeoutID = setTimeout(() => {+ this.isAnimating = false;+ }, this.animationTime);+ },});+ return modal;}\ No newline at end of filediff --git a/resources/js/service/api.js b/resources/js/service/api.jsindex b64911ef..cdf9ec48 100644--- a/resources/js/service/api.js+++ b/resources/js/service/api.js@@ -6,8 +6,9 @@ const handleResponse = (response) => {const handleError = (error) => {// if the server throws an error (404, 500 etc.)- if(error.response.status === 403 | error.response.status === 500){- window.location.href = `/${error.response.status}?message=${error?.message}`+ console.log(error);+ if(error.response.status === 403 || error.response.status === 500){+ window.location = `/${error.response.status}?message=${error?.response?.data?.message ?? error?.message}`return;}diff --git a/resources/js/service/mediaAPI.js b/resources/js/service/mediaAPI.jsindex 40587d90..f723f845 100644--- a/resources/js/service/mediaAPI.js+++ b/resources/js/service/mediaAPI.js@@ -13,6 +13,9 @@ export default{viewVideo(id) {return API.patch(`/videos/watch/${id}`)},+ updateVideo(id,data){+ return API.patch(`/videos/${id}`, data)+ },getCategory(query) {return API.get(`/${query}`);}