🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
wip (#874)
Goldflage9260451ac4b
diff --git a/client/src/app/components/AddSite.tsx b/client/src/app/components/AddSite.tsxindex 72462d918..430a7dff1 100644--- a/client/src/app/components/AddSite.tsx+++ b/client/src/app/components/AddSite.tsx@@ -119,6 +119,25 @@ export function AddSite({ trigger, disabled }: { trigger?: React.ReactNode; disasetSaltUserIds(false);};++ if (subscription?.status !== "active" && IS_CLOUD) {+ return (+ <Tooltip>+ <TooltipTrigger asChild>+ {trigger || (+ <Button disabled title="Upgrade to Pro to add more websites">+ <Plus className="h-4 w-4" />+ Add Website+ </Button>+ )}+ </TooltipTrigger>+ <TooltipContent>+ You need to be on an active subscription to add websites+ </TooltipContent>+ </Tooltip>+ );+ }+// Show upgrade message if disabled due to limitif (isOverSiteLimit) {return (diff --git a/client/src/app/subscribe/components/PricingCards.tsx b/client/src/app/subscribe/components/PricingCards.tsxindex fed79038b..07fb5fec2 100644--- a/client/src/app/subscribe/components/PricingCards.tsx+++ b/client/src/app/subscribe/components/PricingCards.tsx@@ -239,8 +239,8 @@ export function PricingCards({ 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-[1300px] mx-auto mb-16">- <PricingCard+ <div className="grid min-[1100px]:grid-cols-3 min-[400px]:grid-cols-1 gap-6 max-w-[1000px] mx-auto mb-16">+ {/* <PricingCardtitle="Free"description="Perfect for hobby projects"priceDisplay={@@ -255,7 +255,7 @@ export function PricingCards({ isLoggedIn }: { isLoggedIn: boolean }) {variant="free"onClick={() => (siteId ? router.push(`/${siteId}`) : undefined)}disabled={!siteId}- />+ /> */}<PricingCardtitle="Standard"diff --git a/client/src/app/subscribe/components/utils.ts b/client/src/app/subscribe/components/utils.tsindex e69292c6c..eedcf33f9 100644--- a/client/src/app/subscribe/components/utils.ts+++ b/client/src/app/subscribe/components/utils.ts@@ -8,9 +8,9 @@ import { FeatureItem } from "@/components/pricing/PricingCard";export const EVENT_TIERS = [...STRIPE_TIERS.map(tier => tier.events), "Custom"];export const STANDARD_FEATURES = [- "Everything in Free",`Up to ${STANDARD_SITE_LIMIT} websites`,`Up to ${STANDARD_TEAM_LIMIT} team members`,+ "Custom events","Funnels","Goals","Journeys",diff --git a/client/src/components/pricing/PricingCard.tsx b/client/src/components/pricing/PricingCard.tsxindex 5a715044e..7a6707aa2 100644--- a/client/src/components/pricing/PricingCard.tsx+++ b/client/src/components/pricing/PricingCard.tsx@@ -59,7 +59,7 @@ export function PricingCard({<h3 className="text-xl font-bold">{title}</h3>{recommended && (<span className="px-2 py-0.5 text-xs font-semibold bg-emerald-500/30 dark:bg-emerald-500/20 text-emerald-600 dark:text-emerald-400 rounded-full border border-emerald-500/40 dark:border-emerald-500/30">- Recommended+ Most Popular</span>)}</div>diff --git a/docs/src/app/(home)/compare/components/ComparisonPage.tsx b/docs/src/app/(home)/compare/components/ComparisonPage.tsxindex aa6e9bb22..3978b5f7b 100644--- a/docs/src/app/(home)/compare/components/ComparisonPage.tsx+++ b/docs/src/app/(home)/compare/components/ComparisonPage.tsx@@ -83,7 +83,7 @@ export function ComparisonPage({ competitorName, sections, comparisonContent }:</div><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.+ 30 day money-back guarantee. No credit card required.</p></div></div>diff --git a/docs/src/app/(home)/features/page.tsx b/docs/src/app/(home)/features/page.tsxindex 74fc58e5d..ea7a16996 100644--- a/docs/src/app/(home)/features/page.tsx+++ b/docs/src/app/(home)/features/page.tsx@@ -347,7 +347,7 @@ export default function FeaturesPage() {</div><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+ 30 day money-back guarantee. No credit card required</p></div></div>diff --git a/docs/src/app/(home)/page.tsx b/docs/src/app/(home)/page.tsxindex 5abf33bb7..70a6cb781 100644--- a/docs/src/app/(home)/page.tsx+++ b/docs/src/app/(home)/page.tsx@@ -240,7 +240,7 @@ export default function HomePage() {</div><p className="text-neutral-500 dark:text-neutral-400 text-xs md:text-sm flex items-center justify-center gap-2 mt-6"><CircleCheckIcon size={16} className="text-neutral-500 dark:text-neutral-400" />- First {DEFAULT_EVENT_LIMIT.toLocaleString()} pageviews/m are free. No credit card required.+ 30 day money-back guarantee. No credit card required.</p></div><div className="relative w-full max-w-[1300px] mb-10">diff --git a/docs/src/app/(home)/pricing/components/ComparisonSection.tsx b/docs/src/app/(home)/pricing/components/ComparisonSection.tsxindex 2d160c99f..4a3174840 100644--- a/docs/src/app/(home)/pricing/components/ComparisonSection.tsx+++ b/docs/src/app/(home)/pricing/components/ComparisonSection.tsx@@ -264,15 +264,15 @@ 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-[1300px] mx-auto px-4 overflow-x-auto">+ <div className="max-w-[1040px] 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]">{/* 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>@@ -282,7 +282,7 @@ export function ComparisonSection({ isAnnual }: { isAnnual: boolean }) {>Start Free</AppLink>- </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{" "}@@ -326,13 +326,13 @@ export function ComparisonSection({ isAnnual }: { isAnnual: boolean }) {<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}</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,14 +343,14 @@ export function ComparisonSection({ isAnnual }: { isAnnual: boolean }) {{category.features.map((feature, featureIndex) => (<divkey={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/CTASection.tsx b/docs/src/components/CTASection.tsxindex 52de5604a..61457872e 100644--- a/docs/src/components/CTASection.tsx+++ b/docs/src/components/CTASection.tsx@@ -76,7 +76,7 @@ export function CTASection({</div><p className="text-neutral-500 text-sm">- {DEFAULT_EVENT_LIMIT.toLocaleString()} events/month free. No credit card required.+ 30 day money-back guarantee. No credit card required.</p></div></div>diff --git a/docs/src/components/PricingSection.tsx b/docs/src/components/PricingSection.tsxindex 5a483def9..cf0f61967 100644--- a/docs/src/components/PricingSection.tsx+++ b/docs/src/components/PricingSection.tsx@@ -12,9 +12,9 @@ const EVENT_TIERS = [100_000, 250_000, 500_000, 1_000_000, 2_000_000, 5_000_000,// Define standard plan featuresconst STANDARD_FEATURES = [- "Everything in Free",`Up to ${STANDARD_SITE_LIMIT} websites`,`Up to ${STANDARD_TEAM_LIMIT} team members`,+ "Custom events","Funnels","Goals","Journeys",@@ -206,9 +206,9 @@ export function PricingSection({ isAnnual, setIsAnnual }: { isAnnual: boolean, s</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-[1300px] 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-[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"> */}+ {/* <PricingCardtitle="Free"description="Perfect for hobby projects"priceDisplay={@@ -223,7 +223,7 @@ export function PricingSection({ isAnnual, setIsAnnual }: { isAnnual: boolean, sfeatures={FREE_FEATURES}variant="free"eventLocation="free"- />+ /> */}{/* Standard Plan Card */}<PricingCard