Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Update package dependencies and enhance live user count functionality

Bill Yang25c63fdb19a1
diff --git a/client/package-lock.json b/client/package-lock.json
index f6b41106b..3aac62270 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -12,6 +12,7 @@
"@nivo/bar": "^0.88.0",
"@nivo/core": "^0.88.0",
"@nivo/line": "^0.88.0",
+ "@number-flow/react": "^0.5.8",
"@phosphor-icons/react": "^2.1.7",
"@radix-ui/react-alert-dialog": "^1.1.6",
"@radix-ui/react-dialog": "^1.1.6",
@@ -1941,6 +1942,19 @@
"node": ">= 8"
}
},
+ "node_modules/@number-flow/react": {
+ "version": "0.5.8",
+ "resolved": "https://registry.npmjs.org/@number-flow/react/-/react-0.5.8.tgz",
+ "integrity": "sha512-ZHjih9W/kD5srBn7XjcASOEssRbU3vn8VcqXbngVaUeTJNBSn9358QwIg4/WFT6GJXyFAnNQsZeLSCAi6xrMfg==",
+ "dependencies": {
+ "esm-env": "^1.1.4",
+ "number-flow": "0.5.6"
+ },
+ "peerDependencies": {
+ "react": "^18 || ^19",
+ "react-dom": "^18 || ^19"
+ }
+ },
"node_modules/@peculiar/asn1-android": {
"version": "2.3.15",
"resolved": "https://registry.npmjs.org/@peculiar/asn1-android/-/asn1-android-2.3.15.tgz",
@@ -5000,6 +5014,11 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/esm-env": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz",
+ "integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA=="
+ },
"node_modules/execa": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
@@ -5857,6 +5876,14 @@
"node": ">=8"
}
},
+ "node_modules/number-flow": {
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/number-flow/-/number-flow-0.5.6.tgz",
+ "integrity": "sha512-3K4lWNn+zWYeWEgaJMbFIjqy6WnvIETXTVIybKnaPU0XmhsqQmdXfxXf7tmB4MybzHwrl5GN4oFT34EU/B2yhg==",
+ "dependencies": {
+ "esm-env": "^1.1.4"
+ }
+ },
"node_modules/object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
diff --git a/client/package.json b/client/package.json
index 670dec1ac..fa969767c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -13,6 +13,7 @@
"@nivo/bar": "^0.88.0",
"@nivo/core": "^0.88.0",
"@nivo/line": "^0.88.0",
+ "@number-flow/react": "^0.5.8",
"@phosphor-icons/react": "^2.1.7",
"@radix-ui/react-alert-dialog": "^1.1.6",
"@radix-ui/react-dialog": "^1.1.6",
diff --git a/client/src/api/analytics/useLiveUserCount.ts b/client/src/api/analytics/useLiveUserCount.ts
index 791a45edc..bd907231e 100644
--- a/client/src/api/analytics/useLiveUserCount.ts
+++ b/client/src/api/analytics/useLiveUserCount.ts
@@ -7,6 +7,7 @@ export function useGetLiveUsercount() {
const { site } = useStore();
return useQuery({
queryKey: ["live-user-count", site],
+ refetchInterval: 5000,
queryFn: () =>
authedFetch(`${BACKEND_URL}/live-user-count/${site}`).then((res) =>
res.json()
diff --git a/client/src/app/[site]/Header/Header.tsx b/client/src/app/[site]/Header/Header.tsx
index e91ad66f1..e4f504644 100644
--- a/client/src/app/[site]/Header/Header.tsx
+++ b/client/src/app/[site]/Header/Header.tsx
@@ -1,16 +1,13 @@
"use client";
-import { useStore } from "@/lib/store";
-import { Circle } from "@phosphor-icons/react";
import { ChartBarDecreasing, ChartLine, Radio, User } from "lucide-react";
import Link from "next/link";
import { usePathname } from "next/navigation";
-import { SiteSettings } from "../../../components/SiteSettings/SiteSettings";
import { useGetSites } from "../../../api/admin/sites";
-import { useGetLiveUsercount } from "../../../api/analytics/useLiveUserCount";
+import { SiteSettings } from "../../../components/SiteSettings/SiteSettings";
+import LiveUserCount from "./LiveUserCount";
import { UsageBanners } from "./UsageBanners";
export function Header() {
- const { data } = useGetLiveUsercount();
const { data: sites } = useGetSites();
const pathname = usePathname();
@@ -45,8 +42,7 @@ export function Header() {
<div>{site?.domain}</div>
</div>
<div className="flex items-center gap-1 text-base text-neutral-600 dark:text-neutral-400">
- <Circle size={12} weight="fill" color="hsl(var(--green-500))" />
- {data?.count} users online
+ <LiveUserCount />
<SiteSettings siteId={site?.siteId ?? 0} />
</div>
</div>
diff --git a/client/src/app/[site]/Header/LiveUserCount.tsx b/client/src/app/[site]/Header/LiveUserCount.tsx
new file mode 100644
index 000000000..4b89c5088
--- /dev/null
+++ b/client/src/app/[site]/Header/LiveUserCount.tsx
@@ -0,0 +1,36 @@
+import { useGetLiveUsercount } from "../../../api/analytics/useLiveUserCount";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from "../../../components/ui/tooltip";
+import NumberFlow from "@number-flow/react";
+
+export default function LiveUserCount() {
+ const { data } = useGetLiveUsercount();
+
+ return (
+ <div className="flex items-center gap-[6px] text-base text-neutral-200 cursor-default">
+ <div className="flex justify-center">
+ <span className="relative flex h-3 w-3">
+ <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-400 opacity-75"></span>
+ <span className="relative inline-flex h-3 w-3 rounded-full bg-green-500"></span>
+ </span>
+ </div>
+
+ <Tooltip>
+ <TooltipTrigger>
+ {
+ <NumberFlow
+ respectMotionPreference={false}
+ value={data?.count ?? 0}
+ />
+ }
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>Users online in past 5 minutes</p>
+ </TooltipContent>
+ </Tooltip>
+ </div>
+ );
+}