Skip to content

A self-hosted media server and file management system

paginate full history

aminnausin706366fb0b24
diff --git a/resources/js/components/cards/RecordCardDetails.vue b/resources/js/components/cards/RecordCardDetails.vue
index 9ceafe9a..499c31dc 100644
--- a/resources/js/components/cards/RecordCardDetails.vue
+++ b/resources/js/components/cards/RecordCardDetails.vue
@@ -1,70 +1,50 @@
<script setup>
import ButtonCorner from '../inputs/ButtonCorner.vue';
-import CircumLogin from '~icons/circum/login';
-import CircumMaximize1 from '~icons/circum/maximize-1';
import CircumPlay1 from '~icons/circum/play-1';
import { toTimeSpan } from '../../service/util';
import { computed } from 'vue';
-const { record } = defineProps(['record']);
+const props = defineProps(['data']);
-const rawDate = new Date(record.attributes.created_at.replace(' ', 'T'));
+const rawDate = new Date(props.data.attributes.created_at.replace(' ', 'T'));
const timeSpan = toTimeSpan(rawDate);
const videoLink = computed(() => {
- return (`/${encodeURIComponent(record.relationships.category_name)}/${encodeURIComponent(record.relationships.folder_name)}?video=${record.relationships.video_id}`);
+ return (`/${encodeURIComponent(props.data.relationships.category_name)}/${encodeURIComponent(props.data.relationships.folder_name)}?video=${props.data.relationships.video_id}`);
})
</script>
<template>
- <div class="flex gap-12 group cursor-default">
- <div
- class="hidden flex rounded-xl items-center justify-center dark:bg-primary-dark-800 bg-primary-800 dark:hover:bg-neutral-700 hover:bg-neutral-200 dark:text-white shadow p-3 w-full group flex-grow cursor-pointer">
- <div class="w-full flex-wrap divide-y divide-gray-300">
- <section class="flex justify-between items-baseline w-full">
- <h2 class="text-xl text-left truncate">{{ record.relationships.video_name }}</h2>
- <h2 class="text-xl text-right truncate">{{ `${rawDate.toLocaleDateString('en-ca', {
- year: "numeric",
- month: '2-digit', day: '2-digit', hour: '2-digit', hour12: false, minute:'2-digit'})}` }}</h2>
- </section>
- <aside class="flex justify-between items-center w-full pt-1">
- <h3 class="text-lg text-left text-neutral-500 truncate">{{ record.relationships.folder_name }}</h3>
- <h3 class="text-lg text-right text-neutral-500 text-nowrap line-clamp-1 truncate">{{ timeSpan }}
- </h3>
- <span class="hidden space-x-1">
- <button
- class="hover:bg-orange-500 hover:stroke-none border-orange-500 border-2 rounded shadow px-2">Watch</button>
- </span>
- </aside>
+ <button @click.stop.prevent="$emit('clickAction')"
+ class="text-left relative flex flex-col gap-2 sm:flex-row flex-wrap rounded-xl dark:bg-primary-dark-800 bg-primary-800 dark:hover:bg-neutral-700 hover:bg-slate-200 dark:text-white shadow p-3 w-full group cursor-pointer sm:divide-y divide-gray-300 dark:divide-gray-400">
+ <section class="flex justify-between gap-4 w-full">
+ <h2 class="text-xl w-full truncate">{{ props.data.relationships.video_name }}</h2>
+ <div class="flex justify-end gap-1">
+ <ButtonCorner :positionClasses="'w-7 h-7'"
+ :textClasses="'hover:text-indigo-600 dark:hover:text-indigo-400'"
+ :colourClasses="'dark:hover:bg-neutral-800 hover:bg-slate-300'" :to="videoLink">
+ <template #icon>
+ <CircumPlay1 width="20" height="20"/>
+ </template>
+ </ButtonCorner>
+ <ButtonCorner :positionClasses="'w-7 h-7'" :textClasses="'text-rose-700'"
+ :colourClasses="'dark:hover:bg-neutral-800 hover:bg-slate-300'" @click.stop.prevent="$emit('clickAction')" />
</div>
- </div>
- <div class="hidden aspect-square rounded-full items-center justify-center group-hover:visible invisible flex">
- <button class="record-delete w-full p-3 items-center justify-center rounded-xl bg-red-700 hover:bg-red-600"
- :data-id="record" @click="$emit('deleteRecord')">
- Delete
- </button>
- </div>
- <div class="relative flex flex-col gap-2 sm:flex-row flex-wrap rounded-xl dark:bg-primary-dark-800 bg-primary-800 dark:hover:bg-neutral-700 hover:bg-slate-200 dark:text-white shadow p-3 w-full group cursor-pointer sm:divide-y divide-gray-300 dark:divide-gray-400">
- <section class="flex justify-between gap-4 w-full">
- <h2 class="text-xl w-full truncate">{{ record.relationships.video_name }}</h2>
- <div class="flex justify-end gap-1">
- <ButtonCorner :positionClasses="'w-7 h-7'" :textClasses="'hover:text-indigo-600 dark:hover:text-indigo-300'" :colourClasses="'dark:hover:bg-neutral-800 hover:bg-slate-300'" :to="videoLink">
- <template #icon>
- <CircumPlay1 width="20" height="20" fill="none" viewBox="0 0 24 24"/>
- </template>
- </ButtonCorner>
- <ButtonCorner :positionClasses="'w-7 h-7'" :textClasses="'text-rose-700'" :colourClasses="'dark:hover:bg-neutral-800 hover:bg-slate-300'" @click="$emit('deleteRecord')"/>
- </div>
- </section>
- <section class="flex flex-col sm:flex-row sm:justify-between w-full pt-2">
- <h3 class="text-lg text-neutral-500 w-full text-wrap truncate">{{ record.relationships.folder_name }} · {{ timeSpan }}</h3>
- <h3 class="text-lg truncate sm:text-right text-neutral-500 w-full line-clamp-2">{{ `${rawDate.toLocaleDateString('en-ca', {
- year: "numeric",
- month: '2-digit', day: '2-digit', hour: '2-digit', hour12: false, minute:'2-digit'})}` }}</h3>
- </section>
- </div>
- </div>
+ </section>
+ <section class="flex flex-col sm:flex-row sm:justify-between w-full pt-2">
+ <h3 class="text-lg text-neutral-500 w-full text-wrap truncate sm:text-nowrap">
+ {{ props.data.relationships.folder_name }} · {{ timeSpan }}</h3>
+ <h3 class="text-lg truncate sm:text-right text-neutral-500 w-full line-clamp-2">
+ {{
+ `${rawDate.toLocaleDateString('en-ca', {
+ year: "numeric",
+ month: '2-digit', day: '2-digit', hour: '2-digit', hour12: false, minute: '2-digit'
+ })}`
+ }}
+ </h3>
+ </section>
+ </button>
</template>
\ No newline at end of file
diff --git a/resources/js/components/table/TableBase.vue b/resources/js/components/table/TableBase.vue
new file mode 100644
index 00000000..46926769
--- /dev/null
+++ b/resources/js/components/table/TableBase.vue
@@ -0,0 +1,26 @@
+<script setup>
+import useTable from '../../composables/useTable';
+import LabelledTextInput from '../inputs/LabelledTextInput.vue';
+import TablePagination from '../table/TablePagination.vue';
+
+import { watch } from 'vue';
+
+
+const props = defineProps(['useToolbar','data', 'row', 'clickAction']);
+const tableData = useTable(props);
+
+watch(props.data, tableData.handlePageReset, {immediate: true})
+</script>
+
+<template>
+ <table class="w-full flex flex-col gap-4 divide-y first:pt-0 [&>*:not(:first-child)]:pt-4">
+ <section v-if="props.useToolbar" class="flex justify-center sm:justify-between p-2">
+ <LabelledTextInput v-model="tableData.fields.searchQuery" :text="'Search'" :placeholder="'Enter search query'" :id="'table-search'" class="w-80"/>
+ </section>
+ <tbody class="flex w-full flex-wrap gap-2">
+ <component :is="props.row" v-for="(row, index) in tableData.filteredPage" :key="row?.id ?? index" :data="row" @clickAction="props.clickAction"></component>
+ <div v-if="tableData.filteredPage.length === 0" class="text-center text-lg text-gray-500 dark:text-gray-400 uppercase tracking-wider w-full">No Results</div>
+ </tbody>
+ <TablePagination :listLength="props.data?.length ?? 0" :itemsPerPage="tableData.fields.itemsPerPage" :currentPage="tableData.fields.currentPage" @setPage="tableData.handlePageChange"/>
+ </table>
+</template>
\ No newline at end of file
diff --git a/resources/js/components/table/TablePagination.vue b/resources/js/components/table/TablePagination.vue
index eb706c27..b2383111 100644
--- a/resources/js/components/table/TablePagination.vue
+++ b/resources/js/components/table/TablePagination.vue
@@ -21,7 +21,7 @@ const pageRange = computed(() => {
</script>
<template>
- <div class="flex items-center flex-col sm:flex-row sm:justify-between flex-wrap gap-2">
+ <div class="flex items-center flex-col sm:flex-row sm:justify-between flex-wrap gap-2" id="pageinate">
<p class="text-gray-700 dark:text-neutral-300 line-clamp-1">
Showing
<span class="font-medium dark:text-neutral-100">{{ props.listLength ? props.itemsPerPage * (currentPage - 1) + 1 : 0 }}</span>
@@ -31,7 +31,7 @@ const pageRange = computed(() => {
<span class="font-medium dark:text-neutral-100">{{ listLength }}</span>
Results
</p>
- <nav class="">
+ <nav id="pageinate">
<ul
class="flex flex-wrap items-center text-sm leading-tight bg-white dark:bg-neutral-800 border divide-x rounded h-9 text-neutral-500 dark:text-neutral-200 divide-neutral-200 dark:divide-neutral-700 border-neutral-200 dark:border-neutral-700">
<TablePaginationButton :pageNumber="-1" :text="'Previous'"
diff --git a/resources/js/composables/useTable.js b/resources/js/composables/useTable.js
new file mode 100644
index 00000000..a595a248
--- /dev/null
+++ b/resources/js/composables/useTable.js
@@ -0,0 +1,30 @@
+import { computed, reactive, ref, watch } from 'vue';
+
+export default function useTable(props){
+ const currentPage = ref(1);
+ const itemsPerPage = ref(10);
+ const searchQuery = ref('')
+
+ const handlePageChange = (page) => {
+ currentPage.value = page;
+ }
+
+ const handlePageReset = () => {
+ currentPage.value = 1
+ };
+
+ watch(props.data, handlePageReset, {immediate: true})
+
+ return reactive({
+ filteredPage : computed(() => {
+ const minIndex = itemsPerPage.value * (currentPage.value - 1);
+ const maxIndex = Math.min(itemsPerPage.value * (currentPage.value), props.data.length);
+
+ return props.data.slice(minIndex, maxIndex);
+ }),
+ props,
+ fields: {currentPage, itemsPerPage, searchQuery},
+ handlePageChange,
+ handlePageReset
+ });
+}
\ No newline at end of file
diff --git a/resources/js/service/recordsAPI.js b/resources/js/service/recordsAPI.js
index ad01d194..4f9ac315 100644
--- a/resources/js/service/recordsAPI.js
+++ b/resources/js/service/recordsAPI.js
@@ -11,7 +11,7 @@ export default{
return API.post('/records', data)
},
getRecords(query) {
- return API.get(`/records${query}`);
+ return API.get(`/records${query ?? ''}`);
},
deleteRecord(query) {
return API.delete(`/records${query}`);
diff --git a/resources/js/stores/ContentStore.js b/resources/js/stores/ContentStore.js
index 50b6fad6..4d8f6a32 100644
--- a/resources/js/stores/ContentStore.js
+++ b/resources/js/stores/ContentStore.js
@@ -46,19 +46,26 @@ export const useContentStore = defineStore('Content', () => {
async function getRecords(limit){
if(!userData.value) return;
+ if(limit && records.value.length !== 0 || records.value.length > 10){
+ Promise.resolve(records.value);
+ return;
+ }
+
+ records.value = [];
+
const { data, error } = await recordsAPI.getRecords(limit ? `?limit=${limit}`: '');
if(error || !data?.success){
console.log(error ?? data?.message);
return Promise.reject([]);
}
- records.value = data?.data ?? [];
+ records.value = data?.data ?? []; // always overwrite because if limit is set and results cached, no request is made. Otherwise its a full request.
return Promise.resolve(records.value)
//parseHistory(data.data);
}
- async function createRecord(id, limit = 10){
+ async function createRecord(id){
if(!userData.value) return;
const { data, error } = await recordsAPI.createRecord({ 'video_id': id });
@@ -66,7 +73,7 @@ export const useContentStore = defineStore('Content', () => {
console.log(error ?? data?.message);
return Promise.reject([]);
}
- records.value = [data?.data, ...records.value.slice(0, Math.max(limit, records.value.length - 1))];
+ records.value = [data?.data, ...records.value];
return Promise.resolve(records.value)
}
diff --git a/resources/js/views/HistoryView.vue b/resources/js/views/HistoryView.vue
index 945a0a03..5113d232 100644
--- a/resources/js/views/HistoryView.vue
+++ b/resources/js/views/HistoryView.vue
@@ -3,6 +3,7 @@
import LayoutBase from '../components/layout/LayoutBase.vue';
import ModalBase from '../components/pinesUI/ModalBase.vue';
import useModal from '../composables/useModal';
+ import TableBase from '../components/table/TableBase.vue';
import { storeToRefs } from 'pinia';
import { useAppStore } from '../stores/AppStore';
@@ -12,9 +13,10 @@
const appStore = useAppStore();
const ContentStore = useContentStore();
- const { pageTitle } = storeToRefs(appStore);
+ const { pageTitle, selectedSideBar } = storeToRefs(appStore);
const { records } = storeToRefs(ContentStore);
const { getRecords, deleteRecord } = ContentStore;
+ const loaded = ref(false);
const cachedID = ref(null);
const confirmModal = useModal({title: 'Delete Record?', submitText: 'Confim'});
@@ -30,16 +32,24 @@
}
onMounted(() => {
- getRecords();
pageTitle.value = "History";
+ selectedSideBar.value = '';
+ (async () => {
+ if( records.value.length <= 10 ) await getRecords();
+ loaded.value = true;
+ })()
})
</script>
<template>
<LayoutBase>
<template v-slot:content>
- <section id="content-history" class=" space-y-2 cursor-pointer min-h-[80vh] pt-8">
- <RecordCardDetails v-for="record in records" :record="record" :key="record.recordID" @deleteRecord="handleDelete(record.id)"/>
+ <section id="content-history" class=" space-y-2 cursor-pointer min-h-[80vh] ">
+ <!-- <RecordCardDetails v-for="record in records" :data="record" :key="record.id" @deleteRecord="handleDelete(record.id)"/> -->
+
+ <TableBase :data="records" :row="RecordCardDetails" :clickAction="handleDelete">
+
+ </TableBase>
</section>
<ModalBase :modalData="confirmModal" :action="submitDelete">
<template #content>