🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Update domain references from rybbit.io to rybbit.com in various files for consistency and accuracy.
Bill Yang8bb1352dac9e
diff --git a/.env.example b/.env.exampleindex 8e97c3c0b..b02ff3ee6 100644--- a/.env.example+++ b/.env.example@@ -1,5 +1,5 @@# Domain and URL Configuration-DOMAIN_NAME=demo.rybbit.io+DOMAIN_NAME=demo.rybbit.comBASE_URL="https://${DOMAIN_NAME}"# Authentication and Security@@ -24,7 +24,5 @@ POSTGRES_DB=analyticsPOSTGRES_USER=frogPOSTGRES_PASSWORD=frog-RESEND_API_KEY=rs_XXXXXXX-# External Service Tokens (optional)MAPBOX_TOKEN=diff --git a/SECURITY.md b/SECURITY.mdindex 68dffff68..ef32bba38 100644--- a/SECURITY.md+++ b/SECURITY.md@@ -2,10 +2,10 @@## Supported Versions-| Version | Supported |-| ------- | ------------------ |+| Version | Supported |+| ------- | ----------------------------- || 0.1.x | :negative_squared_cross_mark: |-| 1.x | :white_check_mark: |+| 1.x | :white_check_mark: |## Reporting a Vulnerability@@ -13,9 +13,10 @@ We currently support the latest patch versions of the 1.x release line. Older veWe take security seriously. If you discover a vulnerability in our software, we request that you responsibly disclose it by emailing us directly.-**Email:** hello [@] rybbit.io+**Email:** hello [@] rybbit.comPlease include as much detail as possible to help us understand and resolve the issue quickly. This includes:+- A clear description of the vulnerability- Steps to reproduce it- Any relevant logs, proof-of-concept code, or screenshotsdiff --git a/client/src/app/subscribe/components/PricingCard.tsx b/client/src/app/subscribe/components/PricingCard.tsxindex a41692167..7d60a5620 100644--- a/client/src/app/subscribe/components/PricingCard.tsx+++ b/client/src/app/subscribe/components/PricingCard.tsx@@ -28,7 +28,7 @@ export function PricingCard({ isLoggedIn }: { isLoggedIn: boolean }) {async function handleSubscribe(planType: "standard" | "pro"): Promise<void> {// Handle custom tier by redirecting to email contactif (eventLimit === "Custom") {- window.location.href = "https://www.rybbit.io/contact";+ window.location.href = "https://www.rybbit.com/contact";return;}diff --git a/client/src/components/subscription/PaidPlain/PlanDialog.tsx b/client/src/components/subscription/PaidPlain/PlanDialog.tsxindex 303910c00..e71e0abb9 100644--- a/client/src/components/subscription/PaidPlain/PlanDialog.tsx+++ b/client/src/components/subscription/PaidPlain/PlanDialog.tsx@@ -220,7 +220,7 @@ export function PlanDialog({ open, onOpenChange, currentPlanName, hasActiveSubsc{/* Features comparison link */}<div className="mt-3 text-center"><a- href="https://www.rybbit.io/pricing"+ href="https://www.rybbit.com/pricing"target="_blank"rel="noopener noreferrer"className="text-neutral-200 hover:text-neutral-100 text-sm underline"diff --git a/docs/src/app/(home)/contact/page.tsx b/docs/src/app/(home)/contact/page.tsxindex d60c4ec74..0efe5dae8 100644--- a/docs/src/app/(home)/contact/page.tsx+++ b/docs/src/app/(home)/contact/page.tsx@@ -23,7 +23,7 @@ export default function Contact() {</div><div><h2 className="text-xl font-medium mb-1">Email</h2>- <a href="https://www.rybbit.io/contact" className="text-neutral-300 hover:text-white transition-colors">+ <a href="https://www.rybbit.com/contact" className="text-neutral-300 hover:text-white transition-colors"></a></div>@@ -90,8 +90,11 @@ export default function Contact() {</p><p className="mb-4">Contact us at{" "}- <a href="mailto:[email protected]" className="text-neutral-300 hover:text-white transition-colors underline">+ <a+ href="mailto:[email protected]"+ className="text-neutral-300 hover:text-white transition-colors underline"+ ></a>{" "}to discuss your needs.</p>diff --git a/docs/src/app/(home)/privacy/page.tsx b/docs/src/app/(home)/privacy/page.tsxindex f129f422c..2659c7b3d 100644--- a/docs/src/app/(home)/privacy/page.tsx+++ b/docs/src/app/(home)/privacy/page.tsx@@ -125,7 +125,7 @@ export default function PrivacyPolicy() {<h2 className="text-2xl font-semibold mt-8 mb-4">Contact Us</h2><p>If you have questions about this privacy policy or Rybbit's data practices, please contact us at:- <a href="https://www.rybbit.io/contact" className="text-emerald-400 hover:text-emerald-300 ml-1">+ <a href="https://www.rybbit.com/contact" className="text-emerald-400 hover:text-emerald-300 ml-1"></a></p>diff --git a/docs/src/app/(home)/terms-and-conditions/page.tsx b/docs/src/app/(home)/terms-and-conditions/page.tsxindex ba9aeee54..12f3f651c 100644--- a/docs/src/app/(home)/terms-and-conditions/page.tsx+++ b/docs/src/app/(home)/terms-and-conditions/page.tsx@@ -215,7 +215,7 @@ export default function TermsAndConditions() {<h2 className="text-2xl font-semibold mt-8 mb-4">Contact Information</h2><p>If you have any questions about these Terms and Conditions, please contact us at:- <a href="https://www.rybbit.io/contact" className="text-emerald-400 hover:text-emerald-300 ml-1">+ <a href="https://www.rybbit.com/contact" className="text-emerald-400 hover:text-emerald-300 ml-1"></a></p>diff --git a/docs/src/app/blog/[...slug]/page.tsx b/docs/src/app/blog/[...slug]/page.tsxindex 3efb23588..5b6b57f8e 100644--- a/docs/src/app/blog/[...slug]/page.tsx+++ b/docs/src/app/blog/[...slug]/page.tsx@@ -1,15 +1,15 @@-import { notFound } from 'next/navigation';-import { blogSource } from '@/lib/blog-source';-import Link from 'next/link';-import Image from 'next/image';-import { ChevronLeft } from 'lucide-react';-import type { Metadata } from 'next';-import defaultMdxComponents from 'fumadocs-ui/mdx';-import { Pre } from 'fumadocs-ui/components/codeblock';-import Script from 'next/script';+import { notFound } from "next/navigation";+import { blogSource } from "@/lib/blog-source";+import Link from "next/link";+import Image from "next/image";+import { ChevronLeft } from "lucide-react";+import type { Metadata } from "next";+import defaultMdxComponents from "fumadocs-ui/mdx";+import { Pre } from "fumadocs-ui/components/codeblock";+import Script from "next/script";export function generateStaticParams() {- return blogSource.getPages().map((page) => ({+ return blogSource.getPages().map(page => ({slug: page.slugs,}));}@@ -19,9 +19,9 @@ export async function generateMetadata(props: { params: Promise<{ slug: string[]const page = blogSource.getPage(params.slug);if (!page) return {};- const url = `https://docs.rybbit.io/blog/${params.slug.join('/')}`;+ const url = `https://docs.rybbit.io/blog/${params.slug.join("/")}`;const publishedTime = page.data.date ? new Date(page.data.date).toISOString() : undefined;- const ogImage = page.data.image || '/opengraph-image.png';+ const ogImage = page.data.image || "/opengraph-image.png";return {title: page.data.title,@@ -32,7 +32,7 @@ export async function generateMetadata(props: { params: Promise<{ slug: string[]openGraph: {title: page.data.title,description: page.data.description,- type: 'article',+ type: "article",publishedTime,authors: page.data.author ? [page.data.author] : undefined,url,@@ -44,17 +44,19 @@ export async function generateMetadata(props: { params: Promise<{ slug: string[]alt: page.data.title,},],- siteName: 'Rybbit',- locale: 'en_US',+ siteName: "Rybbit",+ locale: "en_US",},twitter: {- card: 'summary_large_image',+ card: "summary_large_image",title: page.data.title,description: page.data.description,images: [ogImage],- creator: '@rybbitio',+ creator: "@rybbitio",},- keywords: page.data.tags ? [...page.data.tags, 'web analytics', 'privacy analytics', 'Rybbit'] : ['web analytics', 'privacy analytics', 'Rybbit'],+ keywords: page.data.tags+ ? [...page.data.tags, "web analytics", "privacy analytics", "Rybbit"]+ : ["web analytics", "privacy analytics", "Rybbit"],authors: page.data.author ? [{ name: page.data.author }] : undefined,};}@@ -62,40 +64,35 @@ export async function generateMetadata(props: { params: Promise<{ slug: string[]export default async function BlogPostPage(props: { params: Promise<{ slug: string[] }> }) {const params = await props.params;const page = blogSource.getPage(params.slug);-+if (!page) {notFound();}const MDXContent = page.data.body;const date = page.data.date ? new Date(page.data.date) : null;-+// Structured data for SEOconst structuredData = {- '@context': 'https://schema.org',- '@type': 'BlogPosting',+ "@context": "https://schema.org",+ "@type": "BlogPosting",headline: page.data.title,description: page.data.description,- image: page.data.image || 'https://docs.rybbit.io/opengraph-image.png',datePublished: date?.toISOString(),dateModified: date?.toISOString(),author: {- '@type': 'Person',- name: page.data.author || 'Rybbit Team',+ "@type": "Person",+ name: page.data.author || "Rybbit Team",},publisher: {- '@type': 'Organization',- name: 'Rybbit',+ "@type": "Organization",+ name: "Rybbit",logo: {- '@type': 'ImageObject',- url: 'https://docs.rybbit.io/rybbit.png',+ "@type": "ImageObject",+ url: "https://rybbit.com/public/rybbit.svg",},},- mainEntityOfPage: {- '@type': 'WebPage',- '@id': `https://docs.rybbit.io/blog/${params.slug.join('/')}`,- },- keywords: page.data.tags?.join(', '),+ keywords: page.data.tags?.join(", "),};return (@@ -106,91 +103,86 @@ export default async function BlogPostPage(props: { params: Promise<{ slug: stridangerouslySetInnerHTML={{ __html: JSON.stringify(structuredData) }}/><article className="max-w-4xl mx-auto px-4 py-16">- <Link- href="/blog"- className="inline-flex items-center text-neutral-400 hover:text-white transition-colors mb-8"- >- <ChevronLeft className="w-4 h-4 mr-1" />- Back to Blog- </Link>-- <header className="mb-12">- <h1 className="text-4xl md:text-5xl font-bold mb-4">- {page.data.title}- </h1>-- {page.data.description && (- <p className="text-xl text-neutral-400 mb-6">- {page.data.description}- </p>+ <Link+ href="/blog"+ className="inline-flex items-center text-neutral-400 hover:text-white transition-colors mb-8"+ >+ <ChevronLeft className="w-4 h-4 mr-1" />+ Back to Blog+ </Link>++ <header className="mb-12">+ <h1 className="text-4xl md:text-5xl font-bold mb-4">{page.data.title}</h1>++ {page.data.description && <p className="text-xl text-neutral-400 mb-6">{page.data.description}</p>}++ <div className="flex items-center gap-4 text-sm text-neutral-500 pb-6 border-b border-neutral-800">+ {date && (+ <time dateTime={date.toISOString()}>+ {date.toLocaleDateString("en-US", {+ year: "numeric",+ month: "long",+ day: "numeric",+ })}+ </time>+ )}++ {page.data.author && (+ <>+ <span>•</span>+ <span>By {page.data.author}</span>+ </>+ )}++ {page.data.tags && page.data.tags.length > 0 && (+ <>+ <span>•</span>+ <div className="flex gap-2">+ {page.data.tags.map((tag: string) => (+ <span key={tag} className="px-2 py-1 text-xs rounded-full bg-neutral-800 text-neutral-300">+ {tag}+ </span>+ ))}+ </div>+ </>+ )}+ </div>+ </header>++ {page.data.image && (+ <Image+ src={page.data.image}+ alt={page.data.title}+ width={1200}+ height={400}+ className="w-full h-96 object-cover rounded-lg mb-8"+ />)}- <div className="flex items-center gap-4 text-sm text-neutral-500 pb-6 border-b border-neutral-800">- {date && (- <time dateTime={date.toISOString()}>- {date.toLocaleDateString('en-US', {- year: 'numeric',- month: 'long',- day: 'numeric',- })}- </time>- )}-- {page.data.author && (- <>- <span>•</span>- <span>By {page.data.author}</span>- </>- )}-- {page.data.tags && page.data.tags.length > 0 && (- <>- <span>•</span>- <div className="flex gap-2">- {page.data.tags.map((tag: string) => (- <span- key={tag}- className="px-2 py-1 text-xs rounded-full bg-neutral-800 text-neutral-300"- >- {tag}- </span>- ))}- </div>- </>- )}- </div>- </header>-- {page.data.image && (- <Image- src={page.data.image}- alt={page.data.title}- width={1200}- height={400}- className="w-full h-96 object-cover rounded-lg mb-8"- />- )}-- <div className="prose prose-invert prose-lg max-w-none+ <div+ className="prose prose-invert prose-lg max-w-noneprose-code:before:content-none prose-code:after:content-none- [&_pre]:my-4 [&_pre]:overflow-x-auto">- <MDXContent components={{- ...defaultMdxComponents,- pre: (props: React.ComponentPropsWithoutRef<'pre'>) => (- <Pre {...props} className="bg-neutral-900 border border-neutral-800 rounded-lg" />- ),- code: ({ className, ...props }: React.ComponentPropsWithoutRef<'code'>) => {- // Check if this code is inside a pre tag (code block)- const isCodeBlock = className?.includes('language-');- if (isCodeBlock) {- return <code className={className} {...props} />;- }- // Inline code- return <code className="bg-neutral-900 px-1.5 py-0.5 rounded text-sm" {...props} />;- },- }} />- </div>- </article>+ [&_pre]:my-4 [&_pre]:overflow-x-auto"+ >+ <MDXContent+ components={{+ ...defaultMdxComponents,+ pre: (props: React.ComponentPropsWithoutRef<"pre">) => (+ <Pre {...props} className="bg-neutral-900 border border-neutral-800 rounded-lg" />+ ),+ code: ({ className, ...props }: React.ComponentPropsWithoutRef<"code">) => {+ // Check if this code is inside a pre tag (code block)+ const isCodeBlock = className?.includes("language-");+ if (isCodeBlock) {+ return <code className={className} {...props} />;+ }+ // Inline code+ return <code className="bg-neutral-900 px-1.5 py-0.5 rounded text-sm" {...props} />;+ },+ }}+ />+ </div>+ </article></>);-}\ No newline at end of file+}diff --git a/docs/src/app/robots.ts b/docs/src/app/robots.tsindex 5bb27064a..f3d4813fa 100644--- a/docs/src/app/robots.ts+++ b/docs/src/app/robots.ts@@ -1,32 +1,32 @@-import { MetadataRoute } from 'next';+import { MetadataRoute } from "next";export default function robots(): MetadataRoute.Robots {- const baseUrl = 'https://docs.rybbit.io';-+ const baseUrl = "https://rybbit.com";+return {rules: [{- userAgent: '*',- allow: '/',+ userAgent: "*",+ allow: "/",disallow: [- '/api/',- '/_next/',- '/static/',- '/*.json$',- '/*?*', // URLs with query parameters- '/404',+ "/api/",+ "/_next/",+ "/static/",+ "/*.json$",+ "/*?*", // URLs with query parameters+ "/404",],},{- userAgent: 'Googlebot',- allow: '/',+ userAgent: "Googlebot",+ allow: "/",},{- userAgent: 'Bingbot',- allow: '/',+ userAgent: "Bingbot",+ allow: "/",},],sitemap: `${baseUrl}/sitemap.xml`,host: baseUrl,};-}\ No newline at end of file+}diff --git a/docs/src/app/sitemap.ts b/docs/src/app/sitemap.tsindex 66846f04b..d1f1fffef 100644--- a/docs/src/app/sitemap.ts+++ b/docs/src/app/sitemap.ts@@ -1,23 +1,23 @@-import { MetadataRoute } from 'next';-import { source } from '@/lib/source';-import { blogSource } from '@/lib/blog-source';+import { MetadataRoute } from "next";+import { source } from "@/lib/source";+import { blogSource } from "@/lib/blog-source";export default async function sitemap(): Promise<MetadataRoute.Sitemap> {- const baseUrl = 'https://docs.rybbit.io';-+ const baseUrl = "https://rybbit.com";+// Get all documentation pages- const docPages = source.getPages().map((page) => ({- url: `${baseUrl}/docs/${page.slugs.join('/')}`,+ const docPages = source.getPages().map(page => ({+ url: `${baseUrl}/docs/${page.slugs.join("/")}`,lastModified: page.data.lastModified || new Date(),- changeFrequency: 'weekly' as const,+ changeFrequency: "weekly" as const,priority: 0.8,}));// Get all blog posts- const blogPosts = blogSource.getPages().map((post) => ({- url: `${baseUrl}/blog/${post.slugs.join('/')}`,+ const blogPosts = blogSource.getPages().map(post => ({+ url: `${baseUrl}/blog/${post.slugs.join("/")}`,lastModified: post.data.date || new Date(),- changeFrequency: 'monthly' as const,+ changeFrequency: "monthly" as const,priority: 0.7,}));@@ -26,28 +26,28 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {{url: baseUrl,lastModified: new Date(),- changeFrequency: 'daily' as const,+ changeFrequency: "daily" as const,priority: 1.0,},{url: `${baseUrl}/docs`,lastModified: new Date(),- changeFrequency: 'weekly' as const,+ changeFrequency: "weekly" as const,priority: 0.9,},{url: `${baseUrl}/blog`,lastModified: new Date(),- changeFrequency: 'weekly' as const,+ changeFrequency: "weekly" as const,priority: 0.8,},{url: `${baseUrl}/pricing`,lastModified: new Date(),- changeFrequency: 'monthly' as const,+ changeFrequency: "monthly" as const,priority: 0.6,},];return [...staticPages, ...docPages, ...blogPosts];-}\ No newline at end of file+}diff --git a/docs/src/components/PricingSection.tsx b/docs/src/components/PricingSection.tsxindex afaa6c382..815c37023 100644--- a/docs/src/components/PricingSection.tsx+++ b/docs/src/components/PricingSection.tsx@@ -313,7 +313,7 @@ export function PricingSection() {</div>{proPrices.custom ? (- <Link href="https://www.rybbit.io/contact" className="w-full block">+ <Link 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">Contact us</button>diff --git a/server/src/lib/email/templates/LimitExceededEmail.tsx b/server/src/lib/email/templates/LimitExceededEmail.tsxindex 11f195c73..b02e81195 100644--- a/server/src/lib/email/templates/LimitExceededEmail.tsx+++ b/server/src/lib/email/templates/LimitExceededEmail.tsx@@ -56,15 +56,13 @@ export const LimitExceededEmail = ({<div className="inline-block bg-warningBg/20 text-warningBg px-3 py-1.5 rounded-full text-sm font-medium mb-4">Event Limit Exceeded</div>- <Heading className="text-darkText text-3xl font-semibold mb-6">- Monthly Event Limit Reached- </Heading>+ <Heading className="text-darkText text-3xl font-semibold mb-6">Monthly Event Limit Reached</Heading></Section><Section className="mb-8"><Text className="text-darkText text-base leading-relaxed mb-4">- Your organization <span className="font-bold text-brand">{organizationName}</span> has- exceeded its monthly event limit.+ Your organization <span className="font-bold text-brand">{organizationName}</span> has exceeded its+ monthly event limit.</Text><Text className="text-darkText text-base leading-relaxed mb-4"><strong>Current usage:</strong> {eventCount.toLocaleString()} events@@ -72,8 +70,8 @@ export const LimitExceededEmail = ({<strong>Monthly limit:</strong> {eventLimit.toLocaleString()} events</Text><Text className="text-darkText text-base leading-relaxed">- Your analytics tracking has been paused. To continue tracking events and accessing- your analytics data, please upgrade your plan.+ Your analytics tracking has been paused. To continue tracking events and accessing your analytics data,+ please upgrade your plan.</Text></Section>@@ -88,15 +86,13 @@ export const LimitExceededEmail = ({<Section className="text-center border-t border-borderColor pt-5"><Text className="text-mutedText text-xs mb-2">- Need help? Contact our support team at [email protected]- </Text>- <Text className="text-mutedText text-xs">- © {currentYear} Rybbit Analytics+ Need help? Contact our support team at [email protected]</Text>+ <Text className="text-mutedText text-xs">© {currentYear} Rybbit Analytics</Text></Section></Container></Body></Tailwind></Html>);-};\ No newline at end of file+};