Compare commits

..

7 Commits

Author SHA1 Message Date
Renovate Bot
4c43a1200a Update dependency react-dom to v19.0.0-rc-fb9a90fa48-20240614
Some checks failed
Playwright Tests / test (pull_request) Failing after 1m22s
Build docker image / build-static-assets (pull_request) Failing after 3m52s
2024-08-18 21:30:34 +00:00
138813b674 Merge pull request 'Display a table skeleton while the list of guests is loading' (#29) from skeleton into main
Some checks failed
Build docker image / build-static-assets (push) Failing after 1m15s
Playwright Tests / test (push) Successful in 3m11s
Reviewed-on: #29
2024-08-18 20:02:45 +00:00
61df349cee Capture error in case the connection is not OK
All checks were successful
Playwright Tests / test (pull_request) Successful in 2m20s
Build docker image / build-static-assets (pull_request) Successful in 3m56s
2024-08-18 20:01:17 +02:00
628ddc8eb2 Define table as a client component
Some checks failed
Playwright Tests / test (pull_request) Failing after 1m58s
Build docker image / build-static-assets (pull_request) Failing after 5m22s
2024-08-18 19:18:00 +02:00
4022928f1c Display a skeleton while guests information is loading
Some checks failed
Playwright Tests / test (pull_request) Failing after 1m12s
Build docker image / build-static-assets (pull_request) Failing after 4m27s
2024-08-18 18:41:44 +02:00
611b487db4 Define skeletons for the guests table (not working yet) 2024-08-18 18:09:09 +02:00
b7eb2838a0 Render table of guests as a server component 2024-08-18 17:46:37 +02:00
4 changed files with 90 additions and 54 deletions

View File

@ -1,8 +1,8 @@
import { lusitana } from '@/app/ui/fonts'; import { lusitana } from '@/app/ui/fonts';
import AffinityGroupsTree from '@/app/ui/guests/affinity-groups-tree'; import AffinityGroupsTree from '@/app/ui/guests/affinity-groups-tree';
import GuestsTable from '@/app/ui/guests/table'; import GuestsTable from '@/app/ui/guests/table';
import { Tree } from 'primereact/tree'; import React, { Suspense } from 'react';
import React, { useState, useEffect } from 'react'; import SkeletonTable from '@/app/ui/guests/skeleton-row';
@ -13,7 +13,9 @@ export default function Page() {
<h1 className={`${lusitana.className} text-2xl py-4`}>Guests</h1> <h1 className={`${lusitana.className} text-2xl py-4`}>Guests</h1>
<div className="flex w-full items-center justify-between"> <div className="flex w-full items-center justify-between">
<Suspense fallback={<SkeletonTable />}>
<GuestsTable /> <GuestsTable />
</Suspense>
</div> </div>
</div> </div>
); );

View File

@ -0,0 +1,34 @@
import Skeleton from '@/app/ui/skeleton';
export function SkeletonRow() {
return (
<tr className="bg-white border-b odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800">
<td className="px-6 py-4">{<Skeleton className="w-[45ch] h-[1rem]" />}</td>
<td className="px-6 py-4">{<Skeleton className="w-[45ch] h-[1rem]" />}</td>
<td className="px-6 py-4">{<Skeleton className="w-[20ch] h-[1rem]" />}</td>
<td className="px-6 py-4">{<Skeleton className="w-[10ch] h-[1rem]" />}</td>
</tr>
);
}
export default function SkeletonTable() {
return (
<div className="w-full relative overflow-x-auto shadow-md sm:rounded-lg">
<table className="w-full text-sm text-left rtl:text-right text-gray-500 dark:text-gray-400">
<caption className="p-5 text-lg font-semibold text-left rtl:text-right text-gray-900 bg-white dark:text-white dark:bg-gray-800">
Guests
<p className="mt-1 text-sm font-normal text-gray-500 dark:text-gray-400">
Loading the list of guests...
</p>
</caption>
<thead className="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400">
</thead>
<tbody>
{[...Array(20)].map((e, i) => <SkeletonRow />)}
</tbody>
</table>
</div>
);
}

View File

@ -1,21 +1,20 @@
'use client' 'use client'
import { Guest } from '@/app/lib/definitions'; import { Guest } from '@/app/lib/definitions';
import { useState, Suspense, useEffect } from 'react'; import SkeletonRow from './skeleton-row';
import { Suspense } from 'react';
import clsx from 'clsx'; import clsx from 'clsx';
export default function guestsTable() { export function TableHeader() {
const [guests, setGuests] = useState<Guest[]>([]);
useEffect(() => {
if (guests.length > 0) {
return;
} }
fetch("http://localhost:3001/guests.json")
export default async function guestsTable() {
let guests: Guest[] = await fetch("http://localhost:3001/guests.json")
.then((response) => response.json()) .then((response) => response.json())
.then((data) => { .then((data) => {
setGuests(data.data.map((record: any) => { return data.data.map((record: any) => {
return ({ return ({
id: record.id, id: record.id,
name: record.attributes.name, name: record.attributes.name,
@ -23,8 +22,9 @@ export default function guestsTable() {
group_name: record.attributes.group_name, group_name: record.attributes.group_name,
status: record.attributes.status status: record.attributes.status
}); });
}))
}); });
}, (error) => {
return [];
}); });
return ( return (
@ -53,7 +53,6 @@ export default function guestsTable() {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<Suspense>
{guests.map((guest) => ( {guests.map((guest) => (
<tr key={guest.id} className="bg-white border-b odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800"> <tr key={guest.id} className="bg-white border-b odd:bg-white odd:dark:bg-gray-900 even:bg-gray-50 even:dark:bg-gray-800">
<th scope="row" className="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white"> <th scope="row" className="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white">
@ -76,14 +75,12 @@ export default function guestsTable() {
'bg-red-400': guest.status === 'Declined', 'bg-red-400': guest.status === 'Declined',
} }
)}> )}>
{/* <span className="flex w-2.5 h-2.5 rounded-full me-1.5 flex-shrink-0 bg-blue-600"> */}
</span> </span>
{guest.status} {guest.status}
</span> </span>
</td> </td>
</tr> </tr>
))} ))}
</Suspense>
</tbody> </tbody>
</table> </table>
</div> </div>

3
app/ui/skeleton.tsx Normal file
View File

@ -0,0 +1,3 @@
export default function Skeleton({ className }: { className: string }) {
return <div className={`bg-slate-200 motion-safe:animate-pulse rounded ${className}`} />;
}