🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
move stuff around
Bill Yang932b2f02a8ba
diff --git a/client/src/app/[site]/components/Header/Header.tsx b/client/src/app/[site]/Header/Header.tsxsimilarity index 97%rename from client/src/app/[site]/components/Header/Header.tsxrename to client/src/app/[site]/Header/Header.tsxindex 5e171886a..20d86cd23 100644--- a/client/src/app/[site]/components/Header/Header.tsx+++ b/client/src/app/[site]/Header/Header.tsx@@ -3,7 +3,7 @@ import { Circle } from "@phosphor-icons/react";import Link from "next/link";import { useStore } from "@/lib/store";import { usePathname } from "next/navigation";-import { useGetLiveUsercount, useGetSites } from "../../../../hooks/api";+import { useGetLiveUsercount, useGetSites } from "../../../hooks/api";export function Header() {const { data } = useGetLiveUsercount();diff --git a/client/src/app/[site]/layout.tsx b/client/src/app/[site]/layout.tsxindex 8a8f5e3d1..f613957e1 100644--- a/client/src/app/[site]/layout.tsx+++ b/client/src/app/[site]/layout.tsx@@ -2,7 +2,7 @@import { usePathname } from "next/navigation";import { useEffect } from "react";import { useStore } from "../../lib/store";-import { Header } from "./components/Header/Header";+import { Header } from "./Header/Header";export default function SiteLayout({children,diff --git a/client/src/app/[site]/components/MainSection/BucketSelection.tsx b/client/src/app/[site]/main/components/MainSection/BucketSelection.tsxsimilarity index 100%rename from client/src/app/[site]/components/MainSection/BucketSelection.tsxrename to client/src/app/[site]/main/components/MainSection/BucketSelection.tsxdiff --git a/client/src/app/[site]/components/MainSection/Chart.tsx b/client/src/app/[site]/main/components/MainSection/Chart.tsxsimilarity index 99%rename from client/src/app/[site]/components/MainSection/Chart.tsxrename to client/src/app/[site]/main/components/MainSection/Chart.tsxindex f885e9fa3..76e1cc62f 100644--- a/client/src/app/[site]/components/MainSection/Chart.tsx+++ b/client/src/app/[site]/main/components/MainSection/Chart.tsx@@ -4,7 +4,7 @@ import { nivoTheme } from "@/lib/nivo";import { StatType, Time, TimeBucket, useStore } from "@/lib/store";import { ResponsiveLine } from "@nivo/line";import { DateTime } from "luxon";-import { formatSecondsAsMinutesAndSeconds } from "../../../../lib/utils";+import { formatSecondsAsMinutesAndSeconds } from "../../../../../lib/utils";export const formatter = Intl.NumberFormat("en", { notation: "compact" });diff --git a/client/src/app/[site]/components/MainSection/MainSection.tsx b/client/src/app/[site]/main/components/MainSection/MainSection.tsxsimilarity index 97%rename from client/src/app/[site]/components/MainSection/MainSection.tsxrename to client/src/app/[site]/main/components/MainSection/MainSection.tsxindex 171354800..a9adf6137 100644--- a/client/src/app/[site]/components/MainSection/MainSection.tsx+++ b/client/src/app/[site]/main/components/MainSection/MainSection.tsx@@ -5,7 +5,7 @@ import { BucketSelection } from "./BucketSelection";import { Chart } from "./Chart";import { Overview } from "./Overview";import { PreviousChart } from "./PreviousChart";-import { useStore } from "../../../../lib/store";+import { useStore } from "../../../../../lib/store";export function MainSection() {const { selectedStat, time } = useStore();diff --git a/client/src/app/[site]/components/MainSection/Overview.tsx b/client/src/app/[site]/main/components/MainSection/Overview.tsxsimilarity index 98%rename from client/src/app/[site]/components/MainSection/Overview.tsxrename to client/src/app/[site]/main/components/MainSection/Overview.tsxindex 01e7beb12..0edf00022 100644--- a/client/src/app/[site]/components/MainSection/Overview.tsx+++ b/client/src/app/[site]/main/components/MainSection/Overview.tsx@@ -4,7 +4,7 @@ import { Badge } from "@/components/ui/badge";import { Skeleton } from "@/components/ui/skeleton";import { useGetOverview } from "@/hooks/api";import { cn, formatSecondsAsMinutesAndSeconds, formatter } from "@/lib/utils";-import { StatType, useStore } from "../../../../lib/store";+import { StatType, useStore } from "../../../../../lib/store";const ChangePercentage = ({current,diff --git a/client/src/app/[site]/components/MainSection/PreviousChart.tsx b/client/src/app/[site]/main/components/MainSection/PreviousChart.tsxsimilarity index 100%rename from client/src/app/[site]/components/MainSection/PreviousChart.tsxrename to client/src/app/[site]/main/components/MainSection/PreviousChart.tsxdiff --git a/client/src/app/[site]/components/sections/Browsers/Browsers.tsx b/client/src/app/[site]/main/components/sections/Browsers.tsxsimilarity index 96%rename from client/src/app/[site]/components/sections/Browsers/Browsers.tsxrename to client/src/app/[site]/main/components/sections/Browsers.tsxindex 231401bf3..83c4db0d0 100644--- a/client/src/app/[site]/components/sections/Browsers/Browsers.tsx+++ b/client/src/app/[site]/main/components/sections/Browsers.tsx@@ -3,7 +3,7 @@import { useSingleCol } from "@/hooks/api";import { Compass } from "lucide-react";import Image from "next/image";-import { StandardCard } from "../../shared/StandardCard";+import { StandardCard } from "../../../components/shared/StandardCard";const BROWSER_TO_LOGO: Record<string, string> = {Chrome: "Chrome.svg",diff --git a/client/src/app/[site]/components/sections/Map/Chloropleth.tsx b/client/src/app/[site]/main/components/sections/Chloropleth.tsxsimilarity index 100%rename from client/src/app/[site]/components/sections/Map/Chloropleth.tsxrename to client/src/app/[site]/main/components/sections/Chloropleth.tsxdiff --git a/client/src/app/[site]/components/sections/Countries/Countries.tsx b/client/src/app/[site]/main/components/sections/Countries.tsxsimilarity index 94%rename from client/src/app/[site]/components/sections/Countries/Countries.tsxrename to client/src/app/[site]/main/components/sections/Countries.tsxindex 6c8d67dbe..e4389f6fc 100644--- a/client/src/app/[site]/components/sections/Countries/Countries.tsx+++ b/client/src/app/[site]/main/components/sections/Countries.tsx@@ -4,7 +4,7 @@ import { useSingleCol } from "@/hooks/api";import { countries } from "countries-list";import * as CountryFlags from "country-flag-icons/react/3x2";import React from "react";-import { StandardCard } from "../../shared/StandardCard";+import { StandardCard } from "../../../components/shared/StandardCard";export function Countries() {const { data, isFetching } = useSingleCol({ parameter: "country" });diff --git a/client/src/app/[site]/components/sections/Devices/Devices.tsx b/client/src/app/[site]/main/components/sections/Devices.tsxsimilarity index 85%rename from client/src/app/[site]/components/sections/Devices/Devices.tsxrename to client/src/app/[site]/main/components/sections/Devices.tsxindex acec797b0..e1d339c8d 100644--- a/client/src/app/[site]/components/sections/Devices/Devices.tsx+++ b/client/src/app/[site]/main/components/sections/Devices.tsx@@ -1,7 +1,7 @@"use client";import { useSingleCol } from "@/hooks/api";-import { StandardCard } from "../../shared/StandardCard";+import { StandardCard } from "../../../components/shared/StandardCard";export function Devices() {const { data, isFetching } = useSingleCol({ parameter: "device_type" });diff --git a/client/src/app/[site]/components/sections/Map/Map.tsx b/client/src/app/[site]/main/components/sections/Map.tsxsimilarity index 100%rename from client/src/app/[site]/components/sections/Map/Map.tsxrename to client/src/app/[site]/main/components/sections/Map.tsxdiff --git a/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsx b/client/src/app/[site]/main/components/sections/OperatingSystems.tsxsimilarity index 94%rename from client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsxrename to client/src/app/[site]/main/components/sections/OperatingSystems.tsxindex 99c535b78..94a1dd499 100644--- a/client/src/app/[site]/components/sections/OperatingSystems/OperatingSystems.tsx+++ b/client/src/app/[site]/main/components/sections/OperatingSystems.tsx@@ -1,9 +1,9 @@"use client";import { Compass } from "lucide-react";-import { StandardCard } from "../../shared/StandardCard";import Image from "next/image";import { useSingleCol } from "@/hooks/api";+import { StandardCard } from "../../../components/shared/StandardCard";const OS_TO_LOGO: Record<string, string> = {Windows: "Windows.svg",diff --git a/client/src/app/[site]/components/sections/Pages/Pages.tsx b/client/src/app/[site]/main/components/sections/Pages.tsxsimilarity index 88%rename from client/src/app/[site]/components/sections/Pages/Pages.tsxrename to client/src/app/[site]/main/components/sections/Pages.tsxindex 1a1d6d340..a05d324c4 100644--- a/client/src/app/[site]/components/sections/Pages/Pages.tsx+++ b/client/src/app/[site]/main/components/sections/Pages.tsx@@ -1,7 +1,7 @@"use client";import { GetSitesResponse, useSingleCol } from "@/hooks/api";-import { StandardCard } from "../../shared/StandardCard";+import { StandardCard } from "../../../components/shared/StandardCard";export function Pages({siteMetadata,diff --git a/client/src/app/[site]/components/sections/Referrers/Referrers.tsx b/client/src/app/[site]/main/components/sections/Referrers.tsxsimilarity index 90%rename from client/src/app/[site]/components/sections/Referrers/Referrers.tsxrename to client/src/app/[site]/main/components/sections/Referrers.tsxindex 2cf3fecbb..e6ee062dc 100644--- a/client/src/app/[site]/components/sections/Referrers/Referrers.tsx+++ b/client/src/app/[site]/main/components/sections/Referrers.tsx@@ -1,7 +1,7 @@"use client";import { useSingleCol } from "@/hooks/api";-import { StandardCard } from "../../shared/StandardCard";+import { StandardCard } from "../../../components/shared/StandardCard";export function Referrers() {const { data, isFetching } = useSingleCol({ parameter: "referrer" });diff --git a/client/src/app/[site]/main/page.tsx b/client/src/app/[site]/main/page.tsxindex 80db32387..f2559e56e 100644--- a/client/src/app/[site]/main/page.tsx+++ b/client/src/app/[site]/main/page.tsx@@ -2,17 +2,17 @@import { usePathname } from "next/navigation";import { useGetSites, useSiteHasData } from "../../../hooks/api";import { useStore } from "../../../lib/store";-import { MainSection } from "../components/MainSection/MainSection";import { NoData } from "../components/NoData";-import { Browsers } from "../components/sections/Browsers/Browsers";-import { Countries } from "../components/sections/Countries/Countries";-import { Devices } from "../components/sections/Devices/Devices";-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 { Browsers } from "./components/sections/Browsers";+import { Countries } from "./components/sections/Countries";+import { Devices } from "./components/sections/Devices";+import { Map } from "./components/sections/Map";+import { OperatingSystems } from "./components/sections/OperatingSystems";+import { Pages } from "./components/sections/Pages";+import { Referrers } from "./components/sections/Referrers";import { SubHeader } from "../components/SubHeader/SubHeader";import { useGetSiteMetadata } from "../../../hooks/hooks";+import { MainSection } from "./components/MainSection/MainSection";export default function MainPage() {const { site } = useStore();