Skip to content

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

wip

Bill Yang30879c6ed344
diff --git a/client/src/app/api/stats/pageviews/route.ts b/client/src/app/api/stats/pageviews/route.ts
deleted file mode 100644
index b460a1720..000000000
--- a/client/src/app/api/stats/pageviews/route.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { NextResponse } from "next/server";
-import { clickhouse } from "@/lib/clickhouse";
-
-export async function GET(request: Request) {
- try {
- const { searchParams } = new URL(request.url);
- const days = Number(searchParams.get("days")) || 1;
-
- const query = `
- SELECT
- formatDateTime(toTimeZone(toStartOfHour(timestamp), 'America/Los_Angeles'), '%Y-%m-%d %H:%M:%S', 'America/Los_Angeles') AS hour,
- count() AS pageviews
- FROM pageviews
- WHERE timestamp >= toTimeZone(now() - INTERVAL ${days} DAY, 'America/Los_Angeles')
- GROUP BY hour
- ORDER BY hour ASC;
- `;
-
- const result = await clickhouse.query({
- query,
- format: "JSONEachRow",
- });
-
- const data = await result.json();
- return NextResponse.json({ data });
- } catch (error) {
- console.error("Error fetching pageviews:", error);
- return NextResponse.json(
- { error: "Failed to fetch pageviews" },
- { status: 500 }
- );
- }
-}
diff --git a/client/src/app/components/Header/DateSelector.tsx b/client/src/app/components/Header/DateSelector.tsx
new file mode 100644
index 000000000..31467a925
--- /dev/null
+++ b/client/src/app/components/Header/DateSelector.tsx
@@ -0,0 +1,78 @@
+"use client";
+
+import { Button } from "@/components/ui/button";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { Time, useTimeSelection } from "@/lib/timeSelectionStore";
+import { DateTime } from "luxon";
+import { CustomDateRangePicker } from "./CustomDateRangePicker";
+
+const getLabel = (time: Time) => {
+ if (time.mode === "range") {
+ return `${time.startDate} - ${time.endDate}`;
+ }
+
+ if (time.mode === "date") {
+ if (time.date === DateTime.now().toISODate()) {
+ return "Today";
+ }
+ if (time.date === DateTime.now().minus({ days: 1 }).toISODate()) {
+ return "Yesterday";
+ }
+ return time.date;
+ }
+};
+
+export function DateSelector() {
+ const { time, setTime } = useTimeSelection();
+
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger>
+ <Button variant="outline">{getLabel(time)}</Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuItem
+ onClick={() =>
+ setTime({
+ mode: "date",
+ date: DateTime.now().toISODate(),
+ })
+ }
+ >
+ Today
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ onClick={() =>
+ setTime({
+ mode: "range",
+ startDate: DateTime.now().minus({ days: 7 }).toISODate(),
+ endDate: DateTime.now().toISODate(),
+ })
+ }
+ >
+ Last 7 Days
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ onClick={() =>
+ setTime({
+ mode: "range",
+ startDate: DateTime.now().minus({ days: 30 }).toISODate(),
+ endDate: DateTime.now().toISODate(),
+ })
+ }
+ >
+ Last 30 Days
+ </DropdownMenuItem>
+
+ <DropdownMenuSeparator />
+ <CustomDateRangePicker />
+ </DropdownMenuContent>
+ </DropdownMenu>
+ );
+}
diff --git a/client/src/app/components/Header/Header.tsx b/client/src/app/components/Header/Header.tsx
index 5fb93f1f4..fe1a8a8b6 100644
--- a/client/src/app/components/Header/Header.tsx
+++ b/client/src/app/components/Header/Header.tsx
@@ -2,19 +2,10 @@
import { Circle } from "@phosphor-icons/react";
import { useQuery } from "@tanstack/react-query";
-import { useStore } from "@/lib/store";
import { Button } from "@/components/ui/button";
+import { goBack, goForward, useTimeSelection } from "@/lib/timeSelectionStore";
import { ChevronLeft, ChevronRight } from "lucide-react";
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuLabel,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import { CustomDateRangePicker } from "./CustomDateRangePicker";
-import { DateTime } from "luxon";
+import { DateSelector } from "./DateSelector";
export function Header() {
const { data } = useQuery<{ count: number }>({
@@ -24,7 +15,7 @@ export function Header() {
res.json()
),
});
- const { date, setDate } = useStore();
+ const { time, setTime } = useTimeSelection();
const DATE_OPTIONS = [
{ value: 1, label: "Today" },
@@ -45,44 +36,15 @@ export function Header() {
</div>
</div>
<div className="flex items-center gap-2">
+ <DateSelector />
<div className="flex items-center">
- <Button variant="outline" size="icon">
+ <Button variant="outline" size="icon" onClick={goBack}>
<ChevronLeft />
</Button>
- <Button variant="outline" size="icon">
+ <Button variant="outline" size="icon" onClick={goForward}>
<ChevronRight />
</Button>
</div>
- <DropdownMenu>
- <DropdownMenuTrigger>
- <Button variant="outline">
- {
- DATE_OPTIONS.find(
- (option) =>
- DateTime.now().minus({ days: option.value }).toISODate() ===
- date[0]
- )?.label
- }
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- {DATE_OPTIONS.map((option) => (
- <DropdownMenuItem
- onClick={() =>
- setDate([
- DateTime.now().minus({ days: option.value }).toISODate(),
- DateTime.now().toISODate(),
- ])
- }
- key={option.value}
- >
- {option.label}
- </DropdownMenuItem>
- ))}
- <DropdownMenuSeparator />
- <CustomDateRangePicker />
- </DropdownMenuContent>
- </DropdownMenu>
</div>
</div>
);
diff --git a/client/src/app/components/MainSection/MainSection.tsx b/client/src/app/components/MainSection/MainSection.tsx
index 22b9e84d2..c376d4cf7 100644
--- a/client/src/app/components/MainSection/MainSection.tsx
+++ b/client/src/app/components/MainSection/MainSection.tsx
@@ -6,14 +6,12 @@ import {
ChartTooltip,
ChartTooltipContent,
} from "@/components/ui/chart";
-import { useQuery } from "@tanstack/react-query";
+import { Spinner } from "@/components/ui/spinner";
import { DateTime } from "luxon";
-import * as React from "react";
import { Area, AreaChart, CartesianGrid, XAxis, YAxis } from "recharts";
+import { useTimeSelection } from "../../../lib/timeSelectionStore";
import { formatter } from "../../../lib/utils";
-import { getPageViews } from "../../actions/getPageviews";
-import { Spinner } from "@/components/ui/spinner";
-import { useStore } from "../../../lib/store";
+import { useGetPageviews } from "../../hooks/useGetPageviews";
const chartConfig = {
visitors: {
@@ -31,32 +29,24 @@ const chartConfig = {
} satisfies ChartConfig;
export function MainSection() {
- const { date } = useStore();
- const { data, isLoading, error } = useQuery({
- queryKey: ["pageviews"],
- queryFn: () => {
- const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
- return getPageViews({
- startDate: date[0],
- endDate: date[1],
- timezone,
- });
- },
- });
+ const { time } = useTimeSelection();
+
+ console.log(time);
+ const { data, isLoading, error } = useGetPageviews();
let body = <Spinner />;
if (data?.data) {
- const filteredData = data.data.map((e) => ({
+ const processed = data.data.map((e) => ({
date: e.time,
desktop: e.pageviews,
// mobile: e.pageviews,
}));
- const maxPageviews = Math.max(...filteredData.map((e) => e.desktop));
+ const maxPageviews = Math.max(...processed.map((e) => e.desktop));
body = (
- <AreaChart data={filteredData}>
+ <AreaChart data={processed}>
<defs>
<linearGradient id="fillDesktop" x1="0" y1="0" x2="0" y2="1">
<stop
diff --git a/client/src/app/hooks/useGetPageviews.ts b/client/src/app/hooks/useGetPageviews.ts
new file mode 100644
index 000000000..c2d58afae
--- /dev/null
+++ b/client/src/app/hooks/useGetPageviews.ts
@@ -0,0 +1,22 @@
+import { useQuery } from "@tanstack/react-query";
+import { useTimeSelection } from "../../lib/timeSelectionStore";
+import { getPageViews } from "../actions/getPageviews";
+import { getStartAndEndDate } from "./utils";
+
+export function useGetPageviews() {
+ const { time } = useTimeSelection();
+
+ const { startDate, endDate } = getStartAndEndDate(time);
+
+ return useQuery({
+ queryKey: ["pageviews", time],
+ queryFn: () => {
+ const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+ return getPageViews({
+ startDate,
+ endDate,
+ timezone,
+ });
+ },
+ });
+}
diff --git a/client/src/app/hooks/utils.ts b/client/src/app/hooks/utils.ts
new file mode 100644
index 000000000..dab280a42
--- /dev/null
+++ b/client/src/app/hooks/utils.ts
@@ -0,0 +1,14 @@
+import { Time } from "@/lib/timeSelectionStore";
+
+export function getStartAndEndDate(time: Time) {
+ if (time.mode === "range") {
+ return { startDate: time.startDate, endDate: time.endDate };
+ }
+ if (time.mode === "month") {
+ return { startDate: time.month, endDate: time.month };
+ }
+ if (time.mode === "year") {
+ return { startDate: time.year, endDate: time.year };
+ }
+ return { startDate: time.date, endDate: time.date };
+}
diff --git a/client/src/lib/store.ts b/client/src/lib/store.ts
deleted file mode 100644
index 11af486ba..000000000
--- a/client/src/lib/store.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { DateTime } from "luxon";
-import { create } from "zustand";
-
-export type DateMode = "day" | "week" | "month" | "year" | "custom";
-
-type Store = {
- date: string[];
- setDate: (date: string[]) => void;
-
- mode: DateMode;
- setMode: (mode: DateMode) => void;
-};
-
-export const useStore = create<Store>((set) => ({
- date: [DateTime.now().toISODate(), DateTime.now().toISODate()],
- setDate: (date) => set({ date }),
-
- mode: "day",
- setMode: (mode) => set({ mode }),
-}));
diff --git a/client/src/lib/timeSelectionStore.ts b/client/src/lib/timeSelectionStore.ts
new file mode 100644
index 000000000..e1c000d77
--- /dev/null
+++ b/client/src/lib/timeSelectionStore.ts
@@ -0,0 +1,64 @@
+import { DateTime } from "luxon";
+import { create } from "zustand";
+
+type DateMode = {
+ mode: "date";
+ date: string;
+};
+
+type DateRangeMode = {
+ mode: "range";
+ startDate: string;
+ endDate: string;
+};
+
+type MonthMode = {
+ mode: "month";
+ month: string;
+};
+
+type YearMode = {
+ mode: "year";
+ year: string;
+};
+
+export type Time = DateMode | DateRangeMode | MonthMode | YearMode;
+
+type Store = {
+ time: Time;
+ setTime: (time: Time) => void;
+};
+
+export const useTimeSelection = create<Store>((set) => ({
+ time: {
+ mode: "date",
+ date: DateTime.now().toISODate(),
+ },
+ setTime: (time) => set({ time }),
+}));
+
+export const goBack = () => {
+ const { time, setTime } = useTimeSelection.getState();
+
+ if (time.mode === "date") {
+ setTime({
+ mode: "date",
+ date: DateTime.fromISO(time.date).minus({ days: 1 }).toISODate() ?? "",
+ });
+ }
+};
+
+export const goForward = () => {
+ const { time, setTime } = useTimeSelection.getState();
+
+ if (time.mode === "date") {
+ setTime({
+ mode: "date",
+ date:
+ DateTime.fromISO(time.date).plus({ days: 1 }).toISODate() ??
+ "" > DateTime.now().toISODate()
+ ? DateTime.now().toISODate()
+ : DateTime.fromISO(time.date).plus({ days: 1 }).toISODate() ?? "",
+ });
+ }
+};