Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Add skeleton state

Bill Yang5f8d41509a84
diff --git a/client/src/app/[site]/layout.tsx b/client/src/app/[site]/layout.tsx
index f613957e1..420ba87bb 100644
--- a/client/src/app/[site]/layout.tsx
+++ b/client/src/app/[site]/layout.tsx
@@ -25,6 +25,7 @@ export default function SiteLayout({
return (
<>
<Header />
+
{children}
</>
);
diff --git a/client/src/app/[site]/main/page.tsx b/client/src/app/[site]/main/page.tsx
index f2559e56e..5ed035a86 100644
--- a/client/src/app/[site]/main/page.tsx
+++ b/client/src/app/[site]/main/page.tsx
@@ -1,8 +1,10 @@
"use client";
-import { usePathname } from "next/navigation";
-import { useGetSites, useSiteHasData } from "../../../hooks/api";
+import { useSiteHasData } from "../../../hooks/api";
+import { useGetSiteMetadata } from "../../../hooks/hooks";
import { useStore } from "../../../lib/store";
import { NoData } from "../components/NoData";
+import { SubHeader } from "../components/SubHeader/SubHeader";
+import { MainSection } from "./components/MainSection/MainSection";
import { Browsers } from "./components/sections/Browsers";
import { Countries } from "./components/sections/Countries";
import { Devices } from "./components/sections/Devices";
@@ -10,9 +12,6 @@ import { Map } from "./components/sections/Map";
import { OperatingSystems } from "./components/sections/OperatingSystems";
import { Pages } from "./components/sections/Pages";
import { Referrers } from "./components/sections/Referrers";
-import { SubHeader } from "../components/SubHeader/SubHeader";
-import { useGetSiteMetadata } from "../../../hooks/hooks";
-import { MainSection } from "./components/MainSection/MainSection";
export default function MainPage() {
const { site } = useStore();
diff --git a/client/src/app/[site]/sessions/components/SessionsTable.tsx b/client/src/app/[site]/sessions/components/SessionsTable.tsx
index e62be5679..f509937fc 100644
--- a/client/src/app/[site]/sessions/components/SessionsTable.tsx
+++ b/client/src/app/[site]/sessions/components/SessionsTable.tsx
@@ -7,10 +7,10 @@ import {
import { format, parseISO } from "date-fns";
import { useEffect, useMemo, useRef } from "react";
import { getCountryName } from "../../../../lib/utils";
-import { APIResponse } from "@/hooks/api";
-import { CountryFlag } from "../../components/shared/icons/CountryFlag";
import { Browser } from "../../components/shared/icons/Browser";
+import { CountryFlag } from "../../components/shared/icons/CountryFlag";
import { OperatingSystem } from "../../components/shared/icons/OperatingSystem";
+import { Skeleton } from "@/components/ui/skeleton";
type Session = {
session_id: string;
@@ -34,6 +34,19 @@ interface SessionsTableProps {
isFetchingNextPage: boolean;
}
+// Skeleton row component for loading state
+const SkeletonRow = ({ columns }: { columns: number }) => {
+ return (
+ <tr className="bg-neutral-900">
+ {Array.from({ length: columns }).map((_, index) => (
+ <td key={index} className="px-4 py-3 whitespace-nowrap">
+ <Skeleton className="h-6 w-full max-w-[120px]" />
+ </td>
+ ))}
+ </tr>
+ );
+};
+
export default function SessionsTable({
data,
isLoading,
@@ -142,14 +155,14 @@ export default function SessionsTable({
className="overflow-auto rounded-lg"
style={{ height: "calc(100vh - 200px)" }}
>
- <table className="min-w-full divide-y divide-gray-200">
+ <table className="min-w-full divide-y divide-neutral-500">
<thead className="bg-neutral-900 sticky top-0">
{table.getHeaderGroups().map((headerGroup) => (
<tr key={headerGroup.id}>
{headerGroup.headers.map((header) => (
<th
key={header.id}
- className="px-6 py-3 text-left font-medium text-gray-400 tracking-wider"
+ className="px-4 py-3 text-left font-medium text-gray-400 tracking-wider"
>
<div className="flex items-center">
{flexRender(
@@ -164,14 +177,13 @@ export default function SessionsTable({
</thead>
<tbody className="divide-y divide-neutral-650">
{isLoading ? (
- <tr>
- <td colSpan={columns.length} className="px-6 py-4">
- <div className="flex justify-center">Loading...</div>
- </td>
- </tr>
+ // Show 10 skeleton rows while loading
+ Array.from({ length: 100 }).map((_, index) => (
+ <SkeletonRow key={index} columns={columns.length} />
+ ))
) : data.length === 0 ? (
<tr>
- <td colSpan={columns.length} className="px-6 py-4">
+ <td colSpan={columns.length} className="px-4 py-3">
<div className="flex justify-center">No sessions found</div>
</td>
</tr>
@@ -179,7 +191,7 @@ export default function SessionsTable({
table.getRowModel().rows.map((row) => (
<tr key={row.id} className="hover:bg-neutral-850 bg-neutral-900">
{row.getVisibleCells().map((cell) => (
- <td key={cell.id} className="px-6 py-4 whitespace-nowrap">
+ <td key={cell.id} className="px-4 py-3 whitespace-nowrap">
{flexRender(cell.column.columnDef.cell, cell.getContext())}
</td>
))}
@@ -191,7 +203,9 @@ export default function SessionsTable({
{isFetchingNextPage && (
<div className="flex justify-center p-4">
- <div className="text-sm text-gray-500">Loading more sessions...</div>
+ <div className="flex space-x-4">
+ <Skeleton className="h-5 w-32" />
+ </div>
</div>
)}
</div>
diff --git a/client/src/app/[site]/sessions/page.tsx b/client/src/app/[site]/sessions/page.tsx
index aaf23d97e..9db2b15d8 100644
--- a/client/src/app/[site]/sessions/page.tsx
+++ b/client/src/app/[site]/sessions/page.tsx
@@ -3,6 +3,7 @@
import { useGetSessionsInfinite } from "@/hooks/api";
import { useMemo } from "react";
import SessionsTable from "./components/SessionsTable";
+import { SubHeader } from "../components/SubHeader/SubHeader";
export default function SessionsPage() {
const {
@@ -24,6 +25,7 @@ export default function SessionsPage() {
return (
<div>
+ <SubHeader />
<SessionsTable
data={flattenedData}
isLoading={isLoading}
diff --git a/client/src/lib/utils.ts b/client/src/lib/utils.ts
index 216d05656..30921891f 100644
--- a/client/src/lib/utils.ts
+++ b/client/src/lib/utils.ts
@@ -30,5 +30,5 @@ export const sleep = (ms: number) =>
new Promise((resolve) => setTimeout(resolve, ms));
export const getCountryName = (countryCode: string) => {
- return countries[countryCode as keyof typeof countries].name;
+ return countries[countryCode as keyof typeof countries]?.name;
};