Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

style: update spacing and layout in various components for improved UI consistency

Bill Yang91666db5d2d9
diff --git a/client/src/app/[site]/components/Header/Header.tsx b/client/src/app/[site]/components/Header/Header.tsx
index 04f9a39b6..0e7a563f2 100644
--- a/client/src/app/[site]/components/Header/Header.tsx
+++ b/client/src/app/[site]/components/Header/Header.tsx
@@ -11,11 +11,11 @@ export function Header() {
return (
<div className="flex flex-col">
{user && (
- <>
+ <div className="flex flex-col gap-4 m-4 mb-0">
<FreeTrialBanner />
<UsageBanners />
<NoData />
- </>
+ </div>
)}
</div>
);
diff --git a/client/src/app/[site]/components/Header/NoData.tsx b/client/src/app/[site]/components/Header/NoData.tsx
index 2bd0df0c1..8c89c445e 100644
--- a/client/src/app/[site]/components/Header/NoData.tsx
+++ b/client/src/app/[site]/components/Header/NoData.tsx
@@ -12,39 +12,37 @@ export function NoData() {
if (!siteHasData && !isLoading && !isLoadingSiteMetadata) {
return (
- <div className="m-4 mb-0">
- <Alert className="p-4 bg-yellow-50 border-yellow-200 dark:bg-yellow-900/20 dark:border-yellow-800">
- <div className="flex flex-col gap-3">
- <div className="flex items-center gap-3">
- <span className="relative flex h-3 w-3">
- <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-400 opacity-75"></span>
- <span className="relative inline-flex h-3 w-3 rounded-full bg-green-500"></span>
- </span>
- <div className="font-medium">
- Waiting for analytics from {siteMetadata?.domain}...
- </div>
- </div>
- <div className="text-xs text-muted-foreground">
- Place this snippet in the &lt;head&gt; of your website:
- </div>
- <CodeSnippet
- language="HTML"
- code={`<script\n src="${globalThis.location.origin}/api/script.js"\n data-site-id="${siteMetadata?.siteId}"\n defer\n></script>`}
- className="text-xs"
- />
- <span className="text-xs text-muted-foreground">
- See our{" "}
- <a
- href="https://rybbit.io/docs"
- className="text-blue-500 hover:underline"
- >
- docs
- </a>{" "}
- for more information.
+ <Alert className="p-4 bg-yellow-50 border-yellow-200 dark:bg-yellow-900/20 dark:border-yellow-800">
+ <div className="flex flex-col gap-3">
+ <div className="flex items-center gap-3">
+ <span className="relative flex h-3 w-3">
+ <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-400 opacity-75"></span>
+ <span className="relative inline-flex h-3 w-3 rounded-full bg-green-500"></span>
</span>
+ <div className="font-medium">
+ Waiting for analytics from {siteMetadata?.domain}...
+ </div>
+ </div>
+ <div className="text-xs text-muted-foreground">
+ Place this snippet in the &lt;head&gt; of your website:
</div>
- </Alert>
- </div>
+ <CodeSnippet
+ language="HTML"
+ code={`<script\n src="${globalThis.location.origin}/api/script.js"\n data-site-id="${siteMetadata?.siteId}"\n defer\n></script>`}
+ className="text-xs"
+ />
+ <span className="text-xs text-muted-foreground">
+ See our{" "}
+ <a
+ href="https://rybbit.io/docs"
+ className="text-blue-500 hover:underline"
+ >
+ docs
+ </a>{" "}
+ for more information.
+ </span>
+ </div>
+ </Alert>
);
}
diff --git a/client/src/app/[site]/components/Header/UsageBanners.tsx b/client/src/app/[site]/components/Header/UsageBanners.tsx
index b7950128b..f9cdda201 100644
--- a/client/src/app/[site]/components/Header/UsageBanners.tsx
+++ b/client/src/app/[site]/components/Header/UsageBanners.tsx
@@ -39,85 +39,81 @@ export function UsageBanners() {
site.monthlyEventCount > site.eventLimit
) {
return (
- <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>
+ <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">
- <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>
- ) : (
+ {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">
- This site has exceeded its monthly event limit. Please contact
- your organization owner to upgrade the plan.
+ Upgrade your plan to continue collecting analytics.
</AlertDescription>
- )}
- </div>
+ <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>
- </Alert>
- </div>
+ </div>
+ </Alert>
);
}
// If approaching limit (>90%), show warning banner
if (isNearLimit) {
return (
- <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>
+ <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">
- <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>
- ) : (
+ {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">
- This site is approaching its monthly event limit. You may want
- to notify your organization owner.
+ Consider upgrading your plan to avoid interruptions.
</AlertDescription>
- )}
- </div>
+ <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>
- </Alert>
- </div>
+ </div>
+ </Alert>
);
}
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
index d530aa0b7..5da16337c 100644
--- a/client/src/app/page.tsx
+++ b/client/src/app/page.tsx
@@ -48,7 +48,7 @@ export default function Home() {
return (
<StandardPage>
<FreeTrialBanner />
- <div className="flex justify-between items-center mb-4">
+ <div className="flex justify-between items-center my-4">
<div className="text-2xl font-bold">{sites?.length} Websites</div>
<AddSite disabled={hasNoOrganizations || disabled} />
</div>
diff --git a/client/src/components/FreeTrialBanner.tsx b/client/src/components/FreeTrialBanner.tsx
index d7c3651c2..9c44a6336 100644
--- a/client/src/components/FreeTrialBanner.tsx
+++ b/client/src/components/FreeTrialBanner.tsx
@@ -8,10 +8,7 @@ export function FreeTrialBanner() {
const { data: subscription } = useStripeSubscription();
// Don't show the banner if no subscription data or if there's a paid subscription
- if (
- !subscription ||
- (subscription.status === "active" && !subscription.isTrial)
- ) {
+ if (!subscription) {
return null;
}
@@ -21,13 +18,13 @@ export function FreeTrialBanner() {
};
// Active trial banner - slightly more visible but still minimal
- if (!subscription.isTrial) {
+ if (subscription.isTrial) {
const daysRemaining = subscription.trialDaysRemaining || 0;
const eventLimit = subscription.eventLimit || 100000;
const eventsUsed = subscription.monthlyEventCount || 0;
return (
- <div className="px-4 py-3 border-b border-blue-100 dark:border-blue-800/30 bg-blue-50/80 dark:bg-blue-900/20 text-sm flex justify-between items-center mb-4">
+ <div className="px-4 py-3 rounded-lg border border-blue-100 dark:border-blue-400/30 bg-blue-50/80 dark:bg-blue-900/20 text-sm flex justify-between items-center">
<div className="text-blue-700 dark:text-blue-300 flex items-center font-medium">
<Clock className="h-4 w-4 mr-2 text-blue-500 dark:text-blue-400 flex-shrink-0" />
<span>
@@ -53,37 +50,35 @@ export function FreeTrialBanner() {
// Trial expired banner - keep prominent
if (subscription.status === "expired") {
return (
- <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 dark:text-amber-400" />
- <div className="flex-1">
- <AlertTitle className="text-base font-semibold mb-1 text-amber-700 dark:text-amber-400">
- Your Free Trial Has Ended
- </AlertTitle>
- <div className="mb-2 text-sm text-amber-700 dark:text-amber-400">
- Your 14-day free trial has expired. Subscribe to continue using
- our analytics services.
- </div>
+ <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 dark:text-amber-400" />
+ <div className="flex-1">
+ <AlertTitle className="text-base font-semibold mb-1 text-amber-700 dark:text-amber-400">
+ Your Free Trial Has Ended
+ </AlertTitle>
+ <div className="mb-2 text-sm text-amber-700 dark:text-amber-400">
+ Your 14-day free trial has expired. Subscribe to continue using
+ our analytics services.
+ </div>
- <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">
- Choose a subscription plan to continue collecting analytics
- data.
- </AlertDescription>
- <Button
- className="bg-amber-500 hover:bg-amber-600 text-white border-amber-400 hover:border-amber-500 py-1 h-auto text-sm"
- asChild
- >
- <Link href="/subscribe">
- Subscribe Now <ArrowRight className="ml-1 h-3 w-3" />
- </Link>
- </Button>
- </div>
+ <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">
+ Choose a subscription plan to continue collecting analytics
+ data.
+ </AlertDescription>
+ <Button
+ className="bg-amber-500 hover:bg-amber-600 text-white border-amber-400 hover:border-amber-500 py-1 h-auto text-sm"
+ asChild
+ >
+ <Link href="/subscribe">
+ Subscribe Now <ArrowRight className="ml-1 h-3 w-3" />
+ </Link>
+ </Button>
</div>
</div>
- </Alert>
- </div>
+ </div>
+ </Alert>
);
}