Skip to content

A self-hosted media server and file management system

feat: skeleton cards when loading table data

aminnausin30c3fc6e3df7
diff --git a/resources/js/components/cedar-ui/table/TableBase.vue b/resources/js/components/cedar-ui/table/TableBase.vue
index 58126464..68e636c5 100644
--- a/resources/js/components/cedar-ui/table/TableBase.vue
+++ b/resources/js/components/cedar-ui/table/TableBase.vue
@@ -1,5 +1,6 @@
<script setup lang="ts" generic="T extends TableRow">
import type { TableSortOption, TableProps, TableRow } from '@aminnausin/cedar-ui';
+import type { Component } from 'vue';
import { PhSortDescendingLight, PhSortAscendingLight } from '../icons';
import { onMounted, ref, toRef } from 'vue';
@@ -11,7 +12,7 @@ import { TextInput } from '../input';
import TableLoadingSpinner from './TableLoadingSpinner.vue';
import TablePagination from './TablePagination.vue';
-const props = withDefaults(defineProps<TableProps<T> & { forceVerticalToolbar?: boolean; sticky?: boolean; stickyClass?: string }>(), {
+const props = withDefaults(defineProps<TableProps<T> & { forceVerticalToolbar?: boolean; sticky?: boolean; stickyClass?: string; loadingPlaceholder?: Component }>(), {
useToolbar: true,
usePagination: true,
itemsPerPage: 12,
@@ -20,6 +21,7 @@ const props = withDefaults(defineProps<TableProps<T> & { forceVerticalToolbar?:
usePaginationIcons: false,
maxVisiblePages: 5,
noResultsMessage: 'No Results',
+ loadingPlaceholder: TableLoadingSpinner,
});
const { currentPage, itemsPerPage, pageData, setPage } = useTable<T>({ itemsPerPage: props.itemsPerPage, data: toRef(props, 'data') });
@@ -99,12 +101,13 @@ onMounted(() => {
</div>
</section>
<section :class="cn(useGrid || 'flex w-full flex-1 flex-col flex-wrap gap-2', tableStyles)">
- <TableLoadingSpinner
+ <component
+ :is="loadingPlaceholder"
v-if="loading || pageData?.length === 0"
:is-loading="loading"
:data-length="pageData?.length"
:no-results-message="noResultsMessage"
- class="my-auto"
+ :class="[{ 'my-auto': loadingPlaceholder === TableLoadingSpinner }]"
/>
<template v-else>
<template v-for="(row, index) in pageData" :key="row.id">
diff --git a/resources/js/components/dashboard/DashboardTasks.vue b/resources/js/components/dashboard/DashboardTasks.vue
index 92e39118..3e6cab06 100644
--- a/resources/js/components/dashboard/DashboardTasks.vue
+++ b/resources/js/components/dashboard/DashboardTasks.vue
@@ -19,6 +19,7 @@ import { ModalBase } from '@/components/cedar-ui/modal';
import { toast } from '@aminnausin/cedar-ui';
import DashboardTaskMenu from '@/components/menus/DashboardTaskMenu.vue';
+import TableSkeleton from '@/components/skeleton/composites/TableSkeleton.vue';
import IconHorizon from '@/components/icons/IconHorizon.vue';
import TaskCard from '@/components/cards/data/TaskCard.vue';
import useModal from '@/composables/useModal';
@@ -247,6 +248,7 @@ onUnmounted(async () => {
:sort-action="handleSort"
:sorting-options="sortingOptions"
:table-styles="'gap-4 xs:gap-2'"
+ :loading-placeholder="TableSkeleton"
v-model="searchQuery"
/>
<ModalBase :modalData="cancelModal" :action="submitCancel">
diff --git a/resources/js/components/dashboard/DashboardUsers.vue b/resources/js/components/dashboard/DashboardUsers.vue
index 0fde5d4b..5552665b 100644
--- a/resources/js/components/dashboard/DashboardUsers.vue
+++ b/resources/js/components/dashboard/DashboardUsers.vue
@@ -14,6 +14,7 @@ import { TableBase } from '@/components/cedar-ui/table';
import { ModalBase } from '@/components/cedar-ui/modal';
import { toast } from '@aminnausin/cedar-ui';
+import TableSkeleton from '@/components/skeleton/composites/TableSkeleton.vue';
import UserCard from '@/components/cards/data/UserCard.vue';
import useModal from '@/composables/useModal';
@@ -147,6 +148,7 @@ const loadData = async (refresh: boolean = false) => {
:sort-action="handleSort"
:sorting-options="sortingOptions"
:table-styles="'gap-4 xs:gap-2'"
+ :loading-placeholder="TableSkeleton"
v-model="searchQuery"
/>
<ModalBase :modalData="confirmModal" :action="submitDelete">
diff --git a/resources/js/components/skeleton/cards/SkeletonCard.vue b/resources/js/components/skeleton/cards/SkeletonCard.vue
new file mode 100644
index 00000000..6cbdd7a4
--- /dev/null
+++ b/resources/js/components/skeleton/cards/SkeletonCard.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+import SidebarCard from '@/components/cards/sidebar/SidebarCard.vue';
+</script>
+
+<template>
+ <SidebarCard class="pointer-events-none min-h-20 animate-pulse justify-between gap-4 *:min-h-full">
+ <div class="flex w-full flex-wrap gap-4">
+ <div class="mr-auto flex items-center gap-2">
+ <div class="bg-foreground-1/5 size-5 rounded"></div>
+ <div class="bg-foreground-1/20 h-5 w-48 rounded"></div>
+ </div>
+ <div class="flex items-center gap-3">
+ <div class="bg-foreground-1/10 h-3 w-32 rounded"></div>
+ <div class="bg-foreground-1/10 size-4 rounded"></div>
+ </div>
+ </div>
+
+ <div class="flex w-full flex-wrap gap-4">
+ <div class="mr-auto flex items-center gap-3">
+ <div class="bg-foreground-2/10 h-3 w-24 rounded"></div>
+ <div class="bg-foreground-2/10 h-3 w-4 rounded-full"></div>
+ <div class="bg-foreground-2/10 h-3 w-16 rounded"></div>
+ </div>
+ <div class="bg-foreground-1/10 h-3 w-40 rounded"></div>
+ </div>
+ </SidebarCard>
+</template>
diff --git a/resources/js/components/skeleton/composites/TableSkeleton.vue b/resources/js/components/skeleton/composites/TableSkeleton.vue
new file mode 100644
index 00000000..506751dd
--- /dev/null
+++ b/resources/js/components/skeleton/composites/TableSkeleton.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts">
+import SkeletonCard from '@/components/skeleton/cards/SkeletonCard.vue';
+</script>
+
+<template>
+ <div class="contents">
+ <SkeletonCard v-for="i in 12" :key="i" />
+ </div>
+</template>
diff --git a/resources/js/views/HistoryView.vue b/resources/js/views/HistoryView.vue
index 4550c4da..957c8170 100755
--- a/resources/js/views/HistoryView.vue
+++ b/resources/js/views/HistoryView.vue
@@ -13,6 +13,7 @@ import { ModalBase } from '@/components/cedar-ui/modal';
import { toast } from '@aminnausin/cedar-ui';
import RecordCardDetails from '@/components/cards/data/RecordCardDetails.vue';
+import TableSkeleton from '@/components/skeleton/composites/TableSkeleton.vue';
import LayoutBase from '@/layouts/LayoutBase.vue';
import useModal from '@/composables/useModal';
@@ -103,6 +104,7 @@ onMounted(() => {
:useToolbar="true"
:sort-action="handleSort"
:sortingOptions="recordSortingOptions"
+ :loading-placeholder="TableSkeleton"
v-model="searchQuery"
/>
</section>