Skip to content

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

improve overview

Bill Yangcbd3bccd13b8
diff --git a/client/src/app/[site]/main/components/MainSection/MainSection.tsx b/client/src/app/[site]/main/components/MainSection/MainSection.tsx
index a8ff6af42..038f8e22a 100644
--- a/client/src/app/[site]/main/components/MainSection/MainSection.tsx
+++ b/client/src/app/[site]/main/components/MainSection/MainSection.tsx
@@ -16,8 +16,11 @@ export function MainSection() {
isFetching: isPreviousFetching,
error: previousError,
} = useGetOverviewBucketed({ periodTime: "previous", site });
- const { isFetching: isOverviewFetching } = useGetOverview();
- const { isFetching: isOverviewFetchingPrevious } = useGetOverview("previous");
+ const { isFetching: isOverviewFetching } = useGetOverview({ site });
+ const { isFetching: isOverviewFetchingPrevious } = useGetOverview({
+ site,
+ periodTime: "previous",
+ });
const maxOfDataAndPreviousData = Math.max(
Math.max(...(data?.data?.map((d) => d[selectedStat]) ?? [])),
diff --git a/client/src/app/[site]/main/components/MainSection/Overview.tsx b/client/src/app/[site]/main/components/MainSection/Overview.tsx
index 0edf00022..aaee4f26a 100644
--- a/client/src/app/[site]/main/components/MainSection/Overview.tsx
+++ b/client/src/app/[site]/main/components/MainSection/Overview.tsx
@@ -89,14 +89,15 @@ const Stat = ({
};
export function Overview() {
+ const { site } = useStore();
const {
data: overviewData,
isFetching: isOverviewFetching,
isLoading: isOverviewLoading,
error: overviewError,
- } = useGetOverview();
+ } = useGetOverview({ site });
const { data: overviewDataPrevious, isLoading: isOverviewLoadingPrevious } =
- useGetOverview("previous");
+ useGetOverview({ site, periodTime: "previous" });
const isLoading = isOverviewLoading || isOverviewLoadingPrevious;
diff --git a/client/src/components/SiteCard.tsx b/client/src/components/SiteCard.tsx
index ca89e7173..e52c937ea 100644
--- a/client/src/components/SiteCard.tsx
+++ b/client/src/components/SiteCard.tsx
@@ -1,9 +1,10 @@
+import { useGetOverview, useGetOverviewBucketed } from "@/hooks/api";
import Link from "next/link";
-import { SiteSettings } from "./SiteSettings/SiteSettings";
import { SiteSessionChart } from "./SiteSessionChart";
-import { Activity, Users } from "lucide-react";
-import { useGetOverviewBucketed } from "@/hooks/api";
+import { SiteSettings } from "./SiteSettings/SiteSettings";
+import { Button } from "./ui/button";
import { Skeleton } from "./ui/skeleton";
+import { ArrowRight } from "lucide-react";
interface SiteCardProps {
siteId: number;
@@ -16,14 +17,12 @@ export function SiteCard({ siteId, domain }: SiteCardProps) {
site: siteId,
});
- const totalSessions = data?.data?.reduce(
- (acc, curr) => acc + curr.sessions,
- 0
- );
-
- const totalUsers = data?.data?.reduce((acc, curr) => acc + curr.users, 0);
+ const { data: overviewData, isLoading: isOverviewLoading } = useGetOverview({
+ site: siteId,
+ past24Hours: true,
+ });
- if (isLoading) {
+ if (isLoading || isOverviewLoading) {
return (
<div className="flex flex-col rounded-lg bg-neutral-900 p-4" key={siteId}>
<div className="flex justify-between items-center mb-3">
@@ -60,28 +59,28 @@ export function SiteCard({ siteId, domain }: SiteCardProps) {
</Link>
<SiteSettings siteId={siteId} />
</div>
-
<div className="mt-2">
<SiteSessionChart data={data?.data ?? []} height={100} />
</div>
-
- <div className="grid grid-cols-2 gap-2 mt-3 text-sm">
- <div className="flex items-center gap-2">
- <Activity size={16} className="text-blue-400" />
- <div>
- <div className="text-gray-400">Sessions</div>
- <div className="font-semibold">
- {totalSessions?.toLocaleString()}
- </div>
+ <div className="flex gap-2 justify-between items-center mt-3 text-sm mx-2">
+ <div className="flex flex-col gap-1 items-center">
+ <div className="text-gray-400">Sessions</div>
+ <div className="font-semibold">
+ {overviewData?.data?.sessions?.toLocaleString()}
</div>
</div>
- <div className="flex items-center gap-2">
- <Users size={16} className="text-green-400" />
- <div>
- <div className="text-gray-400">Users</div>
- <div className="font-semibold">{totalUsers?.toLocaleString()}</div>
+ <div className="flex flex-col gap-1 items-center">
+ <div className="text-gray-400 ">Users</div>
+ <div className="font-semibold">
+ {overviewData?.data?.users?.toLocaleString()}
</div>
</div>
+ <Link href={`/${siteId}`}>
+ <Button variant="outline" size="sm">
+ Analytics
+ <ArrowRight size={16} />
+ </Button>
+ </Link>
</div>
</div>
);
diff --git a/client/src/hooks/api.ts b/client/src/hooks/api.ts
index da4da905a..e8de9d199 100644
--- a/client/src/hooks/api.ts
+++ b/client/src/hooks/api.ts
@@ -191,8 +191,43 @@ export type GetOverviewResponse = {
session_duration: number;
};
-export function useGetOverview(periodTime?: PeriodTime) {
- return useGenericSiteDataQuery<GetOverviewResponse>("overview", periodTime);
+export function useGetOverview({
+ periodTime,
+ past24Hours,
+ site,
+}: {
+ periodTime?: PeriodTime;
+ past24Hours?: boolean;
+ site?: number | string;
+}) {
+ const { time, previousTime, filters } = useStore();
+ const timeToUse = periodTime === "previous" ? previousTime : time;
+ const { startDate, endDate } = getStartAndEndDate(timeToUse);
+
+ return useQuery({
+ queryKey: ["overview", timeToUse, site, filters, past24Hours],
+ queryFn: () => {
+ const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+ return authedFetch(
+ `${BACKEND_URL}/overview?${startDate ? `startDate=${startDate}&` : ""}${
+ endDate ? `endDate=${endDate}&` : ""
+ }timezone=${timezone}&site=${site}&filters=${JSON.stringify(filters)}${
+ past24Hours ? `&past24Hours=${past24Hours}` : ""
+ }`
+ ).then((res) => res.json());
+ },
+ staleTime: Infinity,
+ placeholderData: (_, query: any) => {
+ if (!query?.queryKey) return undefined;
+ const prevQueryKey = query.queryKey as [string, string, string];
+ const [, , prevSite] = prevQueryKey;
+
+ if (prevSite === site) {
+ return query.state.data;
+ }
+ return undefined;
+ },
+ });
}
export type GetSitesResponse = {
diff --git a/server/src/api/getOverview.ts b/server/src/api/getOverview.ts
index 5e4be2e72..5c1a58614 100644
--- a/server/src/api/getOverview.ts
+++ b/server/src/api/getOverview.ts
@@ -16,20 +16,31 @@ type GetOverviewResponse = {
session_duration: number;
};
-export async function getOverview(
- {
- query: { startDate, endDate, timezone, site, filters },
- }: FastifyRequest<GenericRequest>,
- res: FastifyReply
-) {
+const getQuery = ({
+ startDate,
+ endDate,
+ timezone,
+ site,
+ filters,
+ past24Hours,
+}: {
+ startDate: string;
+ endDate: string;
+ timezone: string;
+ site: string;
+ filters: string;
+ past24Hours: boolean;
+}) => {
const filterStatement = getFilterStatement(filters);
- const query = `SELECT
- session_stats.sessions,
- session_stats.pages_per_session,
- session_stats.bounce_rate * 100 AS bounce_rate,
- session_stats.session_duration,
- page_stats.pageviews,
- page_stats.users
+
+ if (past24Hours) {
+ return `SELECT
+ session_stats.sessions,
+ session_stats.pages_per_session,
+ session_stats.bounce_rate * 100 AS bounce_rate,
+ session_stats.session_duration,
+ page_stats.pageviews,
+ page_stats.users
FROM
(
-- Session-level metrics
@@ -39,33 +50,141 @@ export async function getOverview(
sumIf(1, pages_in_session = 1) / COUNT() AS bounce_rate,
AVG(end_time - start_time) AS session_duration
FROM
+ (
+ -- One row per session
+ SELECT
+ session_id,
+ MIN(timestamp) AS start_time,
+ MAX(timestamp) AS end_time,
+ COUNT(*) AS pages_in_session
+ FROM pageviews
+ WHERE
+ site_id = ${site}
+ ${filterStatement}
+ AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY
+ AND timestamp < toTimeZone(now('${timezone}'), 'UTC')
+ GROUP BY session_id
+ )
+ ) AS session_stats
+ CROSS JOIN
(
- -- Build a summary row per session
+ -- Page-level and user-level metrics
SELECT
- session_id,
- MIN(timestamp) AS start_time,
- MAX(timestamp) AS end_time,
- COUNT(*) AS pages_in_session
+ COUNT(*) AS pageviews,
+ COUNT(DISTINCT user_id) AS users
FROM pageviews
- WHERE
+ WHERE
site_id = ${site}
- ${filterStatement}
- ${getTimeStatement(startDate, endDate, timezone)}
- GROUP BY session_id
- )
- ) AS session_stats
- CROSS JOIN
+ ${filterStatement}
+ AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY
+ AND timestamp < toTimeZone(now('${timezone}'), 'UTC')
+ ) AS page_stats`;
+ }
+
+ return `SELECT
+ session_stats.sessions,
+ session_stats.pages_per_session,
+ session_stats.bounce_rate * 100 AS bounce_rate,
+ session_stats.session_duration,
+ page_stats.pageviews,
+ page_stats.users
+ FROM
(
- -- Page-level and user-level metrics
+ -- Session-level metrics
SELECT
- COUNT(*) AS pageviews,
- COUNT(DISTINCT user_id) AS users
- FROM pageviews
- WHERE
- site_id = ${site}
- ${filterStatement}
- ${getTimeStatement(startDate, endDate, timezone)}
- ) AS page_stats`;
+ COUNT() AS sessions,
+ AVG(pages_in_session) AS pages_per_session,
+ sumIf(1, pages_in_session = 1) / COUNT() AS bounce_rate,
+ AVG(end_time - start_time) AS session_duration
+ FROM
+ (
+ -- One row per session
+ SELECT
+ session_id,
+ MIN(timestamp) AS start_time,
+ MAX(timestamp) AS end_time,
+ COUNT(*) AS pages_in_session
+ FROM pageviews
+ WHERE
+ site_id = ${site}
+ ${filterStatement}
+ ${getTimeStatement(startDate, endDate, timezone)}
+ GROUP BY session_id
+ )
+ ) AS session_stats
+ CROSS JOIN
+ (
+ -- Page-level and user-level metrics
+ SELECT
+ COUNT(*) AS pageviews,
+ COUNT(DISTINCT user_id) AS users
+ FROM pageviews
+ WHERE
+ site_id = ${site}
+ ${filterStatement}
+ ${getTimeStatement(startDate, endDate, timezone)}
+ ) AS page_stats`;
+};
+
+export async function getOverview(
+ {
+ query: { startDate, endDate, timezone, site, filters, past24Hours },
+ }: FastifyRequest<GenericRequest & { Querystring: { past24Hours: boolean } }>,
+ res: FastifyReply
+) {
+ const filterStatement = getFilterStatement(filters);
+ // const query = `SELECT
+ // session_stats.sessions,
+ // session_stats.pages_per_session,
+ // session_stats.bounce_rate * 100 AS bounce_rate,
+ // session_stats.session_duration,
+ // page_stats.pageviews,
+ // page_stats.users
+ // FROM
+ // (
+ // -- Session-level metrics
+ // SELECT
+ // COUNT() AS sessions,
+ // AVG(pages_in_session) AS pages_per_session,
+ // sumIf(1, pages_in_session = 1) / COUNT() AS bounce_rate,
+ // AVG(end_time - start_time) AS session_duration
+ // FROM
+ // (
+ // -- Build a summary row per session
+ // SELECT
+ // session_id,
+ // MIN(timestamp) AS start_time,
+ // MAX(timestamp) AS end_time,
+ // COUNT(*) AS pages_in_session
+ // FROM pageviews
+ // WHERE
+ // site_id = ${site}
+ // ${filterStatement}
+ // ${getTimeStatement(startDate, endDate, timezone)}
+ // GROUP BY session_id
+ // )
+ // ) AS session_stats
+ // CROSS JOIN
+ // (
+ // -- Page-level and user-level metrics
+ // SELECT
+ // COUNT(*) AS pageviews,
+ // COUNT(DISTINCT user_id) AS users
+ // FROM pageviews
+ // WHERE
+ // site_id = ${site}
+ // ${filterStatement}
+ // ${getTimeStatement(startDate, endDate, timezone)}
+ // ) AS page_stats`;
+
+ const query = getQuery({
+ startDate,
+ endDate,
+ timezone,
+ site,
+ filters,
+ past24Hours,
+ });
try {
const result = await clickhouse.query({
diff --git a/server/src/api/getOverviewBucketed.ts b/server/src/api/getOverviewBucketed.ts
index 0c755e310..5a1ab56eb 100644
--- a/server/src/api/getOverviewBucketed.ts
+++ b/server/src/api/getOverviewBucketed.ts
@@ -67,6 +67,8 @@ const getQuery = ({
filters: string;
past24Hours: boolean;
}) => {
+ const filterStatement = getFilterStatement(filters);
+
if (past24Hours) {
return `SELECT
session_stats.time AS time,
@@ -96,6 +98,7 @@ FROM
FROM pageviews
WHERE
site_id = ${site}
+ ${filterStatement}
AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY
AND timestamp < toTimeZone(now('${timezone}'), 'UTC')
GROUP BY session_id
@@ -117,6 +120,7 @@ FULL JOIN
FROM pageviews
WHERE
site_id = ${site}
+ ${filterStatement}
-- Past 24 hours in LA time
AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY
AND timestamp < toTimeZone(now('${timezone}'), 'UTC')
@@ -131,7 +135,6 @@ USING time
ORDER BY time;`;
}
const isAllTime = !startDate && !endDate;
- const filterStatement = getFilterStatement(filters);
const query = `SELECT
session_stats.time AS time,