A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
new data structure
aminnausin9950cc9d536a
diff --git a/resources/js/components/cards/FolderCard.vue b/resources/js/components/cards/FolderCard.vueindex 40595ebb..4e06d62b 100755--- a/resources/js/components/cards/FolderCard.vue+++ b/resources/js/components/cards/FolderCard.vue@@ -7,7 +7,7 @@ import { RouterLink } from 'vue-router';import { ref } from 'vue';const props = defineProps(['folder', 'categoryName', 'stateFolderName']);-const folderLink = ref(`/${props.categoryName}/${props.folder.attributes.name}`);+const folderLink = ref(`/${props.categoryName}/${props.folder.name}`);</script><template>@@ -16,7 +16,7 @@ const folderLink = ref(`/${props.categoryName}/${props.folder.attributes.name}`)class="text-left relative flex flex-col gap-4 lg:gap-2 sm:flex-row flex-wrap rounded-lg dark:bg-primary-dark-800/70 bg-primary-800 dark:hover:bg-primary-dark-600 hover:bg-gray-200 dark:text-white shadow p-3 w-full group cursor-pointer divide-gray-300 dark:divide-gray-400"><section class="flex justify-between gap-4 w-full">- <h2 class="text-xl w-full truncate" :title="props.folder.attributes.name">{{ props.folder.attributes.name }}</h2>+ <h2 class="text-xl w-full truncate" :title="props.folder.name">{{ props.folder.name }}</h2><div class="flex justify-end gap-1"><ButtonCorner:positionClasses="'w-7 h-7'"@@ -31,7 +31,7 @@ const folderLink = ref(`/${props.categoryName}/${props.folder.attributes.name}`)</ButtonCorner><ButtonCorner:positionClasses="'w-7 h-7'"- :textClasses="`${props.folder.attributes.name === props.stateFolderName ? 'text-violet-600' : 'hover:text-violet-600'} dark:hover:text-violet-500`"+ :textClasses="`${props.folder.name === props.stateFolderName ? 'text-violet-600' : 'hover:text-violet-600'} dark:hover:text-violet-500`":colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'":to="''":label="'Open Folder'"@@ -45,9 +45,9 @@ const folderLink = ref(`/${props.categoryName}/${props.folder.attributes.name}`)<section class="flex flex-col sm:flex-row sm:justify-between w-full"><h3class="text-neutral-500 w-full text-wrap truncate sm:text-nowrap"- :title="`${props.folder.attributes.file_count} Episode${props.folder.attributes.file_count !== 1 ? 's' : ''}`"+ :title="`${props.folder.file_count} Episode${props.folder.file_count !== 1 ? 's' : ''}`">- {{ props.folder.attributes.file_count }} Episode{{ props.folder.attributes.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"><!-- some other folder statistic or data like number of seasons or if its popular or something -->diff --git a/resources/js/components/cards/RecordCard.vue b/resources/js/components/cards/RecordCard.vueindex 9d826467..eef6c8d4 100755--- a/resources/js/components/cards/RecordCard.vue+++ b/resources/js/components/cards/RecordCard.vue@@ -7,7 +7,7 @@ import { toTimeSpan } from '../../service/util';import { computed } from 'vue';const props = defineProps(['record']);-const rawDate = new Date(props.record.attributes.created_at.replace(' ', 'T'));+const rawDate = new Date(props.record.created_at.replace(' ', 'T'));const timeSpan = toTimeSpan(rawDate);const videoLink = computed(() => {diff --git a/resources/js/components/cards/RecordCardDetails.vue b/resources/js/components/cards/RecordCardDetails.vueindex 2ef7ff2c..c9e93d17 100755--- a/resources/js/components/cards/RecordCardDetails.vue+++ b/resources/js/components/cards/RecordCardDetails.vue@@ -7,7 +7,7 @@ import { computed } from 'vue';const props = defineProps(['data']);-const rawDate = new Date(props.data.attributes.created_at.replace(' ', 'T'));+const rawDate = new Date(props.data.created_at.replace(' ', 'T'));const timeSpan = toTimeSpan(rawDate);const videoLink = computed(() => {@@ -28,6 +28,7 @@ const videoLink = computed(() => {:textClasses="'hover:text-violet-600 dark:hover:text-violet-500'":colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'":to="videoLink"+ :label="'Watch Video'"><template #icon><CircumPlay1 width="20" height="20" />@@ -37,6 +38,7 @@ const videoLink = computed(() => {:positionClasses="'w-7 h-7'":textClasses="'text-rose-700'":colourClasses="'dark:hover:bg-neutral-800 hover:bg-gray-300'"+ :label="'Delete'"@click.stop.prevent="$emit('clickAction')"/></div>diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vueindex e5a657da..d22d1843 100755--- a/resources/js/components/cards/VideoCard.vue+++ b/resources/js/components/cards/VideoCard.vue@@ -5,14 +5,14 @@ import { watch } from 'vue';import { RouterLink } from 'vue-router';const props = defineProps(['data', 'index', 'currentID']);-const metaData = useMetaData({ ...props.data?.attributes, id: props.data.id, skipBaseURL: true });+const metaData = useMetaData({ ...props.data, id: props.data.id, skipBaseURL: true });const emit = defineEmits(['clickAction']);const handlePlay = () => {emit('clickAction', props.data?.id);};const handlePropsUpdate = () => {- metaData.updateData({ ...props.data?.attributes, id: props.data.id, skipBaseURL: true });+ metaData.updateData({ ...props.data, id: props.data.id, skipBaseURL: true });};watch(props, handlePropsUpdate, { immediate: true });@@ -24,7 +24,7 @@ watch(props, handlePropsUpdate, { immediate: true });: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":data-id="props.data?.id"- :data-path="`../${props.data?.attributes.path}`"+ :data-path="`../${props.data?.path}`"@click.left.stop.prevent.capture="handlePlay"><section class="flex justify-between gap-4 w-full items-start">@@ -41,7 +41,7 @@ watch(props, handlePropsUpdate, { immediate: true });</h3><h3 class="line-clamp-1 sm:min-w-40">- {{ props.data?.attributes.date }}+ {{ props.data?.date }}</h3></section></RouterLink>diff --git a/resources/js/components/forms/EditFolder.vue b/resources/js/components/forms/EditFolder.vueindex 080f7df7..1270830c 100644--- a/resources/js/components/forms/EditFolder.vue+++ b/resources/js/components/forms/EditFolder.vue@@ -1,6 +1,6 @@<script setup>import useForm from '../../composables/useForm';-import mediaAPI from '../../service/mediaAPI';+import mediaAPI from '@/service/mediaAPI.ts';import FormInput from '../inputs/FormInput.vue';import FormTextArea from '../inputs/FormTextArea.vue';import FormInputLabel from '../labels/FormInputLabel.vue';diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vueindex ec2776ae..7a1fe7b8 100755--- a/resources/js/components/forms/EditVideo.vue+++ b/resources/js/components/forms/EditVideo.vue@@ -1,6 +1,6 @@<script setup>import useForm from '../../composables/useForm';-import mediaAPI from '../../service/mediaAPI';+import mediaAPI from '@/service/mediaAPI.ts';import FormInput from '../inputs/FormInput.vue';import FormTextArea from '../inputs/FormTextArea.vue';import FormInputLabel from '../labels/FormInputLabel.vue';@@ -21,8 +21,8 @@ const fields = reactive([text: 'Title',type: 'text',required: true,- value: props.video?.attributes.title,- default: props.video?.attributes.name,+ value: props.video?.title,+ default: props.video?.name,subtext: 'The intended title of the episode',max: 255,},@@ -30,14 +30,14 @@ const fields = reactive([name: 'description',text: 'Description',type: 'textArea',- value: props.video?.attributes.description,+ value: props.video?.description,default: '',},{name: 'episode',text: 'Episode',type: 'number',- value: props.video?.attributes.episode ?? 1,+ value: props.video?.episode ?? 1,default: 0,min: 0,},@@ -45,7 +45,7 @@ const fields = reactive([name: 'season',text: 'Season',type: 'number',- value: props.video?.attributes.season ?? 1,+ value: props.video?.season ?? 1,default: 0,min: 0,},@@ -53,27 +53,27 @@ const fields = reactive([name: 'release_date',text: 'Release Date',type: 'date',- value: props.video?.attributes?.release_date ?? null,+ value: props.video?.release_date ?? null,default: null,},{name: 'tags',text: 'Tags',type: 'text',- value: props.video?.attributes.tags,- default: props.video?.attributes.tags,+ value: props.video?.tags,+ default: props.video?.tags,subtext: 'Tags that describe the video',max: 128,},]);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,- date_released: props.video?.attributes.date_released ?? null,- tags: props.video?.attributes.tags ?? null,+ title: props.video?.title ?? props.video?.name,+ description: props.video?.description ?? '',+ episode: props.video?.episode ?? null,+ season: props.video?.season ?? null,+ date_released: props.video?.date_released ?? null,+ tags: props.video?.tags ?? null,});const handleSubmit = async () => {diff --git a/resources/js/components/inputs/ButtonIcon.vue b/resources/js/components/inputs/ButtonIcon.vueindex 9501a69d..0b08592f 100755--- a/resources/js/components/inputs/ButtonIcon.vue+++ b/resources/js/components/inputs/ButtonIcon.vue@@ -1,6 +1,6 @@<template><button- class="p-2 flex items-center justify-center h-10 w-10 shadow-sm rounded-md cursor-pointer focus:outline-none ring-inset ring-[1px] 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-700 text-gray-900 dark:text-neutral-100 bg-white dark:bg-primary-dark-800"+ class="p-2 flex items-center justify-center h-10 max-h-full aspect-square shadow-sm rounded-md cursor-pointer focus:outline-none ring-inset ring-[1px] 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-700 text-gray-900 dark:text-neutral-100 bg-white dark:bg-primary-dark-800"><slot name="icon"> </slot></button>diff --git a/resources/js/components/inputs/ButtonText.vue b/resources/js/components/inputs/ButtonText.vueindex f1241b93..8d1e02d2 100755--- a/resources/js/components/inputs/ButtonText.vue+++ b/resources/js/components/inputs/ButtonText.vue@@ -1,6 +1,10 @@+<script setup>+const props = defineProps(['class']);+</script>+<template><button- class="p-2 flex items-center justify-center h-full shadow-sm rounded-md focus:outline-none cursor-pointer ring-inset ring-[1px] 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-700 text-gray-900 dark:text-neutral-100 bg-white dark:bg-primary-dark-800"+ :class="`${props.class} p-2 flex items-center justify-center h-full shadow-sm rounded-md focus:outline-none cursor-pointer ring-inset ring-[1px] 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-700 text-gray-900 dark:text-neutral-100 bg-white dark:bg-primary-dark-800`"><slot name="text"> </slot></button>diff --git a/resources/js/components/labels/ChipTag.vue b/resources/js/components/labels/ChipTag.vuenew file mode 100644index 00000000..4c7c7dfd--- /dev/null+++ b/resources/js/components/labels/ChipTag.vue@@ -0,0 +1,20 @@+<script setup>+import { RouterLink } from 'vue-router';++const props = defineProps(['label', 'colour', 'URL', 'removeable']);+</script>+<template>+ <RouterLink+ v-if="props.URL"+ :class="`p-1 rounded-xl truncate text-slate-300 bg-${props.colour ? `bg-${props.colour}` : 'bg-violet-900/70'} shrink-0`"+ :to="props.URL"+ >+ #{{ props.label }}+ </RouterLink>+ <p+ v-else+ :class="`p-1 px-2 text-sm leading-none rounded-xl truncate text-slate-300 ${props.colour ? `bg-${props.colour}` : 'bg-violet-900/70'} shrink-0`"+ >+ {{ props.label }}+ </p>+</template>diff --git a/resources/js/components/panels/VideoSidebar.vue b/resources/js/components/panels/VideoSidebar.vueindex 02fdae2c..d6fe1240 100755--- a/resources/js/components/panels/VideoSidebar.vue+++ b/resources/js/components/panels/VideoSidebar.vue@@ -17,7 +17,7 @@ const shareModal = useModal({ title: 'Share Video' });const shareLink = ref('');const { selectedSideBar } = storeToRefs(appStore);-const { folders, records, stateDirectory, stateFolder } = storeToRefs(contentStore);+const { records, stateDirectory, stateFolder } = storeToRefs(contentStore);const handleShare = (link) => {if (!link || link[0] !== '/') return;@@ -35,7 +35,7 @@ const handleShare = (link) => {<hr class="mt-2 mb-3" /><section v-if="selectedSideBar === 'folders'" id="list-content-folders" class="flex space-y-2 flex-wrap"><FolderCard- v-for="folder in folders"+ v-for="folder in stateDirectory.folders":key="folder.id":folder="folder":categoryName="stateDirectory.name"diff --git a/resources/js/components/video/VideoInfoPanel.vue b/resources/js/components/video/VideoInfoPanel.vueindex 8675d43a..16f65b6f 100755--- a/resources/js/components/video/VideoInfoPanel.vue+++ b/resources/js/components/video/VideoInfoPanel.vue@@ -12,8 +12,10 @@ 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 CircumShare1 from '~icons/circum/share-1';+import CircumEdit from '~icons/circum/edit';const ContentStore = useContentStore();const AuthStore = useAuthStore();@@ -39,13 +41,13 @@ const defaultDescription = `After defeating thelife-extending magic and tutor Fern in magic in her spare time. She agrees afterseeing Fern is already remarkably skilled despite her youth.`;-const metaData = useMetaData({ ...stateVideo.value.attributes, id: stateVideo.value.id }, stateVideo.value);+const metaData = useMetaData({ ...stateVideo.value, id: stateVideo.value.id }, stateVideo.value);const editFolderModal = useModal({ title: 'Edit Folder Details', submitText: 'Submit Details' });const editVideoModal = useModal({ title: 'Edit Video Details', submitText: 'Submit Details' });const shareVideoModal = useModal({ title: 'Share Video' });const handlePropsUpdate = () => {- metaData.updateData({ ...stateVideo.value.attributes, id: stateVideo.value.id });+ metaData.updateData({ ...stateVideo.value, id: stateVideo.value.id });};const handleVideoDetailsUpdate = (res) => {@@ -72,12 +74,28 @@ watch(() => stateVideo.value, handlePropsUpdate, { immediate: true, deep: true }<template><div- class="p-6 w-full mx-auto dark:bg-primary-dark-800/70 bg-primary-800 rounded-xl shadow-lg flex justify-center sm:justify-between gap-4 flex-wrap sm:flex-nowrap overflow-hidden"+ class="flex flex-col sm:flex-row gap-2 sm:gap-4 p-4 overflow-clip w-full rounded-xl shadow-lg dark:bg-primary-dark-800/70 bg-primary-800">- <div id="mp4-description" class="flex items-center gap-4 w-full md:w-2/3">+ <div id="mp4-header-mobile" class="flex items-center justify-between w-full sm:hidden gap-2 flex-wrap">+ <div class="text-xl font-medium line-clamp-1 capitalize">+ {{ metaData?.fields.title ?? '[Video Name]' }}+ </div>+ <span class="flex gap-1 flex-row flex-wrap h-[22px] overflow-hidden">+ <ChipTag+ v-for="(tag, index) in (stateVideo?.tags ? stateVideo.tags : '#atmospheric #sad #action')+ .replace('#', '')+ .split(' ')+ .filter((tag) => tag.replaceAll(' ', ''))"+ v-bind:key="index"+ :label="tag"+ />+ </span>+ </div>++ <div id="mp4-description-desktop" class="flex gap-4 sm:flex-1 shrink-0"><imgid="folder-thumbnail"- class="h-28 object-cover rounded-md shadow-md aspect-2/3"+ 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'@@ -90,52 +108,85 @@ watch(() => stateVideo.value, handlePropsUpdate, { immediate: true, deep: true }"title="Edit Folder Details"/>- <div class="h-full flex flex-col gap-2">- <div id="mp4-title" class="text-xl font-medium line capitalize">+ <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">{{ 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">+ <p class="text-nowrap text-ellipsis flex-1 h-[22px]">+ {{ metaData?.fields.views }}+ </p>+ <section class="flex gap-2 justify-end h-8">+ <ButtonIcon+ v-if="userData"+ aria-label="edit details"+ title="Edit Video Details"+ @click="editVideoModal.toggleModal()"+ >+ <template #icon>+ <CircumEdit height="16" width="16" />+ </template>+ </ButtonIcon>+ <ButtonIcon aria-label="share" title="Share Video" @click="shareVideoModal.toggleModal()">+ <template #icon>+ <CircumShare1 height="16" width="16" />+ </template>+ </ButtonIcon>+ </section>+ </span></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 justify-end">- <ButtonText v-if="userData" aria-label="edit details" title="Edit Video Details" @click="editVideoModal.toggleModal()">++ <div id="mp4-details" class="hidden sm:flex flex-col lg:min-w-32 max-w-64 w-fit gap-4 justify-between overflow-hidden" role="group">+ <section class="flex gap-2 justify-end h-8">+ <ButtonText+ v-if="userData"+ aria-label="edit details"+ title="Edit Video Details"+ @click="editVideoModal.toggleModal()"+ class="text-sm"+ ><template #text><p class="text-nowrap">Edit Details</p>+ <!-- <CircumEdit height="24" width="24" /> --></template></ButtonText><ButtonIcon aria-label="share" title="Share Video" @click="shareVideoModal.toggleModal()"><template #icon>- <CircumShare1 height="24" width="24" />+ <CircumShare1 height="16" width="16" /></template></ButtonIcon></section>- <section class="flex flex-1 sm:flex-none gap flex-col items-end text-sm dark:text-slate-400 text-slate-500 max-w-full">+ <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>- <p class="line-clamp-1">- {{ stateVideo?.tags ?? '#atmospheric #sad #action' }}+ {{ metaData.fields.views }}</p>+ <span class="flex gap-1 flex-row flex-wrap max-h-[22px] overflow-hidden justify-end">+ <ChipTag+ v-for="(tag, index) in (stateVideo?.tags ? stateVideo.tags : '#atmospheric #sad #action')+ .replace('#', '')+ .split(' ')+ .filter((tag) => tag.replaceAll(' ', ''))"+ v-bind:key="index"+ :label="tag"+ />+ </span></section></div></div><ModalBase :modalData="editFolderModal" :useControls="false"><template #content>- <div class="pt-3">+ <div class="pt-2"><EditFolder :folder="stateFolder" @handleFinish="handleSeriesUpdate" /></div></template></ModalBase><ModalBase :modalData="editVideoModal" :useControls="false"><template #content>- <div class="pt-3">+ <div class="pt-2"><EditVideo :video="stateVideo" @handleFinish="handleVideoDetailsUpdate" /></div></template>diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vueindex 55e5fbf9..ddbb2dee 100755--- a/resources/js/components/video/VideoPlayer.vue+++ b/resources/js/components/video/VideoPlayer.vue@@ -178,7 +178,7 @@ watch(stateVideo, initVideoPlayer);<videoid="vid-source"width="100%"- :src="stateVideo?.attributes?.path ? `../${stateVideo?.attributes?.path}` : ''"+ :src="stateVideo?.path ? `../${stateVideo?.path}` : ''"type="video/mp4"controlsclass="focus:outline-none aspect-video flex"diff --git a/resources/js/service/mediaAPI.js b/resources/js/service/mediaAPI.tsold mode 100755new mode 100644similarity index 80%rename from resources/js/service/mediaAPI.jsrename to resources/js/service/mediaAPI.tsindex 0b541915..9fd5b8a5--- a/resources/js/service/mediaAPI.js+++ b/resources/js/service/mediaAPI.ts@@ -7,13 +7,13 @@import { API } from './api';export default {- getVideos(data) {- return API.post('/videos', data);+ getVideos(data: { folder_id: number }) {+ return API.get(`/videos?folder_id=${data.folder_id}`);},- viewVideo(id) {+ viewVideo(id: number) {return API.patch(`/videos/watch/${id}`);},- updateVideo(id, data) {+ updateVideo(id: number, data) {return API.patch(`/videos/${id}`, data);},createMetadata(data) {diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.jsindex 79d8cf0a..2c4d772d 100755--- a/resources/js/stores/ContentStore.js+++ b/resources/js/stores/ContentStore.js@@ -1,5 +1,5 @@import recordsAPI from '@/service/recordsAPI';-import mediaAPI from '@/service/mediaAPI';+import mediaAPI from '@/service/mediaAPI.ts';import { toFormattedDate } from '@/service/util';import { ref, watch } from 'vue';@@ -16,7 +16,7 @@ export const useContentStore = defineStore('Content', () => {const route = useRoute();const toast = useToast();- const folders = ref([]);+ // const folders = ref([]);const records = ref([]);const fullRecordsLoaded = ref(false);@@ -41,7 +41,7 @@ export const useContentStore = defineStore('Content', () => {console.log(error ?? data?.message);return Promise.reject([]);}- stateVideo.value.attributes.view_count += 1;+ stateVideo.value.view_count += 1;return Promise.resolve(stateVideo.value);}@@ -98,8 +98,8 @@ export const useContentStore = defineStore('Content', () => {const recordsSort = (column = 'created_at', dir = 1) => {let tempList = records.value.sort((recordA, recordB) => {if (column === 'created_at') {- let dateA = new Date(recordA?.attributes['created_at']);- let dateB = new Date(recordB?.attributes['created_at']);+ let dateA = new Date(recordA['created_at']);+ let dateB = new Date(recordB['created_at']);return (dateB - dateA) * dir;}return recordB?.relationships[column]?.localeCompare(recordA?.relationships[column]) * dir;@@ -109,7 +109,11 @@ export const useContentStore = defineStore('Content', () => {};async function getCategory(URL_CATEGORY, URL_FOLDER) {- const { data, error } = await mediaAPI.getCategory(`${URL_CATEGORY}${URL_FOLDER ? '/' + URL_FOLDER : ''}`);+ const { data, error } = await mediaAPI.getCategory(`${URL_CATEGORY}${URL_FOLDER ? '/' + URL_FOLDER : ''}`); // => {dir: {id,name,folderCount}, folder: {id,name,videos[],series}}++ // statedir (list of folders) = dir => /api/categories/1+ // statefolder (list of videos) = folder => /api/folders/8?videos=true+if (error || !data?.success) {toast.add({ type: 'danger', title: 'Error', description: data?.message ?? 'Unable to load data.' });pageTitle.value = 'Folder not Found';@@ -119,7 +123,7 @@ export const useContentStore = defineStore('Content', () => {stateDirectory.value = data.data.dir;stateFolder.value = data.data.folder;- folders.value = data.data.dir.folders;+ // folders.value = data.data.dir.folders;pageTitle.value = stateFolder.value.name;@@ -129,7 +133,7 @@ export const useContentStore = defineStore('Content', () => {async function getFolder(nextFolderName) {const nextFolder = stateDirectory.value.folders?.find((folder) => {- return folder.attributes.name === nextFolderName;+ return folder.name === nextFolderName;});if (!nextFolder?.id) {@@ -148,7 +152,7 @@ export const useContentStore = defineStore('Content', () => {// console.log(nextFolder);- stateFolder.value = { id: nextFolder.id, name: nextFolder.attributes.name, videos: data.data, series: nextFolder.series ?? null };+ stateFolder.value = { id: nextFolder.id, name: nextFolder.name, videos: data.data, series: nextFolder.series ?? null };pageTitle.value = stateFolder.value.name;InitPlaylist();@@ -163,7 +167,7 @@ export const useContentStore = defineStore('Content', () => {if (nextIndex < 0 || nextIndex > statePlaylist.value.length) return;stateVideo.value = statePlaylist.value[nextIndex];- document.title = `${stateFolder.value.name} · ${stateVideo.value?.attributes?.title ?? stateVideo.value?.attributes?.name}`;+ document.title = `${stateFolder.value.name} · ${stateVideo.value?.title ?? stateVideo.value?.name}`;}function playlistFind(id) {@@ -179,7 +183,7 @@ export const useContentStore = defineStore('Content', () => {if (!result) toast.add({ type: 'danger', title: 'Invalid Video', description: 'Selected video cannot be found...' });else {stateVideo.value = result;- document.title = `${stateFolder.value.name} · ${stateVideo.value?.attributes?.title ?? stateVideo.value?.attributes?.name}`;+ document.title = `${stateFolder.value.name} · ${stateVideo.value?.title ?? stateVideo.value?.name}`;}}@@ -192,7 +196,7 @@ export const useContentStore = defineStore('Content', () => {}statePlaylist.value = stateFolder.value.videos.map((video, index) => {- video.attributes.date = toFormattedDate(new Date(video.attributes.date + ' GMT'));+ video.date = toFormattedDate(new Date(video.date + ' GMT'));return { index, ...video };});playlistSort();@@ -203,12 +207,12 @@ export const useContentStore = defineStore('Content', () => {const playlistSort = (column = 'name', dir = 1) => {let tempList = statePlaylist.value.sort((videoA, videoB) => {if (column === 'date') {- let dateA = new Date(videoA?.attributes[column]);- let dateB = new Date(videoB?.attributes[column]);+ let dateA = new Date(videoA[column]);+ let dateB = new Date(videoB[column]);return (dateB - dateA) * dir;}- if (column === 'name' || column === 'title') return videoA?.attributes[column].localeCompare(videoB?.attributes[column]) * dir;- return (videoB?.attributes[column] - videoA?.attributes[column]) * dir;+ if (column === 'name' || column === 'title') return videoA[column].localeCompare(videoB[column]) * dir;+ return (videoB[column] - videoA[column]) * dir;});stateFilteredPlaylist.value = tempList;@@ -222,7 +226,7 @@ export const useContentStore = defineStore('Content', () => {? statePlaylist.value.filter((video) => {{try {- let strRepresentation = [video.attributes.name, video.attributes.date].join(' ').toLowerCase();+ let strRepresentation = [video.name, video.date].join(' ').toLowerCase();// console.log(strRepresentation);return strRepresentation.includes(query.toLowerCase());@@ -255,7 +259,7 @@ export const useContentStore = defineStore('Content', () => {watch(searchQuery, playlistFilter, { immediate: false });return {- folders,+ // folders,records,stateDirectory,stateFolder,diff --git a/resources/js/views/HistoryView.vue b/resources/js/views/HistoryView.vueindex 73ef3f51..468d0acc 100755--- a/resources/js/views/HistoryView.vue+++ b/resources/js/views/HistoryView.vue@@ -29,11 +29,7 @@ const filteredRecords = computed(() => {? records.value.filter((video) => {{try {- let strRepresentation = [- video.relationships?.video_name,- video.relationships?.folder_name,- video.attributes.created_at,- ]+ let strRepresentation = [video.relationships?.video_name, video.relationships?.folder_name, video.created_at].join(' ').toLowerCase();return strRepresentation.includes(searchQuery.value.toLowerCase());diff --git a/resources/js/views/LoginView.vue b/resources/js/views/LoginView.vueindex d26c058b..f826bf8a 100755--- a/resources/js/views/LoginView.vue+++ b/resources/js/views/LoginView.vue@@ -29,6 +29,8 @@ const form = useForm({const handleLogin = async () => {form.submit(async (fields) => {+ console.log(fields);+return await login(fields);},{