Skip to content

A self-hosted media server and file management system

more sorting fixes and typescript

aminnausinb02b5d60bfe2
diff --git a/resources/js/components/cards/RecordCard.vue b/resources/js/components/cards/RecordCard.vue
index 09e2adca..ed4cb895 100755
--- a/resources/js/components/cards/RecordCard.vue
+++ b/resources/js/components/cards/RecordCard.vue
@@ -27,7 +27,8 @@ const videoLink = computed(() => {
</script>
<template>
- <div
+ <RouterLink
+ :to="videoLink ? videoLink : ''"
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 items-center">
@@ -90,5 +91,5 @@ const videoLink = computed(() => {
}}
</h3>
</section>
- </div>
+ </RouterLink>
</template>
diff --git a/resources/js/components/table/TableBase.vue b/resources/js/components/table/TableBase.vue
index 5c7b8828..e3d75355 100755
--- a/resources/js/components/table/TableBase.vue
+++ b/resources/js/components/table/TableBase.vue
@@ -6,7 +6,7 @@ import TablePagination from '@/components/table/TablePagination.vue';
import FormInputLabel from '@/components/labels/FormInputLabel.vue';
import InputSelect from '@/components/pinesUI/InputSelect.vue';
import ButtonIcon from '@/components/inputs/ButtonIcon.vue';
-import useTable from '@/composables/useTable';
+import useTable from '@/composables/useTable.ts';
import PhSortDescendingLight from '~icons/ph/sort-descending-light';
import PhSortAscendingLight from '~icons/ph/sort-ascending-light';
diff --git a/resources/js/components/table/TablePagination.vue b/resources/js/components/table/TablePagination.vue
index c4e15407..bf8b58c7 100755
--- a/resources/js/components/table/TablePagination.vue
+++ b/resources/js/components/table/TablePagination.vue
@@ -1,10 +1,17 @@
-<script setup>
+<script setup lang="ts">
import { computed, nextTick, ref } from 'vue';
+
import TablePaginationButton from './TablePaginationButton.vue';
+const props = defineProps<{
+ listLength: number;
+ currentPage: number;
+ itemsPerPage: number;
+}>();
+const $element = ref<null | HTMLElement>(null);
+
const emit = defineEmits(['setPage']);
-const $element = ref(null);
-const props = defineProps(['listLength', 'currentPage', 'itemsPerPage']);
+
const pageCount = computed(() => {
return Math.ceil(props.listLength / props.itemsPerPage);
});
@@ -13,7 +20,7 @@ const pageRange = computed(() => {
if (pageCount.value <= 5) out = pageCount.value;
else if (props.currentPage <= 3) out = Math.min(4, pageCount.value);
else if (pageCount.value - props.currentPage <= 2) {
- let range = [];
+ let range: number[] = [];
for (var i = pageCount.value - 3; i <= pageCount.value; i++) {
range = [...range, i];
}
@@ -23,7 +30,7 @@ const pageRange = computed(() => {
return out === null ? [props.currentPage - 1, props.currentPage, props.currentPage + 1] : out;
});
-const handleSetPage = async (page) => {
+const handleSetPage = async (page: number) => {
emit('setPage', page);
await nextTick();
$element.value?.scrollIntoView({ behavior: 'smooth', block: 'end' });
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index e017111c..c7201432 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -12,14 +12,14 @@ import { storeToRefs } from 'pinia';
import { getMediaUrl } from '@/service/api';
const playbackDataBuffer = 5;
-const defaultHeatMapData = ref([
+const defaultHeatMapData = [
{ x: 25, y: 60 },
{ x: 154, y: 48 },
{ x: 266, y: 12 },
{ x: 585, y: 18 },
{ x: 799, y: 16 },
{ x: 1000, y: 100 },
-]);
+];
const ContentStore = useContentStore();
const appStore = useAppStore();
diff --git a/resources/js/composables/useTable.js b/resources/js/composables/useTable.ts
old mode 100755
new mode 100644
similarity index 90%
rename from resources/js/composables/useTable.js
rename to resources/js/composables/useTable.ts
index b269d064..dfa53900
--- a/resources/js/composables/useTable.js
+++ b/resources/js/composables/useTable.ts
@@ -1,6 +1,6 @@
import { computed, reactive, ref, watch } from 'vue';
-export default function useTable(props) {
+export default function useTable(props: any) {
const currentPage = ref(1);
const itemsPerPage = ref(props.itemsPerPage ?? 10);
const searchQuery = ref(props.searchQuery ?? '');
@@ -14,7 +14,7 @@ export default function useTable(props) {
}),
props,
fields: { currentPage, itemsPerPage, searchQuery },
- handlePageChange(page) {
+ handlePageChange(page: number) {
currentPage.value = page;
},
handlePageReset() {
diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.js
index 44114ab9..b3bb1dd3 100755
--- a/resources/js/stores/ContentStore.js
+++ b/resources/js/stores/ContentStore.js
@@ -95,29 +95,8 @@ export const useContentStore = defineStore('Content', () => {
}
// needs to go in the computed property
- async function playlistSort(column = 'name', dir = 1) {
- // videoSort.value = { ...videoSort.value, column, dir };
-
- let parsedDir = parseInt(dir);
-
- videoSortDir.value = !isNaN(parsedDir) ? parsedDir : 1;
- videoSortColumn.value = column;
- // searchQuery.value = '';
- // console.log(videoSortDir.value);
-
- // console.log('outter', videoSort);
-
- // let tempList = statePlaylist.value.sort((videoA, videoB) => {
- // if (column === 'date') {
- // let dateA = new Date(videoA[column]);
- // let dateB = new Date(videoB[column]);
- // return (dateB - dateA) * dir;
- // }
- // if (column === 'name' || column === 'title') return videoA[column].localeCompare(videoB[column]) * dir;
- // return (videoB[column] - videoA[column]) * dir;
- // });
- // statePlaylist.value = tempList;
- // return tempList;
+ async function playlistSort(sort = { column: 'name', dir: 1 }) {
+ videoSort.value = { ...videoSort.value, ...sort };
}
//#region DATA FETCHING
@@ -275,11 +254,6 @@ export const useContentStore = defineStore('Content', () => {
};
}
- function setVideoSort(val) {
- videoSort.value = val;
- console.log(val);
- }
-
//#endregion
return {
@@ -302,6 +276,5 @@ export const useContentStore = defineStore('Content', () => {
updateFolderData,
playlistFind,
playlistSort,
- setVideoSort,
};
});
diff --git a/resources/js/views/VideoView.vue b/resources/js/views/VideoView.vue
index 7e4a75f7..976299ff 100755
--- a/resources/js/views/VideoView.vue
+++ b/resources/js/views/VideoView.vue
@@ -1,44 +1,51 @@
-<script setup>
-import { nextTick, onMounted, ref, watch } from 'vue';
-import { useContentStore } from '../stores/ContentStore';
-import { useAppStore } from '../stores/AppStore';
+<script setup lang="ts">
+import type { FolderResource, VideoResource } from '@/types/resources';
+import type { Metadata } from '@/types/model';
+
+import { nextTick, onMounted, ref, watch, type Ref } from 'vue';
+import { useContentStore } from '@/stores/ContentStore';
+import { useAppStore } from '@/stores/AppStore';
import { storeToRefs } from 'pinia';
import { useRoute } from 'vue-router';
-import VideoAmbientPlayer from '../components/video/VideoAmbientPlayer.vue';
-import VideoInfoPanel from '../components/video/VideoInfoPanel.vue';
-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 VideoAmbientPlayer from '@/components/video/VideoAmbientPlayer.vue';
+import VideoInfoPanel from '@/components/video/VideoInfoPanel.vue';
+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';
+const ContentStore = useContentStore();
+const appStore = useAppStore();
const route = useRoute();
const loading = ref(true);
-// const videoSort = ref({ column: 'title', dir: 1 });
-const appStore = useAppStore();
-const ContentStore = useContentStore();
+const { getFolder, getCategory, getRecords, playlistFind, playlistSort } = ContentStore;
+const { searchQuery, stateFilteredPlaylist, stateVideo, stateFolder } = storeToRefs(ContentStore) as {
+ searchQuery: Ref<string>;
+ stateFilteredPlaylist: Ref<VideoResource[]>;
+ stateVideo: Ref<VideoResource | { id?: number; metadata?: Metadata; path?: string }>;
+ stateFolder: Ref<FolderResource | any>;
+};
const { selectedSideBar } = storeToRefs(appStore);
-const { searchQuery, stateFilteredPlaylist, stateVideo, stateFolder } = storeToRefs(ContentStore);
-const { getFolder, getCategory, getRecords, playlistFind, setVideoSort } = ContentStore;
-async function cycleSideBar(state) {
+async function cycleSideBar(state: string) {
if (state === 'history') {
await getRecords(10);
}
if (!state) return;
await nextTick();
- document.querySelector('#list-card').scrollIntoView({ behavior: 'smooth' });
+ document.querySelector('#list-card')?.scrollIntoView({ behavior: 'smooth' });
}
-async function reload(nextFolderName) {
+async function reload(nextFolderName: string | string[]) {
loading.value = true;
- await getFolder(nextFolderName);
+ await getFolder(nextFolderName.toString());
loading.value = false;
}
-// Table
+//#region TABLE
const sortingOptions = ref([
{
@@ -79,16 +86,15 @@ const sortingOptions = ref([
]);
const handleSort = (column = 'date', dir = 1) => {
- // playlistSort(column, dir);
- setVideoSort({ column, dir });
- // videoSortColumn.value = column;
- // videoSortDir.value = dir;
+ playlistSort({ column, dir });
};
-const handleSearch = (query) => {
+const handleSearch = (query: string) => {
searchQuery.value = query;
};
+//#endregion
+
onMounted(async () => {
const URL_CATEGORY = route.params.category;
const URL_FOLDER = route.params.folder;
@@ -116,14 +122,9 @@ watch(() => selectedSideBar.value, cycleSideBar, { immediate: false });
<section id="content-video" class="flex flex-col gap-3">
<div id="video-container" class="flex flex-col gap-3">
<VideoAmbientPlayer />
-
- <!-- <hr class=""> -->
-
<VideoInfoPanel />
</div>
- <!-- <hr id='preData'> -->
-
<TableBase
:data="stateFilteredPlaylist"
:row="VideoCard"