fix: prevent cross-workspace access on member and permission endpoints

2026-02-23 16:53:43 +00:00
253 changed files with 5696 additions and 74085 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -60,7 +60,3 @@ pnpm-debug.log

 # Cloud compose (separate deployment)
 cloud/
-
-# Local temporary caches
-.pnpm-store
-v8-compile-cache-0
--- a/.env.example
+++ b/.env.example
@@ -2,7 +2,7 @@

 # Required environment variables
 NEXT_PUBLIC_BASE_URL= # e.g. https://kan.bn
-BETTER_AUTH_SECRET= # Random 32+ char string (can gen with: openssl rand -base64 26 | tr -dc 'a-zA-Z0-9' | head -c 32)
+BETTER_AUTH_SECRET= # Random 32+ char string (can gen with: openssl rand -base64 24 | tr -dc 'a-zA-Z0-9' | head -c 32)

 # Fill if you want to use an external database
 POSTGRES_URL= # e.g. postgresql://kan:your_password@your_host:5432/kan
@@ -23,19 +23,17 @@ SMTP_REJECT_UNAUTHORIZED= # set to "false" to accept invalid certs
 NEXT_PUBLIC_DISABLE_EMAIL=

 # S3 storage (optional)
-S3_REGION= # required for AWS S3 (e.g. us-east-1); ignored by most S3-compatible providers — defaults to us-east-1 if unset
-S3_ENDPOINT= # set for S3-compatible providers (MinIO, R2, Spaces, etc.); leave blank for AWS S3
+S3_REGION=
+S3_ENDPOINT=
 S3_ACCESS_KEY_ID=
 S3_SECRET_ACCESS_KEY=
 S3_FORCE_PATH_STYLE=
-# S3_AVATAR_UPLOAD_LIMIT=2097152 # Avatar upload size limit in bytes (default: 2MB)
 NEXT_PUBLIC_STORAGE_URL=
 NEXT_PUBLIC_AVATAR_BUCKET_NAME=
 NEXT_PUBLIC_ATTACHMENTS_BUCKET_NAME=
 NEXT_PUBLIC_STORAGE_DOMAIN=
 NEXT_PUBLIC_USE_VIRTUAL_HOSTED_URLS=

-
 # Auth config (optional)
 NEXT_PUBLIC_ALLOW_CREDENTIALS=
 NEXT_PUBLIC_DISABLE_SIGN_UP=
@@ -51,9 +49,6 @@ TRELLO_APP_SECRET=
 # If not provided, rate limiting will use in-memory storage
 REDIS_URL= # e.g. redis://default:your_password@your_host:6379

-# Logging (optional - debug, info, warn, error; defaults to debug in dev, info in prod)
-LOG_LEVEL=
-
 # OAuth providers (optional)
 BETTER_AUTH_TRUSTED_ORIGINS=
 # Optional: Restrict OIDC/Social sign-ins to specific email domains (comma-separated)
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,9 +7,6 @@ assignees: ''

 ---

