Skip to content

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

Add overview on front page

Bill Yangb8a30959d599
diff --git a/client/src/app/[site]/main/components/MainSection/MainSection.tsx b/client/src/app/[site]/main/components/MainSection/MainSection.tsx
index a9adf6137..a8ff6af42 100644
--- a/client/src/app/[site]/main/components/MainSection/MainSection.tsx
+++ b/client/src/app/[site]/main/components/MainSection/MainSection.tsx
@@ -8,14 +8,14 @@ import { PreviousChart } from "./PreviousChart";
import { useStore } from "../../../../../lib/store";
export function MainSection() {
- const { selectedStat, time } = useStore();
+ const { selectedStat, time, site } = useStore();
- const { data, isFetching, error } = useGetOverviewBucketed();
+ const { data, isFetching, error } = useGetOverviewBucketed({ site });
const {
data: previousData,
isFetching: isPreviousFetching,
error: previousError,
- } = useGetOverviewBucketed("previous");
+ } = useGetOverviewBucketed({ periodTime: "previous", site });
const { isFetching: isOverviewFetching } = useGetOverview();
const { isFetching: isOverviewFetchingPrevious } = useGetOverview("previous");
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
index 1bb19fed2..b4635edcb 100644
--- a/client/src/app/page.tsx
+++ b/client/src/app/page.tsx
@@ -1,37 +1,29 @@
"use client";
-import Link from "next/link";
+import { SiteCard } from "../components/SiteCard";
import { useGetSites } from "../hooks/api";
import { AddSite } from "./components/AddSite";
-import { SiteSettings } from "../components/SiteSettings/SiteSettings";
export default function Home() {
const { data: sites } = useGetSites();
return (
<div className="flex min-h-screen flex-col pt-1">
- <div className="flex justify-between">
+ <div className="flex justify-between items-center mb-4">
<div className="text-2xl font-bold">Websites</div>
<AddSite />
</div>
- <div className="grid grid-cols-3 gap-4 mt-4">
- {sites?.data?.map((site) => (
- <div
- className="flex justify-between gap-2 p-4 rounded-lg bg-neutral-900 text-lg font-semibold"
- key={site.siteId}
- >
- <Link href={`/${site.siteId}`}>
- <div className="flex gap-2">
- <img
- className="w-6 mr-1"
- src={`https://www.google.com/s2/favicons?domain=${site.domain}&sz=48`}
- />
- {site.domain}
- </div>
- </Link>
- <SiteSettings siteId={site.siteId} />
- </div>
- ))}
+
+ <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+ {sites?.data?.map((site) => {
+ return (
+ <SiteCard
+ key={site.siteId}
+ siteId={site.siteId}
+ domain={site.domain}
+ />
+ );
+ })}
</div>
</div>
);
diff --git a/client/src/components/SiteCard.tsx b/client/src/components/SiteCard.tsx
new file mode 100644
index 000000000..ca89e7173
--- /dev/null
+++ b/client/src/components/SiteCard.tsx
@@ -0,0 +1,88 @@
+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 { Skeleton } from "./ui/skeleton";
+
+interface SiteCardProps {
+ siteId: number;
+ domain: string;
+}
+
+export function SiteCard({ siteId, domain }: SiteCardProps) {
+ const { data, isLoading } = useGetOverviewBucketed({
+ past24Hours: true,
+ site: siteId,
+ });
+
+ const totalSessions = data?.data?.reduce(
+ (acc, curr) => acc + curr.sessions,
+ 0
+ );
+
+ const totalUsers = data?.data?.reduce((acc, curr) => acc + curr.users, 0);
+
+ if (isLoading) {
+ return (
+ <div className="flex flex-col rounded-lg bg-neutral-900 p-4" key={siteId}>
+ <div className="flex justify-between items-center mb-3">
+ <div className="flex gap-2 items-center">
+ <img
+ className="w-6 mr-1"
+ src={`https://www.google.com/s2/favicons?domain=${domain}&sz=48`}
+ alt={domain}
+ />
+ <span className="text-lg font-semibold truncate">{domain}</span>
+ </div>
+ </div>
+ <Skeleton className="h-[100px] w-full bg-neutral-950 mb-3" />
+ <div className="grid grid-cols-2 gap-2">
+ <Skeleton className="h-12 bg-neutral-800" />
+ <Skeleton className="h-12 bg-neutral-800" />
+ </div>
+ </div>
+ );
+ }
+
+ return (
+ <div className="flex flex-col rounded-lg bg-neutral-900 p-4">
+ <div className="flex justify-between items-center mb-3">
+ <Link href={`/${siteId}`} className="hover:underline">
+ <div className="flex gap-2 items-center">
+ <img
+ className="w-6 mr-1"
+ src={`https://www.google.com/s2/favicons?domain=${domain}&sz=48`}
+ alt={domain}
+ />
+ <span className="text-lg font-semibold truncate">{domain}</span>
+ </div>
+ </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>
+ </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>
+ </div>
+ </div>
+ </div>
+ );
+}
diff --git a/client/src/components/SiteSessionChart.tsx b/client/src/components/SiteSessionChart.tsx
new file mode 100644
index 000000000..153452552
--- /dev/null
+++ b/client/src/components/SiteSessionChart.tsx
@@ -0,0 +1,109 @@
+import { nivoTheme } from "@/lib/nivo";
+import { ResponsiveLine } from "@nivo/line";
+import { DateTime } from "luxon";
+import { useMemo } from "react";
+import { GetOverviewBucketedResponse } from "../hooks/api";
+import { formatter } from "../lib/utils";
+
+interface SiteSessionChartProps {
+ data: GetOverviewBucketedResponse;
+ height?: number | string;
+}
+
+export function SiteSessionChart({
+ data,
+ height = 100,
+}: SiteSessionChartProps) {
+ const chartData = useMemo(() => {
+ if (!data || data.length === 0) {
+ return [{ id: "sessions", data: [] }];
+ }
+
+ return [
+ {
+ id: "sessions",
+ data: data.map((point) => {
+ return {
+ x: DateTime.fromSQL(point.time)
+ .toUTC()
+ .toFormat("yyyy-MM-dd HH:mm:ss"),
+ y: point.sessions,
+ currentTime: DateTime.fromSQL(point.time),
+ };
+ }),
+ },
+ ];
+ }, [data]);
+
+ return (
+ <div style={{ height }}>
+ <ResponsiveLine
+ data={chartData}
+ margin={{ top: 10, right: 10, bottom: 20, left: 25 }}
+ xScale={{
+ type: "time",
+ format: "%Y-%m-%d %H:%M:%S",
+ precision: "second",
+ useUTC: true,
+ }}
+ yScale={{
+ type: "linear",
+ min: 0,
+ max: "auto",
+ }}
+ curve="linear"
+ enableSlices={"x"}
+ axisBottom={{
+ tickSize: 5,
+ tickPadding: 5,
+ tickRotation: 0,
+ tickValues: 3,
+ format: (value) => {
+ return DateTime.fromJSDate(value).toFormat("ha");
+ },
+ }}
+ axisLeft={{
+ tickSize: 5,
+ tickPadding: 5,
+ tickRotation: 0,
+ tickValues: 2,
+ format: formatter,
+ }}
+ enableGridX={false}
+ enableGridY={false}
+ enablePoints={false}
+ enableArea={true}
+ areaOpacity={0.3}
+ colors={["hsl(var(--fuchsia-400))"]}
+ theme={nivoTheme}
+ defs={[
+ {
+ id: "gradientA",
+ type: "linearGradient",
+ colors: [
+ { offset: 0, color: "hsl(var(--fuchsia-400))", opacity: 1 },
+ { offset: 100, color: "hsl(var(--fuchsia-400))", opacity: 0 },
+ ],
+ },
+ ]}
+ fill={[{ match: "*", id: "gradientA" }]}
+ sliceTooltip={({ slice }: any) => {
+ const currentY = Number(slice.points[0].data.yFormatted);
+ const currentTime = slice.points[0].data.currentTime as DateTime;
+
+ return (
+ <div className="bg-neutral-800 border-neutral-700 border p-2 rounded-md">
+ <div className="text-xs mb-1">Sessions</div>
+ <div className="flex justify-between text-xs w-20">
+ <div className="text-muted-foreground">
+ {currentTime.toFormat("ha")}
+ </div>
+ <div className="font-medium">{currentY.toLocaleString()}</div>
+ </div>
+ </div>
+ );
+ }}
+ />
+ </div>
+ );
+}
diff --git a/client/src/components/ui/skeleton.tsx b/client/src/components/ui/skeleton.tsx
index 34eeeaf5a..a8f51fff2 100644
--- a/client/src/components/ui/skeleton.tsx
+++ b/client/src/components/ui/skeleton.tsx
@@ -1,4 +1,4 @@
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
function Skeleton({
className,
@@ -6,10 +6,10 @@ function Skeleton({
}: React.HTMLAttributes<HTMLDivElement>) {
return (
<div
- className={cn("animate-pulse rounded-md bg-neutral-900/10 dark:bg-neutral-50/10", className)}
+ className={cn("animate-pulse rounded-md bg-neutral-800", className)}
{...props}
/>
- )
+ );
}
-export { Skeleton }
+export { Skeleton };
diff --git a/client/src/hooks/api.ts b/client/src/hooks/api.ts
index 23732b018..da4da905a 100644
--- a/client/src/hooks/api.ts
+++ b/client/src/hooks/api.ts
@@ -132,16 +132,30 @@ export type GetOverviewBucketedResponse = {
users: number;
}[];
-export function useGetOverviewBucketed(
- periodTime?: PeriodTime
-): UseQueryResult<APIResponse<GetOverviewBucketedResponse>> {
- const { time, previousTime, bucket, site, filters } = useStore();
+export function useGetOverviewBucketed({
+ periodTime,
+ past24Hours,
+ site,
+}: {
+ periodTime?: PeriodTime;
+ past24Hours?: boolean;
+ site?: number | string;
+}): UseQueryResult<APIResponse<GetOverviewBucketedResponse>> {
+ const { time, previousTime, bucket, filters } = useStore();
+
const timeToUse = periodTime === "previous" ? previousTime : time;
const { startDate, endDate } = getStartAndEndDate(timeToUse);
return useQuery({
- queryKey: ["overview-bucketed", timeToUse, bucket, site, filters],
+ queryKey: [
+ "overview-bucketed",
+ timeToUse,
+ bucket,
+ site,
+ filters,
+ past24Hours,
+ ],
queryFn: () => {
const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
return authedFetch(
@@ -151,7 +165,7 @@ export function useGetOverviewBucketed(
endDate ? `endDate=${endDate}&` : ""
}timezone=${timezone}&bucket=${bucket}&site=${site}&filters=${JSON.stringify(
filters
- )}`
+ )}${past24Hours ? `&past24Hours=${past24Hours}` : ""}`
).then((res) => res.json());
},
placeholderData: (_, query: any) => {
diff --git a/server/src/api/getOverviewBucketed.ts b/server/src/api/getOverviewBucketed.ts
index d30a08ef5..0c755e310 100644
--- a/server/src/api/getOverviewBucketed.ts
+++ b/server/src/api/getOverviewBucketed.ts
@@ -50,25 +50,86 @@ function getTimeStatementFill(
) STEP INTERVAL ${bucketIntervalMap[bucket]}`;
}
-type TimeBucket = "hour" | "day" | "week" | "month";
+const getQuery = ({
+ startDate,
+ endDate,
+ timezone,
+ bucket,
+ site,
+ filters,
+ past24Hours,
+}: {
+ startDate: string;
+ endDate: string;
+ timezone: string;
+ bucket: TimeBucket;
+ site: string;
+ filters: string;
+ past24Hours: boolean;
+}) => {
+ if (past24Hours) {
+ return `SELECT
+ session_stats.time AS time,
+ 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 STATS β€”β€”β€”β€”β€” */
+ SELECT
+ ${TimeBucketToFn[bucket]}(toTimeZone(start_time, '${timezone}')) AS time,
+ 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}
+ AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY
+ AND timestamp < toTimeZone(now('${timezone}'), 'UTC')
+ GROUP BY session_id
+ )
+ GROUP BY time
+ ORDER BY time WITH FILL
+ FROM toTimeZone(${TimeBucketToFn[bucket]}(now('${timezone}') - INTERVAL 1 DAY), 'UTC')
+ TO toTimeZone(${TimeBucketToFn[bucket]}(now('${timezone}')), 'UTC')
+ STEP INTERVAL 1 HOUR
+) AS session_stats
-type getOverviewBucketed = { time: string; pageviews: number }[];
+FULL JOIN
+(
+ /* β€”β€”β€”β€”β€” PAGE STATS β€”β€”β€”β€”β€” */
+ SELECT
+ ${TimeBucketToFn[bucket]}(toTimeZone(timestamp, '${timezone}')) AS time,
+ COUNT(*) AS pageviews,
+ COUNT(DISTINCT user_id) AS users
+ FROM pageviews
+ WHERE
+ site_id = ${site}
+ -- Past 24 hours in LA time
+ AND timestamp >= toTimeZone(now('${timezone}'), 'UTC') - INTERVAL 1 DAY
+ AND timestamp < toTimeZone(now('${timezone}'), 'UTC')
+ GROUP BY time
+ ORDER BY time WITH FILL
+ FROM toTimeZone(${TimeBucketToFn[bucket]}(now('${timezone}') - INTERVAL 1 DAY), 'UTC')
+ TO toTimeZone(${TimeBucketToFn[bucket]}(now('${timezone}')), 'UTC')
+ STEP INTERVAL 1 HOUR
+) AS page_stats
-export async function getOverviewBucketed(
- {
- query: { startDate, endDate, timezone, bucket, site, filters },
- }: FastifyRequest<{
- Querystring: {
- startDate: string;
- endDate: string;
- timezone: string;
- bucket: TimeBucket;
- site: string;
- filters: string;
- };
- }>,
- res: FastifyReply
-) {
+USING time
+ORDER BY time;`;
+ }
const isAllTime = !startDate && !endDate;
const filterStatement = getFilterStatement(filters);
@@ -133,6 +194,39 @@ FULL JOIN
USING time
ORDER BY time`;
+ return query;
+};
+
+type TimeBucket = "hour" | "day" | "week" | "month";
+
+type getOverviewBucketed = { time: string; pageviews: number }[];
+
+export async function getOverviewBucketed(
+ {
+ query: { startDate, endDate, timezone, bucket, site, filters, past24Hours },
+ }: FastifyRequest<{
+ Querystring: {
+ startDate: string;
+ endDate: string;
+ timezone: string;
+ bucket: TimeBucket;
+ site: string;
+ filters: string;
+ past24Hours?: boolean;
+ };
+ }>,
+ res: FastifyReply
+) {
+ const query = getQuery({
+ startDate,
+ endDate,
+ timezone,
+ bucket,
+ site,
+ filters,
+ past24Hours: past24Hours ?? false,
+ });
+
try {
const result = await clickhouse.query({
query,