🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor Header and UsageBanners components for improved readability and structure
Bill Yanga48297e3285d
diff --git a/client/src/app/[site]/components/Header/Header.tsx b/client/src/app/[site]/components/Header/Header.tsxindex 2f25be824..cff298862 100644--- a/client/src/app/[site]/components/Header/Header.tsx+++ b/client/src/app/[site]/components/Header/Header.tsx@@ -6,13 +6,5 @@ import { UsageBanners } from "./UsageBanners";export function Header() {const { user } = userStore();- return (- <div className="flex flex-col">- {user && (- <div className="m-4 mb-0">- <UsageBanners />- </div>- )}- </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 f9cdda201..b7950128b 100644--- a/client/src/app/[site]/components/Header/UsageBanners.tsx+++ b/client/src/app/[site]/components/Header/UsageBanners.tsx@@ -39,81 +39,85 @@ export function UsageBanners() {site.monthlyEventCount > site.eventLimit) {return (- <Alert variant="destructive" className="p-4">- <div className="flex items-start space-x-3">- <AlertTriangle className="h-5 w-5 mt-0.5" />- <div className="flex-1">- <AlertTitle className="text-base font-semibold mb-1">- Event Limit Exceeded- </AlertTitle>- <div className="mb-2 text-sm">- <strong>{formatNumber(site.monthlyEventCount || 0)}</strong>{" "}- events used (limit:{" "}- <strong>{formatNumber(site.eventLimit || 20000)}</strong>)- </div>+ <div className="m-4 mb-0">+ <Alert variant="destructive" className="p-4">+ <div className="flex items-start space-x-3">+ <AlertTriangle className="h-5 w-5 mt-0.5" />+ <div className="flex-1">+ <AlertTitle className="text-base font-semibold mb-1">+ Event Limit Exceeded+ </AlertTitle>+ <div className="mb-2 text-sm">+ <strong>{formatNumber(site.monthlyEventCount || 0)}</strong>{" "}+ events used (limit:{" "}+ <strong>{formatNumber(site.eventLimit || 20000)}</strong>)+ </div>- {site.isOwner ? (- <div className="flex flex-col space-y-2 sm:flex-row sm:space-y-0 sm:space-x-2 items-start sm:items-center">+ {site.isOwner ? (+ <div className="flex flex-col space-y-2 sm:flex-row sm:space-y-0 sm:space-x-2 items-start sm:items-center">+ <AlertDescription className="text-sm">+ Upgrade your plan to continue collecting analytics.+ </AlertDescription>+ <Button variant="default" asChild>+ <Link href="/settings/subscription">+ Upgrade Plan <ArrowRight className="ml-1 h-3 w-3" />+ </Link>+ </Button>+ </div>+ ) : (<AlertDescription className="text-sm">- Upgrade your plan to continue collecting analytics.+ This site has exceeded its monthly event limit. Please contact+ your organization owner to upgrade the plan.</AlertDescription>- <Button variant="default" asChild>- <Link href="/settings/subscription">- Upgrade Plan <ArrowRight className="ml-1 h-3 w-3" />- </Link>- </Button>- </div>- ) : (- <AlertDescription className="text-sm">- This site has exceeded its monthly event limit. Please contact- your organization owner to upgrade the plan.- </AlertDescription>- )}+ )}+ </div></div>- </div>- </Alert>+ </Alert>+ </div>);}// If approaching limit (>90%), show warning bannerif (isNearLimit) {return (- <Alert className="p-4 bg-amber-50 border-amber-200 dark:bg-amber-900/20 dark:border-amber-800">- <div className="flex items-start space-x-3">- <AlertTriangle className="h-5 w-5 mt-0.5 text-amber-500" />- <div className="flex-1">- <AlertTitle className="text-base font-semibold mb-1 text-amber-700 dark:text-amber-400">- Approaching Event Limit- </AlertTitle>- <div className="mb-2 text-sm text-amber-700 dark:text-amber-400">- <strong>{formatNumber(site.monthlyEventCount || 0)}</strong>{" "}- events used ({Math.round(usagePercentage)}% of your{" "}- <strong>{formatNumber(site.eventLimit || 20000)}</strong> limit)- </div>+ <div className="m-4 mb-0">+ <Alert className="p-4 bg-amber-50 border-amber-200 dark:bg-amber-900/20 dark:border-amber-800">+ <div className="flex items-start space-x-3">+ <AlertTriangle className="h-5 w-5 mt-0.5 text-amber-500" />+ <div className="flex-1">+ <AlertTitle className="text-base font-semibold mb-1 text-amber-700 dark:text-amber-400">+ Approaching Event Limit+ </AlertTitle>+ <div className="mb-2 text-sm text-amber-700 dark:text-amber-400">+ <strong>{formatNumber(site.monthlyEventCount || 0)}</strong>{" "}+ events used ({Math.round(usagePercentage)}% of your{" "}+ <strong>{formatNumber(site.eventLimit || 20000)}</strong> limit)+ </div>- {site.isOwner ? (- <div className="flex flex-col space-y-2 sm:flex-row sm:space-y-0 sm:space-x-2 items-start sm:items-center">+ {site.isOwner ? (+ <div className="flex flex-col space-y-2 sm:flex-row sm:space-y-0 sm:space-x-2 items-start sm:items-center">+ <AlertDescription className="text-sm text-amber-700 dark:text-amber-400">+ Consider upgrading your plan to avoid interruptions.+ </AlertDescription>+ <Button+ className="bg-white hover:bg-white/90 text-neutral-100 border-white/20 hover:border-white/30 py-1 h-auto text-sm"+ asChild+ >+ <Link href="/settings/subscription">+ Upgrade Plan <ArrowRight className="ml-1 h-3 w-3" />+ </Link>+ </Button>+ </div>+ ) : (<AlertDescription className="text-sm text-amber-700 dark:text-amber-400">- Consider upgrading your plan to avoid interruptions.+ This site is approaching its monthly event limit. You may want+ to notify your organization owner.</AlertDescription>- <Button- className="bg-white hover:bg-white/90 text-neutral-100 border-white/20 hover:border-white/30 py-1 h-auto text-sm"- asChild- >- <Link href="/settings/subscription">- Upgrade Plan <ArrowRight className="ml-1 h-3 w-3" />- </Link>- </Button>- </div>- ) : (- <AlertDescription className="text-sm text-amber-700 dark:text-amber-400">- This site is approaching its monthly event limit. You may want- to notify your organization owner.- </AlertDescription>- )}+ )}+ </div></div>- </div>- </Alert>+ </Alert>+ </div>);}