Skip to content

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

Refactor PricingCard and related components for improved layout and c… (#809)

Bill Yanga7ddaab8b3aa
diff --git a/client/src/components/AuthenticationGuard.tsx b/client/src/app/components/AuthenticationGuard.tsx
similarity index 92%
rename from client/src/components/AuthenticationGuard.tsx
rename to client/src/app/components/AuthenticationGuard.tsx
index 9675fba02..fc9ee8ed8 100644
--- a/client/src/components/AuthenticationGuard.tsx
+++ b/client/src/app/components/AuthenticationGuard.tsx
@@ -2,8 +2,8 @@
import { useEffect } from "react";
import { redirect, usePathname } from "next/navigation";
-import { userStore } from "../lib/userStore";
-import { useGetSiteIsPublic } from "../api/admin/hooks/useSites";
+import { userStore } from "../../lib/userStore";
+import { useGetSiteIsPublic } from "../../api/admin/hooks/useSites";
const PUBLIC_ROUTES = ["/login", "/signup", "/invitation", "/reset-password", "/as/callback"];
diff --git a/client/src/components/OrganizationInitializer.tsx b/client/src/app/components/OrganizationInitializer.tsx
similarity index 82%
rename from client/src/components/OrganizationInitializer.tsx
rename to client/src/app/components/OrganizationInitializer.tsx
index eeb36be66..4f912a878 100644
--- a/client/src/components/OrganizationInitializer.tsx
+++ b/client/src/app/components/OrganizationInitializer.tsx
@@ -1,9 +1,9 @@
"use client";
import { useEffect } from "react";
-import { authClient } from "../lib/auth";
-import { useUserOrganizations } from "../api/admin/hooks/useOrganizations";
-import { useTrack } from "../hooks/useTrack";
+import { authClient } from "../../lib/auth";
+import { useUserOrganizations } from "../../api/admin/hooks/useOrganizations";
+import { useTrack } from "../../hooks/useTrack";
function OrganizationInitializerInner() {
const { data: organizations } = useUserOrganizations();
diff --git a/client/src/app/components/SubscriptionGuard.tsx b/client/src/app/components/SubscriptionGuard.tsx
new file mode 100644
index 000000000..52ca0bb8b
--- /dev/null
+++ b/client/src/app/components/SubscriptionGuard.tsx
@@ -0,0 +1,26 @@
+import { useEffect } from "react";
+import { useStripeSubscription } from "../../lib/subscription/useStripeSubscription";
+import { redirect, usePathname } from "next/navigation";
+import { authClient } from "../../lib/auth";
+import { DateTime } from "luxon";
+
+export function SubscriptionGuard() {
+ const { data: subscription, isLoading } = useStripeSubscription();
+ const pathname = usePathname();
+
+ const { data: user } = authClient.useSession();
+
+ useEffect(() => {
+ if (
+ subscription &&
+ user?.user?.createdAt &&
+ subscription?.status !== "active" &&
+ pathname !== "/subscribe" &&
+ DateTime.fromJSDate(user?.user?.createdAt) > DateTime.fromISO("2026-01-10")
+ ) {
+ redirect("/subscribe");
+ }
+ }, [subscription, pathname, user]);
+
+ return null;
+}
diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsx
index f51226dbe..2066ddb89 100644
--- a/client/src/app/layout.tsx
+++ b/client/src/app/layout.tsx
@@ -7,13 +7,14 @@ import { ThemeProvider } from "next-themes";
import { Inter } from "next/font/google";
import Script from "next/script";
import { NuqsAdapter } from "nuqs/adapters/next/app";
-import { AuthenticationGuard } from "../components/AuthenticationGuard";
-import { OrganizationInitializer } from "../components/OrganizationInitializer";
+import { AuthenticationGuard } from "./components/AuthenticationGuard";
+import { OrganizationInitializer } from "./components/OrganizationInitializer";
import { Toaster } from "../components/ui/sonner";
import { TooltipProvider } from "../components/ui/tooltip";
import { cn } from "../lib/utils";
import "./globals.css";
import { ReactScan } from "./ReactScan";
+import { SubscriptionGuard } from "./components/SubscriptionGuard";
const inter = Inter({ subsets: ["latin"] });
@@ -31,6 +32,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
<ThemeProvider attribute="class" enableSystem={true} disableTransitionOnChange>
<TooltipProvider>
<QueryProvider>
+ <SubscriptionGuard />
<OrganizationInitializer />
<AuthenticationGuard />
{children}
diff --git a/client/src/app/subscribe/components/PricingCard.tsx b/client/src/app/subscribe/components/PricingCard.tsx
index 502716afc..11341071d 100644
--- a/client/src/app/subscribe/components/PricingCard.tsx
+++ b/client/src/app/subscribe/components/PricingCard.tsx
@@ -175,24 +175,19 @@ export function PricingCard({ isLoggedIn }: { isLoggedIn: boolean }) {
</div>
{/* Cards section */}
- <div className="grid min-[1100px]:grid-cols-4 min-[600px]:grid-cols-2 min-[400px]:grid-cols-1 gap-6 max-w-6xl mx-auto mb-16">
- {/* Free Plan Card */}
- <div className="bg-neutral-100/30 dark:bg-neutral-800/15 rounded-xl border border-neutral-150 dark:border-neutral-800/60 overflow-hidden text-neutral-600 dark:text-neutral-300 shadow:lg">
+ <div className="grid min-[1100px]:grid-cols-3 min-[400px]:grid-cols-1 gap-6 max-w-4xl mx-auto mb-16">
+ {/* <div className="bg-neutral-100/30 dark:bg-neutral-800/15 rounded-xl border border-neutral-150 dark:border-neutral-800/60 overflow-hidden text-neutral-600 dark:text-neutral-300 shadow:lg">
<div className="p-6">
<div className="mb-4">
<h3 className="text-xl font-bold mb-2">Free</h3>
<p className="text-sm text-neutral-600 dark:text-neutral-400 h-10">Perfect for hobby projects</p>
</div>
-
- {/* Price display */}
<div className="mb-6">
<div>
<span className="text-3xl font-bold">{DEFAULT_EVENT_LIMIT.toLocaleString()}</span>
<span className="ml-1 text-neutral-600 dark:text-neutral-400">pageviews/m</span>
</div>
</div>
-
- {/* Current plan button */}
<button
onClick={() => (siteId ? router.push(`/${siteId}`) : {})}
disabled={!siteId}
@@ -200,13 +195,9 @@ export function PricingCard({ isLoggedIn }: { isLoggedIn: boolean }) {
>
{siteId ? "Continue free" : "Current plan"}
</button>
-
- {/* Features */}
<FeaturesList features={FREE_FEATURES} />
</div>
- </div>
-
- {/* Standard Plan Card */}
+ </div> */}
<div className="bg-white dark:bg-neutral-800/50 rounded-xl border border-neutral-150 dark:border-neutral-800/90 overflow-hidden text-neutral-900 dark:text-neutral-100 shadow-lg">
<div className="p-6">
<div className="mb-4">
@@ -215,8 +206,6 @@ export function PricingCard({ isLoggedIn }: { isLoggedIn: boolean }) {
Everything you need to get started as a small business
</p>
</div>
-
- {/* Price display */}
<div className="mb-6">
{isCustomTier ? (
<div className="text-3xl font-bold">Custom</div>
@@ -229,8 +218,6 @@ export function PricingCard({ isLoggedIn }: { isLoggedIn: boolean }) {
</div>
)}
</div>
-
- {/* Subscribe button */}
<button
onClick={() => handleSubscribe("standard")}
className="w-full bg-emerald-600 hover:bg-emerald-500 text-white font-medium px-5 py-3 rounded-xl shadow-lg shadow-emerald-900/20 transform hover:-translate-y-0.5 transition-all duration-200 focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:ring-opacity-50 disabled:opacity-50 disabled:pointer-events-none cursor-pointer"
@@ -238,13 +225,9 @@ export function PricingCard({ isLoggedIn }: { isLoggedIn: boolean }) {
>
{isLoading ? "Processing..." : isCustomTier ? "Contact us" : "Get started"}
</button>
-
- {/* Features */}
<FeaturesList features={STANDARD_FEATURES} />
</div>
</div>
-
- {/* Pro Plan Card */}
<div className="bg-white dark:bg-neutral-800 rounded-xl border-2 border-emerald-500 overflow-hidden text-neutral-900 dark:text-neutral-100 shadow-lg">
<div className="p-6">
<div className="mb-4">
@@ -258,8 +241,6 @@ export function PricingCard({ isLoggedIn }: { isLoggedIn: boolean }) {
Advanced features for professional teams
</p>
</div>
-
- {/* Price display */}
<div className="mb-6">
{isCustomTier ? (
<div className="text-3xl font-bold">Custom</div>
@@ -272,8 +253,6 @@ export function PricingCard({ isLoggedIn }: { isLoggedIn: boolean }) {
</div>
)}
</div>
-
- {/* Subscribe button */}
<button
onClick={() => handleSubscribe("pro")}
className="w-full bg-emerald-600 hover:bg-emerald-500 text-white font-medium px-5 py-3 rounded-xl shadow-lg shadow-emerald-900/20 transform hover:-translate-y-0.5 transition-all duration-200 focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:ring-opacity-50 disabled:opacity-50 disabled:pointer-events-none cursor-pointer"
@@ -281,13 +260,9 @@ export function PricingCard({ isLoggedIn }: { isLoggedIn: boolean }) {
>
{isLoading ? "Processing..." : isCustomTier ? "Contact us" : "Get started"}
</button>
-
- {/* Features */}
<FeaturesList features={PRO_FEATURES} />
</div>
</div>
-
- {/* Enterprise Plan Card */}
<div className="bg-white dark:bg-neutral-800/50 rounded-xl border border-neutral-150 dark:border-neutral-800/90 overflow-hidden text-neutral-900 dark:text-neutral-100 shadow-lg">
<div className="p-6">
<div className="mb-4">
@@ -296,20 +271,14 @@ export function PricingCard({ isLoggedIn }: { isLoggedIn: boolean }) {
Advanced features for enterprise teams
</p>
</div>
-
- {/* Price display */}
<div className="mb-6">
<div className="text-3xl font-bold">Custom</div>
</div>
-
- {/* Contact button */}
<a href="https://www.rybbit.com/contact" className="w-full block">
<button className="w-full bg-emerald-600 hover:bg-emerald-500 text-white font-medium px-5 py-3 rounded-xl shadow-lg shadow-emerald-900/20 transform hover:-translate-y-0.5 transition-all duration-200 focus:outline-none focus:ring-2 focus:ring-emerald-500 focus:ring-opacity-50 cursor-pointer">
Contact us
</button>
</a>
-
- {/* Features */}
<FeaturesList features={ENTERPRISE_FEATURES} />
</div>
</div>
diff --git a/client/src/app/subscribe/page.tsx b/client/src/app/subscribe/page.tsx
index f2e8dcf5f..e49ea79d4 100644
--- a/client/src/app/subscribe/page.tsx
+++ b/client/src/app/subscribe/page.tsx
@@ -18,12 +18,12 @@ function SubscribeContent() {
const { data: activeOrg } = authClient.useActiveOrganization();
const router = useRouter();
- const [siteId, setSiteId] = useQueryState("siteId");
+ const [siteId] = useQueryState("siteId");
// Redirect if already subscribed
- // if (subscription?.status === "active") {
- // router.push("/settings/organization/subscription");
- // }
+ if (subscription?.status === "active") {
+ router.push("/settings/organization/subscription");
+ }
// Get the active organization ID
const organizationId = activeOrg?.id;
diff --git a/docs/src/app/(home)/compare/components/ComparisonPage.tsx b/docs/src/app/(home)/compare/components/ComparisonPage.tsx
index a42fee346..075456646 100644
--- a/docs/src/app/(home)/compare/components/ComparisonPage.tsx
+++ b/docs/src/app/(home)/compare/components/ComparisonPage.tsx
@@ -88,10 +88,10 @@ export function ComparisonPage({ competitorName, sections, comparisonContent }:
Live demo
</TrackedButton>
</div>
- <p className="text-neutral-500 dark:text-neutral-400 text-xs md:text-sm flex items-center justify-center gap-2 mt-6">
+ {/* <p className="text-neutral-500 dark:text-neutral-400 text-xs md:text-sm flex items-center justify-center gap-2 mt-6">
<CheckCircle className="w-3 h-3 md:w-4 md:h-4" />
First {DEFAULT_EVENT_LIMIT.toLocaleString()} pageviews/m are free. No credit card required.
- </p>
+ </p> */}
</div>
</div>
@@ -221,11 +221,10 @@ export function ComparisonPage({ competitorName, sections, comparisonContent }:
Get started
</TrackedButton>
</div>
-
- <p className="text-neutral-500 dark:text-neutral-400 text-xs md:text-sm flex items-center justify-center gap-2">
+ {/* <p className="text-neutral-500 dark:text-neutral-400 text-xs md:text-sm flex items-center justify-center gap-2">
<CheckCircle className="w-3 h-3 md:w-4 md:h-4" />
No credit card required
- </p>
+ </p> */}
</div>
</div>
</section>
diff --git a/docs/src/app/(home)/features/page.tsx b/docs/src/app/(home)/features/page.tsx
index b1b7334b2..b2c7c3e10 100644
--- a/docs/src/app/(home)/features/page.tsx
+++ b/docs/src/app/(home)/features/page.tsx
@@ -346,10 +346,10 @@ export default function FeaturesPage() {
Live demo
</TrackedButton>
</div>
- <p className="text-neutral-500 dark:text-neutral-400 text-sm flex items-center justify-center gap-2 mt-6">
+ {/* <p className="text-neutral-500 dark:text-neutral-400 text-sm flex items-center justify-center gap-2 mt-6">
<CheckCircle className="w-4 h-4" />
First {DEFAULT_EVENT_LIMIT.toLocaleString()} pageviews/m free • No credit card required
- </p>
+ </p> */}
</div>
</div>
</section>
@@ -513,10 +513,10 @@ export default function FeaturesPage() {
</button>
</Link>
</div>
- <p className="text-neutral-500 dark:text-neutral-400 text-sm flex items-center justify-center gap-2 mt-8">
+ {/* <p className="text-neutral-500 dark:text-neutral-400 text-sm flex items-center justify-center gap-2 mt-8">
<CheckCircle className="w-4 h-4" />
No credit card required • Cancel anytime • {DEFAULT_EVENT_LIMIT.toLocaleString()} pageviews/month free
- </p>
+ </p> */}
</div>
</section>
</div>
diff --git a/docs/src/app/(home)/page.tsx b/docs/src/app/(home)/page.tsx
index 753ce5024..e809329d5 100644
--- a/docs/src/app/(home)/page.tsx
+++ b/docs/src/app/(home)/page.tsx
@@ -178,10 +178,10 @@ export default function HomePage() {
Live demo
</TrackedButton>
</div>
- <p className="text-neutral-500 dark:text-neutral-400 text-xs md:text-sm flex items-center justify-center gap-2 mt-6">
+ {/* <p className="text-neutral-500 dark:text-neutral-400 text-xs md:text-sm flex items-center justify-center gap-2 mt-6">
<CheckCircle className="w-3 h-3 md:w-4 md:h-4" />
First {DEFAULT_EVENT_LIMIT.toLocaleString()} pageviews/m are free. No credit card required.
- </p>
+ </p> */}
</div>
<div className="relative w-full max-w-[1300px] mb-10 px-4">
{/* Background gradients - overlapping circles for organic feel */}
@@ -566,9 +566,9 @@ export default function HomePage() {
<h2 className="text-2xl md:text-4xl font-bold mb-4 md:mb-6">
It&apos;s time to switch to analytics that&apos;s made for you
</h2>
- <p className="text-base md:text-xl text-neutral-600 dark:text-neutral-300 mb-6 md:mb-10 max-w-3xl mx-auto font-light">
+ {/* <p className="text-base md:text-xl text-neutral-600 dark:text-neutral-300 mb-6 md:mb-10 max-w-3xl mx-auto font-light">
The first {DEFAULT_EVENT_LIMIT.toLocaleString()} pageviews a month are free
- </p>
+ </p> */}
<div className="flex flex-col sm:flex-row items-center justify-center gap-4 md:gap-6 mb-6 md:mb-8 w-full sm:w-auto">
<TrackedButton
@@ -581,10 +581,10 @@ export default function HomePage() {
</TrackedButton>
</div>
- <p className="text-neutral-500 dark:text-neutral-400 text-xs md:text-sm flex items-center justify-center gap-2">
+ {/* <p className="text-neutral-500 dark:text-neutral-400 text-xs md:text-sm flex items-center justify-center gap-2">
<CheckCircle className="w-3 h-3 md:w-4 md:h-4" />
No credit card required
- </p>
+ </p> */}
</div>
</div>
</section>
diff --git a/docs/src/app/(home)/pricing/components/ComparisonSection.tsx b/docs/src/app/(home)/pricing/components/ComparisonSection.tsx
index 5bb60ee25..619c3ac05 100644
--- a/docs/src/app/(home)/pricing/components/ComparisonSection.tsx
+++ b/docs/src/app/(home)/pricing/components/ComparisonSection.tsx
@@ -256,14 +256,14 @@ function FeatureCell({ value }: FeatureCellProps) {
export function ComparisonSection() {
return (
<section className="-mt-8 pb-8 w-full">
- <div className="max-w-7xl mx-auto px-4 overflow-x-auto">
+ <div className="max-w-5xl mx-auto px-4 overflow-x-auto">
<div className="w-full border border-neutral-300/50 dark:border-neutral-800/50 rounded-lg min-w-[800px] ">
{/* Table Header */}
- <div className="grid grid-cols-5 gap-0 py-6 bg-neutral-100/50 dark:bg-neutral-800/20">
+ <div className="grid grid-cols-4 gap-0 py-6 bg-neutral-100/50 dark:bg-neutral-800/20">
<div className="flex items-center px-6 border-r border-neutral-400/50 dark:border-neutral-700/50 text-xl font-semibold text-neutral-800 dark:text-neutral-200">
Compare Plans
</div>
- <div className="flex flex-col items-center justify-center px-6 border-r border-neutral-400/50 dark:border-neutral-700/50">
+ {/* <div className="flex flex-col items-center justify-center px-6 border-r border-neutral-400/50 dark:border-neutral-700/50">
<div className="font-semibold text-lg text-center mb-3">
Free <span className="text-sm text-neutral-500 dark:text-neutral-400 font-normal block">$0/month</span>
</div>
@@ -273,7 +273,7 @@ export function ComparisonSection() {
>
Start Free
</a>
- </div>
+ </div> */}
<div className="flex flex-col items-center justify-center px-6 border-r border-neutral-400/50 dark:border-neutral-700/50">
<div className="font-semibold text-lg text-center mb-3">
Standard{" "}
@@ -317,7 +317,7 @@ export function ComparisonSection() {
<div key={categoryIndex}>
{/* Category Header - Skip for "Usage" category */}
{category.category !== "Usage" && (
- <div className="grid grid-cols-5 gap-0 py-3 border-b border-neutral-400 dark:border-neutral-700 bg-neutral-100/30 dark:bg-neutral-800/10">
+ <div className="grid grid-cols-4 gap-0 py-3 border-b border-neutral-400 dark:border-neutral-700 bg-neutral-100/30 dark:bg-neutral-800/10">
<div className="flex items-center px-6 border-r border-neutral-400/50 dark:border-neutral-700/50">
<h3 className="font-semibold text-neutral-800 dark:text-neutral-100 text-base">
{category.category}
@@ -334,14 +334,14 @@ export function ComparisonSection() {
{category.features.map((feature, featureIndex) => (
<div
key={featureIndex}
- className="grid grid-cols-5 gap-0 py-3 hover:bg-neutral-100/50 dark:hover:bg-neutral-800/20 transition-colors border-b border-neutral-300/30 dark:border-neutral-800/30 last:border-b-0"
+ className="grid grid-cols-4 gap-0 py-3 hover:bg-neutral-100/50 dark:hover:bg-neutral-800/20 transition-colors border-b border-neutral-300/30 dark:border-neutral-800/30 last:border-b-0"
>
<div className="flex items-center px-6 border-r border-neutral-400/50 dark:border-neutral-700/50">
<span className="text-sm text-neutral-700 dark:text-neutral-300">{feature.name}</span>
</div>
- <div className="flex items-center justify-center px-6 border-r border-neutral-400/50 dark:border-neutral-700/50">
+ {/* <div className="flex items-center justify-center px-6 border-r border-neutral-400/50 dark:border-neutral-700/50">
<FeatureCell value={feature.free} />
- </div>
+ </div> */}
<div className="flex items-center justify-center px-6 border-r border-neutral-400/50 dark:border-neutral-700/50">
<FeatureCell value={feature.standard} />
</div>
diff --git a/docs/src/components/PricingSection.tsx b/docs/src/components/PricingSection.tsx
index 12a6bdf31..d0dd1a4d2 100644
--- a/docs/src/components/PricingSection.tsx
+++ b/docs/src/components/PricingSection.tsx
@@ -205,9 +205,8 @@ export function PricingSection() {
</div>
{/* Pricing cards layout */}
- <div className="grid min-[1100px]:grid-cols-4 min-[600px]:grid-cols-2 min-[400px]:grid-cols-1 gap-6 max-w-6xl mx-auto justify-center items-stretch">
- {/* Free Plan Card */}
- <PricingCard
+ <div className="grid min-[1100px]:grid-cols-3 min-[400px]:grid-cols-1 gap-6 max-w-4xl mx-auto justify-center items-stretch">
+ {/* <PricingCard
title="Free"
description="Perfect for hobby projects"
priceDisplay={
@@ -222,9 +221,7 @@ export function PricingSection() {
features={FREE_FEATURES}
variant="free"
eventLocation="free"
- />
-
- {/* Standard Plan Card */}
+ /> */}
<PricingCard
title="Standard"
description="Everything you need to get started as a small business"
@@ -245,8 +242,6 @@ export function PricingSection() {
features={STANDARD_FEATURES}
eventLocation={standardPrices.custom ? undefined : "standard"}
/>
-
- {/* Pro Plan Card */}
<PricingCard
title="Pro"
description="Advanced features for professional teams"