🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor site data types and header components for improved user experience
Bill Yang203b855208fa
diff --git a/client/src/api/admin/sites.ts b/client/src/api/admin/sites.tsindex c5e783763..6cddda3b3 100644--- a/client/src/api/admin/sites.ts+++ b/client/src/api/admin/sites.ts@@ -14,7 +14,19 @@ export type SiteResponse = {isOwner: boolean;};-export type GetSitesResponse = SiteResponse[];+export type GetSitesResponse = {+ siteId: number;+ name: string;+ domain: string;+ createdAt: string;+ updatedAt: string;+ createdBy: string;+ public: boolean;+ overMonthlyLimit?: boolean;+ monthlyEventCount?: number;+ eventLimit?: number;+ isOwner?: boolean;+}[];export function useGetSites() {return useGenericQuery<GetSitesResponse>("get-sites");diff --git a/client/src/app/[site]/components/Header/Header.tsx b/client/src/app/[site]/components/Header/Header.tsxindex bfaa00a2a..cff298862 100644--- a/client/src/app/[site]/components/Header/Header.tsx+++ b/client/src/app/[site]/components/Header/Header.tsx@@ -1,13 +1,10 @@"use client";-import { usePathname } from "next/navigation";-import { useGetSite } from "../../../../api/admin/sites";-export function Header() {- const pathname = usePathname();+import { userStore } from "../../../../lib/userStore";+import { UsageBanners } from "./UsageBanners";- const { data: site } = useGetSite(Number(pathname.split("/")[1]));+export function Header() {+ const { user } = userStore();- return (- <div className="flex flex-col">{/* <UsageBanners site={site} /> */}</div>- );+ return <div className="flex flex-col">{user && <UsageBanners />}</div>;}diff --git a/client/src/app/[site]/components/Header/UsageBanners.tsx b/client/src/app/[site]/components/Header/UsageBanners.tsxindex 63c6c5b7a..4c4ef1be0 100644--- a/client/src/app/[site]/components/Header/UsageBanners.tsx+++ b/client/src/app/[site]/components/Header/UsageBanners.tsx@@ -1,18 +1,22 @@import { AlertTriangle, ArrowRight } from "lucide-react";import Link from "next/link";+import { usePathname } from "next/navigation";+import { useGetSites } from "../../../../api/admin/sites";import {Alert,AlertDescription,AlertTitle,} from "../../../../components/ui/alert";import { Button } from "../../../../components/ui/button";-import { GetSitesResponse } from "../../../../api/admin/sites";-interface UsageBannersProps {- site: GetSitesResponse[0] | undefined;-}+export function UsageBanners() {+ const { data: sites } = useGetSites();+ const pathname = usePathname();++ const site = sites?.find(+ (site) => site.siteId === Number(pathname.split("/")[1])+ );-export function UsageBanners({ site }: UsageBannersProps) {if (!site) return null;// Format numbers with commas@@ -55,7 +59,7 @@ export function UsageBanners({ site }: UsageBannersProps) {</AlertDescription><Buttonvariant="outline"- className="bg-white hover:bg-white/90 text-neutral-100 border-white/20 hover:border-white/30 py-1 h-auto text-sm"+ className="text-neutral-100 border-white/20 hover:border-white/30 py-1 h-auto text-sm"asChild><Link href="/settings/subscription">