🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor NoOrganization component for improved messaging and usage across pages
Bill Yang2e308930fae7
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsxindex 302d097c6..7db237ec3 100644--- a/client/src/app/page.tsx+++ b/client/src/app/page.tsx@@ -47,11 +47,10 @@ export default function Home() {<div className="text-2xl font-bold">Websites</div><AddSite disabled={hasNoOrganizations || disabled} /></div>+ {/* Organization required message */}+ {hasNoOrganizations && <NoOrganization />}<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">- {/* Organization required message */}- {hasNoOrganizations && <NoOrganization />}-{/* Sites list */}{sites?.map((site) => {diff --git a/client/src/app/settings/organizations/page.tsx b/client/src/app/settings/organizations/page.tsxindex e5d04ca99..ed81153cd 100644--- a/client/src/app/settings/organizations/page.tsx+++ b/client/src/app/settings/organizations/page.tsx@@ -29,6 +29,7 @@ import { AddMemberDialog } from "./components/AddMemberDialog";import { useQuery } from "@tanstack/react-query";import { Badge } from "../../../components/ui/badge";import { Button } from "../../../components/ui/button";+import { NoOrganization } from "../../../components/NoOrganization";// Types for our componentexport type Organization = {@@ -258,9 +259,7 @@ export default function Organizations() {if (!data?.length) {return (- <Card className="p-6 text-center text-muted-foreground">- No organizations found- </Card>+ <NoOrganization message="You need to create or be added to an organization before you can manage your organizations." />);}diff --git a/client/src/app/settings/subscription/page.tsx b/client/src/app/settings/subscription/page.tsxindex f5c31deb3..a6b0c5a5d 100644--- a/client/src/app/settings/subscription/page.tsx+++ b/client/src/app/settings/subscription/page.tsx@@ -44,7 +44,7 @@ export default function SubscriptionPage() {hasOrganization ? (<FreePlan />) : (- <NoOrganization />+ <NoOrganization message="You need to be part of an organization to manage your subscription." />)) : (<ProPlan />diff --git a/client/src/components/NoOrganization.tsx b/client/src/components/NoOrganization.tsxindex 8ac291b14..152e8e952 100644--- a/client/src/components/NoOrganization.tsx+++ b/client/src/components/NoOrganization.tsx@@ -6,7 +6,11 @@ import { CreateOrganizationDialog } from "./CreateOrganizationDialog";import { Button } from "./ui/button";import { Card, CardDescription, CardTitle } from "./ui/card";-export function NoOrganization() {+export function NoOrganization({+ message = "You need to create or be added to an organization before you can add a website.",+}: {+ message?: string;+}) {const [createOrgDialogOpen, setCreateOrgDialogOpen] = useState(false);const { refetch: refetchSites } = useGetSites();const { refetch: refetchOrganizations } = useUserOrganizations();@@ -16,15 +20,13 @@ export function NoOrganization() {refetchSites();};return (- <>- <Card className="col-span-full p-6 flex flex-col items-center text-center">+ <div className="w-full ">+ <Card className="p-6 flex flex-col items-center text-center w-full"><div className="mx-auto w-12 h-12 rounded-full bg-primary/10 flex items-center justify-center mb-4"><Building className="h-6 w-6 text-primary" /></div>- <CardTitle className="mb-2 text-xl">Organization Required</CardTitle>- <CardDescription className="mb-6">- You need to create an organization before you add a website- </CardDescription>+ <CardTitle className="mb-2 text-xl">No Organization</CardTitle>+ <CardDescription className="mb-6">{message}</CardDescription><ButtononClick={() => setCreateOrgDialogOpen(true)}className="max-w-xs"@@ -38,6 +40,6 @@ export function NoOrganization() {onOpenChange={setCreateOrgDialogOpen}onSuccess={handleOrganizationCreated}/>- </>+ </div>);}