fix: set dynamic to force-static in blog post page

2025-05-31 00:41:17 +08:00
448 changed files with 6217 additions and 37425 deletions
--- a/.cursor/rules/database-state-management.mdc
+++ b/.cursor/rules/database-state-management.mdc
@ -7,7 +7,7 @@ alwaysApply: false

 ## Database (Drizzle ORM)
 - Schema definitions in `src/db/schema.ts`
- Migrations in `src/db/migrations`
+- Migrations in `drizzle/`
 - Use `db:generate` to create new migration files based on schema changes
 - Use `db:migrate` to apply pending migrations to the database
 - Use `db:push` to sync schema changes directly to the database (development only)
--- a/.cursor/rules/project-structure.mdc
+++ b/.cursor/rules/project-structure.mdc
@ -19,7 +19,6 @@ alwaysApply: false
 - `src/payment/`: Payment integration
 - `src/analytics/`: Analytics and tracking
 - `src/storage/`: File storage integration
- `src/notification/`: Sending Notifications

 ## Configuration Files
 - `next.config.ts`: Next.js configuration
@ -30,7 +29,7 @@ alwaysApply: false

 ## Content Management
 - `content/`: MDX content files
- `source.config.ts`: Fumadocs source configuration
+- `content-collections.ts`: Content collection configuration

 ## Environment
 - `env.example`: Environment variables template
--- a/.dockerignore
+++ b/.dockerignore
@ -1,16 +0,0 @@
-.cursor
-.claude
-.conductor
-.kiro
-.github
-.next
-.open-next
-.source
-.vscode
-.git
-.wrangler
-.dockerignore
-node_modules
-**/node_modules
-Dockerfile
-LICENSE
--- a/.gitattributes
+++ b/.gitattributes
@ -1,41 +0,0 @@
-# Set default behavior to automatically normalize line endings
-* text=auto
-
-# Force LF line endings for text files
-*.js text eol=lf
-*.jsx text eol=lf
-*.ts text eol=lf
-*.tsx text eol=lf
-*.json text eol=lf
-*.md text eol=lf
-*.mdx text eol=lf
-*.yml text eol=lf
-*.yaml text eol=lf
-*.css text eol=lf
-*.scss text eol=lf
-*.html text eol=lf
-*.xml text eol=lf
-*.txt text eol=lf
-*.sh text eol=lf
-
-# Ensure these files are always treated as text and get LF line endings
-.gitignore text eol=lf
-.gitattributes text eol=lf
-.editorconfig text eol=lf
-*.config.js text eol=lf
-*.config.ts text eol=lf
-
-# Binary files should be left untouched
-*.png binary
-*.jpg binary
-*.jpeg binary
-*.gif binary
-*.ico binary
-*.svg binary
-*.woff binary
-*.woff2 binary
-*.ttf binary
-*.eot binary
-*.pdf binary
-*.zip binary
-*.tar.gz binary
--- a/.gitignore
+++ b/.gitignore
@ -30,23 +30,12 @@ yarn-debug.log*
 yarn-error.log*
 .pnpm-debug.log*

-certificates
-
 # env files (can opt-in for committing if needed)
 .env*

 # vercel
 .vercel

-# claude code
-.claude
-
-# conductor
-.conductor
-
-# kiro
-.kiro
-
 # typescript
 *.tsbuildinfo
 next-env.d.ts
@ -54,14 +43,5 @@ next-env.d.ts
 # content collections
 .content-collections

-# fumadocs
-.source
-
 # OpenNext build output
 .open-next
-
-# wrangler files
-.wrangler
-.dev.vars
-.dev.vars*
-!.dev.vars.example
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@ -4,7 +4,6 @@
    "bradlc.vscode-tailwindcss",
    "Lokalise.i18n-ally",
    "unifiedjs.vscode-mdx",
-    "eamodio.gitlens",
-    "editorconfig.editorconfig"
+    "eamodio.gitlens"
  ]
 }
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -22,14 +22,6 @@
  "search.exclude": {
    "**/node_modules": true,
    ".next": true,
-    ".source": true,
-    ".wrangler": true,
-    ".open-next": true,
-    ".vscode": true,
-    ".cursor": true,
-    ".claude": true,
-    ".conductor": true,
-    ".kiro": true,
-    ".github": true
+    ".content-collections": true,
  }
