🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Update user analytics and UI components
Bill Yang6f2731139dcb
diff --git a/client/src/api/analytics/users.ts b/client/src/api/analytics/users.tsindex 0a3e885e8..92f6ce9a3 100644--- a/client/src/api/analytics/users.ts+++ b/client/src/api/analytics/users.ts@@ -63,7 +63,11 @@ export function useGetUsers(options: GetUsersOptions) {sortOrder,}).then((res) => res.json());},- staleTime: Infinity,- refetchOnWindowFocus: false,+ // Use default staleTime (0) for real-time data+ staleTime: 0,+ // Enable refetching when the window regains focus+ refetchOnWindowFocus: true,+ // Add a background refetch interval (every 30 seconds)+ refetchInterval: 30000,});}diff --git a/client/src/app/[site]/users/page.tsx b/client/src/app/[site]/users/page.tsxindex ce9051113..41d97f120 100644--- a/client/src/app/[site]/users/page.tsx+++ b/client/src/app/[site]/users/page.tsx@@ -14,6 +14,8 @@ import {} from "@tanstack/react-table";import { DateTime } from "luxon";import {+ ArrowDown,+ ArrowUp,ArrowUpDown,ChevronLeft,ChevronRight,@@ -28,10 +30,40 @@ import { Browser } from "../components/shared/icons/Browser";import { OperatingSystem } from "../components/shared/icons/OperatingSystem";import { getCountryName } from "../../../lib/utils";import { Smartphone, Tablet, Monitor } from "lucide-react";+import {+ Tooltip,+ TooltipContent,+ TooltipProvider,+ TooltipTrigger,+} from "../../../components/ui/tooltip";// Set up column helperconst columnHelper = createColumnHelper<UsersResponse>();+// Create a reusable sort header component+const SortHeader = ({ column, children }: any) => {+ const isSorted = column.getIsSorted();++ return (+ <Button+ variant="ghost"+ onClick={() => column.toggleSorting(isSorted === "asc")}+ className="p-0 hover:bg-transparent"+ >+ {children}+ {isSorted ? (+ isSorted === "asc" ? (+ <ArrowUp className="ml-2 h-4 w-4" />+ ) : (+ <ArrowDown className="ml-2 h-4 w-4" />+ )+ ) : (+ <ArrowUpDown className="ml-2 h-4 w-4" />+ )}+ </Button>+ );+};+export default function UsersPage() {const router = useRouter();const { site } = useParams();@@ -39,7 +71,7 @@ export default function UsersPage() {// State for server-side operationsconst [pagination, setPagination] = useState({pageIndex: 0,- pageSize: 20,+ pageSize: 50,});const [sorting, setSorting] = useState<SortingState>([{ id: "last_seen", desc: true },@@ -60,7 +92,19 @@ export default function UsersPage() {sortOrder,});- // Define table columns+ // Format relative time with special handling for times less than 1 minute+ const formatRelativeTime = (dateStr: string) => {+ const date = DateTime.fromSQL(dateStr, { zone: "utc" }).toLocal();+ const diff = Math.abs(date.diffNow(["minutes"]).minutes);++ if (diff < 1) {+ return "<1 min ago";+ }++ return date.toRelative();+ };++ // Define table columns with consistent Title Case capitalizationconst columns = [columnHelper.accessor("user_id", {header: "User ID",@@ -73,7 +117,7 @@ export default function UsersPage() {columnHelper.accessor("country", {header: "Country",cell: (info) => (- <div className="flex items-center gap-1">+ <div className="flex items-center gap-1 whitespace-nowrap"><CountryFlag country={info.getValue() || ""} />{info.getValue() ? getCountryName(info.getValue()) : "Unknown"}</div>@@ -82,27 +126,27 @@ export default function UsersPage() {columnHelper.accessor("browser", {header: "Browser",cell: (info) => (- <div className="flex items-center gap-1">+ <div className="flex items-center gap-1 whitespace-nowrap"><Browser browser={info.getValue() || "Unknown"} />{info.getValue() || "Unknown"}</div>),}),columnHelper.accessor("operating_system", {- header: "OS",+ header: "Operating System",cell: (info) => (- <div className="flex items-center gap-1">+ <div className="flex items-center gap-1 whitespace-nowrap"><OperatingSystem os={info.getValue() || ""} />{info.getValue() || "Unknown"}</div>),}),columnHelper.accessor("device_type", {- header: "Device",+ header: "Device Type",cell: (info) => {const deviceType = info.getValue();return (- <div className="flex items-center gap-1">+ <div className="flex items-center gap-1 whitespace-nowrap">{deviceType === "Desktop" && <Monitor className="w-4 h-4" />}{deviceType === "Mobile" && <Smartphone className="w-4 h-4" />}{deviceType === "Tablet" && <Tablet className="w-4 h-4" />}@@ -112,58 +156,84 @@ export default function UsersPage() {},}),columnHelper.accessor("pageviews", {- header: "Pageviews",- cell: (info) => info.getValue().toLocaleString(),+ header: ({ column }) => (+ <SortHeader column={column}>Pageviews</SortHeader>+ ),+ cell: (info) => (+ <div className="whitespace-nowrap">+ {info.getValue().toLocaleString()}+ </div>+ ),}),columnHelper.accessor("events", {- header: "Events",- cell: (info) => info.getValue().toLocaleString(),+ header: ({ column }) => <SortHeader column={column}>Events</SortHeader>,+ cell: (info) => (+ <div className="whitespace-nowrap">+ {info.getValue().toLocaleString()}+ </div>+ ),}),columnHelper.accessor("sessions", {- header: "Sessions",- cell: (info) => info.getValue().toLocaleString(),+ header: ({ column }) => <SortHeader column={column}>Sessions</SortHeader>,+ cell: (info) => (+ <div className="whitespace-nowrap">+ {info.getValue().toLocaleString()}+ </div>+ ),}),columnHelper.accessor("last_seen", {header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Last Seen- <ArrowUpDown className="ml-2 h-4 w-4" />- </Button>- ),- cell: (info) => (- <div>- {DateTime.fromSQL(info.getValue(), {- zone: "utc",- })- .toLocal()- .toLocaleString(DateTime.DATETIME_SHORT)}- </div>+ <SortHeader column={column}>Last Seen</SortHeader>),+ cell: (info) => {+ const date = DateTime.fromSQL(info.getValue(), {+ zone: "utc",+ }).toLocal();+ const formattedDate = date.toLocaleString(DateTime.DATETIME_SHORT);+ const relativeTime = formatRelativeTime(info.getValue());++ return (+ <div className="whitespace-nowrap">+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <span>{relativeTime}</span>+ </TooltipTrigger>+ <TooltipContent>+ <p>{formattedDate}</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ </div>+ );+ },}),columnHelper.accessor("first_seen", {header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- First Seen- <ArrowUpDown className="ml-2 h-4 w-4" />- </Button>- ),- cell: (info) => (- <div>- {DateTime.fromSQL(info.getValue(), {- zone: "utc",- })- .toLocal()- .toLocaleString(DateTime.DATETIME_SHORT)}- </div>+ <SortHeader column={column}>First Seen</SortHeader>),+ cell: (info) => {+ const date = DateTime.fromSQL(info.getValue(), {+ zone: "utc",+ }).toLocal();+ const formattedDate = date.toLocaleString(DateTime.DATETIME_SHORT);+ const relativeTime = formatRelativeTime(info.getValue());++ return (+ <div className="whitespace-nowrap">+ <TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <span>{relativeTime}</span>+ </TooltipTrigger>+ <TooltipContent>+ <p>{formattedDate}</p>+ </TooltipContent>+ </Tooltip>+ </TooltipProvider>+ </div>+ );+ },}),];@@ -185,12 +255,9 @@ export default function UsersPage() {getPaginationRowModel: getPaginationRowModel(),manualPagination: true,manualSorting: true,+ sortDescFirst: true,});- const handleRowClick = (userId: string) => {- router.push(`/${site}/user/${userId}`);- };-if (isError) {return (<div className="p-8 text-center text-red-500">@@ -208,17 +275,20 @@ export default function UsersPage() {</h1></div>- <div className="rounded-md border border-neutral-700 bg-neutral-850">+ <div className="rounded-md border border-neutral-800 bg-neutral-900"><div className="relative overflow-x-auto"><table className="w-full text-sm text-left">- <thead className="bg-neutral-900 text-neutral-400 text-xs uppercase">+ <thead className="bg-neutral-850 text-neutral-400 ">{table.getHeaderGroups().map((headerGroup) => (<tr key={headerGroup.id}>{headerGroup.headers.map((header) => (<thkey={header.id}scope="col"- className="px-4 py-3 font-medium"+ className="px-4 py-1 font-medium whitespace-nowrap"+ style={{+ minWidth: header.id === "user_id" ? "100px" : "auto",+ }}>{header.isPlaceholder? null@@ -233,7 +303,7 @@ export default function UsersPage() {</thead><tbody>{isLoading ? (- Array.from({ length: 10 }).map((_, index) => (+ Array.from({ length: 15 }).map((_, index) => (<trkey={index}className="border-b border-neutral-800 animate-pulse"diff --git a/client/src/app/globals.css b/client/src/app/globals.cssindex 0158a3702..ab1e92cba 100644--- a/client/src/app/globals.css+++ b/client/src/app/globals.css@@ -97,10 +97,10 @@ body {--neutral-700: 0 0% 30%;--neutral-750: 0 0% 25%;--neutral-800: 0 0% 20%;- --neutral-850: 0 0% 15%;- --neutral-900: 0 0% 9%;- --neutral-950: 0 0% 5%;- --neutral-1000: 0 0% 0%;+ --neutral-850: 0 0% 16%;+ --neutral-900: 0 0% 12%;+ --neutral-950: 0 0% 8%;+ --neutral-1000: 0 0% 5%;/* Stone */--stone-50: 60 9.1% 97.8%;@@ -339,7 +339,7 @@ body {}.dark {- --background: 0 0% 7%;+ --background: 0 0% 9%;--foreground: 0 0% 98%;--popover: 240 10% 3.9%;