🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Add Basic plan to subscription options with corresponding features and pricing; update related components for integration (#892)
Goldflag2be8202e1307
diff --git a/client/src/app/[site]/goals/page.tsx b/client/src/app/[site]/goals/page.tsxindex fb79b1ea9..db98a0ed5 100644--- a/client/src/app/[site]/goals/page.tsx+++ b/client/src/app/[site]/goals/page.tsx@@ -137,7 +137,7 @@ export default function GoalsPage() {: undefined;return (- <DisabledOverlay message="Goals" featurePath="goals">+ <DisabledOverlay message="Goals" featurePath="goals" requiredPlan="basic"><div className="p-2 md:p-4 max-w-[1400px] mx-auto space-y-3"><SubHeader availableFilters={GOALS_PAGE_FILTERS} /><div className="flex items-center justify-between">diff --git a/client/src/app/subscribe/components/PricingCards.tsx b/client/src/app/subscribe/components/PricingCards.tsxindex 48ec0f67c..d8ac45049 100644--- a/client/src/app/subscribe/components/PricingCards.tsx+++ b/client/src/app/subscribe/components/PricingCards.tsx@@ -9,6 +9,7 @@ import { cn } from "@/lib/utils";import { useEffect, useState } from "react";import { trackAdEvent } from "../../../lib/trackAdEvent";import {+ BASIC_FEATURES,ENTERPRISE_FEATURES,EVENT_TIERS,PRO_FEATURES,@@ -43,7 +44,7 @@ export function PricingCards({ isLoggedIn }: { isLoggedIn: boolean }) {const eventLimit = EVENT_TIERS[eventLimitIndex];// Handle subscription for a specific plan type- async function handleSubscribe(planType: "standard" | "pro"): Promise<void> {+ async function handleSubscribe(planType: "basic" | "standard" | "pro"): Promise<void> {// Handle custom tier by redirecting to email contactif (eventLimit === "Custom") {window.location.href = "https://www.rybbit.com/contact";@@ -164,7 +165,10 @@ export function PricingCards({ isLoggedIn }: { isLoggedIn: boolean }) {setEventLimitIndex(value[0]);}- // Get pricing information for both plans+ // Get pricing information for all plans+ const basicMonthlyPrice = findPriceForTier(eventLimit, "month", "basic")?.price || 0;+ const basicAnnualPrice = findPriceForTier(eventLimit, "year", "basic")?.price || 0;+ const isBasicAvailable = typeof eventLimit === "number" && eventLimit <= 250_000;const standardMonthlyPrice = findPriceForTier(eventLimit, "month", "standard")?.price || 0;const standardAnnualPrice = findPriceForTier(eventLimit, "year", "standard")?.price || 0;const proMonthlyPrice = findPriceForTier(eventLimit, "month", "pro")?.price || 0;@@ -241,23 +245,22 @@ export function PricingCards({ isLoggedIn }: { isLoggedIn: boolean }) {</div>{/* Cards section */}- <div className="grid min-[1100px]:grid-cols-3 min-[400px]:grid-cols-1 gap-6 max-w-[1000px] mx-auto mb-16">- {/* <PricingCard- title="Free"- description="Perfect for hobby projects"- priceDisplay={- <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>- }- buttonText={siteId ? "Continue free" : "Current plan"}- buttonVariant="default"- features={FREE_FEATURES}- variant="free"- onClick={() => (siteId ? router.push(`/${siteId}`) : undefined)}- disabled={!siteId}- /> */}+ <div className="grid min-[1100px]:grid-cols-4 min-[700px]:grid-cols-2 min-[400px]:grid-cols-1 gap-4 mx-auto mb-16">+ <div className={cn("h-full", !isBasicAvailable && "opacity-60")}>+ <PricingCard+ title="Basic"+ description="For personal projects and small sites"+ monthlyPrice={basicMonthlyPrice}+ annualPrice={basicAnnualPrice}+ isAnnual={isAnnual}+ isCustomTier={!isBasicAvailable}+ customPriceLabel="-"+ buttonText={!isBasicAvailable ? "Up to 250k only" : isLoading ? "Processing..." : "Get started"}+ features={BASIC_FEATURES}+ onClick={() => handleSubscribe("basic")}+ disabled={isLoading || !isBasicAvailable}+ />+ </div><PricingCardtitle="Standard"description="Everything you need to get started as a small business"diff --git a/client/src/app/subscribe/components/utils.ts b/client/src/app/subscribe/components/utils.tsindex eedcf33f9..ec0566390 100644--- a/client/src/app/subscribe/components/utils.ts+++ b/client/src/app/subscribe/components/utils.ts@@ -1,27 +1,35 @@// Common utility functions and constants for subscription components-import { FREE_SITE_LIMIT, STANDARD_SITE_LIMIT, STANDARD_TEAM_LIMIT } from "../../../lib/const";+import { BASIC_SITE_LIMIT, BASIC_TEAM_LIMIT, FREE_SITE_LIMIT, STANDARD_SITE_LIMIT, STANDARD_TEAM_LIMIT } from "../../../lib/const";import { getStripePrices, STRIPE_TIERS } from "../../../lib/stripe";import { FeatureItem } from "@/components/pricing/PricingCard";export const EVENT_TIERS = [...STRIPE_TIERS.map(tier => tier.events), "Custom"];+export const BASIC_FEATURES = [+ `${BASIC_SITE_LIMIT} website`,+ `${BASIC_TEAM_LIMIT} team member`,+ "Web analytics dashboard",+ "Goals",+ "Custom events",+ "2 year data retention",+ "Email support",+];+export const STANDARD_FEATURES = [+ "Everything in Basic",`Up to ${STANDARD_SITE_LIMIT} websites`,`Up to ${STANDARD_TEAM_LIMIT} team members`,"Custom events","Funnels",- "Goals","Journeys","Web vitals","Error tracking","User profiles","Retention","Sessions",- "Email reports",- "2 year data retention",- "Email support",+ "3D globe view"];export const PRO_FEATURES = [@@ -63,7 +71,7 @@ const stripePrices = getStripePrices();export function findPriceForTier(eventLimit: number | string,interval: "month" | "year",- planType: "standard" | "pro" = "standard"+ planType: "basic" | "standard" | "pro" = "standard") {// Check if we have a custom tierif (eventLimit === "Custom") {diff --git a/client/src/components/DisabledOverlay.tsx b/client/src/components/DisabledOverlay.tsxindex c54597a43..02cec8e81 100644--- a/client/src/components/DisabledOverlay.tsx+++ b/client/src/components/DisabledOverlay.tsx@@ -16,10 +16,10 @@ interface DisabledOverlayProps {borderRadius?: number;showMessage?: boolean;style?: React.CSSProperties;- requiredPlan?: "pro" | "standard";+ requiredPlan?: "pro" | "standard" | "basic";}-function ownerMessage(message: string, featurePath?: string, requiredPlan?: "pro" | "standard") {+function ownerMessage(message: string, featurePath?: string, requiredPlan?: "pro" | "standard" | "basic") {return (<div className="bg-neutral-900 rounded-lg border border-neutral-700 shadow-xl flex flex-col gap-3 p-4"><div className="flex gap-3">@@ -27,7 +27,7 @@ function ownerMessage(message: string, featurePath?: string, requiredPlan?: "pro<div className="flex-1 space-y-1"><p className="text-sm text-muted-foreground">Upgrade to{" "}- <span className="font-medium text-foreground">{requiredPlan === "pro" ? "Pro" : "Standard"}</span> to unlock{" "}+ <span className="font-medium text-foreground">{requiredPlan === "pro" ? "Pro" : requiredPlan === "basic" ? "Basic" : "Standard"}</span> to unlock{" "}{message}</p>{featurePath && (@@ -102,13 +102,21 @@ export const DisabledOverlay: React.FC<DisabledOverlayProps> = ({if (!IS_CLOUD) {return false;}+ const isFree = subscription?.eventLimit === DEFAULT_EVENT_LIMIT;+ const isBasic = subscription?.planName?.includes("basic") ?? false;+if (requiredPlan === "pro") {if (organization?.createdAt && DateTime.fromJSDate(organization?.createdAt) < DateTime.fromISO("2025-09-19")) {return false;}return !subscription?.planName.includes("pro");}- return subscription?.eventLimit === DEFAULT_EVENT_LIMIT;+ if (requiredPlan === "basic") {+ // Basic and above can access — only free is blocked+ return isFree;+ }+ // requiredPlan === "standard" (default): free and basic are blocked+ return isFree || isBasic;}, [subscription, requiredPlan, organization]);// MutationObserver to detect and restore overlay if removed or modifieddiff --git a/client/src/components/pricing/PricingCard.tsx b/client/src/components/pricing/PricingCard.tsxindex 80b029cfa..c43037be1 100644--- a/client/src/components/pricing/PricingCard.tsx+++ b/client/src/components/pricing/PricingCard.tsx@@ -17,6 +17,7 @@ export interface PricingCardProps {onClick?: () => void;disabled?: boolean;isCustomTier?: boolean;+ customPriceLabel?: string;monthlyPrice?: number;annualPrice?: number;isAnnual?: boolean;@@ -35,6 +36,7 @@ export function PricingCard({onClick,disabled,isCustomTier = false,+ customPriceLabel,monthlyPrice,annualPrice,isAnnual = false,@@ -47,7 +49,7 @@ export function PricingCard({const displayedFeatures = shouldShowToggle && !isExpanded ? features.slice(0, 7) : features;return (- <div className="w-full flex-shrink-0">+ <div className="w-full flex-shrink-0 h-full"><div className="bg-neutral-200/20 dark:bg-neutral-900/40 p-2 rounded-3xl border border-neutral-200 dark:border-neutral-800 h-full"><divclassName={cn(@@ -74,7 +76,7 @@ export function PricingCard({{/* Price display */}<div className="mb-6 space-y-1">- <div>{isCustomTier ? <div className="text-3xl font-bold">Custom+ <div>{isCustomTier ? <div className="text-3xl font-bold">{customPriceLabel || "Custom"}</div> : <div><span className="text-3xl font-bold">${isAnnual ? Math.round(annualPrice! / 12) : monthlyPrice}diff --git a/client/src/components/subscription/PaidPlain/PaidPlan.tsx b/client/src/components/subscription/PaidPlain/PaidPlan.tsxindex 28711ae91..a09254b26 100644--- a/client/src/components/subscription/PaidPlain/PaidPlan.tsx+++ b/client/src/components/subscription/PaidPlain/PaidPlan.tsx@@ -37,14 +37,20 @@ export function PaidPlan() {const stripePlan = getStripePrices().find(p => p.name === activeSubscription?.planName);+ const planType = activeSubscription ? getPlanType(activeSubscription.planName) : null;+const currentPlanDetails = activeSubscription? {- id: getPlanType(activeSubscription?.planName),- name: getPlanType(activeSubscription?.planName),+ id: planType,+ name: planType,price: `$${stripePlan?.price}`,interval: stripePlan?.interval,- description: getPlanType(activeSubscription?.planName) === "Pro" ? "Premium features for professional teams" : "Advanced analytics for growing projects",- features: getPlanType(activeSubscription?.planName) === "Pro"+ description: planType === "Pro"+ ? "Premium features for professional teams"+ : planType === "Basic"+ ? "Core analytics for personal projects"+ : "Advanced analytics for growing projects",+ features: planType === "Pro"? ["5+ year data retention","Session replays",@@ -52,10 +58,21 @@ export function PaidPlan() {"Unlimited websites","Priority support",]- : ["1 year data retention", "Standard support", "Core analytics features"],- color: getPlanType(activeSubscription?.planName) === "Pro"+ : planType === "Basic"+ ? [+ "1 website",+ "1 team member",+ "Web analytics dashboard",+ "Goals & custom events",+ "2 year data retention",+ "Email support",+ ]+ : ["2 year data retention", "Up to 5 websites", "Up to 3 team members", "Email support"],+ color: planType === "Pro"? "bg-linear-to-br from-purple-50 to-indigo-100 dark:from-purple-800 dark:to-indigo-800"- : "bg-linear-to-br from-green-50 to-emerald-100 dark:from-green-800 dark:to-emerald-800",+ : planType === "Basic"+ ? "bg-linear-to-br from-blue-50 to-sky-100 dark:from-blue-800 dark:to-sky-800"+ : "bg-linear-to-br from-green-50 to-emerald-100 dark:from-green-800 dark:to-emerald-800",icon: <Shield className="h-5 w-5" />,}: null;diff --git a/client/src/components/subscription/PaidPlain/PlanDialog.tsx b/client/src/components/subscription/PaidPlain/PlanDialog.tsxindex c6789d0b2..87a79e170 100644--- a/client/src/components/subscription/PaidPlain/PlanDialog.tsx+++ b/client/src/components/subscription/PaidPlain/PlanDialog.tsx@@ -87,7 +87,7 @@ export function PlanDialog({ open, onOpenChange, currentPlanName, hasActiveSubsc}};- const getPriceForTier = (events: number, planType: "standard" | "pro") => {+ const getPriceForTier = (events: number, planType: "basic" | "standard" | "pro") => {const suffix = isAnnual ? "-annual" : "";const planName = `${planType}${events >= 1_000_000 ? events / 1_000_000 + "m" : events / 1_000 + "k"}${suffix}`;const plan = stripePrices.find(p => p.name === planName);@@ -131,7 +131,7 @@ export function PlanDialog({ open, onOpenChange, currentPlanName, hasActiveSubscreturn (<><Dialog open={open} onOpenChange={onOpenChange}>- <DialogContent className="max-w-3xl max-h-[90vh] overflow-y-auto">+ <DialogContent className="max-w-5xl max-h-[90vh] overflow-y-auto"><DialogHeader><DialogTitle>Choose Your Plan</DialogTitle></DialogHeader>@@ -166,53 +166,60 @@ export function PlanDialog({ open, onOpenChange, currentPlanName, hasActiveSubsc</div>{/* Plan columns */}- <div className="grid grid-cols-2 gap-6">+ <div className="grid grid-cols-3 gap-6">{[+ { type: "basic" as const, title: "Basic", subtitle: "For personal projects" },{ type: "standard" as const, title: "Standard", subtitle: "Core analytics features" },{ type: "pro" as const, title: "Pro", subtitle: "Advanced features + session replays" },- ].map(({ type, title, subtitle }) => (- <div key={type} className="space-y-3">- <div className="mb-4">- <h3 className="text-xl font-bold">{title}</h3>- <p className="text-sm text-neutral-500 dark:text-neutral-400">{subtitle}</p>- </div>- <div className="space-y-2">- {STRIPE_TIERS.map(tier => {- const plan = getPriceForTier(tier.events, type);- if (!plan) return null;- const isCurrent = isCurrentPlan(plan.name);- const isLoading = previewMutation.isPending && pendingPriceId === plan.priceId;-- return (- <div- key={plan.name}- className={cn(- "flex flex-col gap-2 justify-between p-3 rounded-lg border cursor-pointer",- isCurrent- ? "bg-emerald-500/10 border-emerald-500"- : "bg-neutral-50 dark:bg-neutral-800/20 border-neutral-100 dark:border-neutral-700/50 hover:bg-neutral-200 dark:hover:bg-neutral-800/30",- isLoading && "opacity-50"- )}- onClick={() => handlePlanSelection(plan.priceId, plan.name)}- >- <div className="flex justify-between w-full">- <div className="text-neutral-900 dark:text-neutral-100 font-medium flex-end">- {tier.shortName} events{" "}- <span className="text-neutral-500 dark:text-neutral-400 text-xs font-normal">/ month</span>- </div>- <div className="text-xs text-neutral-500 dark:text-neutral-400">- <span className="text-neutral-700 dark:text-neutral-200 font-semibold text-base">- ${isAnnual ? Math.round(plan.price / 12) : plan.price}- </span>{" "}- /month+ ].map(({ type, title, subtitle }) => {+ const tiers = type === "basic"+ ? STRIPE_TIERS.filter(t => t.events <= 250_000)+ : STRIPE_TIERS;++ return (+ <div key={type} className="space-y-3">+ <div className="mb-4">+ <h3 className="text-xl font-bold">{title}</h3>+ <p className="text-sm text-neutral-500 dark:text-neutral-400">{subtitle}</p>+ </div>+ <div className="space-y-2">+ {tiers.map(tier => {+ const plan = getPriceForTier(tier.events, type);+ if (!plan) return null;+ const isCurrent = isCurrentPlan(plan.name);+ const isLoading = previewMutation.isPending && pendingPriceId === plan.priceId;++ return (+ <div+ key={plan.name}+ className={cn(+ "flex flex-col gap-2 justify-between p-3 rounded-lg border cursor-pointer",+ isCurrent+ ? "bg-emerald-500/10 border-emerald-500"+ : "bg-neutral-50 dark:bg-neutral-800/20 border-neutral-100 dark:border-neutral-700/50 hover:bg-neutral-200 dark:hover:bg-neutral-800/30",+ isLoading && "opacity-50"+ )}+ onClick={() => handlePlanSelection(plan.priceId, plan.name)}+ >+ <div className="flex justify-between w-full">+ <div className="text-neutral-900 dark:text-neutral-100 font-medium flex-end">+ {tier.shortName} events{" "}+ <span className="text-neutral-500 dark:text-neutral-400 text-xs font-normal">/ month</span>+ </div>+ <div className="text-xs text-neutral-500 dark:text-neutral-400">+ <span className="text-neutral-700 dark:text-neutral-200 font-semibold text-base">+ ${isAnnual ? Math.round(plan.price / 12) : plan.price}+ </span>{" "}+ /month+ </div></div></div>- </div>- );- })}+ );+ })}+ </div></div>- </div>- ))}+ );+ })}</div>{/* Features comparison link */}diff --git a/client/src/lib/const.ts b/client/src/lib/const.tsindex 548dc09fb..30a3c390a 100644--- a/client/src/lib/const.ts+++ b/client/src/lib/const.ts@@ -12,3 +12,5 @@ export const DEMO_HOSTNAME = "demo.rybbit.com";export const FREE_SITE_LIMIT = 1;export const STANDARD_SITE_LIMIT = 5;export const STANDARD_TEAM_LIMIT = 3;+export const BASIC_SITE_LIMIT = 1;+export const BASIC_TEAM_LIMIT = 1;\ No newline at end of filediff --git a/client/src/lib/stripe.ts b/client/src/lib/stripe.tsindex 35c3f9a62..252d0a0c3 100644--- a/client/src/lib/stripe.ts+++ b/client/src/lib/stripe.ts@@ -8,6 +8,38 @@ export interface StripePrice {}const STRIPE_PRICES: StripePrice[] = [+ {+ priceId: "price_1T2No5DFVprnAny2ahUc6TEI",+ name: "basic100k",+ interval: "month",+ price: 14,+ events: 100_000,+ shortName: "100k",+ },+ {+ priceId: "price_1T2NqJDFVprnAny21UlXbpxY",+ name: "basic100k-annual",+ interval: "year",+ price: 14 * 8,+ events: 100_000,+ shortName: "100k",+ },+ {+ priceId: "price_1T2NpzDFVprnAny2EmAIheV8",+ name: "basic250k",+ interval: "month",+ price: 24,+ events: 250_000,+ shortName: "250k",+ },+ {+ priceId: "price_1T2NrRDFVprnAny2N4KhTwQn",+ name: "basic250k-annual",+ interval: "year",+ price: 24 * 8,+ events: 250_000,+ shortName: "250k",+ },// Standard tiers{price: 19,@@ -321,6 +353,9 @@ export const getStripePrices = () => {};export function getPlanType(name: string) {+ if (name.includes("basic")) {+ return "Basic";+ }if (name.includes("standard")) {return "Standard";}diff --git a/docs/src/app/(home)/pricing/components/ComparisonSection.tsx b/docs/src/app/(home)/pricing/components/ComparisonSection.tsxindex 4a3174840..9a43b2151 100644--- a/docs/src/app/(home)/pricing/components/ComparisonSection.tsx+++ b/docs/src/app/(home)/pricing/components/ComparisonSection.tsx@@ -3,7 +3,7 @@import { Check, Minus } from "lucide-react";import { cn } from "@/lib/utils";import { AppLink } from "@/components/AppLink";-import { DEFAULT_EVENT_LIMIT, FREE_SITE_LIMIT, STANDARD_SITE_LIMIT, STANDARD_TEAM_LIMIT } from "../../../../lib/const";+import { BASIC_SITE_LIMIT, BASIC_TEAM_LIMIT, DEFAULT_EVENT_LIMIT, FREE_SITE_LIMIT, STANDARD_SITE_LIMIT, STANDARD_TEAM_LIMIT } from "../../../../lib/const";const COMPARISON_FEATURES = [{@@ -12,6 +12,7 @@ const COMPARISON_FEATURES = [{name: "Monthly pageviews",free: DEFAULT_EVENT_LIMIT.toLocaleString(),+ basic: "100K - 250K",standard: "100K - 20M+",pro: "100K - 20M+",enterprise: "Custom",@@ -19,6 +20,7 @@ const COMPARISON_FEATURES = [{name: "Number of websites",free: `${FREE_SITE_LIMIT}`,+ basic: `${BASIC_SITE_LIMIT}`,standard: `Up to ${STANDARD_SITE_LIMIT}`,pro: "Unlimited",enterprise: "Unlimited",@@ -26,6 +28,7 @@ const COMPARISON_FEATURES = [{name: "Team members",free: "1",+ basic: `${BASIC_TEAM_LIMIT}`,standard: `Up to ${STANDARD_TEAM_LIMIT}`,pro: "Unlimited",enterprise: "Unlimited",@@ -38,6 +41,7 @@ const COMPARISON_FEATURES = [{name: "Core analytics dashboard",free: true,+ basic: true,standard: true,pro: true,enterprise: true,@@ -45,6 +49,7 @@ const COMPARISON_FEATURES = [{name: "Advanced filtering",free: true,+ basic: true,standard: true,pro: true,enterprise: true,@@ -52,6 +57,7 @@ const COMPARISON_FEATURES = [{name: "Custom events",free: true,+ basic: true,standard: true,pro: true,enterprise: true,@@ -59,6 +65,15 @@ const COMPARISON_FEATURES = [{name: "Bot filtering",free: true,+ basic: true,+ standard: true,+ pro: true,+ enterprise: true,+ },+ {+ name: "Goals",+ free: false,+ basic: true,standard: true,pro: true,enterprise: true,@@ -66,6 +81,7 @@ const COMPARISON_FEATURES = [{name: "Real-time globe",free: false,+ basic: false,standard: true,pro: true,enterprise: true,@@ -73,6 +89,7 @@ const COMPARISON_FEATURES = [{name: "Web vitals",free: false,+ basic: false,standard: true,pro: true,enterprise: true,@@ -80,6 +97,7 @@ const COMPARISON_FEATURES = [{name: "Error tracking",free: false,+ basic: false,standard: true,pro: true,enterprise: true,@@ -87,6 +105,7 @@ const COMPARISON_FEATURES = [{name: "Pages view",free: false,+ basic: false,standard: true,pro: true,enterprise: true,@@ -94,6 +113,7 @@ const COMPARISON_FEATURES = [{name: "Sessions",free: false,+ basic: false,standard: true,pro: true,enterprise: true,@@ -101,6 +121,7 @@ const COMPARISON_FEATURES = [{name: "User profiles",free: false,+ basic: false,standard: true,pro: true,enterprise: true,@@ -108,13 +129,7 @@ const COMPARISON_FEATURES = [{name: "Funnels",free: false,- standard: true,- pro: true,- enterprise: true,- },- {- name: "Goals",- free: false,+ basic: false,standard: true,pro: true,enterprise: true,@@ -122,6 +137,7 @@ const COMPARISON_FEATURES = [{name: "Journeys",free: false,+ basic: false,standard: true,pro: true,enterprise: true,@@ -129,6 +145,7 @@ const COMPARISON_FEATURES = [{name: "Retention",free: false,+ basic: false,standard: true,pro: true,enterprise: true,@@ -136,6 +153,7 @@ const COMPARISON_FEATURES = [{name: "Email reports",free: false,+ basic: false,standard: true,pro: true,enterprise: true,@@ -143,6 +161,7 @@ const COMPARISON_FEATURES = [{name: "API",free: false,+ basic: false,standard: true,pro: true,enterprise: true,@@ -150,6 +169,7 @@ const COMPARISON_FEATURES = [{name: "Session replays",free: false,+ basic: false,standard: false,pro: true,enterprise: true,@@ -157,6 +177,7 @@ const COMPARISON_FEATURES = [{name: "Single Sign-On (SSO)",free: false,+ basic: false,standard: false,pro: false,enterprise: true,@@ -164,6 +185,7 @@ const COMPARISON_FEATURES = [{name: "Dedicated isolated instance",free: false,+ basic: false,standard: false,pro: false,enterprise: true,@@ -171,6 +193,7 @@ const COMPARISON_FEATURES = [{name: "On-premise installation",free: false,+ basic: false,standard: false,pro: false,enterprise: true,@@ -178,6 +201,7 @@ const COMPARISON_FEATURES = [{name: "Custom features",free: false,+ basic: false,standard: false,pro: false,enterprise: true,@@ -185,6 +209,7 @@ const COMPARISON_FEATURES = [{name: "Whitelabeling",free: false,+ basic: false,standard: false,pro: false,enterprise: true,@@ -197,6 +222,7 @@ const COMPARISON_FEATURES = [{name: "Privacy-friendly",free: true,+ basic: true,standard: true,pro: true,enterprise: true,@@ -204,6 +230,7 @@ const COMPARISON_FEATURES = [{name: "No cookies required",free: true,+ basic: true,standard: true,pro: true,enterprise: true,@@ -211,6 +238,7 @@ const COMPARISON_FEATURES = [{name: "Data retention",free: "6 months",+ basic: "2 years",standard: "2 years",pro: "5 years",enterprise: "Infinite",@@ -223,6 +251,7 @@ const COMPARISON_FEATURES = [{name: "Support",free: "Community",+ basic: "Email",standard: "Email",pro: "Priority",enterprise: "Enterprise + Slack",@@ -230,6 +259,7 @@ const COMPARISON_FEATURES = [{name: "Manual invoicing",free: false,+ basic: false,standard: false,pro: false,enterprise: true,@@ -237,6 +267,7 @@ const COMPARISON_FEATURES = [{name: "Uptime SLA",free: false,+ basic: false,standard: false,pro: false,enterprise: true,@@ -264,26 +295,27 @@ function FeatureCell({ value }: FeatureCellProps) {export function ComparisonSection({ isAnnual }: { isAnnual: boolean }) {return (<section className="-mt-8 pb-8 w-full relative z-10">- <div className="max-w-[1040px] mx-auto px-4 overflow-x-auto">+ <div className="max-w-[1200px] mx-auto px-4 overflow-x-auto"><div className="bg-neutral-200/40 dark:bg-neutral-900/40 p-2 rounded-3xl border border-neutral-300 dark:border-neutral-800">- <div className="bg-neutral-50 dark:bg-neutral-900 backdrop-blur-sm rounded-2xl border border-neutral-300 dark:border-neutral-800 overflow-hidden min-w-[800px]">+ <div className="bg-neutral-50 dark:bg-neutral-900 backdrop-blur-sm rounded-2xl border border-neutral-300 dark:border-neutral-800 overflow-hidden min-w-[900px]">{/* Table Header */}- <div className="grid grid-cols-4 gap-0 py-6 bg-neutral-100/50 dark:bg-neutral-800/20">+ <div className="grid grid-cols-5 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-4 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>+ Basic{" "}+ <span className="text-sm text-neutral-500 dark:text-neutral-400 font-normal block">From ${isAnnual ? "12" : "14"} /month</span></div><AppLinkhref="https://app.rybbit.io/signup"- className="inline-flex items-center justify-center px-4 py-2 bg-neutral-300 dark:bg-neutral-700 hover:bg-neutral-400 dark:hover:bg-neutral-600 text-neutral-900 dark:text-white text-sm font-medium rounded-lg border border-neutral-400 dark:border-neutral-600 transform hover:-translate-y-0.5 transition-all duration-200"+ className="inline-flex items-center justify-center px-4 py-2 bg-emerald-600 hover:bg-emerald-500 text-white text-sm font-medium rounded-lg shadow-lg shadow-emerald-900/20 transform hover:-translate-y-0.5 transition-all duration-200">- Start Free+ Get started</AppLink>- </div> */}- <div className="flex flex-col items-center justify-center px-6 border-r border-neutral-400/50 dark:border-neutral-700/50">+ </div>+ <div className="flex flex-col items-center justify-center px-4 border-r border-neutral-400/50 dark:border-neutral-700/50"><div className="font-semibold text-lg text-center mb-3">Standard{" "}<span className="text-sm text-neutral-500 dark:text-neutral-400 font-normal block">From ${isAnnual ? "16" : "19"} /month</span>@@ -295,7 +327,7 @@ export function ComparisonSection({ isAnnual }: { isAnnual: boolean }) {Get started</AppLink></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-4 border-r border-neutral-400/50 dark:border-neutral-700/50"><div className="font-semibold text-lg text-emerald-600 dark:text-emerald-400 text-center mb-3">Pro{" "}<span className="text-sm text-neutral-500 dark:text-neutral-400 font-normal block">From ${isAnnual ? "33" : "39"} /month</span>@@ -307,7 +339,7 @@ export function ComparisonSection({ isAnnual }: { isAnnual: boolean }) {Get started</AppLink></div>- <div className="flex flex-col items-center justify-center px-6">+ <div className="flex flex-col items-center justify-center px-4"><div className="font-semibold text-lg text-center mb-3">Enterprise{" "}<span className="text-sm text-neutral-500 dark:text-neutral-400 font-normal block">Custom</span>@@ -326,13 +358,13 @@ export function ComparisonSection({ isAnnual }: { isAnnual: boolean }) {<div key={categoryIndex}>{/* Category Header - Skip for "Usage" category */}{category.category !== "Usage" && (- <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="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="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}</h3></div>- {/* <div className="border-r border-neutral-400/50 dark:border-neutral-700/50"></div> */}+ <div className="border-r border-neutral-400/50 dark:border-neutral-700/50"></div><div className="border-r border-neutral-400/50 dark:border-neutral-700/50"></div><div className="border-r border-neutral-400/50 dark:border-neutral-700/50"></div><div></div>@@ -343,21 +375,21 @@ export function ComparisonSection({ isAnnual }: { isAnnual: boolean }) {{category.features.map((feature, featureIndex) => (<divkey={featureIndex}- 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"+ 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"><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">- <FeatureCell value={feature.free} />- </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-4 border-r border-neutral-400/50 dark:border-neutral-700/50">+ <FeatureCell value={feature.basic} />+ </div>+ <div className="flex items-center justify-center px-4 border-r border-neutral-400/50 dark:border-neutral-700/50"><FeatureCell value={feature.standard} /></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-4 border-r border-neutral-400/50 dark:border-neutral-700/50"><FeatureCell value={feature.pro} /></div>- <div className="flex items-center justify-center px-6">+ <div className="flex items-center justify-center px-4"><FeatureCell value={feature.enterprise} /></div></div>diff --git a/docs/src/components/PricingCard.tsx b/docs/src/components/PricingCard.tsxindex 305cbbf7b..b478afe10 100644--- a/docs/src/components/PricingCard.tsx+++ b/docs/src/components/PricingCard.tsx@@ -47,7 +47,7 @@ export function PricingCard({const displayedFeatures = shouldShowToggle && !isExpanded ? features.slice(0, 7) : features;return (- <div className="w-full flex-shrink-0">+ <div className="w-full flex-shrink-0 h-full"><div className="bg-neutral-200/40 dark:bg-neutral-900/40 p-2 rounded-3xl border border-neutral-300 dark:border-neutral-800 h-full"><divclassName={cn(diff --git a/docs/src/components/PricingSection.tsx b/docs/src/components/PricingSection.tsxindex cf0f61967..9ee8abdd7 100644--- a/docs/src/components/PricingSection.tsx+++ b/docs/src/components/PricingSection.tsx@@ -4,12 +4,23 @@ import { Slider } from "@/components/ui/slider";import { cn } from "@/lib/utils";import { getCalApi } from "@calcom/embed-react";import { useEffect, useState } from "react";-import { DEFAULT_EVENT_LIMIT, FREE_SITE_LIMIT, STANDARD_SITE_LIMIT, STANDARD_TEAM_LIMIT } from "../lib/const";+import { BASIC_SITE_LIMIT, BASIC_TEAM_LIMIT, DEFAULT_EVENT_LIMIT, FREE_SITE_LIMIT, STANDARD_SITE_LIMIT, STANDARD_TEAM_LIMIT } from "../lib/const";import { PricingCard } from "./PricingCard";// Available event tiers for the sliderconst EVENT_TIERS = [100_000, 250_000, 500_000, 1_000_000, 2_000_000, 5_000_000, 10_000_000, 20_000_000, "Custom"];+// Define basic plan features+const BASIC_FEATURES = [+ `${BASIC_SITE_LIMIT} website`,+ `${BASIC_TEAM_LIMIT} team member`,+ "Web analytics dashboard",+ "Goals",+ "Custom events",+ "2 year data retention",+ "Email support",+];+// Define standard plan featuresconst STANDARD_FEATURES = [`Up to ${STANDARD_SITE_LIMIT} websites`,@@ -68,13 +79,17 @@ export const formatter = Intl.NumberFormat("en", {notation: "compact",}).format;-// Format price with dollar sign for both Standard and Pro-function getFormattedPrice(eventLimit: number | string, planType: "standard" | "pro") {+// Format price with dollar sign for Basic, Standard, and Pro+function getFormattedPrice(eventLimit: number | string, planType: "basic" | "standard" | "pro") {// Monthly priceslet monthlyPrice;if (typeof eventLimit === "string") return { custom: true }; // Custom pricing- if (planType === "standard") {+ if (planType === "basic") {+ if (eventLimit <= 100_000) monthlyPrice = 14;+ else if (eventLimit <= 250_000) monthlyPrice = 24;+ else return { custom: true };+ } else if (planType === "standard") {// Standard tier pricesif (eventLimit <= 100_000) monthlyPrice = 19;else if (eventLimit <= 250_000) monthlyPrice = 29;@@ -111,6 +126,8 @@ export function PricingSection({ isAnnual, setIsAnnual }: { isAnnual: boolean, sconst [eventLimitIndex, setEventLimitIndex] = useState(0); // Default to 100k (index 0)const eventLimit = EVENT_TIERS[eventLimitIndex];+ const basicPrices = getFormattedPrice(eventLimit, "basic");+ const isBasicAvailable = typeof eventLimit === "number" && eventLimit <= 250_000;const standardPrices = getFormattedPrice(eventLimit, "standard");const proPrices = getFormattedPrice(eventLimit, "pro");@@ -206,24 +223,33 @@ export function PricingSection({ isAnnual, setIsAnnual }: { isAnnual: boolean, s</div>{/* Pricing cards layout */}- <div className="grid min-[1100px]:grid-cols-3 min-[400px]:grid-cols-1 gap-6 max-w-[1000px] mx-auto justify-center items-stretch">- {/* <div className="grid min-[1100px]:grid-cols-3 min-[600px]:grid-cols-2 min-[400px]:grid-cols-1 gap-6 max-w-[1300px] mx-auto justify-center items-stretch"> */}- {/* <PricingCard- title="Free"- description="Perfect for hobby projects"- priceDisplay={- <div>- <span className="text-3xl font-bold">{DEFAULT_EVENT_LIMIT.toLocaleString()}</span>- <span className="ml-1 text-neutral-400">pageviews/m</span>- </div>- }- buttonText="Start for free"- buttonHref="https://app.rybbit.io/signup"- buttonVariant="default"- features={FREE_FEATURES}- variant="free"- eventLocation="free"- /> */}+ <div className="grid min-[1100px]:grid-cols-4 min-[700px]:grid-cols-2 min-[400px]:grid-cols-1 gap-4 mx-auto justify-center items-stretch">+ {/* Basic Plan Card */}+ <div className={cn("h-full", !isBasicAvailable && "opacity-60")}>+ <PricingCard+ title="Basic"+ description="For personal projects and small sites"+ priceDisplay={+ !isBasicAvailable ? (+ <div className="text-3xl font-bold">-</div>+ ) : basicPrices.custom ? (+ <div className="text-3xl font-bold">Custom</div>+ ) : (+ <div>+ <span className="text-3xl font-bold">+ ${isAnnual ? Math.round(basicPrices.annual! / 12) : basicPrices.monthly}+ </span>+ <span className="ml-1 text-neutral-400">/month</span>+ </div>+ )+ }+ buttonText={!isBasicAvailable ? "Up to 250k only" : "Get started"}+ buttonHref={!isBasicAvailable ? undefined : "https://app.rybbit.io/signup"}+ features={BASIC_FEATURES}+ disabled={!isBasicAvailable}+ eventLocation={isBasicAvailable ? "basic" : undefined}+ />+ </div>{/* Standard Plan Card */}<PricingCarddiff --git a/docs/src/lib/const.ts b/docs/src/lib/const.tsindex 747fdcb2c..4beb912a2 100644--- a/docs/src/lib/const.ts+++ b/docs/src/lib/const.ts@@ -1,5 +1,7 @@export const DEFAULT_EVENT_LIMIT = 3_000;export const FREE_SITE_LIMIT = 1;+export const BASIC_SITE_LIMIT = 1;+export const BASIC_TEAM_LIMIT = 1;export const STANDARD_SITE_LIMIT = 5;export const STANDARD_TEAM_LIMIT = 3;diff --git a/server/src/lib/const.ts b/server/src/lib/const.tsindex 55dc60c30..6d53f5b85 100644--- a/server/src/lib/const.ts+++ b/server/src/lib/const.ts@@ -36,6 +36,43 @@ export interface StripePlan {}const STRIPE_PRICES: StripePlan[] = [+ // Basic tiers+ {+ priceId: "price_1T2No5DFVprnAny2ahUc6TEI",+ name: "basic100k",+ interval: "month",+ limits: {+ events: 100_000,+ replays: 10_000,+ },+ },+ {+ priceId: "price_1T2NqJDFVprnAny21UlXbpxY",+ name: "basic100k-annual",+ interval: "year",+ limits: {+ events: 100_000,+ replays: 10_000,+ },+ },+ {+ priceId: "price_1T2NpzDFVprnAny2EmAIheV8",+ name: "basic250k",+ interval: "month",+ limits: {+ events: 250_000,+ replays: 25_000,+ },+ },+ {+ priceId: "price_1T2NrRDFVprnAny2N4KhTwQn",+ name: "basic250k-annual",+ interval: "year",+ limits: {+ events: 250_000,+ replays: 25_000,+ },+ },// Standard tiers{priceId: "price_1RKuxUDFVprnAny2xyyWvXNr",