🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor Avatar component and update user display across sessions and user pages
Bill Yang277c7cdca498
diff --git a/client/src/app/[site]/globe/components/GlobeSessions.tsx b/client/src/app/[site]/globe/components/GlobeSessions.tsxindex 1b59f85f4..cf02a3917 100644--- a/client/src/app/[site]/globe/components/GlobeSessions.tsx+++ b/client/src/app/[site]/globe/components/GlobeSessions.tsx@@ -2,9 +2,9 @@ import { ArrowRight, ChevronDown, ChevronUp, ExternalLink } from "lucide-react";import { DateTime } from "luxon";import Link from "next/link";import { useMemo, useState } from "react";-import { animals, colors, uniqueNamesGenerator } from "unique-names-generator";import { useCurrentSite } from "../../../../api/admin/sites";import { GetSessionsResponse, useGetSessionsInfinite } from "../../../../api/analytics/userSessions";+import { Avatar, generateName } from "../../../../components/Avatar";import { Channel } from "../../../../components/Channel";import { EventIcon, PageviewIcon } from "../../../../components/EventIcons";import {@@ -68,25 +68,23 @@ function SessionCard({ session }: { session: GetSessionsResponse[number] }) {const duration = formatShortDuration(totalSeconds);const siteId = useCurrentSite();- const name = uniqueNamesGenerator({- dictionaries: [colors, animals],- separator: " ",- style: "capital",- seed: session.user_id,- });+ const name = generateName(session.user_id);return (<div className="rounded-lg bg-neutral-850 border border-neutral-800 overflow-hidden p-2 space-y-2"><div className="flex justify-between border-b border-neutral-700 pb-2">- <div className="text-sm text-neutral-100 flex items-center gap-2">- {name}{" "}- <Link href={`/${siteId.site?.id}/user/${session.user_id}`}>- <ExternalLink className="w-4 h-4 text-gray-400" />+ <div className="text-sm text-neutral-100 flex items-center gap-1.5">+ <Avatar id={session.user_id} size={16} />+ <Link+ href={`/${siteId.site?.siteId}/user/${session.user_id}`}+ className="text-xs text-neutral-200 max-w-32 truncate hover:underline"+ >+ {name}</Link></div><div className="flex space-x-2 items-center pr-2">- <div className="flex items-center gap-1.5 text-xs text-gray-300">- <span className="text-gray-400">+ <div className="flex items-center gap-1.5 text-xs text-neutral-300">+ <span className="text-neutral-400">{DateTime.fromSQL(session.session_start, {zone: "utc",})@@ -94,7 +92,7 @@ function SessionCard({ session }: { session: GetSessionsResponse[number] }) {.toLocal().toFormat(hour12 ? "MMM d, h:mm a" : "dd MMM, HH:mm")}</span>- <span className="text-gray-400">•</span>+ <span className="text-neutral-400">•</span><span className="hidden md:block">{duration}</span></div></div>@@ -115,7 +113,7 @@ function SessionCard({ session }: { session: GetSessionsResponse[number] }) {/><Tooltip><TooltipTrigger asChild>- <Badge className="flex items-center gap-1 bg-neutral-800 text-gray-300">+ <Badge className="flex items-center gap-1 bg-neutral-800 text-neutral-300"><PageviewIcon /><span>{formatter(session.pageviews)}</span></Badge>@@ -124,7 +122,7 @@ function SessionCard({ session }: { session: GetSessionsResponse[number] }) {</Tooltip><Tooltip><TooltipTrigger asChild>- <Badge className="flex items-center gap-1 bg-neutral-800 text-gray-300">+ <Badge className="flex items-center gap-1 bg-neutral-800 text-neutral-300"><EventIcon /><span>{formatter(session.events)}</span></Badge>@@ -136,7 +134,7 @@ function SessionCard({ session }: { session: GetSessionsResponse[number] }) {<div className="items-center flex-1 min-w-0 hidden md:flex"><Tooltip><TooltipTrigger asChild>- <span className="text-xs text-gray-400 truncate max-w-[200px] inline-block">+ <span className="text-xs text-neutral-400 truncate max-w-[200px] inline-block">{truncatePath(session.entry_page)}</span></TooltipTrigger>@@ -145,11 +143,11 @@ function SessionCard({ session }: { session: GetSessionsResponse[number] }) {</TooltipContent></Tooltip>- <ArrowRight className="mx-2 w-3 h-3 flex-shrink-0 text-gray-400" />+ <ArrowRight className="mx-2 w-3 h-3 flex-shrink-0 text-neutral-400" /><Tooltip><TooltipTrigger asChild>- <span className="text-xs text-gray-400 truncate max-w-[200px] inline-block">+ <span className="text-xs text-neutral-400 truncate max-w-[200px] inline-block">{truncatePath(session.exit_page)}</span></TooltipTrigger>diff --git a/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsx b/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsxindex a12d333c3..d3ce474ea 100644--- a/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsx+++ b/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsx@@ -257,7 +257,7 @@ export function ReplayBreadcrumbs() {<div className="flex flex-col gap-2"><div className="rounded-lg border border-neutral-800 bg-neutral-900 flex items-center justify-between gap-2 p-2 text-xs text-neutral-200"><div className="flex items-center gap-2">- <Avatar name={data.metadata.user_id} size={20} />+ <Avatar id={data.metadata.user_id} size={20} />{data.metadata.user_id.slice(0, 12)}</div><Link href={`/${siteId}/user/${data.metadata.user_id}`} className="flex items-center gap-2">diff --git a/client/src/app/[site]/user/[userId]/page.tsx b/client/src/app/[site]/user/[userId]/page.tsxindex 229a2bbe3..289f0035e 100644--- a/client/src/app/[site]/user/[userId]/page.tsx+++ b/client/src/app/[site]/user/[userId]/page.tsx@@ -17,7 +17,7 @@ import { DateTime } from "luxon";import { useParams, useRouter } from "next/navigation";import { useUserInfo } from "../../../../api/analytics/userInfo";import { useGetUserSessionCount } from "../../../../api/analytics/userSessions";-import { Avatar } from "../../../../components/Avatar";+import { Avatar, generateName } from "../../../../components/Avatar";import { Badge } from "../../../../components/ui/badge";import { Button } from "../../../../components/ui/button";import { Skeleton } from "../../../../components/ui/skeleton";@@ -49,21 +49,23 @@ export default function UserPage() {router.push(`/${site}/users`);};+ const name = generateName(userId as string);+return (<div className="p-2 md:p-4 max-w-[1300px] mx-auto space-y-3">- <Button onClick={handleBackClick} className="w-full sm:w-max">+ <MobileSidebar />+ <Button onClick={handleBackClick} className="w-max" variant="ghost"><ArrowLeft className="h-4 w-4" />Back to Users</Button><div className="mb-4">- <h1 className="mb-4 flex items-center gap-2 justify-between">- <div className="text-2xl font-bold flex items-center gap-2">+ <h1 className="mb-4 flex items-center justify-between">+ <div className="flex items-center gap-4">+ <Avatar size={48} id={userId as string} /><div>- <MobileSidebar />+ <div className="text-lg font-bold">{name}</div>+ <span className="text-neutral-300 text-sm">ID: {userId}</span></div>-- <Avatar size={40} name={userId as string} />- {userId?.slice(0, 12)}</div>{data?.ip && (<Badge variant="outline" className="flex gap-1 text-neutral-300">diff --git a/client/src/app/[site]/users/page.tsx b/client/src/app/[site]/users/page.tsxindex 0dae062fa..262eddddf 100644--- a/client/src/app/[site]/users/page.tsx+++ b/client/src/app/[site]/users/page.tsx@@ -15,9 +15,11 @@ import Link from "next/link";import { useParams } from "next/navigation";import { useState } from "react";import { useGetUsers, UsersResponse } from "../../../api/analytics/users";-import { Button } from "../../../components/ui/button";+import { Avatar, generateName } from "../../../components/Avatar";+import { DisabledOverlay } from "../../../components/DisabledOverlay";import { Pagination } from "../../../components/pagination";-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../../../components/ui/tooltip";+import { Button } from "../../../components/ui/button";+import { Tooltip, TooltipContent, TooltipTrigger } from "../../../components/ui/tooltip";import { useSetPageTitle } from "../../../hooks/useSetPageTitle";import { USER_PAGE_FILTERS } from "../../../lib/store";import { getCountryName } from "../../../lib/utils";@@ -25,8 +27,6 @@ import { Browser } from "../components/shared/icons/Browser";import { CountryFlag } from "../components/shared/icons/CountryFlag";import { OperatingSystem } from "../components/shared/icons/OperatingSystem";import { SubHeader } from "../components/SubHeader/SubHeader";-import { DisabledOverlay } from "../../../components/DisabledOverlay";-import { Avatar } from "../../../components/Avatar";// Set up column helperconst columnHelper = createColumnHelper<UsersResponse>();@@ -97,13 +97,11 @@ export default function UsersPage() {// Define table columns with consistent Title Case capitalizationconst columns = [columnHelper.accessor("user_id", {- header: "User ID",+ header: "User",cell: info => (- <Link href={`/${site}/user/${info.getValue()}`}>- <div className=" truncate flex items-center gap-2 text-neutral-250 hover:text-neutral-100 hover:underline">- <Avatar size={20} name={info.getValue() as string} />- {info.getValue().slice(0, 12)}- </div>+ <Link href={`/${site}/user/${info.getValue()}`} className="flex items-center gap-2 hover:underline">+ <Avatar size={20} id={info.getValue() as string} />+ <span className="max-w-24 truncate">{generateName(info.getValue())}</span></Link>),}),diff --git a/client/src/components/Avatar.tsx b/client/src/components/Avatar.tsxindex bd43b5b64..4e7434167 100644--- a/client/src/components/Avatar.tsx+++ b/client/src/components/Avatar.tsx@@ -1,12 +1,23 @@import BoringAvatar from "boring-avatars";+import { animals, colors, uniqueNamesGenerator } from "unique-names-generator";-export function Avatar({ name, size = 20 }: { name: string; size?: number }) {+export function Avatar({ id, size = 20 }: { id: string; size?: number }) {return (<BoringAvatarsize={size}- name={name}- variant="marble"+ name={id}+ variant="beam"colors={["#92A1C6", "#146A7C", "#F0AB3D", "#C271B4", "#C20D90"]}/>);}++export function generateName(id: string) {+ const name = uniqueNamesGenerator({+ dictionaries: [colors, animals],+ separator: " ",+ style: "capital",+ seed: id,+ });+ return name;+}diff --git a/client/src/components/Sessions/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsxindex 36b80814e..c5118d5e5 100644--- a/client/src/components/Sessions/SessionCard.tsx+++ b/client/src/components/Sessions/SessionCard.tsx@@ -6,7 +6,7 @@ import { memo, useState } from "react";import { GetSessionsResponse } from "../../api/analytics/userSessions";import { formatDuration, hour12, userLocale } from "../../lib/dateTimeUtils";import { cn, formatter } from "../../lib/utils";-import { Avatar } from "../Avatar";+import { Avatar, generateName } from "../Avatar";import { Channel } from "../Channel";import { EventIcon, PageviewIcon } from "../EventIcons";import {@@ -50,17 +50,19 @@ export function SessionCard({ session, onClick, userId }: SessionCardProps) {}};+ const name = generateName(session.user_id);+return (<div className="mb-3 rounded-lg bg-neutral-900 border border-neutral-800 overflow-hidden"><div className="p-3 cursor-pointer" onClick={handleCardClick}><div className="flex items-center gap-2"><div className="hidden md:flex items-center gap-2">- {/* <span className="text-xs font-mono text-gray-400">{session.user_id.slice(0, 12)}</span> */}- <Avatar size={24} name={session.user_id.slice(0, 12)} />+ <Avatar size={24} id={session.user_id} />+ <span className="text-xs text-neutral-200 w-24 truncate">{name}</span></div>{/* Icons section */}- <div className="flex space-x-2 items-center md:ml-3">+ <div className="flex space-x-2 items-center">{session.country && (<CountryFlagTooltipIcon country={session.country} city={session.city} region={session.region} />)}diff --git a/client/src/components/Sessions/SessionDetails.tsx b/client/src/components/Sessions/SessionDetails.tsxindex dbaefa2d9..65e620dcd 100644--- a/client/src/components/Sessions/SessionDetails.tsx+++ b/client/src/components/Sessions/SessionDetails.tsx@@ -399,8 +399,8 @@ export function SessionDetails({ session, userId }: SessionDetailsProps) {<div className="space-y-3">{sessionDetails?.user_id && (<div className="flex items-center gap-2">- <div className="h-7 w-7 bg-neutral-800 rounded-full flex items-center justify-center flex-shrink-0">- <Avatar size={24} name={sessionDetails.user_id} />+ <div className="h-10 w-10 bg-neutral-800 rounded-full flex items-center justify-center flex-shrink-0">+ <Avatar size={40} id={sessionDetails.user_id} /></div><div><div className="text-sm text-neutral-400 flex items-center">