Skip to content

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

refactor(FreePlanBanner): update logic to display site-specific event limits

Bill Yang81bdf9605e4d
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
index 37ef5aa22..6aecbe58b 100644
--- a/client/src/app/page.tsx
+++ b/client/src/app/page.tsx
@@ -5,7 +5,6 @@ import { useState } from "react";
import { useUserOrganizations } from "../api/admin/organizations";
import { useGetSites } from "../api/admin/sites";
import { CreateOrganizationDialog } from "../components/CreateOrganizationDialog";
-import { FreePlanBanner } from "../components/FreePlanBanner";
import { NoOrganization } from "../components/NoOrganization";
import { SiteCard } from "../components/SiteCard";
import { StandardPage } from "../components/StandardPage";
@@ -47,7 +46,6 @@ export default function Home() {
return (
<StandardPage>
- <FreePlanBanner />
<div className="flex justify-between items-center my-4">
<div className="text-2xl font-bold">{sites?.length} Websites</div>
<AddSite disabled={hasNoOrganizations || disabled} />
diff --git a/client/src/components/FreePlanBanner.tsx b/client/src/components/FreePlanBanner.tsx
index 1b3a69caf..1469f8976 100644
--- a/client/src/components/FreePlanBanner.tsx
+++ b/client/src/components/FreePlanBanner.tsx
@@ -1,33 +1,32 @@
import { ArrowRight } from "lucide-react";
import Link from "next/link";
-import { useStripeSubscription } from "../app/settings/subscription/utils/useStripeSubscription";
-import { Button } from "./ui/button";
+import { usePathname } from "next/navigation";
+import { useGetSites } from "../api/admin/sites";
import { DEFAULT_EVENT_LIMIT } from "../app/settings/subscription/utils/constants";
+import { Button } from "./ui/button";
export function FreePlanBanner() {
- const { data: subscription } = useStripeSubscription();
+ const { data: sites } = useGetSites();
+ const pathname = usePathname();
+ const site = sites?.find(
+ (site) => site.siteId === Number(pathname.split("/")[1])
+ );
- // Don't show the banner if no subscription data or if there's a paid subscription
- if (!subscription) {
- return null;
- }
+ if (!site) return null;
// Format numbers with commas
const formatNumber = (num: number = 0) => {
return num.toLocaleString();
};
- // Active trial banner - slightly more visible but still minimal
- if (subscription.planName === "free") {
- const eventLimit = subscription.eventLimit || DEFAULT_EVENT_LIMIT;
- const eventsUsed = subscription.monthlyEventCount || 0;
-
+ if (site.eventLimit === DEFAULT_EVENT_LIMIT) {
return (
<div className="mt-4 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 gap-4 items-center">
<div className="text-blue-700 dark:text-blue-300 flex items-center font-medium">
<span>
- Free plan: Using <strong>{formatNumber(eventsUsed)}</strong> of{" "}
- {formatNumber(eventLimit)} events
+ Free plan: Using{" "}
+ <strong>{formatNumber(site.monthlyEventCount)}</strong> of{" "}
+ {formatNumber(site.eventLimit)} events
</span>
</div>
<Button variant="success" size="sm" asChild>
diff --git a/docs/src/app/components/PricingSection.jsx b/docs/src/app/components/PricingSection.jsx
index 3cd112ef6..2dca0e55f 100644
--- a/docs/src/app/components/PricingSection.jsx
+++ b/docs/src/app/components/PricingSection.jsx
@@ -99,7 +99,7 @@ export function PricingSection() {
<div className="w-full lg:w-70 flex-shrink-0 md:h-[666px] h-full">
<div className="bg-neutral-800/30 rounded-xl border border-neutral-700 overflow-hidden backdrop-blur-sm shadow-lg h-full">
<div className="p-6">
- <div className="md:mb-[74px] mb-6">
+ <div className="md:mb-[70px] mb-6">
<div className="flex justify-between mb-3 items-center">
<div>
<h3 className="font-semibold mb-2">Free</h3>