-> [!IMPORTANT]
-> Wait for a maintainer to approve this issue before opening a PR. We'll signal approval with a comment or label. Feature PRs without an approved issue will be closed.
-
 ## ✨ Feature Request

 **Is your feature request related to a problem? Please describe.**
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,24 +0,0 @@
-## Description
-
-<!-- What does this PR do? Why? -->
-
-## Type of change
-
- [ ] Bug fix
- [ ] Feature (requires an approved issue — see below)
- [ ] Refactor / chore
- [ ] Documentation
-
-## Checklist
-
- [ ] I have linked the related issue below
- [ ] My code follows the existing style and conventions
- [ ] I have tested my changes locally
- [ ] I have included screenshots for any UI changes
-
-## Linked issue
-
-Closes #<!-- issue number -->
-
-> **Feature PRs without a linked, approved issue will be closed without review.**
-> Open or comment on a [feature request](https://github.com/kanbn/kan/issues/new?template=feature_request.md) first and wait for maintainer approval before building.
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -6,6 +6,8 @@ name: Docker
 # documentation.

 on:
+  schedule:
+    - cron: "21 21 * * *"
  push:
    # Only trigger on tags (releases), not main branch pushes
    # Main branch builds are handled by workflow_run after Translate completes
@@ -24,7 +26,6 @@ env:
  REGISTRY: ghcr.io
  # github.repository as <account>/<repo>
  IMAGE_NAME: ${{ github.repository }}
-  MIGRATE_IMAGE_NAME: ${{ github.repository }}-migrate

 jobs:
  build:
@@ -82,22 +83,7 @@ jobs:
            type=semver,pattern={{version}}
            type=semver,pattern={{major}}.{{minor}}
            type=semver,pattern={{major}}
-            type=raw,value=latest,enable=${{ github.ref_type == 'tag' }}
-            type=raw,value=edge,enable={{is_default_branch}}
-
-      - name: Extract Docker metadata (migrate)
-        id: meta-migrate
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.MIGRATE_IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=raw,value=latest,enable=${{ github.ref_type == 'tag' }}
-            type=raw,value=edge,enable={{is_default_branch}}
+            type=raw,value=latest,enable={{is_default_branch}}

      # Extract version from git tag or ref
      # Uses git describe to get latest tag + commit hash in SemVer format: 1.2.3+abc1234
@@ -152,22 +138,6 @@ jobs:
          cache-from: type=gha
          cache-to: type=gha,mode=max

-      - name: Build and push migrate Docker image
-        id: build-and-push-migrate
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
-        with:
-          context: .
-          file: apps/web/Dockerfile
-          target: migrate
-          push: ${{ github.event_name != 'pull_request' }}
-          platforms: linux/amd64,linux/arm64
-          tags: ${{ steps.meta-migrate.outputs.tags }}
-          labels: ${{ steps.meta-migrate.outputs.labels }}
-          build-args: |
-            APP_VERSION=${{ steps.version.outputs.version }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
      # Sign the resulting Docker image digest except on PRs.
      # This will only write to the public Rekor transparency log when the Docker
      # repository is public to avoid leaking data.  If you would like to publish
@@ -182,10 +152,3 @@ jobs:
        # This step uses the identity token to provision an ephemeral certificate
        # against the sigstore community Fulcio instance.
        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
-
-      - name: Sign the published migrate Docker image
-        if: ${{ github.event_name != 'pull_request' }}
-        env:
-          TAGS: ${{ steps.meta-migrate.outputs.tags }}
-          DIGEST: ${{ steps.build-and-push-migrate.outputs.digest }}
-        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
--- a/.github/workflows/translate.yml
+++ b/.github/workflows/translate.yml
@@ -14,24 +14,16 @@ jobs:
      - uses: actions/checkout@v4
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
-
+      
      - name: Setup Node
        uses: actions/setup-node@v4
        with:
          node-version: 20
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: 9
-
-      - name: Install dependencies
-        run: pnpm install --filter @kan/web...
-
+      
      - name: Extract translations
        working-directory: apps/web
-        run: pnpm lingui:extract
-
+        run: npx --yes @lingui/cli extract
+      
      - name: Lingo.dev
        uses: lingodotdev/lingo.dev@main
        with:
@@ -41,11 +33,11 @@ jobs:
          commit-author-name: "${{ github.actor }}"
          commit-author-email: "${{ github.actor }}@users.noreply.github.com"
          parallel: true
-
+      
      - name: Compile translations
        working-directory: apps/web
-        run: pnpm lingui:compile
-
+        run: npx --yes @lingui/cli compile --typescript
+      
      - name: Commit compiled translations
        run: |
          git config --local user.email "${{ github.actor }}@users.noreply.github.com"
@@ -54,3 +46,4 @@ jobs:
            git add apps/web/src/locales/*/messages.ts
            git diff --staged --quiet || (git commit -m "chore: compile translations" && git push)
          fi
+
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,6 @@
 node_modules
 .pnp
 .pnp.js
-.pnpm/
-.pnpm-store/
-v8-compile-cache-0/

 # testing
 coverage
@@ -57,8 +54,3 @@ i18n.cache

 # pgdata
 /apps/web/pgdata
-
-# local scripts
-scripts/
-
-.claude
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -185,17 +185,9 @@ Use `assertUserInWorkspace` helper for workspace checks.

 - Use TRPCError with appropriate codes (UNAUTHORIZED, NOT_FOUND, etc.)
 - Provide user-friendly error messages
- Log errors appropriately using the `@kan/logger` package
+- Log errors appropriately
 - Show popup notifications for user-facing errors

-### Logging
-
- Import from `@kan/logger`: `import { createLogger } from "@kan/logger"`
- Create a module-scoped logger: `const logger = createLogger("module-name")`
- Log level is controlled by `LOG_LEVEL` env var (debug, info, warn, error)
- Defaults to `debug` in development, `info` in production
- Never use `console.log` — always use the logger
-
 ## Common Patterns

 ### Creating a Card
@@ -227,16 +219,6 @@ Use `assertUserInWorkspace` helper for workspace checks.
 5. **Frontend**: Add UI components in `apps/web/src/`
 6. **i18n**: Add translations for new strings

-## Adding a New Environment Variable
-
-Update all of the following:
-
-1. `.env.example` — add the variable with an empty value and a comment explaining it
-2. `turbo.json` — add to `globalEnv` (or `globalPassThroughEnv` for CI/platform vars)
-3. `docker-compose.yml` — add to the `web` service `environment` section
-4. `cloud/docker-compose.yml` — add to the `web` service `environment` section
-5. `README.md` — add a row to the Environment Variables table
-
 ## Database Changes

 - Always create migrations (never modify existing migrations)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,54 +1,52 @@
 # Contributing to Kan

-Thank you for your interest in contributing to Kan!
+Thank you for your interest in contributing to Kan! This document provides guidelines and instructions for contributing to the project.

-## Before you start
-
-**Open an issue before writing code for a new feature.**
-
-Feature PRs opened without a prior approved issue will be closed without review - not because the idea is bad, but because we can't review code for features we haven't aligned on yet. This protects your time as much as ours.
-
-The process is:
-
-1. Open a [feature request](https://github.com/kanbn/kan/issues/new?template=feature_request.md) and describe what you want to build
-2. Wait for a maintainer to respond and signal approval (we aim to respond within a few days)
-3. Once approved, open a PR that links the issue
-
-Bug fixes and documentation improvements don't need prior approval - just open a PR.
-
---
-
-## Getting started
+## Getting Started

 1. Fork the repository
 2. Clone your fork: `git clone https://github.com/YOUR-USERNAME/kan.git`
-3. Create a branch: `git checkout -b feat/your-feature-name` or `fix/your-fix-name`
+3. Create a new branch: `git checkout -b feat/your-feature-name`
 4. Install dependencies: `pnpm install`
 5. Copy `.env.example` to `.env` and configure your environment variables
 6. Make your changes
-7. Commit using [conventional commits](https://www.conventionalcommits.org/): `git commit -m "feat: description"`
-8. Push and open a Pull Request
+7. Commit your changes: `git commit -m "feat: description of changes"`
+8. Push to your fork: `git push origin feat/your-feature-name`
+9. Open a Pull Request

-## Pull request expectations
+## Development Guidelines

- Link the related issue (required for features)
- Write a clear description of what changed and why
- Include screenshots for any UI changes
- Keep PRs focused - one feature or fix per PR
- All CI checks must pass before review
+### Code Style

-## Code style
-
- Follow the existing patterns in the codebase
- Use meaningful names - avoid comments that just restate what the code does
+- Follow the existing code style
+- Use meaningful variable and function names
+- Add comments for complex logic
 - Keep functions focused and concise

-## Need help?
+### Commits

- Join our [Discord server](https://discord.gg/e6ejRb6CmT)
- Check existing issues and PRs before opening new ones
+- Use clear and descriptive commit messages
+- Reference issue numbers when applicable
+- Keep commits focused on single changes
+
+### Pull Requests
+
+- Provide a clear description of the changes
+- Include screenshots for UI changes
+- Keep PRs focused on a single feature/fix
+
+## Need Help?
+
+- Join our [Discord server](https://discord.gg/e6ejRb6CmT) for questions
+- Check existing issues and pull requests
 - Email [henry@kan.bn](mailto:henry@kan.bn) for major concerns

+## Code of Conduct
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms.
+
+We aim to foster an inclusive and welcoming community. Harassment and abusive behavior will not be tolerated.
+
 ## License

 By contributing to Kan, you agree that your contributions will be licensed under the AGPLv3 License.
--- a/README.md
+++ b/README.md
@@ -1,315 +1,212 @@
-# Kan
+![github-background](https://github.com/user-attachments/assets/f728f52e-bf67-4357-9ba2-c24c437488e3)

-Kan 是一个开源的看板式项目管理工具，可作为 Trello 的自托管替代方案。它支持工作区、看板、列表、卡片、标签、成员、评论、检查清单和活动记录。
+<div align="center">
+  <h3 align="center">Kan</h3>
+  <p>The open-source project management alternative to Trello.</p>
+</div>

-Kan 使用 AGPLv3 协议发布。
+<p align="center">
+  <a href="https://kan.bn/kan/roadmap">Roadmap</a>
+  ·
+  <a href="https://kan.bn">Website</a>
+  ·
+  <a href="https://docs.kan.bn">Docs</a>
+  ·
+  <a href="https://discord.gg/e6ejRb6CmT">Discord</a>
+</p>

- [项目主页](https://kan.bn)
- [在线文档](https://docs.kan.bn)
- [路线图](https://kan.bn/kan/roadmap)
- [Discord 社区](https://discord.gg/e6ejRb6CmT)
+<div align="center">
+  <a href="https://github.com/kanbn/kan/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/badge/license-AGPLv3-purple"></a>
+</div>

-![Kan 截图](https://github.com/user-attachments/assets/8490104a-cd5d-49de-afc2-152fd8a93119)
+## Features 💫

-## 功能
+- 👁️ **Board Visibility**: Control who can view and edit your boards
+- 🤝 **Workspace Members**: Invite members and collaborate with your team
+- 🚀 **Trello Imports**: Easily import your Trello boards
+- 🔍 **Labels & Filters**: Organise and find cards quickly
+- 💬 **Comments**: Discuss and collaborate with your team
+- 📝 **Activity Log**: Track all card changes with detailed activity history
+- 🎨 **Templates** : Save time with reusable custom board templates
+- ⚡️ **Integrations (coming soon)** : Connect your favourite tools

- 看板可见性控制
- 工作区成员和协作
- Trello 看板导入
- 卡片标签和筛选
- 评论、活动记录和检查清单
- 可复用的看板模板
- 卡片截止日期、成员和附件
- 内置 REST API 和 MCP 服务
+See our [roadmap](https://kan.bn/kan/roadmap) for upcoming features.

-## 使用 Docker Compose 自托管
+## Screenshot 👁️

-### 环境要求
+<img width="1507" alt="hero-dark" src="https://github.com/user-attachments/assets/8490104a-cd5d-49de-afc2-152fd8a93119" />

- Docker Engine
- Docker Compose v2
+## Made With 🛠️

-### 启动
+- [Next.js](https://nextjs.org/?ref=kan.bn)
+- [tRPC](https://trpc.io/?ref=kan.bn)
+- [Better Auth](https://better-auth.com/?ref=kan.bn)
+- [Tailwind CSS](https://tailwindcss.com/?ref=kan.bn)
+- [Drizzle ORM](https://orm.drizzle.team/?ref=kan.bn)
+- [React Email](https://react.email/?ref=kan.bn)

-在仓库根目录执行：
+## Self Hosting 🐳

-```bash
-cp .env.example .env
-```
+### One-click Deployments

-编辑 `.env`，至少设置以下变量：
+The easiest way to deploy Kan is through Railway. We've partnered with Railway to maintain an official template that supports the development of the project.

-```dotenv
-NEXT_PUBLIC_BASE_URL=http://localhost:3000
-POSTGRES_PASSWORD=请填写数据库密码
-POSTGRES_URL=postgresql://kan:请填写数据库密码@postgres:5432/kan_db
-BETTER_AUTH_SECRET=请填写一个随机的 32 位以上密钥
-```
+<a href="https://railway.com/deploy/kan?referralCode=bZPsr2&utm_medium=integration&utm_source=template&utm_campaign=generic">
+  <img src="https://railway.app/button.svg" alt="Deploy on Railway" height="40" />
+</a>

-构建本地镜像并启动：
+### Docker Compose

-```bash
-docker compose up -d --build
-```
+Alternatively, you can self-host Kan with Docker Compose. This will set up everything for you including your postgres database.

-仓库自带的 `docker-compose.yml` 使用本地镜像标签：
+1. Create a new file called `docker-compose.yml` and paste the following configuration:

 ```yaml
 services:
-  migrate:
-    image: kan-migrate:local
-    build:
-      context: .
-      dockerfile: ./apps/web/Dockerfile
-      target: migrate
  web:
-    image: kan:local
-    build:
-      context: .
-      dockerfile: ./apps/web/Dockerfile
-      target: web
+    image: ghcr.io/kanbn/kan:latest
+    container_name: kan-web
+    ports:
+      - "3000:3000"
+    networks:
+      - kan-network
+    environment:
+      NEXT_PUBLIC_BASE_URL: http://localhost:3000
+      BETTER_AUTH_SECRET: your_auth_secret
+      POSTGRES_URL: postgresql://kan:your_postgres_password@postgres:5432/kan_db
+      NEXT_PUBLIC_ALLOW_CREDENTIALS: true
+    depends_on:
+      - postgres
+    restart: unless-stopped
+
+  postgres:
+    image: postgres:15
+    container_name: kan-db
+    environment:
+      POSTGRES_DB: kan_db
+      POSTGRES_USER: kan
+      POSTGRES_PASSWORD: your_postgres_password
+    ports:
+      - 5432:5432
+    volumes:
+      - kan_postgres_data:/var/lib/postgresql/data
+    restart: unless-stopped
+    networks:
+      - kan-network
+
+networks:
+  kan-network:
+
+volumes:
+  kan_postgres_data:
 ```

-不会拉取远端 Web 镜像。数据库迁移会在 Web 服务启动前自动执行。启动完成后访问 <http://localhost:3000>。如修改端口，请同步修改 `WEB_PORT` 和 `NEXT_PUBLIC_BASE_URL`。
-
-### 常用命令
+2. Start the containers in detached mode:

 ```bash
-# 查看状态
-docker compose ps
-
-# 查看 Web 日志
-docker compose logs -f web
-
-# 查看迁移日志
-docker compose logs -f migrate
-
-# 停止服务
-docker compose down
-
-# 停止服务并删除数据库卷（会删除本地数据）
-docker compose down -v
+docker compose up -d
 ```

-检查 API 健康状态：
+3. Access Kan at http://localhost:3000

-```bash
-curl http://localhost:3000/api/v1/health
-```
+The application will be running in the background. You can manage the containers using these commands:

-预期返回：
+- To stop the containers: `docker compose down`
+- To view logs: `docker compose logs -f`
+- To restart the containers: `docker compose restart`

-```json
-{ "status": "ok", "database": "ok", "storage": "not_configured" }
-```
+For the complete Docker Compose configuration, see [docker-compose.yml](./docker-compose.yml) in the repository.

-默认文件存储状态为 `not_configured`。如需上传头像和附件，请按照 `.env.example` 配置 S3 兼容存储。
+> **Note**: The Docker Compose configuration shown above is a minimal example. For a complete setup with all features (email, OAuth, file uploads, etc.), you'll need to create a `.env` file with the required environment variables. See the Environment Variables section below for the full list of available options.

-## 本地开发
+## Local Development 🧑‍💻

-项目是 pnpm monorepo，需要 Node.js 20.18.1 或更高版本，以及 pnpm 9.14.2。
+1. Clone the repository (or fork)

 ```bash
 git clone https://github.com/kanbn/kan.git
-cd kan
+```
+
+2. Install dependencies
+
+```bash
 pnpm install
-cp .env.example .env
+```
+
+3. Copy `.env.example` to `.env` and configure your environment variables
+4. Migrate database
+
+```bash
 pnpm db:migrate
+```
+
+5. Start the development server
+
+```bash
 pnpm dev
 ```

-开发服务器默认地址为 <http://localhost:3000>。常用检查命令：
+## Environment Variables 🔐

-```bash
-pnpm typecheck
-pnpm lint
-pnpm format
-```
+| Variable                                  | Description                                               | Required                              | Example                                                     |
+| ----------------------------------------- | --------------------------------------------------------- | ------------------------------------- | ----------------------------------------------------------- |
+| `POSTGRES_URL`                            | PostgreSQL connection URL                                 | To use external database              | `postgres://user:pass@localhost:5432/db`                    |
+| `REDIS_URL`                               | Redis connection URL                                      | For rate limiting (optional)          | `redis://localhost:6379` or `redis://redis:6379` (Docker)   |
+| `EMAIL_FROM`                              | Sender email address                                      | For Email                             | `"Kan <hello@mail.kan.bn>"`                                 |
+| `SMTP_HOST`                               | SMTP server hostname                                      | For Email                             | `smtp.resend.com`                                           |
+| `SMTP_PORT`                               | SMTP server port                                          | For Email                             | `465`                                                       |
+| `SMTP_USER`                               | SMTP username/email                                       | No                                    | `resend`                                                    |
+| `SMTP_PASSWORD`                           | SMTP password/token                                       | No                                    | `re_xxxx`                                                   |
+| `SMTP_SECURE`                             | Use secure SMTP connection (defaults to true if not set)  | For Email                             | `true`                                                      |
+| `SMTP_REJECT_UNAUTHORIZED`                | Reject invalid certificates (defaults to true if not set) | For Email                             | `false`                                                     |
+| `NEXT_PUBLIC_DISABLE_EMAIL`               | To disable all email features                             | For Email                             | `true`                                                      |
+| `NEXT_PUBLIC_BASE_URL`                    | Base URL of your installation                             | Yes                                   | `http://localhost:3000`                                     |
+| `NEXT_API_BODY_SIZE_LIMIT`                | Maximum API request body size (defaults to 1mb)           | No                                    | `50mb`                                                      |
+| `BETTER_AUTH_ALLOWED_DOMAINS`             | Comma-separated list of allowed domains for OIDC logins   | For OIDC/Social login                 | `example.com,subsidiary.com`                                |
+| `BETTER_AUTH_SECRET`                      | Auth encryption secret                                    | Yes                                   | Random 32+ char string                                      |
+| `BETTER_AUTH_TRUSTED_ORIGINS`             | Allowed callback origins                                  | No                                    | `http://localhost:3000,http://localhost:3001`               |
+| `GOOGLE_CLIENT_ID`                        | Google OAuth client ID                                    | For Google login                      | `xxx.apps.googleusercontent.com`                            |
+| `GOOGLE_CLIENT_SECRET`                    | Google OAuth client secret                                | For Google login                      | `xxx`                                                       |
+| `DISCORD_CLIENT_ID`                       | Discord OAuth client ID                                   | For Discord login                     | `xxx`                                                       |
+| `DISCORD_CLIENT_SECRET`                   | Discord OAuth client secret                               | For Discord login                     | `xxx`                                                       |
+| `GITHUB_CLIENT_ID`                        | GitHub OAuth client ID                                    | For GitHub login                      | `xxx`                                                       |
+| `GITHUB_CLIENT_SECRET`                    | GitHub OAuth client secret                                | For GitHub login                      | `xxx`                                                       |
+| `OIDC_CLIENT_ID`                          | Generic OIDC client ID                                    | For OIDC login                        | `xxx`                                                       |
+| `OIDC_CLIENT_SECRET`                      | Generic OIDC client secret                                | For OIDC login                        | `xxx`                                                       |
+| `OIDC_DISCOVERY_URL`                      | OIDC discovery URL                                        | For OIDC login                        | `https://auth.example.com/.well-known/openid-configuration` |
+| `TRELLO_APP_API_KEY`                      | Trello app API key                                        | For Trello import                     | `xxx`                                                       |
+| `TRELLO_APP_API_SECRET`                   | Trello app API secret                                     | For Trello import                     | `xxx`                                                       |
+| `S3_REGION`                               | S3 storage region                                         | For file uploads                      | `WEUR`                                                      |
+| `S3_ENDPOINT`                             | S3 endpoint URL                                           | For file uploads                      | `https://xxx.r2.cloudflarestorage.com`                      |
+| `S3_ACCESS_KEY_ID`                        | S3 access key                                             | For file uploads (optional with IRSA) | `xxx`                                                       |
+| `S3_SECRET_ACCESS_KEY`                    | S3 secret key                                             | For file uploads (optional with IRSA) | `xxx`                                                       |
+| `S3_FORCE_PATH_STYLE`                     | Use path-style URLs for S3                                | For file uploads                      | `true`                                                      |
+| `NEXT_PUBLIC_STORAGE_URL`                 | Storage service URL                                       | For file uploads                      | `https://storage.kanbn.com`                                 |
+| `NEXT_PUBLIC_STORAGE_DOMAIN`              | Storage domain name                                       | For file uploads                      | `kanbn.com`                                                 |
+| `NEXT_PUBLIC_USE_VIRTUAL_HOSTED_URLS`     | Use virtual-hosted style URLs (bucket.domain.com)         | For file uploads (optional)           | `true`                                                      |
+| `NEXT_PUBLIC_AVATAR_BUCKET_NAME`          | S3 bucket name for avatars                                | For file uploads                      | `avatars`                                                   |
+| `NEXT_PUBLIC_ATTACHMENTS_BUCKET_NAME`     | S3 bucket name for attachments                            | For file uploads                      | `attachments`                                               |
+| `NEXT_PUBLIC_ALLOW_CREDENTIALS`           | Allow email & password login                              | For authentication                    | `true`                                                      |
+| `NEXT_PUBLIC_DISABLE_SIGN_UP`             | Disable sign up                                           | For authentication                    | `false`                                                     |
+| `NEXT_PUBLIC_WHITE_LABEL_HIDE_POWERED_BY` | Hide “Powered by kan.bn” on public boards (self-host)     | For white labelling                   | `true`                                                      |
+| `KAN_ADMIN_API_KEY`                       | Admin API key for stats and admin endpoints               | For admin/monitoring                  | `your-secret-admin-key`                                     |

-## 环境变量
+See `.env.example` for a complete list of supported environment variables.

-完整变量列表见 [`.env.example`](.env.example)。
+## Contributing 🤝

-| 变量                            | 用途                               | 示例                                         |
-| ------------------------------- | ---------------------------------- | -------------------------------------------- |
-| `NEXT_PUBLIC_BASE_URL`          | 当前 Kan 实例的访问地址            | `http://localhost:3000`                      |
-| `POSTGRES_URL`                  | PostgreSQL 连接地址                | `postgresql://kan:密码@postgres:5432/kan_db` |
-| `POSTGRES_PASSWORD`             | Compose 创建 PostgreSQL 使用的密码 | `change-me`                                  |
-| `BETTER_AUTH_SECRET`            | 登录会话加密密钥                   | 随机 32 位以上字符串                         |
-| `WEB_PORT`                      | 宿主机映射端口                     | `3000`                                       |
-| `REDIS_URL`                     | 可选的限流 Redis 地址              | `redis://redis:6379`                         |
-| `NEXT_PUBLIC_ALLOW_CREDENTIALS` | 是否允许账号密码登录               | `true`                                       |
-| `NEXT_PUBLIC_DISABLE_SIGN_UP`   | 是否关闭注册                       | `false`                                      |
-| `KAN_ADMIN_API_KEY`             | 管理和监控接口密钥                 | 自定义密钥                                   |
+We welcome contributions! Please read our [contribution guidelines](CONTRIBUTING.md) before submitting a pull request.

-## MCP 服务
+## Contributors 👥

-Kan 仓库内置了基于 Model Context Protocol 的 MCP 服务。连接后，Claude Desktop、Cursor、VS Code、Codex 等 MCP 客户端可以通过自然语言读取和管理 Kan 数据。
+<a href="https://github.com/kanbn/kan/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=kanbn/kan" />
+</a>

-### 先看这里
+## License 📝

-MCP 源码位于 `packages/mcp`，目前是仓库内的工作区包，并未发布为 npm 公共包。因此以下命令不能使用：
+Kan is licensed under the [AGPLv3 license](LICENSE).

-```bash
-npx -y @kan/mcp
-bunx kan-mcp
-```
+## Contact 📧

-请从当前仓库构建 MCP 服务，再让客户端启动生成的文件。
-
-### 获取 API 密钥
-
-1. 登录 Kan。
-2. 打开设置中的 API 密钥页面，地址通常为 `/settings/api`。
-3. 创建一个 API 密钥并立即保存。密钥只会完整显示一次。
-
-MCP 使用用户 API 密钥，不是 `KAN_ADMIN_API_KEY`。请求会以 Bearer Token 方式访问 `${KAN_BASE_URL}/api/v1`。
-
-### 构建
-
-在仓库根目录执行：
-
-```bash
-pnpm install
-pnpm --filter @kan/mcp build
-```
-
-构建产物为 `packages/mcp/dist/index.js`。MCP 服务使用 stdio 通信，应由 MCP 客户端启动，不需要单独暴露 HTTP 端口。
-
-### 环境变量
-
-| 变量            | 说明                               |
-| --------------- | ---------------------------------- |
-| `KAN_BASE_URL`  | Kan 实例根地址，不要追加 `/api/v1` |
-| `KAN_API_TOKEN` | Kan 设置中创建的用户 API 密钥      |
-
-本地 Kan 使用 Docker Compose 时：
-
-```text
-KAN_BASE_URL=http://localhost:3000
-KAN_API_TOKEN=kan_你的_api_key
-```
-
-### Claude Desktop 和 Cursor
-
-Claude Desktop 使用 `claude_desktop_config.json`，Cursor 使用项目内的 `.cursor/mcp.json`。将 `args` 中的路径替换为本机仓库的绝对路径：
-
-```json
-{
-  "mcpServers": {
-    "kan": {
-      "command": "node",
-      "args": ["/绝对路径/kan/packages/mcp/dist/index.js"],
-      "env": {
-        "KAN_BASE_URL": "http://localhost:3000",
-        "KAN_API_TOKEN": "kan_你的_api_key"
-      }
-    }
-  }
-}
-```
-
-Windows 路径示例：
-
-```json
-{
-  "mcpServers": {
-    "kan": {
-      "command": "node",
-      "args": ["C:\\workspace\\kan\\packages\\mcp\\dist\\index.js"],
-      "env": {
-        "KAN_BASE_URL": "http://localhost:3000",
-        "KAN_API_TOKEN": "kan_你的_api_key"
-      }
-    }
-  }
-}
-```
-
-VS Code 的 `mcp.json` 使用 `servers` 作为顶层键，并增加 `type`：
-
-```json
-{
-  "servers": {
-    "kan": {
-      "type": "stdio",
-      "command": "node",
-      "args": ["/绝对路径/kan/packages/mcp/dist/index.js"],
-      "env": {
-        "KAN_BASE_URL": "http://localhost:3000",
-        "KAN_API_TOKEN": "kan_你的_api_key"
-      }
-    }
-  }
-}
-```
-
-### Codex
-
-Codex 可通过命令添加 stdio MCP 服务。将脚本路径替换为本机绝对路径：
-
-```bash
-codex mcp add kan \
-  --env KAN_BASE_URL=http://localhost:3000 \
-  --env KAN_API_TOKEN=kan_你的_api_key \
-  -- node /绝对路径/kan/packages/mcp/dist/index.js
-```
-
-Windows PowerShell：
-
-```powershell
-codex mcp add kan `
-  --env KAN_BASE_URL=http://localhost:3000 `
-  --env KAN_API_TOKEN=kan_你的_api_key `
-  -- node C:\workspace\kan\packages\mcp\dist\index.js
-```
-
-使用 `codex mcp get kan` 检查配置。
-
-### 手动启动和排错
-
-Linux 或 macOS：
-
-```bash
-KAN_BASE_URL=http://localhost:3000 \
-KAN_API_TOKEN=kan_你的_api_key \
-node packages/mcp/dist/index.js
-```
-
-PowerShell：
-
-```powershell
-$env:KAN_BASE_URL = "http://localhost:3000"
-$env:KAN_API_TOKEN = "kan_你的_api_key"
-node .\packages\mcp\dist\index.js
-```
-
-如果出现 `Connection closed`，检查以下内容：
-
-1. 已执行 `pnpm --filter @kan/mcp build`。
-2. `args` 指向真实存在的 `packages/mcp/dist/index.js`。
-3. `KAN_BASE_URL` 只填写实例根地址。
-4. `KAN_API_TOKEN` 是 Kan 用户 API 密钥。
-5. `http://localhost:3000/api/v1/health` 返回数据库正常。
-
-### 工具范围
-
-当前 MCP 服务提供 46 个工具，覆盖工作区、看板、列表、卡片、评论、标签、检查清单和成员管理。连接后可以直接提出以下请求：
-
- 列出我的工作区。
- 查看研发工作区中的所有看板。
- 创建一个包含待办、进行中、已完成列表的新看板。
- 将登录问题卡片移动到进行中列表。
- 给版本发布卡片添加检查清单和评论。
-
-## 技术栈
-
-Next.js、React、tRPC、Better Auth、Tailwind CSS、Drizzle ORM、PostgreSQL 和 Model Context Protocol SDK。
-
-## 参与贡献
-
-欢迎提交 Issue 和 Pull Request。提交代码前请先阅读 [CONTRIBUTING.md](CONTRIBUTING.md)，并运行类型检查、Lint 和格式检查。
-
-## 许可证与联系
-
-项目使用 [AGPLv3](LICENSE) 协议。如需支持，请发送邮件至 [henry@kan.bn](mailto:henry@kan.bn)，或加入 [Discord 社区](https://discord.gg/e6ejRb6CmT)。
+For support or to get in touch, please email [henry@kan.bn](mailto:henry@kan.bn) or join our [Discord server](https://discord.gg/e6ejRb6CmT).
--- a/apps/docs/api-reference/introduction.mdx
+++ b/apps/docs/api-reference/introduction.mdx
@@ -11,10 +11,10 @@ https://kan.bn/api/v1

 ## Authentication

-Most endpoints require authentication using your API key. You can create one in the [settings page](https://kan.bn/settings) of your account. Include this key as a Bearer token in the `Authorization` header of each request.
+Most endpoints require authentication using your API key. You can create one in the [settings page](https://kan.bn/settings) of your account. Include this key in the `x-api-key` header of each request.

 ```
-'Authorization': 'Bearer kan_123456789'
+'x-api-key': kan_123456789
 ```

 ## Response codes
--- a/apps/web/Dockerfile
+++ b/apps/web/Dockerfile
@@ -11,7 +11,6 @@ RUN apk update && \
    apk add --no-cache libc6-compat && \
    rm -rf /var/cache/apk/* /tmp/* || true && \
    corepack enable && \
-    corepack prepare pnpm@9.14.2 --activate && \
    npm install turbo@2.3.1 --global && \
    pnpm config set store-dir ~/.pnpm-store

@@ -110,15 +109,13 @@ ENV PORT=3000
 ENV HOSTNAME=0.0.0.0

 # Copy the standalone Next.js server
-COPY --chown=1000:1000 --from=builder /app/apps/web/.next/standalone/ ./
+COPY --from=builder /app/apps/web/.next/standalone/ ./
 # Copy static assets and public files
-COPY --chown=1000:1000 --from=builder /app/apps/web/.next/static/ ./apps/web/.next/static/
-COPY --chown=1000:1000 --from=builder /app/apps/web/public/ ./apps/web/public/
+COPY --from=builder /app/apps/web/.next/static/ ./apps/web/.next/static/
+COPY --from=builder /app/apps/web/public/ ./apps/web/public/

 # Copy bootstrap script for runtime env var injection
-COPY --chown=1000:1000 apps/web/bootstrap.cjs ./bootstrap.cjs
-
-USER 1000:1000
+COPY apps/web/bootstrap.cjs ./bootstrap.cjs

 EXPOSE 3000
 CMD ["bootstrap.cjs"]
--- a/apps/web/i18n.json
+++ b/apps/web/i18n.json
@@ -2,7 +2,7 @@
  "version": "1.10",
  "locale": {
    "source": "en",
-    "targets": ["fr", "de", "es", "it", "nl", "ru", "pl", "pt-BR", "zh-CN"]
+    "targets": ["fr", "de", "es", "it", "nl", "ru", "pl", "pt-BR"]
  },
  "buckets": {
    "json": {
--- a/apps/web/i18n.lock
+++ b/apps/web/i18n.lock
--- a/apps/web/lingui.config.ts
+++ b/apps/web/lingui.config.ts
@@ -3,7 +3,7 @@ import { formatter } from "@lingui/format-json";


 export default defineConfig({
-  locales: ["en", "fr", "de", "es", "it", "nl", "ru", "pl", "pt-BR", "zh-CN"],
+  locales: ["en", "fr", "de", "es", "it", "nl", "ru", "pl", "pt-BR"],
  sourceLocale: "en",
  catalogs: [
    {
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -28,7 +28,6 @@ const config = {
    ],
  },

-
  /** Enables hot reloading for local packages without a build step */
  transpilePackages: [
    "@kan/api",
@@ -66,8 +65,6 @@ const config = {
      },
    },
  },
-  serverExternalPackages: ["pino"],
-
  experimental: {
    // instrumentationHook: true,
    swcPlugins: [["@lingui/swc-plugin", {}]],
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -27,13 +27,12 @@
    "@kan/api": "workspace:*",
    "@kan/auth": "workspace:*",
    "@kan/db": "workspace:^",
-    "@kan/email": "workspace:^",
-    "@kan/logger": "workspace:^",
    "@kan/shared": "workspace:^",
    "@lingui/babel-preset-react": "^2.9.2",
    "@lingui/conf": "^5.3.2",
    "@lingui/macro": "^5.3.2",
    "@lingui/react": "^5.3.2",
+    "@novu/api": "^3.11.0",
    "@t3-oss/env-nextjs": "^0.11.1",
    "@tailwindcss/typography": "^0.5.16",
    "@tanstack/react-query": "catalog:",
--- a/apps/web/public/icon-512.png
+++ b/apps/web/public/icon-512.png
--- a/apps/web/public/manifest.json
+++ b/apps/web/public/manifest.json
@@ -1,39 +0,0 @@
-{
-  "background_color": "#000000",
-  "categories": [
-    "business",
-    "productivity",
-    "utilities"
-  ],
-  "description": "The open source Trello alternative.",
-  "display": "standalone",
-  "icons": [
-    {
-      "sizes": "512x512",
-      "src": "/icon-512.png",
-      "type": "image/png",
-      "purpose": "any"
-    }
-  ],
-  "id": "/",
-  "screenshots": [
-    {
-      "sizes": "1624x1561",
-      "src": "/screenshot-wide.png",
-      "type": "image/png",
-      "form_factor": "wide"
-    },
-    {
-      "sizes": "1290x2796",
-      "src": "/screenshot-narrow.png",
-      "type": "image/png",
-      "form_factor": "narrow"
-    }
-  ],
-  "orientation": "portrait-primary",
-  "name": "Kan.bn | The open source alternative to Trello",
-  "scope": "/",
-  "short_name": "Kan.bn",
-  "start_url": "/",
-  "theme_color": "#000000"
-}
--- a/apps/web/public/screenshot-narrow.png
+++ b/apps/web/public/screenshot-narrow.png
--- a/apps/web/public/screenshot-wide.png
+++ b/apps/web/public/screenshot-wide.png
--- a/apps/web/src/components/AuthForm.tsx
+++ b/apps/web/src/components/AuthForm.tsx
@@ -46,7 +46,6 @@ interface FormValues {
 interface AuthProps {
  setIsMagicLinkSent: (value: boolean, recipient: string) => void;
  isSignUp?: boolean;
-  callbackURL?: string;
 }

 const EmailSchema = z.object({
@@ -153,11 +152,7 @@ const availableSocialProviders = {
  },
 };

-export function Auth({
-  setIsMagicLinkSent,
-  isSignUp,
-  callbackURL: callbackURLProp,
-}: AuthProps) {
+export function Auth({ setIsMagicLinkSent, isSignUp }: AuthProps) {
  const [isCloudEnv, setIsCloudEnv] = useState(false);
  const [isLoginWithProviderPending, setIsLoginWithProviderPending] =
    useState<null | AuthProvider>(null);
@@ -170,7 +165,7 @@ export function Auth({
  const passwordRef = useRef<HTMLInputElement | null>(null);

  const redirect = useSearchParams().get("next");
-  const callbackURL = callbackURLProp ?? redirect ?? "/boards";
+  const callbackURL = redirect ?? "/boards";

  // Safely get environment variables on client side to avoid hydration mismatch
  useEffect(() => {
--- a/apps/web/src/components/CommandPallette.tsx
+++ b/apps/web/src/components/CommandPallette.tsx
@@ -33,7 +33,6 @@ type SearchResult =
      boardPublicId: string;
      boardName: string;
      listName: string;
-      cardNumber: number | null;
      updatedAt: Date | null;
      createdAt: Date;
      type: "card";
@@ -146,6 +145,7 @@ export default function CommandPallette({
                        value={result}
                        className="cursor-pointer select-none px-4 py-3 data-[focus]:bg-light-200 hover:bg-light-200 focus:outline-none dark:data-[focus]:bg-dark-200 dark:hover:bg-dark-200"
                        onClick={() => {
+                          console.log("clicked", url);
                          void router.push(url);
                          onClose();
                          setQuery("");
@@ -160,17 +160,8 @@ export default function CommandPallette({
                            )}
                          </div>
                          <div className="min-w-0 flex-1 text-left">
-                            <div className="flex items-center gap-2">
-                              <div className="truncate text-sm font-bold text-light-900 dark:text-dark-900">
-                                {result.title}
-                              </div>
-                              {result.type === "card" &&
-                                result.cardNumber != null &&
-                                workspace.cardPrefix && (
-                                  <span className="flex-shrink-0 text-xs text-light-600 dark:text-dark-600">
-                                    {workspace.cardPrefix}-{result.cardNumber}
-                                  </span>
-                                )}
+                            <div className="truncate text-sm font-bold text-light-900 dark:text-dark-900">
+                              {result.title}
                            </div>
                            {result.type === "card" && (
                              <div className="truncate text-xs text-light-700 dark:text-dark-700">
--- a/apps/web/src/components/Dashboard.tsx
+++ b/apps/web/src/components/Dashboard.tsx
@@ -1,6 +1,3 @@
-import { useRouter, useSearchParams } from "next/navigation";
-import { t } from "@lingui/core/macro";
-import { env } from "next-runtime-env";
 import { useTheme } from "next-themes";
 import { useEffect, useRef, useState } from "react";
 import {
@@ -14,12 +11,8 @@ import { authClient } from "@kan/auth/client";

 import { useClickOutside } from "~/hooks/useClickOutside";
 import { useModal } from "~/providers/modal";
-import { usePopup } from "~/providers/popup";
 import { useWorkspace, WorkspaceProvider } from "~/providers/workspace";
 import { api } from "~/utils/api";
-import { ChangePasswordFormConfirmation } from "~/views/settings/components/ChangePasswordConfirmation";
-import Button from "./Button";
-import Modal from "./modal";
 import SideNavigation from "./SideNavigation";

 interface DashboardProps {
@@ -48,11 +41,8 @@ export default function Dashboard({
  hasRightPanel = false,
 }: DashboardProps) {
  const { resolvedTheme } = useTheme();
-  const { openModal, closeModal, modalContentType } = useModal();
+  const { openModal } = useModal();
  const { availableWorkspaces, hasLoaded } = useWorkspace();
-  const { showPopup } = usePopup();
-  const router = useRouter();
-  const searchParams = useSearchParams();

  const { data: session, isPending: sessionLoading } = authClient.useSession();
  const { data: user, isLoading: userLoading } = api.user.getUser.useQuery(
@@ -106,66 +96,11 @@ export default function Dashboard({
    }
  });

-  useEffect(() => {
-    const partnerActivated = searchParams.get("partner_activated");
-    const partnerError = searchParams.get("partner_error");
-
-    if (partnerActivated) {
-      showPopup({
-        header: t`License activated`,
-        message: t`Your license has been activated successfully.`,
-        icon: "success",
-      });
-      const params = new URLSearchParams(searchParams.toString());
-      params.delete("partner_activated");
-      router.replace(`?${params.toString()}`);
-    } else if (partnerError) {
-      const messages: Record<string, string> = {
-        invalid_license: t`That license key could not be found. Please contact support.`,
-        license_inactive: t`Your license is not active. Please check your account.`,
-        missing_license: t`No license key was provided. Please try activating again.`,
-      };
-      showPopup({
-        header: t`License activation failed`,
-        message:
-          messages[partnerError] ??
-          t`Something went wrong during license activation.`,
-        icon: "error",
-      });
-      const params = new URLSearchParams(searchParams.toString());
-      params.delete("partner_error");
-      router.replace(`?${params.toString()}`);
-    }
-  }, [searchParams, showPopup, router]);
-
  useEffect(() => {
    if (hasLoaded && availableWorkspaces.length === 0) {
-      if (env("NEXT_PUBLIC_KAN_ENV") === "cloud") {
-        router.push(
-          `/onboarding/select-plan?returnUrl=${encodeURIComponent(window.location.pathname)}`,
-        );
-      } else {
-        openModal("NEW_WORKSPACE", undefined, undefined, false);
-      }
+      openModal("NEW_WORKSPACE", undefined, undefined, false);
    }
-  }, [hasLoaded, availableWorkspaces.length, openModal, router]);
-
-  useEffect(() => {
-    const isCredentialsEnabled =
-      env("NEXT_PUBLIC_ALLOW_CREDENTIALS")?.toLowerCase() === "true";
-
-    if (
-      !userLoading &&
-      user &&
-      isCredentialsEnabled &&
-      user.hasMagicLinkAccount &&
-      !user.hasPassword &&
-      !sessionStorage.getItem("set_password_prompted")
-    ) {
-      sessionStorage.setItem("set_password_prompted", "1");
-      openModal("SET_PASSWORD_PROMPT");
-    }
-  }, [user, userLoading, openModal]);
+  }, [hasLoaded, availableWorkspaces.length, openModal]);

  const isDarkMode = resolvedTheme === "dark";

@@ -261,30 +196,6 @@ export default function Dashboard({
          </div>
        </div>
      </div>
-
-      <Modal
-        modalSize="sm"
-        isVisible={modalContentType === "SET_PASSWORD_PROMPT"}
-      >
-        {user?.hasPassword ? (
-          <div className="p-5">
-            <h2 className="pb-4 text-base font-medium dark:text-white">{t`Password already set`}</h2>
-            <p className="mb-6 text-sm text-light-900">
-              {t`Your account already has a password. You can change it from your account settings.`}
-            </p>
-            <Button
-              variant="secondary"
-              onClick={closeModal}
-              fullWidth
-              size="lg"
-            >
-              {t`Close`}
-            </Button>
-          </div>
-        ) : (
-          <ChangePasswordFormConfirmation hasPassword={false} />
-        )}
-      </Modal>
    </>
  );
 }
--- a/apps/web/src/components/DateSelector.tsx
+++ b/apps/web/src/components/DateSelector.tsx
@@ -17,14 +17,9 @@ import { twMerge } from "tailwind-merge";
 interface DateSelectorProps {
  selectedDate?: Date | null;
  onDateSelect?: (date: Date | undefined) => void;
-  weekStartsOn?: 0 | 1 | 6;
 }

-const DateSelector = ({
-  selectedDate,
-  onDateSelect,
-  weekStartsOn = 1,
-}: DateSelectorProps) => {
+const DateSelector = ({ selectedDate, onDateSelect }: DateSelectorProps) => {
  const [currentMonth, setCurrentMonth] = useState(() => {
    return selectedDate ? startOfMonth(selectedDate) : startOfMonth(new Date());
  });
@@ -33,18 +28,18 @@ const DateSelector = ({
  const year = format(currentMonth, "yyyy");

  const dayHeaders = useMemo(() => {
-    const weekStart = startOfWeek(new Date(), { weekStartsOn });
+    const weekStart = startOfWeek(new Date(), { weekStartsOn: 1 }); // Monday
    return eachDayOfInterval({
      start: weekStart,
      end: new Date(weekStart.getTime() + 6 * 24 * 60 * 60 * 1000),
    }).map((date) => format(date, "EEEEEE")); // Shortest localized day name
-  }, [weekStartsOn]);
+  }, []);

  const days = useMemo(() => {
    const monthStart = startOfMonth(currentMonth);
    const monthEnd = endOfMonth(currentMonth);
-    const calendarStart = startOfWeek(monthStart, { weekStartsOn });
-    const calendarEnd = endOfWeek(monthEnd, { weekStartsOn });
+    const calendarStart = startOfWeek(monthStart, { weekStartsOn: 1 }); // Monday
+    const calendarEnd = endOfWeek(monthEnd, { weekStartsOn: 1 }); // Monday

    return eachDayOfInterval({ start: calendarStart, end: calendarEnd }).map(
      (date) => {
@@ -58,7 +53,7 @@ const DateSelector = ({
        };
      },
    );
-  }, [currentMonth, selectedDate, weekStartsOn]);
+  }, [currentMonth, selectedDate]);

  const handlePreviousMonth = () => {
    setCurrentMonth(subMonths(currentMonth, 1));
--- a/apps/web/src/components/Editor.tsx
+++ b/apps/web/src/components/Editor.tsx
@@ -10,7 +10,6 @@ import { t } from "@lingui/core/macro";
 import Link from "@tiptap/extension-link";
 import Mention from "@tiptap/extension-mention";
 import Placeholder from "@tiptap/extension-placeholder";
-import Typography from "@tiptap/extension-typography";
 import {
  BubbleMenu,
  EditorContent,
@@ -18,6 +17,7 @@ import {
  ReactRenderer,
  useEditor,
 } from "@tiptap/react";
+import Typography from "@tiptap/extension-typography";
 import StarterKit from "@tiptap/starter-kit";
 import Suggestion from "@tiptap/suggestion";
 import {
@@ -85,7 +85,7 @@ export interface RenderSuggestionsProps {
 export interface WorkspaceMember {
  publicId: string;
  user: {
-    id: string | null;
+    id: string;
    name: string | null;
    image: string | null;
  } | null;
@@ -180,13 +180,13 @@ const RenderSuggestions = () => {

      if (!props.clientRect) return;

-      popup?.[0]?.setProps({
+      popup[0]?.setProps({
        getReferenceClientRect: props.clientRect,
      });
    },
    onKeyDown(props: SuggestionKeyDownProps): boolean {
      if (props.event.key === "Escape") {
-        popup?.[0]?.hide();
+        popup[0]?.hide();
        return true;
      }

@@ -199,7 +199,7 @@ const RenderSuggestions = () => {
      );
    },
    onExit() {
-      popup?.[0]?.destroy();
+      popup[0]?.destroy();
      reactRenderer.destroy();
    },
  };
@@ -308,11 +308,11 @@ const renderMentionSuggestions = () => {
    onUpdate(props: any) {
      reactRenderer.updateProps(props);
      if (!props.clientRect) return;
-      popup?.[0]?.setProps({ getReferenceClientRect: props.clientRect });
+      popup[0]?.setProps({ getReferenceClientRect: props.clientRect });
    },
    onKeyDown(props: SuggestionKeyDownProps) {
      if (props.event.key === "Escape") {
-        popup?.[0]?.hide();
+        popup[0]?.hide();
        return true;
      }
      return (
@@ -324,7 +324,7 @@ const renderMentionSuggestions = () => {
      );
    },
    onExit() {
-      popup?.[0]?.destroy();
+      popup[0]?.destroy();
      reactRenderer.destroy();
    },
  };
@@ -440,7 +440,6 @@ export default function Editor({
  content,
  onChange,
  onBlur,
-  onSubmit,
  readOnly = false,
  workspaceMembers,
  enableYouTubeEmbed = true,
@@ -450,7 +449,6 @@ export default function Editor({
  content: string | null;
  onChange?: (value: string) => void;
  onBlur?: () => void;
-  onSubmit?: () => void;
  readOnly?: boolean;
  workspaceMembers: WorkspaceMember[];
  enableYouTubeEmbed?: boolean;
@@ -459,27 +457,19 @@ export default function Editor({
 }) {
  const containerRef = useRef<HTMLDivElement>(null);

-  // useEditor is created once (empty deps below), so keep the latest callbacks
-  // in refs to avoid the editor capturing stale closures on re-render.
-  const onChangeRef = useRef(onChange);
-  const onBlurRef = useRef(onBlur);
-  const onSubmitRef = useRef(onSubmit);
-  useEffect(() => {
-    onChangeRef.current = onChange;
-  }, [onChange]);
-  useEffect(() => {
-    onBlurRef.current = onBlur;
-  }, [onBlur]);
-  useEffect(() => {
-    onSubmitRef.current = onSubmit;
-  }, [onSubmit]);
-
  const editor = useEditor(
    {
      extensions: [
        StarterKit.configure({
          heading: disableHeadings ? false : undefined,
        }),
+        Markdown,
+        Placeholder.configure({
+          placeholder: readOnly
+            ? ""
+            : placeholder ??
+              t`Add description... (type '/' to open commands or '@' to mention)`,
+        }),
        Link.configure({
          openOnClick: true,
          HTMLAttributes: {
@@ -489,14 +479,6 @@ export default function Editor({
          },
          validate: (href) => /^https?:\/\//.test(href),
          autolink: true,
-          linkOnPaste: true,
-        }),
-        Markdown.configure({ transformPastedText: true }),
-        Placeholder.configure({
-          placeholder: readOnly
-            ? ""
-            : (placeholder ??
-              t`Add description... (type '/' to open commands or '@' to mention)`),
        }),
        SlashCommands.configure({
          commandItems: getCommandItems(disableHeadings),
@@ -514,26 +496,24 @@ export default function Editor({
          suggestion: {
            char: "@",
            items: ({ query }: { query: string }) => {
-              const withEmail = workspaceMembers.filter(
-                (member) => member.email,
-              );
-
+              const withEmail = workspaceMembers.filter((member) => member.email);
+              
              const mapped = withEmail.map((member: WorkspaceMember) => ({
                id: member.publicId,
                label: member?.user?.name?.trim() || member.email || "",
                image: member?.user?.image ?? null,
              }));
-
+              
              const all: MentionItem[] = mapped.filter(
                (item) => item.label && item.label.length > 0,
              );
-
+              
              const q = query.toLowerCase().trim();
-
+              
              if (q === "") {
                return all;
              }
-
+              
              const filtered = all.filter((u) =>
                u.label.toLowerCase().includes(q),
              );
@@ -559,20 +539,20 @@ export default function Editor({
          },
        }),
        Typography.configure({
-          openDoubleQuote: false,
-          closeDoubleQuote: false,
-          openSingleQuote: false,
-          closeSingleQuote: false,
-          oneHalf: false,
-          oneQuarter: false,
-          threeQuarters: false,
-          superscriptTwo: false,
-          superscriptThree: false,
+            openDoubleQuote: false,
+            closeDoubleQuote: false,
+            openSingleQuote: false,
+            closeSingleQuote: false,
+            oneHalf: false,
+            oneQuarter: false,
+            threeQuarters: false,
+            superscriptTwo: false,
+            superscriptThree: false,
        }),
        ...(enableYouTubeEmbed ? [YouTubeNode] : []),
      ],
      content,
-      onUpdate: ({ editor }) => onChangeRef.current?.(editor.getHTML()),
+      onUpdate: ({ editor }) => onChange?.(editor.getHTML()),
      onBlur: ({ event }) => {
        if (
          document
@@ -582,20 +562,13 @@ export default function Editor({
          return;
        // Only trigger onBlur if the click was outside both the editor and menu
        if (!containerRef.current?.contains(event.relatedTarget as Node)) {
-          onBlurRef.current?.();
+          onBlur?.();
        }
      },
      editorProps: {
        attributes: {
          class: "outline-none focus:outline-none focus-visible:ring-0",
        },
-        handleKeyDown: (_view, event) => {
-          if ((event.metaKey || event.ctrlKey) && event.key === "Enter") {
-            onSubmitRef.current?.();
-            return true;
-          }
-          return false;
-        },
      },
      editable: !readOnly,
      injectCSS: false,
@@ -613,16 +586,6 @@ export default function Editor({
    }
  }, [content, editor]);

-  // useEditor captures `readOnly` once at creation time (empty deps above), so
-  // explicitly sync `editable` when the prop changes. Without this the editor
-  // gets stuck read-only when `readOnly` flips from true to false after mount
-  // (e.g. card permissions resolving slower than the card data on first load).
-  useEffect(() => {
-    if (!editor) return;
-    if (editor.isEditable === !readOnly) return;
-    editor.setEditable(!readOnly);
-  }, [editor, readOnly]);
-
  return (
    <div ref={containerRef}>
      <style jsx global>{`
--- a/apps/web/src/components/FontSizeSelector.tsx
+++ b/apps/web/src/components/FontSizeSelector.tsx
@@ -1,32 +0,0 @@
-import { t } from "@lingui/core/macro";
-import { HiOutlineAdjustmentsHorizontal } from "react-icons/hi2";
-
-import { useFontSize, type FontSize } from "~/providers/font-size";
-
-const fontSizeOptions: { value: FontSize; label: () => string }[] = [
-  { value: "small", label: () => t`Small` },
-  { value: "medium", label: () => t`Medium` },
-  { value: "large", label: () => t`Large` },
-];
-
-export function FontSizeSelector() {
-  const { fontSize, setFontSize } = useFontSize();
-
-  return (
-    <div className="relative">
-      <HiOutlineAdjustmentsHorizontal className="pointer-events-none absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-gray-400" />
-      <select
-        id="font-size-select"
-        value={fontSize}
-        onChange={(e) => setFontSize(e.target.value as FontSize)}
-        className="block w-full max-w-[180px] rounded-lg border-0 bg-light-50 pl-10 text-sm shadow-sm ring-1 ring-inset ring-light-300 focus:ring-2 focus:ring-inset focus:ring-light-400 dark:bg-dark-50 dark:text-dark-1000 dark:ring-dark-300 dark:focus:ring-dark-500"
-      >
-        {fontSizeOptions.map((opt) => (
-          <option key={opt.value} value={opt.value}>
-            {opt.label()}
-          </option>
-        ))}
-      </select>
-    </div>
-  );
-}
--- a/apps/web/src/components/Input.tsx
+++ b/apps/web/src/components/Input.tsx
@@ -88,7 +88,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
            </button>
          )}
          {iconRight && type !== "password" && (
-            <div className="absolute right-3 top-1/2 -translate-y-1/2 leading-[0]">
+            <div className="absolute right-3 top-1/2 -translate-y-1/2">
              {iconRight}
            </div>
          )}
--- a/apps/web/src/components/LabelForm.tsx
+++ b/apps/web/src/components/LabelForm.tsx
@@ -39,7 +39,7 @@ export function LabelForm({
      labelPublicId: entityId,
    },
    {
-      enabled: !!isEdit && entityId.length >= 12,
+      enabled: isEdit && !!entityId,
    },
  );

@@ -75,7 +75,7 @@ export function LabelForm({
          reset(newFormState);
        }
      } catch (e) {
-        console.error(e);
+        console.log(e);
      }
    },
  });
@@ -207,7 +207,7 @@ export function LabelForm({
        />
      </div>

-      <div className="mt-12 flex items-center justify-end space-x-4 border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600">
+      <div className="mt-12 flex items-center justify-end border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600">
        {!isEdit && (
          <Toggle
            label={t`Create another`}
@@ -231,7 +231,9 @@ export function LabelForm({
          <Button
            type="submit"
            isLoading={updateLabel.isPending || createLabel.isPending}
-            disabled={!watch("name")}
+            disabled={
+              !watch("name")
+            }
          >
            {isEdit ? t`Update label` : t`Create label`}
          </Button>
--- a/apps/web/src/components/NewWorkspaceForm.tsx
+++ b/apps/web/src/components/NewWorkspaceForm.tsx
@@ -1,14 +1,21 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { t } from "@lingui/core/macro";
 import { env } from "next-runtime-env";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
-import { HiCheck, HiXMark } from "react-icons/hi2";
+import {
+  HiBolt,
+  HiCheck,
+  HiCheckBadge,
+  HiInformationCircle,
+  HiXMark,
+} from "react-icons/hi2";
 import { twMerge } from "tailwind-merge";
 import { z } from "zod";

 import Button from "~/components/Button";
 import Input from "~/components/Input";
+import Toggle from "~/components/Toggle";
 import { useDebounce } from "~/hooks/useDebounce";
 import { useModal } from "~/providers/modal";
 import { usePopup } from "~/providers/popup";
@@ -47,6 +54,7 @@ export function NewWorkspaceForm() {
    watch,
    trigger,
    clearErrors,
+    setValue,
  } = useForm<FormValues>({
    resolver: zodResolver(schema),
    defaultValues: {
@@ -59,10 +67,16 @@ export function NewWorkspaceForm() {

  const hasAvailableWorkspaces = availableWorkspaces.length > 0;

+  const isCloudEnv = env("NEXT_PUBLIC_KAN_ENV") === "cloud";
+
  const slug = watch("slug");
  const [debouncedSlug] = useDebounce(slug, 500);
  const isTyping = slug !== debouncedSlug;

+  // Pro toggle state management
+  const [isProToggleEnabled, setIsProToggleEnabled] = useState(false);
+  const [lastAvailableSlug, setLastAvailableSlug] = useState<string>("");
+
  // Validate slug only after debounce
  useEffect(() => {
    if (isTyping) {
@@ -87,7 +101,7 @@ export function NewWorkspaceForm() {
  const isWorkspaceSlugAvailable = checkWorkspaceSlugAvailability.data;

  const createWorkspace = api.workspace.create.useMutation({
-    onSuccess: (values) => {
+    onSuccess: async (values, variables) => {
      if (values.publicId && values.name) {
        void utils.workspace.all.invalidate();
        switchWorkspace({
@@ -96,11 +110,45 @@ export function NewWorkspaceForm() {
          description: values.description,
          slug: values.slug,
          plan: values.plan,
-          cardPrefix: values.cardPrefix,
          role: "admin",
-          weekStartDay: 1,
        });

+        // If in cloud and Pro toggle is enabled, create checkout session for pro
+        if (env("NEXT_PUBLIC_KAN_ENV") === "cloud" && isProToggleEnabled) {
+          try {
+            const response = await fetch(
+              "/api/stripe/create_checkout_session",
+              {
+                method: "POST",
+                headers: {
+                  "Content-Type": "application/json",
+                },
+                body: JSON.stringify({
+                  slug: slug || undefined,
+                  workspacePublicId: values.publicId,
+                  cancelUrl: "/settings/workspace?upgrade=pro",
+                  successUrl: "/boards",
+                }),
+              },
+            );
+
+            const data = await response.json();
+            const url = (data as { url: string }).url;
+
+            if (url) {
+              window.location.href = url;
+              return; // Don't close modal if redirecting to checkout
+            }
+          } catch (error) {
+            console.error("Error creating checkout session:", error);
+            showPopup({
+              header: t`Error upgrading to Pro`,
+              message: t`Workspace created successfully. You can upgrade later in settings.`,
+              icon: "warning",
+            });
+          }
+        }
+
        closeModal();
      }
    },
@@ -119,8 +167,57 @@ export function NewWorkspaceForm() {
    if (nameElement) nameElement.focus();
  }, []);

+  const [shouldShowBenefits, setShouldShowBenefits] = useState(false);
+
  const isValidSlug = slug && slug.length >= 3 && !errors.slug;

+  useEffect(() => {
+    if (
+      isCloudEnv &&
+      !checkWorkspaceSlugAvailability.isPending &&
+      isValidSlug
+    ) {
+      const isAvailable = isWorkspaceSlugAvailable?.isAvailable === true;
+      setShouldShowBenefits(isAvailable);
+
+      // Automatically enable Pro toggle when slug is available
+      if (isAvailable) {
+        setIsProToggleEnabled(true);
+        setLastAvailableSlug(slug);
+      }
+    }
+  }, [
+    isValidSlug,
+    isWorkspaceSlugAvailable?.isAvailable,
+    checkWorkspaceSlugAvailability.isPending,
+    slug,
+    isCloudEnv,
+  ]);
+
+  // Reset benefits when slug becomes invalid
+  useEffect(() => {
+    if (!isValidSlug) {
+      setShouldShowBenefits(false);
+    }
+  }, [isValidSlug]);
+
+  // Handle Pro toggle changes
+  const handleProToggleChange = () => {
+    if (isProToggleEnabled) {
+      // Turning off: clear the slug and disable Pro
+      setValue("slug", "");
+      setIsProToggleEnabled(false);
+    } else {
+      // Turning on: restore the last available slug if we have one
+      if (lastAvailableSlug) {
+        setValue("slug", lastAvailableSlug);
+      }
+      setIsProToggleEnabled(true);
+    }
+  };
+
+  const showProBenefits = isProToggleEnabled;
+
  const onSubmit = (values: FormValues) => {
    // Don't submit if slug is provided but not available
    if (values.slug && isWorkspaceSlugAvailable?.isAvailable === false) {
@@ -129,7 +226,7 @@ export function NewWorkspaceForm() {

    createWorkspace.mutate({
      name: values.name,
-      slug: values.slug,
+      slug: !isCloudEnv && values.slug ? values.slug : undefined,
    });
  };

@@ -192,7 +289,11 @@ export function NewWorkspaceForm() {
                  ? t`This workspace URL is reserved`
                  : undefined)
            }
-            prefix={`${env("NEXT_PUBLIC_BASE_URL")}/`}
+            prefix={
+              env("NEXT_PUBLIC_KAN_ENV") === "cloud"
+                ? "kan.bn/"
+                : `${env("NEXT_PUBLIC_BASE_URL")}/`
+            }
            iconRight={
              slug && slug.length >= 3 && !errors.slug ? (
                isWorkspaceSlugAvailable?.isAvailable ? (
@@ -209,9 +310,68 @@ export function NewWorkspaceForm() {
              }
            }}
          />
+
+          {slug && slug.length >= 3 && shouldShowBenefits && (
+            <div className="mt-2 flex items-center gap-1">
+              <HiInformationCircle className="h-4 w-4 text-dark-900" />
+              <p className="text-xs text-gray-500 dark:text-dark-900">
+                {t`Custom URLs require upgrading to a Pro plan`}
+              </p>
+            </div>
+          )}
        </div>
+
+        {showProBenefits && (
+          <div className="mt-6">
+            <div className="rounded-md bg-light-100 p-3 text-xs text-light-900 dark:bg-dark-200 dark:text-dark-900">
+              <div className="space-y-3">
+                <div className="flex items-center space-x-3">
+                  <HiCheckBadge className="h-[18px] w-[18px] flex-shrink-0 text-light-1000 dark:text-dark-950" />
+                  <div className="flex items-center space-x-2">
+                    <span className="text-xs text-neutral-900 dark:text-dark-1000">
+                      {t`Unlimited members`}
+                    </span>
+                    <span className="inline-flex items-center rounded-full bg-emerald-500/10 px-2 py-0.5 text-[10px] font-medium text-emerald-600 ring-1 ring-inset ring-emerald-500/20 dark:text-emerald-400 sm:text-[10px]">
+                      {t`Launch offer`}
+                    </span>
+                  </div>
+                </div>
+                <div className="flex items-center space-x-3">
+                  <HiCheckBadge className="h-[18px] w-[18px] flex-shrink-0 text-light-1000 dark:text-dark-950" />
+                  <span className="text-xs text-neutral-900 dark:text-dark-1000">
+                    {t`Custom workspace URL`}
+                  </span>
+                </div>
+                <div className="flex items-center space-x-3">
+                  <HiCheckBadge className="h-[18px] w-[18px] flex-shrink-0 text-light-1000 dark:text-dark-950" />
+                  <div className="flex items-center space-x-2">
+                    <span className="text-xs text-neutral-900 dark:text-dark-1000">
+                      {t`Board analytics`}
+                    </span>
+                    <span className="inline-flex items-center rounded-full bg-gray-500/10 px-2 py-0.5 text-[10px] font-medium text-gray-600 ring-1 ring-inset ring-gray-500/20 dark:text-gray-400 sm:text-[10px]">
+                      {t`Coming soon`}
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        )}
      </div>
-      <div className="mt-6 flex items-center justify-end border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600">
+      <div
+        className={twMerge(
+          "mt-6 flex items-center justify-end border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600",
+          !showProBenefits && "mt-12",
+        )}
+      >
+        {/* Pro Toggle - only show in cloud environment */}
+        {isCloudEnv && (
+          <Toggle
+            isChecked={isProToggleEnabled}
+            onChange={handleProToggleChange}
+            label={t`Upgrade to Pro ($29/month)`}
+          />
+        )}
        <div>
          <Button
            type="submit"
--- a/apps/web/src/components/PageHead.tsx
+++ b/apps/web/src/components/PageHead.tsx
@@ -8,7 +8,6 @@ export const PageHead = ({ title }: { title: string }) => {
        name="viewport"
        content="width=device-width, initial-scale=1, maximum-scale=1"
      />
-      <link rel="manifest" href="/manifest.json" />
    </Head>
  );
 };
--- a/apps/web/src/components/PlainTextEditor.tsx
+++ b/apps/web/src/components/PlainTextEditor.tsx
@@ -1,130 +0,0 @@
-import Placeholder from "@tiptap/extension-placeholder";
-import { EditorContent, useEditor } from "@tiptap/react";
-import StarterKit from "@tiptap/starter-kit";
-import { useEffect, useRef } from "react";
-import { twMerge } from "tailwind-merge";
-
-interface PlainTextEditorProps {
-  content: string;
-  onChange?: (value: string) => void;
-  onBlur?: (value: string) => void;
-  onEnter?: (value: string) => void;
-  onEscape?: () => void;
-  readOnly?: boolean;
-  placeholder?: string;
-  className?: string;
-}
-
-export default function PlainTextEditor({
-  content,
-  onChange,
-  onBlur,
-  onEnter,
-  onEscape,
-  readOnly = false,
-  placeholder,
-  className,
-}: PlainTextEditorProps) {
-  const onEnterRef = useRef(onEnter);
-  const onEscapeRef = useRef(onEscape);
-  const onBlurRef = useRef(onBlur);
-  const onChangeRef = useRef(onChange);
-  const contentRef = useRef(content);
-
-  useEffect(() => {
-    onEnterRef.current = onEnter;
-  }, [onEnter]);
-  useEffect(() => {
-    onEscapeRef.current = onEscape;
-  }, [onEscape]);
-  useEffect(() => {
-    onBlurRef.current = onBlur;
-  }, [onBlur]);
-  useEffect(() => {
-    onChangeRef.current = onChange;
-  }, [onChange]);
-  useEffect(() => {
-    contentRef.current = content;
-  }, [content]);
-
-  const editor = useEditor(
-    {
-      extensions: [
-        StarterKit.configure({
-          bold: false,
-          italic: false,
-          strike: false,
-          code: false,
-          codeBlock: false,
-          blockquote: false,
-          heading: false,
-          bulletList: false,
-          orderedList: false,
-          listItem: false,
-          horizontalRule: false,
-          hardBreak: false,
-        }),
-        Placeholder.configure({ placeholder }),
-      ],
-      content,
-      editable: !readOnly,
-      onUpdate: ({ editor }) => onChangeRef.current?.(editor.getText()),
-      onBlur: ({ editor }) => onBlurRef.current?.(editor.getText()),
-      editorProps: {
-        handleKeyDown: (view, event) => {
-          if (event.key === "Enter") {
-            event.preventDefault();
-            onEnterRef.current?.(view.state.doc.textContent.trim());
-            return true;
-          }
-          if (event.key === "Escape") {
-            event.preventDefault();
-            // Reset to original content before calling the callback
-            editor?.commands.setContent(contentRef.current, false);
-            editor?.commands.blur();
-            onEscapeRef.current?.();
-            return true;
-          }
-          return false;
-        },
-        attributes: {
-          class: "outline-none focus:outline-none focus-visible:ring-0",
-        },
-      },
-    },
-    [],
-  );
-
-  useEffect(() => {
-    if (!editor) return;
-    if (content !== editor.getText()) {
-      editor.commands.setContent(content, false);
-    }
-  }, [content, editor]);
-
-  useEffect(() => {
-    if (!editor) return;
-    editor.setEditable(!readOnly);
-  }, [readOnly, editor]);
-
-  return (
-    <>
-      <style jsx global>{`
-        .plain-text-editor p.is-empty::before {
-          content: attr(data-placeholder);
-          float: left;
-          height: 0;
-          pointer-events: none;
-          color: var(--placeholder-color, #9ca3af);
-        }
-        .plain-text-editor .tiptap p {
-          margin: 0 !important;
-        }
-      `}</style>
-      <EditorContent
-        editor={editor}
-        className={twMerge("plain-text-editor", className)}
-      />
-    </>
-  );
-}
--- a/apps/web/src/components/SettingsLayout.tsx
+++ b/apps/web/src/components/SettingsLayout.tsx
@@ -12,7 +12,6 @@ import { useEffect, useState } from "react";
 import {
  HiChevronDown,
  HiOutlineBanknotes,
-  HiOutlineBolt,
  HiOutlineCodeBracketSquare,
  HiOutlineRectangleGroup,
  HiOutlineShieldCheck,
@@ -65,12 +64,6 @@ export function SettingsLayout({ children, currentTab }: SettingsLayoutProps) {
      label: t`API`,
      condition: true,
    },
-    {
-      key: "webhooks",
-      icon: <HiOutlineBolt />,
-      label: t`Webhooks`,
-      condition: isAdmin,
-    },
    {
      key: "integrations",
      icon: <HiOutlineCodeBracketSquare />,
--- a/apps/web/src/components/SideNavigation.tsx
+++ b/apps/web/src/components/SideNavigation.tsx
@@ -4,7 +4,7 @@ import { Button } from "@headlessui/react";
 import { t } from "@lingui/core/macro";
 import { env } from "next-runtime-env";
 import { useTheme } from "next-themes";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import { HiBolt } from "react-icons/hi2";
 import {
  TbLayoutSidebarLeftCollapse,
@@ -28,7 +28,7 @@ import ButtonComponent from "~/components/Button";
 import ReactiveButton from "~/components/ReactiveButton";
 import UserMenu from "~/components/UserMenu";
 import WorkspaceMenu from "~/components/WorkspaceMenu";
-import { useLinguiContext } from "~/providers/lingui";
+import { useModal } from "~/providers/modal";
 import { useWorkspace } from "~/providers/workspace";
 import { api } from "~/utils/api";

@@ -51,9 +51,9 @@ export default function SideNavigation({
 }: SideNavigationProps) {
  const router = useRouter();
  const { workspace } = useWorkspace();
-  const { locale } = useLinguiContext();
  const [isCollapsed, setIsCollapsed] = useState(false);
  const [isInitialised, setIsInitialised] = useState(false);
+  const { openModal } = useModal();

  const { data: workspaceData } = api.workspace.byId.useQuery(
    { workspacePublicId: workspace.publicId },
@@ -94,59 +94,56 @@ export default function SideNavigation({
    href: string;
    icon: object;
    keyboardShortcut: KeyboardShortcut;
-  }[] = useMemo(
-    () => [
-      {
-        name: t`Boards`,
-        href: "/boards",
-        icon: isDarkMode ? boardsIconDark : boardsIconLight,
-        keyboardShortcut: {
-          type: "SEQUENCE",
-          strokes: [{ key: "G" }, { key: "B" }],
-          action: () => router.push("/boards"),
-          group: "NAVIGATION",
-          description: t`Go to boards`,
-        },
+  }[] = [
+    {
+      name: t`Boards`,
+      href: "/boards",
+      icon: isDarkMode ? boardsIconDark : boardsIconLight,
+      keyboardShortcut: {
+        type: "SEQUENCE",
+        strokes: [{ key: "G" }, { key: "B" }],
+        action: () => router.push("/boards"),
+        group: "NAVIGATION",
+        description: t`Go to boards`,
      },
-      {
-        name: t`Templates`,
-        href: "/templates",
-        icon: isDarkMode ? templatesIconDark : templatesIconLight,
-        keyboardShortcut: {
-          type: "SEQUENCE",
-          strokes: [{ key: "G" }, { key: "T" }],
-          action: () => router.push("/templates"),
-          group: "NAVIGATION",
-          description: t`Go to templates`,
-        },
+    },
+    {
+      name: t`Templates`,
+      href: "/templates",
+      icon: isDarkMode ? templatesIconDark : templatesIconLight,
+      keyboardShortcut: {
+        type: "SEQUENCE",
+        strokes: [{ key: "G" }, { key: "T" }],
+        action: () => router.push("/templates"),
+        group: "NAVIGATION",
+        description: t`Go to templates`,
      },
-      {
-        name: t`Members`,
-        href: "/members",
-        icon: isDarkMode ? membersIconDark : membersIconLight,
-        keyboardShortcut: {
-          type: "SEQUENCE",
-          strokes: [{ key: "G" }, { key: "M" }],
-          action: () => router.push("/members"),
-          group: "NAVIGATION",
-          description: t`Go to members`,
-        },
+    },
+    {
+      name: t`Members`,
+      href: "/members",
+      icon: isDarkMode ? membersIconDark : membersIconLight,
+      keyboardShortcut: {
+        type: "SEQUENCE",
+        strokes: [{ key: "G" }, { key: "M" }],
+        action: () => router.push("/members"),
+        group: "NAVIGATION",
+        description: t`Go to members`,
      },
-      {
-        name: t`Settings`,
-        href: "/settings",
-        icon: isDarkMode ? settingsIconDark : settingsIconLight,
-        keyboardShortcut: {
-          type: "SEQUENCE",
-          strokes: [{ key: "G" }, { key: "S" }],
-          action: () => router.push("/settings"),
-          group: "NAVIGATION",
-          description: t`Go to settings`,
-        },
+    },
+    {
+      name: t`Settings`,
+      href: "/settings",
+      icon: isDarkMode ? settingsIconDark : settingsIconLight,
+      keyboardShortcut: {
+        type: "SEQUENCE",
+        strokes: [{ key: "G" }, { key: "S" }],
+        action: () => router.push("/settings"),
+        group: "NAVIGATION",
+        description: t`Go to settings`,
      },
-    ],
-    [isDarkMode, locale, router],
-  );
+    },
+  ];

  const toggleCollapse = () => {
    setIsCollapsed(!isCollapsed);
@@ -226,19 +223,21 @@ export default function SideNavigation({
                  <ButtonComponent
                    iconLeft={<HiBolt />}
                    variant="secondary"
-                    href={`/upgrade/select-plan?plan=pro&workspacePublicId=${workspace.publicId}&returnUrl=${encodeURIComponent("/settings/billing")}`}
-                    aria-label={t`Start free trial`}
-                    title={t`Start free trial`}
+                    href="/settings/workspace?upgrade=pro"
+                    aria-label="Upgrade to Pro"
+                    title="Upgrade to Pro"
                    iconOnly
+                    onClick={() => openModal("UPGRADE_TO_PRO")}
                  />
                ) : (
                  <ButtonComponent
                    iconLeft={<HiBolt />}
                    fullWidth
                    variant="secondary"
-                    href={`/upgrade/select-plan?plan=pro&workspacePublicId=${workspace.publicId}&returnUrl=${encodeURIComponent("/settings/billing")}`}
+                    href="/settings/workspace?upgrade=pro"
+                    onClick={() => openModal("UPGRADE_TO_PRO")}
                  >
-                    {t`Start free trial`}
+                    {t`Upgrade to Pro`}
                  </ButtonComponent>
                )}
              </div>
--- a/apps/web/src/components/Toggle.tsx
+++ b/apps/web/src/components/Toggle.tsx
@@ -7,17 +7,15 @@ const Toggle = ({
  label,
  disabled,
  showLabel = true,
-  labelPosition = "before",
 }: {
  isChecked: boolean;
  onChange: () => void;
  label: string;
  disabled?: boolean;
  showLabel?: boolean;
-  labelPosition?: "before" | "after";
 }) => (
-  <div className="flex items-center">
-    {showLabel && labelPosition === "before" && (
+  <div className="mr-4 flex items-center justify-end">
+    {showLabel && (
      <span className="mr-2 text-xs text-light-900 dark:text-dark-900">
        {label}
      </span>
@@ -40,11 +38,6 @@ const Toggle = ({
        )}
      />
    </Switch>
-    {showLabel && labelPosition === "after" && (
-      <span className="ml-2 text-xs text-light-900 dark:text-dark-900">
-        {label}
-      </span>
-    )}
  </div>
 );

--- a/apps/web/src/components/Tooltip.tsx
+++ b/apps/web/src/components/Tooltip.tsx
@@ -1,6 +1,6 @@
 import type { ReactNode } from "react";
 import type { Root } from "react-dom/client";
-import type { Placement, Instance as TippyInstance } from "tippy.js";
+import type { Placement } from "tippy.js";
 import { useEffect, useRef } from "react";
 import { createRoot } from "react-dom/client";
 import tippy from "tippy.js";
@@ -20,16 +20,16 @@ export function Tooltip({
 }: TooltipProps) {
  const triggerRef = useRef<HTMLDivElement>(null);
  const rootRef = useRef<Root | null>(null);
-  const tippyRef = useRef<TippyInstance | null>(null);
-  const contentRef = useRef(content);
-  contentRef.current = content;

  useEffect(() => {
    if (!triggerRef.current) return;

+    if (!content) return;
+
    const container = document.createElement("div");
    const root = createRoot(container);
    rootRef.current = root;
+    root.render(content);

    const instance = tippy(triggerRef.current, {
      content: container,
@@ -39,33 +39,12 @@ export function Tooltip({
      theme: "tooltip",
      touch: false,
    });
-    tippyRef.current = instance;
-
-    if (contentRef.current) {
-      root.render(contentRef.current);
-    } else {
-      instance.disable();
-    }

    return () => {
      instance.destroy();
-      tippyRef.current = null;
-      root.unmount();
-      rootRef.current = null;
+      rootRef.current?.unmount();
    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [placement, delay]);
-
-  useEffect(() => {
-    if (!content) {
-      tippyRef.current?.disable();
-      return;
-    }
-    if (tippyRef.current) {
-      tippyRef.current.enable();
-      rootRef.current?.render(content);
-    }
-  }, [content]);
+  }, [content, placement, delay]);

  return (
    <div ref={triggerRef} className="inline-flex">
--- a/apps/web/src/components/WorkspaceMenu.tsx
+++ b/apps/web/src/components/WorkspaceMenu.tsx
@@ -1,16 +1,12 @@
-import { useRouter } from "next/navigation";
 import { Button, Menu, Transition } from "@headlessui/react";
 import { t } from "@lingui/core/macro";
-import { env } from "next-runtime-env";
-import { Fragment, useMemo, useState } from "react";
+import { Fragment, useState } from "react";
 import { HiCheck, HiMagnifyingGlass } from "react-icons/hi2";
 import { twMerge } from "tailwind-merge";

 import { useKeyboardShortcut } from "~/providers/keyboard-shortcuts";
-import { useLinguiContext } from "~/providers/lingui";
 import { useModal } from "~/providers/modal";
 import { useWorkspace } from "~/providers/workspace";
-import { api } from "~/utils/api";
 import CommandPallette from "./CommandPallette";
 import { Tooltip } from "./Tooltip";

@@ -21,29 +17,20 @@ export default function WorkspaceMenu({
 }) {
  const { workspace, isLoading, availableWorkspaces, switchWorkspace } =
    useWorkspace();
-  const { locale } = useLinguiContext();
  const { openModal } = useModal();
-  const { data: hasPartnerSlot } =
-    api.workspace.hasAvailablePartnerSlot.useQuery();
-  const router = useRouter();
  const [isOpen, setIsOpen] = useState(false);

-  const commandPaletteShortcut = useMemo(
-    () => ({
-      type: "PRESS" as const,
+  const { tooltipContent: commandPaletteShortcutTooltipContent } =
+    useKeyboardShortcut({
+      type: "PRESS",
      stroke: {
        key: "k",
-        modifiers: ["META"] as ("META" | "CONTROL" | "ALT" | "SHIFT")[],
+        modifiers: ["META"],
      },
      action: () => setIsOpen(true),
      description: t`Open command menu`,
-      group: "GENERAL" as const,
-    }),
-    [locale],
-  );
-
-  const { tooltipContent: commandPaletteShortcutTooltipContent } =
-    useKeyboardShortcut(commandPaletteShortcut);
+      group: "GENERAL",
+    });

  return (
    <>
@@ -160,19 +147,7 @@ export default function WorkspaceMenu({
            <div className="border-t-[1px] border-light-600 p-1 dark:border-dark-500">
              <Menu.Item>
                <button
-                  onClick={() => {
-                    if (env("NEXT_PUBLIC_KAN_ENV") !== "cloud") {
-                      openModal("NEW_WORKSPACE");
-                    } else if (hasPartnerSlot) {
-                      router.push(
-                        `/onboarding/workspace?partner=1&returnUrl=${encodeURIComponent(window.location.pathname)}`,
-                      );
-                    } else {
-                      router.push(
-                        `/onboarding/select-plan?returnUrl=${encodeURIComponent(window.location.pathname)}`,
-                      );
-                    }
-                  }}
+                  onClick={() => openModal("NEW_WORKSPACE")}
                  className="flex w-full items-center justify-between rounded-[5px] px-3 py-2 text-left text-xs text-neutral-900 hover:bg-light-200 dark:text-dark-1000 dark:hover:bg-dark-400"
                >
                  {t`Create workspace`}
--- a/apps/web/src/env.ts
+++ b/apps/web/src/env.ts
@@ -52,9 +52,8 @@ export const env = createEnv({
    VK_CLIENT_SECRET: z.string().optional(),
    LINKEDIN_CLIENT_ID: z.string().optional(),
    LINKEDIN_CLIENT_SECRET: z.string().optional(),
-    SUBSCRIBER_API_URL: z.string().url().optional(),
-    SUBSCRIBER_API_KEY: z.string().optional(),
-    SUBSCRIBER_ENVIRONMENT_ID: z.string().optional(),
+    NOVU_API_KEY: z.string().optional(),
+    EMAIL_UNSUBSCRIBE_SECRET: z.string().optional(),
    // Generic OIDC Provider
    OIDC_CLIENT_ID: z.string().optional(),
    OIDC_CLIENT_SECRET: z.string().optional(),
--- a/apps/web/src/hooks/useLocalisation.ts
+++ b/apps/web/src/hooks/useLocalisation.ts
@@ -1,6 +1,6 @@
 import type { Locale as DateFnsLocale } from "date-fns";
 import { useLingui } from "@lingui/react";
-import { de, enGB, es, fr, it, nl, pl, ptBR, ru, zhCN } from "date-fns/locale";
+import { de, enGB, es, fr, it, nl, pl, ru, ptBR} from "date-fns/locale";

 import type { Locale } from "~/locales";
 import { useLinguiContext } from "~/providers/lingui";
@@ -19,8 +19,7 @@ export function useLocalisation() {
    nl,
    ru,
    pl,
-    ptbr: ptBR,
-    "zh-CN": zhCN,
+    "pt-BR": ptBR,
  };

  const currentDateLocale = dateLocaleMap[locale] ?? enGB;
--- a/apps/web/src/hooks/useModalFormState.ts
+++ b/apps/web/src/hooks/useModalFormState.ts
@@ -1,5 +1,4 @@
-import { useCallback, useEffect, useRef } from "react";
-
+import { useEffect } from "react";
 import { useModal } from "~/providers/modal";

 interface UseModalFormStateOptions<T> {
@@ -13,43 +12,25 @@ export function useModalFormState<T extends Record<string, any>>({
  initialValues,
  resetOnClose = false,
 }: UseModalFormStateOptions<T>) {
-  const {
-    modalContentType,
-    isOpen,
-    getModalState,
-    setModalState,
-    clearModalState,
-  } = useModal();
-
+  const { modalContentType, isOpen, getModalState, setModalState, clearModalState } = useModal();
+  
  const isCurrentModal = modalContentType === modalType;
  const savedState = getModalState(modalType) as T | undefined;
-
+  
  // get current form state (using the saved values if available, otherwise the initial values)
  const formState = savedState || initialValues;

-  // Keep refs so the callbacks below stay stable across re-renders.
-  const modalTypeRef = useRef(modalType);
-  const initialValuesRef = useRef(initialValues);
-  const getModalStateRef = useRef(getModalState);
-  modalTypeRef.current = modalType;
-  initialValuesRef.current = initialValues;
-  getModalStateRef.current = getModalState;
+  const saveFormState = (state: Partial<T>) => {
+    if (!isCurrentModal) return;
+    
+    const currentState = getModalState(modalType) || initialValues;
+    const newState = { ...currentState, ...state };
+    setModalState(modalType, newState);
+  };

-  const saveFormState = useCallback(
-    (state: Partial<T>) => {
-      const type = modalTypeRef.current;
-      const currentState =
-        getModalStateRef.current(type) ?? initialValuesRef.current;
-      const newState = { ...currentState, ...state };
-      setModalState(type, newState);
-    },
-    // setModalState is stable (useCallback with [] deps in ModalProvider)
-    [setModalState],
-  );
-
-  const clearFormState = useCallback(() => {
-    clearModalState(modalTypeRef.current);
-  }, [clearModalState]);
+  const clearFormState = () => {
+    clearModalState(modalType);
+  };

  useEffect(() => {
    if (resetOnClose && !isOpen && savedState) {
@@ -64,4 +45,4 @@ export function useModalFormState<T extends Record<string, any>>({
    isCurrentModal,
    hasSavedState: !!savedState,
  };
-}
+} 
--- a/apps/web/src/hooks/usePermissions.ts
+++ b/apps/web/src/hooks/usePermissions.ts
@@ -19,7 +19,6 @@ interface UsePermissionsResult {
  canCreateBoard: boolean;
  canEditBoard: boolean;
  canDeleteBoard: boolean;
-  canArchiveBoard: boolean;
  canViewComment: boolean;
  canCreateComment: boolean;
  canEditComment: boolean;
@@ -34,7 +33,7 @@ interface UsePermissionsResult {
 export function usePermissions(): UsePermissionsResult {
  // Check if WorkspaceProvider is available (for public board views, it may not be)
  const workspaceContext = useContext(WorkspaceContext);
-
+  
  // If WorkspaceProvider is not available, return safe defaults
  if (!workspaceContext) {
    const emptyPermissions: UsePermissionsResult = {
@@ -52,7 +51,6 @@ export function usePermissions(): UsePermissionsResult {
      canCreateBoard: false,
      canEditBoard: false,
      canDeleteBoard: false,
-      canArchiveBoard: false,
      canViewComment: false,
      canCreateComment: false,
      canEditComment: false,
@@ -97,7 +95,6 @@ export function usePermissions(): UsePermissionsResult {
    canCreateBoard: hasPermission("board:create"),
    canEditBoard: hasPermission("board:edit"),
    canDeleteBoard: hasPermission("board:delete"),
-    canArchiveBoard: hasPermission("board:edit"),
    canViewComment: hasPermission("comment:view"),
    canCreateComment: hasPermission("comment:create"),
    canEditComment: hasPermission("comment:edit"),
--- a/apps/web/src/hooks/useScrollRestore.ts
+++ b/apps/web/src/hooks/useScrollRestore.ts
@@ -1,44 +0,0 @@
-import type { RefObject } from "react";
-import type { NextRouter } from "next/router";
-import { useEffect, useRef } from "react";
-
-const scrollPositions = new Map<string, number>();
-
-export function useScrollRestore(
-  boardId: string | null | undefined,
-  scrollRef: RefObject<HTMLElement | null>,
-  router: NextRouter,
-  isReady: boolean,
-) {
-  const restored = useRef(false);
-
-  useEffect(() => {
-    if (!boardId) return;
-
-    restored.current = false;
-
-    const saveScrollPosition = () => {
-      if (scrollRef.current) {
-        scrollPositions.set(boardId, scrollRef.current.scrollLeft);
-      }
-    };
-
-    router.events.on("routeChangeStart", saveScrollPosition);
-    return () => router.events.off("routeChangeStart", saveScrollPosition);
-  }, [boardId, router.events, scrollRef]);
-
-  useEffect(() => {
-    if (restored.current || !isReady || !boardId) return;
-    restored.current = true;
-
-    const saved = scrollPositions.get(boardId);
-    if (saved === undefined) return;
-
-    // StrictModeDroppable delays rendering by one requestAnimationFrame
-    requestAnimationFrame(() => {
-      requestAnimationFrame(() => {
-        if (scrollRef.current) scrollRef.current.scrollLeft = saved;
-      });
-    });
-  }, [isReady, scrollRef, boardId]);
-}
--- a/apps/web/src/locales/de/messages.json
+++ b/apps/web/src/locales/de/messages.json
--- a/apps/web/src/locales/de/messages.ts
+++ b/apps/web/src/locales/de/messages.ts
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
--- a/apps/web/src/locales/en/messages.ts
+++ b/apps/web/src/locales/en/messages.ts
--- a/apps/web/src/locales/es/messages.json
+++ b/apps/web/src/locales/es/messages.json
--- a/apps/web/src/locales/es/messages.ts
+++ b/apps/web/src/locales/es/messages.ts
--- a/apps/web/src/locales/fr/messages.json
+++ b/apps/web/src/locales/fr/messages.json
--- a/apps/web/src/locales/fr/messages.ts
+++ b/apps/web/src/locales/fr/messages.ts
--- a/apps/web/src/locales/index.ts
+++ b/apps/web/src/locales/index.ts
@@ -7,14 +7,12 @@ export const locales = [
  "nl",
  "ru",
  "pl",
-  "ptbr",
-  "zh-CN",
+  "pt-BR"
 ] as const;

 export type Locale = (typeof locales)[number];

-// 自托管实例默认使用简体中文，用户仍可在设置中切换其他语言。
-export const defaultLocale: Locale = "zh-CN";
+export const defaultLocale: Locale = "en";

 export const localeNames: Record<Locale, string> = {
  en: "English",
@@ -25,6 +23,5 @@ export const localeNames: Record<Locale, string> = {
  nl: "Nederlands",
  ru: "Русский",
  pl: "Polski",
-  ptbr: "Português",
-  "zh-CN": "简体中文",
+  "pt-BR": "Português",
 };
--- a/apps/web/src/locales/it/messages.json
+++ b/apps/web/src/locales/it/messages.json
--- a/apps/web/src/locales/it/messages.ts
+++ b/apps/web/src/locales/it/messages.ts
--- a/apps/web/src/locales/nl/messages.json
+++ b/apps/web/src/locales/nl/messages.json
--- a/apps/web/src/locales/nl/messages.ts
+++ b/apps/web/src/locales/nl/messages.ts
--- a/apps/web/src/locales/pl/messages.json
+++ b/apps/web/src/locales/pl/messages.json
--- a/apps/web/src/locales/pl/messages.ts
+++ b/apps/web/src/locales/pl/messages.ts
--- a/apps/web/src/locales/pt-BR/messages.json
+++ b/apps/web/src/locales/pt-BR/messages.json
--- a/apps/web/src/locales/pt-BR/messages.ts
+++ b/apps/web/src/locales/pt-BR/messages.ts
--- a/apps/web/src/locales/ptbr/messages.po
+++ b/apps/web/src/locales/ptbr/messages.po
--- a/apps/web/src/locales/ptbr/messages.ts
+++ b/apps/web/src/locales/ptbr/messages.ts
--- a/apps/web/src/locales/ru/messages.json
+++ b/apps/web/src/locales/ru/messages.json
--- a/apps/web/src/locales/ru/messages.ts
+++ b/apps/web/src/locales/ru/messages.ts
--- a/apps/web/src/locales/zh-CN/messages.json
+++ b/apps/web/src/locales/zh-CN/messages.json
--- a/apps/web/src/locales/zh-CN/messages.ts
+++ b/apps/web/src/locales/zh-CN/messages.ts
--- a/apps/web/src/pages/404.tsx
+++ b/apps/web/src/pages/404.tsx
@@ -1,55 +0,0 @@
-import Link from "next/link";
-import { t } from "@lingui/core/macro";
-import { Trans } from "@lingui/react/macro";
-
-import { PageHead } from "~/components/PageHead";
-import PatternedBackground from "~/components/PatternedBackground";
-
-export default function NotFoundPage() {
-  return (
-    <>
-      <PageHead title={t`404 - Page Not Found | kan.bn`} />
-      <main className="h-screen bg-light-100 pt-20 dark:bg-dark-50 sm:pt-0">
-        <div className="justify-top flex h-full flex-col items-center px-4 sm:justify-center">
-          <div className="z-10 flex w-full flex-col items-center">
-            <Link href="/">
-              <h1 className="mb-6 text-lg font-bold tracking-tight text-light-1000 dark:text-dark-1000">
-                kan.bn
-              </h1>
-            </Link>
-            <p className="mb-4 text-8xl font-bold tracking-tight text-light-1000 dark:text-dark-1000">
-              404
-            </p>
-            <p className="mb-10 text-3xl font-bold tracking-tight text-light-1000 dark:text-dark-1000">
-              <Trans>Page not found</Trans>
-            </p>
-            <div className="w-full rounded-lg border border-light-500 bg-light-300 px-4 py-10 dark:border-dark-400 dark:bg-dark-200 sm:max-w-md lg:px-10">
-              <div className="sm:mx-auto sm:w-full sm:max-w-sm">
-                <p className="mb-6 text-center text-light-900 dark:text-dark-900">
-                  <Trans>
-                    The page you're looking for doesn't exist or has been moved.
-                  </Trans>
-                </p>
-                <div className="flex flex-col gap-3">
-                  <Link
-                    href="/"
-                    className="flex w-full justify-center rounded-md bg-light-1000 px-3 py-2 text-sm font-semibold text-light-100 shadow-sm hover:bg-light-900 dark:bg-dark-1000 dark:text-dark-100 dark:hover:bg-dark-900"
-                  >
-                    <Trans>Go to homepage</Trans>
-                  </Link>
-                  <Link
-                    href="/boards"
-                    className="flex w-full justify-center rounded-md border border-light-500 bg-light-100 px-3 py-2 text-sm font-semibold text-light-1000 shadow-sm hover:bg-light-200 dark:border-dark-400 dark:bg-dark-100 dark:text-dark-1000 dark:hover:bg-dark-300"
-                  >
-                    <Trans>Go to boards</Trans>
-                  </Link>
-                </div>
-              </div>
-            </div>
-          </div>
-          <PatternedBackground />
-        </div>
-      </main>
-    </>
-  );
-}
--- a/apps/web/src/pages/_app.tsx
+++ b/apps/web/src/pages/_app.tsx
@@ -12,7 +12,6 @@ import posthog from "posthog-js";
 import { PostHogProvider } from "posthog-js/react";
 import { useEffect } from "react";

-import { FontSizeProvider } from "~/providers/font-size";
 import { KeyboardShortcutProvider } from "~/providers/keyboard-shortcuts";
 import { LinguiProviderWrapper } from "~/providers/lingui";
 import { ModalProvider } from "~/providers/modal";
@@ -82,25 +81,23 @@ const MyApp: AppType = ({ Component, pageProps }: AppPropsWithLayout) => {
      )}
      <script src="/__ENV.js" />
      <main className="font-sans">
-        <LinguiProviderWrapper>
-          <KeyboardShortcutProvider>
-            <FontSizeProvider>
-              <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
-                <ModalProvider>
-                  <PopupProvider>
-                    {posthogKey ? (
-                      <PostHogProvider client={posthog}>
-                        {getLayout(<Component {...pageProps} />)}
-                      </PostHogProvider>
-                    ) : (
-                      getLayout(<Component {...pageProps} />)
-                    )}
-                  </PopupProvider>
-                </ModalProvider>
-              </ThemeProvider>
-            </FontSizeProvider>
-          </KeyboardShortcutProvider>
-        </LinguiProviderWrapper>
+        <KeyboardShortcutProvider>
+          <LinguiProviderWrapper>
+            <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
+              <ModalProvider>
+                <PopupProvider>
+                  {posthogKey ? (
+                    <PostHogProvider client={posthog}>
+                      {getLayout(<Component {...pageProps} />)}
+                    </PostHogProvider>
+                  ) : (
+                    getLayout(<Component {...pageProps} />)
+                  )}
+                </PopupProvider>
+              </ModalProvider>
+            </ThemeProvider>
+          </LinguiProviderWrapper>
+        </KeyboardShortcutProvider>
      </main>
    </>
  );
--- a/apps/web/src/pages/api/download/attatchment.ts
+++ b/apps/web/src/pages/api/download/attatchment.ts
@@ -1,75 +1,49 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { withApiLogging } from "@kan/api/utils/apiLogging";
 import { withRateLimit } from "@kan/api/utils/rateLimit";

-import { env } from "~/env";
-
 export default withRateLimit(
  { points: 100, duration: 60 },
-  withApiLogging(async (req: NextApiRequest, res: NextApiResponse) => {
-    if (req.method !== "GET") {
-      return res.status(405).json({ message: "Method not allowed" });
+  async (req: NextApiRequest, res: NextApiResponse) => {
+  if (req.method !== "GET") {
+    return res.status(405).json({ message: "Method not allowed" });
+  }
+
+  const { url, filename } = req.query;
+
+  if (!url || typeof url !== "string") {
+    return res.status(400).json({
+      message: "url parameter is required",
+    });
+  }
+
+  try {
+    const downloadFilename = typeof filename === "string"
+      ? encodeURIComponent(filename)
+      : "attachment";
+
+    const upstream = await fetch(url);
+
+    if (!upstream.ok) {
+      return res.status(upstream.status).json({
+        message: "Failed to fetch attachment",
+      });
    }

-    const { url, filename } = req.query;
+    const contentType =
+      upstream.headers.get("Content-Type") ?? "application/octet-stream";

-    if (!url || typeof url !== "string") {
-      return res.status(400).json({ message: "url parameter is required" });
-    }
+    res.setHeader("Content-Type", contentType);
+    res.setHeader(
+      "Content-Disposition",
+      `attachment; filename="${downloadFilename}"; filename*=UTF-8''${downloadFilename}`,
+    );

-    const s3Endpoint = env.S3_ENDPOINT;
-
-    if (s3Endpoint) {
-      let parsed: URL;
-      try {
-        parsed = new URL(url);
-      } catch {
-        return res.status(400).json({ message: "Invalid URL" });
-      }
-
-      const hostname = parsed.hostname.toLowerCase();
-      let allowedHost: string;
-      try {
-        allowedHost = new URL(s3Endpoint).hostname.toLowerCase();
-      } catch {
-        return res
-          .status(500)
-          .json({ message: "Storage endpoint misconfigured" });
-      }
-
-      if (hostname !== allowedHost && !hostname.endsWith(`.${allowedHost}`)) {
-        return res.status(403).json({ message: "URL not allowed" });
-      }
-    }
-
-    try {
-      const downloadFilename =
-        typeof filename === "string"
-          ? encodeURIComponent(filename)
-          : "attachment";
-
-      const upstream = await fetch(url);
-
-      if (!upstream.ok) {
-        return res
-          .status(upstream.status)
-          .json({ message: "Failed to fetch attachment" });
-      }
-
-      const contentType =
-        upstream.headers.get("Content-Type") ?? "application/octet-stream";
-
-      res.setHeader("Content-Type", contentType);
-      res.setHeader(
-        "Content-Disposition",
-        `attachment; filename="${downloadFilename}"; filename*=UTF-8''${downloadFilename}`,
-      );
-
-      const buffer = await upstream.arrayBuffer();
-      return res.send(Buffer.from(buffer));
-    } catch (error) {
-      return res.status(500).json({ message: "Failed to download attachment" });
-    }
-  }),
+    const buffer = await upstream.arrayBuffer();
+    return res.send(Buffer.from(buffer));
+  } catch (error) {
+    console.error("Error downloading attachment:", error);
+    return res.status(500).json({ message: "Failed to download attachment" });
+  }
+  },
 );
--- a/apps/web/src/pages/api/oss-friends.ts
+++ b/apps/web/src/pages/api/oss-friends.ts
@@ -1,25 +1,25 @@
 import type { NextApiRequest, NextApiResponse } from "next";

-import { withApiLogging } from "@kan/api/utils/apiLogging";
 import { withRateLimit } from "@kan/api/utils/rateLimit";

 export default withRateLimit(
  { points: 100, duration: 60 },
-  withApiLogging(async (req: NextApiRequest, res: NextApiResponse) => {
-    if (req.method !== "GET") {
-      return res.status(405).json({ message: "Method not allowed" });
-    }
+  async (req: NextApiRequest, res: NextApiResponse) => {
+  if (req.method !== "GET") {
+    return res.status(405).json({ message: "Method not allowed" });
+  }

-    try {
-      const response = await fetch("https://formbricks.com/api/oss-friends");
-      if (!response.ok) {
-        throw new Error("Failed to fetch from Formbricks");
-      }
-      const data = await response.json();
-
-      return res.status(200).json(data);
-    } catch (error) {
-      return res.status(500).json({ message: "Failed to fetch OSS friends" });
+  try {
+    const response = await fetch("https://formbricks.com/api/oss-friends");
+    if (!response.ok) {
+      throw new Error("Failed to fetch from Formbricks");
    }
-  }),
+    const data = await response.json();
+
+    return res.status(200).json(data);
+  } catch (error) {
+    console.error("Error fetching OSS friends:", error);
+    return res.status(500).json({ message: "Failed to fetch OSS friends" });
+  }
+  },
 );
--- a/apps/web/src/pages/api/partner/_utils.ts
+++ b/apps/web/src/pages/api/partner/_utils.ts
@@ -1,20 +0,0 @@
-export type WorkspacePlan = "free" | "team" | "pro" | "enterprise";
-
-export interface TierConfig {
-  plan: WorkspacePlan;
-  seats: number | null;
-  unlimitedSeats: boolean;
-  workspaceSlots: number;
-}
-
-const TIER_MAP: Record<number, TierConfig> = {
-  1: { plan: "team", seats: 5, unlimitedSeats: false, workspaceSlots: 1 },
-  2: { plan: "pro", seats: 15, unlimitedSeats: false, workspaceSlots: 2 },
-  3: { plan: "pro", seats: null, unlimitedSeats: true, workspaceSlots: 4 },
-};
-
-export function tierConfig(tier: number): TierConfig {
-  const config = TIER_MAP[tier];
-  if (!config) throw new Error(`Unknown partner tier: ${tier}`);
-  return config;
-}
--- a/apps/web/src/pages/api/partner/callback.ts
+++ b/apps/web/src/pages/api/partner/callback.ts
@@ -1,144 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from "next";
-
-import { createNextApiContext } from "@kan/api/trpc";
-import { withApiLogging } from "@kan/api/utils/apiLogging";
-import { withRateLimit } from "@kan/api/utils/rateLimit";
-import * as subscriptionRepo from "@kan/db/repository/subscription.repo";
-import { createLogger } from "@kan/logger";
-
-import { tierConfig } from "./_utils";
-
-const log = createLogger("api");
-
-interface TokenResponse {
-  access_token: string;
-  token_type: string;
-}
-
-interface OAuthLicenseResponse {
-  license_key: string;
-  status: string;
-}
-
-interface LicenseDetailResponse {
-  license_key: string;
-  status: string;
-  tier: number;
-}
-
-async function exchangeCodeForToken(code: string): Promise<TokenResponse> {
-  const tokenUrl = process.env.PARTNER_TOKEN_URL;
-  const clientId = process.env.PARTNER_CLIENT_ID;
-  const clientSecret = process.env.PARTNER_CLIENT_SECRET;
-  const redirectUrl = process.env.PARTNER_REDIRECT_URL;
-  if (!tokenUrl) throw new Error("PARTNER_TOKEN_URL not configured");
-  if (!clientId) throw new Error("PARTNER_CLIENT_ID not configured");
-  if (!clientSecret) throw new Error("PARTNER_CLIENT_SECRET not configured");
-  if (!redirectUrl) throw new Error("PARTNER_REDIRECT_URL not configured");
-
-  const res = await fetch(tokenUrl, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: new URLSearchParams({
-      grant_type: "authorization_code",
-      code,
-      client_id: clientId,
-      client_secret: clientSecret,
-      redirect_uri: redirectUrl,
-    }),
-  });
-
-  if (!res.ok) throw new Error(`Token exchange failed: ${res.status}`);
-  return res.json() as Promise<TokenResponse>;
-}
-
-async function fetchOAuthLicense(
-  accessToken: string,
-): Promise<OAuthLicenseResponse> {
-  const oauthLicenseUrl = process.env.PARTNER_OAUTH_LICENSE_URL;
-  if (!oauthLicenseUrl)
-    throw new Error("PARTNER_OAUTH_LICENSE_URL not configured");
-
-  const res = await fetch(`${oauthLicenseUrl}?access_token=${accessToken}`);
-  if (!res.ok) throw new Error(`OAuth license fetch failed: ${res.status}`);
-  return res.json() as Promise<OAuthLicenseResponse>;
-}
-
-async function fetchLicenseDetail(
-  licenseKey: string,
-): Promise<LicenseDetailResponse> {
-  const licenseApiUrl = process.env.PARTNER_LICENSE_API_URL;
-  const apiKey = process.env.PARTNER_API_KEY;
-  if (!licenseApiUrl) throw new Error("PARTNER_LICENSE_API_URL not configured");
-  if (!apiKey) throw new Error("PARTNER_API_KEY not configured");
-
-  const apiKeyHeader = process.env.PARTNER_API_KEY_HEADER;
-  if (!apiKeyHeader) throw new Error("PARTNER_API_KEY_HEADER not configured");
-
-  const res = await fetch(`${licenseApiUrl}/${licenseKey}`, {
-    headers: { [apiKeyHeader]: apiKey },
-  });
-  if (!res.ok) throw new Error(`License detail fetch failed: ${res.status}`);
-  return res.json() as Promise<LicenseDetailResponse>;
-}
-
-export default withRateLimit(
-  { points: 20, duration: 60 },
-  withApiLogging(async (req: NextApiRequest, res: NextApiResponse) => {
-    if (req.method !== "GET") {
-      return res.status(405).json({ message: "Method not allowed" });
-    }
-
-    const { code } = req.query;
-
-    if (!code || typeof code !== "string") {
-      return res.status(200).json({ message: "OK" });
-    }
-
-    let license: LicenseDetailResponse;
-
-    try {
-      const tokenData = await exchangeCodeForToken(code);
-      const oauthLicense = await fetchOAuthLicense(tokenData.access_token);
-      license = await fetchLicenseDetail(oauthLicense.license_key);
-    } catch (err) {
-      log.error({ err }, "Partner OAuth flow failed");
-      return res.redirect(`/partner/activate?error=oauth_failed`);
-    }
-
-    const { db, user } = await createNextApiContext(req);
-
-    const cfg = tierConfig(license.tier);
-    const status = license.status === "active" ? "active" : "inactive";
-
-    // Ensure subscription slots exist — webhook may have already created them
-    const existing = await subscriptionRepo.getAllByPartnerLicenseKey(
-      db,
-      license.license_key,
-    );
-    if (existing.length === 0) {
-      await subscriptionRepo.createPartnerLicenseSlots(
-        db,
-        license.license_key,
-        {
-          plan: cfg.plan,
-          status,
-          partnerTier: license.tier,
-          seats: cfg.seats,
-          unlimitedSeats: cfg.unlimitedSeats,
-        },
-        cfg.workspaceSlots,
-      );
-    }
-
-    if (!user) {
-      return res.redirect(
-        `/partner/activate?license_key=${encodeURIComponent(license.license_key)}`,
-      );
-    }
-
-    return res.redirect(
-      `/api/partner/link?license_key=${encodeURIComponent(license.license_key)}`,
-    );
-  }),
-);
--- a/apps/web/src/pages/api/partner/link.ts
+++ b/apps/web/src/pages/api/partner/link.ts
@@ -1,98 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from "next";
-
-import { createNextApiContext } from "@kan/api/trpc";
-import { withApiLogging } from "@kan/api/utils/apiLogging";
-import { withRateLimit } from "@kan/api/utils/rateLimit";
-import * as subscriptionRepo from "@kan/db/repository/subscription.repo";
-import * as workspaceRepo from "@kan/db/repository/workspace.repo";
-
-export default withRateLimit(
-  { points: 20, duration: 60 },
-  withApiLogging(async (req: NextApiRequest, res: NextApiResponse) => {
-    if (req.method !== "GET") {
-      return res.status(405).json({ message: "Method not allowed" });
-    }
-
-    const { license_key } = req.query;
-
-    if (!license_key || typeof license_key !== "string") {
-      return res.redirect("/boards?partner_error=missing_license");
-    }
-
-    const { db, user } = await createNextApiContext(req);
-
-    if (!user) {
-      return res.redirect(
-        `/login?next=${encodeURIComponent(`/api/partner/link?license_key=${license_key}`)}`,
-      );
-    }
-
-    const allSlots = await subscriptionRepo.getAllByPartnerLicenseKey(
-      db,
-      license_key,
-    );
-
-    if (!allSlots.length) {
-      return res.redirect("/boards?partner_error=invalid_license");
-    }
-
-    const activeSlots = allSlots.filter((s) =>
-      ["active", "trialing"].includes(s.status),
-    );
-
-    if (!activeSlots.length) {
-      return res.redirect("/boards?partner_error=license_inactive");
-    }
-
-    const unlinkedSlot = activeSlots.find((s) => !s.referenceId);
-
-    if (!unlinkedSlot) {
-      return res.redirect("/boards?partner_activated=1");
-    }
-
-    const linkedIds = new Set(
-      activeSlots.filter((s) => s.referenceId).map((s) => s.referenceId!),
-    );
-
-    const memberships = await workspaceRepo.getAllByUserId(db, user.id);
-    const availableWorkspace = memberships
-      .map((m) => m.workspace)
-      .find((w) => w && !w.deletedAt && !linkedIds.has(w.publicId));
-
-    if (!availableWorkspace) {
-      return res.redirect(
-        `/onboarding/workspace?license_key=${encodeURIComponent(license_key)}`,
-      );
-    }
-
-    await subscriptionRepo.updateById(db, unlinkedSlot.id, {
-      referenceId: availableWorkspace.publicId,
-    });
-
-    await workspaceRepo.update(db, availableWorkspace.publicId, {
-      plan: unlinkedSlot.plan as "free" | "team" | "pro" | "enterprise",
-    });
-
-    const remainingUnlinked = activeSlots.filter(
-      (s) => !s.referenceId && s.id !== unlinkedSlot.id,
-    );
-
-    if (remainingUnlinked.length > 0) {
-      const updatedLinkedIds = new Set([
-        ...linkedIds,
-        availableWorkspace.publicId,
-      ]);
-      const hasMoreAvailableWorkspace = memberships
-        .map((m) => m.workspace)
-        .some((w) => w && !w.deletedAt && !updatedLinkedIds.has(w.publicId));
-
-      if (hasMoreAvailableWorkspace) {
-        return res.redirect(
-          `/api/partner/link?license_key=${encodeURIComponent(license_key)}`,
-        );
-      }
-    }
-
-    return res.redirect("/boards?partner_activated=1");
-  }),
-);
--- a/apps/web/src/pages/api/partner/webhook.ts
+++ b/apps/web/src/pages/api/partner/webhook.ts
@@ -1,418 +0,0 @@
-import { createHmac, timingSafeEqual } from "crypto";
-import type { NextApiRequest, NextApiResponse } from "next";
-import type { Readable } from "node:stream";
-
-import type { dbClient } from "@kan/db/client";
-import { createNextApiContext } from "@kan/api/trpc";
-import { withApiLogging } from "@kan/api/utils/apiLogging";
-import { cancelWorkspaceAccess } from "@kan/api/utils/workspace";
-import * as subscriptionRepo from "@kan/db/repository/subscription.repo";
-import * as workspaceRepo from "@kan/db/repository/workspace.repo";
-import { createLogger } from "@kan/logger";
-import { getActiveSubscriptions } from "@kan/shared/utils";
-
-import type { TierConfig } from "./_utils";
-import { tierConfig } from "./_utils";
-
-const log = createLogger("api");
-
-async function createAndLinkSlots(
-  db: dbClient,
-  licenseKey: string,
-  cfg: TierConfig,
-  tier: number,
-  alreadyLinkedReferenceIds: Set<string>,
-  count: number,
-) {
-  const linkedId = [...alreadyLinkedReferenceIds][0];
-  let autoLinked = 0;
-
-  if (linkedId) {
-    const linkedWorkspace = await workspaceRepo.getByPublicId(db, linkedId);
-
-    if (linkedWorkspace?.createdBy) {
-      const owned = await workspaceRepo.getAllOwnedByUserId(
-        db,
-        linkedWorkspace.createdBy,
-      );
-
-      const candidates = owned.filter(
-        (w) => !alreadyLinkedReferenceIds.has(w.publicId),
-      );
-
-      if (candidates.length > 0) {
-        const existingSubs =
-          await subscriptionRepo.getAllActivePartnerSubsByWorkspaceIds(
-            db,
-            candidates.map((w) => w.publicId),
-          );
-        const alreadySubscribed = new Set(
-          existingSubs
-            .map((s) => s.referenceId)
-            .filter((id): id is string => !!id),
-        );
-
-        const available = candidates
-          .filter((w) => !alreadySubscribed.has(w.publicId))
-          .slice(0, count);
-
-        if (available.length > 0) {
-          const newSlots = await subscriptionRepo.createPartnerLicenseSlots(
-            db,
-            licenseKey,
-            {
-              plan: cfg.plan,
-              status: "active",
-              partnerTier: tier,
-              seats: cfg.seats,
-              unlimitedSeats: cfg.unlimitedSeats,
-            },
-            available.length,
-          );
-
-          await Promise.all(
-            available.map((workspace, i) => {
-              const slot = newSlots[i];
-              if (!slot) return;
-              return Promise.all([
-                subscriptionRepo.updateById(db, slot.id, {
-                  referenceId: workspace.publicId,
-                }),
-                workspaceRepo.update(db, workspace.publicId, {
-                  plan: cfg.plan,
-                }),
-              ]);
-            }),
-          );
-
-          autoLinked = available.length;
-        }
-      }
-    }
-  }
-
-  const remaining = count - autoLinked;
-  if (remaining > 0) {
-    await subscriptionRepo.createPartnerLicenseSlots(
-      db,
-      licenseKey,
-      {
-        plan: cfg.plan,
-        status: "active",
-        partnerTier: tier,
-        seats: cfg.seats,
-        unlimitedSeats: cfg.unlimitedSeats,
-      },
-      remaining,
-    );
-  }
-}
-
-async function buffer(readable: Readable) {
-  const chunks: Buffer[] = [];
-  for await (const chunk of readable) {
-    chunks.push(typeof chunk === "string" ? Buffer.from(chunk) : chunk);
-  }
-  return Buffer.concat(chunks);
-}
-
-function verifySignature(
-  rawBody: string,
-  signature: string,
-  timestamp: string,
-): boolean {
-  const secret = process.env.PARTNER_API_KEY;
-  if (!secret) return false;
-
-  const ts = Number(timestamp);
-  if (isNaN(ts) || Date.now() - ts > 300_000) return false;
-
-  const payload = `${timestamp}${rawBody}`;
-  const expected = createHmac("sha256", secret).update(payload).digest("hex");
-
-  try {
-    return timingSafeEqual(Buffer.from(signature), Buffer.from(expected));
-  } catch {
-    return false;
-  }
-}
-
-function hasReferenceId<T extends { referenceId: string | null | undefined }>(
-  s: T,
-): s is T & { referenceId: string } {
-  return !!s.referenceId;
-}
-
-interface WebhookPayload {
-  event:
-    | "purchase"
-    | "activate"
-    | "deactivate"
-    | "upgrade"
-    | "downgrade"
-    | "migrate";
-  license_key: string;
-  license_status: string;
-  tier: number;
-  prev_license_key?: string;
-}
-
-export default withApiLogging(
-  async (req: NextApiRequest, res: NextApiResponse) => {
-    if (req.method !== "POST") {
-      return res.status(405).json({ message: "Method not allowed" });
-    }
-
-    const signatureHeader = process.env.PARTNER_SIGNATURE_HEADER;
-    const timestampHeader = process.env.PARTNER_TIMESTAMP_HEADER;
-
-    if (!signatureHeader || !timestampHeader) {
-      log.error("Webhook signature headers not configured");
-      return res.status(500).json({ message: "Server misconfiguration" });
-    }
-
-    const signature = req.headers[signatureHeader] as string | undefined;
-    const timestamp = req.headers[timestampHeader] as string | undefined;
-
-    if (!signature || !timestamp) {
-      return res.status(400).json({ message: "Missing signature headers" });
-    }
-
-    const buf = await buffer(req as unknown as Readable);
-    const rawBody = buf.toString("utf8");
-
-    if (!verifySignature(rawBody, signature, timestamp)) {
-      return res.status(401).json({ message: "Invalid signature" });
-    }
-
-    const payload = JSON.parse(rawBody) as WebhookPayload;
-    const { event, license_key, license_status, tier, prev_license_key } =
-      payload;
-
-    log.info({ headers: req.headers, payload }, "partner webhook received");
-
-    const { db } = await createNextApiContext(req);
-
-    switch (event) {
-      case "purchase":
-      case "activate": {
-        const cfg = tierConfig(tier);
-        const existing = await subscriptionRepo.getAllByPartnerLicenseKey(
-          db,
-          license_key,
-        );
-        const status = event === "activate" ? "active" : license_status;
-
-        if (existing.length === 0) {
-          await subscriptionRepo.createPartnerLicenseSlots(
-            db,
-            license_key,
-            {
-              plan: cfg.plan,
-              status,
-              partnerTier: tier,
-              seats: cfg.seats,
-              unlimitedSeats: cfg.unlimitedSeats,
-            },
-            cfg.workspaceSlots,
-          );
-        } else {
-          await subscriptionRepo.updateAllByPartnerLicenseKey(db, license_key, {
-            plan: cfg.plan,
-            status,
-            partnerTier: tier,
-            seats: cfg.seats,
-            unlimitedSeats: cfg.unlimitedSeats,
-          });
-        }
-        break;
-      }
-
-      case "deactivate": {
-        const allSlots = await subscriptionRepo.getAllByPartnerLicenseKey(
-          db,
-          license_key,
-        );
-
-        await Promise.all(
-          allSlots.filter(hasReferenceId).map(async (slot) => {
-            const siblingSubs = await subscriptionRepo.getByReferenceId(
-              db,
-              slot.referenceId,
-            );
-            const hasOtherActiveSub = getActiveSubscriptions(siblingSubs).some(
-              (s) => s.id !== slot.id,
-            );
-            if (!hasOtherActiveSub) {
-              await cancelWorkspaceAccess(db, slot.referenceId);
-            }
-          }),
-        );
-
-        await subscriptionRepo.updateAllByPartnerLicenseKey(db, license_key, {
-          plan: "free",
-          status: "canceled",
-          unlimitedSeats: false,
-          seats: null,
-        });
-
-        break;
-      }
-
-      case "upgrade":
-      case "downgrade": {
-        const lookupKey = prev_license_key ?? license_key;
-        const existing = await subscriptionRepo.getAllByPartnerLicenseKey(
-          db,
-          lookupKey,
-        );
-
-        if (existing.length === 0) break;
-
-        const cfg = tierConfig(tier);
-        const newCount = cfg.workspaceSlots;
-
-        // Prefer keeping linked slots; among linked, keep in insertion order (LIFO removal)
-        const preferKeep = [
-          ...existing.filter((s) => s.referenceId),
-          ...existing.filter((s) => !s.referenceId),
-        ];
-
-        const slotsToKeep = preferKeep.slice(0, newCount);
-        const slotsToRemove = preferKeep.slice(newCount);
-
-        await Promise.all([
-          ...slotsToKeep.map((slot) =>
-            subscriptionRepo.updateById(db, slot.id, {
-              plan: cfg.plan,
-              seats: cfg.seats,
-              unlimitedSeats: cfg.unlimitedSeats,
-              partnerTier: tier,
-              status: "active",
-              ...(prev_license_key ? { partnerLicenseKey: license_key } : {}),
-            }),
-          ),
-          ...slotsToKeep
-            .filter(hasReferenceId)
-            .map((s) =>
-              workspaceRepo.update(db, s.referenceId, { plan: cfg.plan }),
-            ),
-        ]);
-
-        if (newCount > existing.length) {
-          const linkedIds = new Set(
-            slotsToKeep.filter(hasReferenceId).map((s) => s.referenceId),
-          );
-          await createAndLinkSlots(
-            db,
-            license_key,
-            cfg,
-            tier,
-            linkedIds,
-            newCount - existing.length,
-          );
-        }
-
-        if (slotsToRemove.length > 0) {
-          await Promise.all([
-            ...slotsToRemove
-              .filter(hasReferenceId)
-              .map((s) => cancelWorkspaceAccess(db, s.referenceId)),
-            ...slotsToRemove.map((s) =>
-              subscriptionRepo.updateById(db, s.id, {
-                plan: "free",
-                status: "inactive",
-                unlimitedSeats: false,
-                seats: null,
-              }),
-            ),
-          ]);
-        }
-
-        break;
-      }
-
-      case "migrate": {
-        if (!prev_license_key) break;
-
-        const existing = await subscriptionRepo.getAllByPartnerLicenseKey(
-          db,
-          prev_license_key,
-        );
-        if (existing.length === 0) break;
-
-        const cfg = tierConfig(tier);
-        const newCount = cfg.workspaceSlots;
-
-        const preferKeep = [
-          ...existing.filter((s) => s.referenceId),
-          ...existing.filter((s) => !s.referenceId),
-        ];
-
-        const slotsToKeep = preferKeep.slice(0, newCount);
-        const slotsToRemove = preferKeep.slice(newCount);
-
-        await Promise.all([
-          ...slotsToKeep.map((slot) =>
-            subscriptionRepo.updateById(db, slot.id, {
-              partnerLicenseKey: license_key,
-              plan: cfg.plan,
-              status: "active",
-              partnerTier: tier,
-              seats: cfg.seats,
-              unlimitedSeats: cfg.unlimitedSeats,
-            }),
-          ),
-          ...slotsToKeep
-            .filter(hasReferenceId)
-            .map((s) =>
-              workspaceRepo.update(db, s.referenceId, { plan: cfg.plan }),
-            ),
-        ]);
-
-        if (newCount > existing.length) {
-          const linkedIds = new Set(
-            slotsToKeep.filter(hasReferenceId).map((s) => s.referenceId),
-          );
-          await createAndLinkSlots(
-            db,
-            license_key,
-            cfg,
-            tier,
-            linkedIds,
-            newCount - existing.length,
-          );
-        }
-
-        if (slotsToRemove.length > 0) {
-          await Promise.all([
-            ...slotsToRemove
-              .filter(hasReferenceId)
-              .map((s) => cancelWorkspaceAccess(db, s.referenceId)),
-            ...slotsToRemove.map((s) =>
-              subscriptionRepo.updateById(db, s.id, {
-                plan: "free",
-                status: "inactive",
-                unlimitedSeats: false,
-                seats: null,
-              }),
-            ),
-          ]);
-        }
-
-        break;
-      }
-
-      default:
-        log.warn({ event }, "Unhandled partner webhook event");
-    }
-
-    return res.status(200).json({ success: true, event });
-  },
-);
-
-export const config = {
-  api: {
-    bodyParser: false,
-  },
-};
--- a/apps/web/src/pages/api/stripe/create_billing_session.ts
+++ b/apps/web/src/pages/api/stripe/create_billing_session.ts
@@ -2,34 +2,34 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import { env } from "next-runtime-env";

 import { createNextApiContext } from "@kan/api/trpc";
-import { withApiLogging } from "@kan/api/utils/apiLogging";
-import { withRateLimit } from "@kan/api/utils/rateLimit";
 import { createStripeClient } from "@kan/stripe";
+import { withRateLimit } from "@kan/api/utils/rateLimit";

 export default withRateLimit(
  { points: 100, duration: 60 },
-  withApiLogging(async (req: NextApiRequest, res: NextApiResponse) => {
-    const stripe = createStripeClient();
+  async (req: NextApiRequest, res: NextApiResponse) => {
+  const stripe = createStripeClient();

-    if (req.method !== "POST") {
-      return res.status(405).json({ error: "Method not allowed" });
+  if (req.method !== "POST") {
+    return res.status(405).json({ error: "Method not allowed" });
+  }
+
+  try {
+    const { user } = await createNextApiContext(req);
+
+    if (!user?.stripeCustomerId) {
+      return res.status(404).json({ error: "No billing account found" });
    }

-    try {
-      const { user } = await createNextApiContext(req);
+    const session = await stripe.billingPortal.sessions.create({
+      customer: user.stripeCustomerId,
+      return_url: `${env("NEXT_PUBLIC_BASE_URL")}/settings`,
+    });

-      if (!user?.stripeCustomerId) {
-        return res.status(404).json({ error: "No billing account found" });
-      }
-
-      const session = await stripe.billingPortal.sessions.create({
-        customer: user.stripeCustomerId,
-        return_url: `${env("NEXT_PUBLIC_BASE_URL")}/settings`,
-      });
-
-      return res.status(200).json({ url: session.url });
-    } catch (error) {
-      return res.status(500).json({ error: "Error creating portal session" });
-    }
-  }),
+    return res.status(200).json({ url: session.url });
+  } catch (error) {
+    console.error("Error:", error);
+    return res.status(500).json({ error: "Error creating portal session" });
+  }
+  },
 );
--- a/apps/web/src/pages/api/stripe/create_checkout_session.ts
+++ b/apps/web/src/pages/api/stripe/create_checkout_session.ts
@@ -3,13 +3,10 @@ import { env } from "next-runtime-env";
 import { z } from "zod";

 import { createNextApiContext } from "@kan/api/trpc";
-import { withApiLogging } from "@kan/api/utils/apiLogging";
-import { assertPermission } from "@kan/api/utils/permissions";
-import { withRateLimit } from "@kan/api/utils/rateLimit";
 import * as subscriptionRepo from "@kan/db/repository/subscription.repo";
 import * as workspaceRepo from "@kan/db/repository/workspace.repo";
-import { generateUID } from "@kan/shared/utils";
 import { createStripeClient } from "@kan/stripe";
+import { withRateLimit } from "@kan/api/utils/rateLimit";

 const workspaceSlugSchema = z
  .string()
@@ -20,24 +17,21 @@ const workspaceSlugSchema = z
 interface CheckoutSessionRequest {
  successUrl: string;
  cancelUrl: string;
-  plan: "team" | "pro";
-  billing?: string;
-  workspacePublicId?: string;
-  slug?: string;
-  workspaceName?: string;
-  workspaceDescription?: string;
-  workspaceSlug?: string;
+  slug: string;
+  workspacePublicId: string;
+  stripeCustomerId: string;
 }

 export default withRateLimit(
  { points: 100, duration: 60 },
-  withApiLogging(async (req: NextApiRequest, res: NextApiResponse) => {
-    const stripe = createStripeClient();
+  async (req: NextApiRequest, res: NextApiResponse) => {
+  const stripe = createStripeClient();

-    if (req.method !== "POST") {
-      return res.status(405).json({ error: "Method not allowed" });
-    }
+  if (req.method !== "POST") {
+    return res.status(405).json({ error: "Method not allowed" });
+  }

+  try {
    const { user, db } = await createNextApiContext(req);

    if (!user) {
@@ -45,107 +39,81 @@ export default withRateLimit(
    }

    const body = req.body as CheckoutSessionRequest;
-    const {
-      successUrl,
-      cancelUrl,
-      plan,
-      billing,
-      workspacePublicId,
-      slug,
-      workspaceName,
-      workspaceDescription,
-      workspaceSlug,
-    } = body;
+    const { successUrl, cancelUrl, slug, workspacePublicId } = body;

-    if (!successUrl || !cancelUrl || !plan) {
+    if (!successUrl || !cancelUrl || !workspacePublicId) {
      return res.status(400).json({ error: "Missing required fields" });
    }

-    if (!workspacePublicId && !workspaceName) {
-      return res
-        .status(400)
-        .json({ error: "Must provide workspacePublicId or workspaceName" });
-    }
+    if (slug) {
+      const slugResult = workspaceSlugSchema.safeParse(slug);

-    const resolvedSlug = slug ?? workspaceSlug;
-
-    if (resolvedSlug) {
-      const slugResult = workspaceSlugSchema.safeParse(resolvedSlug);
      if (!slugResult.success) {
-        return res.status(400).json({ error: "Invalid workspace slug" });
+        return new Response(
+          JSON.stringify({ error: "Invalid workspace slug" }),
+          {
+            status: 400,
+            headers: { "Content-Type": "application/json" },
+          },
+        );
      }
    }

-    let resolvedWorkspacePublicId = workspacePublicId;
-    let subscriptionId: number | undefined;
+    const workspace = await workspaceRepo.getAllByUserId(db, user.id);

-    if (workspacePublicId) {
-      // Existing workspace upgrade
-      const workspace = await workspaceRepo.getByPublicId(
-        db,
-        workspacePublicId,
-      );
+    const isMemberOfWorkspace = workspace.some(
+      ({ workspace }) => workspace.publicId === body.workspacePublicId,
+    );

-      if (!workspace) {
-        return res.status(404).json({ error: "Workspace not found" });
-      }
-
-      try {
-        await assertPermission(db, user.id, workspace.id, "workspace:manage");
-      } catch {
-        return res.status(403).json({ error: "Unauthorized" });
-      }
-
-      const subscription = await subscriptionRepo.create(db, {
-        plan: plan,
-        referenceId: workspacePublicId,
-        userId: user.id,
-        stripeCustomerId: user.stripeCustomerId ?? "",
-        status: "incomplete",
+    if (!isMemberOfWorkspace) {
+      return new Response(JSON.stringify({ error: "Unauthorized" }), {
+        status: 403,
+        headers: { "Content-Type": "application/json" },
      });
-
-      subscriptionId = subscription?.id;
-
-      if (!subscriptionId) {
-        return res.status(500).json({ error: "Error creating subscription" });
-      }
-    } else {
-      resolvedWorkspacePublicId = generateUID();
    }

-    const isTeam = body.plan === "team";
-    const annualPriceId = isTeam
-      ? (process.env.STRIPE_TEAM_PLAN_YEARLY_PRICE_ID ??
-        process.env.STRIPE_TEAM_PLAN_MONTHLY_PRICE_ID)
-      : (process.env.STRIPE_PRO_PLAN_YEARLY_PRICE_ID ??
-        process.env.STRIPE_PRO_PLAN_MONTHLY_PRICE_ID);
-    const monthlyPriceId = isTeam
-      ? process.env.STRIPE_TEAM_PLAN_MONTHLY_PRICE_ID
-      : process.env.STRIPE_PRO_PLAN_MONTHLY_PRICE_ID;
-    const priceId = billing === "annual" ? annualPriceId : monthlyPriceId;
+    const subscription = await subscriptionRepo.create(db, {
+      plan: "pro",
+      referenceId: workspacePublicId,
+      userId: user.id,
+      stripeCustomerId: user.stripeCustomerId ?? "",
+      status: "incomplete",
+    });
+
+    const subscriptionId = subscription?.id;
+
+    if (!subscriptionId) {
+      return res.status(500).json({ error: "Error creating subscription" });
+    }

    const session = await stripe.checkout.sessions.create({
      mode: "subscription",
      payment_method_collection: "always",
-      line_items: [{ price: priceId, quantity: 1 }],
-      subscription_data: { trial_period_days: 14 },
-      success_url: `${env("NEXT_PUBLIC_BASE_URL")}${successUrl}?workspacePublicId=${resolvedWorkspacePublicId}`,
+      line_items: [
+        {
+          price: process.env.STRIPE_PRO_PLAN_MONTHLY_PRICE_ID,
+          quantity: 1,
+        },
+      ],
+      subscription_data: {
+        trial_period_days: 14,
+      },
+      success_url: `${env("NEXT_PUBLIC_BASE_URL")}${successUrl}`,
      cancel_url: `${env("NEXT_PUBLIC_BASE_URL")}${cancelUrl}`,
-      client_reference_id: resolvedWorkspacePublicId,
+      client_reference_id: workspacePublicId,
      customer: user.stripeCustomerId ?? undefined,
      metadata: {
-        workspacePublicId: resolvedWorkspacePublicId!,
+        ...(slug && { workspaceSlug: slug }),
+        workspacePublicId,
        userId: user.id,
-        userEmail: user.email ?? "",
-        ...(resolvedSlug && { workspaceSlug: resolvedSlug }),
-        ...(workspaceName && { workspaceName }),
-        ...(workspaceDescription && { workspaceDescription }),
-        ...(subscriptionId && { subscriptionId: String(subscriptionId) }),
-        plan: plan,
-        isNewWorkspace: workspaceName ? "true" : "false",
+        subscriptionId,
      },
    });

    return res.status(200).json({ url: session.url });
-  }),
+  } catch (error) {
+    console.error("Error:", error);
+    return res.status(500).json({ error: "Error creating checkout session" });
+  }
+  },
 );
--- a/apps/web/src/pages/api/stripe/webhook.ts
+++ b/apps/web/src/pages/api/stripe/webhook.ts
@@ -1,15 +1,10 @@
-import { randomUUID } from "crypto";
 import type { NextApiRequest, NextApiResponse } from "next";
 import type { Readable } from "node:stream";

 import { createNextApiContext } from "@kan/api/trpc";
-import * as subscriptionRepo from "@kan/db/repository/subscription.repo";
 import * as workspaceRepo from "@kan/db/repository/workspace.repo";
-import { createLogger } from "@kan/logger";
 import { createStripeClient } from "@kan/stripe";

-const log = createLogger("api");
-
 async function buffer(readable: Readable) {
  const chunks = [];
  for await (const chunk of readable) {
@@ -23,9 +18,6 @@ export default async function handler(
  res: NextApiResponse,
 ) {
  const stripe = createStripeClient();
-  const start = Date.now();
-  const requestId = randomUUID();
-  const procedure = req.url?.split("?")[0] ?? "/api/stripe/webhook";

  if (req.method !== "POST") {
    return res.status(405).json({ message: "Method not allowed" });
@@ -52,85 +44,24 @@ export default async function handler(
    switch (event.type) {
      case "checkout.session.completed": {
        const checkoutSession = event.data.object;
-        const meta = checkoutSession.metadata;

-        if (!meta?.workspacePublicId) break;
+        const metaData = checkoutSession.metadata;

-        const plan = meta.plan === "team" ? "team" : ("pro" as const);
-
-        if (
-          meta.isNewWorkspace === "true" &&
-          meta.workspaceName &&
-          meta.userId &&
-          meta.userEmail
-        ) {
-          const existing = await workspaceRepo.getByPublicId(
-            db,
-            meta.workspacePublicId,
-          );
-
-          if (!existing) {
-            const slug = meta.workspaceSlug ?? meta.workspacePublicId;
-
-            await workspaceRepo.create(db, {
-              publicId: meta.workspacePublicId,
-              name: meta.workspaceName,
-              slug,
-              plan,
-              createdBy: meta.userId,
-              createdByEmail: meta.userEmail,
-              ...(meta.workspaceDescription && {
-                description: meta.workspaceDescription,
-              }),
-            });
-
-            await subscriptionRepo.create(db, {
-              plan,
-              referenceId: meta.workspacePublicId,
-              userId: meta.userId,
-              stripeCustomerId: checkoutSession.customer as string,
-              status: "active",
-            });
-          }
-        } else {
-          await workspaceRepo.update(db, meta.workspacePublicId, {
-            plan,
-            ...(plan === "pro" &&
-              meta.workspaceSlug && { slug: meta.workspaceSlug }),
+        if (metaData?.workspacePublicId) {
+          await workspaceRepo.update(db, metaData.workspacePublicId, {
+            ...(metaData.workspaceSlug && { slug: metaData.workspaceSlug }),
+            plan: "pro",
          });
        }
-
        break;
      }
      default:
-        log.warn({ eventType: event.type }, "Unhandled Stripe event type");
+        console.log(`Unhandled event type: ${event.type}`);
    }

-    log.info(
-      {
-        requestId,
-        procedure,
-        transport: "rest",
-        duration: Date.now() - start,
-        status: 200,
-        input: { eventType: event.type, eventId: event.id },
-      },
-      "API OK",
-    );
-
    return res.status(200).json({ received: true });
  } catch (err) {
-    log.error(
-      {
-        requestId,
-        procedure,
-        transport: "rest",
-        duration: Date.now() - start,
-        status: 400,
-        err,
-      },
-      "API error",
-    );
+    console.error("Webhook error:", err);
    return res.status(400).json({ message: "Webhook handler failed" });
  }
 }
--- a/apps/web/src/pages/api/trello/authenticate.ts
+++ b/apps/web/src/pages/api/trello/authenticate.ts
@@ -1,58 +1,52 @@
 import type { NextApiRequest, NextApiResponse } from "next";
-import { addYears } from "date-fns";

 import { createNextApiContext } from "@kan/api/trpc";
-import { withApiLogging } from "@kan/api/utils/apiLogging";
-import { withRateLimit } from "@kan/api/utils/rateLimit";
 import { integrations } from "@kan/db/schema";
+import { addYears } from "date-fns";
+import { withRateLimit } from "@kan/api/utils/rateLimit";

 export default withRateLimit(
  { points: 100, duration: 60 },
-  withApiLogging(async (req: NextApiRequest, res: NextApiResponse) => {
-    if (req.method !== "POST") {
-      return res.status(405).json({ message: "Method not allowed" });
-    }
+  async (req: NextApiRequest, res: NextApiResponse) => {
+  if (req.method !== "POST") {
+    return res.status(405).json({ message: "Method not allowed" });
+  }

-    const { user } = await createNextApiContext(req);
+  const { user } = await createNextApiContext(req);

-    if (!user)
-      return res.status(401).json({ message: "User not authenticated" });
+  if (!user)
+    return res.status(401).json({ message: "User not authenticated" });

-    const apiKey = process.env.TRELLO_APP_API_KEY;
+  const apiKey = process.env.TRELLO_APP_API_KEY;

-    if (!apiKey)
-      return res
-        .status(500)
-        .json({ message: "Trello API key not set in Environment Variables" });
+  if (!apiKey)
+    return res.status(500).json({ message: "Trello API key not set in Environment Variables" });

-    const token = req.body.token;
+  const token = req.body.token;

-    if (!token) return res.status(400).json({ message: "No token found" });
+  if (!token)
+    return res.status(400).json({ message: "No token found" });

-    try {
-      const { db } = await createNextApiContext(req);
+  try {
+    const { db } = await createNextApiContext(req);

-      await db
-        .insert(integrations)
-        .values({
-          provider: "trello",
-          userId: user.id,
-          accessToken: token,
-          expiresAt: addYears(new Date(), 1),
-        })
-        .onConflictDoUpdate({
-          set: {
-            accessToken: token,
-            expiresAt: addYears(new Date(), 1),
-          },
-          target: [integrations.userId, integrations.provider],
-        });
+    await db.insert(integrations).values({
+      provider: "trello",
+      userId: user.id,
+      accessToken: token,
+      expiresAt: addYears(new Date(), 1),
+    }).onConflictDoUpdate({
+      set: {
+        accessToken: token,
+        expiresAt: addYears(new Date(), 1),
+      },
+      target: [integrations.userId, integrations.provider],
+    });

-      return res
-        .status(200)
-        .json({ message: "Trello authentication successful" });
-    } catch (err) {
-      return res.status(400).json({ message: "Trello authentication failed" });
-    }
-  }),
-);
+    return res.status(200).json({ message: "Trello authentication successful" });
+  } catch (err) {
+    console.error("Trello authentication error:", err);
+    return res.status(400).json({ message: "Trello authentication failed" });
+  }
+  },
+);
--- a/apps/web/src/pages/api/unsubscribe.ts
+++ b/apps/web/src/pages/api/unsubscribe.ts
@@ -0,0 +1,105 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+import { Novu } from "@novu/api";
+import { jwtVerify } from "jose";
+import { z } from "zod";
+
+import { env } from "~/env";
+import { withRateLimit } from "@kan/api/utils/rateLimit";
+
+const requestSchema = z.object({
+  token: z.string().min(1),
+});
+
+const tokenPayloadSchema = z.object({
+  subscriberId: z.string(),
+});
+
+type ResponseData =
+  | { success: true }
+  | { success: false; error: string; code?: string };
+
+const textEncoder = new TextEncoder();
+
+export default withRateLimit(
+  { points: 100, duration: 60 },
+  async (req: NextApiRequest, res: NextApiResponse<ResponseData>) => {
+  if (process.env.NEXT_PUBLIC_KAN_ENV !== "cloud") {
+    return res.status(404).json({
+      success: false,
+      error: "Unsubscribe endpoint is not available.",
+      code: "UNAVAILABLE",
+    });
+  }
+
+  if (req.method !== "POST") {
+    res.setHeader("Allow", "POST");
+    return res.status(405).json({
+      success: false,
+      error: "Method not allowed.",
+      code: "METHOD_NOT_ALLOWED",
+    });
+  }
+
+  const parsedBody = requestSchema.safeParse(req.body);
+
+  if (!parsedBody.success) {
+    return res.status(400).json({
+      success: false,
+      error: "Invalid request payload.",
+      code: "BAD_REQUEST",
+    });
+  }
+
+  if (!env.EMAIL_UNSUBSCRIBE_SECRET || !env.NOVU_API_KEY) {
+    return res.status(500).json({
+      success: false,
+      error: "Unsubscribe service is not configured.",
+      code: "NOT_CONFIGURED",
+    });
+  }
+
+  let payload: z.infer<typeof tokenPayloadSchema>;
+
+  try {
+    const verified = await jwtVerify(
+      parsedBody.data.token,
+      textEncoder.encode(env.EMAIL_UNSUBSCRIBE_SECRET),
+      {
+        // We intentionally do not use exp/iat claims –
+        // tokens are long-lived and validated only by signature + payload.
+        clockTolerance: "0s",
+      },
+    );
+    payload = tokenPayloadSchema.parse(verified.payload);
+  } catch {
+    return res.status(401).json({
+      success: false,
+      error: "Your unsubscribe link is invalid or has expired.",
+      code: "INVALID_TOKEN",
+    });
+  }
+
+  const novu = new Novu({ secretKey: env.NOVU_API_KEY });
+
+  try {
+    await novu.subscribers.preferences.update(
+      {
+        channels: {
+          email: false,
+        },
+      },
+      payload.subscriberId,
+    );
+  } catch (error) {
+    console.error("Failed to update Novu preferences", error);
+    return res.status(502).json({
+      success: false,
+      error:
+        "We could not update your email preferences right now. Please try again later.",
+      code: "NOVU_ERROR",
+    });
+  }
+
+  return res.status(200).json({ success: true });
+  },
+);
--- a/apps/web/src/pages/api/upload/attachment.ts
+++ b/apps/web/src/pages/api/upload/attachment.ts
@@ -2,7 +2,6 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import { Upload } from "@aws-sdk/lib-storage";

 import { createNextApiContext } from "@kan/api/trpc";
-import { withApiLogging } from "@kan/api/utils/apiLogging";
 import { assertPermission } from "@kan/api/utils/permissions";
 import { withRateLimit } from "@kan/api/utils/rateLimit";
 import * as cardRepo from "@kan/db/repository/card.repo";
@@ -23,7 +22,7 @@ export const config = {

 export default withRateLimit(
  { points: 100, duration: 60 },
-  withApiLogging(async (req: NextApiRequest, res: NextApiResponse) => {
+  async (req: NextApiRequest, res: NextApiResponse) => {
    if (req.method !== "POST") {
      return res.status(405).json({ error: "Method not allowed" });
    }
@@ -37,9 +36,7 @@ export default withRateLimit(

      const bucket = env.NEXT_PUBLIC_ATTACHMENTS_BUCKET_NAME;
      if (!bucket) {
-        return res
-          .status(500)
-          .json({ error: "Attachments bucket not configured" });
+        return res.status(500).json({ error: "Attachments bucket not configured" });
      }

      const cardPublicId = req.query.cardPublicId;
@@ -58,24 +55,15 @@ export default withRateLimit(
      }

      if (!Number.isFinite(contentLength) || contentLength <= 0) {
-        return res
-          .status(400)
-          .json({ error: "Missing or invalid content length" });
+        return res.status(400).json({ error: "Missing or invalid content length" });
      }

      if (contentLength > MAX_SIZE_BYTES) {
        return res.status(400).json({ error: "File too large" });
      }

-      const rawFilenameHeader =
+      const originalFilenameHeader =
        (req.headers["x-original-filename"] as string | undefined) ?? "file";
-      const originalFilenameHeader = (() => {
-        try {
-          return decodeURIComponent(rawFilenameHeader);
-        } catch {
-          return rawFilenameHeader;
-        }
-      })();

      const sanitizedFilename = originalFilenameHeader
        .replace(/[^a-zA-Z0-9._-]/g, "_")
@@ -141,7 +129,8 @@ export default withRateLimit(

      return res.status(200).json({ attachment });
    } catch (error) {
+      console.error("Attachment upload failed", error);
      return res.status(500).json({ error: "Internal server error" });
    }
-  }),
+  },
 );
--- a/apps/web/src/pages/api/upload/avatar.ts
+++ b/apps/web/src/pages/api/upload/avatar.ts
@@ -2,17 +2,13 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import { PutObjectCommand } from "@aws-sdk/client-s3";

 import { createNextApiContext } from "@kan/api/trpc";
-import { withApiLogging } from "@kan/api/utils/apiLogging";
-import { withRateLimit } from "@kan/api/utils/rateLimit";
 import * as userRepo from "@kan/db/repository/user.repo";
-import { createS3Client } from "@kan/shared/utils";

 import { env } from "~/env";
+import { withRateLimit } from "@kan/api/utils/rateLimit";
+import { createS3Client } from "@kan/shared/utils";

-const MAX_SIZE_BYTES = parseInt(
-  process.env.S3_AVATAR_UPLOAD_LIMIT || "2097152",
-  10,
-); // Default 2MB
+const MAX_SIZE_BYTES = 2 * 1024 * 1024; // 2MB
 const allowedContentTypes = ["image/jpeg", "image/png", "image/webp"];

 export const config = {
@@ -23,7 +19,7 @@ export const config = {

 export default withRateLimit(
  { points: 100, duration: 60 },
-  withApiLogging(async (req: NextApiRequest, res: NextApiResponse) => {
+  async (req: NextApiRequest, res: NextApiResponse) => {
    if (req.method !== "POST") {
      return res.status(405).json({ error: "Method not allowed" });
    }
@@ -55,24 +51,15 @@ export default withRateLimit(
      }

      if (!Number.isFinite(contentLength) || contentLength <= 0) {
-        return res
-          .status(400)
-          .json({ error: "Missing or invalid content length" });
+        return res.status(400).json({ error: "Missing or invalid content length" });
      }

      if (contentLength > MAX_SIZE_BYTES) {
        return res.status(400).json({ error: "File too large" });
      }

-      const rawFilenameHeader =
+      const originalFilenameHeader =
        (req.headers["x-original-filename"] as string | undefined) ?? "file";
-      const originalFilenameHeader = (() => {
-        try {
-          return decodeURIComponent(rawFilenameHeader);
-        } catch {
-          return rawFilenameHeader;
-        }
-      })();

      const sanitizedFilename = originalFilenameHeader
        .replace(/[^a-zA-Z0-9._-]/g, "_")
@@ -106,7 +93,9 @@ export default withRateLimit(
        user: updatedUser,
      });
    } catch (error) {
+      console.error("Avatar upload failed", error);
      return res.status(500).json({ error: "Internal server error" });
    }
-  }),
+  },
 );
+
--- a/apps/web/src/pages/onboarding/select-plan.tsx
+++ b/apps/web/src/pages/onboarding/select-plan.tsx
@@ -1,31 +0,0 @@
-import { useRouter } from "next/navigation";
-import { useEffect } from "react";
-import { env } from "next-runtime-env";
-
-import { authClient } from "@kan/auth/client";
-
-import { PageHead } from "~/components/PageHead";
-import SelectPlanView from "~/views/onboarding/select-plan";
-
-export default function SelectPlanPage() {
-  const router = useRouter();
-  const { data: session, isPending } = authClient.useSession();
-
-  useEffect(() => {
-    if (!isPending && !session?.user) {
-      router.push("/login");
-    }
-    if (!isPending && env("NEXT_PUBLIC_KAN_ENV") !== "cloud") {
-      router.push("/boards");
-    }
-  }, [session, isPending, router]);
-
-  if (isPending || !session?.user) return null;
-
-  return (
-    <>
-      <PageHead title="Select plan | kan.bn" />
-      <SelectPlanView />
-    </>
-  );
-}
--- a/apps/web/src/pages/onboarding/workspace.tsx
+++ b/apps/web/src/pages/onboarding/workspace.tsx
@@ -1,28 +0,0 @@
-import { useRouter } from "next/navigation";
-import { env } from "next-runtime-env";
-import { useEffect } from "react";
-
-import { authClient } from "@kan/auth/client";
-
-import { PageHead } from "~/components/PageHead";
-import WorkspaceDetailsView from "~/views/onboarding/workspace-details";
-
-export default function WorkspaceDetailsPage() {
-  const router = useRouter();
-  const { data: session, isPending } = authClient.useSession();
-
-  useEffect(() => {
-    if (!isPending && !session?.user) router.push("/login");
-    if (!isPending && env("NEXT_PUBLIC_KAN_ENV") !== "cloud")
-      router.push("/boards");
-  }, [session, isPending, router]);
-
-  if (isPending || !session?.user) return null;
-
-  return (
-    <>
-      <PageHead title="Create workspace | kan.bn" />
-      <WorkspaceDetailsView />
-    </>
-  );
-}
--- a/apps/web/src/pages/partner/activate.tsx
+++ b/apps/web/src/pages/partner/activate.tsx
@@ -1,117 +0,0 @@
-import Link from "next/link";
-import { useRouter, useSearchParams } from "next/navigation";
-import { t } from "@lingui/core/macro";
-import { Trans } from "@lingui/react/macro";
-import { env } from "next-runtime-env";
-import { useEffect, useState } from "react";
-
-import { authClient } from "@kan/auth/client";
-
-import { Auth } from "~/components/AuthForm";
-import { PageHead } from "~/components/PageHead";
-import PatternedBackground from "~/components/PatternedBackground";
-
-export default function PartnerActivatePage() {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-  const licenseKey = searchParams.get("license_key");
-  const error = searchParams.get("error");
-
-  const partnerName = env("NEXT_PUBLIC_PARTNER_NAME");
-
-  const { data: session, isPending } = authClient.useSession();
-  const [isMagicLinkSent, setIsMagicLinkSent] = useState(false);
-  const [magicLinkRecipient, setMagicLinkRecipient] = useState("");
-
-  useEffect(() => {
-    if (licenseKey) {
-      localStorage.setItem("partnerLicenseKey", licenseKey);
-    }
-  }, [licenseKey]);
-
-  useEffect(() => {
-    if (!isPending && session?.user && licenseKey) {
-      router.push(
-        `/api/partner/link?license_key=${encodeURIComponent(licenseKey)}`,
-      );
-    } else if (!isPending && session?.user && !licenseKey) {
-      router.push("/boards");
-    }
-  }, [session, isPending, licenseKey, router]);
-
-  if (isPending || (session?.user && licenseKey)) return null;
-
-  return (
-    <>
-      <PageHead title={t`Activate | kan.bn`} />
-      <main className="h-screen bg-light-100 pt-20 dark:bg-dark-50 sm:pt-0">
-        <div className="justify-top flex h-full flex-col items-center px-4 sm:justify-center">
-          <div className="z-10 flex w-full flex-col items-center">
-            <Link href="/">
-              <h1 className="mb-6 text-lg font-bold tracking-tight text-light-1000 dark:text-dark-1000">
-                kan.bn
-              </h1>
-            </Link>
-            <p className="mb-2 text-3xl font-bold tracking-tight text-light-1000 dark:text-dark-1000">
-              {isMagicLinkSent ? t`Check your inbox` : t`Activate your account`}
-            </p>
-            <p className="mb-10 text-sm text-light-800 dark:text-dark-800">
-              {isMagicLinkSent ? (
-                <Trans>We sent a link to {magicLinkRecipient}</Trans>
-              ) : partnerName ? (
-                <Trans>
-                  Sign in or create an account to activate your {partnerName}{" "}
-                  license
-                </Trans>
-              ) : (
-                t`Sign in or create an account to activate your license`
-              )}
-            </p>
-
-            {error && (
-              <div className="mb-4 w-full rounded-md bg-red-50 px-4 py-3 text-sm text-red-700 dark:bg-red-900/20 dark:text-red-400 sm:max-w-md">
-                {t`Something went wrong during activation. Please try again.`}
-              </div>
-            )}
-
-            {!isMagicLinkSent && (
-              <div className="w-full rounded-lg border border-light-500 bg-light-300 px-4 py-10 dark:border-dark-400 dark:bg-dark-200 sm:max-w-md lg:px-10">
-                <div className="sm:mx-auto sm:w-full sm:max-w-sm">
-                  <Auth
-                    setIsMagicLinkSent={(val, recipient) => {
-                      setIsMagicLinkSent(val);
-                      setMagicLinkRecipient(recipient);
-                    }}
-                    callbackURL={
-                      licenseKey
-                        ? `/api/partner/link?license_key=${encodeURIComponent(licenseKey)}`
-                        : "/boards"
-                    }
-                  />
-                </div>
-              </div>
-            )}
-
-            <p className="mt-4 text-sm text-light-1000 dark:text-dark-1000">
-              <Trans>
-                Already have an account?{" "}
-                <span className="underline">
-                  <Link
-                    href={
-                      licenseKey
-                        ? `/login?next=${encodeURIComponent(`/api/partner/link?license_key=${licenseKey}`)}`
-                        : "/login"
-                    }
-                  >
-                    Sign in
-                  </Link>
-                </span>
-              </Trans>
-            </p>
-          </div>
-          <PatternedBackground />
-        </div>
-      </main>
-    </>
-  );
-}
--- a/apps/web/src/pages/settings/trello/authorize.tsx
+++ b/apps/web/src/pages/settings/trello/authorize.tsx
@@ -1,25 +1,24 @@
 import { useEffect } from "react";

 export default function TrelloAuthorize() {
-  useEffect(() => {
-    const hash = window.location.hash;
-    const token = hash.split("=")[1];
-    if (token) {
-      fetch("/api/trello/authenticate", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ token }),
-      }).then(() => {
-        window.close();
-      });
-    }
-  }, []);
+    useEffect(() => {
+        const hash = window.location.hash;
+        const token = hash.split("=")[1];
+        if (token) {
+            console.log("Posting token to /api/trello/authenticate", token);
+            fetch("/api/trello/authenticate", {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                body: JSON.stringify({ token }),
+            }).then(() => {
+                window.close();
+            });
+        }
+    }, []);

-  return (
-    <div className="flex h-[200px] items-center justify-center">
-      <p className="text-center">Connecting to Trello...</p>
-    </div>
-  );
-}
+    return <div className="flex h-[200px] items-center justify-center">
+        <p className="text-center">Connecting to Trello...</p>
+    </div>;
+}
--- a/apps/web/src/pages/settings/webhooks.tsx
+++ b/apps/web/src/pages/settings/webhooks.tsx
@@ -1,16 +0,0 @@
-import type { NextPageWithLayout } from "~/pages/_app";
-import { getDashboardLayout } from "~/components/Dashboard";
-import { SettingsLayout } from "~/components/SettingsLayout";
-import WebhookSettings from "~/views/settings/WebhookSettings";
-
-const WebhookSettingsPage: NextPageWithLayout = () => {
-  return (
-    <SettingsLayout currentTab="webhooks">
-      <WebhookSettings />
-    </SettingsLayout>
-  );
-};
-
-WebhookSettingsPage.getLayout = (page) => getDashboardLayout(page);
-
-export default WebhookSettingsPage;
--- a/apps/web/src/pages/unsubscribe/index.tsx
+++ b/apps/web/src/pages/unsubscribe/index.tsx
@@ -0,0 +1,110 @@
+import { useRouter } from "next/router";
+import { t } from "@lingui/core/macro";
+import { useEffect, useState } from "react";
+
+import Button from "~/components/Button";
+import { PageHead } from "~/components/PageHead";
+import PatternedBackground from "~/components/PatternedBackground";
+
+type UnsubscribeStatus = "idle" | "processing" | "success" | "error";
+
+export default function UnsubscribePage() {
+  const router = useRouter();
+  const [token, setToken] = useState("");
+  const [status, setStatus] = useState<UnsubscribeStatus>("idle");
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
+
+  useEffect(() => {
+    if (!router.isReady) return;
+    const value = router.query.token;
+    if (typeof value === "string") {
+      setToken(value);
+    } else if (Array.isArray(value)) {
+      setToken(value[0] ?? "");
+    } else {
+      setToken("");
+    }
+  }, [router.isReady, router.query.token]);
+
+  const handleUnsubscribe = async () => {
+    if (!token) {
+      setStatus("error");
+      setErrorMessage(
+        t`Your unsubscribe link is missing a token. Please open the latest email and try again.`,
+      );
+      return;
+    }
+
+    setStatus("processing");
+    setErrorMessage(null);
+
+    try {
+      const response = await fetch("/api/unsubscribe", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ token }),
+      });
+
+      if (!response.ok) {
+        const payload = (await response.json().catch(() => null)) as {
+          error?: string;
+        } | null;
+
+        throw new Error(
+          payload?.error ??
+            "We couldn't update your preferences. Please try again.",
+        );
+      }
+
+      setStatus("success");
+    } catch (error) {
+      setStatus("error");
+      setErrorMessage(
+        t`We couldn't update your preferences. Please try again.`,
+      );
+    }
+  };
+
+  const title = t`Unsubscribe`;
+
+  return (
+    <>
+      <PageHead title={`${title} | kan.bn`} />
+      <div className="relative flex min-h-screen items-center justify-center px-4 py-12 sm:px-6 lg:px-8">
+        <PatternedBackground />
+        <div className="z-10 w-full max-w-md space-y-6">
+          <div>
+            <h1 className="mt-6 text-center text-3xl font-bold tracking-tight text-light-1000 dark:text-dark-1000">
+              {t`Do you want to unsubscribe?`}
+            </h1>
+            <p className="mt-4 text-center text-sm text-light-900 dark:text-dark-800">
+              {t`Confirm your email preferences:`}
+            </p>
+          </div>
+
+          <div className="flex justify-center">
+            <Button
+              onClick={handleUnsubscribe}
+              disabled={status === "success"}
+              isLoading={status === "processing"}
+              variant="primary"
+              size="md"
+            >
+              {t`Unsubscribe`}
+            </Button>
+          </div>
+          {status === "success" && (
+            <p className="text-center text-sm text-light-900 dark:text-dark-800">
+              {t`You have been unsubscribed!`}
+            </p>
+          )}
+          {status === "error" && (
+            <p className="mx-auto max-w-[300px] text-center text-sm font-medium text-red-600 dark:text-red-400">
+              {errorMessage}
+            </p>
+          )}
+        </div>
+      </div>
+    </>
+  );
+}
--- a/apps/web/src/pages/upgrade/select-plan.tsx
+++ b/apps/web/src/pages/upgrade/select-plan.tsx
@@ -1,31 +0,0 @@
-import { useRouter } from "next/navigation";
-import { env } from "next-runtime-env";
-import { useEffect } from "react";
-
-import { authClient } from "@kan/auth/client";
-
-import { PageHead } from "~/components/PageHead";
-import SelectPlanView from "~/views/onboarding/select-plan";
-
-export default function UpgradeSelectPlanPage() {
-  const router = useRouter();
-  const { data: session, isPending } = authClient.useSession();
-
-  useEffect(() => {
-    if (!isPending && !session?.user) {
-      router.push("/login");
-    }
-    if (!isPending && env("NEXT_PUBLIC_KAN_ENV") !== "cloud") {
-      router.push("/boards");
-    }
-  }, [session, isPending, router]);
-
-  if (isPending || !session?.user) return null;
-
-  return (
-    <>
-      <PageHead title="Upgrade | kan.bn" />
-      <SelectPlanView />
-    </>
-  );
-}
--- a/apps/web/src/providers/font-size.tsx
+++ b/apps/web/src/providers/font-size.tsx
@@ -1,57 +0,0 @@
-import React, {
-  createContext,
-  useContext,
-  useEffect,
-  useState,
-  type ReactNode,
-} from "react";
-
-export type FontSize = "small" | "medium" | "large";
-
-const fontSizeMap: Record<FontSize, string> = {
-  small: "14px",
-  medium: "16px",
-  large: "18px",
-};
-
-interface FontSizeContextProps {
-  fontSize: FontSize;
-  setFontSize: (size: FontSize) => void;
-}
-
-const FontSizeContext = createContext<FontSizeContextProps | undefined>(
-  undefined,
-);
-
-export const FontSizeProvider: React.FC<{ children: ReactNode }> = ({
-  children,
-}) => {
-  const [fontSize, setFontSizeState] = useState<FontSize>("medium");
-
-  const setFontSize = (size: FontSize) => {
-    document.documentElement.style.fontSize = fontSizeMap[size];
-    localStorage.setItem("fontSize", size);
-    setFontSizeState(size);
-  };
-
-  useEffect(() => {
-    const stored = localStorage.getItem("fontSize") as FontSize | null;
-    const size = stored && fontSizeMap[stored] ? stored : "medium";
-    document.documentElement.style.fontSize = fontSizeMap[size];
-    setFontSizeState(size);
-  }, []);
-
-  return (
-    <FontSizeContext.Provider value={{ fontSize, setFontSize }}>
-      {children}
-    </FontSizeContext.Provider>
-  );
-};
-
-export const useFontSize = (): FontSizeContextProps => {
-  const context = useContext(FontSizeContext);
-  if (!context) {
-    throw new Error("useFontSize must be used within a FontSizeProvider");
-  }
-  return context;
-};
--- a/apps/web/src/providers/keyboard-shortcuts.tsx
+++ b/apps/web/src/providers/keyboard-shortcuts.tsx
@@ -20,7 +20,6 @@ import { HiXMark } from "react-icons/hi2";

 import { env } from "~/env";
 import { useEventListener } from "~/hooks/useEventListener";
-import { useLinguiContext } from "~/providers/lingui";

 const ModifierKey = {
  CONTROL: "CONTROL",
@@ -161,7 +160,6 @@ export function KeyboardShortcutProvider({
  const sequenceTimeoutRef = useRef<NodeJS.Timeout | null>(null);

  const [isLegendOpen, setIsLegendOpen] = useState(false);
-  const { locale } = useLinguiContext();

  const openLegendShortcut: KeyboardShortcut = useMemo(
    () => ({
@@ -174,7 +172,7 @@ export function KeyboardShortcutProvider({
      description: t`Open keyboard shortcuts`,
      group: ShortcutGroup.GENERAL,
    }),
-    [locale],
+    [setIsLegendOpen],
  );

  const handleKeyDown = useCallback((event: KeyboardEvent) => {
--- a/apps/web/src/providers/lingui.tsx
+++ b/apps/web/src/providers/lingui.tsx
@@ -35,31 +35,10 @@ function detectBrowserLocale(availableLocales: readonly string[]): Locale {
  const browserLanguages = navigator.languages || [navigator.language];

  for (const browserLang of browserLanguages) {
-    const normalizedLocale = browserLang.toLowerCase();
-    const exactLocale = availableLocales.find(
-      (availableLocale) => availableLocale.toLowerCase() === normalizedLocale,
-    );
+    const langCode = browserLang.split("-")[0];

-    if (exactLocale) {
-      return exactLocale as Locale;
-    }
-
-    const languageCode = normalizedLocale.split("-")[0];
-
-    if (languageCode === "zh" && availableLocales.includes("zh-CN")) {
-      return "zh-CN";
-    }
-
-    if (languageCode === "pt" && availableLocales.includes("ptbr")) {
-      return "ptbr";
-    }
-
-    const baseLocale = availableLocales.find(
-      (availableLocale) => availableLocale.toLowerCase() === languageCode,
-    );
-
-    if (baseLocale) {
-      return baseLocale as Locale;
+    if (langCode && availableLocales.includes(langCode.toLowerCase())) {
+      return langCode.toLowerCase() as Locale;
    }
  }

@@ -70,7 +49,7 @@ export function LinguiProviderWrapper({
  children,
  initialLocale = defaultLocale,
 }: LinguiProviderProps) {
-  const [locale, setLocale] = useState<Locale>(initialLocale);
+  const [locale, setLocale] = useState<Locale>(defaultLocale);
  const [isHydrated, setIsHydrated] = useState(false);

  initializeI18n();
--- a/apps/web/src/providers/popup.tsx
+++ b/apps/web/src/providers/popup.tsx
@@ -1,4 +1,4 @@
-import { createContext, useCallback, useContext, useState } from "react";
+import { createContext, useContext, useState } from "react";

 interface PopupContextType {
  isOpen: boolean;
@@ -25,27 +25,24 @@ export const PopupProvider: React.FC<Props> = ({ children }) => {
  const [popupMessage, setPopupMessage] = useState("");
  const [popupIcon, setPopupIcon] = useState("");

-  const showPopup = useCallback(
-    ({
-      header,
-      message,
-      icon,
-    }: {
-      header: string;
-      message: string;
-      icon: string;
-    }) => {
-      setIsOpen(true);
-      setPopupHeader(header);
-      setPopupMessage(message);
-      setPopupIcon(icon);
-    },
-    [],
-  );
+  const showPopup = ({
+    header,
+    message,
+    icon,
+  }: {
+    header: string;
+    message: string;
+    icon: string;
+  }) => {
+    setIsOpen(true);
+    setPopupHeader(header);
+    setPopupMessage(message);
+    setPopupIcon(icon);
+  };

-  const hidePopup = useCallback(() => {
+  const hidePopup = () => {
    setIsOpen(false);
-  }, []);
+  };

  return (
    <PopupContext.Provider
--- a/apps/web/src/providers/workspace.tsx
+++ b/apps/web/src/providers/workspace.tsx
@@ -17,10 +17,8 @@ interface Workspace {
  description: string | null | undefined;
  publicId: string;
  slug: string | undefined;
-  plan: "free" | "team" | "pro" | "enterprise" | undefined;
+  plan: "free" | "pro" | "enterprise" | undefined;
  role: "admin" | "member" | "guest";
-  weekStartDay: 0 | 1 | 6;
-  cardPrefix: string;
 }

 const initialWorkspace: Workspace = {
@@ -28,17 +26,15 @@ const initialWorkspace: Workspace = {
  description: null,
  publicId: "",
  slug: "",
-  plan: "free" as const,
+  plan: "free",
  role: "member",
-  weekStartDay: 1,
-  cardPrefix: "",
 };

 const initialAvailableWorkspaces: Workspace[] = [];

-export const WorkspaceContext = createContext<
-  WorkspaceContextProps | undefined
->(undefined);
+export const WorkspaceContext = createContext<WorkspaceContextProps | undefined>(
+  undefined,
+);

 export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
  children,
@@ -52,18 +48,7 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({

  const workspacePublicId = useSearchParams().get("workspacePublicId");

-  const [pendingWorkspaceId, setPendingWorkspaceId] = useState<string | null>(
-    workspacePublicId,
-  );
-  const pollAttemptsRef = React.useRef(0);
-  const MAX_POLL_ATTEMPTS = 5;
-
-  const { data, isLoading, isFetching } = api.workspace.all.useQuery(
-    undefined,
-    {
-      refetchInterval: pendingWorkspaceId ? 2000 : false,
-    },
-  );
+  const { data, isLoading } = api.workspace.all.useQuery();
  const utils = api.useUtils();

  const switchWorkspace = (_workspace: Workspace) => {
@@ -79,7 +64,7 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({

  useEffect(() => {
    if (!data?.length) {
-      if (!isLoading && !isFetching) setHasLoaded(true);
+      if (!isLoading) setHasLoaded(true);
      return;
    }

@@ -94,8 +79,6 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
        slug: workspace.slug,
        description: workspace.description,
        plan: workspace.plan,
-        weekStartDay: workspace.weekStartDay,
-        cardPrefix: workspace.cardPrefix,
        hasLoaded: true,
      })) as Workspace[];

@@ -103,72 +86,42 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
    }

    if (storedWorkspaceId !== null) {
-      const selectedWorkspace = data.find(
+      const newData = data;
+      const selectedWorkspace = newData.find(
        ({ workspace }) => workspace.publicId === storedWorkspaceId,
      );

-      if (!selectedWorkspace?.workspace) {
-        if (pendingWorkspaceId) {
-          pollAttemptsRef.current += 1;
-          if (pollAttemptsRef.current >= MAX_POLL_ATTEMPTS) {
-            setPendingWorkspaceId(null);
-            localStorage.removeItem("workspacePublicId");
-          } else {
-            return;
-          }
-        } else {
-          // Clear stale workspacePublicId from localStorage
-          localStorage.removeItem("workspacePublicId");
-        }
-      } else {
-        pollAttemptsRef.current = 0;
-        setPendingWorkspaceId(null);
+      if (!selectedWorkspace?.workspace) return;

-        setWorkspace({
-          publicId: selectedWorkspace.workspace.publicId,
-          name: selectedWorkspace.workspace.name,
-          slug: selectedWorkspace.workspace.slug,
-          plan: selectedWorkspace.workspace.plan,
-          description: selectedWorkspace.workspace.description,
-          role: selectedWorkspace.role as "admin" | "member" | "guest",
-          weekStartDay: selectedWorkspace.workspace.weekStartDay as 0 | 1 | 6,
-          cardPrefix: selectedWorkspace.workspace.cardPrefix,
-        });
+      setWorkspace({
+        publicId: selectedWorkspace.workspace.publicId,
+        name: selectedWorkspace.workspace.name,
+        slug: selectedWorkspace.workspace.slug,
+        plan: selectedWorkspace.workspace.plan,
+        description: selectedWorkspace.workspace.description,
+        role: selectedWorkspace.role,
+      });

-        if (workspacePublicId) {
-          router.push(`/boards`);
-          localStorage.setItem("workspacePublicId", workspacePublicId);
-        }
-
-        setHasLoaded(true);
-        return;
+      if (workspacePublicId) {
+        router.push(`/boards`);
+        localStorage.setItem("workspacePublicId", workspacePublicId);
      }
+    } else {
+      const primaryWorkspace = data[0]?.workspace;
+      const primaryWorkspaceRole = data[0]?.role;
+
+      if (!primaryWorkspace || !primaryWorkspaceRole) return;
+      localStorage.setItem("workspacePublicId", primaryWorkspace.publicId);
+      setWorkspace({
+        publicId: primaryWorkspace.publicId,
+        name: primaryWorkspace.name,
+        slug: primaryWorkspace.slug,
+        plan: primaryWorkspace.plan,
+        description: primaryWorkspace.description,
+        role: primaryWorkspaceRole,
+      });
    }
-
-    const primaryWorkspace = data[0]?.workspace;
-    const primaryWorkspaceRole = data[0]?.role;
-
-    if (!primaryWorkspace || !primaryWorkspaceRole) return;
-    localStorage.setItem("workspacePublicId", primaryWorkspace.publicId);
-    setWorkspace({
-      publicId: primaryWorkspace.publicId,
-      name: primaryWorkspace.name,
-      slug: primaryWorkspace.slug,
-      plan: primaryWorkspace.plan,
-      description: primaryWorkspace.description,
-      role: primaryWorkspaceRole as "admin" | "member" | "guest",
-      weekStartDay: primaryWorkspace.weekStartDay as 0 | 1 | 6,
-      cardPrefix: primaryWorkspace.cardPrefix,
-    });
-    setHasLoaded(true);
-  }, [
-    data,
-    isLoading,
-    isFetching,
-    workspacePublicId,
-    pendingWorkspaceId,
-    router,
-  ]);
+  }, [data, isLoading, workspacePublicId, router]);

  return (
    <WorkspaceContext.Provider
--- a/apps/web/src/styles/globals.css
+++ b/apps/web/src/styles/globals.css
@@ -2,10 +2,6 @@
@tailwind components;
@tailwind utilities;

-html {
-  font-size: 14px;
-}
-
 [contenteditable="true"]:empty:before {
  content: attr(placeholder);
  display: block;
--- a/apps/web/src/utils/helpers.ts
+++ b/apps/web/src/utils/helpers.ts
@@ -1,5 +1,3 @@
-import { env } from "next-runtime-env";
-
 export const formatToArray = (
  value: string | string[] | undefined,
 ): string[] => {
@@ -52,21 +50,5 @@ export const getAvatarUrl = (imageOrKey: string | null) => {
    return imageOrKey;
  }

-  // Construct URL from S3 key
-  const useVirtualHosted = env("NEXT_PUBLIC_USE_VIRTUAL_HOSTED_URLS") === "true";
-  const storageDomain = env("NEXT_PUBLIC_STORAGE_DOMAIN");
-  const storageUrl = env("NEXT_PUBLIC_STORAGE_URL");
-  const bucket = env("NEXT_PUBLIC_AVATAR_BUCKET_NAME");
-
-  if (useVirtualHosted && storageDomain && bucket) {
-    // Virtual-hosted style: https://{bucket}.{domain}/{key}
-    return `https://${bucket}.${storageDomain}/${imageOrKey}`;
-  }
-
-  if (storageUrl && bucket) {
-    // Path-style: {storageUrl}/{bucket}/{key}
-    return `${storageUrl}/${bucket}/${imageOrKey}`;
-  }
-
  return "";
 };
--- a/apps/web/src/utils/i18n.ts
+++ b/apps/web/src/utils/i18n.ts
@@ -3,7 +3,6 @@ import { i18n } from "@lingui/core";
 import type { Locale } from "~/locales";
 import { defaultLocale } from "~/locales";
 import { messages as enMessages } from "~/locales/en/messages";
-import { messages as zhCNMessages } from "~/locales/zh-CN/messages";

 const loadMessages = async (locale: Locale) => {
  switch (locale) {
@@ -23,10 +22,8 @@ const loadMessages = async (locale: Locale) => {
      return (await import("~/locales/ru/messages")).messages;
    case "pl":
      return (await import("~/locales/pl/messages")).messages;
-    case "ptbr":
-      return (await import("~/locales/ptbr/messages")).messages;
-    case "zh-CN":
-      return (await import("~/locales/zh-CN/messages")).messages;
+    case "pt-BR":
+      return (await import("~/locales/pt-BR/messages")).messages;
    default:
      return enMessages;
  }
@@ -35,15 +32,11 @@ const loadMessages = async (locale: Locale) => {
 let isInitialized = false;
 const loadedLocales = new Set<string>();

-export function initializeI18n() {
+export function initializeI18n(locale: Locale = defaultLocale) {
  if (!isInitialized) {
-    // 首屏同步加载中英文，避免默认语言激活前出现中英混排。
-    i18n.load("en", enMessages);
-    i18n.load("zh-CN", zhCNMessages);
+    i18n.load(defaultLocale, enMessages);
    i18n.activate(defaultLocale);
    loadedLocales.add(defaultLocale);
-    loadedLocales.add("en");
-    loadedLocales.add("zh-CN");
    isInitialized = true;
  }

--- a/apps/web/src/views/auth/login/index.tsx
+++ b/apps/web/src/views/auth/login/index.tsx
@@ -26,7 +26,7 @@ export default function LoginPage() {

  const { data } = authClient.useSession();

-  if (data?.user.id) router.push(redirect ?? "/boards");
+  if (data?.user.id) router.push("/boards");

  return (
    <>
@@ -58,7 +58,7 @@ export default function LoginPage() {
                </div>
              </div>
            )}
-            {(!isSignUpDisabled || redirect?.startsWith("/invite/")) && (
+            {!isSignUpDisabled && (
              <p className="mt-4 text-sm text-light-1000 dark:text-dark-1000">
                <Trans>
                  Don't have an account?{" "}
--- a/apps/web/src/views/auth/signup/index.tsx
+++ b/apps/web/src/views/auth/signup/index.tsx
@@ -21,16 +21,14 @@ export default function SignUpPage() {

  const { data } = authClient.useSession();

-  if (data?.user.id) router.push(redirect ?? "/boards");
+  if (data?.user.id) router.push("/boards");

  const handleMagicLinkSent = (value: boolean, recipient: string) => {
    setIsMagicLinkSent(value);
    setMagicLinkRecipient(recipient);
  };

-  const isInviteFlow = redirect?.startsWith("/invite/");
-
-  if (isSignUpDisabled && !isInviteFlow) {
+  if (isSignUpDisabled) {
    return (
      <>
        <PageHead title={t`Sign up | kan.bn`} />
--- a/apps/web/src/views/board/components/BoardDropdown.tsx
+++ b/apps/web/src/views/board/components/BoardDropdown.tsx
@@ -1,7 +1,5 @@
-import { useRouter } from "next/router";
 import { t } from "@lingui/core/macro";
 import {
-  HiArrowRightOnRectangle,
  HiEllipsisHorizontal,
  HiLink,
  HiOutlineDocumentDuplicate,
@@ -9,7 +7,7 @@ import {
  HiOutlineStar,
  HiStar,
 } from "react-icons/hi2";
-import { IoArchiveOutline } from "react-icons/io5";
+
 import Dropdown from "~/components/Dropdown";
 import { usePermissions } from "~/hooks/usePermissions";
 import { useModal } from "~/providers/modal";
@@ -19,7 +17,6 @@ import { api } from "~/utils/api";
 export default function BoardDropdown({
  isTemplate,
  isLoading,
-  isArchived,
  boardPublicId,
  isFavorite,
  boardName,
@@ -27,31 +24,28 @@ export default function BoardDropdown({
  isTemplate: boolean;
  isLoading: boolean;
  boardPublicId: string;
-  isArchived?: boolean;
  isFavorite?: boolean;
  boardName?: string;
 }) {
-  const router = useRouter();
  const { openModal } = useModal();
+  const { canEditBoard, canDeleteBoard, canCreateBoard } = usePermissions();
  const { showPopup } = usePopup();
-  const { canEditBoard, canDeleteBoard, canCreateBoard, canArchiveBoard } =
-    usePermissions();
  const utils = api.useUtils();

+  const handleToggleFavorite = () => {
+    updateBoard.mutate({
+      boardPublicId,
+      favorite: !isFavorite,
+    });
+  };
+
  const updateBoard = api.board.update.useMutation({
-    onSuccess: (_data, variables) => {
+    onSuccess: (data, variables) => {
      void utils.board.all.invalidate();
      void utils.board.byId.invalidate();
-      if (variables.isArchived !== undefined) {
-        showPopup({
-          header: variables.isArchived ? t`Board archived` : t`Board unarchived`,
-          message: variables.isArchived
-            ? t`The board has been archived.`
-            : t`The board has been unarchived.`,
-          icon: "success",
-        });
-        void router.push(`/boards`);
-      } else if (variables.favorite !== undefined) {
+
+      // Show popup notification
+      if (variables.favorite !== undefined) {
        showPopup({
          header: variables.favorite
            ? t`Added to favorites`
@@ -71,65 +65,27 @@ export default function BoardDropdown({
      });
    },
  });
-
-  const handleToggleFavorite = () => {
-    updateBoard.mutate({
-      boardPublicId,
-      favorite: !isFavorite,
-    });
-  };
-
-  const handleArchiveOrUnarchive = () => {
-    updateBoard.mutate({
-      boardPublicId,
-      isArchived: !isArchived,
-    });
-  };
-
-  const isArchiveActionPending = updateBoard.isPending;
-
+  
  const items = [
-    ...(!isTemplate && canCreateBoard
+    ...(isTemplate && canCreateBoard
      ? [
-        {
-          label: t`Make template`,
-          action: () => openModal("CREATE_TEMPLATE"),
-          icon: (
-            <HiOutlineDocumentDuplicate className="h-[16px] w-[16px] text-dark-900" />
-          ),
-        },
-      ]
+          {
+            label: t`Make template`,
+            action: () => openModal("CREATE_TEMPLATE"),
+            icon: (
+              <HiOutlineDocumentDuplicate className="h-[16px] w-[16px] text-dark-900" />
+            ),
+          },
+        ]
      : []),
    ...(!isTemplate && canEditBoard
      ? [
-        {
-          label: t`Edit board URL`,
-          action: () => openModal("UPDATE_BOARD_SLUG"),
-          icon: <HiLink className="h-[16px] w-[16px] text-dark-900" />,
-        },
-      ]
-      : []),
-    ...(!isTemplate && canArchiveBoard
-      ? [
-        {
-          label: isArchived ? t`Unarchive board` : t`Archive board`,
-          action: handleArchiveOrUnarchive,
-          icon: (
-            <IoArchiveOutline className="h-[16px] w-[16px] text-dark-900" />
-          ),
-        },
-      ]
-      : []),
-    ...(!isTemplate && canEditBoard
-      ? [
-        {
-          label: t`Move to workspace`,
-          action: () => openModal("MOVE_BOARD"),
-          icon: (
-            <HiArrowRightOnRectangle className="h-[16px] w-[16px] text-dark-900" />
-          ),
-        },
-      ]
+          {
+            label: t`Edit board URL`,
+            action: () => openModal("UPDATE_BOARD_SLUG"),
+            icon: <HiLink className="h-[16px] w-[16px] text-dark-900" />,
+          },
+        ]
      : []),
    {
      label: isFavorite
@@ -144,26 +100,22 @@ export default function BoardDropdown({
    },
    ...(canDeleteBoard
      ? [
-        {
-          label: isTemplate ? t`Delete template` : t`Delete board`,
-          action: () => openModal("DELETE_BOARD"),
-          icon: (
-            <HiOutlineTrash className="h-[16px] w-[16px] text-dark-900" />
-          ),
-        },
-      ]
+          {
+            label: isTemplate ? t`Delete template` : t`Delete board`,
+            action: () => openModal("DELETE_BOARD"),
+            icon: <HiOutlineTrash className="h-[16px] w-[16px] text-dark-900" />,
+          },
+        ]
      : []),
  ];
+  

  if (items.length === 0) {
    return null;
  }

  return (
-    <Dropdown
-      disabled={isLoading || isArchiveActionPending}
-      items={items}
-    >
+    <Dropdown disabled={isLoading} items={items}>
      <HiEllipsisHorizontal className="h-5 w-5 text-dark-900" />
    </Dropdown>
  );
--- a/apps/web/src/views/board/components/Card.tsx
+++ b/apps/web/src/views/board/components/Card.tsx
@@ -16,7 +16,6 @@ import { getAvatarUrl } from "~/utils/helpers";

 const Card = ({
  title,
-  ticketNumber,
  labels,
  members,
  checklists,
@@ -26,7 +25,6 @@ const Card = ({
  dueDate,
 }: {
  title: string;
-  ticketNumber?: string | null;
  labels: { name: string; colourCode: string | null }[];
  members: {
    publicId: string;
@@ -69,11 +67,6 @@ const Card = ({

  return (
    <div className="flex flex-col overflow-hidden rounded-md border border-light-200 bg-light-50 px-3 py-2 text-sm text-neutral-900 dark:border-dark-200 dark:bg-dark-200 dark:text-dark-1000 dark:hover:bg-dark-300">
-      {ticketNumber && (
-        <span className="mb-1 text-xs text-light-700 dark:text-dark-800">
-          {ticketNumber}
-        </span>
-      )}
      <span className="break-words">{title}</span>
      {labels.length ||
      members.length ||
--- a/apps/web/src/views/board/components/CardContextDueDateModal.tsx
+++ b/apps/web/src/views/board/components/CardContextDueDateModal.tsx
@@ -1,41 +0,0 @@
-import { t } from "@lingui/core/macro";
-
-import { useModal } from "~/providers/modal";
-import { api } from "~/utils/api";
-import { DueDateSelector } from "~/views/card/components/DueDateSelector";
-
-export function CardContextDueDateModal() {
-  const { entityId: cardPublicId, closeModal } = useModal();
-
-  const { data: card, isLoading } = api.card.byId.useQuery(
-    { cardPublicId: cardPublicId ?? "" },
-    { enabled: !!cardPublicId && cardPublicId.length >= 12 },
-  );
-
-  if (!cardPublicId) return null;
-
-  return (
-    <div className="p-4">
-      <h2 className="mb-4 text-lg font-semibold text-light-1000 dark:text-dark-1000">
-        {t`Set due date`}
-      </h2>
-      {isLoading ? (
-        <div className="h-10 w-full animate-pulse rounded bg-light-200 dark:bg-dark-300" />
-      ) : (
-        <DueDateSelector
-          cardPublicId={cardPublicId}
-          dueDate={card?.dueDate ?? null}
-        />
-      )}
-      <div className="mt-4 flex justify-end">
-        <button
-          type="button"
-          onClick={closeModal}
-          className="rounded-md border border-light-300 bg-light-50 px-3 py-1.5 text-sm font-medium text-light-1000 hover:bg-light-200 dark:border-dark-400 dark:bg-dark-200 dark:text-dark-1000 dark:hover:bg-dark-300"
-        >
-          {t`Done`}
-        </button>
-      </div>
-    </div>
-  );
-}
--- a/Show More
+++ b/Show More