🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance Realtime components with dynamic time selection and improved visualizations
Bill Yangdbe9b4d8f08e
diff --git a/client/src/api/analytics/useGetLiveSessionLocations.ts b/client/src/api/analytics/useGetLiveSessionLocations.tsindex d82e6918a..2b2a545ac 100644--- a/client/src/api/analytics/useGetLiveSessionLocations.ts+++ b/client/src/api/analytics/useGetLiveSessionLocations.ts@@ -13,7 +13,7 @@ export type LiveSessionLocation = {export function useGetLiveSessionLocations(minutes = 5) {const { site } = useStore();return useQuery<LiveSessionLocation[]>({- queryKey: ["live-session-locations", site],+ queryKey: ["live-session-locations", site, minutes],queryFn: () =>authedFetch(`${BACKEND_URL}/live-session-locations/${site}?time=${minutes}`diff --git a/client/src/app/[site]/components/Sidebar/Sidebar.tsx b/client/src/app/[site]/components/Sidebar/Sidebar.tsxindex 9c7ad0c02..264682aca 100644--- a/client/src/app/[site]/components/Sidebar/Sidebar.tsx+++ b/client/src/app/[site]/components/Sidebar/Sidebar.tsx@@ -2,6 +2,7 @@import { Funnel } from "@phosphor-icons/react/dist/ssr";import {ChartBarDecreasing,+ Globe,LayoutDashboard,LayoutGrid,Radio,@@ -66,7 +67,7 @@ export function Sidebar() {label="Realtime"active={isActiveTab("realtime")}href={getTabPath("realtime")}- icon={<Radio className="w-4 h-4" />}+ icon={<Globe className="w-4 h-4" />}/><SidebarLinklabel="Retention"diff --git a/client/src/app/[site]/realtime/RealtimeChart/RealtimeChart.tsx b/client/src/app/[site]/realtime/RealtimeChart/RealtimeChart.tsxindex 4a11ed29a..ebefd4580 100644--- a/client/src/app/[site]/realtime/RealtimeChart/RealtimeChart.tsx+++ b/client/src/app/[site]/realtime/RealtimeChart/RealtimeChart.tsx@@ -1,16 +1,10 @@+import { ResponsiveBar } from "@nivo/bar";+import { DateTime } from "luxon";import { useMemo } from "react";import { useGetOverviewBucketedPastMinutes } from "../../../../api/analytics/useGetOverviewBucketed";+import { nivoTheme } from "../../../../lib/nivo";import { useStore } from "../../../../lib/store";-import { DateTime } from "luxon";-import { ResponsiveBar } from "@nivo/bar";import { formatter } from "../../../../lib/utils";-import { nivoTheme } from "../../../../lib/nivo";-import {- Card,- CardContent,- CardTitle,- CardHeader,-} from "../../../../components/ui/card";export function RealtimeChart() {const { site } = useStore();@@ -55,88 +49,79 @@ export function RealtimeChart() {}return (- <Card>- <CardHeader>- <CardTitle>Realtime - Last 30 minutes</CardTitle>- </CardHeader>- <CardContent>- <div style={{ height: 300 }}>- <ResponsiveBar- data={chartData}- keys={["users"]}- indexBy="time"- margin={{ top: 20, right: 0, bottom: 30, left: 35 }}- padding={0.3}- valueScale={{ type: "linear" }}- indexScale={{ type: "band", round: true }}- // colors={["hsla(210, 40%, 50%, 0.7)"]}- colors={["hsl(var(--accent-500))"]}- theme={nivoTheme}- axisTop={null}- axisRight={null}- axisBottom={{- tickSize: 5,- tickPadding: 5,- legend: "",- legendPosition: "middle",- legendOffset: 32,- format: (value: string) => {- const dt = DateTime.fromFormat(value, "yyyy-MM-dd HH:mm:ss", {- zone: "utc",- }).toLocal();- return dt.isValid ? dt.toFormat("h:mm") : "";- },- }}- axisLeft={{- tickSize: 5,- tickPadding: 5,- tickRotation: 0,- legend: "",- legendPosition: "middle",- legendOffset: -30,- format: formatter,- tickValues: 3,- }}- enableLabel={false}- enableGridX={false}- enableGridY={true}- tooltip={({- id,- value,- data,- }: {- id: string | number;- value: number;- data: { time: string; users: number };- }) => {- const currentTime = DateTime.fromFormat(- data.time,- "yyyy-MM-dd HH:mm:ss",- { zone: "utc" }- ).toLocal();- const currentY = Number(value);+ <div style={{ height: 300 }}>+ <ResponsiveBar+ data={chartData}+ keys={["users"]}+ indexBy="time"+ margin={{ top: 20, right: 0, bottom: 30, left: 35 }}+ padding={0.3}+ valueScale={{ type: "linear" }}+ indexScale={{ type: "band", round: true }}+ // colors={["hsla(210, 40%, 50%, 0.7)"]}+ colors={["hsl(var(--accent-500))"]}+ theme={nivoTheme}+ axisTop={null}+ axisRight={null}+ axisBottom={{+ tickSize: 5,+ tickPadding: 5,+ legend: "",+ legendPosition: "middle",+ legendOffset: 32,+ format: (value: string) => {+ const dt = DateTime.fromFormat(value, "yyyy-MM-dd HH:mm:ss", {+ zone: "utc",+ }).toLocal();+ return dt.isValid ? dt.toFormat("h:mm") : "";+ },+ }}+ axisLeft={{+ tickSize: 5,+ tickPadding: 5,+ tickRotation: 0,+ legend: "",+ legendPosition: "middle",+ legendOffset: -30,+ format: formatter,+ tickValues: 3,+ }}+ enableLabel={false}+ enableGridX={false}+ enableGridY={true}+ tooltip={({+ id,+ value,+ data,+ }: {+ id: string | number;+ value: number;+ data: { time: string; users: number };+ }) => {+ const currentTime = DateTime.fromFormat(+ data.time,+ "yyyy-MM-dd HH:mm:ss",+ { zone: "utc" }+ ).toLocal();+ const currentY = Number(value);- return (- <div className="bg-neutral-950 p-2 rounded-md text-xs">- <div className="font-semibold mb-1">- {currentTime.isValid- ? currentTime.toFormat("HH:mm")- : "Invalid Time"}- </div>- <div className="flex justify-between items-center">- <span className="font-medium">- {currentY.toLocaleString()}- </span>- <span className="text-muted-foreground ml-1">{id}</span>- </div>- </div>- );- }}- animate={true}- motionConfig="gentle"- />- </div>- </CardContent>- </Card>+ return (+ <div className="bg-neutral-950 p-2 rounded-md text-xs">+ <div className="font-semibold mb-1">+ {currentTime.isValid+ ? currentTime.toFormat("HH:mm")+ : "Invalid Time"}+ </div>+ <div className="flex justify-between items-center">+ <span className="font-medium">{currentY.toLocaleString()}</span>+ <span className="text-muted-foreground ml-1">{id}</span>+ </div>+ </div>+ );+ }}+ animate={true}+ motionConfig="gentle"+ />+ </div>);}diff --git a/client/src/app/[site]/realtime/RealtimeGlobe/RealtimeGlobe.tsx b/client/src/app/[site]/realtime/RealtimeGlobe/RealtimeGlobe.tsxindex a5015eb99..ea9c947a4 100644--- a/client/src/app/[site]/realtime/RealtimeGlobe/RealtimeGlobe.tsx+++ b/client/src/app/[site]/realtime/RealtimeGlobe/RealtimeGlobe.tsx@@ -1,27 +1,31 @@"use client";-import { memo, useEffect, useMemo, useRef, useState } from "react";+import { useQuery } from "@tanstack/react-query";+import { useWindowSize } from "@uidotdev/usehooks";+import { scaleSequentialSqrt } from "d3-scale";+import { interpolateYlOrRd } from "d3-scale-chromatic";+import { memoize } from "lodash";+import { useEffect, useMemo, useRef } from "react";import Globe from "react-globe.gl";import { MeshPhongMaterial } from "three";import { useGetLiveSessionLocations } from "../../../../api/analytics/useGetLiveSessionLocations";-import { useQuery } from "@tanstack/react-query";-import { scaleSequentialSqrt } from "d3-scale";-import {- interpolateYlOrRd,- interpolatePuBu,- interpolateOranges,-} from "d3-scale-chromatic";-import { useWindowSize } from "@uidotdev/usehooks";+import { useAtom } from "jotai";+import { minutesAtom } from "../realtimeStore";-export const World = memo(({ width }: { width: number }) => {- const globeEl = useRef<any>(null);+const randomShader = memoize((e: string) => {+ return `rgba(100, 100, 100, ${Math.random() / 2 + 0.5})`;+});+export const World = ({ width }: { width: number }) => {+ const globeEl = useRef<any>(null);const size = useWindowSize();+ const [minutes] = useAtom(minutesAtom);+const {data: liveSessionLocations,isLoading: isLiveSessionLocationsLoading,- } = useGetLiveSessionLocations(60);+ } = useGetLiveSessionLocations(Number(minutes));const { data: countries = { features: [] } } = useQuery({queryKey: ["countries"],@@ -31,14 +35,14 @@ export const World = memo(({ width }: { width: number }) => {},});- const highest = liveSessionLocations?.reduce(- (acc, curr) => Math.max(acc, curr.count),- 0- );+ const highest =+ liveSessionLocations?.reduce((acc, curr) => Math.max(acc, curr.count), 0) ??+ 1;+ const normalized = 5 / Number(minutes);const weightColor = scaleSequentialSqrt(interpolateYlOrRd).domain([0,- (highest ?? 0) * 5,+ highest * normalized * 15,]);useEffect(() => {@@ -63,7 +67,7 @@ export const World = memo(({ width }: { width: number }) => {return liveSessionLocations?.map((e) => ({lat: e.lat,lng: e.lon,- count: e.count,+ count: Math.max(1, e.count / highest),}));}, [liveSessionLocations]);@@ -84,37 +88,43 @@ export const World = memo(({ width }: { width: number }) => {}}ref={globeEl as any}width={width ?? 0}- height={size.height ?? 0 - 36}+ height={(size.height ?? 0) - 50}+ globeOffset={[0, -36]}atmosphereColor="rgba(170, 170, 200, 1)"globeMaterial={oceanBlueMaterial}hexPolygonsData={countries.features}hexPolygonResolution={3}hexPolygonMargin={0.2}- hexBinMargin={0.2}+ // hexBinMargin={0.2}hexBinResolution={3}hexBinPointsData={liveSessionLocationsData}hexBinMerge={true}hexBinPointWeight={"count"}backgroundColor="rgba(0, 0, 0, 0)"- hexPolygonColor={(e) => {- return `rgba(100, 100, 100, ${Math.random() / 3 + 0.5})`;+ hexPolygonColor={(e: any) => {+ return randomShader(e.properties.ISO_A2);}}+ // hexPolygonColor={(e) => {+ // return `rgba(100, 100, 100, ${Math.random() / 3 + 0.5})`;+ // }}hexTopColor={(d) => weightColor(d.sumWeight)}hexSideColor={(d) => weightColor(d.sumWeight)}// @ts-ignore- hexPolygonLabel={({ properties: d }) => (- <div className="text-neutral-100 bg-neutral-900 border border-neutral-700 rounded-md p-2 ">- <div>- <b>- {d.ADMIN} ({d.ISO_A2})- </b>- </div>- <div>- Population: <i>{d.POP_EST}</i>- </div>- </div>- )}+ // hexPolygonLabel={(props: any) => {+ // console.info(props);+ // return <div>{props.properties.ADMIN}</div>;+ // // <div className="text-neutral-100 bg-neutral-900 border border-neutral-700 rounded-md p-2 ">+ // // <div>+ // // <b>+ // // {d.ADMIN} ({d.ISO_A2})+ // // </b>+ // // </div>+ // // <div>+ // // Population: <i>{d.POP_EST}</i>+ // // </div>+ // // </div>+ // }}/></div>);-});+};diff --git a/client/src/app/[site]/realtime/page.tsx b/client/src/app/[site]/realtime/page.tsxindex d6c0064d0..b9fb3a589 100644--- a/client/src/app/[site]/realtime/page.tsx+++ b/client/src/app/[site]/realtime/page.tsx@@ -1,26 +1,79 @@"use client";-import { useMeasure } from "@uidotdev/usehooks";+import { useMeasure, useWindowSize } from "@uidotdev/usehooks";import { Countries } from "../main/components/sections/Countries";import { Events } from "../main/components/sections/Events";import { Pages } from "../main/components/sections/Pages";import { Referrers } from "../main/components/sections/Referrers";import { RealtimeChart } from "./RealtimeChart/RealtimeChart";import { World } from "./RealtimeGlobe/RealtimeGlobe";+import { useGetLiveUsercount } from "../../../api/analytics/useLiveUserCount";+import { Tabs, TabsList, TabsTrigger } from "../../../components/ui/tabs";+import {+ Select,+ SelectTrigger,+ SelectItem,+ SelectContent,+ SelectValue,+} from "../../../components/ui/select";+import { useAtom } from "jotai";+import { minutesAtom, MinutesType } from "./realtimeStore";+import NumberFlow from "@number-flow/react";export default function RealtimePage() {const [ref, { width }] = useMeasure();+ const size = useWindowSize();++ const [minutes, setMinutes] = useAtom(minutesAtom);++ const { data } = useGetLiveUsercount(Number(minutes));return (- <div className="flex flex-col gap-4" ref={ref}>+ <div style={{ position: "relative", overflow: "hidden" }} ref={ref}><World width={width ?? 0} />- <RealtimeChart />- <div className="grid grid-cols-1 md:grid-cols-2 gap-4">++ <div className="absolute top-4 left-4 flex justify-center items-center w-full">+ <div style={{ width: size.height ?? 0 }}>+ <div className="flex flex-col p-4 pt-3 bg-neutral-900 rounded-lg shadow-lg border border-neutral-750 w-fit">+ <div className="text-sm text-gray-400 flex gap-2 text-nowrap items-center">+ Visitors in the last{" "}+ <Select+ value={minutes}+ onValueChange={(value) => setMinutes(value as MinutesType)}+ >+ <SelectTrigger>+ <SelectValue placeholder="Select a time period" />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="5">5 minutes</SelectItem>+ <SelectItem value="15">15 minutes</SelectItem>+ <SelectItem value="30">30 minutes</SelectItem>+ <SelectItem value="60">1 hour</SelectItem>+ <SelectItem value="120">2 hours</SelectItem>+ <SelectItem value="240">4 hours</SelectItem>+ <SelectItem value="480">8 hours</SelectItem>+ <SelectItem value="720">12 hours</SelectItem>+ <SelectItem value="1440">24 hours</SelectItem>+ </SelectContent>+ </Select>+ </div>+ <div className="text-4xl font-bold">+ {+ <NumberFlow+ respectMotionPreference={false}+ value={data?.count ?? 0}+ />+ }+ </div>+ </div>+ </div>+ </div>+ {/* <div className="grid grid-cols-1 md:grid-cols-2 gap-4"><Pages isRealtime /><Events isRealtime /><Referrers isRealtime /><Countries isRealtime />- </div>+ </div> */}</div>);}diff --git a/client/src/app/[site]/realtime/realtimeStore.ts b/client/src/app/[site]/realtime/realtimeStore.tsnew file mode 100644index 000000000..43aa69fac--- /dev/null+++ b/client/src/app/[site]/realtime/realtimeStore.ts@@ -0,0 +1,14 @@+import { atom } from "jotai";++export type MinutesType =+ | "5"+ | "15"+ | "30"+ | "60"+ | "120"+ | "240"+ | "480"+ | "720"+ | "1440";++export const minutesAtom = atom<MinutesType>("5");diff --git a/client/src/components/ui/tabs.tsx b/client/src/components/ui/tabs.tsxindex b5686097d..45c278a19 100644--- a/client/src/components/ui/tabs.tsx+++ b/client/src/components/ui/tabs.tsx@@ -1,11 +1,11 @@-"use client"+"use client";-import * as React from "react"-import * as TabsPrimitive from "@radix-ui/react-tabs"+import * as React from "react";+import * as TabsPrimitive from "@radix-ui/react-tabs";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";-const Tabs = TabsPrimitive.Root+const Tabs = TabsPrimitive.Root;const TabsList = React.forwardRef<React.ElementRef<typeof TabsPrimitive.List>,@@ -19,8 +19,8 @@ const TabsList = React.forwardRef<)}{...props}/>-))-TabsList.displayName = TabsPrimitive.List.displayName+));+TabsList.displayName = TabsPrimitive.List.displayName;const TabsTrigger = React.forwardRef<React.ElementRef<typeof TabsPrimitive.Trigger>,@@ -29,13 +29,13 @@ const TabsTrigger = React.forwardRef<<TabsPrimitive.Triggerref={ref}className={cn(- "inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-white transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-950 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-white data-[state=active]:text-neutral-950 data-[state=active]:shadow dark:ring-offset-neutral-950 dark:focus-visible:ring-neutral-300 dark:data-[state=active]:bg-neutral-950 dark:data-[state=active]:text-neutral-50",+ "inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-white transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-950 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-white data-[state=active]:text-neutral-950 data-[state=active]:shadow dark:ring-offset-neutral-950 dark:focus-visible:ring-neutral-300 dark:data-[state=active]:bg-neutral-900 dark:data-[state=active]:text-neutral-50",className)}{...props}/>-))-TabsTrigger.displayName = TabsPrimitive.Trigger.displayName+));+TabsTrigger.displayName = TabsPrimitive.Trigger.displayName;const TabsContent = React.forwardRef<React.ElementRef<typeof TabsPrimitive.Content>,@@ -49,7 +49,7 @@ const TabsContent = React.forwardRef<)}{...props}/>-))-TabsContent.displayName = TabsPrimitive.Content.displayName+));+TabsContent.displayName = TabsPrimitive.Content.displayName;-export { Tabs, TabsList, TabsTrigger, TabsContent }+export { Tabs, TabsList, TabsTrigger, TabsContent };