A self-hosted media server and file management system
Vue ffmpegfile-serverjellyfinlaravelmediamedia-playermedia-servermediabrowsermediaservermusicmusic-librarymusic-playermusicplayerself-hostedvuejs
fix sort and add tags on video card
aminnausin717f8afe9cf3
diff --git a/resources/js/components/cards/VideoCard.vue b/resources/js/components/cards/VideoCard.vueindex ba0cfd1d..c2f7a15a 100755--- a/resources/js/components/cards/VideoCard.vue+++ b/resources/js/components/cards/VideoCard.vue@@ -4,6 +4,7 @@ import useMetaData from '../../composables/useMetaData';import { watch } from 'vue';import { RouterLink } from 'vue-router';import { toFormattedDate } from '../../service/util';+import ChipTag from '../labels/ChipTag.vue';const props = defineProps(['data', 'index', 'currentID']);const metaData = useMetaData({ ...props.data, id: props.data.id, skipBaseURL: true });@@ -42,9 +43,20 @@ watch(props, handlePropsUpdate, { immediate: true });<sectionclass="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>+ <span class="flex gap-2 items-center w-full flex-1">+ <h3 class="text-sm sm:text-base text-nowrap text-start">+ {{ metaData?.fields?.views }}+ </h3>++ <span class="hidden sm:flex flex-wrap gap-1 max-h-5 h-full sm:max-h-[24px] overflow-x-hidden px-2 flex-1">+ <ChipTag+ v-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'"+ />+ </span>+ </span><h3 class="text-end truncate">{{ toFormattedDate(new Date(props.data?.date + ' GMT')) }}diff --git a/resources/js/components/labels/ChipTag.vue b/resources/js/components/labels/ChipTag.vueindex 8d80ccef..2eccf3ef 100644--- a/resources/js/components/labels/ChipTag.vue+++ b/resources/js/components/labels/ChipTag.vue@@ -5,7 +5,7 @@ import ButtonCorner from '../inputs/ButtonCorner.vue';const props = defineProps(['label', 'colour', 'URL', 'removeable']);-const styling = `p-1 px-2 text-sm leading-none rounded-xl truncate lowercase text-neutral-100 dark:text-neutral-300 ${props.colour ? `bg-${props.colour}` : 'bg-violet-600 dark:bg-violet-900/90'} shrink-0`;+const styling = `p-1 px-2 text-sm 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`;</script><template><RouterLink v-if="props.URL" :class="styling" :to="props.URL">diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.jsindex 12be340f..0a03817a 100755--- a/resources/js/stores/ContentStore.js+++ b/resources/js/stores/ContentStore.js@@ -23,6 +23,7 @@ export const useContentStore = defineStore('Content', () => {const videoSortColumn = ref('title');const videoSortDir = ref(1);+ const searchQuery = ref('');const stateDirectory = ref({ id: 7, name: 'anime', folders: [] });const stateFolder = ref({ id: 7, name: 'ODDTAXI', videos: [], series: null });@@ -30,18 +31,8 @@ export const useContentStore = defineStore('Content', () => {const stateFilteredPlaylist = computed(() => {// let dir = videoSortDir.value;let list = stateFolder.value.videos;- // let list = statePlaylist.value.sort((videoA, videoB) => {- // if (videoSortColumn.value === 'date') {- // let dateA = new Date(videoA[videoSortColumn.value]);- // let dateB = new Date(videoB[videoSortColumn.value]);- // return (dateB - dateA) * dir;- // }- // if (videoSortColumn.value === 'name' || videoSortColumn.value === 'title')- // return videoA[videoSortColumn.value].localeCompare(videoB[videoSortColumn.value]) * dir;- // return (videoB[videoSortColumn.value] - videoA[videoSortColumn.value]) * dir;- // });- return searchQuery.value+ let searchedList = searchQuery.value? list.filter((video) => {{try {@@ -56,14 +47,27 @@ export const useContentStore = defineStore('Content', () => {}}): list;++ let sortedList = videoSortColumn.value+ ? searchedList.sort((videoA, videoB) => {+ if (videoSortColumn.value === 'date') {+ let dateA = new Date(videoA[videoSortColumn.value]);+ let dateB = new Date(videoB[videoSortColumn.value]);+ return (dateB - dateA) * videoSortDir.value;+ }+ if (videoSortColumn.value === 'name' || videoSortColumn.value === 'title')+ return videoA[videoSortColumn.value].localeCompare(videoB[videoSortColumn.value]) * videoSortDir.value;+ return (videoB[videoSortColumn.value] - videoA[videoSortColumn.value]) * videoSortDir.value;+ })+ : searchedList;++ return sortedList;}); // use a computed ref?const stateVideo = ref({});const { pageTitle } = storeToRefs(AppStore);const { userData } = storeToRefs(AuthStore);- const searchQuery = ref('');-async function recordsSort(column = 'created_at', dir = 1) {let tempList = stateRecords.value.sort((recordA, recordB) => {if (column === 'created_at') {@@ -102,7 +106,7 @@ export const useContentStore = defineStore('Content', () => {videoSortDir.value = !isNaN(parsedDir) ? parsedDir : 1;videoSortColumn.value = column;- searchQuery.value = '';+ // searchQuery.value = '';// console.log(videoSortDir.value);// console.log('outter', videoSort);diff --git a/resources/js/views/VideoView.vue b/resources/js/views/VideoView.vueindex 9bdb815f..941f4124 100755--- a/resources/js/views/VideoView.vue+++ b/resources/js/views/VideoView.vue@@ -14,11 +14,13 @@ import { useRoute } from 'vue-router';const route = useRoute();const loading = ref(true);+const videoSortColumn = ref('title');+const videoSortDir = ref(1);const appStore = useAppStore();const ContentStore = useContentStore();const { selectedSideBar } = storeToRefs(appStore);const { searchQuery, stateFilteredPlaylist, stateVideo } = storeToRefs(ContentStore);-const { getFolder, getCategory, getRecords, playlistFind, playlistSort } = ContentStore;+const { getFolder, getCategory, getRecords, playlistFind } = ContentStore;async function cycleSideBar(state) {if (state === 'history') {@@ -77,7 +79,9 @@ const sortingOptions = ref([]);const handleSort = (column = 'date', dir = 1) => {- playlistSort(column, dir);+ // playlistSort(column, dir);+ videoSortColumn.value = column;+ videoSortDir.value = dir;};const handleSearch = (query) => {@@ -111,7 +115,18 @@ watch(() => selectedSideBar.value, cycleSideBar, { immediate: false });<!-- <hr id='preData'> --><TableBase- :data="stateFilteredPlaylist"+ :data="+ stateFilteredPlaylist.sort((videoA, videoB) => {+ if (videoSortColumn === 'date') {+ let dateA = new Date(videoA[videoSortColumn]);+ let dateB = new Date(videoB[videoSortColumn]);+ return (dateB - dateA) * videoSortDir.value;+ }+ if (videoSortColumn === 'name' || videoSortColumn === 'title')+ return videoA[videoSortColumn].localeCompare(videoB[videoSortColumn]) * videoSortDir;+ return (videoB[videoSortColumn] - videoA[videoSortColumn]) * videoSortDir;+ })+ ":row="VideoCard":clickAction="playlistFind":loading="loading"