-}
+}
--- a/CLAUDE.md
+++ b/CLAUDE.md
@ -1,109 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Development Commands
-
-### Core Development
- `pnpm dev` - Start development server with content collections
- `pnpm build` - Build the application and content collections
- `pnpm start` - Start production server
- `pnpm lint` - Run Biome linter (use for code quality checks)
- `pnpm format` - Format code with Biome
-
-### Database Operations (Drizzle ORM)
- `pnpm db:generate` - Generate new migration files based on schema changes
- `pnpm db:migrate` - Apply pending migrations to the database
- `pnpm db:push` - Sync schema changes directly to the database (development only)
- `pnpm db:studio` - Open Drizzle Studio for database inspection and management
-
-### Content and Email
- `pnpm content` - Process MDX content collections
- `pnpm email` - Start email template development server on port 3333
-
-## Project Architecture
-
-This is a Next.js 15 full-stack SaaS application with the following key architectural components:
-
-### Core Stack
- **Framework**: Next.js 15 with App Router
- **Database**: PostgreSQL with Drizzle ORM
- **Authentication**: Better Auth with social providers (Google, GitHub)
- **Payments**: Stripe integration with subscription and one-time payments
- **UI**: Radix UI components with TailwindCSS
- **State Management**: Zustand for client-side state
- **Internationalization**: next-intl with English and Chinese locales
- **Content**: Fumadocs for documentation and MDX for content
- **Code Quality**: Biome for formatting and linting
-
-### Key Directory Structure
- `src/app/` - Next.js app router with internationalized routing
- `src/components/` - Reusable React components organized by feature
- `src/lib/` - Utility functions and shared code
- `src/db/` - Database schema and migrations
- `src/actions/` - Server actions for API operations
- `src/stores/` - Zustand state management
- `src/hooks/` - Custom React hooks
- `src/config/` - Application configuration files
- `src/i18n/` - Internationalization setup
- `src/mail/` - Email templates and mail functionality
- `src/payment/` - Stripe payment integration
- `src/credits/` - Credit system implementation
- `content/` - MDX content files for docs and blog
- `messages/` - Translation files (en.json, zh.json) for internationalization
-
-### Authentication & User Management
- Uses Better Auth with PostgreSQL adapter
- Supports email/password and social login (Google, GitHub)
- Includes user management, email verification, and password reset
- Admin plugin for user management and banning
- Automatic newsletter subscription on user creation
-
-### Payment System
- Stripe integration for subscriptions and one-time payments
- Three pricing tiers: Free, Pro (monthly/yearly), and Lifetime
- Credit system with packages for pay-per-use features
- Customer portal for subscription management
-
-### Feature Modules
- **Blog**: MDX-based blog with pagination and categories
- **Docs**: Fumadocs-powered documentation
- **AI Features**: Image generation with multiple providers (OpenAI, Replicate, etc.)
- **Newsletter**: Email subscription system
- **Analytics**: Multiple analytics providers support
- **Storage**: S3 integration for file uploads
-
-### Development Workflow
-1. Use TypeScript for all new code
-2. Follow Biome formatting rules (single quotes, trailing commas)
-3. Write server actions in `src/actions/`
-4. Use Zustand for client-side state management
-5. Implement database changes through Drizzle migrations
-6. Use Radix UI components for consistent UI
-7. Follow the established directory structure
-8. Use proper error handling with error.tsx and not-found.tsx
-9. Leverage Next.js 15 features like Server Actions
-10. Use `next-safe-action` for secure form submissions
-
-### Configuration
- Main config in `src/config/website.tsx`
- Environment variables template in `env.example`
- Database config in `drizzle.config.ts`
- Biome config in `biome.json` with specific ignore patterns
- TypeScript config with path aliases (@/* for src/*)
-
-### Testing and Quality
- Use Biome for linting and formatting
- TypeScript for type safety
- Environment variables for configuration
- Proper error boundaries and not-found pages
- Zod for runtime validation
-
-## Important Notes
-
- The project uses pnpm as the package manager
- Database schema is in `src/db/schema.ts` with auth, payment, and credit tables
- Email templates are in `src/mail/templates/`
- The app supports both light and dark themes
- Content is managed through MDX files in the `content/` directory
- The project includes comprehensive internationalization support
--- a/62
+++ b/62
@ -1,62 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM node:20-alpine AS base
-
-# Install dependencies only when needed
-FROM base AS deps
-# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
-RUN apk add --no-cache libc6-compat
-WORKDIR /app
-
-# Install dependencies
-COPY package.json pnpm-lock.yaml* ./
-# Copy config files needed for fumadocs-mdx postinstall
-COPY source.config.ts ./
-COPY content ./content
-RUN npm install -g pnpm && pnpm i --frozen-lockfile
-
-# Rebuild the source code only when needed
-FROM base AS builder
-WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
-COPY . .
-
-# Next.js collects completely anonymous telemetry data about general usage.
-# Learn more here: https://nextjs.org/telemetry
-# Uncomment the following line in case you want to disable telemetry during the build.
-# ENV NEXT_TELEMETRY_DISABLED 1
-
-RUN npm install -g pnpm \
-  && DOCKER_BUILD=true pnpm build
-
-# Production image, copy all the files and run next
-FROM base AS runner
-WORKDIR /app
-
-ENV NODE_ENV=production
-# Uncomment the following line in case you want to disable telemetry during runtime.
-# ENV NEXT_TELEMETRY_DISABLED 1
-
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
-
-COPY --from=builder /app/public ./public
-
-# Set the correct permission for prerender cache
-RUN mkdir .next
-RUN chown nextjs:nodejs .next
-
-# Automatically leverage output traces to reduce image size
-# https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
-
-USER nextjs
-
-EXPOSE 3000
-
-ENV PORT=3000
-ENV HOSTNAME="0.0.0.0"
-
-# server.js is created by next build from the standalone output
-# https://nextjs.org/docs/pages/api-reference/next-config-js/output
-CMD ["node", "server.js"]
--- a/README.md
+++ b/README.md
@ -19,27 +19,28 @@ If you found anything that could be improved, please let me know.
 - 🔥 website: [mksaas.com](https://mksaas.com)
 - 🌐 demo: [demo.mksaas.com](https://demo.mksaas.com)
 - 📚 documentation: [mksaas.com/docs](https://mksaas.com/docs)
- 🗓️ roadmap: [mksaas roadmap](https://mksaas.link/roadmap)
+- 🗓️ roadmap: [mksaas project](https://mksaas.link/roadmap)
 - 👨‍💻 discord: [mksaas.link/discord](https://mksaas.link/discord)
- 📹 video: [mksaas.link/youtube](https://mksaas.link/youtube)
+- 📹 video (WIP): [mksaas.link/youtube](https://mksaas.link/youtube)

 ## Repositories

-By default, you should have access to all 5 repositories. If you find that you’re unable to access any of them, please don’t hesitate to reach out to me, and I’ll assist you in resolving the issue.
+By default, you should have access to all four repositories. If you find that you’re unable to access any of them, please don’t hesitate to reach out to me, and I’ll assist you in resolving the issue.

- [mksaas-template (ready)](https://github.com/MkSaaSHQ/mksaas-template): https://demo.mksaas.com
- [mksaas-blog (ready)](https://github.com/MkSaaSHQ/mksaas-blog): https://mksaas.me
- [mksaas-haitang (ready)](https://github.com/MkSaaSHQ/mksaas-haitang): https://haitang.app
- [mksaas-outfit (ready)](https://github.com/MkSaaSHQ/mksaas-outfit)
- [mksaas-app (WIP)](https://github.com/MkSaaSHQ/mksaas-app): https://mksaas.app
+- [MkSaaSHQ/mksaas-template](https://github.com/MkSaaSHQ/mksaas-template): https://demo.mksaas.com (ready)
+- [MkSaaSHQ/mksaas-blog](https://github.com/MkSaaSHQ/mksaas-blog): https://mksaas.me (ready)
+- [MkSaaSHQ/mksaas-app](https://github.com/MkSaaSHQ/mksaas-app): https://mksaas.app (WIP)
+- [MkSaaSHQ/mksaas-haitang](https://github.com/MkSaaSHQ/mksaas-haitang): https://haitang.app (WIP)

 ## Notice

-> If you have any questions, please [submit an issue](https://github.com/MkSaaSHQ/mksaas-template/issues/new), or contact me at [support@mksaas.com](mailto:support@mksaas.com), or join our [discord community](https://mksaas.link/discord) and ask for help there.
+> If you have any questions, please [submit an issue](https://github.com/MkSaaSHQ/mksaas-template/issues/new), or contact me at [support@mksaas.com](mailto:support@mksaas.com).
+
+> If you have any feature requests or questions or ideas to share, please [submit it in the discussions](https://github.com/MkSaaSHQ/mksaas-template/discussions).

 > If you want to receive notifications whenever code changes, please click `Watch` button in the top right.

-> When submitting any content to the  issues of the repository, please use **English** as the main Language, so that everyone can read it and help you, thank you for your supports.
+> When submitting any content to the  issues or discussions of the repository, please use **English** as the main Language, so that everyone can read it and help you, thank you for your supports.

 ## License

--- a/biome.json
+++ b/biome.json
@ -9,28 +9,22 @@
    "ignoreUnknown": true,
    "ignore": [
      ".next/**",
-      ".open-next/**",
-      ".wrangler/**",
      ".cursor/**",
-      ".claude/**",
-      ".kiro/**",
-      ".conductor/**",
      ".vscode/**",
-      ".source/**",
+      ".content-collections/**",
      "node_modules/**",
      "dist/**",
      "build/**",
-      "src/db/**",
+      "drizzle/**",
      "tailwind.config.ts",
      "src/components/ui/*.tsx",
      "src/components/magicui/*.tsx",
-      "src/components/animate-ui/*.tsx",
      "src/components/tailark/*.tsx",
-      "src/components/ai-elements/*.tsx",
      "src/app/[[]locale]/preview/**",
+      "src/db/schema.ts",
      "src/payment/types.ts",
-      "src/credits/types.ts",
-      "src/types/index.d.ts"
+      "src/types/index.d.ts",
+      "public/sw.js"
    ]
  },
  "formatter": {
@ -38,8 +32,7 @@
    "indentStyle": "space",
    "indentWidth": 2,
    "lineWidth": 80,
-    "formatWithErrors": true,
-    "useEditorconfig": true
+    "formatWithErrors": true
  },
  "organizeImports": {
    "enabled": true
@ -74,28 +67,22 @@
    },
    "ignore": [
      ".next/**",
-      ".open-next/**",
-      ".wrangler/**",
      ".cursor/**",
-      ".claude/**",
-      ".conductor/**",
-      ".kiro/**",
      ".vscode/**",
-      ".source/**",
+      ".content-collections/**",
      "node_modules/**",
      "dist/**",
      "build/**",
-      "src/db/**",
+      "drizzle/**",
      "tailwind.config.ts",
      "src/components/ui/*.tsx",
      "src/components/magicui/*.tsx",
-      "src/components/animate-ui/*.tsx",
      "src/components/tailark/*.tsx",
-      "src/components/ai-elements/*.tsx",
      "src/app/[[]locale]/preview/**",
+      "src/db/schema.ts",
      "src/payment/types.ts",
-      "src/credits/types.ts",
-      "src/types/index.d.ts"
+      "src/types/index.d.ts",
+      "public/sw.js"
    ]
  },
  "javascript": {
--- a/cloudflare-env.d.ts
+++ b/cloudflare-env.d.ts
--- a/content-collections.ts
+++ b/content-collections.ts
@ -0,0 +1,328 @@
+import path from 'path';
+import { DEFAULT_LOCALE, LOCALES } from '@/i18n/routing';
+import { defineCollection, defineConfig } from '@content-collections/core';
+import {
+  createDocSchema,
+  createMetaSchema,
+  transformMDX,
+} from '@fumadocs/content-collections/configuration';
+
+/**
+ * 1. Content Collections documentation
+ * https://www.content-collections.dev/docs/quickstart/next
+ * https://www.content-collections.dev/docs/configuration
+ * https://www.content-collections.dev/docs/transform#join-collections
+ *
+ * 2. Use Content Collections for Fumadocs
+ * https://fumadocs.dev/docs/headless/content-collections
+ */
+const docs = defineCollection({
+  name: 'docs',
+  directory: 'content/docs',
+  include: '**/*.mdx',
+  schema: (z) => ({
+    ...createDocSchema(z),
+    preview: z.string().optional(),
+    index: z.boolean().default(false),
+  }),
+  transform: transformMDX,
+});
+
+const metas = defineCollection({
+  name: 'meta',
+  directory: 'content/docs',
+  include: '**/meta**.json',
+  parser: 'json',
+  schema: createMetaSchema,
+});
+
+/**
+ * Blog Author collection
+ *
+ * Authors are identified by their slug across all languages
+ * New format: content/author/authorname.{locale}.mdx
+ * Example: content/author/mksaas.mdx (default locale) and content/author/mksaas.zh.mdx (Chinese)
+ *
+ * For author, slug is slugAsParams
+ */
+export const authors = defineCollection({
+  name: 'author',
+  directory: 'content/author',
+  include: '**/*.mdx',
+  schema: (z) => ({
+    slug: z.string(),
+    name: z.string(),
+    avatar: z.string(),
+    locale: z.string().optional().default(DEFAULT_LOCALE),
+  }),
+  transform: async (data, context) => {
+    // Get the filename from the path
+    const filePath = data._meta.path;
+    const fileName = filePath.split(path.sep).pop() || '';
+
+    // Extract locale and base from filename
+    const { locale, base } = extractLocaleAndBase(fileName);
+    // console.log(`author processed: ${fileName}, locale=${locale}`);
+
+    return {
+      ...data,
+      locale,
+    };
+  },
+});
+
+/**
+ * Blog Category collection
+ *
+ * Categories are identified by their slug across all languages
+ * New format: content/category/categoryname.{locale}.mdx
+ * Example: content/category/tutorial.mdx (default locale) and content/category/tutorial.zh.mdx (Chinese)
+ *
+ * For category, slug is slugAsParams
+ */
+export const categories = defineCollection({
+  name: 'category',
+  directory: 'content/category',
+  include: '**/*.mdx',
+  schema: (z) => ({
+    slug: z.string(),
+    name: z.string(),
+    description: z.string(),
+    locale: z.string().optional().default(DEFAULT_LOCALE),
+  }),
+  transform: async (data, context) => {
+    // Get the filename from the path
+    const filePath = data._meta.path;
+    const fileName = filePath.split(path.sep).pop() || '';
+
+    // Extract locale and base from filename
+    const { locale, base } = extractLocaleAndBase(fileName);
+    // console.log(`category processed: ${fileName}, locale=${locale}`);
+
+    return {
+      ...data,
+      locale,
+    };
+  },
+});
+
+/**
+ * Blog Post collection
+ *
+ * New format: content/blog/post-slug.{locale}.mdx
+ *
+ * slug: /blog/first-post, used in URL or sitemap
+ * slugAsParams: first-post, used in route params
+ *
+ * 1. For a blog post at content/blog/first-post.mdx (default locale):
+ * locale: en
+ * slug: /blog/first-post
+ * slugAsParams: first-post
+ *
+ * 2. For a blog post at content/blog/first-post.zh.mdx (Chinese locale):
+ * locale: zh
+ * slug: /blog/first-post
+ * slugAsParams: first-post
+ */
+export const posts = defineCollection({
+  name: 'post',
+  directory: 'content/blog',
+  include: '**/*.mdx',
+  schema: (z) => ({
+    title: z.string(),
+    description: z.string(),
+    image: z.string(),
+    date: z.string().datetime(),
+    published: z.boolean().default(true),
+    categories: z.array(z.string()),
+    author: z.string(),
+    estimatedTime: z.number().optional(), // Reading time in minutes
+  }),
+  transform: async (data, context) => {
+    // Use Fumadocs transformMDX for consistent MDX processing
+    const transformedData = await transformMDX(data, context);
+
+    // Get the filename from the path
+    const filePath = data._meta.path;
+    const fileName = filePath.split(path.sep).pop() || '';
+
+    // Extract locale and base from filename
+    const { locale, base } = extractLocaleAndBase(fileName);
+    // console.log(`post processed: ${fileName}, base=${base}, locale=${locale}`);
+
+    // Find the author by matching slug and locale
+    const blogAuthor = context
+      .documents(authors)
+      .find((a) => a.slug === data.author && a.locale === locale);
+
+    // Find categories by matching slug and locale
+    const blogCategories = data.categories
+      .map((categorySlug) => {
+        const category = context
+          .documents(categories)
+          .find((c) => c.slug === categorySlug && c.locale === locale);
+
+        return category;
+      })
+      .filter(Boolean); // Remove null values
+
+    // Create the slug and slugAsParams
+    const slug = `/blog/${base}`;
+    const slugAsParams = base;
+
+    // Calculate estimated reading time
+    const wordCount = data.content.split(/\s+/).length;
+    const wordsPerMinute = 200; // average reading speed: 200 words per minute
+    const estimatedTime = Math.max(Math.ceil(wordCount / wordsPerMinute), 1);
+
+    return {
+      ...data,
+      locale,
+      author: blogAuthor,
+      categories: blogCategories,
+      slug,
+      slugAsParams,
+      estimatedTime,
+      body: transformedData.body,
+      toc: transformedData.toc,
+    };
+  },
+});
+
+/**
+ * Pages collection for policy pages like privacy-policy, terms-of-service, etc.
+ *
+ * New format: content/pages/page-slug.{locale}.mdx
+ *
+ * 1. For a page at content/pages/privacy-policy.mdx (default locale):
+ * locale: en
+ * slug: /pages/privacy-policy
+ * slugAsParams: privacy-policy
+ *
+ * 2. For a page at content/pages/privacy-policy.zh.mdx (Chinese locale):
+ * locale: zh
+ * slug: /pages/privacy-policy
+ * slugAsParams: privacy-policy
+ */
+export const pages = defineCollection({
+  name: 'page',
+  directory: 'content/pages',
+  include: '**/*.mdx',
+  schema: (z) => ({
+    title: z.string(),
+    description: z.string(),
+    date: z.string().datetime(),
+    published: z.boolean().default(true),
+  }),
+  transform: async (data, context) => {
+    // Use Fumadocs transformMDX for consistent MDX processing
+    const transformedData = await transformMDX(data, context);
+
+    // Get the filename from the path
+    const filePath = data._meta.path;
+    const fileName = filePath.split(path.sep).pop() || '';
+
+    // Extract locale and base from filename
+    const { locale, base } = extractLocaleAndBase(fileName);
+    // console.log(`page processed: ${fileName}, base=${base}, locale=${locale}`);
+
+    // Create the slug and slugAsParams
+    const slug = `/pages/${base}`;
+    const slugAsParams = base;
+
+    return {
+      ...data,
+      locale,
+      slug,
+      slugAsParams,
+      body: transformedData.body,
+      toc: transformedData.toc,
+    };
+  },
+});
+
+/**
+ * Releases collection for changelog
+ *
+ * New format: content/release/version-slug.{locale}.mdx
+ *
+ * 1. For a release at content/release/v1-0-0.mdx (default locale):
+ * locale: en
+ * slug: /release/v1-0-0
+ * slugAsParams: v1-0-0
+ *
+ * 2. For a release at content/release/v1-0-0.zh.mdx (Chinese locale):
+ * locale: zh
+ * slug: /release/v1-0-0
+ * slugAsParams: v1-0-0
+ */
+export const releases = defineCollection({
+  name: 'release',
+  directory: 'content/release',
+  include: '**/*.mdx',
+  schema: (z) => ({
+    title: z.string(),
+    description: z.string(),
+    date: z.string().datetime(),
+    version: z.string(),
+    published: z.boolean().default(true),
+  }),
+  transform: async (data, context) => {
+    // Use Fumadocs transformMDX for consistent MDX processing
+    const transformedData = await transformMDX(data, context);
+
+    // Get the filename from the path
+    const filePath = data._meta.path;
+    const fileName = filePath.split(path.sep).pop() || '';
+
+    // Extract locale and base from filename
+    const { locale, base } = extractLocaleAndBase(fileName);
+    // console.log(`release processed: ${fileName}, base=${base}, locale=${locale}`);
+
+    // Create the slug and slugAsParams
+    const slug = `/release/${base}`;
+    const slugAsParams = base;
+
+    return {
+      ...data,
+      locale,
+      slug,
+      slugAsParams,
+      body: transformedData.body,
+      toc: transformedData.toc,
+    };
+  },
+});
+
+/**
+ * Helper function to extract locale and base name from filename
+ * Handles filename formats:
+ * - name -> locale: DEFAULT_LOCALE, base: name
+ * - name.zh -> locale: zh, base: name
+ *
+ * @param fileName Filename without extension (already has .mdx removed)
+ * @returns Object with locale and base name
+ */
+function extractLocaleAndBase(fileName: string): {
+  locale: string;
+  base: string;
+} {
+  // Split filename into parts
+  const parts = fileName.split('.');
+
+  if (parts.length === 1) {
+    // Simple filename without locale: xxx
+    return { locale: DEFAULT_LOCALE, base: parts[0] };
+  }
+  if (parts.length === 2 && LOCALES.includes(parts[1])) {
+    // Filename with locale: xxx.zh
+    return { locale: parts[1], base: parts[0] };
+  }
+  // Unexpected format, use first part as base and default locale
+  console.warn(`Unexpected filename format: ${fileName}`);
+  return { locale: DEFAULT_LOCALE, base: parts[0] };
+}
+
+export default defineConfig({
+  collections: [docs, metas, authors, categories, posts, pages, releases],
+});
--- a/content/author/fox.mdx
+++ b/content/author/fox.mdx
@ -1,4 +1,5 @@
 ---
+slug: fox
 name: Fox
 avatar: /images/avatars/fox.png
 ---
--- a/content/author/fox.zh.mdx
+++ b/content/author/fox.zh.mdx
@ -1,4 +1,5 @@
 ---
+slug: fox
 name: Fox
 avatar: /images/avatars/fox.png
 ---
--- a/content/author/mkdirs.mdx
+++ b/content/author/mkdirs.mdx
@ -1,4 +1,5 @@
 ---
+slug: mkdirs
 name: Mkdirs
 avatar: /images/avatars/mkdirs.png
 ---
--- a/content/author/mkdirs.zh.mdx
+++ b/content/author/mkdirs.zh.mdx
@ -1,4 +1,5 @@
 ---
+slug: mkdirs
 name: Mkdirs模板
 avatar: /images/avatars/mkdirs.png
 ---
--- a/content/author/mksaas.mdx
+++ b/content/author/mksaas.mdx
@ -1,4 +1,5 @@
 ---
+slug: mksaas
 name: MkSaaS
 avatar: /images/avatars/mksaas.png
 ---
--- a/content/author/mksaas.zh.mdx
+++ b/content/author/mksaas.zh.mdx
@ -1,4 +1,5 @@
 ---
+slug: mksaas
 name: MkSaaS模板
 avatar: /images/avatars/mksaas.png
 ---
--- a/content/blog/comparisons.mdx
+++ b/content/blog/comparisons.mdx
@ -2,7 +2,7 @@
 title: Comparisons
 description: How is Fumadocs different from other existing frameworks?
 image: /images/blog/post-2.png
-date: "2025-03-22"
+date: 2025-03-22T12:00:00.000Z
 published: true
 categories: [news, company]
 author: fox
--- a/content/blog/comparisons.zh.mdx
+++ b/content/blog/comparisons.zh.mdx
@ -2,7 +2,7 @@
 title: 对比
 description: Fumadocs 与其他现有框架有何不同？
 image: /images/blog/post-2.png
-date: "2025-03-22"
+date: 2025-03-22T12:00:00.000Z
 published: true
 categories: [news, company]
 author: fox
@ -69,4 +69,4 @@ Docusaurus 是一个基于 React.js 的强大框架。它通过插件和自定

 您可以通过插件轻松实现许多功能，他们的生态系统确实更大，并由许多贡献者维护。

-相比之下，Fumadocs 的灵活性允许您自己实现它们，可能需要更长的时间来调整它以达到您的满意度。
+相比之下，Fumadocs 的灵活性允许您自己实现它们，可能需要更长的时间来调整它以达到您的满意度。 
--- a/content/blog/fumadocs.mdx
+++ b/content/blog/fumadocs.mdx
@ -2,7 +2,7 @@
 title: Quick Start
 description: Getting Started with Fumadocs
 image: /images/blog/post-8.png
-date: "2025-03-28"
+date: 2025-03-28T12:00:00.000Z
 published: true
 categories: [company, news]
 author: mksaas
@ -99,7 +99,7 @@ title: Hello World

 Run the app in development mode and see http://localhost:3000/docs.

-```mdx
+```package-install
 npm run dev
 ```

--- a/content/blog/fumadocs.zh.mdx
+++ b/content/blog/fumadocs.zh.mdx
@ -2,7 +2,7 @@
 title: 快速入门
 description: Fumadocs 入门指南
 image: /images/blog/post-8.png
-date: "2025-03-28"
+date: 2025-03-28T12:00:00.000Z
 published: true
 categories: [company, news]
 author: mksaas
@ -99,7 +99,7 @@ title: Hello World

 在开发模式下运行应用程序并查看 http://localhost:3000/docs。

-```mdx
+```package-install
 npm run dev
 ```

@ -250,4 +250,4 @@ export const source = loader({

 ## 了解更多

-刚来这里？别担心，我们欢迎您的问题。
+刚来这里？别担心，我们欢迎您的问题。 
--- a/content/blog/internationalization.mdx
+++ b/content/blog/internationalization.mdx
@ -2,7 +2,7 @@
 title: Internationalization
 description: Support multiple languages in your documentation
 image: /images/blog/post-3.png
-date: "2025-03-15"
+date: 2025-03-15T12:00:00.000Z
 published: true
 categories: [company, product]
 author: mksaas
--- a/content/blog/internationalization.zh.mdx
+++ b/content/blog/internationalization.zh.mdx
@ -2,7 +2,7 @@
 title: 国际化
 description: 在您的文档中支持多种语言
 image: /images/blog/post-3.png
-date: "2025-03-15"
+date: 2025-03-15T12:00:00.000Z
 published: true
 categories: [company, product]
 author: mksaas
@ -224,4 +224,4 @@ return <Link href={`/${lang}/another-page`}>This is a link</Link>;
 import { DynamicLink } from 'fumadocs-core/dynamic-link';

 <DynamicLink href="/[lang]/another-page">This is a link</DynamicLink>
-```
+``` 
--- a/content/blog/manual-installation.mdx
+++ b/content/blog/manual-installation.mdx
@ -2,7 +2,7 @@
 title: Manual Installation
 description: Create a new fumadocs project from scratch.
 image: /images/blog/post-4.png
-date: "2025-03-14"
+date: 2025-03-14T12:00:00.000Z
 published: true
 categories: [company, product]
 author: mkdirs
@ -14,7 +14,7 @@ author: mkdirs

 Create a new Next.js application with `create-next-app`, and install required packages.

-```mdx
+```package-install
 fumadocs-ui fumadocs-core
 ```

--- a/content/blog/manual-installation.zh.mdx
+++ b/content/blog/manual-installation.zh.mdx
@ -2,7 +2,7 @@
 title: 手动安装
 description: 从零开始创建一个新的 Fumadocs 项目
 image: /images/blog/post-4.png
-date: "2025-03-14"
+date: 2025-03-14T12:00:00.000Z
 published: true
 categories: [company, product]
 author: mkdirs
@ -14,7 +14,7 @@ author: mkdirs

 使用 `create-next-app` 创建一个新的 Next.js 应用程序，并安装所需的包。

-```mdx
+```package-install
 fumadocs-ui fumadocs-core
 ```

@ -193,4 +193,4 @@ WORKDIR /app
 COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* .npmrc* source.config.ts ./
 ```

-这确保 Fumadocs MDX 在构建期间可以访问您的配置文件。
+这确保 Fumadocs MDX 在构建期间可以访问您的配置文件。
--- a/content/blog/markdown.mdx
+++ b/content/blog/markdown.mdx
@ -2,7 +2,7 @@
 title: Markdown
 description: How to write documents
 image: /images/blog/post-5.png
-date: "2025-03-05"
+date: 2025-03-05T12:00:00.000Z
 published: true
 categories: [news, company]
 author: mkdirs
@ -353,12 +353,12 @@ Some optional plugins you can enable.
 Write math equations with TeX.

 ````md
-```mdx
+```math
 f(x) = x * e^{2 pi i \xi x}
 ```
 ````

-```mdx
+```math
 f(x) = x * e^{2 pi i \xi x}
 ```

@ -369,12 +369,12 @@ To enable, see [Math Integration](/docs/math).
 Generate code blocks for installing packages via package managers (JS/Node.js).

 ````md
-```mdx
+```package-install
 npm i next -D
 ```
 ````

-```mdx
+```package-install
 npm i next -D
 ```

--- a/content/blog/markdown.zh.mdx
+++ b/content/blog/markdown.zh.mdx
@ -2,7 +2,7 @@
 title: Markdown
 description: 如何撰写文档
 image: /images/blog/post-5.png
-date: "2025-03-05"
+date: 2025-03-05T12:00:00.000Z
 published: true
 categories: [news, company]
 author: mkdirs
@ -251,7 +251,7 @@ console.log('Hello World');
 ```
 ````

-### 高亮行
+### 高亮行 

 ````md
 ```tsx
--- a/content/blog/premium.mdx
+++ b/content/blog/premium.mdx
@ -1,56 +0,0 @@
---
-title: "Premium Blog Post"
-description: "This blog post is a test for premium content."
-date: "2025-08-30"
-published: true
-premium: true
-categories: ["product"]
-author: "fox"
-image: "/images/blog/post-7.png"
---
-
-This blog post is a test for premium content.
-
-You can read this part of the blog post if you are not a premium user.
-
-But for the rest of the blog post, you need to be logged in as a premium user.
-
-You can click the "Sign In" button to sign in as a user with free plan.
-
-Then you can click the "Upgrade Now" button to upgrade to a premium plan.
-
-<Callout type="warn">
-  Don't worry, you don't actually pay any cents, because we are in the sandbox environment of Stripe.
-</Callout>
-
-You can use the test card number to pay for monthly or yearly PRO plan or LIFETIME plan.
-
-```
-Card number: 4242 4242 4242 4242
-Exp: 12/34
-CVV: 567
-```
-
-After that, you can return to the blog post and you can read the rest of the blog post.
-
-For more details, please check out the documentation: [Blog](https://mksaas.com/docs/blog).
-
-Now the rest of the blog post is premium content.
-
-<PremiumContent>
-
-<Callout type="info">
-  This is the beginning of the premium content part.
-</Callout>
-
-This is the premium content part.
-
-You can read this paragraph only if you are a premium user.
-
-Please don't share this blog post with others.
-
-<Callout type="info">
-  This is the end of the premium content part.
-</Callout>
-
-</PremiumContent>
--- a/content/blog/premium.zh.mdx
+++ b/content/blog/premium.zh.mdx
@ -1,56 +0,0 @@
---
-title: "测试专用付费文章"
-description: "这是一篇测试专用付费文章。"
-date: "2025-08-30"
-published: true
-premium: true
-categories: ["product"]
-author: "fox"
-image: "/images/blog/post-7.png"
---
-
-这是一篇测试专用的付费文章。
-
-如果你不是付费用户，你可以阅读这篇文章的这部分内容。
-
-但如果你想阅读剩下的内容，你需要成为一个付费用户。
-
-你可以点击 "登录" 按钮来以免费用户的身份登录。
-
-然后你可以点击 "立即升级" 按钮来升级到付费计划。
-
-<Callout type="warn">
-  不用担心，你实际上不需要支付任何费用，因为我们处于 Stripe 的沙盒环境中。
-</Callout>
-
-你可以使用测试卡号来支付月度或年度 PRO 计划或终身计划。
-
-```
-Card number: 4242 4242 4242 4242
-Exp: 12/34
-CVV: 567
-```
-
-之后，你可以返回这篇博客文章，然后你可以阅读剩下的内容。
-
-更多详情，请参考文档：[博客](https://mksaas.com/docs/blog)。
-
-现在剩下的内容是付费内容。
-
-<PremiumContent>
-
-<Callout type="info">
-  这是付费内容部分的开始。
-</Callout>
-
-这是付费内容部分。
-
-你可以阅读这篇内容，只要你是一个付费用户。
-
-请不要分享这篇文章给其他人。
-
-<Callout type="info">
-  这是付费内容部分的结束。
-</Callout>
-
-</PremiumContent>
--- a/content/blog/search.mdx
+++ b/content/blog/search.mdx
@ -2,7 +2,7 @@
 title: Search
 description: Implement document search in your docs
 image: /images/blog/post-6.png
-date: "2025-02-15"
+date: 2025-02-15T12:00:00.000Z
 published: true
 categories: [company, news]
 author: mksaas
--- a/content/blog/search.zh.mdx
+++ b/content/blog/search.zh.mdx
@ -2,7 +2,7 @@
 title: 搜索
 description: 在您的文档中实现文档搜索
 image: /images/blog/post-6.png
-date: "2025-02-15"
+date: 2025-02-15T12:00:00.000Z
 published: true
 categories: [company, news]
 author: mksaas
@ -249,4 +249,4 @@ export default function CustomSearchDialog(props: SharedProps) {
 ```

 1. 将 `endpoint`、`apiKey` 替换为您想要的值。
-2. 用您的新组件[替换默认搜索对话框](#replace-search-dialog)。
+2. 用您的新组件[替换默认搜索对话框](#replace-search-dialog)。 
--- a/content/blog/theme.mdx
+++ b/content/blog/theme.mdx
@ -2,7 +2,7 @@
 title: Themes
 description: Add Theme to Fumadocs UI
 image: /images/blog/post-7.png
-date: "2025-01-15"
+date: 2025-01-15T12:00:00.000Z
 published: true
 categories: [product, news]
 author: mkdirs
--- a/content/blog/theme.zh.mdx
+++ b/content/blog/theme.zh.mdx
@ -2,7 +2,7 @@
 title: 主题
 description: 为 Fumadocs UI 添加主题
 image: /images/blog/post-7.png
-date: "2025-01-15"
+date: 2025-01-15T12:00:00.000Z
 published: true
 categories: [product, news]
 author: mkdirs
@ -167,4 +167,4 @@ Tailwind CSS 预设引入了新的颜色和额外的工具，包括 `fd-steps`
 ```

 > 该插件仅与 Fumadocs UI 的 MDX 组件一起工作，它可能与 `@tailwindcss/typography` 冲突。
-> 如果您需要使用 `@tailwindcss/typography` 而不是默认插件，请[设置类名选项](https://github.com/tailwindlabs/tailwindcss-typography/blob/main/README.md#changing-the-default-class-name)以避免冲突。
+> 如果您需要使用 `@tailwindcss/typography` 而不是默认插件，请[设置类名选项](https://github.com/tailwindlabs/tailwindcss-typography/blob/main/README.md#changing-the-default-class-name)以避免冲突。 
--- a/content/blog/what-is-fumadocs.mdx
+++ b/content/blog/what-is-fumadocs.mdx
@ -2,7 +2,7 @@
 title: What is Fumadocs
 description: Introducing Fumadocs, a docs framework that you can break.
 image: /images/blog/post-1.png
-date: "2025-04-01"
+date: 2025-04-01T12:00:00.000Z
 published: true
 categories: [company, product]
 author: fox
--- a/content/blog/what-is-fumadocs.zh.mdx
+++ b/content/blog/what-is-fumadocs.zh.mdx
@ -2,7 +2,7 @@
 title: 什么是 Fumadocs
 description: 介绍 Fumadocs，一个可以打破常规的文档框架
 image: /images/blog/post-1.png
-date: "2025-04-01"
+date: 2025-04-01T12:00:00.000Z
 published: true
 categories: [company, product]
 author: fox
@ -57,4 +57,4 @@ Fumadocs 为 Next.js 提供了额外的工具，包括语法高亮、文档搜

 Fumadocs 由 Fuma 和许多贡献者维护，关注代码库的可维护性。
 虽然我们不打算提供人们想要的每一项功能，但我们更专注于使基本功能完美且维护良好。
-您也可以通过贡献来帮助 Fumadocs 变得更加有用！
+您也可以通过贡献来帮助 Fumadocs 变得更加有用！ 
--- a/content/category/company.mdx
+++ b/content/category/company.mdx
@ -1,4 +1,5 @@
 ---
+slug: company
 name: Company
 description: Company news and updates
 ---
--- a/content/category/company.zh.mdx
+++ b/content/category/company.zh.mdx
@ -1,4 +1,5 @@
 ---
+slug: company
 name: 公司
 description: 公司新闻和更新
 ---
--- a/content/category/news.mdx
+++ b/content/category/news.mdx
@ -1,4 +1,5 @@
 ---
+slug: news
 name: News
 description: News and updates about MkSaaS
 ---
--- a/content/category/news.zh.mdx
+++ b/content/category/news.zh.mdx
@ -1,4 +1,5 @@
 ---
+slug: news
 name: 新闻
 description: 最新新闻和更新
 ---
--- a/content/category/product.mdx
+++ b/content/category/product.mdx
@ -1,4 +1,5 @@
 ---
+slug: product
 name: Product
 description: Products and services powered by MkSaaS
 ---
--- a/content/category/product.zh.mdx
+++ b/content/category/product.zh.mdx
@ -1,4 +1,5 @@
 ---
+slug: product
 name: 产品
 description: 产品和服务
 ---
--- a/content/docs/components/index.zh.mdx
+++ b/content/docs/components/index.zh.mdx
@ -2,4 +2,4 @@
 title: 组件
 description: 改进文档的额外组件
 index: true
---
+--- 
--- a/content/docs/customisation.mdx
+++ b/content/docs/customisation.mdx
@ -46,6 +46,6 @@ Since the design system is built on Tailwind CSS, you can customise it [with CSS

 If none of them suits you, Fumadocs CLI is a tool to install Fumadocs UI components and layouts to your codebase, similar to Shadcn UI. Allowing you to fully customise Fumadocs UI:

-```mdx
+```package-install
 npx fumadocs add
 ```
--- a/content/docs/customisation.zh.mdx
+++ b/content/docs/customisation.zh.mdx
@ -46,6 +46,6 @@ Fumadocs UI 还提供了样式化组件，用于交互式示例以增强您的

 如果这些都不适合您，Fumadocs CLI 是一个工具，可以将 Fumadocs UI 组件和布局安装到您的代码库中，类似于 Shadcn UI。允许您完全自定义 Fumadocs UI：

-```mdx
+```package-install
 npx fumadocs add
-```
+``` 
--- a/content/docs/index.mdx
+++ b/content/docs/index.mdx
@ -95,7 +95,7 @@ title: Hello World

 Run the app in development mode and see http://localhost:3000/docs.

-```mdx
+```package-install
 npm run dev
 ```

--- a/content/docs/index.zh.mdx
+++ b/content/docs/index.zh.mdx
@ -95,7 +95,7 @@ title: Hello World

 在开发模式下运行应用程序并查看 http://localhost:3000/docs。

-```mdx
+```package-install
 npm run dev
 ```

@ -250,4 +250,4 @@ export const source = loader({

 ## 了解更多

-刚来这里？别担心，我们欢迎您的问题。
+刚来这里？别担心，我们欢迎您的问题。
--- a/content/docs/manual-installation.mdx
+++ b/content/docs/manual-installation.mdx
@ -9,7 +9,7 @@ description: Create a new fumadocs project from scratch.

 Create a new Next.js application with `create-next-app`, and install required packages.

-```mdx
+```package-install
 fumadocs-ui fumadocs-core
 ```

--- a/content/docs/manual-installation.zh.mdx
+++ b/content/docs/manual-installation.zh.mdx
@ -9,7 +9,7 @@ description: 从零开始创建一个新的 Fumadocs 项目

 使用 `create-next-app` 创建一个新的 Next.js 应用程序，并安装所需的包。

-```mdx
+```package-install
 fumadocs-ui fumadocs-core
 ```

@ -188,4 +188,4 @@ WORKDIR /app
 COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* .npmrc* source.config.ts ./
 ```

-这确保 Fumadocs MDX 在构建期间可以访问您的配置文件。
+这确保 Fumadocs MDX 在构建期间可以访问您的配置文件。
--- a/content/docs/markdown.mdx
+++ b/content/docs/markdown.mdx
@ -348,12 +348,12 @@ Some optional plugins you can enable.
 Write math equations with TeX.

 ````md
-```mdx
+```math
 f(x) = x * e^{2 pi i \xi x}
 ```
 ````

-```mdx
+```math
 f(x) = x * e^{2 pi i \xi x}
 ```

@ -364,12 +364,12 @@ To enable, see [Math Integration](/docs/math).
 Generate code blocks for installing packages via package managers (JS/Node.js).

 ````md
-```mdx
+```package-install
 npm i next -D
 ```
 ````

-```mdx
+```package-install
 npm i next -D
 ```

--- a/content/docs/what-is-fumadocs.mdx
+++ b/content/docs/what-is-fumadocs.mdx
@ -2,7 +2,6 @@
 title: What is Fumadocs
 description: Introducing Fumadocs, a docs framework that you can break.
 icon: CircleHelp
-premium: true
 ---

 Fumadocs was created because I wanted a more customisable experience for building docs, to be a docs framework that is not opinionated, **a "framework" that you can break**.
@ -19,8 +18,6 @@ You are still using features of Next.js App Router, like **Static Site Generatio
 **Opinionated on UI:** The only thing Fumadocs UI (the default theme) offers is **User Interface**. The UI is opinionated for bringing better mobile responsiveness and user experience.
 Instead, we use a much more flexible approach inspired by Shadcn UI — [Fumadocs CLI](/docs/cli), so we can iterate our design quick, and welcome for more feedback about the UI.

-<PremiumContent>
-
 ## Why Fumadocs

 Fumadocs is designed with flexibility in mind.
@ -59,5 +56,3 @@ docs easier, with less boilerplate.
 Fumadocs is maintained by Fuma and many contributors, with care on the maintainability of codebase.
 While we don't aim to offer every functionality people wanted, we're more focused on making basic features perfect and well-maintained.
 You can also help Fumadocs to be more useful by contributing!
-
-</PremiumContent>
--- a/content/docs/what-is-fumadocs.zh.mdx
+++ b/content/docs/what-is-fumadocs.zh.mdx
@ -2,7 +2,6 @@
 title: 什么是 Fumadocs
 description: 介绍 Fumadocs，一个可以打破常规的文档框架
 icon: CircleHelp
-premium: true
 ---

 Fumadocs 的创建是因为我想要一种更加可定制化的文档构建体验，一个不固执己见的文档框架，**一个你可以"打破"的"框架"**。
@ -19,8 +18,6 @@ Fumadocs 的创建是因为我想要一种更加可定制化的文档构建体
 **对 UI 有自己的看法：** Fumadocs UI（默认主题）提供的唯一东西是**用户界面**。UI 的设计理念是提供更好的移动响应性和用户体验。
 相反，我们使用受 Shadcn UI 启发的更灵活的方法 — [Fumadocs CLI](/docs/cli)，这样我们可以快速迭代设计，并欢迎更多关于 UI 的反馈。

-<PremiumContent>
-
 ## 为什么选择 Fumadocs

 Fumadocs 的设计考虑了灵活性。
@ -56,6 +53,4 @@ Fumadocs 为 Next.js 提供了额外的工具，包括语法高亮、文档搜

 Fumadocs 由 Fuma 和许多贡献者维护，关注代码库的可维护性。
 虽然我们不打算提供人们想要的每一项功能，但我们更专注于使基本功能完美且维护良好。
-您也可以通过贡献来帮助 Fumadocs 变得更加有用！
-
-</PremiumContent>
+您也可以通过贡献来帮助 Fumadocs 变得更加有用！ 
--- a/content/pages/cookie-policy.mdx
+++ b/content/pages/cookie-policy.mdx
@ -1,7 +1,7 @@
 ---
 title: Cookie Policy
 description: How we use cookies and similar technologies on our website
-date: "2025-03-10"
+date: 2025-03-10T00:00:00.000Z
 published: true
 ---

--- a/content/pages/cookie-policy.zh.mdx
+++ b/content/pages/cookie-policy.zh.mdx
@ -1,7 +1,7 @@
 ---
 title: Cookie 政策
 description: 我们如何在网站上使用 Cookie 和类似技术
-date: "2025-03-10"
+date: 2025-03-10T00:00:00.000Z
 published: true
 ---

--- a/content/pages/privacy-policy.mdx
+++ b/content/pages/privacy-policy.mdx
@ -1,7 +1,7 @@
 ---
 title: Privacy Policy
 description: Our commitment to protecting your privacy and personal data
-date: "2025-03-10"
+date: 2025-03-10T00:00:00.000Z
 published: true
 ---

--- a/content/pages/privacy-policy.zh.mdx
+++ b/content/pages/privacy-policy.zh.mdx
@ -1,7 +1,7 @@
 ---
 title: 隐私政策
 description: 我们致力于保护您的隐私和个人数据
-date: "2025-03-10"
+date: 2025-03-10T00:00:00.000Z
 published: true
 ---

--- a/content/pages/terms-of-service.mdx
+++ b/content/pages/terms-of-service.mdx
@ -1,7 +1,7 @@
 ---
 title: Terms of Service
 description: The terms and conditions governing the use of our services
-date: "2025-03-10"
+date: 2025-03-10T00:00:00.000Z
 published: true
 ---

--- a/content/pages/terms-of-service.zh.mdx
+++ b/content/pages/terms-of-service.zh.mdx
@ -1,7 +1,7 @@
 ---
 title: 服务条款
 description: 管理我们服务使用的条款和条件
-date: "2025-03-10"
+date: 2025-03-10T00:00:00.000Z
 published: true
 ---

--- a/content/changelog/v1-0-0.mdx
+++ b/content/changelog/v1-0-0.mdx
@ -1,7 +1,7 @@
 ---
 title: "Initial Release"
 description: "Our first official release with core features and functionality"
-date: "2024-03-01"
+date: "2024-03-01T00:00:00Z"
 version: "v1.0.0"
 published: true
 ---
@ -27,4 +27,4 @@ We're excited to announce the initial release of our platform with the following

 - Fixed issues with user registration flow
 - Resolved authentication token expiration handling
- Improved form validation and error messages
+- Improved form validation and error messages 
--- a/content/changelog/v1-0-0.zh.mdx
+++ b/content/changelog/v1-0-0.zh.mdx
@ -1,7 +1,7 @@
 ---
 title: "初始版本"
 description: "我们的第一个正式版本，包含核心功能"
-date: "2024-03-01"
+date: "2024-03-01T00:00:00Z"
 version: "v1.0.0"
 published: true
 ---
@ -27,4 +27,4 @@ published: true

 - 修复了用户注册流程中的问题
 - 解决了身份验证令牌过期处理
- 改进了表单验证和错误消息
+- 改进了表单验证和错误消息 
--- a/content/changelog/v1-1-0.mdx
+++ b/content/changelog/v1-1-0.mdx
@ -1,7 +1,7 @@
 ---
 title: "Feature Update"
 description: "New features and improvements to enhance your experience"
-date: "2024-03-15"
+date: "2024-03-15T00:00:00Z"
 version: "v1.1.0"
 published: true
 ---
@ -27,4 +27,4 @@ We've added several new features to improve your experience:
 - Fixed issue with project duplication
 - Resolved calendar sync problems
 - Fixed data import validation errors
- Improved error handling for API requests
+- Improved error handling for API requests 
--- a/content/changelog/v1-1-0.zh.mdx
+++ b/content/changelog/v1-1-0.zh.mdx
@ -1,7 +1,7 @@
 ---
 title: "功能更新"
 description: "新功能和改进，提升您的使用体验"
-date: "2024-03-15"
+date: "2024-03-15T00:00:00Z"
 version: "v1.1.0"
 published: true
 ---
@ -27,4 +27,4 @@ published: true
 - 修复了项目复制问题
 - 解决了日历同步问题
 - 修复了数据导入验证错误
- 改进了API请求的错误处理
+- 改进了API请求的错误处理 
--- a/content/changelog/v1-2-0.mdx
+++ b/content/changelog/v1-2-0.mdx
@ -1,7 +1,7 @@
 ---
 title: "AI Integration"
 description: "Introducing AI-powered features to boost productivity"
-date: "2024-03-30"
+date: "2024-03-30T00:00:00Z"
 version: "v1.2.0"
 published: true
 ---
@ -34,4 +34,4 @@ We're thrilled to introduce our new AI capabilities:
 - Fixed issues with file uploads on certain browsers
 - Resolved synchronization issues between devices
 - Improved error handling for third-party integrations
- Fixed accessibility issues in the dashboard
+- Fixed accessibility issues in the dashboard 
--- a/content/changelog/v1-2-0.zh.mdx
+++ b/content/changelog/v1-2-0.zh.mdx
@ -1,7 +1,7 @@
 ---
 title: "AI集成"
 description: "引入AI驱动的功能，提高生产力"
-date: "2024-03-30"
+date: "2024-03-30T00:00:00Z"
 version: "v1.2.0"
 published: true
 ---
@ -34,4 +34,4 @@ published: true
 - 修复了某些浏览器上文件上传的问题
 - 解决了设备之间的同步问题
 - 改进了第三方集成的错误处理
- 修复了仪表板中的可访问性问题
+- 修复了仪表板中的可访问性问题 
--- a/dev.vars.example
+++ b/dev.vars.example
@ -1 +0,0 @@
-NEXTJS_ENV=development
--- a/drizzle.config.ts
+++ b/drizzle.config.ts
@ -5,7 +5,7 @@ import { defineConfig } from 'drizzle-kit';
 * https://orm.drizzle.team/docs/get-started/neon-new#step-5---setup-drizzle-config-file
 */
 export default defineConfig({
-  out: './src/db/migrations',
+  out: './drizzle',
  schema: './src/db/schema.ts',
  dialect: 'postgresql',
  dbCredentials: {
--- a/src/db/migrations/0000_fine_sir_ram.sql
+++ b/src/db/migrations/0000_fine_sir_ram.sql
--- a/src/db/migrations/meta/0000_snapshot.json
+++ b/src/db/migrations/meta/0000_snapshot.json
--- a/drizzle/meta/_journal.json
+++ b/drizzle/meta/_journal.json
@ -0,0 +1,13 @@
+{
+  "version": "7",
+  "dialect": "postgresql",
+  "entries": [
+    {
+      "idx": 0,
+      "version": "7",
+      "when": 1744304844165,
+      "tag": "0000_fine_sir_ram",
+      "breakpoints": true
+    }
+  ]
+}
--- a/env.example
+++ b/env.example
@ -8,13 +8,13 @@ NEXT_PUBLIC_BASE_URL="http://localhost:3000"

 # -----------------------------------------------------------------------------
 # Database
-# https://mksaas.com/docs/database
+# https://mksaas.com/docs/database#setup
 # -----------------------------------------------------------------------------
 DATABASE_URL=""

 # -----------------------------------------------------------------------------
 # Better Auth
-# https://mksaas.com/docs/auth
+# https://mksaas.com/docs/auth#setup
 # Generate a random string for the secret key using `openssl rand -base64 32`
 # -----------------------------------------------------------------------------
 BETTER_AUTH_SECRET=""
@ -39,8 +39,8 @@ GOOGLE_CLIENT_SECRET=""

 # -----------------------------------------------------------------------------
 # Email / Newsletter (Resend)
-# https://mksaas.com/docs/email
-# https://mksaas.com/docs/newsletter
+# https://mksaas.com/docs/email#setup
+# https://mksaas.com/docs/newsletter#setup
 # Get API key and audience id from https://resend.com
 # -----------------------------------------------------------------------------
 RESEND_API_KEY=""
@ -48,7 +48,7 @@ RESEND_AUDIENCE_ID=""

 # -----------------------------------------------------------------------------
 # Storage (Cloudflare R2 or S3-compatible service of your choice)
-# https://mksaas.com/docs/storage
+# https://mksaas.com/docs/storage#setup
 # Cloudflare R2: https://www.cloudflare.com/developer-platform/products/r2
 # -----------------------------------------------------------------------------
 STORAGE_REGION="auto"
@ -56,11 +56,12 @@ STORAGE_BUCKET_NAME=""
 STORAGE_ACCESS_KEY_ID=""
 STORAGE_SECRET_ACCESS_KEY=""
 STORAGE_ENDPOINT=""
+STORAGE_FORCE_PATH_STYLE="false"
 STORAGE_PUBLIC_URL=""

 # -----------------------------------------------------------------------------
 # Payment (Stripe)
-# https://mksaas.com/docs/payment
+# https://mksaas.com/docs/payment#setup
 # Get Stripe key and secret from https://dashboard.stripe.com
 # -----------------------------------------------------------------------------
 STRIPE_SECRET_KEY=""
@ -71,29 +72,18 @@ NEXT_PUBLIC_STRIPE_PRICE_PRO_MONTHLY=""
 NEXT_PUBLIC_STRIPE_PRICE_PRO_YEARLY=""
 # Lifetime plan - one-time payment
 NEXT_PUBLIC_STRIPE_PRICE_LIFETIME=""
-# Credit package - basic
-NEXT_PUBLIC_STRIPE_PRICE_CREDITS_BASIC=""
-# Credit package - standard
-NEXT_PUBLIC_STRIPE_PRICE_CREDITS_STANDARD=""
-# Credit package - premium
-NEXT_PUBLIC_STRIPE_PRICE_CREDITS_PREMIUM=""
-# Credit package - enterprise
-NEXT_PUBLIC_STRIPE_PRICE_CREDITS_ENTERPRISE=""

 # -----------------------------------------------------------------------------
 # Configurations
 # -----------------------------------------------------------------------------
 # Disable image optimization, check out next.config.ts for more details
-# -----------------------------------------------------------------------------
 DISABLE_IMAGE_OPTIMIZATION=false
-# -----------------------------------------------------------------------------
 # Run this website as demo website, in most cases, you should set this to false
-# -----------------------------------------------------------------------------
 NEXT_PUBLIC_DEMO_WEBSITE=false

 # -----------------------------------------------------------------------------
 # Analytics
-# https://mksaas.com/docs/analytics
+# https://mksaas.com/docs/analytics#setup
 # -----------------------------------------------------------------------------
 # Google Analytics (https://analytics.google.com)
 # https://mksaas.com/docs/analytics#google
@ -130,68 +120,18 @@ NEXT_PUBLIC_SELINE_TOKEN=""
 # DataFast Analytics (https://datafa.st)
 # https://mksaas.com/docs/analytics#datafast
 # -----------------------------------------------------------------------------
-NEXT_PUBLIC_DATAFAST_WEBSITE_ID=""
-NEXT_PUBLIC_DATAFAST_DOMAIN=""
+NEXT_PUBLIC_DATAFAST_ANALYTICS_ID=""
+NEXT_PUBLIC_DATAFAST_ANALYTICS_DOMAIN=""


 # -----------------------------------------------------------------------------
-# Notification (Discord)
+# Discord
 # -----------------------------------------------------------------------------
-DISCORD_WEBHOOK_URL=""
-# -----------------------------------------------------------------------------
-# Notification (Feishu)
-# -----------------------------------------------------------------------------
-FEISHU_WEBHOOK_URL=""
+NEXT_PUBLIC_DISCORD_WIDGET_SERVER_ID=""
+NEXT_PUBLIC_DISCORD_WIDGET_CHANNEL_ID=""

 # -----------------------------------------------------------------------------
-# Affiliate
+# Affiliate (Affonso)
 # https://mksaas.com/docs/affiliate
 # -----------------------------------------------------------------------------
-# Affonso
-# https://affonso.com/
-# -----------------------------------------------------------------------------
 NEXT_PUBLIC_AFFILIATE_AFFONSO_ID=""
-# -----------------------------------------------------------------------------
-# PromoteKit
-# https://www.promotekit.com/
-# -----------------------------------------------------------------------------
-NEXT_PUBLIC_AFFILIATE_PROMOTEKIT_ID=""
-
-# -----------------------------------------------------------------------------
-# Captcha (Cloudflare Turnstile)
-# https://mksaas.com/docs/captcha
-# -----------------------------------------------------------------------------
-NEXT_PUBLIC_TURNSTILE_SITE_KEY=""
-TURNSTILE_SECRET_KEY=""
-
-# -----------------------------------------------------------------------------
-# Crisp
-# https://mksaas.com/docs/chat
-# -----------------------------------------------------------------------------
-NEXT_PUBLIC_CRISP_WEBSITE_ID=""
-
-# -----------------------------------------------------------------------------
-# Cron Jobs
-# https://mksaas.com/docs/cronjobs
-# -----------------------------------------------------------------------------
-CRON_JOBS_USERNAME=""
-CRON_JOBS_PASSWORD=""
-
-# -----------------------------------------------------------------------------
-# AI
-# https://mksaas.com/docs/ai
-# -----------------------------------------------------------------------------
-AI_GATEWAY_API_KEY=""
-FAL_API_KEY=""
-FIREWORKS_API_KEY=""
-OPENAI_API_KEY=""
-REPLICATE_API_TOKEN=""
-GOOGLE_GENERATIVE_AI_API_KEY=""
-DEEPSEEK_API_KEY=""
-OPENROUTER_API_KEY=""
-
-# -----------------------------------------------------------------------------
-# Web Content Analyzer (Firecrawl)
-# https://firecrawl.dev/
-# -----------------------------------------------------------------------------
-FIRECRAWL_API_KEY=""
--- a/messages/en.json
+++ b/messages/en.json
@ -5,7 +5,6 @@
    "description": "MkSaaS is the best AI SaaS boilerplate. Make AI SaaS in days, simply and effortlessly"
  },
  "Common": {
-    "premium": "Premium",
    "login": "Log in",
    "logout": "Log out",
    "signUp": "Sign up",
@ -29,21 +28,7 @@
    "save": "Save",
    "loading": "Loading...",
    "cancel": "Cancel",
-    "logoutFailed": "Failed to log out",
-    "table": {
-      "totalRecords": "Total {count} records",
-      "noResults": "No results",
-      "loading": "Loading...",
-      "columns": "Columns",
-      "rowsPerPage": "Rows per page",
-      "page": "Page",
-      "firstPage": "First Page",
-      "lastPage": "Last Page",
-      "nextPage": "Next Page",
-      "previousPage": "Previous Page",
-      "ascending": "Asc",
-      "descending": "Desc"
-    }
+    "logoutFailed": "Failed to log out"
  },
  "PricingPage": {
    "title": "Pricing",
@ -114,24 +99,6 @@
      }
    }
  },
-  "CreditPackages": {
-    "basic": {
-      "name": "Basic",
-      "description": "Basic credits package description"
-    },
-    "standard": {
-      "name": "Standard",
-      "description": "Standard credits package description"
-    },
-    "premium": {
-      "name": "Premium",
-      "description": "Premium credits package description"
-    },
-    "enterprise": {
-      "name": "Enterprise",
-      "description": "Enterprise credits package description"
-    }
-  },
  "NotFoundPage": {
    "title": "404",
    "message": "Sorry, the page you are looking for does not exist.",
@ -220,9 +187,7 @@
      "hidePassword": "Hide password",
      "or": "Or continue with",
      "emailRequired": "Please enter your email",
-      "passwordRequired": "Please enter your password",
-      "captchaInvalid": "Captcha verification failed",
-      "captchaError": "Captcha verification error"
+      "passwordRequired": "Please enter your password"
    },
    "register": {
      "title": "Register",
@ -237,9 +202,7 @@
      "hidePassword": "Hide password",
      "nameRequired": "Please enter your name",
      "emailRequired": "Please enter your email",
-      "passwordRequired": "Please enter your password",
-      "captchaInvalid": "Captcha verification failed",
-      "captchaError": "Captcha verification error"
+      "passwordRequired": "Please enter your password"
    },
    "forgotPassword": {
      "title": "Forgot Password",
@ -293,20 +256,8 @@
    "nextPage": "Next",
    "chooseLanguage": "Select language",
    "title": "MkSaaS Docs",
-    "homepage": "Homepage"
-  },
-  "PremiumContent": {
-    "title": "Unlock Premium Content",
-    "description": "Subscribe to our Pro plan to access all premium content and exclusive content.",
-    "upgradeCta": "Upgrade Now",
-    "benefit1": "All premium content",
-    "benefit2": "Exclusive content",
-    "benefit3": "Cancel anytime",
-    "signIn": "Sign In",
-    "loginRequired": "Sign in to continue reading",
-    "loginDescription": "This is premium content. Sign in to your account to access the full content.",
-    "checkingAccess": "Checking access...",
-    "loadingContent": "Loading full content..."
+    "homepage": "Homepage",
+    "blog": "Blog"
  },
  "Marketing": {
    "navbar": {
@ -333,10 +284,6 @@
            "title": "AI Image",
            "description": "Show how to use AI to generate beautiful images"
          },
-          "chat": {
-            "title": "AI Chat",
-            "description": "Show how to use AI to chat with your customers"
-          },
          "video": {
            "title": "AI Video",
            "description": "Show how to use AI to generate amazing videos"
@ -483,7 +430,6 @@
    "avatar": {
      "dashboard": "Dashboard",
      "billing": "Billing",
-      "credits": "Credits",
      "settings": "Settings"
    }
  },
@ -509,6 +455,14 @@
          "banReason": "Ban Reason",
          "banExpires": "Ban Expires"
        },
+        "noResults": "No results",
+        "firstPage": "First Page",
+        "lastPage": "Last Page",
+        "nextPage": "Next Page",
+        "previousPage": "Previous Page",
+        "rowsPerPage": "Rows per page",
+        "page": "Page",
+        "loading": "Loading...",
        "admin": "Admin",
        "user": "User",
        "email": {
@ -518,8 +472,8 @@
        "emailCopied": "Email copied to clipboard",
        "banned": "Banned",
        "active": "Active",
-        "joined": "Joined at",
-        "updated": "Updated at",
+        "joined": "Joined",
+        "updated": "Updated",
        "ban": {
          "reason": "Ban Reason",
          "reasonPlaceholder": "Enter the reason for banning this user",
@ -590,8 +544,7 @@
          "createCustomerPortalFailed": "Failed to open Stripe customer portal"
        },
        "price": "Price:",
-        "periodStartDate": "Period start date:",
-        "periodEndDate": "Period end date:",
+        "nextBillingDate": "Next billing date:",
        "trialEnds": "Trial ends:",
        "freePlanMessage": "You are currently on the free plan with limited features",
        "lifetimeMessage": "You have lifetime access to all premium features",
@ -599,77 +552,7 @@
        "manageBilling": "Manage Billing",
        "upgradePlan": "Upgrade Plan",
        "retry": "Retry",
-        "errorMessage": "Failed to get data",
-        "paymentSuccess": "Payment successful"
-      },
-      "credits": {
-        "title": "Credits",
-        "description": "Manage your credit transactions",
-        "tabs": {
-          "balance": "Balance",
-          "transactions": "Transactions"
-        },
-        "balance": {
-          "title": "Credit Balance",
-          "description": "Your credit balance",
-          "credits": "Credits",
-          "creditsDescription": "You have {credits} credits",
-          "creditsExpired": "Credits expired",
-          "creditsAdded": "Credits have been added to your account",
-          "viewTransactions": "View Credit Transactions",
-          "retry": "Retry",
-          "expiringCredits": "{credits} credits expiring in the next {days} days"
-        },
-        "packages": {
-          "title": "Credit Packages",
-          "description": "Purchase additional credits to use our services",
-          "purchase": "Purchase",
-          "processing": "Processing...",
-          "popular": "Popular",
-          "completePurchase": "Complete Your Purchase",
-          "failedToFetchCredits": "Failed to fetch credits",
-          "failedToCreatePaymentIntent": "Failed to create payment intent",
-          "failedToInitiatePayment": "Failed to initiate payment",
-          "cancel": "Cancel",
-          "purchaseFailed": "Purchase credits failed",
-          "checkoutFailed": "Failed to create checkout session",
-          "loading": "Loading...",
-          "pay": "Pay"
-        },
-        "transactions": {
-          "title": "Credit Transactions",
-          "error": "Failed to get credit transactions",
-          "search": "Search credit transactions...",
-          "paymentIdCopied": "Payment ID copied to clipboard",
-          "columns": {
-            "columns": "Columns",
-            "id": "ID",
-            "type": "Type",
-            "description": "Description",
-            "amount": "Amount",
-            "remainingAmount": "Remaining Amount",
-            "paymentId": "Payment ID",
-            "expirationDate": "Expiration Date",
-            "expirationDateProcessedAt": "Expiration Date Processed At",
-            "createdAt": "Created At",
-            "updatedAt": "Updated At"
-          },
-          "types": {
-            "MONTHLY_REFRESH": "Monthly Refresh",
-            "REGISTER_GIFT": "Register Gift",
-            "PURCHASE": "Purchased Credits",
-            "USAGE": "Consumed Credits",
-            "EXPIRE": "Expired Credits",
-            "SUBSCRIPTION_RENEWAL": "Subscription Renewal",
-            "LIFETIME_MONTHLY": "Lifetime Monthly"
-          },
-          "detailViewer": {
-            "title": "Credit Transaction Detail",
-            "close": "Close"
-          },
-          "expired": "Expired",
-          "never": "Never"
-        }
+        "errorMessage": "Failed to get data"
      },
      "notification": {
        "title": "Notification",
@ -1007,68 +890,23 @@
    }
  },
  "AITextPage": {
-    "title": "AI Text Demo",
-    "description": "Analyze web content with AI to extract key information, features, and insights",
-    "content": "Web Content Analyzer",
-    "subtitle": "Enter a website URL to get AI-powered analysis of its content",
-    "analyzer": {
-      "title": "Web Content Analyzer",
-      "description": "Analyze any website content using AI to extract structured information",
-      "placeholder": "Enter website URL (e.g., https://example.com)",
-      "button": "Analyze Website",
-      "loading": {
-        "scraping": "Scraping website content...",
-        "analyzing": "Analyzing content with AI..."
-      },
-      "results": {
-        "title": "Analysis Results",
-        "newAnalysis": "Analyze Another Website",
-        "sections": {
-          "title": "Title",
-          "description": "Description",
-          "introduction": "Introduction",
-          "features": "Features",
-          "pricing": "Pricing",
-          "useCases": "Use Cases",
-          "screenshot": "Website Screenshot"
-        }
-      },
-      "errors": {
-        "invalidUrl": "Please enter a valid URL starting with http:// or https://",
-        "analysisError": "Failed to analyze website. Please try again.",
-        "networkError": "Network error. Please check your connection and try again.",
-        "insufficientCredits": "Insufficient credits. Please purchase more credits to continue."
-      }
-    },
-    "features": {
-      "scraping": {
-        "title": "Smart Web Scraping",
-        "description": "Advanced web scraping technology extracts clean, structured content from any website"
-      },
-      "analysis": {
-        "title": "AI-Powered Analysis",
-        "description": "Intelligent AI analysis extracts key insights, features, and structured information"
-      },
-      "results": {
-        "title": "Structured Results",
-        "description": "Get organized, easy-to-read results with clear sections and actionable insights"
-      }
-    }
+    "title": "AI Text",
+    "description": "MkSaaS lets you make AI SaaS in days, simply and effortlessly",
+    "content": "Working in progress"
  },
  "AIImagePage": {
    "title": "AI Image",
-    "description": "MkSaaS lets you make AI SaaS in days, simply and effortlessly"
-  },
-  "AIChatPage": {
-    "title": "AI Chat",
-    "description": "MkSaaS lets you make AI SaaS in days, simply and effortlessly"
+    "description": "MkSaaS lets you make AI SaaS in days, simply and effortlessly",
+    "content": "Working in progress"
  },
  "AIVideoPage": {
    "title": "AI Video",
-    "description": "MkSaaS lets you make AI SaaS in days, simply and effortlessly"
+    "description": "MkSaaS lets you make AI SaaS in days, simply and effortlessly",
+    "content": "Working in progress"
  },
  "AIAudioPage": {
    "title": "AI Audio",
-    "description": "MkSaaS lets you make AI SaaS in days, simply and effortlessly"
+    "description": "MkSaaS lets you make AI SaaS in days, simply and effortlessly",
+    "content": "Working in progress"
  }
 }
--- a/messages/zh.json
+++ b/messages/zh.json
@ -5,7 +5,6 @@
    "description": "MkSaaS 是构建 AI SaaS 的最佳模板，使用 MkSaaS 可以在几天内轻松构建您的 AI SaaS，简单且毫不费力。"
  },
  "Common": {
-    "premium": "付费文章",
    "login": "登录",
    "logout": "退出",
    "signUp": "注册",
@ -29,21 +28,7 @@
    "saving": "保存中...",
    "loading": "加载中...",
    "cancel": "取消",
-    "logoutFailed": "退出失败",
-    "table": {
-      "totalRecords": "总共 {count} 条记录",
-      "noResults": "无结果",
-      "loading": "加载中...",
-      "columns": "列",
-      "rowsPerPage": "每页行数",
-      "page": "页",
-      "firstPage": "第一页",
-      "lastPage": "最后一页",
-      "nextPage": "下一页",
-      "previousPage": "上一页",
-      "ascending": "升序",
-      "descending": "降序"
-    }
+    "logoutFailed": "退出失败"
  },
  "PricingPage": {
    "title": "价格",
@ -109,29 +94,12 @@
        "feature-3": "专属支持",
        "feature-4": "企业级安全",
        "feature-5": "高级集成",
-        "feature-6": "自定义品牌",
-        "feature-7": "终身更新"
+        "feature-6": "自定义域名",
+        "feature-7": "自定义品牌",
+        "feature-8": "终身更新"
      }
    }
  },
-  "CreditPackages": {
-    "basic": {
-      "name": "基础版",
-      "description": "基础版功能介绍放这里"
-    },
-    "standard": {
-      "name": "标准版",
-      "description": "标准版功能介绍放这里"
-    },
-    "premium": {
-      "name": "高级版",
-      "description": "高级版功能介绍放这里"
-    },
-    "enterprise": {
-      "name": "企业版",
-      "description": "企业版功能介绍放这里"
-    }
-  },
  "NotFoundPage": {
    "title": "404",
    "message": "抱歉，您正在寻找的页面不存在",
@ -220,9 +188,7 @@
      "hidePassword": "隐藏密码",
      "or": "或以社媒账号登录",
      "emailRequired": "请输入邮箱",
-      "passwordRequired": "请输入密码",
-      "captchaInvalid": "验证码验证失败",
-      "captchaError": "验证码验证出错"
+      "passwordRequired": "请输入密码"
    },
    "register": {
      "title": "注册",
@ -237,9 +203,7 @@
      "hidePassword": "隐藏密码",
      "nameRequired": "请输入姓名",
      "emailRequired": "请输入邮箱",
-      "passwordRequired": "请输入密码",
-      "captchaInvalid": "验证码验证失败",
-      "captchaError": "验证码验证出错"
+      "passwordRequired": "请输入密码"
    },
    "forgotPassword": {
      "title": "忘记密码",
@ -293,20 +257,8 @@
    "nextPage": "下一页",
    "chooseLanguage": "选择语言",
    "title": "MkSaaS文档",
-    "homepage": "首页"
-  },
-  "PremiumContent": {
-    "title": "解锁付费内容",
-    "description": "订阅我们的付费计划，访问所有付费内容和独家内容。",
-    "upgradeCta": "立即升级",
-    "benefit1": "所有内容",
-    "benefit2": "独家内容",
-    "benefit3": "随时取消",
-    "signIn": "登录",
-    "loginRequired": "登录以继续阅读",
-    "loginDescription": "这是一篇付费内容，请登录您的账户以访问完整内容。",
-    "checkingAccess": "检查阅读权限...",
-    "loadingContent": "加载完整内容..."
+    "homepage": "首页",
+    "blog": "博客"
  },
  "Marketing": {
    "navbar": {
@ -333,10 +285,6 @@
            "title": "AI 图像",
            "description": "展示如何使用 AI 生成精美图像"
          },
-          "chat": {
-            "title": "AI 聊天",
-            "description": "展示如何使用 AI 与客户聊天"
-          },
          "video": {
            "title": "AI 视频",
            "description": "展示如何使用 AI 生成惊人视频"
@ -426,13 +374,13 @@
          "comparator": {
            "title": "Comparator 组件"
          },
-          "faq": {
-            "title": "FAQ 组件"
+          "faqs": {
+            "title": "FAQs 组件"
          },
          "login": {
            "title": "Login 组件"
          },
-          "signup": {
+          "sign-up": {
            "title": "Signup 组件"
          },
          "forgot-password": {
@ -483,7 +431,6 @@
    "avatar": {
      "dashboard": "工作台",
      "billing": "账单",
-      "credits": "积分",
      "settings": "设置"
    }
  },
@ -509,6 +456,14 @@
          "banReason": "封禁原因",
          "banExpires": "封禁到期时间"
        },
+        "noResults": "没有结果",
+        "firstPage": "第一页",
+        "lastPage": "最后一页",
+        "nextPage": "下一页",
+        "previousPage": "上一页",
+        "rowsPerPage": "每页行数",
+        "page": "页",
+        "loading": "加载中...",
        "admin": "管理员",
        "user": "用户",
        "email": {
@ -590,8 +545,7 @@
          "createCustomerPortalFailed": "打开Stripe客户界面失败"
        },
        "price": "价格：",
-        "periodStartDate": "周期开始日期：",
-        "periodEndDate": "周期结束日期：",
+        "nextBillingDate": "下次账单日期：",
        "trialEnds": "试用结束日期：",
        "freePlanMessage": "您当前使用的是功能有限的免费方案",
        "lifetimeMessage": "您拥有所有高级功能的终身使用权限",
@ -599,77 +553,7 @@
        "manageBilling": "管理账单",
        "upgradePlan": "升级方案",
        "retry": "重试",
-        "errorMessage": "获取数据失败",
-        "paymentSuccess": "支付成功"
-      },
-      "credits": {
-        "title": "积分",
-        "description": "管理您的积分交易",
-        "tabs": {
-          "balance": "积分余额",
-          "transactions": "交易记录"
-        },
-        "balance": {
-          "title": "积分余额",
-          "description": "您的积分余额",
-          "credits": "积分",
-          "creditsDescription": "您有 {credits} 积分",
-          "creditsExpired": "积分已过期",
-          "creditsAdded": "积分已添加到您的账户",
-          "viewTransactions": "查看积分记录",
-          "retry": "重试",
-          "expiringCredits": "{credits} 积分将在 {days} 天内过期"
-        },
-        "packages": {
-          "title": "积分套餐",
-          "description": "购买积分以使用我们的更多服务",
-          "purchase": "购买",
-          "processing": "处理中...",
-          "popular": "热门",
-          "completePurchase": "请支付订单",
-          "failedToFetchCredits": "获取积分失败",
-          "failedToCreatePaymentIntent": "创建付款意向失败",
-          "failedToInitiatePayment": "发起付款失败",
-          "cancel": "取消",
-          "purchaseFailed": "购买积分失败",
-          "checkoutFailed": "创建支付会话失败",
-          "loading": "加载中...",
-          "pay": "支付"
-        },
-        "transactions": {
-          "title": "积分记录",
-          "error": "获取积分交易记录失败",
-          "search": "搜索积分交易记录...",
-          "paymentIdCopied": "支付ID已复制到剪贴板",
-          "columns": {
-            "columns": "列",
-            "id": "ID",
-            "type": "类型",
-            "description": "描述",
-            "amount": "金额",
-            "remainingAmount": "剩余金额",
-            "paymentId": "支付编号",
-            "expirationDate": "过期日期",
-            "expirationDateProcessedAt": "过期处理时间",
-            "createdAt": "创建时间",
-            "updatedAt": "更新时间"
-          },
-          "types": {
-            "MONTHLY_REFRESH": "每月赠送",
-            "REGISTER_GIFT": "注册赠送",
-            "PURCHASE": "购买积分",
-            "USAGE": "使用积分",
-            "EXPIRE": "过期积分",
-            "SUBSCRIPTION_RENEWAL": "订阅月度积分",
-            "LIFETIME_MONTHLY": "终身月度积分"
-          },
-          "detailViewer": {
-            "title": "积分交易详情",
-            "close": "关闭"
-          },
-          "expired": "已过期",
-          "never": "永不过期"
-        }
+        "errorMessage": "获取数据失败"
      },
      "notification": {
        "title": "通知",
@ -1008,67 +892,22 @@
  },
  "AITextPage": {
    "title": "AI 文本",
-    "description": "使用 AI 分析网页内容，提取关键信息、功能和见解",
-    "content": "网页内容分析器",
-    "subtitle": "输入网站 URL，使用 AI 分析其内容",
-    "analyzer": {
-      "title": "网页内容分析器",
-      "description": "使用 AI 分析任何网站的内容，提取结构化信息",
-      "placeholder": "输入网站 URL（例如：https://example.com）",
-      "button": "分析网站",
-      "loading": {
-        "scraping": "正在抓取网站内容...",
-        "analyzing": "正在使用 AI 分析内容..."
-      },
-      "results": {
-        "title": "分析结果",
-        "newAnalysis": "分析其他网站",
-        "sections": {
-          "title": "标题",
-          "description": "描述",
-          "introduction": "介绍",
-          "features": "功能",
-          "pricing": "定价",
-          "useCases": "使用场景",
-          "screenshot": "网站截图"
-        }
-      },
-      "errors": {
-        "invalidUrl": "请输入以 http:// 或 https:// 开头的有效 URL",
-        "analysisError": "分析网站失败，请重试。",
-        "networkError": "网络错误，请检查您的连接并重试。",
-        "insufficientCredits": "积分不足，请购买更多积分以继续。"
-      }
-    },
-    "features": {
-      "scraping": {
-        "title": "智能网页抓取",
-        "description": "先进的网页抓取技术从任何网站提取干净、结构化的内容"
-      },
-      "analysis": {
-        "title": "AI 驱动分析",
-        "description": "智能 AI 分析提取关键见解、功能和结构化信息"
-      },
-      "results": {
-        "title": "结构化结果",
-        "description": "获得有组织、易于阅读的结果，包含清晰的部分和可操作的见解"
-      }
-    }
+    "description": "MkSaaS 让您在几天内轻松构建您的 AI SaaS，简单且毫不费力",
+    "content": "正在开发中"
  },
  "AIImagePage": {
    "title": "AI 图片",
-    "description": "MkSaaS 让您在几天内轻松构建您的 AI SaaS，简单且毫不费力"
-  },
-  "AIChatPage": {
-    "title": "AI 聊天",
-    "description": "MkSaaS 让您在几天内轻松构建您的 AI SaaS，简单且毫不费力"
+    "description": "MkSaaS 让您在几天内轻松构建您的 AI SaaS，简单且毫不费力",
+    "content": "正在开发中"
  },
  "AIVideoPage": {
    "title": "AI 视频",
-    "description": "MkSaaS 让您在几天内轻松构建您的 AI SaaS，简单且毫不费力"
+    "description": "MkSaaS 让您在几天内轻松构建您的 AI SaaS，简单且毫不费力",
+    "content": "正在开发中"
  },
  "AIAudioPage": {
    "title": "AI 音频",
-    "description": "MkSaaS 让您在几天内轻松构建您的 AI SaaS，简单且毫不费力"
+    "description": "MkSaaS 让您在几天内轻松构建您的 AI SaaS，简单且毫不费力",
+    "content": "正在开发中"
  }
 }
--- a/next.config.ts
+++ b/next.config.ts
@ -1,4 +1,4 @@
-import { createMDX } from 'fumadocs-mdx/next';
+import { withContentCollections } from '@content-collections/next';
 import type { NextConfig } from 'next';
 import createNextIntlPlugin from 'next-intl/plugin';

@ -6,28 +6,13 @@ import createNextIntlPlugin from 'next-intl/plugin';
 * https://nextjs.org/docs/app/api-reference/config/next-config-js
 */
 const nextConfig: NextConfig = {
-  // Docker standalone output
-  ...(process.env.DOCKER_BUILD === 'true' && { output: 'standalone' }),
-
  /* config options here */
  devIndicators: false,

  // https://nextjs.org/docs/architecture/nextjs-compiler#remove-console
  // Remove all console.* calls in production only
  compiler: {
-    // removeConsole: process.env.NODE_ENV === 'production',
-  },
-
-  // https://github.com/vercel/next.js/discussions/50177#discussioncomment-6006702
-  // fix build error: Module build failed: UnhandledSchemeError:
-  // Reading from "cloudflare:sockets" is not handled by plugins (Unhandled scheme).
-  webpack: (config, { webpack }) => {
-    config.plugins.push(
-      new webpack.IgnorePlugin({
-        resourceRegExp: /^pg-native$|^cloudflare:sockets$/,
-      })
-    );
-    return config;
+    removeConsole: process.env.NODE_ENV === 'production',
  },

  images: {
@ -56,14 +41,6 @@ const nextConfig: NextConfig = {
        protocol: 'https',
        hostname: 'ik.imagekit.io',
      },
-      {
-        protocol: 'https',
-        hostname: 'html.tailus.io',
-      },
-      {
-        protocol: 'https',
-        hostname: 'service.firecrawl.dev',
-      },
    ],
  },
 };
@ -76,15 +53,8 @@ const nextConfig: NextConfig = {
 const withNextIntl = createNextIntlPlugin();

 /**
- * https://fumadocs.dev/docs/ui/manual-installation
- * https://fumadocs.dev/docs/mdx/plugin
+ * withContentCollections must be the outermost plugin
+ *
+ * https://www.content-collections.dev/docs/quickstart/next
 */
-const withMDX = createMDX();
-
-export default withMDX(withNextIntl(nextConfig));
-
-// https://opennext.js.org/cloudflare/get-started#12-develop-locally
-import { initOpenNextCloudflareForDev } from '@opennextjs/cloudflare';
-
-// during local development, to access in any of your server code, local versions of Cloudflare bindings
-initOpenNextCloudflareForDev();
+export default withContentCollections(withNextIntl(nextConfig));
--- a/open-next.config.ts
+++ b/open-next.config.ts
@ -1,6 +0,0 @@
-import { defineCloudflareConfig } from "@opennextjs/cloudflare";
-
-
-export default defineCloudflareConfig({
-
-});
--- a/package.json
+++ b/package.json
@ -3,11 +3,9 @@
  "version": "0.1.0",
  "private": true,
  "scripts": {
-    "dev": "next dev",
-    "cf-dev": "next dev -p 8787",
-    "build": "next build",
+    "dev": "concurrently \"content-collections watch\" \"next dev\"",
+    "build": "content-collections build && next build",
    "start": "next start",
-    "postinstall": "fumadocs-mdx",
    "lint": "biome check --write .",
    "lint:fix": "biome check --fix --unsafe .",
    "format": "biome format --write .",
@ -16,35 +14,25 @@
    "db:push": "drizzle-kit push",
    "db:studio": "drizzle-kit studio",
    "list-contacts": "tsx scripts/list-contacts.ts",
-    "list-users": "tsx scripts/list-users.ts",
-    "content": "fumadocs-mdx",
-    "email": "email dev --dir src/mail/templates --port 3333",
-    "preview": "opennextjs-cloudflare build && opennextjs-cloudflare preview",
-    "deploy": "opennextjs-cloudflare build && opennextjs-cloudflare deploy",
-    "upload": "opennextjs-cloudflare build && opennextjs-cloudflare upload",
-    "cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts",
-    "knip": "knip"
+    "docs": "content-collections build",
+    "email": "email dev --dir src/mail/templates --port 3333"
  },
  "dependencies": {
-    "@ai-sdk/deepseek": "^1.0.0",
-    "@ai-sdk/fal": "^1.0.0",
-    "@ai-sdk/fireworks": "^1.0.0",
-    "@ai-sdk/google": "^2.0.0",
-    "@ai-sdk/openai": "^2.0.0",
-    "@ai-sdk/react": "^2.0.22",
-    "@ai-sdk/replicate": "^1.0.0",
-    "@base-ui-components/react": "1.0.0-beta.0",
+    "@ai-sdk/openai": "^1.1.13",
+    "@aws-sdk/client-s3": "^3.758.0",
+    "@aws-sdk/s3-request-presigner": "^3.758.0",
    "@better-fetch/fetch": "^1.1.18",
+    "@content-collections/core": "^0.8.0",
+    "@content-collections/mdx": "^0.2.0",
+    "@content-collections/next": "^0.2.4",
    "@dnd-kit/core": "^6.3.1",
    "@dnd-kit/modifiers": "^9.0.0",
    "@dnd-kit/sortable": "^10.0.0",
    "@dnd-kit/utilities": "^3.2.2",
-    "@hookform/resolvers": "^5.2.1",
-    "@marsidev/react-turnstile": "^1.1.0",
-    "@mendable/firecrawl-js": "^1.29.1",
+    "@fumadocs/content-collections": "^1.1.8",
+    "@hookform/resolvers": "^4.1.0",
    "@next/third-parties": "^15.3.0",
    "@openpanel/nextjs": "^1.0.7",
-    "@openrouter/ai-sdk-provider": "^1.0.0-beta.6",
    "@orama/orama": "^3.1.4",
    "@orama/tokenizers": "^3.1.4",
    "@radix-ui/react-accordion": "^1.2.3",
@ -76,25 +64,22 @@
    "@radix-ui/react-toggle": "^1.1.2",
    "@radix-ui/react-toggle-group": "^1.1.2",
    "@radix-ui/react-tooltip": "^1.1.8",
-    "@radix-ui/react-use-controllable-state": "^1.2.2",
    "@react-email/components": "0.0.33",
    "@react-email/render": "1.0.5",
    "@stripe/stripe-js": "^5.6.0",
    "@tabler/icons-react": "^3.31.0",
-    "@tanstack/react-query": "^5.85.5",
-    "@tanstack/react-query-devtools": "^5.85.5",
    "@tanstack/react-table": "^8.21.2",
    "@types/canvas-confetti": "^1.9.0",
    "@vercel/analytics": "^1.5.0",
    "@vercel/speed-insights": "^1.2.0",
-    "ai": "^5.0.0",
+    "@widgetbot/react-embed": "^1.9.0",
+    "ai": "^4.1.45",
    "better-auth": "^1.1.19",
    "canvas-confetti": "^1.9.3",
    "class-variance-authority": "^0.7.1",
    "clsx": "^2.1.1",
    "cmdk": "1.1.1",
    "cookie": "^1.0.2",
-    "crisp-sdk-web": "^1.0.25",
    "date-fns": "^4.1.0",
    "deepmerge": "^4.3.1",
    "dotenv": "^16.4.7",
@ -102,65 +87,63 @@
    "drizzle-orm": "^0.39.3",
    "embla-carousel-react": "^8.5.2",
    "framer-motion": "^12.4.7",
-    "fumadocs-core": "^15.6.7",
-    "fumadocs-mdx": "^11.7.3",
-    "fumadocs-ui": "^15.6.7",
+    "fumadocs-core": "^15.1.2",
+    "fumadocs-ui": "^15.1.2",
    "input-otp": "^1.4.2",
    "lucide-react": "^0.483.0",
+    "mdast-util-toc": "^7.1.0",
    "motion": "^12.4.3",
    "next": "15.2.1",
    "next-intl": "^4.0.0",
+    "next-plausible": "^3.12.4",
    "next-safe-action": "^7.10.4",
    "next-themes": "^0.4.4",
-    "pg": "^8.16.0",
-    "nuqs": "^2.5.1",
    "postgres": "^3.4.5",
-    "radix-ui": "^1.4.2",
    "react": "^19.0.0",
    "react-day-picker": "8.10.1",
    "react-dom": "^19.0.0",
-    "react-hook-form": "^7.62.0",
+    "react-hook-form": "^7.54.2",
    "react-remove-scroll": "^2.6.3",
    "react-resizable-panels": "^2.1.7",
-    "react-syntax-highlighter": "^15.6.3",
    "react-tweet": "^3.2.2",
    "react-use-measure": "^2.1.7",
    "recharts": "^2.15.1",
+    "rehype-autolink-headings": "^7.1.0",
+    "rehype-pretty-code": "^0.14.0",
+    "rehype-slug": "^6.0.0",
+    "remark": "^15.0.1",
+    "remark-code-import": "^1.2.0",
+    "remark-gfm": "^4.0.1",
    "resend": "^4.4.1",
-    "s3mini": "^0.2.0",
    "shiki": "^2.4.2",
    "sonner": "^2.0.0",
-    "streamdown": "^1.0.12",
    "stripe": "^17.6.0",
    "swiper": "^11.2.5",
    "tailwind-merge": "^3.0.2",
    "tailwindcss-animate": "^1.0.7",
    "tw-animate-css": "^1.2.4",
+    "unist-util-visit": "^5.0.0",
    "use-intl": "^3.26.5",
    "use-media": "^1.5.0",
-    "use-stick-to-bottom": "^1.1.1",
    "vaul": "^1.1.2",
-    "zod": "^4.0.17",
+    "zod": "^3.24.2",
    "zustand": "^5.0.3"
  },
  "devDependencies": {
    "@biomejs/biome": "1.9.4",
-    "@opennextjs/cloudflare": "^1.6.5",
+    "@content-collections/cli": "^0.1.6",
    "@tailwindcss/postcss": "^4.0.14",
-    "@tanstack/eslint-plugin-query": "^5.83.1",
    "@types/mdx": "^2.0.13",
-    "@types/node": "^20.19.0",
+    "@types/node": "^20",
    "@types/pg": "^8.11.11",
    "@types/react": "^19",
    "@types/react-dom": "^19",
-    "@types/react-syntax-highlighter": "^15.5.13",
+    "concurrently": "^9.1.2",
    "drizzle-kit": "^0.30.4",
-    "knip": "^5.61.2",
    "postcss": "^8",
    "react-email": "3.0.7",
    "tailwindcss": "^4.0.14",
    "tsx": "^4.19.3",
-    "typescript": "^5.8.3",
-    "wrangler": "^4.28.1"
+    "typescript": "^5"
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/public/_headers
+++ b/public/_headers
@ -1,2 +0,0 @@
-/_next/static/*
-  Cache-Control: public,max-age=31536000,immutable
--- a/public/sw.js
+++ b/public/sw.js
@ -0,0 +1,129 @@
+// Service Worker for caching iframe content
+const CACHE_NAME = 'cnblocks-iframe-cache-v1'
+
+// Add iframe URLs to this list to prioritize caching
+const URLS_TO_CACHE = [
+    // Default assets that should be cached
+    '/favicon.ico',
+    // Images used in iframes
+    '/payments.png',
+    '/payments-light.png',
+    '/origin-cal.png',
+    '/origin-cal-dark.png',
+    '/exercice.png',
+    '/exercice-dark.png',
+    '/charts-light.png',
+    '/charts.png',
+    '/music-light.png',
+    '/music.png',
+    '/mail-back-light.png',
+    '/mail-upper.png',
+    '/mail-back.png',
+    '/card.png',
+    '/dark-card.webp',
+]
+
+// Install event - cache resources
+self.addEventListener('install', (event) => {
+    event.waitUntil(
+        caches
+            .open(CACHE_NAME)
+            .then((cache) => {
+                console.log('Opened cache')
+                return cache.addAll(URLS_TO_CACHE)
+            })
+            .then(() => self.skipWaiting()) // Activate SW immediately
+    )
+})
+
+// Activate event - clean up old caches
+self.addEventListener('activate', (event) => {
+    const currentCaches = [CACHE_NAME]
+    event.waitUntil(
+        caches
+            .keys()
+            .then((cacheNames) => {
+                return cacheNames.filter((cacheName) => !currentCaches.includes(cacheName))
+            })
+            .then((cachesToDelete) => {
+                return Promise.all(
+                    cachesToDelete.map((cacheToDelete) => {
+                        return caches.delete(cacheToDelete)
+                    })
+                )
+            })
+            .then(() => self.clients.claim()) // Take control of clients immediately
+    )
+})
+
+// Fetch event - serve from cache or fetch from network and cache
+self.addEventListener('fetch', (event) => {
+    // Check if this is an iframe request - typically they'll be HTML or have 'preview' in the URL
+    const isIframeRequest = event.request.url.includes('/preview/') || event.request.url.includes('/examples/')
+
+    if (isIframeRequest) {
+        event.respondWith(
+            caches.match(event.request, { ignoreSearch: true }).then((response) => {
+                // Return cached response if found
+                if (response) {
+                    return response
+                }
+
+                // Clone the request (requests are one-time use)
+                const fetchRequest = event.request.clone()
+
+                return fetch(fetchRequest).then((response) => {
+                    // Check if we received a valid response
+                    if (!response || response.status !== 200 || response.type !== 'basic') {
+                        return response
+                    }
+
+                    // Clone the response (responses are one-time use)
+                    const responseToCache = response.clone()
+
+                    caches.open(CACHE_NAME).then((cache) => {
+                        cache.put(event.request, responseToCache)
+                    })
+
+                    return response
+                })
+            })
+        )
+    } else {
+        // For non-iframe requests, use a standard cache-first strategy
+        event.respondWith(
+            caches.match(event.request).then((response) => {
+                if (response) {
+                    return response
+                }
+                return fetch(event.request)
+            })
+        )
+    }
+})
+
+// Listen for messages from clients (to force cache update, etc)
+self.addEventListener('message', (event) => {
+    if (event.data && event.data.type === 'SKIP_WAITING') {
+        self.skipWaiting()
+    }
+
+    // Handle cache clearing
+    if (event.data && event.data.type === 'CLEAR_IFRAME_CACHE') {
+        const url = event.data.url
+
+        if (url) {
+            // Clear specific URL from cache
+            caches.open(CACHE_NAME).then((cache) => {
+                cache.delete(url).then(() => {
+                    console.log(`Cleared cache for: ${url}`)
+                })
+            })
+        } else {
+            // Clear the entire cache
+            caches.delete(CACHE_NAME).then(() => {
+                console.log('Cleared entire iframe cache')
+            })
+        }
+    }
+})
--- a/scripts/list-users.ts
+++ b/scripts/list-users.ts
@ -1,24 +0,0 @@
-import dotenv from 'dotenv';
-import { getDb } from '../src/db/index.js';
-import { user } from '../src/db/schema.js';
-dotenv.config();
-
-export default async function listUsers() {
-  const db = await getDb();
-
-  try {
-    const users = await db.select({ email: user.email }).from(user);
-
-    // Extract emails from users
-    const emails: string[] = users.map((user) => user.email);
-
-    console.log(`Total users: ${emails.length}`);
-
-    // Output all emails joined with comma
-    console.log(emails.join(', '));
-  } catch (error) {
-    console.error('Error fetching users:', error);
-  }
-}
-
-listUsers();
--- a/source.config.ts
+++ b/source.config.ts
@ -1,102 +0,0 @@
-import {
-  defineCollections,
-  defineDocs,
-  frontmatterSchema,
-  metaSchema,
-} from 'fumadocs-mdx/config';
-import { z } from 'zod';
-
-/**
- * https://fumadocs.dev/docs/mdx/collections#schema-1
- */
-export const docs = defineDocs({
-  dir: 'content/docs',
-  docs: {
-    schema: frontmatterSchema.extend({
-      preview: z.string().optional(),
-      index: z.boolean().default(false),
-      premium: z.boolean().optional(),
-    }),
-  },
-  meta: {
-    schema: metaSchema.extend({
-      description: z.string().optional(),
-    }),
-  },
-});
-
-/**
- * Changelog
- *
- * title is required, but description is optional in frontmatter
- */
-export const changelog = defineCollections({
-  type: 'doc',
-  dir: 'content/changelog',
-  schema: frontmatterSchema.extend({
-    version: z.string(),
-    date: z.string().date(),
-    published: z.boolean().default(true),
-  }),
-});
-
-/**
- * Pages, like privacy policy, terms of service, etc.
- *
- * title is required, but description is optional in frontmatter
- */
-export const pages = defineCollections({
-  type: 'doc',
-  dir: 'content/pages',
-  schema: frontmatterSchema.extend({
-    date: z.string().date(),
-    published: z.boolean().default(true),
-  }),
-});
-
-/**
- * Blog authors
- *
- * description is optional in frontmatter, but we must add it to the schema
- */
-export const author = defineCollections({
-  type: 'doc',
-  dir: 'content/author',
-  schema: z.object({
-    name: z.string(),
-    avatar: z.string(),
-    description: z.string().optional(),
-  }),
-});
-
-/**
- * Blog categories
- *
- * description is optional in frontmatter, but we must add it to the schema
- */
-export const category = defineCollections({
-  type: 'doc',
-  dir: 'content/category',
-  schema: z.object({
-    name: z.string(),
-    description: z.string().optional(),
-  }),
-});
-
-/**
- * Blog posts
- *
- * title is required, but description is optional in frontmatter
- */
-export const blog = defineCollections({
-  type: 'doc',
-  dir: 'content/blog',
-  schema: frontmatterSchema.extend({
-    image: z.string(),
-    date: z.string().date(),
-    published: z.boolean().default(true),
-    premium: z.boolean().optional(),
-    categories: z.array(z.string()),
-    author: z.string(),
-  }),
-});
--- a/src/actions/check-newsletter-status.ts
+++ b/src/actions/check-newsletter-status.ts
@ -1,16 +1,19 @@
 'use server';

-import { userActionClient } from '@/lib/safe-action';
 import { isSubscribed } from '@/newsletter';
+import { createSafeActionClient } from 'next-safe-action';
 import { z } from 'zod';

+// Create a safe action client
+const actionClient = createSafeActionClient();
+
 // Newsletter schema for validation
 const newsletterSchema = z.object({
-  email: z.email({ error: 'Please enter a valid email address' }),
+  email: z.string().email({ message: 'Please enter a valid email address' }),
 });

 // Create a safe action to check if a user is subscribed to the newsletter
-export const checkNewsletterStatusAction = userActionClient
+export const checkNewsletterStatusAction = actionClient
  .schema(newsletterSchema)
  .action(async ({ parsedInput: { email } }) => {
    try {
--- a/src/actions/consume-credits.ts
+++ b/src/actions/consume-credits.ts
@ -1,37 +0,0 @@
-'use server';
-
-import { consumeCredits } from '@/credits/credits';
-import type { User } from '@/lib/auth-types';
-import { userActionClient } from '@/lib/safe-action';
-import { z } from 'zod';
-
-// consume credits schema
-const consumeSchema = z.object({
-  amount: z.number().min(1),
-  description: z.string().optional(),
-});
-
-/**
- * Consume credits
- */
-export const consumeCreditsAction = userActionClient
-  .schema(consumeSchema)
-  .action(async ({ parsedInput, ctx }) => {
-    const { amount, description } = parsedInput;
-    const currentUser = (ctx as { user: User }).user;
-
-    try {
-      await consumeCredits({
-        userId: currentUser.id,
-        amount,
-        description: description || `Consume credits: ${amount}`,
-      });
-      return { success: true };
-    } catch (error) {
-      console.error('consume credits error:', error);
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : 'Something went wrong',
-      };
-    }
-  });
--- a/src/actions/create-checkout-session.ts
+++ b/src/actions/create-checkout-session.ts
@ -1,34 +1,57 @@
 'use server';

-import { websiteConfig } from '@/config/website';
-import type { User } from '@/lib/auth-types';
 import { findPlanByPlanId } from '@/lib/price-plan';
-import { userActionClient } from '@/lib/safe-action';
+import { getSession } from '@/lib/server';
 import { getUrlWithLocale } from '@/lib/urls/urls';
 import { createCheckout } from '@/payment';
 import type { CreateCheckoutParams } from '@/payment/types';
 import { Routes } from '@/routes';
 import { getLocale } from 'next-intl/server';
-import { cookies } from 'next/headers';
+import { createSafeActionClient } from 'next-safe-action';
 import { z } from 'zod';

+// Create a safe action client
+const actionClient = createSafeActionClient();
+
 // Checkout schema for validation
 // metadata is optional, and may contain referral information if you need
 const checkoutSchema = z.object({
-  userId: z.string().min(1, { error: 'User ID is required' }),
-  planId: z.string().min(1, { error: 'Plan ID is required' }),
-  priceId: z.string().min(1, { error: 'Price ID is required' }),
-  metadata: z.record(z.string(), z.string()).optional(),
+  userId: z.string().min(1, { message: 'User ID is required' }),
+  planId: z.string().min(1, { message: 'Plan ID is required' }),
+  priceId: z.string().min(1, { message: 'Price ID is required' }),
+  metadata: z.record(z.string()).optional(),
 });

 /**
 * Create a checkout session for a price plan
 */
-export const createCheckoutAction = userActionClient
+export const createCheckoutAction = actionClient
  .schema(checkoutSchema)
-  .action(async ({ parsedInput, ctx }) => {
-    const { planId, priceId, metadata } = parsedInput;
-    const currentUser = (ctx as { user: User }).user;
+  .action(async ({ parsedInput }) => {
+    const { userId, planId, priceId, metadata } = parsedInput;
+
+    // Get the current user session for authorization
+    const session = await getSession();
+    if (!session) {
+      console.warn(
+        `unauthorized request to create checkout session for user ${userId}`
+      );
+      return {
+        success: false,
+        error: 'Unauthorized',
+      };
+    }
+
+    // Only allow users to create their own checkout session
+    if (session.user.id !== userId) {
+      console.warn(
+        `current user ${session.user.id} is not authorized to create checkout session for user ${userId}`
+      );
+      return {
+        success: false,
+        error: 'Not authorized to do this action',
+      };
+    }

    try {
      // Get the current locale from the request
@ -39,37 +62,27 @@ export const createCheckoutAction = userActionClient
      if (!plan) {
        return {
          success: false,
-          error: 'Price plan not found',
+          error: 'Plan not found',
        };
      }

      // Add user id to metadata, so we can get it in the webhook event
-      const customMetadata: Record<string, string> = {
+      const customMetadata = {
        ...metadata,
-        userId: currentUser.id,
-        userName: currentUser.name,
+        userId: session.user.id,
+        userName: session.user.name,
      };

-      // https://datafa.st/docs/stripe-checkout-api
-      // if datafast analytics is enabled, add the revenue attribution to the metadata
-      if (websiteConfig.features.enableDatafastRevenueTrack) {
-        const cookieStore = await cookies();
-        customMetadata.datafast_visitor_id =
-          cookieStore.get('datafast_visitor_id')?.value ?? '';
-        customMetadata.datafast_session_id =
-          cookieStore.get('datafast_session_id')?.value ?? '';
-      }
-
      // Create the checkout session with localized URLs
      const successUrl = getUrlWithLocale(
-        `${Routes.SettingsBilling}?session_id={CHECKOUT_SESSION_ID}`,
+        '/settings/billing?session_id={CHECKOUT_SESSION_ID}',
        locale
      );
      const cancelUrl = getUrlWithLocale(Routes.Pricing, locale);
      const params: CreateCheckoutParams = {
        planId,
        priceId,
-        customerEmail: currentUser.email,
+        customerEmail: session.user.email,
        metadata: customMetadata,
        successUrl,
        cancelUrl,
--- a/src/actions/create-credit-checkout-session.ts
+++ b/src/actions/create-credit-checkout-session.ts
@ -1,99 +0,0 @@
-'use server';
-
-import { websiteConfig } from '@/config/website';
-import { getCreditPackageById } from '@/credits/server';
-import type { User } from '@/lib/auth-types';
-import { userActionClient } from '@/lib/safe-action';
-import { getUrlWithLocale } from '@/lib/urls/urls';
-import { createCreditCheckout } from '@/payment';
-import type { CreateCreditCheckoutParams } from '@/payment/types';
-import { Routes } from '@/routes';
-import { getLocale } from 'next-intl/server';
-import { cookies } from 'next/headers';
-import { z } from 'zod';
-
-// Credit checkout schema for validation
-// metadata is optional, and may contain referral information if you need
-const creditCheckoutSchema = z.object({
-  userId: z.string().min(1, { error: 'User ID is required' }),
-  packageId: z.string().min(1, { error: 'Package ID is required' }),
-  priceId: z.string().min(1, { error: 'Price ID is required' }),
-  metadata: z.record(z.string(), z.string()).optional(),
-});
-
-/**
- * Create a checkout session for a credit package
- */
-export const createCreditCheckoutSession = userActionClient
-  .schema(creditCheckoutSchema)
-  .action(async ({ parsedInput, ctx }) => {
-    const { packageId, priceId, metadata } = parsedInput;
-    const currentUser = (ctx as { user: User }).user;
-
-    try {
-      // Get the current locale from the request
-      const locale = await getLocale();
-
-      // Find the credit package
-      const creditPackage = getCreditPackageById(packageId);
-      if (!creditPackage) {
-        return {
-          success: false,
-          error: 'Credit package not found',
-        };
-      }
-
-      // Add metadata to identify this as a credit purchase
-      const customMetadata: Record<string, string> = {
-        ...metadata,
-        type: 'credit_purchase',
-        packageId,
-        credits: creditPackage.amount.toString(),
-        userId: currentUser.id,
-        userName: currentUser.name,
-      };
-
-      // https://datafa.st/docs/stripe-checkout-api
-      // if datafast analytics is enabled, add the revenue attribution to the metadata
-      if (websiteConfig.features.enableDatafastRevenueTrack) {
-        const cookieStore = await cookies();
-        customMetadata.datafast_visitor_id =
-          cookieStore.get('datafast_visitor_id')?.value ?? '';
-        customMetadata.datafast_session_id =
-          cookieStore.get('datafast_session_id')?.value ?? '';
-      }
-
-      // Create checkout session with credit-specific URLs
-      const successUrl = getUrlWithLocale(
-        `${Routes.SettingsCredits}?credits_session_id={CHECKOUT_SESSION_ID}`,
-        locale
-      );
-      const cancelUrl = getUrlWithLocale(Routes.SettingsCredits, locale);
-
-      const params: CreateCreditCheckoutParams = {
-        packageId,
-        priceId,
-        customerEmail: currentUser.email,
-        metadata: customMetadata,
-        successUrl,
-        cancelUrl,
-        locale,
-      };
-
-      const result = await createCreditCheckout(params);
-      // console.log('create credit checkout session result:', result);
-      return {
-        success: true,
-        data: result,
-      };
-    } catch (error) {
-      console.error('Create credit checkout session error:', error);
-      return {
-        success: false,
-        error:
-          error instanceof Error
-            ? error.message
-            : 'Failed to create checkout session',
-      };
-    }
-  });
--- a/src/actions/create-customer-portal-session.ts
+++ b/src/actions/create-customer-portal-session.ts
@ -1,45 +1,69 @@
 'use server';

-import { getDb } from '@/db';
+import db from '@/db';
 import { user } from '@/db/schema';
-import type { User } from '@/lib/auth-types';
-import { userActionClient } from '@/lib/safe-action';
+import { getSession } from '@/lib/server';
 import { getUrlWithLocale } from '@/lib/urls/urls';
 import { createCustomerPortal } from '@/payment';
 import type { CreatePortalParams } from '@/payment/types';
 import { eq } from 'drizzle-orm';
 import { getLocale } from 'next-intl/server';
+import { createSafeActionClient } from 'next-safe-action';
 import { z } from 'zod';

+// Create a safe action client
+const actionClient = createSafeActionClient();
+
 // Portal schema for validation
 const portalSchema = z.object({
-  userId: z.string().min(1, { error: 'User ID is required' }),
+  userId: z.string().min(1, { message: 'User ID is required' }),
  returnUrl: z
    .string()
-    .url({ error: 'Return URL must be a valid URL' })
+    .url({ message: 'Return URL must be a valid URL' })
    .optional(),
 });

 /**
 * Create a customer portal session
 */
-export const createPortalAction = userActionClient
+export const createPortalAction = actionClient
  .schema(portalSchema)
-  .action(async ({ parsedInput, ctx }) => {
-    const { returnUrl } = parsedInput;
-    const currentUser = (ctx as { user: User }).user;
+  .action(async ({ parsedInput }) => {
+    const { userId, returnUrl } = parsedInput;
+
+    // Get the current user session for authorization
+    const session = await getSession();
+    if (!session) {
+      console.warn(
+        `unauthorized request to create portal session for user ${userId}`
+      );
+      return {
+        success: false,
+        error: 'Unauthorized',
+      };
+    }
+
+    // Only allow users to create their own portal session
+    if (session.user.id !== userId) {
+      console.warn(
+        `current user ${session.user.id} is not authorized to create portal session for user ${userId}`
+      );
+      return {
+        success: false,
+        error: 'Not authorized to do this action',
+      };
+    }

    try {
      // Get the user's customer ID from the database
-      const db = await getDb();
      const customerResult = await db
        .select({ customerId: user.customerId })
        .from(user)
-        .where(eq(user.id, currentUser.id))
+        .where(eq(user.id, session.user.id))
        .limit(1);

      if (customerResult.length <= 0 || !customerResult[0].customerId) {
-        console.error(`No customer found for user ${currentUser.id}`);
+        console.error(`No customer found for user ${session.user.id}`);
        return {
          success: false,
          error: 'No customer found for user',
--- a/src/actions/get-active-subscription.ts
+++ b/src/actions/get-active-subscription.ts
@ -1,13 +1,16 @@
 'use server';

-import type { User } from '@/lib/auth-types';
-import { userActionClient } from '@/lib/safe-action';
+import { getSession } from '@/lib/server';
 import { getSubscriptions } from '@/payment';
+import { createSafeActionClient } from 'next-safe-action';
 import { z } from 'zod';

+// Create a safe action client
+const actionClient = createSafeActionClient();
+
 // Input schema
 const schema = z.object({
-  userId: z.string().min(1, { error: 'User ID is required' }),
+  userId: z.string().min(1, { message: 'User ID is required' }),
 });

 /**
@ -16,27 +19,38 @@ const schema = z.object({
 * If the user has multiple subscriptions,
 * it returns the most recent active or trialing one
 */
-export const getActiveSubscriptionAction = userActionClient
+export const getActiveSubscriptionAction = actionClient
  .schema(schema)
-  .action(async ({ ctx }) => {
-    const currentUser = (ctx as { user: User }).user;
+  .action(async ({ parsedInput }) => {
+    const { userId } = parsedInput;

-    // Check if Stripe environment variables are configured
-    const stripeSecretKey = process.env.STRIPE_SECRET_KEY;
-    const stripeWebhookSecret = process.env.STRIPE_WEBHOOK_SECRET;
-
-    if (!stripeSecretKey || !stripeWebhookSecret) {
-      console.log('Stripe environment variables not configured, return');
+    // Get the current user session for authorization
+    const session = await getSession();
+    if (!session) {
+      console.warn(
+        `unauthorized request to get active subscription for user ${userId}`
+      );
      return {
-        success: true,
-        data: null, // No subscription = free plan
+        success: false,
+        error: 'Unauthorized',
+      };
+    }
+
+    // Only allow users to check their own status unless they're admins
+    if (session.user.id !== userId && session.user.role !== 'admin') {
+      console.warn(
+        `current user ${session.user.id} is not authorized to get active subscription for user ${userId}`
+      );
+      return {
+        success: false,
+        error: 'Not authorized to do this action',
      };
    }

    try {
      // Find the user's most recent active subscription
      const subscriptions = await getSubscriptions({
-        userId: currentUser.id,
+        userId: session.user.id,
      });
      // console.log('get user subscriptions:', subscriptions);

@ -50,16 +64,16 @@ export const getActiveSubscriptionAction = userActionClient

        // If found, use it
        if (activeSubscription) {
-          console.log('find active subscription for userId:', currentUser.id);
+          console.log('find active subscription for userId:', session.user.id);
          subscriptionData = activeSubscription;
        } else {
          console.log(
            'no active subscription found for userId:',
-            currentUser.id
+            session.user.id
          );
        }
      } else {
-        console.log('no subscriptions found for userId:', currentUser.id);
+        console.log('no subscriptions found for userId:', session.user.id);
      }

      return {
--- a/src/actions/get-credit-balance.ts
+++ b/src/actions/get-credit-balance.ts
@ -1,27 +0,0 @@
-'use server';
-
-import { getUserCredits } from '@/credits/credits';
-import type { User } from '@/lib/auth-types';
-import { userActionClient } from '@/lib/safe-action';
-
-/**
- * Get current user's credits
- */
-export const getCreditBalanceAction = userActionClient.action(
-  async ({ ctx }) => {
-    try {
-      const currentUser = (ctx as { user: User }).user;
-      const credits = await getUserCredits(currentUser.id);
-      return { success: true, credits };
-    } catch (error) {
-      console.error('get credit balance error:', error);
-      return {
-        success: false,
-        error:
-          error instanceof Error
-            ? error.message
-            : 'Failed to fetch credit balance',
-      };
-    }
-  }
-);
--- a/src/actions/get-credit-stats.ts
+++ b/src/actions/get-credit-stats.ts
@ -1,62 +0,0 @@
-'use server';
-
-import { getDb } from '@/db';
-import { creditTransaction } from '@/db/schema';
-import type { User } from '@/lib/auth-types';
-import { CREDITS_EXPIRATION_DAYS } from '@/lib/constants';
-import { userActionClient } from '@/lib/safe-action';
-import { addDays } from 'date-fns';
-import { and, eq, gt, gte, isNotNull, lte, sum } from 'drizzle-orm';
-
-/**
- * Get credit statistics for a user
- */
-export const getCreditStatsAction = userActionClient.action(async ({ ctx }) => {
-  try {
-    const currentUser = (ctx as { user: User }).user;
-    const userId = currentUser.id;
-
-    const db = await getDb();
-    const now = new Date();
-    // Get credits expiring in the next 30 days
-    const expirationDaysFromNow = addDays(now, CREDITS_EXPIRATION_DAYS);
-
-    // Get total credits expiring in the next 30 days
-    const expiringCreditsResult = await db
-      .select({
-        totalAmount: sum(creditTransaction.remainingAmount),
-      })
-      .from(creditTransaction)
-      .where(
-        and(
-          eq(creditTransaction.userId, userId),
-          isNotNull(creditTransaction.expirationDate),
-          isNotNull(creditTransaction.remainingAmount),
-          gt(creditTransaction.remainingAmount, 0),
-          lte(creditTransaction.expirationDate, expirationDaysFromNow),
-          gte(creditTransaction.expirationDate, now)
-        )
-      );
-
-    const totalExpiringCredits =
-      Number(expiringCreditsResult[0]?.totalAmount) || 0;
-
-    return {
-      success: true,
-      data: {
-        expiringCredits: {
-          amount: totalExpiringCredits,
-        },
-      },
-    };
-  } catch (error) {
-    console.error('get credit stats error:', error);
-    return {
-      success: false,
-      error:
-        error instanceof Error
-          ? error.message
-          : 'Failed to fetch credit statistics',
-    };
-  }
-});
--- a/src/actions/get-credit-transactions.ts
+++ b/src/actions/get-credit-transactions.ts
@ -1,128 +0,0 @@
-'use server';
-
-import { getDb } from '@/db';
-import { creditTransaction } from '@/db/schema';
-import type { User } from '@/lib/auth-types';
-import { userActionClient } from '@/lib/safe-action';
-import { and, asc, desc, eq, ilike, or, sql } from 'drizzle-orm';
-import { z } from 'zod';
-
-// Define the schema for getCreditTransactions parameters
-const getCreditTransactionsSchema = z.object({
-  pageIndex: z.number().min(0).default(0),
-  pageSize: z.number().min(1).max(100).default(10),
-  search: z.string().optional().default(''),
-  sorting: z
-    .array(
-      z.object({
-        id: z.string(),
-        desc: z.boolean(),
-      })
-    )
-    .optional()
-    .default([]),
-});
-
-// Define sort field mapping
-const sortFieldMap = {
-  type: creditTransaction.type,
-  amount: creditTransaction.amount,
-  remainingAmount: creditTransaction.remainingAmount,
-  description: creditTransaction.description,
-  createdAt: creditTransaction.createdAt,
-  updatedAt: creditTransaction.updatedAt,
-  expirationDate: creditTransaction.expirationDate,
-  expirationDateProcessedAt: creditTransaction.expirationDateProcessedAt,
-  paymentId: creditTransaction.paymentId,
-} as const;
-
-// Create a safe action for getting credit transactions
-export const getCreditTransactionsAction = userActionClient
-  .schema(getCreditTransactionsSchema)
-  .action(async ({ parsedInput, ctx }) => {
-    try {
-      const { pageIndex, pageSize, search, sorting } = parsedInput;
-      const currentUser = (ctx as { user: User }).user;
-
-      // Search logic: text fields use ilike, and if search is a number, also search amount fields
-      const searchConditions = [];
-      if (search) {
-        // Always search text fields
-        searchConditions.push(
-          ilike(creditTransaction.type, `%${search}%`),
-          ilike(creditTransaction.paymentId, `%${search}%`),
-          ilike(creditTransaction.description, `%${search}%`)
-        );
-
-        // If search is a valid number, also search numeric fields
-        const numericSearch = Number.parseInt(search, 10);
-        if (!Number.isNaN(numericSearch)) {
-          searchConditions.push(
-            eq(creditTransaction.amount, numericSearch),
-            eq(creditTransaction.remainingAmount, numericSearch)
-          );
-        }
-      }
-
-      const where = search
-        ? and(
-            eq(creditTransaction.userId, currentUser.id),
-            or(...searchConditions)
-          )
-        : eq(creditTransaction.userId, currentUser.id);
-
-      const offset = pageIndex * pageSize;
-
-      // Get the sort configuration
-      const sortConfig = sorting[0];
-      const sortField = sortConfig?.id
-        ? sortFieldMap[sortConfig.id as keyof typeof sortFieldMap]
-        : creditTransaction.createdAt;
-      const sortDirection = sortConfig?.desc ? desc : asc;
-
-      const db = await getDb();
-      const [items, [{ count }]] = await Promise.all([
-        db
-          .select({
-            id: creditTransaction.id,
-            userId: creditTransaction.userId,
-            type: creditTransaction.type,
-            description: creditTransaction.description,
-            amount: creditTransaction.amount,
-            remainingAmount: creditTransaction.remainingAmount,
-            paymentId: creditTransaction.paymentId,
-            expirationDate: creditTransaction.expirationDate,
-            expirationDateProcessedAt:
-              creditTransaction.expirationDateProcessedAt,
-            createdAt: creditTransaction.createdAt,
-            updatedAt: creditTransaction.updatedAt,
-          })
-          .from(creditTransaction)
-          .where(where)
-          .orderBy(sortDirection(sortField))
-          .limit(pageSize)
-          .offset(offset),
-        db
-          .select({ count: sql`count(*)` })
-          .from(creditTransaction)
-          .where(where),
-      ]);
-
-      return {
-        success: true,
-        data: {
-          items,
-          total: Number(count),
-        },
-      };
-    } catch (error) {
-      console.error('get credit transactions error:', error);
-      return {
-        success: false,
-        error:
-          error instanceof Error
-            ? error.message
-            : 'Failed to fetch credit transactions',
-      };
-    }
-  });
--- a/src/actions/get-lifetime-status.ts
+++ b/src/actions/get-lifetime-status.ts
@ -1,17 +1,20 @@
 'use server';

-import { getDb } from '@/db';
+import db from '@/db';
 import { payment } from '@/db/schema';
-import type { User } from '@/lib/auth-types';
 import { findPlanByPriceId, getAllPricePlans } from '@/lib/price-plan';
-import { userActionClient } from '@/lib/safe-action';
+import { getSession } from '@/lib/server';
 import { PaymentTypes } from '@/payment/types';
 import { and, eq } from 'drizzle-orm';
+import { createSafeActionClient } from 'next-safe-action';
 import { z } from 'zod';

+// Create a safe action client
+const actionClient = createSafeActionClient();
+
 // Input schema
 const schema = z.object({
-  userId: z.string().min(1, { error: 'User ID is required' }),
+  userId: z.string().min(1, { message: 'User ID is required' }),
 });

 /**
@ -22,11 +25,33 @@ const schema = z.object({
 * in order to do this, you have to update the logic to check the lifetime status,
 * for example, just check the planId is `lifetime` or not.
 */
-export const getLifetimeStatusAction = userActionClient
+export const getLifetimeStatusAction = actionClient
  .schema(schema)
-  .action(async ({ ctx }) => {
-    const currentUser = (ctx as { user: User }).user;
-    const userId = currentUser.id;
+  .action(async ({ parsedInput }) => {
+    const { userId } = parsedInput;
+
+    // Get the current user session for authorization
+    const session = await getSession();
+    if (!session) {
+      console.warn(
+        `unauthorized request to get lifetime status for user ${userId}`
+      );
+      return {
+        success: false,
+        error: 'Unauthorized',
+      };
+    }
+
+    // Only allow users to check their own status unless they're admins
+    if (session.user.id !== userId && session.user.role !== 'admin') {
+      console.warn(
+        `current user ${session.user.id} is not authorized to get lifetime status for user ${userId}`
+      );
+      return {
+        success: false,
+        error: 'Not authorized to do this action',
+      };
+    }

    try {
      // Get lifetime plans
@ -44,7 +69,6 @@ export const getLifetimeStatusAction = userActionClient
      }

      // Query the database for one-time payments with lifetime plans
-      const db = await getDb();
      const result = await db
        .select({
          id: payment.id,
--- a/src/actions/get-users.ts
+++ b/src/actions/get-users.ts
@ -1,12 +1,14 @@
 'use server';

-import { getDb } from '@/db';
+import db from '@/db';
 import { user } from '@/db/schema';
-import { isDemoWebsite } from '@/lib/demo';
-import { adminActionClient } from '@/lib/safe-action';
 import { asc, desc, ilike, or, sql } from 'drizzle-orm';
+import { createSafeActionClient } from 'next-safe-action';
 import { z } from 'zod';

+// Create a safe action client
+const actionClient = createSafeActionClient();
+
 // Define the schema for getUsers parameters
 const getUsersSchema = z.object({
  pageIndex: z.number().min(0).default(0),
@ -36,19 +38,14 @@ const sortFieldMap = {
 } as const;

 // Create a safe action for getting users
-export const getUsersAction = adminActionClient
+export const getUsersAction = actionClient
  .schema(getUsersSchema)
  .action(async ({ parsedInput }) => {
    try {
      const { pageIndex, pageSize, search, sorting } = parsedInput;

-      // search by name, email, and customerId
      const where = search
-        ? or(
-            ilike(user.name, `%${search}%`),
-            ilike(user.email, `%${search}%`),
-            ilike(user.customerId, `%${search}%`)
-          )
+        ? or(ilike(user.name, `%${search}%`), ilike(user.email, `%${search}%`))
        : undefined;

      const offset = pageIndex * pageSize;
@ -60,7 +57,6 @@ export const getUsersAction = adminActionClient
        : user.createdAt;
      const sortDirection = sortConfig?.desc ? desc : asc;

-      const db = await getDb();
      let [items, [{ count }]] = await Promise.all([
        db
          .select()
@ -73,8 +69,7 @@ export const getUsersAction = adminActionClient
      ]);

      // hide user data in demo website
-      const isDemo = isDemoWebsite();
-      if (isDemo) {
+      if (process.env.NEXT_PUBLIC_DEMO_WEBSITE === 'true') {
        items = items.map((item) => ({
          ...item,
          name: 'Demo User',
--- a/src/actions/send-message.ts
+++ b/src/actions/send-message.ts
@ -1,11 +1,14 @@
 'use server';

 import { websiteConfig } from '@/config/website';
-import { actionClient } from '@/lib/safe-action';
 import { sendEmail } from '@/mail';
 import { getLocale } from 'next-intl/server';
+import { createSafeActionClient } from 'next-safe-action';
 import { z } from 'zod';

+// Create a safe action client
+const actionClient = createSafeActionClient();
+
 /**
 * DOC: When using Zod for validation, how can I localize error messages?
 * https://next-intl.dev/docs/environments/actions-metadata-route-handlers#server-actions
@ -14,13 +17,13 @@ import { z } from 'zod';
 const contactFormSchema = z.object({
  name: z
    .string()
-    .min(3, { error: 'Name must be at least 3 characters' })
-    .max(30, { error: 'Name must not exceed 30 characters' }),
-  email: z.email({ error: 'Please enter a valid email address' }),
+    .min(3, { message: 'Name must be at least 3 characters' })
+    .max(30, { message: 'Name must not exceed 30 characters' }),
+  email: z.string().email({ message: 'Please enter a valid email address' }),
  message: z
    .string()
-    .min(10, { error: 'Message must be at least 10 characters' })
-    .max(500, { error: 'Message must not exceed 500 characters' }),
+    .min(10, { message: 'Message must be at least 10 characters' })
+    .max(500, { message: 'Message must not exceed 500 characters' }),
 });

 // Create a safe action for contact form submission
--- a/src/actions/subscribe-newsletter.ts
+++ b/src/actions/subscribe-newsletter.ts
@ -1,14 +1,17 @@
 'use server';

-import { actionClient } from '@/lib/safe-action';
 import { sendEmail } from '@/mail';
 import { subscribe } from '@/newsletter';
 import { getLocale } from 'next-intl/server';
+import { createSafeActionClient } from 'next-safe-action';
 import { z } from 'zod';

+// Create a safe action client
+const actionClient = createSafeActionClient();
+
 // Newsletter schema for validation
 const newsletterSchema = z.object({
-  email: z.email({ error: 'Please enter a valid email address' }),
+  email: z.string().email({ message: 'Please enter a valid email address' }),
 });

 // Create a safe action for newsletter subscription
--- a/src/actions/unsubscribe-newsletter.ts
+++ b/src/actions/unsubscribe-newsletter.ts
@ -1,18 +1,30 @@
 'use server';

-import { userActionClient } from '@/lib/safe-action';
+import { getSession } from '@/lib/server';
 import { unsubscribe } from '@/newsletter';
+import { createSafeActionClient } from 'next-safe-action';
 import { z } from 'zod';

+// Create a safe action client
+const actionClient = createSafeActionClient();
+
 // Newsletter schema for validation
 const newsletterSchema = z.object({
-  email: z.email({ error: 'Please enter a valid email address' }),
+  email: z.string().email({ message: 'Please enter a valid email address' }),
 });

 // Create a safe action for newsletter unsubscription
-export const unsubscribeNewsletterAction = userActionClient
+export const unsubscribeNewsletterAction = actionClient
  .schema(newsletterSchema)
  .action(async ({ parsedInput: { email } }) => {
+    const session = await getSession();
+    if (!session) {
+      return {
+        success: false,
+        error: 'Unauthorized',
+      };
+    }
+
    try {
      const unsubscribed = await unsubscribe(email);

--- a/src/actions/validate-captcha.ts
+++ b/src/actions/validate-captcha.ts
@ -1,33 +0,0 @@
-'use server';
-
-import { validateTurnstileToken } from '@/lib/captcha';
-import { actionClient } from '@/lib/safe-action';
-import { z } from 'zod';
-
-// Captcha validation schema
-const captchaSchema = z.object({
-  captchaToken: z.string().min(1, { error: 'Captcha token is required' }),
-});
-
-// Create a safe action for captcha validation
-export const validateCaptchaAction = actionClient
-  .schema(captchaSchema)
-  .action(async ({ parsedInput }) => {
-    const { captchaToken } = parsedInput;
-
-    try {
-      const isValid = await validateTurnstileToken(captchaToken);
-
-      return {
-        success: true,
-        valid: isValid,
-      };
-    } catch (error) {
-      console.error('Captcha validation error:', error);
-      return {
-        success: false,
-        valid: false,
-        error: error instanceof Error ? error.message : 'Something went wrong',
-      };
-    }
-  });
--- a/src/ai/chat/components/ChatBot.tsx
+++ b/src/ai/chat/components/ChatBot.tsx
@ -1,181 +0,0 @@
-'use client';
-
-import {
-  Conversation,
-  ConversationContent,
-  ConversationScrollButton,
-} from '@/components/ai-elements/conversation';
-import { Loader } from '@/components/ai-elements/loader';
-import { Message, MessageContent } from '@/components/ai-elements/message';
-import {
-  PromptInput,
-  PromptInputButton,
-  PromptInputModelSelect,
-  PromptInputModelSelectContent,
-  PromptInputModelSelectItem,
-  PromptInputModelSelectTrigger,
-  PromptInputModelSelectValue,
-  PromptInputSubmit,
-  PromptInputTextarea,
-  PromptInputToolbar,
-  PromptInputTools,
-} from '@/components/ai-elements/prompt-input';
-import {
-  Reasoning,
-  ReasoningContent,
-  ReasoningTrigger,
-} from '@/components/ai-elements/reasoning';
-import { Response } from '@/components/ai-elements/response';
-import {
-  Source,
-  Sources,
-  SourcesContent,
-  SourcesTrigger,
-} from '@/components/ai-elements/source';
-import { useChat } from '@ai-sdk/react';
-import { GlobeIcon } from 'lucide-react';
-import { useState } from 'react';
-
-const models = [
-  {
-    name: 'GPT 4o',
-    value: 'openai/gpt-4o',
-  },
-  {
-    name: 'Deepseek R1',
-    value: 'deepseek/deepseek-r1',
-  },
-];
-
-export default function ChatBot() {
-  const [input, setInput] = useState('');
-  const [model, setModel] = useState<string>(models[0].value);
-  const [webSearch, setWebSearch] = useState(false);
-  const { messages, sendMessage, status } = useChat();
-
-  const handleSubmit = (e: React.FormEvent) => {
-    e.preventDefault();
-    if (input.trim()) {
-      sendMessage(
-        { text: input },
-        {
-          body: {
-            model: model,
-            webSearch: webSearch,
-          },
-        }
-      );
-      setInput('');
-    }
-  };
-
-  return (
-    <div className="mx-auto p-6 relative size-full h-screen rounded-lg bg-muted">
-      <div className="flex flex-col h-full">
-        <Conversation className="h-full">
-          <ConversationContent>
-            {messages.map((message) => (
-              <div key={message.id}>
-                {message.role === 'assistant' && (
-                  <Sources>
-                    {message.parts.map((part, i) => {
-                      switch (part.type) {
-                        case 'source-url':
-                          return (
-                            <>
-                              <SourcesTrigger
-                                count={
-                                  message.parts.filter(
-                                    (part) => part.type === 'source-url'
-                                  ).length
-                                }
-                              />
-                              <SourcesContent key={`${message.id}-${i}`}>
-                                <Source
-                                  key={`${message.id}-${i}`}
-                                  href={part.url}
-                                  title={part.url}
-                                />
-                              </SourcesContent>
-                            </>
-                          );
-                      }
-                    })}
-                  </Sources>
-                )}
-                <Message from={message.role} key={message.id}>
-                  <MessageContent>
-                    {message.parts.map((part, i) => {
-                      switch (part.type) {
-                        case 'text':
-                          return (
-                            <Response key={`${message.id}-${i}`}>
-                              {part.text}
-                            </Response>
-                          );
-                        case 'reasoning':
-                          return (
-                            <Reasoning
-                              key={`${message.id}-${i}`}
-                              className="w-full"
-                              isStreaming={status === 'streaming'}
-                            >
-                              <ReasoningTrigger />
-                              <ReasoningContent>{part.text}</ReasoningContent>
-                            </Reasoning>
-                          );
-                        default:
-                          return null;
-                      }
-                    })}
-                  </MessageContent>
-                </Message>
-              </div>
-            ))}
-            {status === 'submitted' && <Loader />}
-          </ConversationContent>
-          <ConversationScrollButton />
-        </Conversation>
-
-        <PromptInput onSubmit={handleSubmit} className="mt-4">
-          <PromptInputTextarea
-            onChange={(e) => setInput(e.target.value)}
-            value={input}
-          />
-          <PromptInputToolbar>
-            <PromptInputTools>
-              <PromptInputButton
-                variant={webSearch ? 'default' : 'ghost'}
-                onClick={() => setWebSearch(!webSearch)}
-              >
-                <GlobeIcon size={16} />
-                <span>Search</span>
-              </PromptInputButton>
-              <PromptInputModelSelect
-                onValueChange={(value) => {
-                  setModel(value);
-                }}
-                value={model}
-              >
-                <PromptInputModelSelectTrigger>
-                  <PromptInputModelSelectValue />
-                </PromptInputModelSelectTrigger>
-                <PromptInputModelSelectContent>
-                  {models.map((model) => (
-                    <PromptInputModelSelectItem
-                      key={model.value}
-                      value={model.value}
-                    >
-                      {model.name}
-                    </PromptInputModelSelectItem>
-                  ))}
-                </PromptInputModelSelectContent>
-              </PromptInputModelSelect>
-            </PromptInputTools>
-            <PromptInputSubmit disabled={!input} status={status} />
-          </PromptInputToolbar>
-        </PromptInput>
-      </div>
-    </div>
-  );
-}
--- a/src/ai/image/components/ImageCarousel.tsx
+++ b/src/ai/image/components/ImageCarousel.tsx
@ -1,102 +0,0 @@
-'use client';
-
-import {
-  Carousel,
-  type CarouselApi,
-  CarouselContent,
-  CarouselItem,
-  CarouselNext,
-  CarouselPrevious,
-} from '@/components/ui/carousel';
-import { cn } from '@/lib/utils';
-import { useEffect, useState } from 'react';
-import type { GeneratedImage, ProviderTiming } from '../lib/image-types';
-import type { ProviderKey } from '../lib/provider-config';
-import { ImageDisplay } from './ImageDisplay';
-
-interface ImageCarouselProps {
-  providers: ProviderKey[];
-  images: GeneratedImage[];
-  timings: Record<ProviderKey, ProviderTiming>;
-  failedProviders: ProviderKey[];
-  enabledProviders: Record<ProviderKey, boolean>;
-  providerToModel: Record<ProviderKey, string>;
-}
-
-export function ImageCarousel({
-  providers,
-  images,
-  timings,
-  failedProviders,
-  enabledProviders,
-  providerToModel,
-}: ImageCarouselProps) {
-  const [currentSlide, setCurrentSlide] = useState(0);
-  const [api, setApi] = useState<CarouselApi>();
-
-  useEffect(() => {
-    if (!api) return;
-
-    api.on('select', () => {
-      setCurrentSlide(api.selectedScrollSnap());
-    });
-  }, [api]);
-
-  return (
-    <div className="relative w-full">
-      <Carousel setApi={setApi} opts={{ align: 'start', loop: true }}>
-        <CarouselContent>
-          {providers.map((provider, i) => {
-            const imageData = images?.find(
-              (img) => img.provider === provider
-            )?.image;
-            const timing = timings[provider];
-
-            return (
-              <CarouselItem key={provider}>
-                <ImageDisplay
-                  modelId={
-                    images?.find((img) => img.provider === provider)?.modelId ||
-                    providerToModel[provider]
-                  }
-                  provider={provider}
-                  image={imageData}
-                  timing={timing}
-                  failed={failedProviders.includes(provider)}
-                  enabled={enabledProviders[provider]}
-                />
-                <div className="text-center text-sm text-muted-foreground mt-4">
-                  {i + 1} of {providers.length}
-                </div>
-              </CarouselItem>
-            );
-          })}
-        </CarouselContent>
-
-        <CarouselPrevious className="left-0 bg-background/80 backdrop-blur-sm" />
-        <CarouselNext className="right-0 bg-background/80 backdrop-blur-sm" />
-      </Carousel>
-
-      {/* Dot Indicators */}
-      <div className="absolute -bottom-6 left-0 right-0">
-        <div className="flex justify-center gap-1">
-          {providers.map((_, index) => (
-            <button
-              type="button"
-              key={index}
-              className={cn(
-                'h-1.5 rounded-full transition-all',
-                index === currentSlide
-                  ? 'w-4 bg-primary'
-                  : 'w-1.5 bg-primary/50'
-              )}
-              onClick={() => api?.scrollTo(index)}
-            >
-              <span className="sr-only">Go to image {index + 1}</span>
-            </button>
-          ))}
-        </div>
-      </div>
-    </div>
-  );
-}
--- a/src/ai/image/components/ImageDisplay.tsx
+++ b/src/ai/image/components/ImageDisplay.tsx
@ -1,195 +0,0 @@
-import { Button } from '@/components/ui/button';
-import { Label } from '@/components/ui/label';
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from '@/components/ui/tooltip';
-import { cn } from '@/lib/utils';
-import { AlertCircle, Download, ImageIcon, Share } from 'lucide-react';
-import { useEffect, useState } from 'react';
-import { createPortal } from 'react-dom';
-import { imageHelpers } from '../lib/image-helpers';
-import type { ProviderTiming } from '../lib/image-types';
-import { Stopwatch } from './Stopwatch';
-
-interface ImageDisplayProps {
-  provider: string;
-  image: string | null | undefined;
-  timing?: ProviderTiming;
-  failed?: boolean;
-  fallbackIcon?: React.ReactNode;
-  enabled?: boolean;
-  modelId: string;
-}
-
-export function ImageDisplay({
-  provider,
-  image,
-  timing,
-  failed,
-  fallbackIcon,
-  modelId,
-}: ImageDisplayProps) {
-  const [isZoomed, setIsZoomed] = useState(false);
-
-  useEffect(() => {
-    if (isZoomed) {
-      window.history.pushState({ zoomed: true }, '');
-    }
-
-    const handleEscape = (e: KeyboardEvent) => {
-      if (e.key === 'Escape' && isZoomed) {
-        setIsZoomed(false);
-      }
-    };
-
-    const handlePopState = () => {
-      if (isZoomed) {
-        setIsZoomed(false);
-      }
-    };
-
-    if (isZoomed) {
-      document.addEventListener('keydown', handleEscape);
-      window.addEventListener('popstate', handlePopState);
-    }
-
-    return () => {
-      document.removeEventListener('keydown', handleEscape);
-      window.removeEventListener('popstate', handlePopState);
-    };
-  }, [isZoomed]);
-
-  const handleImageClick = (e: React.MouseEvent) => {
-    if (image) {
-      e.stopPropagation();
-      setIsZoomed(true);
-    }
-  };
-
-  const handleActionClick = (
-    e: React.MouseEvent,
-    imageData: string,
-    provider: string
-  ) => {
-    e.stopPropagation();
-    imageHelpers.shareOrDownload(imageData, provider).catch((error) => {
-      console.error('Failed to share/download image:', error);
-    });
-  };
-
-  return (
-    <>
-      <div
-        className={cn(
-          'relative w-full aspect-square group bg-zinc-50 rounded-lg',
-          image && !failed && 'cursor-pointer',
-          (!image || failed) && 'border-1 border-zinc-100'
-        )}
-        onClick={handleImageClick}
-      >
-        {(image || failed) && (
-          <div className="absolute top-2 left-2 max-w-[75%] bg-white/95 px-2 py-1 flex items-center gap-2 rounded-lg">
-            <TooltipProvider>
-              <Tooltip delayDuration={100}>
-                <TooltipTrigger asChild>
-                  <Label className="text-xs text-gray-900 truncate min-w-0 grow">
-                    {imageHelpers.formatModelId(modelId)}
-                  </Label>
-                </TooltipTrigger>
-                <TooltipContent>
-                  <p>{modelId}</p>
-                </TooltipContent>
-              </Tooltip>
-            </TooltipProvider>
-          </div>
-        )}
-        {image && !failed ? (
-          <>
-            {/* eslint-disable-next-line @next/next/no-img-element */}
-            <img
-              src={`data:image/png;base64,${image}`}
-              alt={`Generated by ${provider}`}
-              className="w-full h-full object-cover rounded-lg"
-            />
-            <Button
-              size="icon"
-              variant="secondary"
-              className="absolute bottom-2 left-2 sm:opacity-0 sm:group-hover:opacity-100 transition-opacity"
-              onClick={(e) => handleActionClick(e, image, provider)}
-            >
-              <span className="sm:hidden">
-                <Share className="h-4 w-4" />
-              </span>
-              <span className="hidden sm:block">
-                <Download className="h-4 w-4" />
-              </span>
-            </Button>
-            {timing?.elapsed && (
-              <div className="absolute bottom-2 right-2 bg-black/70 backdrop-blur-sm rounded-md px-2 py-1 shadow">
-                <span className="text-xs text-white/90 font-medium">
-                  {(timing.elapsed / 1000).toFixed(1)}s
-                </span>
-              </div>
-            )}
-          </>
-        ) : (
-          <div className="absolute inset-0 flex flex-col items-center justify-center">
-            {failed ? (
-              fallbackIcon || <AlertCircle className="h-8 w-8 text-red-500" />
-            ) : image ? (
-              <>
-                {/* eslint-disable-next-line @next/next/no-img-element */}
-                <img
-                  src={`data:image/png;base64,${image}`}
-                  alt={`Generated by ${provider}`}
-                  className="w-full h-full object-cover rounded-lg"
-                />
-                <Button
-                  size="icon"
-                  variant="secondary"
-                  className="absolute bottom-2 left-2 sm:opacity-0 sm:group-hover:opacity-100 transition-opacity"
-                  onClick={(e) => handleActionClick(e, image, provider)}
-                >
-                  <span className="sm:hidden">
-                    <Share className="h-4 w-4" />
-                  </span>
-                  <span className="hidden sm:block">
-                    <Download className="h-4 w-4" />
-                  </span>
-                </Button>
-              </>
-            ) : timing?.startTime ? (
-              <>
-                {/* <div className="text-zinc-400 mb-2">{provider}</div> */}
-                <Stopwatch startTime={timing.startTime} />
-              </>
-            ) : (
-              <ImageIcon className="h-12 w-12 text-zinc-300" />
-            )}
-          </div>
-        )}
-      </div>
-
-      {isZoomed &&
-        image &&
-        createPortal(
-          <div
-            className="fixed inset-0 bg-black/90 z-50 flex items-center justify-center cursor-pointer min-h-[100dvh] w-screen"
-            onClick={() => setIsZoomed(false)}
-          >
-            {/* eslint-disable-next-line @next/next/no-img-element */}
-            <img
-              src={`data:image/png;base64,${image}`}
-              alt={`Generated by ${provider}`}
-              className="max-h-[90dvh] max-w-[90vw] object-contain"
-              onClick={(e) => e.stopPropagation()}
-            />
-          </div>,
-          document.body
-        )}
-    </>
-  );
-}
--- a/src/ai/image/components/ImageGenerator.tsx
+++ b/src/ai/image/components/ImageGenerator.tsx
@ -1,120 +0,0 @@
-import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
-import { Button } from '@/components/ui/button';
-import {
-  Collapsible,
-  CollapsibleContent,
-  CollapsibleTrigger,
-} from '@/components/ui/collapsible';
-import { AlertCircle, ChevronDown, Settings } from 'lucide-react';
-import type {
-  GeneratedImage,
-  ImageError,
-  ProviderTiming,
-} from '../lib/image-types';
-import {
-  PROVIDER_ORDER,
-  type ProviderKey,
-  initializeProviderRecord,
-} from '../lib/provider-config';
-import { ImageCarousel } from './ImageCarousel';
-import { ImageDisplay } from './ImageDisplay';
-
-interface ImageGeneratorProps {
-  images: GeneratedImage[];
-  errors: ImageError[];
-  failedProviders: ProviderKey[];
-  timings: Record<ProviderKey, ProviderTiming>;
-  enabledProviders: Record<ProviderKey, boolean>;
-  toggleView: () => void;
-}
-
-export function ImageGenerator({
-  images,
-  errors,
-  failedProviders,
-  timings,
-  enabledProviders,
-  toggleView,
-}: ImageGeneratorProps) {
-  return (
-    <div className="space-y-6">
-      {/* If there are errors, render a collapsible alert */}
-      {errors.length > 0 && (
-        <Collapsible>
-          <CollapsibleTrigger asChild>
-            <Button
-              variant="ghost"
-              className="flex items-center gap-2 text-destructive"
-            >
-              <AlertCircle className="h-4 w-4" />
-              {errors.length} {errors.length === 1 ? 'error' : 'errors'}{' '}
-              occurred
-              <ChevronDown className="h-4 w-4 transition-transform duration-200 data-[state=open]:rotate-180" />
-            </Button>
-          </CollapsibleTrigger>
-          <CollapsibleContent>
-            <div className="space-y-2 mt-2">
-              {errors.map((err, index) => (
-                <Alert key={index} variant="destructive">
-                  <AlertCircle className="h-4 w-4" />
-                  <div className="ml-3">
-                    <AlertTitle className="capitalize">
-                      {err.provider} Error
-                    </AlertTitle>
-                    <AlertDescription className="mt-1 text-sm">
-                      {err.message}
-                    </AlertDescription>
-                  </div>
-                </Alert>
-              ))}
-            </div>
-          </CollapsibleContent>
-        </Collapsible>
-      )}
-
-      <div className="flex items-center justify-between">
-        <h3 className="text-xl font-semibold">Generated Images</h3>
-        <Button
-          variant="outline"
-          className=""
-          onClick={() => toggleView()}
-          size="icon"
-        >
-          <Settings className="h-4 w-4" />
-        </Button>
-      </div>
-
-      {/* Mobile layout: Carousel */}
-      <div className="sm:hidden">
-        <ImageCarousel
-          providers={PROVIDER_ORDER}
-          images={images}
-          timings={timings}
-          failedProviders={failedProviders}
-          enabledProviders={enabledProviders}
-          providerToModel={initializeProviderRecord<string>()}
-        />
-      </div>
-
-      {/* Desktop layout: Grid */}
-      <div className="hidden sm:grid sm:grid-cols-2 2xl:grid-cols-4 gap-6">
-        {PROVIDER_ORDER.map((provider) => {
-          const imageItem = images.find((img) => img.provider === provider);
-          const imageData = imageItem?.image;
-          const timing = timings[provider];
-          return (
-            <ImageDisplay
-              key={provider}
-              provider={provider}
-              image={imageData}
-              timing={timing}
-              failed={failedProviders.includes(provider)}
-              enabled={enabledProviders[provider]}
-              modelId={imageItem?.modelId ?? ''}
-            />
-          );
-        })}
-      </div>
-    </div>
-  );
-}
--- a/Show More
+++ b/Show More