Skip to content

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

Refactor PricingCard component to streamline pricing display logic and enhance subscription options. Removed priceDisplay prop in favor of direct monthly and annual price handling, improving clarity and maintainability. Updated SubscribeContent to remove unnecessary whitespace.

Bill Yang73b3776f1152
diff --git a/client/src/app/subscribe/components/PricingCards.tsx b/client/src/app/subscribe/components/PricingCards.tsx
index 641b6f0be..48ec0f67c 100644
--- a/client/src/app/subscribe/components/PricingCards.tsx
+++ b/client/src/app/subscribe/components/PricingCards.tsx
@@ -1,22 +1,20 @@
"use client";
+import { PricingCard } from "@/components/pricing/PricingCard";
import { Slider } from "@/components/ui/slider";
+import { toast } from "@/components/ui/sonner";
import { authClient } from "@/lib/auth";
import { BACKEND_URL } from "@/lib/const";
import { cn } from "@/lib/utils";
import { useEffect, useState } from "react";
-import { toast } from "@/components/ui/sonner";
-import { DEFAULT_EVENT_LIMIT } from "../../../lib/subscription/constants";
import { trackAdEvent } from "../../../lib/trackAdEvent";
-import { PricingCard } from "@/components/pricing/PricingCard";
import {
ENTERPRISE_FEATURES,
EVENT_TIERS,
- FREE_FEATURES,
PRO_FEATURES,
STANDARD_FEATURES,
findPriceForTier,
- formatEventTier,
+ formatEventTier
} from "./utils";
import { useRouter } from "next/navigation";
@@ -260,43 +258,25 @@ export function PricingCards({ isLoggedIn }: { isLoggedIn: boolean }) {
onClick={() => (siteId ? router.push(`/${siteId}`) : undefined)}
disabled={!siteId}
/> */}
-
<PricingCard
title="Standard"
description="Everything you need to get started as a small business"
- priceDisplay={
- isCustomTier ? (
- <div className="text-3xl font-bold">Custom</div>
- ) : (
- <div>
- <span className="text-3xl font-bold">
- ${isAnnual ? Math.round(standardAnnualPrice / 12) : standardMonthlyPrice}
- </span>
- <span className="ml-1 text-neutral-600 dark:text-neutral-400">/month</span>
- </div>
- )
- }
+ monthlyPrice={standardMonthlyPrice}
+ annualPrice={standardAnnualPrice}
+ isAnnual={isAnnual}
+ isCustomTier={isCustomTier}
buttonText={isLoading ? "Processing..." : isCustomTier ? "Contact us" : "Get started"}
features={STANDARD_FEATURES}
onClick={() => handleSubscribe("standard")}
disabled={isLoading}
/>
-
<PricingCard
title="Pro"
description="Advanced features for professional teams"
- priceDisplay={
- isCustomTier ? (
- <div className="text-3xl font-bold">Custom</div>
- ) : (
- <div>
- <span className="text-3xl font-bold">
- ${isAnnual ? Math.round(proAnnualPrice / 12) : proMonthlyPrice}
- </span>
- <span className="ml-1 text-neutral-600 dark:text-neutral-400">/month</span>
- </div>
- )
- }
+ isCustomTier={isCustomTier}
+ monthlyPrice={proMonthlyPrice}
+ annualPrice={proAnnualPrice}
+ isAnnual={isAnnual}
buttonText={isLoading ? "Processing..." : isCustomTier ? "Contact us" : "Get started"}
features={PRO_FEATURES}
recommended={true}
@@ -308,12 +288,7 @@ export function PricingCards({ isLoggedIn }: { isLoggedIn: boolean }) {
<PricingCard
title="Test"
description="$1 test subscription for development"
- priceDisplay={
- <div>
- <span className="text-3xl font-bold">$1</span>
- <span className="ml-1 text-neutral-600 dark:text-neutral-400">/month</span>
- </div>
- }
+ isCustomTier={isCustomTier}
buttonText={isLoading ? "Processing..." : "Subscribe ($1)"}
features={["Test plan"]}
onClick={() => handleTestSubscribe()}
@@ -324,8 +299,8 @@ export function PricingCards({ isLoggedIn }: { isLoggedIn: boolean }) {
<PricingCard
title="Enterprise"
description="Advanced features for enterprise teams"
- priceDisplay={<div className="text-3xl font-bold">Custom</div>}
features={ENTERPRISE_FEATURES}
+ isCustomTier={true}
customButton={
<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-lg 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">
diff --git a/client/src/app/subscribe/page.tsx b/client/src/app/subscribe/page.tsx
index 2e74ba0fd..4adabc981 100644
--- a/client/src/app/subscribe/page.tsx
+++ b/client/src/app/subscribe/page.tsx
@@ -36,7 +36,6 @@ function SubscribeContent() {
<StandardPage>
<div className="container mx-auto py-12 px-4">
<PricingHeader />
-
{/* Pricing Card */}
<PricingCards isLoggedIn={!!sessionData?.user} />
</div>
@@ -48,10 +47,8 @@ function SubscribeContent() {
<StandardPage>
<div className="container mx-auto py-12 px-4">
<PricingHeader />
-
{/* Pricing Card */}
<PricingCards isLoggedIn={!!sessionData?.user} />
-
{/* Usage Stats and Chart */}
{organizationId && (
<div className="max-w-4xl mx-auto mt-6 bg-white dark:bg-neutral-900/80 rounded-xl border border-neutral-100 dark:border-neutral-850 p-6">
diff --git a/client/src/components/pricing/PricingCard.tsx b/client/src/components/pricing/PricingCard.tsx
index 7a6707aa2..80b029cfa 100644
--- a/client/src/components/pricing/PricingCard.tsx
+++ b/client/src/components/pricing/PricingCard.tsx
@@ -7,7 +7,6 @@ export type FeatureItem = { feature: string; included?: boolean } | string;
export interface PricingCardProps {
title: string;
description: string;
- priceDisplay: React.ReactNode;
buttonText?: string;
buttonVariant?: "default" | "primary";
features: FeatureItem[];
@@ -17,12 +16,15 @@ export interface PricingCardProps {
customButton?: React.ReactNode;
onClick?: () => void;
disabled?: boolean;
+ isCustomTier?: boolean;
+ monthlyPrice?: number;
+ annualPrice?: number;
+ isAnnual?: boolean;
}
export function PricingCard({
title,
description,
- priceDisplay,
buttonText,
buttonVariant = "primary",
features,
@@ -32,6 +34,10 @@ export function PricingCard({
customButton,
onClick,
disabled,
+ isCustomTier = false,
+ monthlyPrice,
+ annualPrice,
+ isAnnual = false,
}: PricingCardProps) {
const [isExpanded, setIsExpanded] = useState(false);
const isFree = variant === "free";
@@ -67,7 +73,18 @@ export function PricingCard({
</div>
{/* Price display */}
- <div className="mb-6">{priceDisplay}</div>
+ <div className="mb-6 space-y-1">
+ <div>{isCustomTier ? <div className="text-3xl font-bold">Custom
+ </div> : <div>
+ <span className="text-3xl font-bold">
+ ${isAnnual ? Math.round(annualPrice! / 12) : monthlyPrice}
+ </span>
+ <span className="ml-1 pb-1 text-neutral-600 dark:text-neutral-400">/month</span>
+ </div>}</div>
+ <div className="text-xs">
+ <span className="text-xs text-neutral-600 dark:text-neutral-400">billed {isAnnual ? `annually at $${annualPrice}` : "monthly"}</span>
+ </div>
+ </div>
{customButton ? (
customButton