🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Add @nivo/calendar dependency and implement user session count feature
Bill Yang702efe807081
diff --git a/client/package-lock.json b/client/package-lock.jsonindex 80523735d..56e703f04 100644--- a/client/package-lock.json+++ b/client/package-lock.json@@ -10,6 +10,7 @@"dependencies": {"@better-auth/stripe": "^1.2.3","@nivo/bar": "^0.88.0",+ "@nivo/calendar": "^0.88.0","@nivo/core": "^0.88.0","@nivo/line": "^0.88.0","@number-flow/react": "^0.5.8",@@ -1787,6 +1788,31 @@"react": ">= 16.14.0 < 19.0.0"}},+ "node_modules/@nivo/calendar": {+ "version": "0.88.0",+ "resolved": "https://registry.npmjs.org/@nivo/calendar/-/calendar-0.88.0.tgz",+ "integrity": "sha512-sTpoaN5bNRwywRIVKAv7oo+/ZZjX0cjBcpbyFQZqXnEmFX8tEO55Rn/469zWDG776Gk7wHcuwmQfEIqwWM9PfQ==",+ "dependencies": {+ "@nivo/core": "0.88.0",+ "@nivo/legends": "0.88.0",+ "@nivo/tooltip": "0.88.0",+ "@types/d3-scale": "^4.0.8",+ "@types/d3-time": "^1.0.10",+ "@types/d3-time-format": "^3.0.0",+ "d3-scale": "^4.0.2",+ "d3-time": "^1.0.10",+ "d3-time-format": "^3.0.0",+ "lodash": "^4.17.21"+ },+ "peerDependencies": {+ "react": ">= 16.14.0 < 19.0.0"+ }+ },+ "node_modules/@nivo/calendar/node_modules/@types/d3-time-format": {+ "version": "3.0.4",+ "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-3.0.4.tgz",+ "integrity": "sha512-or9DiDnYI1h38J9hxKEsw513+KVuFbEVhl7qdxcaudoiqWWepapUen+2vAriFGexr6W5+P4l9+HJrB39GG+oRg=="+ },"node_modules/@nivo/colors": {"version": "0.88.0","resolved": "https://registry.npmjs.org/@nivo/colors/-/colors-0.88.0.tgz",diff --git a/client/package.json b/client/package.jsonindex c9342a712..5c58d836a 100644--- a/client/package.json+++ b/client/package.json@@ -11,6 +11,7 @@"dependencies": {"@better-auth/stripe": "^1.2.3","@nivo/bar": "^0.88.0",+ "@nivo/calendar": "^0.88.0","@nivo/core": "^0.88.0","@nivo/line": "^0.88.0","@number-flow/react": "^0.5.8",diff --git a/client/src/api/analytics/userSessions.ts b/client/src/api/analytics/userSessions.tsindex 8ec616ebc..c29560b6a 100644--- a/client/src/api/analytics/userSessions.ts+++ b/client/src/api/analytics/userSessions.ts@@ -189,3 +189,27 @@ export function useGetSessionDetailsInfinite(sessionId: string | null) {staleTime: Infinity,});}++export interface UserSessionCountResponse {+ date: string;+ sessions: number;+}++export function useGetUserSessionCount(userId: string) {+ const { time, site } = useStore();+ const { startDate, endDate } = getStartAndEndDate(time);++ return useQuery<APIResponse<UserSessionCountResponse[]>>({+ queryKey: ["user-session-count", userId, time, site],+ queryFn: () => {+ const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;+ return authedFetch(`${BACKEND_URL}/user/session-count/${site}`, {+ userId,+ startDate,+ endDate,+ timezone,+ }).then((res) => res.json());+ },+ staleTime: Infinity,+ });+}diff --git a/client/src/app/[site]/user/[userId]/components/Calendar.tsx b/client/src/app/[site]/user/[userId]/components/Calendar.tsxnew file mode 100644index 000000000..69f795293--- /dev/null+++ b/client/src/app/[site]/user/[userId]/components/Calendar.tsx@@ -0,0 +1,61 @@+import { DateTime } from "luxon";+import { Calendar, ResponsiveCalendar } from "@nivo/calendar";+import _ from "lodash";+import { nivoTheme } from "../../../../../lib/nivo";+import { UserSessionCountResponse } from "../../../../../api/analytics/userSessions";++export const VisitCalendar = ({+ sessionCount,+}: {+ sessionCount: UserSessionCountResponse[];+}) => {+ const data = sessionCount+ .map((e) => ({+ value: e.sessions,+ day: DateTime.fromSQL(e.date ?? 0)+ .toLocal()+ .toFormat("y-LL-dd"),+ }))+ .reverse();++ const maxValue = _.get(+ _.sortBy(data, "value")[Math.floor(data.length * 0.95)],+ "value"+ );++ if (data.length === 0) {+ return null;+ }++ const numYears =+ DateTime.fromISO(data[0].day ?? "").year -+ DateTime.fromISO(data.at(-1)?.day ?? "").year ++ 1;++ return (+ <ResponsiveCalendar+ data={data}+ theme={nivoTheme}+ from={data.at(-1)?.day ?? ""}+ to={data[0]?.day}+ emptyColor={"hsl(var(--neutral-750))"}+ colors={["#10452A", "#006D32", "#3E9058", "#3CD456"]}+ margin={{ top: 20, right: 0, bottom: 1, left: 20 }}+ monthBorderColor="rgba(0, 0, 0, 0)"+ daySpacing={3}+ dayBorderColor="rgba(0, 0, 0, 0)"+ maxValue={maxValue}+ tooltip={({ value, day }) => {+ return (+ <div className="bg-neutral-900 p-2 rounded-md border border-neutral-800 text-sm">+ {value}{" "}+ <span className="text-neutral-300">+ battle{Number(value) > 1 && "s"} on+ </span>{" "}+ {day}+ </div>+ );+ }}+ />+ );+};diff --git a/client/src/app/[site]/user/[userId]/page.tsx b/client/src/app/[site]/user/[userId]/page.tsxindex 40ccc550b..74c148b1b 100644--- a/client/src/app/[site]/user/[userId]/page.tsx+++ b/client/src/app/[site]/user/[userId]/page.tsx@@ -23,18 +23,27 @@ import { formatDuration, getCountryName } from "../../../../lib/utils";import { Browser } from "../../components/shared/icons/Browser";import { CountryFlag } from "../../components/shared/icons/CountryFlag";import { OperatingSystem } from "../../components/shared/icons/OperatingSystem";+import { MobileSidebar } from "../../../../components/MobileSidebar";+import { VisitCalendar } from "./components/Calendar";+import { useGetUserSessionCount } from "../../../../api/analytics/userSessions";export default function UserPage() {const { userId } = useParams();const { site } = useParams();const { data } = useUserInfo(Number(site), userId as string);++ const { data: sessionCount } = useGetUserSessionCount(userId as string);+const { getRegionName } = useGetRegionName();return (<div className="p-2 md:p-4 max-w-[1300px] mx-auto space-y-3"><div className="mb-4"><h1 className="text-2xl font-bold mb-4 flex items-center gap-2">+ <div>+ <MobileSidebar />+ </div><Avatarsize={40}name={userId as string}@@ -158,6 +167,9 @@ export default function UserPage() {</div></div></div>+ <div className="bg-neutral-850 p-3 rounded-lg flex flex-col gap-1 border border-neutral-750 h-[150px]">+ <VisitCalendar sessionCount={sessionCount?.data ?? []} />+ </div><h2 className="text-lg font-bold mb-4">Sessions</h2><SessionsList userId={userId as string} />diff --git a/client/src/components/Sessions/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsxindex 58ee75477..b9b960018 100644--- a/client/src/components/Sessions/SessionCard.tsx+++ b/client/src/components/Sessions/SessionCard.tsx@@ -192,9 +192,11 @@ export function SessionCard({ session, onClick, userId }: SessionCardProps) {<div className="flex items-center gap-4 text-xs text-gray-300"><span className="text-gray-400">- {DateTime.fromSQL(session.session_start).toFormat(- "MMM d, h:mm a"- )}+ {DateTime.fromSQL(session.session_start, {+ zone: "utc",+ })+ .toLocal()+ .toFormat("MMM d, h:mm a")}</span><span className="hidden md:block">{durationFormatted}</span></div>diff --git a/server/src/api/analytics/getUserSessionCount.ts b/server/src/api/analytics/getUserSessionCount.tsnew file mode 100644index 000000000..f24a8495c--- /dev/null+++ b/server/src/api/analytics/getUserSessionCount.ts@@ -0,0 +1,81 @@+import { FastifyReply, FastifyRequest } from "fastify";+import clickhouse from "../../db/clickhouse/clickhouse.js";+import { getTimeStatement, processResults } from "./utils.js";+import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";++export interface GetUserSessionCountRequest {+ Params: {+ site: string;+ };+ Querystring: {+ userId?: string;+ startDate?: string;+ endDate?: string;+ timezone?: string;+ };+}++export type GetUserSessionCountResponse = {+ date: string;+ sessions: number;+}[];++export async function getUserSessionCount(+ req: FastifyRequest<GetUserSessionCountRequest>,+ res: FastifyReply+) {+ const { site } = req.params;+ const { userId, startDate, endDate, timezone } = req.query;++ const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);+ if (!userHasAccessToSite) {+ return res.status(403).send({ error: "Forbidden" });+ }++ if (!userId) {+ return res.status(400).send({ error: "userId is required" });+ }++ // Generate time statement+ const timeStatement = getTimeStatement({+ date: {+ startDate: startDate || "",+ endDate: endDate || "",+ timezone: timezone || "UTC",+ table: "sessions",+ },+ });++ const query = `+ SELECT+ toDate(session_start, '${timezone || "UTC"}') as date,+ count() as sessions+ FROM sessions+ WHERE+ site_id = ${site}+ AND user_id = '${userId}'+ ${timeStatement}+ GROUP BY date+ ORDER BY date ASC+ `;++ try {+ const result = await clickhouse.query({+ query,+ format: "JSONEachRow",+ });++ const data = await processResults<GetUserSessionCountResponse[number]>(+ result+ );++ return res.send({+ data,+ });+ } catch (error) {+ console.error("Error fetching user session count:", error);+ return res+ .status(500)+ .send({ error: "Failed to fetch user session count" });+ }+}diff --git a/server/src/index.ts b/server/src/index.tsindex 3d41552e8..bc42e5d00 100644--- a/server/src/index.ts+++ b/server/src/index.ts@@ -44,6 +44,7 @@ import { trackEvent } from "./tracker/trackEvent.js";import { extractSiteId, isSitePublic } from "./utils.js";import { publicSites } from "./lib/publicSites.js";import { getSiteIsPublic } from "./api/sites/getSiteIsPublic.js";+import { getUserSessionCount } from "./api/analytics/getUserSessionCount.js";const __filename = fileURLToPath(import.meta.url);const __dirname = dirname(__filename);@@ -117,6 +118,7 @@ const ANALYTICS_ROUTES = ["/recent-events/","/users/","/user/info/",+ "/user/session-count/","/live-session-locations/","/funnels/","/funnel/",@@ -180,6 +182,7 @@ server.get("/sessions/:site", getSessions);server.get("/session/:sessionId/:site", getSession);server.get("/users/:site", getUsers);server.get("/user/:userId/sessions/:site", getUserSessions);+server.get("/user/session-count/:site", getUserSessionCount);server.get("/user/info/:userId/:site", getUserInfo);server.get("/live-session-locations/:site", getLiveSessionLocations);server.get("/funnels/:site", getFunnels);