🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Update translations for event tracking and enhance UsageTab component
Bill Yang715ec401554e
diff --git a/client/messages/cs.json b/client/messages/cs.jsonindex 58bcd061f..db97eb856 100644--- a/client/messages/cs.json+++ b/client/messages/cs.json@@ -1551,6 +1551,7 @@"GIL+DR": "Sledování interakcí s formuláři zapnuto","E/tVTI": "Sledování interakcí s formuláři vypnuto","6dvnRN": "",+ "k71IKL": "","IFodEo": "","Pgj6mf": "","FxfxpX": "",@@ -1558,6 +1559,7 @@"6rP1gv": "","5iGg8I": "","o5XOA3": "",+ "hO42EP": "","4cfxQk": "AppSumo plán úrovně {tier}","pIN/qH": "Máš AppSumo doživotní plán s až {limit} událostmi měsíčně.","ja2Zok": "Upgradovat na Pro",diff --git a/client/messages/de.json b/client/messages/de.jsonindex d4ac70975..35c95bf86 100644--- a/client/messages/de.json+++ b/client/messages/de.json@@ -1550,14 +1550,16 @@"enuxmm": "Kopier-Tracking deaktiviert","GIL+DR": "Formularinteraktions-Tracking aktiviert","E/tVTI": "Formularinteraktions-Tracking deaktiviert",- "6dvnRN": "",- "IFodEo": "",- "Pgj6mf": "",- "FxfxpX": "",- "/+XPOf": "",- "6rP1gv": "",- "5iGg8I": "",- "o5XOA3": "",+ "6dvnRN": "Die Nutzung wird zu Beginn jedes Kalendermonats zurückgesetzt.",+ "k71IKL": "Tag {day} von {total}",+ "IFodEo": "Nutzung konnte nicht geladen werden",+ "Pgj6mf": "Events diesen Monat",+ "FxfxpX": "{percent}% der Events Ihrer Organisation",+ "/+XPOf": "Events der Organisation",+ "6rP1gv": "Prognose zum Monatsende",+ "5iGg8I": "Noch nicht genügend Daten",+ "o5XOA3": "{percent}% des Event-Limits Ihrer Organisation",+ "hO42EP": "Tägliche Events","4cfxQk": "AppSumo Plan Stufe {tier}","pIN/qH": "Sie sind im AppSumo-Lifetime-Plan mit bis zu {limit} Events pro Monat.","ja2Zok": "Auf Pro upgraden",diff --git a/client/messages/en.json b/client/messages/en.jsonindex 54a7294ea..0761cabd7 100644--- a/client/messages/en.json+++ b/client/messages/en.json@@ -1551,6 +1551,7 @@"GIL+DR": "Form interaction tracking enabled","E/tVTI": "Form interaction tracking disabled","6dvnRN": "Usage resets at the start of each calendar month.",+ "k71IKL": "Day {day} of {total}","IFodEo": "Failed to load usage","Pgj6mf": "Events this month","FxfxpX": "{percent}% of your organization's events",@@ -1558,6 +1559,7 @@"6rP1gv": "Projected by month end","5iGg8I": "Not enough data yet","o5XOA3": "{percent}% of your organization's event limit",+ "hO42EP": "Daily Events","4cfxQk": "AppSumo Plan Tier {tier}","pIN/qH": "You are on the AppSumo lifetime plan with up to {limit} events per month.","ja2Zok": "Upgrade To Pro",diff --git a/client/messages/es.json b/client/messages/es.jsonindex a94a4f4b1..8a5ded217 100644--- a/client/messages/es.json+++ b/client/messages/es.json@@ -1550,14 +1550,16 @@"enuxmm": "Rastreo de eventos de copia desactivado","GIL+DR": "Rastreo de interacciones en formularios activado","E/tVTI": "Rastreo de interacciones en formularios desactivado",- "6dvnRN": "",- "IFodEo": "",- "Pgj6mf": "",- "FxfxpX": "",- "/+XPOf": "",- "6rP1gv": "",- "5iGg8I": "",- "o5XOA3": "",+ "6dvnRN": "El uso se restablece al inicio de cada mes calendario.",+ "k71IKL": "Día {day} de {total}",+ "IFodEo": "Error al cargar el uso",+ "Pgj6mf": "Eventos este mes",+ "FxfxpX": "{percent}% de los eventos de tu organización",+ "/+XPOf": "Eventos de la organización",+ "6rP1gv": "Proyección a fin de mes",+ "5iGg8I": "Aún no hay suficientes datos",+ "o5XOA3": "{percent}% del límite de eventos de tu organización",+ "hO42EP": "Eventos diarios","4cfxQk": "Nivel de plan AppSumo {tier}","pIN/qH": "Estás en el plan de por vida de AppSumo con hasta {limit} eventos por mes.","ja2Zok": "Actualizar a Pro",diff --git a/client/messages/fr.json b/client/messages/fr.jsonindex 669ddba85..bc460a853 100644--- a/client/messages/fr.json+++ b/client/messages/fr.json@@ -1550,14 +1550,16 @@"enuxmm": "Suivi des copies désactivé","GIL+DR": "Suivi des interactions de formulaire activé","E/tVTI": "Suivi des interactions de formulaire désactivé",- "6dvnRN": "",- "IFodEo": "",- "Pgj6mf": "",- "FxfxpX": "",- "/+XPOf": "",- "6rP1gv": "",- "5iGg8I": "",- "o5XOA3": "",+ "6dvnRN": "L'utilisation est réinitialisée au début de chaque mois calendaire.",+ "k71IKL": "Jour {day} sur {total}",+ "IFodEo": "Échec du chargement de l'utilisation",+ "Pgj6mf": "Événements ce mois-ci",+ "FxfxpX": "{percent}% des événements de votre organisation",+ "/+XPOf": "Événements de l'organisation",+ "6rP1gv": "Projection en fin de mois",+ "5iGg8I": "Pas encore assez de données",+ "o5XOA3": "{percent}% de la limite d'événements de votre organisation",+ "hO42EP": "Événements quotidiens","4cfxQk": "Plan AppSumo Niveau {tier}","pIN/qH": "Vous êtes sur le plan à vie AppSumo avec jusqu'à {limit} événements par mois.","ja2Zok": "Passer à Pro",diff --git a/client/messages/it.json b/client/messages/it.jsonindex ba83dae12..ae6d79372 100644--- a/client/messages/it.json+++ b/client/messages/it.json@@ -1550,14 +1550,16 @@"enuxmm": "Tracciamento copia disabilitato","GIL+DR": "Tracciamento interazioni moduli abilitato","E/tVTI": "Tracciamento interazioni moduli disabilitato",- "6dvnRN": "",- "IFodEo": "",- "Pgj6mf": "",- "FxfxpX": "",- "/+XPOf": "",- "6rP1gv": "",- "5iGg8I": "",- "o5XOA3": "",+ "6dvnRN": "L'utilizzo si azzera all'inizio di ogni mese solare.",+ "k71IKL": "Giorno {day} di {total}",+ "IFodEo": "Impossibile caricare l'utilizzo",+ "Pgj6mf": "Eventi questo mese",+ "FxfxpX": "{percent}% degli eventi della tua organizzazione",+ "/+XPOf": "Eventi dell'organizzazione",+ "6rP1gv": "Proiezione a fine mese",+ "5iGg8I": "Dati ancora insufficienti",+ "o5XOA3": "{percent}% del limite di eventi della tua organizzazione",+ "hO42EP": "Eventi Giornalieri","4cfxQk": "Piano AppSumo Livello {tier}","pIN/qH": "Sei nel piano a vita AppSumo con fino a {limit} eventi al mese.","ja2Zok": "Passa a Pro",diff --git a/client/messages/ja.json b/client/messages/ja.jsonindex 109962527..f1f0a70d7 100644--- a/client/messages/ja.json+++ b/client/messages/ja.json@@ -1550,14 +1550,16 @@"enuxmm": "コピー追跡を無効にしました","GIL+DR": "フォーム操作追跡を有効にしました","E/tVTI": "フォーム操作追跡を無効にしました",- "6dvnRN": "",- "IFodEo": "",- "Pgj6mf": "",- "FxfxpX": "",- "/+XPOf": "",- "6rP1gv": "",- "5iGg8I": "",- "o5XOA3": "",+ "6dvnRN": "使用量は毎月月初にリセットされます。",+ "k71IKL": "{total}日中{day}日目",+ "IFodEo": "使用量の読み込みに失敗しました",+ "Pgj6mf": "今月のイベント",+ "FxfxpX": "組織のイベントの{percent}%",+ "/+XPOf": "組織のイベント",+ "6rP1gv": "月末予測",+ "5iGg8I": "まだ十分なデータがありません",+ "o5XOA3": "組織のイベント上限の{percent}%",+ "hO42EP": "日別イベント","4cfxQk": "AppSumoプランティア{tier}","pIN/qH": "AppSumoライフタイムプランで月{limit}イベントまでご利用いただけます。","ja2Zok": "Proにアップグレード",diff --git a/client/messages/ko.json b/client/messages/ko.jsonindex 787c45260..dbf818093 100644--- a/client/messages/ko.json+++ b/client/messages/ko.json@@ -1550,14 +1550,16 @@"enuxmm": "복사 추적 비활성화됨","GIL+DR": "폼 상호작용 추적 활성화됨","E/tVTI": "폼 상호작용 추적 비활성화됨",- "6dvnRN": "",- "IFodEo": "",- "Pgj6mf": "",- "FxfxpX": "",- "/+XPOf": "",- "6rP1gv": "",- "5iGg8I": "",- "o5XOA3": "",+ "6dvnRN": "사용량은 매월 초에 초기화됩니다.",+ "k71IKL": "{total}일 중 {day}일째",+ "IFodEo": "사용량을 불러오지 못했습니다",+ "Pgj6mf": "이번 달 이벤트",+ "FxfxpX": "조직 이벤트의 {percent}%",+ "/+XPOf": "조직 이벤트",+ "6rP1gv": "월말 예상치",+ "5iGg8I": "아직 데이터가 충분하지 않습니다",+ "o5XOA3": "조직 이벤트 한도의 {percent}%",+ "hO42EP": "일별 이벤트","4cfxQk": "AppSumo 플랜 등급 {tier}","pIN/qH": "월 최대 {limit}개 이벤트의 AppSumo 평생 플랜을 사용 중입니다.","ja2Zok": "Pro로 업그레이드",diff --git a/client/messages/pl.json b/client/messages/pl.jsonindex ab5ed43c6..90b9cc1e3 100644--- a/client/messages/pl.json+++ b/client/messages/pl.json@@ -1550,14 +1550,16 @@"enuxmm": "Śledzenie kopiowania wyłączone","GIL+DR": "Śledzenie interakcji z formularzami włączone","E/tVTI": "Śledzenie interakcji z formularzami wyłączone",- "6dvnRN": "",- "IFodEo": "",- "Pgj6mf": "",- "FxfxpX": "",- "/+XPOf": "",- "6rP1gv": "",- "5iGg8I": "",- "o5XOA3": "",+ "6dvnRN": "Użycie resetuje się na początku każdego miesiąca kalendarzowego.",+ "k71IKL": "Dzień {day} z {total}",+ "IFodEo": "Nie udało się załadować danych o użyciu",+ "Pgj6mf": "Zdarzenia w tym miesiącu",+ "FxfxpX": "{percent}% zdarzeń Twojej organizacji",+ "/+XPOf": "Zdarzenia organizacji",+ "6rP1gv": "Prognoza na koniec miesiąca",+ "5iGg8I": "Jeszcze za mało danych",+ "o5XOA3": "{percent}% limitu zdarzeń Twojej organizacji",+ "hO42EP": "Dzienne zdarzenia","4cfxQk": "Plan AppSumo Tier {tier}","pIN/qH": "Jesteś na dożywotnim planie AppSumo z limitem do {limit} zdarzeń miesięcznie.","ja2Zok": "Ulepsz do Pro",diff --git a/client/messages/pt.json b/client/messages/pt.jsonindex d695f8ea0..7515c7f53 100644--- a/client/messages/pt.json+++ b/client/messages/pt.json@@ -1550,14 +1550,16 @@"enuxmm": "Rastreamento de cópia desativado","GIL+DR": "Rastreamento de interação com formulários ativado","E/tVTI": "Rastreamento de interação com formulários desativado",- "6dvnRN": "",- "IFodEo": "",- "Pgj6mf": "",- "FxfxpX": "",- "/+XPOf": "",- "6rP1gv": "",- "5iGg8I": "",- "o5XOA3": "",+ "6dvnRN": "O uso é redefinido no início de cada mês do calendário.",+ "k71IKL": "Dia {day} de {total}",+ "IFodEo": "Falha ao carregar o uso",+ "Pgj6mf": "Eventos deste mês",+ "FxfxpX": "{percent}% dos eventos da sua organização",+ "/+XPOf": "Eventos da organização",+ "6rP1gv": "Projeção até o fim do mês",+ "5iGg8I": "Ainda não há dados suficientes",+ "o5XOA3": "{percent}% do limite de eventos da sua organização",+ "hO42EP": "Eventos Diários","4cfxQk": "Plano AppSumo Tier {tier}","pIN/qH": "Você está no plano vitalício AppSumo com até {limit} eventos por mês.","ja2Zok": "Atualizar Para Pro",diff --git a/client/messages/uk.json b/client/messages/uk.jsonindex 71c40ba60..956aa5be7 100644--- a/client/messages/uk.json+++ b/client/messages/uk.json@@ -1551,6 +1551,7 @@"GIL+DR": "Відстеження взаємодій із формами увімкнено","E/tVTI": "Відстеження взаємодій із формами вимкнено","6dvnRN": "",+ "k71IKL": "","IFodEo": "","Pgj6mf": "","FxfxpX": "",@@ -1558,6 +1559,7 @@"6rP1gv": "","5iGg8I": "","o5XOA3": "",+ "hO42EP": "","4cfxQk": "План AppSumo (Рівень {tier})","pIN/qH": "Ви користуєтеся довічним планом AppSumo з лімітом до {limit} подій на місяць.","ja2Zok": "Перейти на Pro",diff --git a/client/messages/zh.json b/client/messages/zh.jsonindex 769883d16..d9c7be1ba 100644--- a/client/messages/zh.json+++ b/client/messages/zh.json@@ -1550,14 +1550,16 @@"enuxmm": "复制追踪已禁用","GIL+DR": "表单交互追踪已启用","E/tVTI": "表单交互追踪已禁用",- "6dvnRN": "",- "IFodEo": "",- "Pgj6mf": "",- "FxfxpX": "",- "/+XPOf": "",- "6rP1gv": "",- "5iGg8I": "",- "o5XOA3": "",+ "6dvnRN": "使用量在每个日历月初重置。",+ "k71IKL": "第 {day} 天,共 {total} 天",+ "IFodEo": "加载使用量失败",+ "Pgj6mf": "本月事件",+ "FxfxpX": "占您组织事件的 {percent}%",+ "/+XPOf": "组织事件",+ "6rP1gv": "月底预估",+ "5iGg8I": "数据尚不足",+ "o5XOA3": "占您组织事件限额的 {percent}%",+ "hO42EP": "每日事件","4cfxQk": "AppSumo 计划层级 {tier}","pIN/qH": "您目前处于 AppSumo 终身计划,每月事件上限为 {limit} 个。","ja2Zok": "升级到 Pro",diff --git a/client/src/api/analytics/hooks/useGetSiteEventCount.ts b/client/src/api/analytics/hooks/useGetSiteEventCount.tsnew file mode 100644index 000000000..c9c89d885--- /dev/null+++ b/client/src/api/analytics/hooks/useGetSiteEventCount.ts@@ -0,0 +1,27 @@+import { useQuery } from "@tanstack/react-query";+import { fetchSiteEventCount } from "../endpoints";++export function useGetSiteEventCount({+ siteId,+ startDate,+ endDate,+ timeZone = "UTC",+}: {+ siteId?: number;+ startDate?: string;+ endDate?: string;+ timeZone?: string;+}) {+ return useQuery({+ queryKey: ["site-event-count", siteId, startDate, endDate, timeZone],+ queryFn: () =>+ fetchSiteEventCount(siteId!, {+ startDate: startDate ?? "",+ endDate: endDate ?? "",+ timeZone,+ bucket: "day",+ }),+ enabled: !!siteId,+ staleTime: 1000 * 60 * 5, // 5 minutes+ });+}diff --git a/client/src/api/gsc/hooks/useGetGSCData.ts b/client/src/api/gsc/hooks/useGetGSCData.tsindex cfe79e0d5..231f87381 100644--- a/client/src/api/gsc/hooks/useGetGSCData.ts+++ b/client/src/api/gsc/hooks/useGetGSCData.ts@@ -40,7 +40,8 @@ export function useGetGSCData(dimension: GSCDimension) {dimension,startDate,endDate,- timeZone: timezone,+ // Resolve the "system" sentinel — the API needs a real IANA zone+ timeZone: getTimezone(),});},enabled: !!site,diff --git a/client/src/components/SiteSettings/UsageTab.tsx b/client/src/components/SiteSettings/UsageTab.tsxindex eb53bb888..a2622acbe 100644--- a/client/src/components/SiteSettings/UsageTab.tsx+++ b/client/src/components/SiteSettings/UsageTab.tsx@@ -1,10 +1,16 @@"use client";+import { DateTime } from "luxon";import { useExtracted } from "next-intl";-import { ReactNode } from "react";+import { ReactNode, useState } from "react";+import { EventCountRow } from "@/api/admin/endpoints/adminServiceEventCount";import { useGetSiteUsage } from "@/api/admin/hooks/useSites";+import { SiteEventCountPoint } from "@/api/analytics/endpoints";+import { useGetSiteEventCount } from "@/api/analytics/hooks/useGetSiteEventCount";+import { EventUsageChart } from "@/components/EventUsageChart";import { Skeleton } from "@/components/ui/skeleton";+import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";import { cn } from "@/lib/utils";import { SettingsSection, SettingsSections } from "./SettingsSection";@@ -13,6 +19,62 @@ interface UsageTabProps {siteId: number;}+const PERIODS = [+ { value: "7", label: "7D" },+ { value: "14", label: "14D" },+ { value: "30", label: "30D" },+ { value: "60", label: "60D" },+ { value: "all", label: "All" },+] as const;++type PeriodValue = (typeof PERIODS)[number]["value"];++function getPeriodDates(period: PeriodValue): { startDate?: string; endDate?: string } {+ if (period === "all") return {};+ const end = DateTime.now().toFormat("yyyy-MM-dd");+ const start = DateTime.now().minus({ days: Number(period) }).toFormat("yyyy-MM-dd");+ return { startDate: start, endDate: end };+}++const EMPTY_COUNTS = {+ pageview_count: 0,+ custom_event_count: 0,+ performance_count: 0,+ outbound_count: 0,+ error_count: 0,+ button_click_count: 0,+ copy_count: 0,+ form_submit_count: 0,+ input_change_count: 0,+ event_count: 0,+};++/**+ * The events/count endpoint omits days with no events; fill the gaps with+ * zero rows so the chart dips to zero instead of interpolating across them.+ */+function toEventCountRows(+ points: SiteEventCountPoint[] | undefined,+ startDate?: string,+ endDate?: string+): EventCountRow[] | undefined {+ if (!points) return undefined;+ const rows = points.map(({ time, ...counts }) => ({ event_date: time, ...counts }));+ if (!startDate || !endDate) return rows;++ const byDate = new Map(rows.map(r => [r.event_date.slice(0, 10), r]));+ const filled: EventCountRow[] = [];+ for (+ let day = DateTime.fromISO(startDate), end = DateTime.fromISO(endDate);+ day <= end;+ day = day.plus({ days: 1 })+ ) {+ const key = day.toFormat("yyyy-MM-dd");+ filled.push(byDate.get(key) ?? { event_date: `${key} 00:00:00`, ...EMPTY_COUNTS });+ }+ return filled;+}+function formatPercent(value: number): string {if (value === 0) {return "0";@@ -29,10 +91,17 @@ interface UsageStatProps {caption?: ReactNode;/** 0-100 fill for the bottom bar; omit to hide the bar */percent?: number;- exceeded?: boolean;+ /** color the bar by proximity to a hard limit: amber past 80%, red at 100% */+ isLimit?: boolean;}-function UsageStat({ label, value, caption, percent, exceeded }: UsageStatProps) {+function UsageStat({ label, value, caption, percent, isLimit }: UsageStatProps) {+ const barColor =+ isLimit && percent !== undefined && percent >= 100+ ? "bg-red-500"+ : isLimit && percent !== undefined && percent > 80+ ? "bg-amber-500"+ : "bg-accent-400/75";return (<div className="relative overflow-hidden rounded-lg border border-neutral-150 p-3 pb-4 dark:border-neutral-800"><div className="text-xs text-muted-foreground">{label}</div>@@ -40,10 +109,7 @@ function UsageStat({ label, value, caption, percent, exceeded }: UsageStatProps){caption && <div className="mt-0.5 text-xs text-muted-foreground">{caption}</div>}{percent !== undefined && (<div className="absolute bottom-0 left-0 h-1 w-full bg-neutral-100 dark:bg-neutral-800">- <div- className={cn("h-1", exceeded ? "bg-red-500" : "bg-accent-400/75")}- style={{ width: `${Math.min(percent, 100)}%` }}- />+ <div className={cn("h-1", barColor)} style={{ width: `${Math.min(percent, 100)}%` }} /></div>)}</div>@@ -54,19 +120,37 @@ export function UsageTab({ siteId }: UsageTabProps) {const t = useExtracted();const { data: usage, isLoading, error } = useGetSiteUsage(siteId);+ const [period, setPeriod] = useState<PeriodValue>("30");+ const { startDate, endDate } = getPeriodDates(period);+ const {+ data: eventCounts,+ isLoading: chartLoading,+ error: chartError,+ } = useGetSiteEventCount({ siteId, startDate, endDate });++ const dayOfMonth = usage ? Math.min(Math.floor(usage.daysElapsed) + 1, usage.daysInMonth) : null;+return (<SettingsSections>- <SettingsSection description={t("Usage resets at the start of each calendar month.")}>- {isLoading || !usage ? (- error ? (- <p className="text-sm text-red-600 dark:text-red-400">{t("Failed to load usage")}</p>- ) : (- <div className="grid gap-3 sm:grid-cols-3">- <Skeleton className="h-[92px] rounded-lg" />- <Skeleton className="h-[92px] rounded-lg" />- <Skeleton className="h-[92px] rounded-lg" />- </div>+ <SettingsSection+ title={t("This Month")}+ description={t("Usage resets at the start of each calendar month.")}+ action={+ dayOfMonth !== null && (+ <span className="text-xs text-muted-foreground tabular-nums">+ {t("Day {day} of {total}", { day: String(dayOfMonth), total: String(usage!.daysInMonth) })}+ </span>)+ }+ >+ {error ? (+ <p className="text-sm text-red-600 dark:text-red-400">{t("Failed to load usage")}</p>+ ) : isLoading || !usage ? (+ <div className="grid gap-3 sm:grid-cols-3">+ <Skeleton className="h-[92px] rounded-lg" />+ <Skeleton className="h-[92px] rounded-lg" />+ <Skeleton className="h-[92px] rounded-lg" />+ </div>) : (<div className="grid gap-3 sm:grid-cols-3"><UsageStat@@ -91,7 +175,7 @@ export function UsageTab({ siteId }: UsageTabProps) {? (usage.orgEventsThisMonth / usage.orgEventLimit) * 100: undefined}- exceeded={usage.orgEventLimit !== null && usage.orgEventsThisMonth >= usage.orgEventLimit}+ isLimit/><UsageStatlabel={t("Projected by month end")}@@ -110,15 +194,33 @@ export function UsageTab({ siteId }: UsageTabProps) {? (usage.projectedSiteEvents / usage.orgEventLimit) * 100: undefined}- exceeded={- usage.projectedSiteEvents !== null &&- usage.orgEventLimit !== null &&- usage.projectedSiteEvents >= usage.orgEventLimit- }+ isLimit/></div>)}</SettingsSection>++ <SettingsSection+ title={t("Daily Events")}+ action={+ <Tabs value={period} onValueChange={v => setPeriod(v as PeriodValue)}>+ <TabsList className="h-7">+ {PERIODS.map(p => (+ <TabsTrigger key={p.value} value={p.value} className="text-xs px-2 py-0.5">+ {p.value === "all" ? t("All") : p.label}+ </TabsTrigger>+ ))}+ </TabsList>+ </Tabs>+ }+ >+ <EventUsageChart+ data={toEventCountRows(eventCounts, startDate, endDate)}+ isLoading={chartLoading}+ error={chartError}+ maxTickCount={6}+ />+ </SettingsSection></SettingsSections>);}