🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor API utility functions and improve site data handling
Bill Yang071c65e5b41c
diff --git a/client/src/api/admin/sites.ts b/client/src/api/admin/sites.tsindex 9d46e458c..1299faf71 100644--- a/client/src/api/admin/sites.ts+++ b/client/src/api/admin/sites.ts@@ -1,5 +1,5 @@import { BACKEND_URL } from "../../lib/const";-import { authedFetch, useGenericQuery } from "../utils";+import { authedFetch, genericQuery, useGenericQuery } from "../utils";export type GetSitesResponse = {siteId: number;@@ -18,6 +18,10 @@ export function useGetSites() {return useGenericQuery<GetSitesResponse>("get-sites");}+export async function getSites() {+ return genericQuery<GetSitesResponse>("get-sites");+}+export function addSite(domain: string, name: string, organizationId: string) {return authedFetch(`${BACKEND_URL}/add-site`, {method: "POST",@@ -58,7 +62,7 @@ export function useSiteHasData(siteId: string) {export function useGetSiteMetadata(siteId: string | number) {const { data, isLoading } = useGetSites();return {- siteMetadata: data?.data?.find((site) => site.siteId === Number(siteId)),+ siteMetadata: data?.find((site) => site.siteId === Number(siteId)),isLoading,};}diff --git a/client/src/api/utils.ts b/client/src/api/utils.tsindex 66e914a39..115ca2af9 100644--- a/client/src/api/utils.ts+++ b/client/src/api/utils.ts@@ -39,9 +39,7 @@ export async function authedFetch(url: string, opts: RequestInit = {}) {});}-export function useGenericQuery<T>(- endpoint: string-): UseQueryResult<APIResponse<T>> {+export function useGenericQuery<T>(endpoint: string): UseQueryResult<T> {return useQuery({queryKey: [endpoint],queryFn: () => {@@ -52,3 +50,7 @@ export function useGenericQuery<T>(staleTime: Infinity,});}++export async function genericQuery<T>(endpoint: string): Promise<T> {+ return authedFetch(`${BACKEND_URL}/${endpoint}`).then((res) => res.json());+}diff --git a/client/src/app/[site]/Header/Header.tsx b/client/src/app/[site]/Header/Header.tsxindex 5c1c0a83f..e91ad66f1 100644--- a/client/src/app/[site]/Header/Header.tsx+++ b/client/src/app/[site]/Header/Header.tsx@@ -14,7 +14,7 @@ export function Header() {const { data: sites } = useGetSites();const pathname = usePathname();- const site = sites?.data?.find(+ const site = sites?.find((site) => site.siteId === Number(pathname.split("/")[1]));diff --git a/client/src/app/[site]/layout.tsx b/client/src/app/[site]/layout.tsxindex 8942760df..16972f63b 100644--- a/client/src/app/[site]/layout.tsx+++ b/client/src/app/[site]/layout.tsx@@ -15,6 +15,7 @@ export default function SiteLayout({const pathname = usePathname();const { setSite, site } = useStore();const { data: siteHasData, isLoading } = useSiteHasData(site);+const { siteMetadata, isLoading: isLoadingSiteMetadata } =useGetSiteMetadata(site);@@ -35,7 +36,7 @@ export default function SiteLayout({return null;}- if (!siteHasData?.data && !isLoading && !isLoadingSiteMetadata) {+ if (!siteHasData && !isLoading && !isLoadingSiteMetadata) {return <NoData siteMetadata={siteMetadata} />;}diff --git a/client/src/app/components/AddSite.tsx b/client/src/app/components/AddSite.tsxindex 062f4cf01..b75aa347f 100644--- a/client/src/app/components/AddSite.tsx+++ b/client/src/app/components/AddSite.tsx@@ -1,5 +1,9 @@"use client";import { Button } from "@/components/ui/button";+import { AlertCircle, AppWindow, Building2, Plus } from "lucide-react";+import { useEffect, useState } from "react";+import { addSite, useGetSites } from "../../api/admin/sites";+import { Alert, AlertDescription, AlertTitle } from "../../components/ui/alert";import {Dialog,DialogContent,@@ -9,19 +13,8 @@ import {DialogTitle,DialogTrigger,} from "../../components/ui/dialog";-import { useState, useEffect } from "react";-import { Label } from "../../components/ui/label";import { Input } from "../../components/ui/input";-import { addSite, useGetSites } from "../../api/admin/sites";-import { Alert, AlertDescription, AlertTitle } from "../../components/ui/alert";-import {- AlertCircle,- AppWindow,- Building2,- Plus,- PlusCircle,-} from "lucide-react";-import { authClient } from "../../lib/auth";+import { Label } from "../../components/ui/label";import {Select,SelectContent,@@ -29,6 +22,7 @@ import {SelectTrigger,SelectValue,} from "../../components/ui/select";+import { authClient } from "../../lib/auth";/*** A simple domain validation function:@@ -52,7 +46,7 @@ export function AddSite({const { data: sites, refetch } = useGetSites();const { data: organizations } = authClient.useListOrganizations();- const existingSites = sites?.data?.map((site) => site.domain);+ const existingSites = sites?.map((site) => site.domain);const [open, setOpen] = useState(false);const [domain, setDomain] = useState("");diff --git a/client/src/app/page.tsx b/client/src/app/page.tsxindex fc3ea155e..09579ec19 100644--- a/client/src/app/page.tsx+++ b/client/src/app/page.tsx@@ -1,23 +1,21 @@"use client";-import { useState, useEffect } from "react";-import { SiteCard } from "../components/SiteCard";+import { Building, Plus } from "lucide-react";+import { useState } from "react";import { useGetSites } from "../api/admin/sites";+import { SiteCard } from "../components/SiteCard";+import { Button } from "../components/ui/button";+import { Card, CardDescription, CardTitle } from "../components/ui/card";import { authClient } from "../lib/auth";import { AddSite } from "./components/AddSite";import { CreateOrganizationDialog } from "./components/CreateOrganizationDialog";-import { Button } from "../components/ui/button";-import {- Card,- CardContent,- CardDescription,- CardHeader,- CardTitle,-} from "../components/ui/card";-import { Plus, Building } from "lucide-react";export default function Home() {- const { data: sites, refetch: refetchSites } = useGetSites();+ const {+ data: sites,+ refetch: refetchSites,+ isLoading: isLoadingSites,+ } = useGetSites();const userOrganizations = authClient.useListOrganizations();const [createOrgDialogOpen, setCreateOrgDialogOpen] = useState(false);@@ -65,7 +63,7 @@ export default function Home() {{/* Sites list */}{!hasNoOrganizations &&- sites?.data?.map((site) => {+ sites?.map((site) => {return (<SiteCardkey={site.siteId}@@ -77,8 +75,9 @@ export default function Home() {{/* No websites message */}{!hasNoOrganizations &&- (!sites?.data || sites.data.length === 0) &&- !userOrganizations.isPending && (+ (!sites || sites.length === 0) &&+ !userOrganizations.isPending &&+ !isLoadingSites && (<Card className="col-span-full p-6 flex flex-col items-center text-center"><CardTitle className="mb-2 text-xl">No websites yet</CardTitle><CardDescription className="mb-4">diff --git a/server/src/api/sites/getSiteHasData.ts b/server/src/api/sites/getSiteHasData.tsindex fa9f7b67a..6899d7c78 100644--- a/server/src/api/sites/getSiteHasData.ts+++ b/server/src/api/sites/getSiteHasData.ts@@ -15,8 +15,8 @@ export async function getSiteHasData(}).then((res) => res.json());- return reply.status(200).send({ data: sites[0].count > 0 });+ return reply.status(200).send(sites[0].count > 0);} catch (err) {- return reply.status(500).send({ error: String(err) });+ return reply.status(500).send(String(err));}}diff --git a/server/src/api/sites/getSites.ts b/server/src/api/sites/getSites.tsindex 8447ad400..5533b9b12 100644--- a/server/src/api/sites/getSites.ts+++ b/server/src/api/sites/getSites.ts@@ -113,9 +113,9 @@ export async function getSites(req: FastifyRequest, reply: FastifyReply) {}));- return reply.status(200).send({ data: enhancedSitesData });+ return reply.status(200).send(enhancedSitesData);} catch (err) {console.error("Error in getSites:", err);- return reply.status(500).send({ error: String(err) });+ return reply.status(500).send(String(err));}}