🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
wip
Bill Yang7d3fca409322
diff --git a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsxindex 271653c63..39ca6fa45 100644--- a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx+++ b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx@@ -3,7 +3,9 @@ import { X } from "lucide-react";import {Filter,FilterParameter,+ FilterType,removeFilter,+ updateFilter,useStore,} from "../../../../../lib/store";import { NewFilterButton } from "./NewFilterButton";@@ -21,7 +23,7 @@ function getParameterNameLabel(parameter: FilterParameter) {case "referrer":return "Referrer";case "pathname":- return "Pathname";+ return "Page";case "page_title":return "Page Title";case "querystring":@@ -31,6 +33,19 @@ function getParameterNameLabel(parameter: FilterParameter) {}}+const filterTypeToLabel = (type: FilterType) => {+ switch (type) {+ case "equals":+ return "is";+ case "not_equals":+ return "is not";+ case "contains":+ return "contains";+ case "not_contains":+ return "not contains";+ }+};+function getParameterValueLabel(filter: Filter) {switch (filter.parameter) {case "country":@@ -48,7 +63,7 @@ export function Filters() {return (<div className="flex gap-2"><NewFilterButton />- {filters?.map((filter) => (+ {filters?.map((filter, i) => (<divkey={filter.parameter}className="px-2 py-1 rounded-md bg-neutral-850 text-neutral-400 flex items-center gap-1 text-sm"@@ -56,7 +71,29 @@ export function Filters() {<div className="text-neutral-300">{getParameterNameLabel(filter.parameter)}</div>- <div className="text-emerald-400 font-medium">is</div>+ <div+ className={`text-emerald-400 font-medium cursor-pointer ${+ filter.type === "not_equals" || filter.type === "not_contains"+ ? "text-red-400"+ : ""+ }`}+ onClick={() => {+ let newType: FilterType = "equals";+ if (filter.type === "equals") {+ newType = "not_equals";+ } else if (filter.type === "not_equals") {+ newType = "contains";+ } else if (filter.type === "contains") {+ newType = "not_contains";+ } else if (filter.type === "not_contains") {+ newType = "equals";+ }++ updateFilter({ ...filter, type: newType }, i);+ }}+ >+ {filterTypeToLabel(filter.type)}+ </div><div className="text-neutral-100 font-medium">{getParameterValueLabel(filter)}</div>diff --git a/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx b/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsxindex 6d14279f0..6a26a2824 100644--- a/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx+++ b/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx@@ -37,7 +37,7 @@ interface ValueFilterProps {}export function ValueFilter({ parameter, type, onComplete }: ValueFilterProps) {- const { data, isLoading } = useSingleCol(parameter, 1000);+ const { data, isLoading } = useSingleCol({ parameter, limit: 1000 });const [open, setOpen] = useState(false);@@ -93,7 +93,6 @@ export function ValueFilter({ parameter, type, onComplete }: ValueFilterProps) {className="min-w-[200px] justify-between text-left font-normal">{value || "Select value..."}-<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" /></Button></PopoverTrigger>diff --git a/client/src/app/[site]/components/sections/Browsers/Browsers.tsx b/client/src/app/[site]/components/sections/Browsers/Browsers.tsxindex c90c3c68b..5812a2582 100644--- a/client/src/app/[site]/components/sections/Browsers/Browsers.tsx+++ b/client/src/app/[site]/components/sections/Browsers/Browsers.tsx@@ -54,7 +54,7 @@ const BROWSER_TO_LOGO: Record<string, string> = {};export function Browsers() {- const { data, isLoading } = useSingleCol("browser");+ const { data, isLoading } = useSingleCol({ parameter: "browser" });return (<StandardCarddiff --git a/client/src/app/[site]/components/sections/Countries/Countries.tsx b/client/src/app/[site]/components/sections/Countries/Countries.tsxindex cca3a409e..31fb0b310 100644--- a/client/src/app/[site]/components/sections/Countries/Countries.tsx+++ b/client/src/app/[site]/components/sections/Countries/Countries.tsx@@ -7,7 +7,7 @@ import React from "react";import { StandardCard } from "../../shared/StandardCard";export function Countries() {- const { data, isLoading } = useSingleCol("country");+ const { data, isLoading } = useSingleCol({ parameter: "country" });return (<StandardCarddiff --git a/client/src/app/[site]/components/sections/Devices/Devices.tsx b/client/src/app/[site]/components/sections/Devices/Devices.tsxindex f918c1e40..8197a4cb6 100644--- a/client/src/app/[site]/components/sections/Devices/Devices.tsx+++ b/client/src/app/[site]/components/sections/Devices/Devices.tsx@@ -4,7 +4,7 @@ import { useSingleCol } from "@/hooks/api";import { StandardCard } from "../../shared/StandardCard";export function Devices() {- const { data, isLoading } = useSingleCol("device_type");+ const { data, isLoading } = useSingleCol({ parameter: "device_type" });return (<StandardCardfilterParameter="device_type"diff --git a/client/src/app/[site]/components/sections/Map/Chloropleth.tsx b/client/src/app/[site]/components/sections/Map/Chloropleth.tsxindex 9e22e40b7..b03b2ee9a 100644--- a/client/src/app/[site]/components/sections/Map/Chloropleth.tsx+++ b/client/src/app/[site]/components/sections/Map/Chloropleth.tsx@@ -30,7 +30,7 @@ const GeoJSON = dynamic();export function Chloropleth() {- const { data, isLoading } = useSingleCol("country");+ const { data, isLoading } = useSingleCol({ parameter: "country" });const [geoJson, setGeoJson] = useState<FeatureCollection | null>(null);useEffect(() => {diff --git a/client/src/app/[site]/components/sections/Map/Map.tsx b/client/src/app/[site]/components/sections/Map/Map.tsxindex 488f083cb..fb45b7e5e 100644--- a/client/src/app/[site]/components/sections/Map/Map.tsx+++ b/client/src/app/[site]/components/sections/Map/Map.tsx@@ -34,7 +34,7 @@ interface TooltipData {}export function Map() {- const { data, isLoading } = useSingleCol("country");+ const { data, isLoading } = useSingleCol({ parameter: "country" });const [tooltipData, setTooltipData] = useState<TooltipData | null>(null);const colorScale = useMemo(() => {diff --git a/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsx b/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsxindex 0955d2742..ec33f8696 100644--- a/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsx+++ b/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsx@@ -21,7 +21,7 @@ const OS_TO_LOGO: Record<string, string> = {};export function OperatingSystems() {- const { data, isLoading } = useSingleCol("operating_system");+ const { data, isLoading } = useSingleCol({ parameter: "operating_system" });return (<StandardCarddiff --git a/client/src/app/[site]/components/sections/Pages/Pages.tsx b/client/src/app/[site]/components/sections/Pages/Pages.tsxindex 771d7c098..fcced0a6f 100644--- a/client/src/app/[site]/components/sections/Pages/Pages.tsx+++ b/client/src/app/[site]/components/sections/Pages/Pages.tsx@@ -4,7 +4,7 @@ import { useSingleCol } from "@/hooks/api";import { StandardCard } from "../../shared/StandardCard";export function Pages() {- const { data, isLoading } = useSingleCol("pathname");+ const { data, isLoading } = useSingleCol({ parameter: "pathname" });return (<StandardCarddiff --git a/client/src/app/[site]/components/sections/Referrers/Referrers.tsx b/client/src/app/[site]/components/sections/Referrers/Referrers.tsxindex 5560cda97..d622af96d 100644--- a/client/src/app/[site]/components/sections/Referrers/Referrers.tsx+++ b/client/src/app/[site]/components/sections/Referrers/Referrers.tsx@@ -4,7 +4,7 @@ import { useSingleCol } from "@/hooks/api";import { StandardCard } from "../../shared/StandardCard";export function Referrers() {- const { data, isLoading } = useSingleCol("referrer");+ const { data, isLoading } = useSingleCol({ parameter: "referrer" });return (<StandardCardfilterParameter="referrer"diff --git a/client/src/hooks/api.ts b/client/src/hooks/api.tsindex b9423998e..f12b449dc 100644--- a/client/src/hooks/api.ts+++ b/client/src/hooks/api.ts@@ -21,11 +21,15 @@ export function useGetLiveUsercount() {type PeriodTime = "current" | "previous";-export function useSingleCol(- parameter: FilterParameter,- limit?: number,- periodTime?: PeriodTime-): UseQueryResult<+export function useSingleCol({+ parameter,+ limit = 10000,+ periodTime,+}: {+ parameter: FilterParameter;+ limit?: number;+ periodTime?: PeriodTime;+}): UseQueryResult<APIResponse<{ value: string; count: number; percentage: number }[]>> {const { time, previousTime, site, filters } = useStore();diff --git a/client/src/lib/store.ts b/client/src/lib/store.tsindex f6808878f..d8e64ca5b 100644--- a/client/src/lib/store.ts+++ b/client/src/lib/store.ts@@ -317,3 +317,8 @@ export const removeFilter = (filter: Filter) => {const { filters, setFilters } = useStore.getState();setFilters(filters.filter((f) => f !== filter));};++export const updateFilter = (filter: Filter, index: number) => {+ const { filters, setFilters } = useStore.getState();+ setFilters(filters.map((f, i) => (i === index ? filter : f)));+};