Skip to content

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

add filter button and improve api logic

Bill Yangfade684e24c8
diff --git a/client/package-lock.json b/client/package-lock.json
index 0e3635c63..01518d715 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -28,6 +28,7 @@
"better-auth": "^1.1.16",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
+ "cmdk": "^1.0.0",
"countries-list": "^3.1.1",
"country-flag-icons": "^1.5.14",
"date-fns": "^4.1.0",
@@ -77,6 +78,17 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/@babel/runtime": {
+ "version": "7.26.9",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.9.tgz",
+ "integrity": "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==",
+ "dependencies": {
+ "regenerator-runtime": "^0.14.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
"node_modules/@better-auth/utils": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/@better-auth/utils/-/utils-0.2.3.tgz",
@@ -3656,6 +3668,366 @@
"node": ">=6"
}
},
+ "node_modules/cmdk": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.0.0.tgz",
+ "integrity": "sha512-gDzVf0a09TvoJ5jnuPvygTB77+XdOSwEmJ88L6XPFPlv7T3RxbP9jgenfylrAMD0+Le1aO0nVjQUzl2g+vjz5Q==",
+ "dependencies": {
+ "@radix-ui/react-dialog": "1.0.5",
+ "@radix-ui/react-primitive": "1.0.3"
+ },
+ "peerDependencies": {
+ "react": "^18.0.0",
+ "react-dom": "^18.0.0"
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/primitive": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.0.1.tgz",
+ "integrity": "sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10"
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-compose-refs": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz",
+ "integrity": "sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-context": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.0.1.tgz",
+ "integrity": "sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-dialog": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.0.5.tgz",
+ "integrity": "sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10",
+ "@radix-ui/primitive": "1.0.1",
+ "@radix-ui/react-compose-refs": "1.0.1",
+ "@radix-ui/react-context": "1.0.1",
+ "@radix-ui/react-dismissable-layer": "1.0.5",
+ "@radix-ui/react-focus-guards": "1.0.1",
+ "@radix-ui/react-focus-scope": "1.0.4",
+ "@radix-ui/react-id": "1.0.1",
+ "@radix-ui/react-portal": "1.0.4",
+ "@radix-ui/react-presence": "1.0.1",
+ "@radix-ui/react-primitive": "1.0.3",
+ "@radix-ui/react-slot": "1.0.2",
+ "@radix-ui/react-use-controllable-state": "1.0.1",
+ "aria-hidden": "^1.1.1",
+ "react-remove-scroll": "2.5.5"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "@types/react-dom": "*",
+ "react": "^16.8 || ^17.0 || ^18.0",
+ "react-dom": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "@types/react-dom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-dismissable-layer": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.5.tgz",
+ "integrity": "sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10",
+ "@radix-ui/primitive": "1.0.1",
+ "@radix-ui/react-compose-refs": "1.0.1",
+ "@radix-ui/react-primitive": "1.0.3",
+ "@radix-ui/react-use-callback-ref": "1.0.1",
+ "@radix-ui/react-use-escape-keydown": "1.0.3"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "@types/react-dom": "*",
+ "react": "^16.8 || ^17.0 || ^18.0",
+ "react-dom": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "@types/react-dom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-focus-guards": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.1.tgz",
+ "integrity": "sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-focus-scope": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.4.tgz",
+ "integrity": "sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10",
+ "@radix-ui/react-compose-refs": "1.0.1",
+ "@radix-ui/react-primitive": "1.0.3",
+ "@radix-ui/react-use-callback-ref": "1.0.1"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "@types/react-dom": "*",
+ "react": "^16.8 || ^17.0 || ^18.0",
+ "react-dom": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "@types/react-dom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-id": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.1.tgz",
+ "integrity": "sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10",
+ "@radix-ui/react-use-layout-effect": "1.0.1"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-portal": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.4.tgz",
+ "integrity": "sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10",
+ "@radix-ui/react-primitive": "1.0.3"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "@types/react-dom": "*",
+ "react": "^16.8 || ^17.0 || ^18.0",
+ "react-dom": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "@types/react-dom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-presence": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.0.1.tgz",
+ "integrity": "sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10",
+ "@radix-ui/react-compose-refs": "1.0.1",
+ "@radix-ui/react-use-layout-effect": "1.0.1"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "@types/react-dom": "*",
+ "react": "^16.8 || ^17.0 || ^18.0",
+ "react-dom": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "@types/react-dom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-primitive": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.3.tgz",
+ "integrity": "sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10",
+ "@radix-ui/react-slot": "1.0.2"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "@types/react-dom": "*",
+ "react": "^16.8 || ^17.0 || ^18.0",
+ "react-dom": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ },
+ "@types/react-dom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-slot": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
+ "integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10",
+ "@radix-ui/react-compose-refs": "1.0.1"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-use-callback-ref": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.1.tgz",
+ "integrity": "sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-use-controllable-state": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.1.tgz",
+ "integrity": "sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10",
+ "@radix-ui/react-use-callback-ref": "1.0.1"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-use-escape-keydown": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.3.tgz",
+ "integrity": "sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10",
+ "@radix-ui/react-use-callback-ref": "1.0.1"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/@radix-ui/react-use-layout-effect": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.1.tgz",
+ "integrity": "sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==",
+ "dependencies": {
+ "@babel/runtime": "^7.13.10"
+ },
+ "peerDependencies": {
+ "@types/react": "*",
+ "react": "^16.8 || ^17.0 || ^18.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/cmdk/node_modules/react-remove-scroll": {
+ "version": "2.5.5",
+ "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",
+ "integrity": "sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==",
+ "dependencies": {
+ "react-remove-scroll-bar": "^2.3.3",
+ "react-style-singleton": "^2.2.1",
+ "tslib": "^2.1.0",
+ "use-callback-ref": "^1.3.0",
+ "use-sidecar": "^1.1.2"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "peerDependencies": {
+ "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+ "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
"node_modules/color": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
@@ -5196,6 +5568,11 @@
"node": ">=8.10.0"
}
},
+ "node_modules/regenerator-runtime": {
+ "version": "0.14.1",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+ "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+ },
"node_modules/resolve": {
"version": "1.22.10",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
diff --git a/client/package.json b/client/package.json
index aee69a3db..0b2f763d5 100644
--- a/client/package.json
+++ b/client/package.json
@@ -29,6 +29,7 @@
"better-auth": "^1.1.16",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
+ "cmdk": "^1.0.0",
"countries-list": "^3.1.1",
"country-flag-icons": "^1.5.14",
"date-fns": "^4.1.0",
diff --git a/client/src/app/[site]/components/Header/Header.tsx b/client/src/app/[site]/components/Header/Header.tsx
index a5fff031e..103c5ed38 100644
--- a/client/src/app/[site]/components/Header/Header.tsx
+++ b/client/src/app/[site]/components/Header/Header.tsx
@@ -1,15 +1,10 @@
"use client";
import { Circle } from "@phosphor-icons/react";
-import { useQuery } from "@tanstack/react-query";
-import { Button } from "@/components/ui/button";
-import { goBack, goForward, Time, useStore } from "@/lib/store";
-import { ChevronLeft, ChevronRight } from "lucide-react";
-import { DateSelector } from "./DateSelector";
+import { Time, useStore } from "@/lib/store";
import { DateTime } from "luxon";
-import { authedFetch } from "@/hooks/utils";
-import { useGetLiveUsercount, useGetSites } from "../../../../hooks/api";
import { usePathname } from "next/navigation";
+import { useGetLiveUsercount, useGetSites } from "../../../../hooks/api";
const canGoForward = (time: Time) => {
const currentDay = DateTime.now().startOf("day");
@@ -61,22 +56,6 @@ export function Header() {
{data?.count} users online
</div>
</div>
- <div className="flex items-center gap-2">
- <DateSelector />
- <div className="flex items-center">
- <Button variant="default" size="icon" onClick={goBack}>
- <ChevronLeft />
- </Button>
- <Button
- variant="default"
- size="icon"
- onClick={goForward}
- disabled={!canGoForward(time)}
- >
- <ChevronRight />
- </Button>
- </div>
- </div>
</div>
);
}
diff --git a/client/src/app/[site]/components/Header/CustomDateRangePicker.tsx b/client/src/app/[site]/components/SubHeader/CustomDateRangePicker.tsx
similarity index 92%
rename from client/src/app/[site]/components/Header/CustomDateRangePicker.tsx
rename to client/src/app/[site]/components/SubHeader/CustomDateRangePicker.tsx
index 501063ed4..9606986dc 100644
--- a/client/src/app/[site]/components/Header/CustomDateRangePicker.tsx
+++ b/client/src/app/[site]/components/SubHeader/CustomDateRangePicker.tsx
@@ -1,7 +1,5 @@
"use client";
-import { format } from "date-fns";
-import { CalendarIcon } from "lucide-react";
import * as React from "react";
import { DateRange } from "react-day-picker";
@@ -33,7 +31,7 @@ export function CustomDateRangePicker({
Custom Range
</Button>
</PopoverTrigger>
- <PopoverContent className="w-auto p-0 " align="start">
+ <PopoverContent className="w-auto p-0" align="start">
<Calendar
initialFocus
mode="range"
diff --git a/client/src/app/[site]/components/Header/DateSelector.tsx b/client/src/app/[site]/components/SubHeader/DateSelector.tsx
similarity index 100%
rename from client/src/app/[site]/components/Header/DateSelector.tsx
rename to client/src/app/[site]/components/SubHeader/DateSelector.tsx
diff --git a/client/src/app/[site]/components/Filters/Filters.tsx b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
similarity index 91%
rename from client/src/app/[site]/components/Filters/Filters.tsx
rename to client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
index d6d8510e8..db287ade4 100644
--- a/client/src/app/[site]/components/Filters/Filters.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
@@ -1,11 +1,12 @@
+import { countries } from "countries-list";
import { X } from "lucide-react";
import {
Filter,
FilterParameter,
removeFilter,
useStore,
-} from "../../../../lib/store";
-import { countries } from "countries-list";
+} from "../../../../../lib/store";
+import { NewFilterButton } from "./NewFilterButton";
function getParameterNameLabel(parameter: FilterParameter) {
switch (parameter) {
@@ -49,11 +50,11 @@ function getParameterValueLabel(filter: Filter) {
export function Filters() {
const { filters } = useStore();
- if (filters.length === 0) return null;
return (
- <div className="flex gap-2 mb-3">
- {filters.map((filter) => (
+ <div className="flex gap-2">
+ <NewFilterButton />
+ {filters?.map((filter) => (
<div
key={filter.parameter}
className="px-2 py-1 rounded-md bg-neutral-850 text-neutral-400 flex items-center gap-1 text-sm"
diff --git a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
new file mode 100644
index 000000000..a27bca44f
--- /dev/null
+++ b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
@@ -0,0 +1,139 @@
+"use client";
+import { Plus } from "lucide-react";
+import { Button } from "../../../../../components/ui/button";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from "../../../../../components/ui/dropdown-menu";
+import { FilterParameter, FilterType } from "../../../../../lib/store";
+import { useState } from "react";
+import { sleep } from "../../../../../lib/utils";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "../../../../../components/ui/select";
+import { ValueFilter } from "./ValueFilter";
+
+const FilterOptions: { label: string; value: FilterParameter }[] = [
+ {
+ label: "Path",
+ value: "pathname",
+ },
+ {
+ label: "Query",
+ value: "query",
+ },
+ {
+ label: "Region",
+ value: "region",
+ },
+ {
+ label: "City",
+ value: "city",
+ },
+ {
+ label: "Country",
+ value: "country",
+ },
+ {
+ label: "Device Type",
+ value: "device_type",
+ },
+ {
+ label: "Operating System",
+ value: "operating_system",
+ },
+ {
+ label: "Browser",
+ value: "browser",
+ },
+ {
+ label: "Referrer",
+ value: "referrer",
+ },
+];
+
+export function NewFilterButton() {
+ const [selectedFilter, setSelectedFilter] = useState<{
+ label: string;
+ value: FilterParameter;
+ } | null>(null);
+
+ const [selectedOperator, setSelectedOperator] =
+ useState<FilterType>("equals");
+
+ const [open, setOpen] = useState(false);
+
+ return (
+ <DropdownMenu
+ onOpenChange={async (isOpen) => {
+ if (!isOpen) {
+ setOpen(false);
+ await sleep(100);
+ setSelectedFilter(null);
+ setSelectedOperator("equals");
+ }
+ }}
+ open={open}
+ >
+ <DropdownMenuTrigger asChild>
+ <Button
+ variant="default"
+ className="px-3"
+ onClick={() => setOpen(true)}
+ >
+ <Plus />
+ Filter
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="start">
+ {selectedFilter ? (
+ <div className="flex flex-col gap-2 p-2">
+ <div>{selectedFilter.label}</div>
+ <div className="flex items-center gap-2 text-sm">
+ <Select
+ onValueChange={(value) =>
+ setSelectedOperator(value as FilterType)
+ }
+ value={selectedOperator}
+ >
+ <SelectTrigger>
+ <SelectValue placeholder="Select" />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="equals">Is</SelectItem>
+ <SelectItem value="not_equals">Is not</SelectItem>
+ <SelectItem value="contains">Contains</SelectItem>
+ <SelectItem value="not_contains">Not contains</SelectItem>
+ </SelectContent>
+ </Select>
+
+ <ValueFilter
+ parameter={selectedFilter.value}
+ type={selectedOperator}
+ onComplete={() => setOpen(false)}
+ />
+ </div>
+ </div>
+ ) : (
+ FilterOptions.map((option) => (
+ <DropdownMenuItem
+ key={option.value}
+ onClick={(e) => {
+ e.preventDefault();
+ setSelectedFilter(option);
+ }}
+ >
+ {option.label}
+ </DropdownMenuItem>
+ ))
+ )}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ );
+}
diff --git a/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx b/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx
new file mode 100644
index 000000000..f213ad6c7
--- /dev/null
+++ b/client/src/app/[site]/components/SubHeader/Filters/ValueFilter.tsx
@@ -0,0 +1,177 @@
+"use client";
+
+import { useState, useEffect } from "react";
+
+import { Button } from "../../../../../components/ui/button";
+
+import { Check, ChevronsUpDown, Plus, X } from "lucide-react";
+
+import { cn } from "../../../../../lib/utils";
+
+import {
+ Command,
+ CommandEmpty,
+ CommandGroup,
+ CommandInput,
+ CommandItem,
+ CommandList,
+} from "../../../../../components/ui/command";
+
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from "../../../../../components/ui/popover";
+
+import { FilterParameter, addFilter } from "../../../../../lib/store";
+
+import { useRouter } from "next/navigation";
+
+interface ValueFilterProps {
+ parameter?: FilterParameter;
+
+ type?: "equals" | "not_equals" | "contains" | "not_contains";
+
+ onComplete?: () => void;
+}
+
+export function ValueFilter({ parameter, type, onComplete }: ValueFilterProps) {
+ const [open, setOpen] = useState(false);
+
+ const [value, setValue] = useState("");
+
+ const [suggestions, setSuggestions] = useState<string[]>([]);
+
+ const router = useRouter();
+
+ // This would be replaced with actual data fetching based on the parameter
+
+ useEffect(() => {
+ // Mock suggestions based on parameter type
+
+ if (parameter) {
+ // In a real implementation, these would come from an API call based on the parameter
+
+ const mockSuggestions: Record<FilterParameter, string[]> = {
+ pathname: ["/", "/about", "/pricing", "/contact", "/blog"],
+
+ query: ["utm_source=google", "ref=homepage", "campaign=spring"],
+
+ region: ["California", "New York", "Texas", "Florida"],
+
+ city: ["San Francisco", "New York", "Austin", "Miami"],
+
+ country: [
+ "United States",
+ "United Kingdom",
+ "Canada",
+ "Germany",
+ "Japan",
+ ],
+
+ device_type: ["desktop", "mobile", "tablet"],
+
+ operating_system: ["Windows", "macOS", "iOS", "Android", "Linux"],
+
+ browser: ["Chrome", "Safari", "Firefox", "Edge"],
+
+ referrer: ["google.com", "facebook.com", "twitter.com", "direct"],
+ };
+
+ setSuggestions(mockSuggestions[parameter] || []);
+ }
+ }, [parameter]);
+
+ const handleSelect = (currentValue: string) => {
+ setValue(currentValue);
+
+ setOpen(false);
+ };
+
+ const handleApply = () => {
+ if (parameter && type && value.trim()) {
+ // Add the filter using the store function
+
+ addFilter({
+ parameter,
+
+ type,
+
+ value: value.trim(),
+ });
+
+ // Reset the component
+
+ setValue("");
+
+ // Call the onComplete callback (if provided)
+
+ if (onComplete) {
+ onComplete();
+ }
+
+ // Refresh the page to apply the filter
+
+ router.refresh();
+ }
+ };
+
+ return (
+ <div className="flex items-center gap-2">
+ <Popover open={open} onOpenChange={setOpen}>
+ <PopoverTrigger asChild>
+ <Button
+ variant="outline"
+ role="combobox"
+ aria-expanded={open}
+ 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>
+
+ <PopoverContent className="w-[200px] p-0">
+ <Command>
+ <CommandInput
+ placeholder="Search values..."
+ value={value}
+ onValueChange={setValue}
+ className="h-9"
+ />
+
+ <CommandList>
+ <CommandEmpty>No matching results</CommandEmpty>
+
+ <CommandGroup>
+ {suggestions.map((suggestion) => (
+ <CommandItem
+ key={suggestion}
+ value={suggestion}
+ onSelect={handleSelect}
+ >
+ <Check
+ className={cn(
+ "mr-2 h-4 w-4",
+
+ value === suggestion ? "opacity-100" : "opacity-0"
+ )}
+ />
+
+ {suggestion}
+ </CommandItem>
+ ))}
+ </CommandGroup>
+ </CommandList>
+ </Command>
+ </PopoverContent>
+ </Popover>
+
+ <Button size="sm" onClick={handleApply}>
+ <Plus className="h-4 w-4 mr-1" />
+ Add
+ </Button>
+ </div>
+ );
+}
diff --git a/client/src/app/[site]/components/SubHeader/SubHeader.tsx b/client/src/app/[site]/components/SubHeader/SubHeader.tsx
new file mode 100644
index 000000000..9ce29c4e2
--- /dev/null
+++ b/client/src/app/[site]/components/SubHeader/SubHeader.tsx
@@ -0,0 +1,68 @@
+"use client";
+import { Filters } from "./Filters/Filters";
+
+import { Button } from "@/components/ui/button";
+import { goBack, goForward, Time, useStore } from "@/lib/store";
+import { ChevronLeft, ChevronRight } from "lucide-react";
+import { DateTime } from "luxon";
+
+import { usePathname } from "next/navigation";
+import { useGetSites } from "../../../../hooks/api";
+import { DateSelector } from "./DateSelector";
+
+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() {
+ const { time } = useStore();
+ const { data: sites } = useGetSites();
+ const pathname = usePathname();
+
+ const site = sites?.data?.find(
+ (site) => site.site_id === Number(pathname.slice(1))
+ );
+
+ return (
+ <div className="flex gap-2 mb-3 mt-1 justify-between">
+ <Filters />
+ <div className="flex items-center gap-2">
+ <DateSelector />
+ <div className="flex items-center">
+ <Button variant="default" size="icon" onClick={goBack}>
+ <ChevronLeft />
+ </Button>
+ <Button
+ variant="default"
+ size="icon"
+ onClick={goForward}
+ disabled={!canGoForward(time)}
+ >
+ <ChevronRight />
+ </Button>
+ </div>
+ </div>
+ </div>
+ );
+}
diff --git a/client/src/app/[site]/components/sections/Browsers/Browsers.tsx b/client/src/app/[site]/components/sections/Browsers/Browsers.tsx
index 3e13339f0..c90c3c68b 100644
--- a/client/src/app/[site]/components/sections/Browsers/Browsers.tsx
+++ b/client/src/app/[site]/components/sections/Browsers/Browsers.tsx
@@ -1,9 +1,9 @@
"use client";
+import { useSingleCol } from "@/hooks/api";
import { Compass } from "lucide-react";
import Image from "next/image";
import { StandardCard } from "../../shared/StandardCard";
-import { useGetBrowsers } from "@/hooks/api";
const BROWSER_TO_LOGO: Record<string, string> = {
Chrome: "Chrome.svg",
@@ -54,20 +54,20 @@ const BROWSER_TO_LOGO: Record<string, string> = {
};
export function Browsers() {
- const { data, isLoading } = useGetBrowsers();
+ const { data, isLoading } = useSingleCol("browser");
return (
<StandardCard
title="Browsers"
data={data}
isLoading={isLoading}
- getKey={(e) => e.browser}
+ getKey={(e) => e.value}
getLabel={(e) => (
<div className="flex gap-2 items-center">
- {BROWSER_TO_LOGO[e.browser] ? (
+ {BROWSER_TO_LOGO[e.value] ? (
<Image
- src={`/browsers/${BROWSER_TO_LOGO[e.browser]}`}
- alt={e.browser || "Other"}
+ src={`/browsers/${BROWSER_TO_LOGO[e.value]}`}
+ alt={e.value || "Other"}
className="w-4 h-4"
width={16}
height={16}
@@ -75,10 +75,10 @@ export function Browsers() {
) : (
<Compass width={16} />
)}
- {e.browser || "Other"}
+ {e.value || "Other"}
</div>
)}
- getValue={(e) => e.browser}
+ getValue={(e) => e.value}
filterParameter="browser"
/>
);
diff --git a/client/src/app/[site]/components/sections/Countries/Countries.tsx b/client/src/app/[site]/components/sections/Countries/Countries.tsx
index f15b782f3..cca3a409e 100644
--- a/client/src/app/[site]/components/sections/Countries/Countries.tsx
+++ b/client/src/app/[site]/components/sections/Countries/Countries.tsx
@@ -1,42 +1,41 @@
"use client";
-import React from "react";
-import { StandardCard } from "../../shared/StandardCard";
+import { useSingleCol } from "@/hooks/api";
import { countries } from "countries-list";
import * as CountryFlags from "country-flag-icons/react/3x2";
-import { useGetCountries } from "@/hooks/api";
+import React from "react";
+import { StandardCard } from "../../shared/StandardCard";
export function Countries() {
- const { data, isLoading } = useGetCountries();
+ const { data, isLoading } = useSingleCol("country");
return (
<StandardCard
title="Countries"
data={data}
isLoading={isLoading}
- getKey={(e) => e.country}
+ getKey={(e) => e.value}
getLabel={(e) => (
<span className="flex items-center gap-2">
- {e.country && countries[e.country as keyof typeof countries] ? (
+ {e.value && countries[e.value as keyof typeof countries] ? (
<>
- {CountryFlags[e.country as keyof typeof CountryFlags]
+ {CountryFlags[e.value as keyof typeof CountryFlags]
? React.createElement(
- CountryFlags[e.country as keyof typeof CountryFlags],
+ CountryFlags[e.value as keyof typeof CountryFlags],
{
- title:
- countries[e.country as keyof typeof countries].name,
+ title: countries[e.value as keyof typeof countries].name,
className: "w-5",
}
)
: null}
- {countries[e.country as keyof typeof countries].name}
+ {countries[e.value as keyof typeof countries].name}
</>
) : (
"Unknown"
)}
</span>
)}
- getValue={(e) => e.country}
+ getValue={(e) => e.value}
filterParameter="country"
/>
);
diff --git a/client/src/app/[site]/components/sections/Devices/Devices.tsx b/client/src/app/[site]/components/sections/Devices/Devices.tsx
index 2652f6a22..f918c1e40 100644
--- a/client/src/app/[site]/components/sections/Devices/Devices.tsx
+++ b/client/src/app/[site]/components/sections/Devices/Devices.tsx
@@ -1,19 +1,19 @@
"use client";
-import { useGetDevices } from "@/hooks/api";
+import { useSingleCol } from "@/hooks/api";
import { StandardCard } from "../../shared/StandardCard";
export function Devices() {
- const { data, isLoading } = useGetDevices();
+ const { data, isLoading } = useSingleCol("device_type");
return (
<StandardCard
filterParameter="device_type"
isLoading={isLoading}
title="Devices"
data={data}
- getValue={(e) => e.device_type}
- getKey={(e) => e.device_type}
- getLabel={(e) => e.device_type || "Other"}
+ getValue={(e) => e.value}
+ getKey={(e) => e.value}
+ getLabel={(e) => e.value || "Other"}
/>
);
}
diff --git a/client/src/app/[site]/components/sections/Map/Chloropleth.tsx b/client/src/app/[site]/components/sections/Map/Chloropleth.tsx
index 2238469c4..9e22e40b7 100644
--- a/client/src/app/[site]/components/sections/Map/Chloropleth.tsx
+++ b/client/src/app/[site]/components/sections/Map/Chloropleth.tsx
@@ -1,12 +1,12 @@
"use client";
+import { useSingleCol } from "@/hooks/api";
+import { scaleLinear } from "d3-scale";
+import { Feature, FeatureCollection } from "geojson";
import { LatLngExpression } from "leaflet";
import "leaflet/dist/leaflet.css";
-import { useEffect, useMemo, useState } from "react";
-import { Feature, FeatureCollection } from "geojson";
-import { scaleLinear } from "d3-scale";
import dynamic from "next/dynamic";
-import { useGetCountries } from "@/hooks/api";
+import { useEffect, useMemo, useState } from "react";
const MapContainer = dynamic(
() => import("react-leaflet").then((mod) => mod.MapContainer),
@@ -30,7 +30,7 @@ const GeoJSON = dynamic(
);
export function Chloropleth() {
- const { data, isLoading } = useGetCountries();
+ const { data, isLoading } = useSingleCol("country");
const [geoJson, setGeoJson] = useState<FeatureCollection | null>(null);
useEffect(() => {
@@ -42,7 +42,7 @@ export function Chloropleth() {
const countryData = useMemo(() => {
if (!data?.data) return new Map();
- return new Map(data.data.map((item) => [item.country, item]));
+ return new Map(data.data.map((item) => [item.value, item]));
}, [data?.data]);
const colorScale = useMemo(() => {
diff --git a/client/src/app/[site]/components/sections/Map/Map.tsx b/client/src/app/[site]/components/sections/Map/Map.tsx
index 7f10e6f66..488f083cb 100644
--- a/client/src/app/[site]/components/sections/Map/Map.tsx
+++ b/client/src/app/[site]/components/sections/Map/Map.tsx
@@ -1,5 +1,14 @@
"use client";
+import {
+ Card,
+ CardContent,
+ CardHeader,
+ CardLoader,
+ CardTitle,
+} from "@/components/ui/card";
+import { countries } from "countries-list";
+import * as CountryFlags from "country-flag-icons/react/3x2";
import { scaleLinear } from "d3-scale";
import { Feature, Geometry } from "geojson";
import { useMemo, useState } from "react";
@@ -10,18 +19,9 @@ import {
Sphere,
ZoomableGroup,
} from "react-simple-maps";
-import {
- Card,
- CardContent,
- CardHeader,
- CardLoader,
- CardTitle,
-} from "@/components/ui/card";
-import { countries } from "countries-list";
-import * as CountryFlags from "country-flag-icons/react/3x2";
+import { useSingleCol } from "@/hooks/api";
import React from "react";
-import { useGetCountries } from "@/hooks/api";
const geoUrl = "/countries.geojson";
@@ -34,7 +34,7 @@ interface TooltipData {
}
export function Map() {
- const { data, isLoading } = useGetCountries();
+ const { data, isLoading } = useSingleCol("country");
const [tooltipData, setTooltipData] = useState<TooltipData | null>(null);
const colorScale = useMemo(() => {
@@ -71,7 +71,7 @@ export function Map() {
}) =>
geographies.map((geo, index) => {
const foundCountry = data?.data?.find(
- ({ country }) => country === geo.properties?.["ISO_A2"]
+ ({ value }) => value === geo.properties?.["ISO_A2"]
);
const count = foundCountry?.count || 0;
const percentage = foundCountry?.percentage || 0;
diff --git a/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsx b/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsx
index 8b3f710a8..0955d2742 100644
--- a/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsx
+++ b/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsx
@@ -3,7 +3,7 @@
import { Compass } from "lucide-react";
import { StandardCard } from "../../shared/StandardCard";
import Image from "next/image";
-import { useGetOperatingSystems } from "@/hooks/api";
+import { useSingleCol } from "@/hooks/api";
const OS_TO_LOGO: Record<string, string> = {
Windows: "Windows.svg",
@@ -21,20 +21,21 @@ const OS_TO_LOGO: Record<string, string> = {
};
export function OperatingSystems() {
- const { data, isLoading } = useGetOperatingSystems();
+ const { data, isLoading } = useSingleCol("operating_system");
+
return (
<StandardCard
title="Operating Systems"
data={data}
isLoading={isLoading}
- getValue={(e) => e.operating_system}
- getKey={(e) => e.operating_system}
+ getValue={(e) => e.value}
+ getKey={(e) => e.value}
getLabel={(e) => (
<div className="flex gap-2 items-center">
- {OS_TO_LOGO[e.operating_system] ? (
+ {OS_TO_LOGO[e.value] ? (
<Image
- src={`/operating-systems/${OS_TO_LOGO[e.operating_system]}`}
- alt={e.operating_system || "Other"}
+ src={`/operating-systems/${OS_TO_LOGO[e.value]}`}
+ alt={e.value || "Other"}
className="w-4 h-4"
width={16}
height={16}
@@ -42,7 +43,7 @@ export function OperatingSystems() {
) : (
<Compass width={16} />
)}
- {e.operating_system || "Other"}
+ {e.value || "Other"}
</div>
)}
filterParameter="operating_system"
diff --git a/client/src/app/[site]/components/sections/Pages/Pages.tsx b/client/src/app/[site]/components/sections/Pages/Pages.tsx
index 8d2e3abad..771d7c098 100644
--- a/client/src/app/[site]/components/sections/Pages/Pages.tsx
+++ b/client/src/app/[site]/components/sections/Pages/Pages.tsx
@@ -1,19 +1,20 @@
"use client";
-import { useGetPages } from "@/hooks/api";
+import { useSingleCol } from "@/hooks/api";
import { StandardCard } from "../../shared/StandardCard";
export function Pages() {
- const { data, isLoading } = useGetPages();
+ const { data, isLoading } = useSingleCol("pathname");
+
return (
<StandardCard
filterParameter="pathname"
title="Pages"
data={data}
isLoading={isLoading}
- getValue={(e) => e.pathname}
- getKey={(e) => e.pathname}
- getLabel={(e) => e.pathname || "Other"}
+ getValue={(e) => e.value}
+ getKey={(e) => e.value}
+ getLabel={(e) => e.value || "Other"}
/>
);
}
diff --git a/client/src/app/[site]/components/sections/Referrers/Referrers.tsx b/client/src/app/[site]/components/sections/Referrers/Referrers.tsx
index e91aa9c09..9da93fa94 100644
--- a/client/src/app/[site]/components/sections/Referrers/Referrers.tsx
+++ b/client/src/app/[site]/components/sections/Referrers/Referrers.tsx
@@ -1,37 +1,37 @@
"use client";
-import { useGetReferrers } from "@/hooks/api";
+import { useSingleCol } from "@/hooks/api";
import { StandardCard } from "../../shared/StandardCard";
export function Referrers() {
- const { data, isLoading } = useGetReferrers();
+ const { data, isLoading } = useSingleCol("referrer");
return (
<StandardCard
filterParameter="referrer"
title="Referrers"
data={data}
- getKey={(e) => e.referrer}
+ getKey={(e) => e.value}
isLoading={isLoading}
getLabel={(e) => (
<div className="flex items-center">
<img
className="w-4 mr-2"
- src={`https://www.google.com/s2/favicons?domain=${e.referrer}&sz=32`}
+ src={`https://www.google.com/s2/favicons?domain=${e.value}&sz=32`}
/>
- {e.referrer ? (
+ {e.value ? (
<a
- href={`https://${e.referrer}`}
+ href={`https://${e.value}`}
target="_blank"
className="hover:underline"
>
- {e.referrer}
+ {e.value}
</a>
) : (
"Direct"
)}
</div>
)}
- getValue={(e) => e.referrer}
+ getValue={(e) => e.value}
/>
);
}
diff --git a/client/src/app/[site]/page.tsx b/client/src/app/[site]/page.tsx
index 6a6945f9d..c2f80a958 100644
--- a/client/src/app/[site]/page.tsx
+++ b/client/src/app/[site]/page.tsx
@@ -13,7 +13,7 @@ import { Map } from "./components/sections/Map/Map";
import { OperatingSystems } from "./components/sections/OperatingSystems/OperatingSystems";
import { Pages } from "./components/sections/Pages/Pages";
import { Referrers } from "./components/sections/Referrers/Referrers";
-import { Filters } from "./components/Filters/Filters";
+import { SubHeader } from "./components/SubHeader/SubHeader";
export default function SitePage() {
const pathname = usePathname();
@@ -49,7 +49,7 @@ function SitePageInner({ site }: { site: string }) {
return (
<>
<Header />
- <Filters />
+ <SubHeader />
<MainSection />
<div className="grid grid-cols-2 gap-4 mt-4">
<OperatingSystems />
diff --git a/client/src/components/ui/command.tsx b/client/src/components/ui/command.tsx
new file mode 100644
index 000000000..b1f96e6a8
--- /dev/null
+++ b/client/src/components/ui/command.tsx
@@ -0,0 +1,156 @@
+"use client";
+
+import * as React from "react";
+import { type DialogProps } from "@radix-ui/react-dialog";
+import { Command as CommandPrimitive } from "cmdk";
+import { Search } from "lucide-react";
+
+import { cn } from "@/lib/utils";
+import { Dialog, DialogContent } from "@/components/ui/dialog";
+
+const Command = React.forwardRef<
+ React.ElementRef<typeof CommandPrimitive>,
+ React.ComponentPropsWithoutRef<typeof CommandPrimitive>
+>(({ className, ...props }, ref) => (
+ <CommandPrimitive
+ ref={ref}
+ className={cn(
+ "flex h-full w-full flex-col overflow-hidden rounded-md bg-white text-neutral-950 dark:bg-neutral-900 dark:text-neutral-50",
+ className
+ )}
+ {...props}
+ />
+));
+Command.displayName = CommandPrimitive.displayName;
+
+const CommandDialog = ({ children, ...props }: DialogProps) => {
+ return (
+ <Dialog {...props}>
+ <DialogContent className="overflow-hidden p-0">
+ <Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-neutral-500 [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5 dark:[&_[cmdk-group-heading]]:text-neutral-400">
+ {children}
+ </Command>
+ </DialogContent>
+ </Dialog>
+ );
+};
+
+const CommandInput = React.forwardRef<
+ React.ElementRef<typeof CommandPrimitive.Input>,
+ React.ComponentPropsWithoutRef<typeof CommandPrimitive.Input>
+>(({ className, ...props }, ref) => (
+ <div
+ className="flex items-center border-b border-neutral-700 px-3"
+ cmdk-input-wrapper=""
+ >
+ <Search className="mr-2 h-4 w-4 shrink-0 opacity-50" />
+ <CommandPrimitive.Input
+ ref={ref}
+ className={cn(
+ "flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-none placeholder:text-neutral-500 disabled:cursor-not-allowed disabled:opacity-50 dark:placeholder:text-neutral-400",
+ className
+ )}
+ {...props}
+ />
+ </div>
+));
+
+CommandInput.displayName = CommandPrimitive.Input.displayName;
+
+const CommandList = React.forwardRef<
+ React.ElementRef<typeof CommandPrimitive.List>,
+ React.ComponentPropsWithoutRef<typeof CommandPrimitive.List>
+>(({ className, ...props }, ref) => (
+ <CommandPrimitive.List
+ ref={ref}
+ className={cn("max-h-[300px] overflow-y-auto overflow-x-hidden", className)}
+ {...props}
+ />
+));
+
+CommandList.displayName = CommandPrimitive.List.displayName;
+
+const CommandEmpty = React.forwardRef<
+ React.ElementRef<typeof CommandPrimitive.Empty>,
+ React.ComponentPropsWithoutRef<typeof CommandPrimitive.Empty>
+>((props, ref) => (
+ <CommandPrimitive.Empty
+ ref={ref}
+ className="py-6 text-center text-sm"
+ {...props}
+ />
+));
+
+CommandEmpty.displayName = CommandPrimitive.Empty.displayName;
+
+const CommandGroup = React.forwardRef<
+ React.ElementRef<typeof CommandPrimitive.Group>,
+ React.ComponentPropsWithoutRef<typeof CommandPrimitive.Group>
+>(({ className, ...props }, ref) => (
+ <CommandPrimitive.Group
+ ref={ref}
+ className={cn(
+ "overflow-hidden p-1 text-neutral-950 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-neutral-500 dark:text-neutral-50 dark:[&_[cmdk-group-heading]]:text-neutral-400",
+ className
+ )}
+ {...props}
+ />
+));
+
+CommandGroup.displayName = CommandPrimitive.Group.displayName;
+
+const CommandSeparator = React.forwardRef<
+ React.ElementRef<typeof CommandPrimitive.Separator>,
+ React.ComponentPropsWithoutRef<typeof CommandPrimitive.Separator>
+>(({ className, ...props }, ref) => (
+ <CommandPrimitive.Separator
+ ref={ref}
+ className={cn("-mx-1 h-px bg-neutral-200 dark:bg-neutral-800", className)}
+ {...props}
+ />
+));
+CommandSeparator.displayName = CommandPrimitive.Separator.displayName;
+
+const CommandItem = React.forwardRef<
+ React.ElementRef<typeof CommandPrimitive.Item>,
+ React.ComponentPropsWithoutRef<typeof CommandPrimitive.Item>
+>(({ className, ...props }, ref) => (
+ <CommandPrimitive.Item
+ ref={ref}
+ className={cn(
+ "relative flex cursor-default gap-2 select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none data-[disabled=true]:pointer-events-none data-[selected=true]:bg-neutral-100 data-[selected=true]:text-neutral-900 data-[disabled=true]:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 dark:data-[selected=true]:bg-neutral-800 dark:data-[selected=true]:text-neutral-50",
+ className
+ )}
+ {...props}
+ />
+));
+
+CommandItem.displayName = CommandPrimitive.Item.displayName;
+
+const CommandShortcut = ({
+ className,
+ ...props
+}: React.HTMLAttributes<HTMLSpanElement>) => {
+ return (
+ <span
+ className={cn(
+ "ml-auto text-xs tracking-widest text-neutral-500 dark:text-neutral-400",
+ className
+ )}
+ {...props}
+ />
+ );
+};
+CommandShortcut.displayName = "CommandShortcut";
+
+export {
+ Command,
+ CommandDialog,
+ CommandInput,
+ CommandList,
+ CommandEmpty,
+ CommandGroup,
+ CommandItem,
+ CommandShortcut,
+ CommandSeparator,
+};
diff --git a/client/src/hooks/api.ts b/client/src/hooks/api.ts
index f4a7f98d2..218f813db 100644
--- a/client/src/hooks/api.ts
+++ b/client/src/hooks/api.ts
@@ -1,6 +1,6 @@
import { useQuery, UseQueryResult } from "@tanstack/react-query";
import { BACKEND_URL } from "../lib/const";
-import { useStore } from "../lib/store";
+import { FilterParameter, useStore } from "../lib/store";
import { authedFetch, getStartAndEndDate } from "./utils";
export type APIResponse<T> = {
@@ -21,6 +21,44 @@ export function useGetLiveUsercount() {
type PeriodTime = "current" | "previous";
+export function useSingleCol(
+ parameter: FilterParameter,
+ periodTime?: PeriodTime
+): UseQueryResult<
+ APIResponse<{ value: string; count: number; percentage: number }[]>
+> {
+ const { time, previousTime, site, filters } = useStore();
+ const timeToUse = periodTime === "previous" ? previousTime : time;
+ const { startDate, endDate } = getStartAndEndDate(timeToUse);
+
+ return useQuery({
+ queryKey: [parameter, timeToUse, site, filters],
+ queryFn: () => {
+ const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+ return authedFetch(
+ `${BACKEND_URL}/single-col?${
+ startDate ? `startDate=${startDate}&` : ""
+ }${
+ endDate ? `endDate=${endDate}&` : ""
+ }timezone=${timezone}&site=${site}&parameter=${parameter}&filters=${JSON.stringify(
+ filters
+ )}`
+ ).then((res) => res.json());
+ },
+ staleTime: Infinity,
+ placeholderData: (_, query: any) => {
+ if (!query?.queryKey) return undefined;
+ const prevQueryKey = query.queryKey as [string, string, string];
+ const [, , prevSite] = prevQueryKey;
+
+ if (prevSite === site) {
+ return query.state.data;
+ }
+ return undefined;
+ },
+ });
+}
+
export function useGenericQuery<T>(
endpoint: string
): UseQueryResult<APIResponse<T>> {
@@ -69,68 +107,6 @@ export function useGenericSiteDataQuery<T>(
});
}
-export type GetCountriesResponse = {
- country: string;
- count: number;
- percentage: number;
-}[];
-
-export function useGetCountries() {
- return useGenericSiteDataQuery<GetCountriesResponse>("countries");
-}
-
-export type GetDevicesResponse = {
- device_type: string;
- count: number;
- percentage: number;
-}[];
-
-export function useGetDevices() {
- return useGenericSiteDataQuery<GetDevicesResponse>("devices");
-}
-
-export type GetOperatingSystemsResponse = {
- operating_system: string;
- count: number;
- percentage: number;
-}[];
-
-export function useGetOperatingSystems() {
- return useGenericSiteDataQuery<GetOperatingSystemsResponse>(
- "operating-systems"
- );
-}
-
-export type GetBrowsersResponse = {
- browser: string;
- count: number;
- percentage: number;
-}[];
-
-export function useGetBrowsers() {
- return useGenericSiteDataQuery<GetBrowsersResponse>("browsers");
-}
-
-export type GetPagesResponse = {
- pathname: string;
- count: number;
- percentage: number;
-}[];
-
-export function useGetPages() {
- return useGenericSiteDataQuery<GetPagesResponse>("pages");
-}
-
-export type GetReferrersResponse = {
- referrer: string;
- count: number;
- percentage: number;
-}[];
-
-export function useGetReferrers() {
- return useGenericSiteDataQuery<GetReferrersResponse>("referrers");
-}
-
export type GetOverviewBucketedResponse = {
time: string;
pageviews: number;
diff --git a/client/src/lib/store.ts b/client/src/lib/store.ts
index 4a38b98ad..89d96c3cd 100644
--- a/client/src/lib/store.ts
+++ b/client/src/lib/store.ts
@@ -61,9 +61,12 @@ export type FilterParameter =
| "browser"
| "operating_system"
| "country"
+ | "region"
+ | "city"
| "device_type"
| "referrer"
- | "pathname";
+ | "pathname"
+ | "query";
export type Filter = {
parameter: FilterParameter;
diff --git a/client/src/lib/utils.ts b/client/src/lib/utils.ts
index 9daa8ef2e..398a8ee0d 100644
--- a/client/src/lib/utils.ts
+++ b/client/src/lib/utils.ts
@@ -24,3 +24,6 @@ export function formatSecondsAsMinutesAndSeconds(value: number) {
return `${seconds}s`;
}
}
+
+export const sleep = (ms: number) =>
+ new Promise((resolve) => setTimeout(resolve, ms));
diff --git a/server/src/api/getBrowsers.ts b/server/src/api/getBrowsers.ts
deleted file mode 100644
index b11675d8e..000000000
--- a/server/src/api/getBrowsers.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { FastifyReply, FastifyRequest } from "fastify";
-import clickhouse from "../db/clickhouse/clickhouse.js";
-import { GenericRequest } from "./types.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "./utils.js";
-
-type GetBrowsersResponse = {
- browser: string;
- count: number;
- percentage: number;
-}[];
-
-export async function getBrowsers(
- {
- query: { startDate, endDate, timezone, site, filters },
- }: FastifyRequest<GenericRequest>,
- res: FastifyReply
-) {
- const filterStatement = getFilterStatement(filters);
-
- const query = `
- SELECT
- browser,
- COUNT(*) as count,
- ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 2) as percentage
- FROM pageviews
- WHERE
- site_id = ${site}
- ${filterStatement}
- ${getTimeStatement(startDate, endDate, timezone)}
- GROUP BY browser ORDER BY count desc;
- `;
-
- try {
- const result = await clickhouse.query({
- query,
- format: "JSONEachRow",
- });
-
- const data = await processResults<GetBrowsersResponse[number]>(result);
- return res.send({ data });
- } catch (error) {
- console.error("Error fetching browsers:", error);
- return res.status(500).send({ error: "Failed to fetch browsers" });
- }
-}
diff --git a/server/src/api/getCountries.ts b/server/src/api/getCountries.ts
deleted file mode 100644
index 9525dc3ea..000000000
--- a/server/src/api/getCountries.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { FastifyReply, FastifyRequest } from "fastify";
-import clickhouse from "../db/clickhouse/clickhouse.js";
-import { GenericRequest } from "./types.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "./utils.js";
-
-type GetCountriesResponse = {
- country: string;
- count: number;
- percentage: number;
-}[];
-
-export async function getCountries(
- {
- query: { startDate, endDate, timezone, site, filters },
- }: FastifyRequest<GenericRequest>,
- res: FastifyReply
-) {
- const filterStatement = getFilterStatement(filters);
-
- const query = `
- SELECT
- country,
- COUNT(*) as count,
- ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 2) as percentage
- FROM pageviews
- WHERE
- site_id = ${site}
- ${filterStatement}
- ${getTimeStatement(startDate, endDate, timezone)}
- GROUP BY country ORDER BY count desc;
- `;
-
- try {
- const result = await clickhouse.query({
- query,
- format: "JSONEachRow",
- });
-
- const data = await processResults<GetCountriesResponse[number]>(result);
- return res.send({ data });
- } catch (error) {
- console.error("Error fetching countries:", error);
- return res.status(500).send({ error: "Failed to fetch countries" });
- }
-}
diff --git a/server/src/api/getOperatingSystems.ts b/server/src/api/getOperatingSystems.ts
deleted file mode 100644
index 27c934043..000000000
--- a/server/src/api/getOperatingSystems.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { FastifyReply, FastifyRequest } from "fastify";
-import clickhouse from "../db/clickhouse/clickhouse.js";
-import { GenericRequest } from "./types.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "./utils.js";
-
-type GetOperatingSystemsResponse = {
- operating_system: string;
- count: number;
- percentage: number;
-}[];
-
-export async function getOperatingSystems(
- {
- query: { startDate, endDate, timezone, site, filters },
- }: FastifyRequest<GenericRequest>,
- res: FastifyReply
-) {
- const filterStatement = getFilterStatement(filters);
-
- const query = `
- SELECT
- operating_system,
- COUNT(*) as count,
- ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 2) as percentage
- FROM pageviews
- WHERE
- site_id = ${site}
- ${filterStatement}
- ${getTimeStatement(startDate, endDate, timezone)}
- GROUP BY operating_system ORDER BY count desc;
- `;
-
- try {
- const result = await clickhouse.query({
- query,
- format: "JSONEachRow",
- });
-
- const data = await processResults<GetOperatingSystemsResponse[number]>(
- result
- );
- return res.send({ data });
- } catch (error) {
- console.error("Error fetching operating systems:", error);
- return res.status(500).send({ error: "Failed to fetch operating systems" });
- }
-}
diff --git a/server/src/api/getPages.ts b/server/src/api/getPages.ts
deleted file mode 100644
index b411c69de..000000000
--- a/server/src/api/getPages.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { FastifyReply, FastifyRequest } from "fastify";
-import clickhouse from "../db/clickhouse/clickhouse.js";
-import { GenericRequest } from "./types.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "./utils.js";
-
-type GetPagesResponse = {
- pathname: string;
- count: number;
- percentage: number;
-}[];
-
-export async function getPages(
- {
- query: { startDate, endDate, timezone, site, filters },
- }: FastifyRequest<GenericRequest>,
- res: FastifyReply
-) {
- const filterStatement = getFilterStatement(filters);
-
- const query = `
- SELECT
- pathname,
- COUNT(*) as count,
- ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 2) as percentage
- FROM pageviews
- WHERE
- site_id = ${site}
- ${filterStatement}
- ${getTimeStatement(startDate, endDate, timezone)}
- GROUP BY pathname
- ORDER BY count desc
- LIMIT 100;
- `;
-
- try {
- const result = await clickhouse.query({
- query,
- format: "JSONEachRow",
- });
-
- const data = await processResults<GetPagesResponse[number]>(result);
- return res.send({ data });
- } catch (error) {
- console.error("Error fetching pages:", error);
- return res.status(500).send({ error: "Failed to fetch pages" });
- }
-}
diff --git a/server/src/api/getReferrers.ts b/server/src/api/getReferrers.ts
deleted file mode 100644
index 2625a5a41..000000000
--- a/server/src/api/getReferrers.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { FastifyReply, FastifyRequest } from "fastify";
-import clickhouse from "../db/clickhouse/clickhouse.js";
-import { GenericRequest } from "./types.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "./utils.js";
-
-type GetReferrersResponse = {
- referrer: string;
- count: number;
- percentage: number;
-}[];
-
-export async function getReferrers(
- {
- query: { startDate, endDate, timezone, site, filters },
- }: FastifyRequest<GenericRequest>,
- res: FastifyReply
-) {
- const filterStatement = getFilterStatement(filters);
-
- const query = `
- SELECT
- domainWithoutWWW(referrer) AS referrer,
- COUNT(*) as count,
- ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 2) as percentage
- FROM pageviews
- WHERE
- site_id = ${site}
- ${filterStatement}
- ${getTimeStatement(startDate, endDate, timezone)}
- GROUP BY referrer
- ORDER BY count desc
- LIMIT 100;
- `;
-
- try {
- const result = await clickhouse.query({
- query,
- format: "JSONEachRow",
- });
-
- const data = await processResults<GetReferrersResponse[number]>(result);
- return res.send({ data });
- } catch (error) {
- console.error("Error fetching referrers:", error);
- return res.status(500).send({ error: "Failed to fetch referrers" });
- }
-}
diff --git a/server/src/api/getDevices.ts b/server/src/api/getSingleCol.ts
similarity index 74%
rename from server/src/api/getDevices.ts
rename to server/src/api/getSingleCol.ts
index 90348b950..ddd90a271 100644
--- a/server/src/api/getDevices.ts
+++ b/server/src/api/getSingleCol.ts
@@ -2,20 +2,21 @@ import { FastifyReply, FastifyRequest } from "fastify";
import clickhouse from "../db/clickhouse/clickhouse.js";
import { GenericRequest } from "./types.js";
import {
+ geSqlParam,
getFilterStatement,
getTimeStatement,
processResults,
} from "./utils.js";
-type GetDevicesResponse = {
- device_type: string;
+type GetSingleColResponse = {
+ value: string;
count: number;
percentage: number;
}[];
-export async function getDevices(
+export async function getSingleCol(
{
- query: { startDate, endDate, timezone, site, filters },
+ query: { startDate, endDate, timezone, site, filters, parameter },
}: FastifyRequest<GenericRequest>,
res: FastifyReply
) {
@@ -23,7 +24,7 @@ export async function getDevices(
const query = `
SELECT
- device_type,
+ ${geSqlParam(parameter)} as value,
COUNT(*) as count,
ROUND(COUNT(*) * 100.0 / SUM(COUNT(*)) OVER (), 2) as percentage
FROM pageviews
@@ -31,7 +32,7 @@ export async function getDevices(
site_id = ${site}
${filterStatement}
${getTimeStatement(startDate, endDate, timezone)}
- GROUP BY device_type ORDER BY count desc;
+ GROUP BY value ORDER BY count desc;
`;
try {
@@ -40,7 +41,7 @@ export async function getDevices(
format: "JSONEachRow",
});
- const data = await processResults<GetDevicesResponse[number]>(result);
+ const data = await processResults<GetSingleColResponse[number]>(result);
return res.send({ data });
} catch (error) {
console.error("Error fetching devices:", error);
diff --git a/server/src/api/types.ts b/server/src/api/types.ts
index bf2352780..b91a4054a 100644
--- a/server/src/api/types.ts
+++ b/server/src/api/types.ts
@@ -4,9 +4,12 @@ export type FilterParameter =
| "browser"
| "operating_system"
| "country"
+ | "region"
+ | "city"
| "device_type"
| "referrer"
- | "pathname";
+ | "pathname"
+ | "query";
export type Filter = {
parameter: FilterParameter;
@@ -21,5 +24,6 @@ export interface GenericRequest {
timezone: string;
site: string;
filters: string;
+ parameter: FilterParameter;
};
}
diff --git a/server/src/api/utils.ts b/server/src/api/utils.ts
index 479fc68d8..b0aa12015 100644
--- a/server/src/api/utils.ts
+++ b/server/src/api/utils.ts
@@ -1,5 +1,5 @@
import { ResultSet } from "@clickhouse/client";
-import { Filter } from "./types.js";
+import { Filter, FilterParameter, FilterType } from "./types.js";
export function getTimeStatement(
startDate: string,
@@ -37,6 +37,26 @@ export async function processResults<T>(
return data;
}
+const filterTypeToOperator = (type: FilterType) => {
+ switch (type) {
+ case "equals":
+ return "=";
+ case "not_equals":
+ return "!=";
+ case "contains":
+ return "LIKE";
+ case "not_contains":
+ return "NOT LIKE";
+ }
+};
+
+export const geSqlParam = (parameter: FilterParameter) => {
+ if (parameter === "referrer") {
+ return "domainWithoutWWW(referrer)";
+ }
+ return parameter;
+};
+
export function getFilterStatement(filters: string) {
const filtersArray = JSON.parse(filters);
if (filtersArray.length === 0) {
@@ -46,18 +66,9 @@ export function getFilterStatement(filters: string) {
"AND " +
filtersArray
.map((filter: Filter) => {
- if (filter.type === "equals") {
- return `${filter.parameter} = '${filter.value}'`;
- }
- if (filter.type === "not_equals") {
- return `${filter.parameter} != '${filter.value}'`;
- }
- if (filter.type === "contains") {
- return `${filter.parameter} LIKE '${filter.value}'`;
- }
- if (filter.type === "not_contains") {
- return `${filter.parameter} NOT LIKE '${filter.value}'`;
- }
+ return `${geSqlParam(filter.parameter)} ${filterTypeToOperator(
+ filter.type
+ )} '${filter.value}'`;
})
.join(" AND ")
);
diff --git a/server/src/index.ts b/server/src/index.ts
index 20a80f4b7..31fc62939 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -6,27 +6,22 @@ import cron from "node-cron";
import { dirname, join } from "path";
import { Headers, HeadersInit } from "undici";
import { fileURLToPath } from "url";
-import { addSite } from "./api/sites/addSite.js";
-import { deleteSite } from "./api/sites/deleteSite.js";
-import { getSites } from "./api/sites/getSites.js";
-import { trackPageView } from "./tracker/trackPageView.js";
-import { getBrowsers } from "./api/getBrowsers.js";
-import { getCountries } from "./api/getCountries.js";
-import { getDevices } from "./api/getDevices.js";
import { getLiveUsercount } from "./api/getLiveUsercount.js";
-import { getOperatingSystems } from "./api/getOperatingSystems.js";
import { getOverview } from "./api/getOverview.js";
-import { getPages } from "./api/getPages.js";
import { getOverviewBucketed } from "./api/getOverviewBucketed.js";
-import { getReferrers } from "./api/getReferrers.js";
+import { getSingleCol } from "./api/getSingleCol.js";
+import { listUsers } from "./api/listUsers.js";
+import { addSite } from "./api/sites/addSite.js";
+import { deleteSite } from "./api/sites/deleteSite.js";
+import { getSiteHasData } from "./api/sites/getSiteHasData.js";
+import { getSites } from "./api/sites/getSites.js";
import { initializeClickhouse } from "./db/clickhouse/clickhouse.js";
import { initializePostgres } from "./db/postgres/postgres.js";
import { cleanupOldSessions } from "./db/postgres/session-cleanup.js";
import { allowList, loadAllowedDomains } from "./lib/allowedDomains.js";
import { auth } from "./lib/auth.js";
import { mapHeaders } from "./lib/betterAuth.js";
-import { listUsers } from "./api/listUsers.js";
-import { getSiteHasData } from "./api/sites/getSiteHasData.js";
+import { trackPageView } from "./tracker/trackPageView.js";
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
@@ -122,12 +117,7 @@ server.addHook("onRequest", async (request, reply) => {
server.get("/live-user-count/:site", getLiveUsercount);
server.get("/overview", getOverview);
server.get("/overview-bucketed", getOverviewBucketed);
-server.get("/countries", getCountries);
-server.get("/browsers", getBrowsers);
-server.get("/operating-systems", getOperatingSystems);
-server.get("/devices", getDevices);
-server.get("/pages", getPages);
-server.get("/referrers", getReferrers);
+server.get("/single-col", getSingleCol);
server.get("/site-has-data/:site", getSiteHasData);
// Administrative