Skip to content

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

Enhance Home and SubHeader components with date navigation and improved site metrics display

Bill Yang3a0b4d78827c
diff --git a/client/src/app/[site]/components/SubHeader/SubHeader.tsx b/client/src/app/[site]/components/SubHeader/SubHeader.tsx
index d705a1996..8e4201e71 100644
--- a/client/src/app/[site]/components/SubHeader/SubHeader.tsx
+++ b/client/src/app/[site]/components/SubHeader/SubHeader.tsx
@@ -1,43 +1,16 @@
"use client";
import { Button } from "@/components/ui/button";
-import { goBack, goForward, useStore } from "@/lib/store";
+import { canGoForward, goBack, goForward, useStore } from "@/lib/store";
import { FilterParameter } from "@rybbit/shared";
-import { ChevronLeft, ChevronRight, Share } from "lucide-react";
-import { DateTime } from "luxon";
+import { ChevronLeft, ChevronRight } from "lucide-react";
import { Filters } from "./Filters/Filters";
import { DateSelector } from "../../../../components/DateSelector/DateSelector";
-import { Time } from "../../../../components/DateSelector/types";
+import { authClient } from "../../../../lib/auth";
+import { MobileSidebar } from "../Sidebar/MobileSidebar";
import { NewFilterButton } from "./Filters/NewFilterButton";
import { LiveUserCount } from "./LiveUserCount";
-import { MobileSidebar } from "../Sidebar/MobileSidebar";
import { ShareSite } from "./ShareSite";
-import { authClient } from "../../../../lib/auth";
-
-const canGoForward = (time: Time) => {
- const currentDay = DateTime.now().startOf("day");
- if (time.mode === "day") {
- return !(DateTime.fromISO(time.day).startOf("day") >= currentDay);
- }
-
- if (time.mode === "range") {
- return !(DateTime.fromISO(time.endDate).startOf("day") >= currentDay);
- }
-
- if (time.mode === "week") {
- return !(DateTime.fromISO(time.week).startOf("week") >= currentDay);
- }
-
- if (time.mode === "month") {
- return !(DateTime.fromISO(time.month).startOf("month") >= currentDay);
- }
-
- if (time.mode === "year") {
- return !(DateTime.fromISO(time.year).startOf("year") >= currentDay);
- }
-
- return false;
-};
export function SubHeader({ availableFilters }: { availableFilters?: FilterParameter[] }) {
const { time, setTime } = useStore();
diff --git a/client/src/app/[site]/main/components/MainSection/Overview.tsx b/client/src/app/[site]/main/components/MainSection/Overview.tsx
index 6af145108..dbaebb52c 100644
--- a/client/src/app/[site]/main/components/MainSection/Overview.tsx
+++ b/client/src/app/[site]/main/components/MainSection/Overview.tsx
@@ -1,17 +1,17 @@
"use client";
import { Skeleton } from "@/components/ui/skeleton";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
import { cn, formatSecondsAsMinutesAndSeconds } from "@/lib/utils";
import NumberFlow from "@number-flow/react";
-import { TrendingDown, TrendingUp } from "lucide-react";
+import { ArrowDown, ArrowUp, ChevronDown, ChevronUp } from "lucide-react";
import { useState } from "react";
import { useGetOverview } from "../../../../../api/analytics/hooks/useGetOverview";
import { useGetOverviewBucketed } from "../../../../../api/analytics/hooks/useGetOverviewBucketed";
import { StatType, useStore } from "../../../../../lib/store";
import { SparklinesChart } from "./SparklinesChart";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
-const ChangePercentage = ({
+export const ChangePercentage = ({
current,
previous,
reverseColor,
@@ -36,11 +36,11 @@ const ChangePercentage = ({
return (
<div
className={cn(
- "text-xs flex items-center gap-1",
+ "text-xs flex items-center gap-0.5",
(reverseColor ? -change : change) > 0 ? "text-green-400" : "text-red-400"
)}
>
- {change > 0 ? <TrendingUp className="w-4 h-4" /> : <TrendingDown className="w-4 h-4" />}
+ {change > 0 ? <ArrowUp className="w-3 h-3" strokeWidth={3} /> : <ArrowDown className="w-3 h-3" strokeWidth={3} />}
{Math.abs(change).toFixed(1)}%
</div>
);
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
index 574620651..78adaba99 100644
--- a/client/src/app/page.tsx
+++ b/client/src/app/page.tsx
@@ -1,10 +1,11 @@
"use client";
-import { Plus } from "lucide-react";
+import { ChevronLeft, ChevronRight, Plus } from "lucide-react";
import { useState } from "react";
import { useUserOrganizations } from "../api/admin/organizations";
import { useGetSitesFromOrg } from "../api/admin/sites";
import { CreateOrganizationDialog } from "../components/CreateOrganizationDialog";
+import { DateSelector } from "../components/DateSelector/DateSelector";
import { NoOrganization } from "../components/NoOrganization";
import { OrganizationSelector } from "../components/OrganizationSelector";
import { SiteCard } from "../components/SiteCard";
@@ -13,11 +14,13 @@ import { Button } from "../components/ui/button";
import { Card, CardDescription, CardTitle } from "../components/ui/card";
import { useSetPageTitle } from "../hooks/useSetPageTitle";
import { authClient } from "../lib/auth";
+import { canGoForward, goBack, goForward, useStore } from "../lib/store";
import { AddSite } from "./components/AddSite";
export default function Home() {
useSetPageTitle("Rybbit · Home");
+ const { time, setTime } = useStore();
const { data: activeOrganization, isPending } = authClient.useActiveOrganization();
const { data: sites, refetch: refetchSites, isLoading: isLoadingSites } = useGetSitesFromOrg(activeOrganization?.id);
@@ -59,22 +62,37 @@ export default function Home() {
<div>
<OrganizationSelector />
</div>
- {/* <div className="text-2xl font-bold">{sites?.length} Websites</div> */}
- <AddSite disabled={!canAddSites} />
+ <div className="flex items-center gap-2">
+ <DateSelector time={time} setTime={setTime} />
+ <div className="flex items-center">
+ <Button
+ variant="secondary"
+ size="icon"
+ onClick={goBack}
+ disabled={time.mode === "past-minutes"}
+ className="rounded-r-none h-8 w-8"
+ >
+ <ChevronLeft />
+ </Button>
+ <Button
+ variant="secondary"
+ size="icon"
+ onClick={goForward}
+ disabled={!canGoForward(time)}
+ className="rounded-l-none -ml-px h-8 w-8"
+ >
+ <ChevronRight />
+ </Button>
+ </div>
+ </div>
</div>
- {/* Organization required message */}
{hasNoOrganizations && <NoOrganization />}
-
- <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
- {/* Sites list */}
-
+ <div className="flex flex-col gap-4">
{sites?.sites?.map(site => {
return <SiteCard key={site.siteId} siteId={site.siteId} domain={site.domain} />;
})}
-
- {/* No websites message */}
- {hasNoSites && (
- <Card className="col-span-full p-6 flex flex-col items-center text-center">
+ {hasNoSites ? (
+ <Card className="p-6 flex flex-col items-center text-center">
<CardTitle className="mb-2 text-xl">No websites yet</CardTitle>
<CardDescription className="mb-4">Add your first website to start tracking analytics</CardDescription>
<AddSite
@@ -86,9 +104,12 @@ export default function Home() {
}
/>
</Card>
+ ) : (
+ <div className="flex justify-center">
+ <AddSite disabled={!canAddSites} />
+ </div>
)}
</div>
-
<CreateOrganizationDialog
open={createOrgDialogOpen}
onOpenChange={setCreateOrgDialogOpen}
diff --git a/client/src/components/DateSelector/DateSelector.tsx b/client/src/components/DateSelector/DateSelector.tsx
index 75bfe4d7f..950722d3b 100644
--- a/client/src/components/DateSelector/DateSelector.tsx
+++ b/client/src/components/DateSelector/DateSelector.tsx
@@ -11,7 +11,7 @@ import {
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { getTimezoneLabel, timezones } from "@/lib/dateTimeUtils";
-import { getTimezone, getTodayInTimezone, useStore } from "@/lib/store";
+import { getTimezone, useStore } from "@/lib/store";
import { Calendar, Check, Globe } from "lucide-react";
import { DateTime } from "luxon";
import { CustomDateRangePicker } from "./CustomDateRangePicker";
diff --git a/client/src/components/SiteCard.tsx b/client/src/components/SiteCard.tsx
index 790924c9c..192712c34 100644
--- a/client/src/components/SiteCard.tsx
+++ b/client/src/components/SiteCard.tsx
@@ -1,12 +1,13 @@
-import { ArrowRight } from "lucide-react";
import Link from "next/link";
import { useRef } from "react";
import { useGetOverview } from "../api/analytics/hooks/useGetOverview";
import { useGetOverviewBucketed } from "../api/analytics/hooks/useGetOverviewBucketed";
+import { ChangePercentage } from "../app/[site]/main/components/MainSection/Overview";
import { useInView } from "../hooks/useInView";
+import { useStore } from "../lib/store";
+import { formatter } from "../lib/utils";
import { Favicon } from "./Favicon";
import { SiteSessionChart } from "./SiteSessionChart";
-import { Button } from "./ui/button";
import { Skeleton } from "./ui/skeleton";
interface SiteCardProps {
@@ -25,14 +26,11 @@ export function SiteCard({ siteId, domain }: SiteCardProps) {
// Track if we've ever loaded data successfully
const hasLoadedData = useRef(false);
+ const { bucket } = useStore();
+
const { data, isLoading, isSuccess } = useGetOverviewBucketed({
site: siteId,
- bucket: "hour",
- overrideTime: {
- mode: "past-minutes",
- pastMinutesStart: 1440,
- pastMinutesEnd: 0,
- },
+ bucket,
props: {
enabled: isInView,
},
@@ -44,11 +42,12 @@ export function SiteCard({ siteId, domain }: SiteCardProps) {
isSuccess: isOverviewSuccess,
} = useGetOverview({
site: siteId,
- overrideTime: {
- mode: "past-minutes",
- pastMinutesStart: 1440,
- pastMinutesEnd: 0,
- },
+ });
+
+ // Previous period - automatically handles both regular time-based and past-minutes queries
+ const { data: overviewDataPrevious, isLoading: isOverviewLoadingPrevious } = useGetOverview({
+ site: siteId,
+ periodTime: "previous",
});
// Update the hasLoadedData ref when data loads successfully
@@ -62,81 +61,78 @@ export function SiteCard({ siteId, domain }: SiteCardProps) {
const showSkeleton = (isLoading || isOverviewLoading || !isInView) && !hasLoadedData.current;
return (
- <div
- ref={ref}
- className="flex flex-col rounded-lg bg-white dark:bg-neutral-900/70 p-4 border border-neutral-100 dark:border-neutral-850 shadow-lg hover:shadow-xl hover:border-neutral-200 dark:hover:border-neutral-800 transition-all duration-300 hover:translate-y-[-2px]"
- >
- {showSkeleton ? (
- <>
- <div className="flex justify-between items-center">
- <div className="flex gap-3 items-center">
+ <Link href={`/${siteId}`}>
+ <div
+ ref={ref}
+ className="flex flex-col md:flex-row md:justify-between gap-3 rounded-lg bg-white dark:bg-neutral-900/70 px-4 py-3 border border-neutral-100 dark:border-neutral-850 transition-all duration-300 hover:translate-y-[-2px] w-full"
+ >
+ {showSkeleton ? (
+ <>
+ <div className="flex gap-2 items-center">
<Skeleton className="w-6 h-6 rounded" />
- <Skeleton className="h-6 w-40" />
+ <Skeleton className="h-5 w-32" />
</div>
- </div>
-
- <div className="relative mt-1 mb-1 rounded-md p-2 overflow-hidden">
- <Skeleton className="h-[110px] w-full rounded-md" />
- </div>
-
- <div className="grid grid-cols-3 gap-2 mt-2">
- <div className="flex flex-col gap-1 items-center bg-neutral-100 dark:bg-neutral-800/50 rounded-md p-2">
- <Skeleton className="h-3 w-16 rounded" />
- <Skeleton className="h-6 w-10 rounded mt-1" />
- </div>
-
- <div className="flex flex-col gap-1 items-center bg-neutral-100 dark:bg-neutral-800/50 rounded-md p-2">
- <Skeleton className="h-3 w-16 rounded" />
- <Skeleton className="h-6 w-10 rounded mt-1" />
- </div>
-
- <div className="flex items-center justify-center">
- <Skeleton className="h-[38px] w-full rounded" />
+ <div className="flex gap-2 items-center">
+ <Skeleton className="h-[64px] w-[200px] rounded-md" />
+ <div className="grid grid-cols-2 gap-2 w-[250px]">
+ <div className="flex flex-col gap-1 p-2">
+ <Skeleton className="h-3 w-12" />
+ <Skeleton className="h-6 w-16" />
+ </div>
+ <div className="flex flex-col gap-1 p-2">
+ <Skeleton className="h-3 w-10" />
+ <Skeleton className="h-6 w-14" />
+ </div>
+ </div>
</div>
- </div>
- </>
- ) : (
- <>
- <div className="flex justify-between items-center">
- <Link href={`/${siteId}`} className="group flex gap-3 items-center duration-200">
+ </>
+ ) : (
+ <>
+ <div className="flex gap-2 items-center">
<Favicon domain={domain} className="w-6 h-6" />
<span className="text-lg font-medium truncate group-hover:underline transition-all">{domain}</span>
- </Link>
- </div>
-
- <div className="relative mt-1 mb-1 rounded-md p-2 overflow-hidden">
- <SiteSessionChart data={data?.data ?? []} height={110} />
- {!hasData && (
- <div className="absolute inset-0 flex items-center justify-center bg-white/70 dark:bg-neutral-900/70 backdrop-blur-sm">
- <span className="text-sm text-neutral-500 dark:text-neutral-400">No data available</span>
- </div>
- )}
- </div>
-
- <div className="grid grid-cols-3 gap-2 mt-2">
- <div className="flex flex-col gap-1 items-center bg-neutral-50 dark:bg-neutral-800/50 rounded-md p-2 hover:bg-neutral-150 dark:hover:bg-neutral-800 transition-colors">
- <div className="text-xs text-neutral-500 dark:text-neutral-400">Sessions</div>
- <div className="font-semibold">{overviewData?.data?.sessions?.toLocaleString() || "0"}</div>
</div>
+ <div className="flex flex-col sm:flex-row gap-2 sm:gap-4 items-start sm:items-center justify-between">
+ <div className="relative rounded-md w-[200px] h-[50px]">
+ <SiteSessionChart data={data?.data ?? []} />
+ {!hasData && (
+ <div className="absolute inset-0 flex items-center justify-center bg-white/70 dark:bg-neutral-900/70 backdrop-blur-sm">
+ <span className="text-sm text-neutral-500 dark:text-neutral-400">No data available</span>
+ </div>
+ )}
+ </div>
- <div className="flex flex-col gap-1 items-center bg-neutral-50 dark:bg-neutral-800/50 rounded-md p-2 hover:bg-neutral-150 dark:hover:bg-neutral-800 transition-colors">
- <div className="text-xs text-neutral-500 dark:text-neutral-400">Users</div>
- <div className="font-semibold">{overviewData?.data?.users?.toLocaleString() || "0"}</div>
+ <div className="grid grid-cols-2 gap-2 w-full sm:w-[250px]">
+ <div className="flex flex-col items-start gap-1 rounded-md p-2 transition-colors">
+ <div className="text-xs text-neutral-500 dark:text-neutral-400">Sessions</div>
+ <div className="font-semibold text-xl flex gap-2">
+ {formatter(overviewData?.data?.sessions ?? 0)}{" "}
+ {overviewData?.data?.sessions && overviewDataPrevious?.data?.sessions ? (
+ <ChangePercentage
+ current={overviewData?.data?.sessions}
+ previous={overviewDataPrevious?.data?.sessions}
+ />
+ ) : null}
+ </div>
+ </div>
+
+ <div className="flex flex-col items-start gap-1 rounded-md p-2 transition-colors">
+ <div className="text-xs text-neutral-500 dark:text-neutral-400">Users</div>
+ <div className="font-semibold text-xl flex gap-2">
+ {formatter(overviewData?.data?.users ?? 0)}{" "}
+ {overviewData?.data?.users && overviewDataPrevious?.data?.users ? (
+ <ChangePercentage
+ current={overviewData?.data?.users}
+ previous={overviewDataPrevious?.data?.users}
+ />
+ ) : null}
+ </div>
+ </div>
+ </div>
</div>
-
- <Link href={`/${siteId}`} className="flex items-center justify-center">
- <Button
- variant="outline"
- size="sm"
- className="w-full h-full border-neutral-150 dark:border-neutral-700 bg-neutral-50 dark:bg-neutral-800/50 hover:bg-neutral-150 dark:hover:bg-neutral-800 hover:text-blue-400 transition-all"
- >
- <span className="mr-1">View</span>
- <ArrowRight size={14} className="transition-transform group-hover:translate-x-0.5" />
- </Button>
- </Link>
- </div>
- </>
- )}
- </div>
+ </>
+ )}
+ </div>
+ </Link>
);
}
diff --git a/client/src/components/SiteSessionChart.tsx b/client/src/components/SiteSessionChart.tsx
index 10371fad3..7d8026ebc 100644
--- a/client/src/components/SiteSessionChart.tsx
+++ b/client/src/components/SiteSessionChart.tsx
@@ -3,16 +3,16 @@ import { ResponsiveLine } from "@nivo/line";
import { DateTime } from "luxon";
import { useMemo } from "react";
import { GetOverviewBucketedResponse } from "../api/analytics/endpoints";
-import { hour12 } from "../lib/dateTimeUtils";
-import { formatter } from "../lib/utils";
+import { formatChartDateTime } from "../lib/dateTimeUtils";
+import { useStore } from "../lib/store";
import { ChartTooltip } from "./charts/ChartTooltip";
interface SiteSessionChartProps {
data: GetOverviewBucketedResponse;
- height?: number | string;
}
-export function SiteSessionChart({ data, height = 100 }: SiteSessionChartProps) {
+export function SiteSessionChart({ data }: SiteSessionChartProps) {
+ const { bucket } = useStore();
const chartData = useMemo(() => {
if (!data || data.length === 0) {
return [{ id: "sessions", data: [] }];
@@ -34,75 +34,60 @@ export function SiteSessionChart({ data, height = 100 }: SiteSessionChartProps)
const nivoTheme = useNivoTheme();
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 => {
- const time = DateTime.fromJSDate(value);
- return time.toFormat(hour12 ? "ha" : "HH:mm");
- },
- }}
- 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(--accent-400))"]}
- theme={nivoTheme}
- defs={[
- {
- id: "gradientA",
- type: "linearGradient",
- colors: [
- { offset: 0, color: "hsl(var(--accent-400))", opacity: 1 },
- { offset: 100, color: "hsl(var(--accent-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;
+ <ResponsiveLine
+ data={chartData}
+ margin={{ top: 5, right: 0, bottom: 0, left: 0 }}
+ 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={null}
+ axisLeft={null}
+ enableGridX={false}
+ enableGridY={false}
+ enablePoints={false}
+ enableArea={true}
+ areaOpacity={0.3}
+ colors={["hsl(var(--dataviz))"]}
+ theme={nivoTheme}
+ defs={[
+ {
+ id: "gradientA",
+ type: "linearGradient",
+ colors: [
+ { offset: 0, color: "hsl(var(--dataviz))", opacity: 1 },
+ { offset: 50, color: "hsl(var(--dataviz))", opacity: 0.3 },
+ { offset: 100, color: "hsl(var(--dataviz))", opacity: 0 },
+ ],
+ },
+ ]}
+ animate={false}
+ 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 (
- <ChartTooltip>
- <div className="p-2">
- <div className="text-xs mb-1">Sessions</div>
- <div className="flex justify-between text-xs w-20">
- <div className="text-muted-foreground">{currentTime.toFormat(hour12 ? "ha" : "HH:mm")}</div>
- <div className="font-medium">{currentY.toLocaleString()}</div>
- </div>
+ return (
+ <ChartTooltip>
+ <div className="p-2">
+ <div className="text-xs mb-1">Sessions</div>
+ <div className="flex justify-between text-xs gap-3">
+ <div className="text-muted-foreground">{formatChartDateTime(currentTime, bucket)}</div>
+ <div className="font-medium">{currentY.toLocaleString()}</div>
</div>
- </ChartTooltip>
- );
- }}
- />
- </div>
+ </div>
+ </ChartTooltip>
+ );
+ }}
+ />
);
}
diff --git a/client/src/lib/store.ts b/client/src/lib/store.ts
index 5ab472de3..b8c517adf 100644
--- a/client/src/lib/store.ts
+++ b/client/src/lib/store.ts
@@ -6,23 +6,7 @@ import { Time } from "../components/DateSelector/types";
// Get system timezone
const getSystemTimezone = () =>
- typeof window !== "undefined"
- ? Intl.DateTimeFormat().resolvedOptions().timeZone
- : "UTC";
-
-// Get today's date string in a specific timezone
-export const getTodayInTimezone = (tz?: string): string => {
- const timezone = tz ?? (typeof window !== "undefined" ? useStore.getState().timezone : "system");
- const resolvedTz = timezone === "system" ? getSystemTimezone() : timezone;
- return DateTime.now().setZone(resolvedTz).toISODate() ?? DateTime.now().toISODate()!;
-};
-
-// Get a date relative to today in a specific timezone
-export const getRelativeDateInTimezone = (days: number, tz?: string): string => {
- const timezone = tz ?? (typeof window !== "undefined" ? useStore.getState().timezone : "system");
- const resolvedTz = timezone === "system" ? getSystemTimezone() : timezone;
- return DateTime.now().setZone(resolvedTz).plus({ days }).toISODate() ?? "";
-};
+ typeof window !== "undefined" ? Intl.DateTimeFormat().resolvedOptions().timeZone : "UTC";
// Recalculate time based on wellKnown value for a new timezone
const recalculateTimeForTimezone = (time: Time, timezone: string): Time | null => {
@@ -138,148 +122,149 @@ type Store = {
export const useStore = create<Store>()(
persist(
(set, get) => ({
- site: "",
- setSite: (site) => {
- // Get current URL search params to check for stored state
- let urlParams: URLSearchParams | null = null;
- if (typeof window !== "undefined") {
- urlParams = new URLSearchParams(globalThis.location.search);
- }
-
- // Check if we have state stored in the URL
- const hasTimeInUrl = urlParams?.has("timeMode");
- const hasBucketInUrl = urlParams?.has("bucket");
- const hasStatInUrl = urlParams?.has("stat");
-
- // Only set defaults if not present in URL
- set(state => ({
- site,
- time: hasTimeInUrl
- ? state.time
- : {
- mode: "day",
- day: DateTime.now().toISODate(),
- wellKnown: "today",
- },
- previousTime: hasTimeInUrl
- ? state.previousTime
- : {
- mode: "day",
- day: DateTime.now().minus({ days: 1 }).toISODate(),
- wellKnown: "yesterday",
- },
- bucket: hasBucketInUrl ? state.bucket : "hour",
- selectedStat: hasStatInUrl ? state.selectedStat : "users",
- }));
- },
- privateKey: null,
- setPrivateKey: privateKey => set({ privateKey }),
- time: {
- mode: "day",
- day: DateTime.now().toISODate(),
- wellKnown: "today",
- },
- previousTime: {
- mode: "day",
- day: DateTime.now().minus({ days: 1 }).toISODate(),
- wellKnown: "yesterday",
- },
- setTime: (time, changeBucket = true) => {
- let bucketToUse: TimeBucket = "hour";
- let previousTime: Time;
-
- if (time.mode === "day") {
- bucketToUse = "hour";
- previousTime = {
+ site: "",
+ setSite: site => {
+ // Get current URL search params to check for stored state
+ let urlParams: URLSearchParams | null = null;
+ if (typeof window !== "undefined") {
+ urlParams = new URLSearchParams(globalThis.location.search);
+ }
+
+ // Check if we have state stored in the URL
+ const hasTimeInUrl = urlParams?.has("timeMode");
+ const hasBucketInUrl = urlParams?.has("bucket");
+ const hasStatInUrl = urlParams?.has("stat");
+
+ // Only set defaults if not present in URL
+ set(state => ({
+ site,
+ time: hasTimeInUrl
+ ? state.time
+ : {
+ mode: "day",
+ day: DateTime.now().toISODate(),
+ wellKnown: "today",
+ },
+ previousTime: hasTimeInUrl
+ ? state.previousTime
+ : {
+ mode: "day",
+ day: DateTime.now().minus({ days: 1 }).toISODate(),
+ wellKnown: "yesterday",
+ },
+ bucket: hasBucketInUrl ? state.bucket : "hour",
+ selectedStat: hasStatInUrl ? state.selectedStat : "users",
+ }));
+ },
+ privateKey: null,
+ setPrivateKey: privateKey => set({ privateKey }),
+ time: {
mode: "day",
- day: DateTime.fromISO(time.day).minus({ days: 1 }).toISODate() ?? "",
- };
- } else if (time.mode === "past-minutes") {
- const timeDiff = time.pastMinutesStart - time.pastMinutesEnd;
-
- if (timeDiff <= 120) {
- bucketToUse = "minute";
- }
-
- previousTime = {
- mode: "past-minutes",
- pastMinutesStart: time.pastMinutesStart + timeDiff,
- pastMinutesEnd: time.pastMinutesEnd + timeDiff,
- };
- } else if (time.mode === "range") {
- const timeRangeLength = DateTime.fromISO(time.endDate).diff(DateTime.fromISO(time.startDate), "days").days + 1;
-
- if (timeRangeLength > 180) {
- bucketToUse = "month";
- } else if (timeRangeLength > 31) {
- bucketToUse = "week";
- } else {
- bucketToUse = "day";
- }
-
- previousTime = {
- mode: "range",
- startDate: DateTime.fromISO(time.startDate).minus({ days: timeRangeLength }).toISODate() ?? "",
- endDate: DateTime.fromISO(time.startDate).minus({ days: 1 }).toISODate() ?? "",
- };
- } else if (time.mode === "week") {
- bucketToUse = "day";
- previousTime = {
- mode: "week",
- week: DateTime.fromISO(time.week).minus({ weeks: 1 }).toISODate() ?? "",
- };
- } else if (time.mode === "month") {
- bucketToUse = "day";
- previousTime = {
- mode: "month",
- month: DateTime.fromISO(time.month).minus({ months: 1 }).toISODate() ?? "",
- };
- } else if (time.mode === "year") {
- bucketToUse = "month";
- previousTime = {
- mode: "year",
- year: DateTime.fromISO(time.year).minus({ years: 1 }).toISODate() ?? "",
- };
- } else if (time.mode === "all-time") {
- bucketToUse = "day";
- previousTime = {
- mode: "all-time",
- };
- } else {
- previousTime = time; // fallback case
- }
+ day: DateTime.now().toISODate(),
+ wellKnown: "today",
+ },
+ previousTime: {
+ mode: "day",
+ day: DateTime.now().minus({ days: 1 }).toISODate(),
+ wellKnown: "yesterday",
+ },
+ setTime: (time, changeBucket = true) => {
+ let bucketToUse: TimeBucket = "hour";
+ let previousTime: Time;
- if (changeBucket) {
- set({ time, previousTime, bucket: bucketToUse });
- } else {
- set({ time, previousTime });
- }
- },
- bucket: "hour",
- setBucket: (bucket) => set({ bucket }),
- selectedStat: "users",
- setSelectedStat: (stat) => set({ selectedStat: stat }),
- filters: [],
- setFilters: (filters) => set({ filters }),
- timezone: "system",
- setTimezone: (newTimezone) => {
- const state = get();
- const resolvedTz = newTimezone === "system" ? getSystemTimezone() : newTimezone;
- const newTime = recalculateTimeForTimezone(state.time, resolvedTz);
-
- // If time should be recalculated (has wellKnown), update via setTime
- if (newTime) {
- set({ timezone: newTimezone });
- // Use setTime to properly recalculate previousTime and bucket
- get().setTime(newTime);
- } else {
- set({ timezone: newTimezone });
- }
- },
-}),
+ if (time.mode === "day") {
+ bucketToUse = "hour";
+ previousTime = {
+ mode: "day",
+ day: DateTime.fromISO(time.day).minus({ days: 1 }).toISODate() ?? "",
+ };
+ } else if (time.mode === "past-minutes") {
+ const timeDiff = time.pastMinutesStart - time.pastMinutesEnd;
+
+ if (timeDiff <= 120) {
+ bucketToUse = "minute";
+ }
+
+ previousTime = {
+ mode: "past-minutes",
+ pastMinutesStart: time.pastMinutesStart + timeDiff,
+ pastMinutesEnd: time.pastMinutesEnd + timeDiff,
+ };
+ } else if (time.mode === "range") {
+ const timeRangeLength =
+ DateTime.fromISO(time.endDate).diff(DateTime.fromISO(time.startDate), "days").days + 1;
+
+ if (timeRangeLength > 180) {
+ bucketToUse = "month";
+ } else if (timeRangeLength > 31) {
+ bucketToUse = "week";
+ } else {
+ bucketToUse = "day";
+ }
+
+ previousTime = {
+ mode: "range",
+ startDate: DateTime.fromISO(time.startDate).minus({ days: timeRangeLength }).toISODate() ?? "",
+ endDate: DateTime.fromISO(time.startDate).minus({ days: 1 }).toISODate() ?? "",
+ };
+ } else if (time.mode === "week") {
+ bucketToUse = "day";
+ previousTime = {
+ mode: "week",
+ week: DateTime.fromISO(time.week).minus({ weeks: 1 }).toISODate() ?? "",
+ };
+ } else if (time.mode === "month") {
+ bucketToUse = "day";
+ previousTime = {
+ mode: "month",
+ month: DateTime.fromISO(time.month).minus({ months: 1 }).toISODate() ?? "",
+ };
+ } else if (time.mode === "year") {
+ bucketToUse = "month";
+ previousTime = {
+ mode: "year",
+ year: DateTime.fromISO(time.year).minus({ years: 1 }).toISODate() ?? "",
+ };
+ } else if (time.mode === "all-time") {
+ bucketToUse = "day";
+ previousTime = {
+ mode: "all-time",
+ };
+ } else {
+ previousTime = time; // fallback case
+ }
+
+ if (changeBucket) {
+ set({ time, previousTime, bucket: bucketToUse });
+ } else {
+ set({ time, previousTime });
+ }
+ },
+ bucket: "hour",
+ setBucket: bucket => set({ bucket }),
+ selectedStat: "users",
+ setSelectedStat: stat => set({ selectedStat: stat }),
+ filters: [],
+ setFilters: filters => set({ filters }),
+ timezone: "system",
+ setTimezone: newTimezone => {
+ const state = get();
+ const resolvedTz = newTimezone === "system" ? getSystemTimezone() : newTimezone;
+ const newTime = recalculateTimeForTimezone(state.time, resolvedTz);
+
+ // If time should be recalculated (has wellKnown), update via setTime
+ if (newTime) {
+ set({ timezone: newTimezone });
+ // Use setTime to properly recalculate previousTime and bucket
+ get().setTime(newTime);
+ } else {
+ set({ timezone: newTimezone });
+ }
+ },
+ }),
{
name: "rybbit-store",
- partialize: (state) => ({ timezone: state.timezone }),
+ partialize: state => ({ timezone: state.timezone }),
}
)
);
@@ -440,3 +425,28 @@ export const getFilteredFilters = (parameters: FilterParameter[]) => {
const { filters } = useStore.getState();
return filters.filter(f => parameters.includes(f.parameter));
};
+
+export const canGoForward = (time: Time) => {
+ const currentDay = DateTime.now().startOf("day");
+ if (time.mode === "day") {
+ return !(DateTime.fromISO(time.day).startOf("day") >= currentDay);
+ }
+
+ if (time.mode === "range") {
+ return !(DateTime.fromISO(time.endDate).startOf("day") >= currentDay);
+ }
+
+ if (time.mode === "week") {
+ return !(DateTime.fromISO(time.week).startOf("week") >= currentDay);
+ }
+
+ if (time.mode === "month") {
+ return !(DateTime.fromISO(time.month).startOf("month") >= currentDay);
+ }
+
+ if (time.mode === "year") {
+ return !(DateTime.fromISO(time.year).startOf("year") >= currentDay);
+ }
+
+ return false;
+};