🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance user page loading experience with skeleton loaders
Bill Yang388da205922a
diff --git a/client/src/app/[site]/user/[userId]/page.tsx b/client/src/app/[site]/user/[userId]/page.tsxindex 0873bc8e6..e0ee6ccc4 100644--- a/client/src/app/[site]/user/[userId]/page.tsx+++ b/client/src/app/[site]/user/[userId]/page.tsx@@ -20,6 +20,7 @@ import { useUserInfo } from "../../../../api/analytics/userInfo";import { useGetUserSessionCount } from "../../../../api/analytics/userSessions";import { MobileSidebar } from "../../../../components/MobileSidebar";import { Button } from "../../../../components/ui/button";+import { Skeleton } from "../../../../components/ui/skeleton";import { useSetPageTitle } from "../../../../hooks/useSetPageTitle";import { useGetRegionName } from "../../../../lib/geo";import { getCountryName, getLanguageName } from "../../../../lib/utils";@@ -36,7 +37,7 @@ export default function UserPage() {const { userId } = useParams();const { site } = useParams();- const { data } = useUserInfo(Number(site), userId as string);+ const { data, isLoading } = useUserInfo(Number(site), userId as string);const { data: sessionCount } = useGetUserSessionCount(userId as string);@@ -66,122 +67,166 @@ export default function UserPage() {{userId?.slice(0, 10)}</h1><div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 text-sm mb-3">- <div className="grid grid-cols-1 md:grid-cols-2 gap-2">- <div className="grid grid-cols-[100px_auto] gap-2">- {/* <span className=" text-neutral-100">User ID:</span>- <CopyText- text={userId as string}- maxLength={24}- className="inline-flex text-neutral-300"- /> */}- <span className="text-neutral-100">Country:</span>- <div className="text-neutral-300 flex gap-1 items-center">- <CountryFlag country={data?.country || ""} />- {data?.country ? getCountryName(data.country) : "N/A"}+ {isLoading ? (+ // Skeleton loading state for user info+ <div className="grid grid-cols-1 md:grid-cols-2 gap-2">+ <div className="grid grid-cols-[100px_auto] gap-2">+ {Array.from({ length: 4 }).map((_, index) => (+ <>+ <Skeleton key={`label-${index}`} className="h-4 w-16" />+ <Skeleton key={`value-${index}`} className="h-4 w-24" />+ </>+ ))}</div>- <span className=" text-neutral-100">Region:</span>- <div className="text-neutral-300">- {data?.region ? getRegionName(data.region) : "N/A"}- </div>- <span className=" text-neutral-100">City:</span>- <div className="text-neutral-300">{data?.city ?? "N/A"}</div>- <span className=" text-neutral-100">Language:</span>- <div className="text-neutral-300">- {data?.language ? getLanguageName(data.language) : "N/A"}+ <div className="grid grid-cols-[110px_1fr] gap-2">+ {Array.from({ length: 4 }).map((_, index) => (+ <>+ <Skeleton key={`label2-${index}`} className="h-4 w-20" />+ <Skeleton key={`value2-${index}`} className="h-4 w-32" />+ </>+ ))}</div></div>- <div className="grid grid-cols-[110px_1fr] gap-2">- <span className=" text-neutral-100">Device Type:</span>- <div className="text-neutral-300 flex gap-1 items-center">- {data?.device_type === "Desktop" && (- <Monitor className="w-4 h-4" />- )}- {data?.device_type === "Mobile" && (- <Smartphone className="w-4 h-4" />- )}- {data?.device_type === "Tablet" && (- <Tablet className="w-4 h-4" />- )}- {data?.device_type}- </div>- <span className=" text-neutral-100">Browser:</span>- <div className="flex gap-1 text-neutral-300 items-center">- <Browser browser={data?.browser || "Unknown"} />- {data?.browser}- {data?.browser_version && (- <span className="ml-1">v{data?.browser_version}</span>- )}+ ) : (+ // Actual user info data+ <div className="grid grid-cols-1 md:grid-cols-2 gap-2">+ <div className="grid grid-cols-[100px_auto] gap-2">+ {/* <span className=" text-neutral-100">User ID:</span>+ <CopyText+ text={userId as string}+ maxLength={24}+ className="inline-flex text-neutral-300"+ /> */}+ <span className="text-neutral-100">Country:</span>+ <div className="text-neutral-300 flex gap-1 items-center">+ <CountryFlag country={data?.country || ""} />+ {data?.country ? getCountryName(data.country) : "N/A"}+ </div>+ <span className=" text-neutral-100">Region:</span>+ <div className="text-neutral-300">+ {data?.region ? getRegionName(data.region) : "N/A"}+ </div>+ <span className=" text-neutral-100">City:</span>+ <div className="text-neutral-300">{data?.city ?? "N/A"}</div>+ <span className=" text-neutral-100">Language:</span>+ <div className="text-neutral-300">+ {data?.language ? getLanguageName(data.language) : "N/A"}+ </div></div>- <span className="text-neutral-100">OS:</span>- <div className="flex gap-1 text-neutral-300 items-center">- <OperatingSystem os={data?.operating_system || ""} />- {data?.operating_system}- {data?.operating_system_version && (- <span className="ml-1">- v{data?.operating_system_version}- </span>- )}- </div>- <span className="text-neutral-100">Screen Size:</span>- <div className="flex gap-1 text-neutral-300">- {data?.screen_width} x {data?.screen_height}+ <div className="grid grid-cols-[110px_1fr] gap-2">+ <span className=" text-neutral-100">Device Type:</span>+ <div className="text-neutral-300 flex gap-1 items-center">+ {data?.device_type === "Desktop" && (+ <Monitor className="w-4 h-4" />+ )}+ {data?.device_type === "Mobile" && (+ <Smartphone className="w-4 h-4" />+ )}+ {data?.device_type === "Tablet" && (+ <Tablet className="w-4 h-4" />+ )}+ {data?.device_type}+ </div>+ <span className=" text-neutral-100">Browser:</span>+ <div className="flex gap-1 text-neutral-300 items-center">+ <Browser browser={data?.browser || "Unknown"} />+ {data?.browser}+ {data?.browser_version && (+ <span className="ml-1">v{data?.browser_version}</span>+ )}+ </div>+ <span className="text-neutral-100">OS:</span>+ <div className="flex gap-1 text-neutral-300 items-center">+ <OperatingSystem os={data?.operating_system || ""} />+ {data?.operating_system}+ {data?.operating_system_version && (+ <span className="ml-1">+ v{data?.operating_system_version}+ </span>+ )}+ </div>+ <span className="text-neutral-100">Screen Size:</span>+ <div className="flex gap-1 text-neutral-300">+ {data?.screen_width} x {data?.screen_height}+ </div></div></div>- </div>+ )}</div><div className="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-6 gap-3 justify-between">- <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 flex-grow">- <div className="text-xs text-neutral-400 flex items-center gap-1">- <Clock className="w-4 h-4" />- Avg. Session Duration- </div>- <div className="font-semibold">- {data?.duration ? formatDuration(data.duration) : "N/A"}- </div>- </div>- <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow">- <div className="text-xs text-neutral-400 flex items-center gap-1">- <Files className="w-4 h-4" />- Sessions- </div>- <div className="font-semibold">{data?.sessions}</div>- </div>- <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow">- <div className="text-xs text-neutral-400 flex items-center gap-1">- <FileText className="w-4 h-4" />- Pageviews- </div>- <div className="font-semibold">{data?.pageviews}</div>- </div>- <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow">- <div className="text-xs text-neutral-400 flex items-center gap-1">- <MousePointerClick className="w-4 h-4" />- Events- </div>- <div className="font-semibold">{data?.events}</div>- </div>- <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow">- <div className="text-xs text-neutral-400 flex items-center gap-1">- <Calendar className="w-4 h-4" />- First Seen- </div>- <div className="font-semibold">- {DateTime.fromSQL(data?.first_seen ?? "", { zone: "utc" })- .toLocal()- .toLocaleString(DateTime.DATETIME_SHORT)}- </div>- </div>- <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow">- <div className="text-xs text-neutral-400 flex items-center gap-1">- <CalendarCheck className="w-4 h-4" />- Last Seen- </div>- <div className="font-semibold">- {DateTime.fromSQL(data?.last_seen ?? "", { zone: "utc" })- .toLocal()- .toLocaleString(DateTime.DATETIME_SHORT)}- </div>- </div>+ {isLoading ? (+ // Skeleton loading state+ <>+ {Array.from({ length: 6 }).map((_, index) => (+ <div+ key={index}+ className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 flex-grow"+ >+ <div className="text-xs text-neutral-400 flex items-center gap-1">+ <Skeleton className="w-4 h-4" />+ <Skeleton className="h-3 w-20" />+ </div>+ <Skeleton className="h-5 w-16" />+ </div>+ ))}+ </>+ ) : (+ // Actual data+ <>+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 flex-grow">+ <div className="text-xs text-neutral-400 flex items-center gap-1">+ <Clock className="w-4 h-4" />+ Avg. Session Duration+ </div>+ <div className="font-semibold">+ {data?.duration ? formatDuration(data.duration) : "N/A"}+ </div>+ </div>+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow">+ <div className="text-xs text-neutral-400 flex items-center gap-1">+ <Files className="w-4 h-4" />+ Sessions+ </div>+ <div className="font-semibold">{data?.sessions}</div>+ </div>+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow">+ <div className="text-xs text-neutral-400 flex items-center gap-1">+ <FileText className="w-4 h-4" />+ Pageviews+ </div>+ <div className="font-semibold">{data?.pageviews}</div>+ </div>+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow">+ <div className="text-xs text-neutral-400 flex items-center gap-1">+ <MousePointerClick className="w-4 h-4" />+ Events+ </div>+ <div className="font-semibold">{data?.events}</div>+ </div>+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow">+ <div className="text-xs text-neutral-400 flex items-center gap-1">+ <Calendar className="w-4 h-4" />+ First Seen+ </div>+ <div className="font-semibold">+ {DateTime.fromSQL(data?.first_seen ?? "", { zone: "utc" })+ .toLocal()+ .toLocaleString(DateTime.DATETIME_SHORT)}+ </div>+ </div>+ <div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 flex-grow">+ <div className="text-xs text-neutral-400 flex items-center gap-1">+ <CalendarCheck className="w-4 h-4" />+ Last Seen+ </div>+ <div className="font-semibold">+ {DateTime.fromSQL(data?.last_seen ?? "", { zone: "utc" })+ .toLocal()+ .toLocaleString(DateTime.DATETIME_SHORT)}+ </div>+ </div>+ </>+ )}</div></div><div className="bg-neutral-900 p-3 rounded-lg flex flex-col gap-1 border border-neutral-800 h-[150px]">