Merge branch 'main' into fix/ee

.env.example

@@ -8,9 +8,6 @@
 
 WEBAPP_URL=http://localhost:3000
 
-# Required for next-auth. Should be the same as WEBAPP_URL
-NEXTAUTH_URL=http://localhost:3000
-
 # Set this if you want to have a shorter link for surveys
 SHORT_URL_BASE=
 
@@ -34,9 +31,13 @@ DATABASE_URL='postgresql://postgres:postgres@localhost:5432/formbricks?schema=pu
 # You can use: `openssl rand -hex 32` to generate a secure one
 NEXTAUTH_SECRET=RANDOM_STRING
 
-# API Secret for running cron jobs. (mandatory)
+# Set this to your public-facing URL, e.g., https://example.com
+# You do not need the NEXTAUTH_URL environment variable in Vercel.
+NEXTAUTH_URL=http://localhost:3000
+
+# Cron Secret
 # You can use: `openssl rand -hex 32` to generate a secure one
-CRON_SECRET=RANDOM_STRING
+CRON_SECRET=
 
 ################
 #  MAIL SETUP  #
@@ -53,9 +54,6 @@ SMTP_SECURE_ENABLED=0
 SMTP_USER=smtpUser
 SMTP_PASSWORD=smtpPassword
 
-# If set to 0, the server will accept connections without requiring authorization from the list of supplied CAs (default is 1). 
-# SMTP_REJECT_UNAUTHORIZED_TLS=0
-
 ########################################################################
 # ------------------------------ OPTIONAL -----------------------------#
 ########################################################################
@@ -178,10 +176,7 @@ ENTERPRISE_LICENSE_KEY=
 UNSPLASH_ACCESS_KEY=
 
 # The below is used for Next Caching (uses In-Memory from Next Cache if not provided)
-# REDIS_URL=redis://localhost:6379
+# REDIS_URL:
 
 # The below is used for Rate Limiting (uses In-Memory LRU Cache if not provided) (You can use a service like Webdis for this)
 # REDIS_HTTP_URL:
-
-# Disable custom cache handler if necessary (e.g. if deployed on Vercel)
-# CUSTOM_CACHE_DISABLED=1

.github/actions/cache-build-web/action.yml

@@ -30,10 +30,6 @@ runs:
           **/dist/**
         key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}
 
-    - name: Set Cache Hit Status
-      run: echo "cache-hit=${{ steps.cache-build.outputs.cache-hit }}" >> "$GITHUB_OUTPUT"
-      shell: bash
-
     - name: Setup Node.js 20.x
       uses: actions/setup-node@v3
       with:
@@ -41,7 +37,7 @@ runs:
       if: steps.cache-build.outputs.cache-hit != 'true'
 
     - name: Install pnpm
-      uses: pnpm/action-setup@v4
+      uses: pnpm/action-setup@v2
       if: steps.cache-build.outputs.cache-hit != 'true'
 
     - name: Install dependencies

.github/workflows/build-web.yml

@@ -11,8 +11,24 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/dangerous-git-checkout
 
-      - name: Build & Cache Web Binaries
-        uses: ./.github/actions/cache-build-web
-        id: cache-build-web
+      - name: Setup Node.js 20.x
+        uses: actions/setup-node@v3
         with:
-          e2e_testing_mode: "0"
+          node-version: 20.x
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+
+      - name: Install dependencies
+        run: pnpm install --config.platform=linux --config.architecture=x64
+
+      - name: create .env
+        run: cp .env.example .env
+
+      - name: Generate Random ENCRYPTION_KEY
+        run: |
+          SECRET=$(openssl rand -hex 32)
+          echo "ENCRYPTION_KEY=$SECRET" >> $GITHUB_ENV
+
+      - name: Build Formbricks-web
+        run: pnpm build --filter=@formbricks/web...

.github/workflows/chromatic.yml

@@ -1,30 +0,0 @@
-name: "Chromatic"
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-jobs:
-  chromatic:
-    name: Run Chromatic
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-      - name: Install dependencies
-        run: pnpm install --config.platform=linux --config.architecture=x64
-      - name: Run Chromatic
-        uses: chromaui/action@latest
-        with:
-          # ⚠️ Make sure to configure a `CHROMATIC_PROJECT_TOKEN` repository secret
-          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
-          workingDir: apps/storybook

.github/workflows/e2e.yml

@@ -7,20 +7,6 @@ jobs:
     name: Run E2E Tests
     runs-on: ubuntu-latest
     timeout-minutes: 60
-    services:
-      postgres:
-        image: postgres:latest
-        env:
-          POSTGRES_DB: postgres
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd="pg_isready -U testuser"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=5
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/dangerous-git-checkout
@@ -30,46 +16,44 @@ jobs:
         with:
           e2e_testing_mode: "1"
 
-      - name: Check if pnpm is installed
-        id: pnpm-check
-        run: |
-          if pnpm --version; then
-            echo "pnpm is installed."
-            echo "PNPM_INSTALLED=true" >> $GITHUB_ENV
-          else
-            echo "pnpm is not installed."
-            echo "PNPM_INSTALLED=false" >> $GITHUB_ENV
-          fi
-
       - name: Install pnpm
-        if: env.PNPM_INSTALLED == 'false'
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v2
 
       - name: Install dependencies
-        if: env.PNPM_INSTALLED == 'false'
         run: pnpm install
 
-      - name: Apply Prisma Migrations
+      - name: Start PostgreSQL
         run: |
-          pnpm prisma migrate deploy
+          cd packages/database && pnpm db:up &
+          for attempt in {1..20}; do
+            if nc -zv localhost 5432; then
+              echo "Ready"
+              break
+            fi
+            echo "Waiting..."
+            sleep 5
+          done
+          pnpm db:migrate:dev
+      - name: Serve packages for lazy loading
+        run: |
+          cd packages/surveys && pnpm serve &
 
       - name: Run App
         run: |
           NODE_ENV=test pnpm start --filter=@formbricks/web &
-          sleep 10  # Optional: gives some buffer for the app to start
-          for attempt in {1..10}; do
+          for attempt in {1..20}; do
             if [ $(curl -o /dev/null -s -w "%{http_code}" http://localhost:3000/health) -eq 200 ]; then
-              echo "Application is ready."
+              echo "Ready"
               break
             fi
-            if [ $attempt -eq 10 ]; then
-              echo "Application failed to start in time."
-              exit 1
-            fi
-            echo "Still waiting for the application to be ready..."
+            echo "Waiting..."
             sleep 10
           done
 
+      - name: Test Serve endpoints
+        run: |
+          curl -s http://localhost:3003
+
       - name: Cache Playwright
         uses: actions/cache@v3
         id: playwright-cache

.github/workflows/kamal-deploy.yml

@@ -0,0 +1,130 @@
+name: Kamal Deploy
+concurrency:
+  group: deploy-to-kamal
+  cancel-in-progress: false
+
+on:
+  workflow_dispatch:
+  #push:
+  #  branches:
+  #    - main
+
+jobs:
+  Deploy:
+    runs-on: ubuntu-latest
+    environment: production
+    env:
+      DOCKER_BUILDKIT: 1
+      IS_FORMBRICKS_CLOUD: ${{ vars.IS_FORMBRICKS_CLOUD }}
+      WEBAPP_URL: ${{ vars.WEBAPP_URL }}
+      MIGRATE_DATABASE_URL: ${{ secrets.MIGRATE_DATABASE_URL }}
+      NEXTAUTH_URL: ${{ vars.NEXTAUTH_URL }}
+      DATABASE_URL: ${{ secrets.DATABASE_URL }}
+      NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
+      ENCRYPTION_KEY: ${{ secrets.ENCRYPTION_KEY }}
+      SHORT_URL_BASE: ${{ vars.SHORT_URL_BASE }}
+      MAIL_FROM: ${{ secrets.MAIL_FROM }}
+      SMTP_HOST: ${{ secrets.SMTP_HOST }}
+      SMTP_PORT: ${{ secrets.SMTP_PORT }}
+      SMTP_USER: ${{ secrets.SMTP_USER }}
+      SMTP_PASSWORD: ${{ secrets.SMTP_PASSWORD }}
+      PRIVACY_URL: ${{ vars.PRIVACY_URL }}
+      TERMS_URL: ${{ vars.TERMS_URL }}
+      IMPRINT_URL: ${{ vars.IMPRINT_URL }}
+      GITHUB_ID: ${{ secrets.FB_GITHUB_ID }}
+      GITHUB_SECRET: ${{ secrets.FB_GITHUB_SECRET }}
+      GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
+      GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
+      AZUREAD_CLIENT_ID: ${{ secrets.AZUREAD_CLIENT_ID }}
+      AZUREAD_CLIENT_SECRET: ${{ secrets.AZUREAD_CLIENT_SECRET }}
+      AZUREAD_TENANT_ID: ${{ secrets.AZUREAD_TENANT_ID }}
+      OIDC_CLIENT_ID: ${{ secrets.OIDC_CLIENT_ID }}
+      OIDC_CLIENT_SECRET: ${{ secrets.OIDC_CLIENT_SECRET }}
+      OIDC_ISSUER: ${{ secrets.OIDC_ISSUER }}
+      OIDC_DISPLAY_NAME: ${{ secrets.OIDC_DISPLAY_NAME }}
+      OIDC_SIGNING_ALGORITHM: ${{ secrets.OIDC_SIGNING_ALGORITHM }}
+      CRON_SECRET: ${{ secrets.CRON_SECRET }}
+      ASSET_PREFIX_URL: ${{ vars.ASSET_PREFIX_URL }}
+      NOTION_OAUTH_CLIENT_ID: ${{ secrets.NOTION_OAUTH_CLIENT_ID }}
+      NOTION_OAUTH_CLIENT_SECRET: ${{ secrets.NOTION_OAUTH_CLIENT_SECRET }}
+      SLACK_CLIENT_ID: ${{ secrets.SLACK_CLIENT_ID }}
+      SLACK_CLIENT_SECRET: ${{ secrets.SLACK_CLIENT_SECRET }}
+      STRIPE_SECRET_KEY: ${{ secrets.STRIPE_SECRET_KEY }}
+      STRIPE_WEBHOOK_SECRET: ${{ secrets.STRIPE_WEBHOOK_SECRET }}
+      GOOGLE_SHEETS_CLIENT_ID: ${{ secrets.GOOGLE_SHEETS_CLIENT_ID }}
+      GOOGLE_SHEETS_CLIENT_SECRET: ${{ secrets.GOOGLE_SHEETS_CLIENT_SECRET }}
+      GOOGLE_SHEETS_REDIRECT_URL: ${{ secrets.GOOGLE_SHEETS_REDIRECT_URL }}
+      AIRTABLE_CLIENT_ID: ${{ secrets.AIRTABLE_CLIENT_ID }}
+      ENTERPRISE_LICENSE_KEY: ${{ secrets.ENTERPRISE_LICENSE_KEY }}
+      DEFAULT_ORGANIZATION_ID: ${{ vars.DEFAULT_ORGANIZATION_ID }}
+      CUSTOMER_IO_API_KEY: ${{ secrets.CUSTOMER_IO_API_KEY }}
+      CUSTOMER_IO_SITE_ID: ${{ secrets.CUSTOMER_IO_SITE_ID }}
+      NEXT_PUBLIC_POSTHOG_API_KEY: ${{ vars.NEXT_PUBLIC_POSTHOG_API_KEY }}
+      NEXT_PUBLIC_POSTHOG_API_HOST: ${{ vars.NEXT_PUBLIC_POSTHOG_API_HOST }}
+      NEXT_PUBLIC_FORMBRICKS_API_HOST: ${{ vars.NEXT_PUBLIC_FORMBRICKS_API_HOST }}
+      NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID: ${{ vars.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID }}
+      NEXT_PUBLIC_FORMBRICKS_ONBOARDING_SURVEY_ID: ${{ vars.NEXT_PUBLIC_FORMBRICKS_ONBOARDING_SURVEY_ID }}
+      NEXT_PUBLIC_SENTRY_DSN: ${{ vars.NEXT_PUBLIC_SENTRY_DSN }}
+      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+      NODE_ENV: production
+      CLOUDFLARE_EMAIL: ${{ secrets.CLOUDFLARE_EMAIL }}
+      CLOUDFLARE_DNS_API_TOKEN: ${{ secrets.CLOUDFLARE_DNS_API_TOKEN }}
+      S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+      S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
+      S3_REGION: ${{ vars.S3_REGION }}
+      S3_BUCKET_NAME: ${{ vars.S3_BUCKET_NAME }}
+      OPENTELEMETRY_LISTENER_URL: ${{ vars.OPENTELEMETRY_LISTENER_URL }}
+      RATE_LIMITING_DISABLED: ${{ vars.RATE_LIMITING_DISABLED }}
+      KAMAL_REGISTRY_PASSWORD: ${{ secrets.KAMAL_REGISTRY_PASSWORD }}
+      DB_HOST: ${{ secrets.DB_HOST }}
+      DB_USER: ${{ secrets.DB_USER }}
+      DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+      DB_NAME: ${{ secrets.DB_NAME }}
+      REDIS_URL: ${{ secrets.REDIS_URL }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3.0
+          bundler-cache: true
+
+      - name: Install dependencies
+        run: |
+          gem install kamal
+
+      - uses: webfactory/ssh-agent@v0.9.0
+        with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Create builder
+        run: docker buildx create --use --name formbricks-gh-actions-builder
+        if: steps.buildx.outputs.should_create_builder == 'true'
+
+      - name: Push env variables to Kamal
+        run: |
+          kamal() { command kamal "$@" -c kamal/deploy.yml; }
+          kamal env push
+
+      - name: Run deploy command
+        run: |
+          kamal() { command kamal "$@" -c kamal/deploy.yml; }
+          set +e
+          DEPLOY_OUTPUT=$(kamal deploy 2>&1)
+          DEPLOY_EXIT_CODE=$?
+          echo "$DEPLOY_OUTPUT"
+          if [[ "$DEPLOY_OUTPUT" == *"container not unhealthy (healthy)"* ]]; then
+            echo "Deployment reported healthy container. Considering as success."
+            kamal lock release
+            exit 0
+          else
+            exit $DEPLOY_EXIT_CODE
+          fi
+        shell: bash

.github/workflows/kamal-setup.yml

@@ -0,0 +1,127 @@
+name: Kamal Setup
+concurrency:
+  group: setup-kamal
+  cancel-in-progress: false
+
+on:
+  workflow_dispatch: # Only to be triggered when accessories are updated
+
+jobs:
+  Setup:
+    runs-on: ubuntu-latest
+    environment: production
+    env:
+      DOCKER_BUILDKIT: 1
+      IS_FORMBRICKS_CLOUD: ${{ vars.IS_FORMBRICKS_CLOUD }}
+      WEBAPP_URL: ${{ vars.WEBAPP_URL }}
+      NEXTAUTH_URL: ${{ vars.NEXTAUTH_URL }}
+      DATABASE_URL: ${{ secrets.DATABASE_URL }}
+      MIGRATE_DATABASE_URL: ${{ secrets.MIGRATE_DATABASE_URL }}
+      NEXTAUTH_SECRET: ${{ secrets.NEXTAUTH_SECRET }}
+      ENCRYPTION_KEY: ${{ secrets.ENCRYPTION_KEY }}
+      SHORT_URL_BASE: ${{ vars.SHORT_URL_BASE }}
+      MAIL_FROM: ${{ secrets.MAIL_FROM }}
+      SMTP_HOST: ${{ secrets.SMTP_HOST }}
+      SMTP_PORT: ${{ secrets.SMTP_PORT }}
+      SMTP_USER: ${{ secrets.SMTP_USER }}
+      SMTP_PASSWORD: ${{ secrets.SMTP_PASSWORD }}
+      PRIVACY_URL: ${{ vars.PRIVACY_URL }}
+      TERMS_URL: ${{ vars.TERMS_URL }}
+      IMPRINT_URL: ${{ vars.IMPRINT_URL }}
+      GITHUB_ID: ${{ secrets.FB_GITHUB_ID }}
+      GITHUB_SECRET: ${{ secrets.FB_GITHUB_SECRET }}
+      GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
+      GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
+      AZUREAD_CLIENT_ID: ${{ secrets.AZUREAD_CLIENT_ID }}
+      AZUREAD_CLIENT_SECRET: ${{ secrets.AZUREAD_CLIENT_SECRET }}
+      AZUREAD_TENANT_ID: ${{ secrets.AZUREAD_TENANT_ID }}
+      OIDC_CLIENT_ID: ${{ secrets.OIDC_CLIENT_ID }}
+      OIDC_CLIENT_SECRET: ${{ secrets.OIDC_CLIENT_SECRET }}
+      OIDC_ISSUER: ${{ secrets.OIDC_ISSUER }}
+      OIDC_DISPLAY_NAME: ${{ secrets.OIDC_DISPLAY_NAME }}
+      OIDC_SIGNING_ALGORITHM: ${{ secrets.OIDC_SIGNING_ALGORITHM }}
+      CRON_SECRET: ${{ secrets.CRON_SECRET }}
+      ASSET_PREFIX_URL: ${{ vars.ASSET_PREFIX_URL }}
+      NOTION_OAUTH_CLIENT_ID: ${{ secrets.NOTION_OAUTH_CLIENT_ID }}
+      NOTION_OAUTH_CLIENT_SECRET: ${{ secrets.NOTION_OAUTH_CLIENT_SECRET }}
+      SLACK_CLIENT_ID: ${{ secrets.SLACK_CLIENT_ID }}
+      SLACK_CLIENT_SECRET: ${{ secrets.SLACK_CLIENT_SECRET }}
+      STRIPE_SECRET_KEY: ${{ secrets.STRIPE_SECRET_KEY }}
+      STRIPE_WEBHOOK_SECRET: ${{ secrets.STRIPE_WEBHOOK_SECRET }}
+      GOOGLE_SHEETS_CLIENT_ID: ${{ secrets.GOOGLE_SHEETS_CLIENT_ID }}
+      GOOGLE_SHEETS_CLIENT_SECRET: ${{ secrets.GOOGLE_SHEETS_CLIENT_SECRET }}
+      GOOGLE_SHEETS_REDIRECT_URL: ${{ secrets.GOOGLE_SHEETS_REDIRECT_URL }}
+      AIRTABLE_CLIENT_ID: ${{ secrets.AIRTABLE_CLIENT_ID }}
+      ENTERPRISE_LICENSE_KEY: ${{ secrets.ENTERPRISE_LICENSE_KEY }}
+      DEFAULT_ORGANIZATION_ID: ${{ vars.DEFAULT_ORGANIZATION_ID }}
+      CUSTOMER_IO_API_KEY: ${{ secrets.CUSTOMER_IO_API_KEY }}
+      CUSTOMER_IO_SITE_ID: ${{ secrets.CUSTOMER_IO_SITE_ID }}
+      NEXT_PUBLIC_POSTHOG_API_KEY: ${{ vars.NEXT_PUBLIC_POSTHOG_API_KEY }}
+      NEXT_PUBLIC_POSTHOG_API_HOST: ${{ vars.NEXT_PUBLIC_POSTHOG_API_HOST }}
+      NEXT_PUBLIC_FORMBRICKS_API_HOST: ${{ vars.NEXT_PUBLIC_FORMBRICKS_API_HOST }}
+      NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID: ${{ vars.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID }}
+      NEXT_PUBLIC_FORMBRICKS_ONBOARDING_SURVEY_ID: ${{ vars.NEXT_PUBLIC_FORMBRICKS_ONBOARDING_SURVEY_ID }}
+      NEXT_PUBLIC_SENTRY_DSN: ${{ vars.NEXT_PUBLIC_SENTRY_DSN }}
+      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+      NODE_ENV: production
+      CLOUDFLARE_EMAIL: ${{ secrets.CLOUDFLARE_EMAIL }}
+      CLOUDFLARE_DNS_API_TOKEN: ${{ secrets.CLOUDFLARE_DNS_API_TOKEN }}
+      S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+      S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
+      S3_REGION: ${{ vars.S3_REGION }}
+      S3_BUCKET_NAME: ${{ vars.S3_BUCKET_NAME }}
+      OPENTELEMETRY_LISTENER_URL: ${{ vars.OPENTELEMETRY_LISTENER_URL }}
+      RATE_LIMITING_DISABLED: ${{ vars.RATE_LIMITING_DISABLED }}
+      KAMAL_REGISTRY_PASSWORD: ${{ secrets.KAMAL_REGISTRY_PASSWORD }}
+      DB_HOST: ${{ secrets.DB_HOST }}
+      DB_USER: ${{ secrets.DB_USER }}
+      DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+      DB_NAME: ${{ secrets.DB_NAME }}
+      REDIS_URL: ${{ secrets.REDIS_URL }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3.0
+          bundler-cache: true
+
+      - name: Install dependencies
+        run: |
+          gem install kamal
+
+      - uses: webfactory/ssh-agent@v0.9.0
+        with:
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Create builder
+        run: docker buildx create --use --name formbricks-gh-actions-builder
+        if: steps.buildx.outputs.should_create_builder == 'true'
+
+      - name: Push env variables to Kamal
+        run: |
+          kamal() { command kamal "$@" -c kamal/deploy.yml; }
+          kamal env push
+
+      - name: Run setup command
+        run: |
+          kamal() { command kamal "$@" -c kamal/deploy.yml; }
+          set +e
+          DEPLOY_OUTPUT=$(kamal setup 2>&1)
+          DEPLOY_EXIT_CODE=$?
+          echo "$DEPLOY_OUTPUT"
+          if [[ "$DEPLOY_OUTPUT" == *"container not unhealthy (healthy)"* ]]; then
+            echo "Deployment reported healthy container. Considering as success."
+            kamal lock release
+            exit 0
+          else
+            exit $DEPLOY_EXIT_CODE
+          fi
+        shell: bash

.github/workflows/lint.yml

@@ -11,13 +11,13 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/dangerous-git-checkout
 
-      - name: Setup Node.js 20.x
+      - name: Setup Node.js 18.x
         uses: actions/setup-node@v3
         with:
-          node-version: 20.x
+          node-version: 18.x
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v2
 
       - name: Install dependencies
         run: pnpm install --config.platform=linux --config.architecture=x64

.github/workflows/release-docker-github-data-migration.yml

@@ -1,5 +1,10 @@
 name: Docker for Data Migrations
 
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
 on:
   workflow_dispatch:
   push:
@@ -7,6 +12,7 @@ on:
       - "v*"
 
 env:
+  # Use docker.io for Docker Hub if empty
   REGISTRY: ghcr.io
   IMAGE_NAME: formbricks/data-migrations
   DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/formbricks?schema=public"
@@ -17,6 +23,8 @@ jobs:
     permissions:
       contents: read
       packages: write
+      # This is used to complete the identity challenge
+      # with sigstore/fulcio when running outside of PRs.
       id-token: write
 
     steps:
@@ -42,7 +50,6 @@ jobs:
           tags: |
             type=ref,event=tag
             type=raw,value=${{ github.ref_name }}
-            type=raw,value=latest
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v3
@@ -59,4 +66,3 @@ jobs:
         if: ${{ github.event_name != 'pull_request' }}
         run: |
           cosign sign --yes ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
-          cosign sign --yes ghcr.io/${{ env.IMAGE_NAME }}:latest

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
           node-version: 20.x
 
       - name: Install pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v2
 
       - name: Install dependencies
         run: pnpm install --config.platform=linux --config.architecture=x64

.gitignore

@@ -56,5 +56,5 @@ Zone.Identifier
 packages/lib/uploads
 
 # Vite Timestamps
-*vite.config.*.timestamp-*
+vite.config.*.timestamp-*
 

.gitpod.yml

@@ -33,6 +33,7 @@ tasks:
       gp sync-await init &&
       cp .env.example .env &&
       sed -i -r "s#^(WEBAPP_URL=).*#\1 $(gp url 3000)#" .env &&
+      sed -i -r "s#^(NEXTAUTH_URL=).*#\1 $(gp url 3000)#" .env &&
       RANDOM_ENCRYPTION_KEY=$(openssl rand -hex 32)
       sed -i 's/^ENCRYPTION_KEY=.*/ENCRYPTION_KEY='"$RANDOM_ENCRYPTION_KEY"'/' .env
       turbo --filter "@formbricks/web" go

.husky/pre-commit

@@ -1 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
 pnpm lint-staged

.kamal/hooks/post-deploy.sample

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# A sample post-deploy hook
+#
+# These environment variables are available:
+# KAMAL_RECORDED_AT
+# KAMAL_PERFORMER
+# KAMAL_VERSION
+# KAMAL_HOSTS
+# KAMAL_ROLE (if set)
+# KAMAL_DESTINATION (if set)
+# KAMAL_RUNTIME
+
+echo "$KAMAL_PERFORMER deployed $KAMAL_VERSION to $KAMAL_DESTINATION in $KAMAL_RUNTIME seconds"

.kamal/hooks/post-traefik-reboot.sample

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "Rebooted Traefik on $KAMAL_HOSTS"

.kamal/hooks/pre-build.sample

@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# A sample pre-build hook
+#
+# Checks:
+# 1. We have a clean checkout
+# 2. A remote is configured
+# 3. The branch has been pushed to the remote
+# 4. The version we are deploying matches the remote
+#
+# These environment variables are available:
+# KAMAL_RECORDED_AT
+# KAMAL_PERFORMER
+# KAMAL_VERSION
+# KAMAL_HOSTS
+# KAMAL_ROLE (if set)
+# KAMAL_DESTINATION (if set)
+
+if [ -n "$(git status --porcelain)" ]; then
+  echo "Git checkout is not clean, aborting..." >&2
+  git status --porcelain >&2
+  exit 1
+fi
+
+first_remote=$(git remote)
+
+if [ -z "$first_remote" ]; then
+  echo "No git remote set, aborting..." >&2
+  exit 1
+fi
+
+current_branch=$(git branch --show-current)
+
+if [ -z "$current_branch" ]; then
+  echo "Not on a git branch, aborting..." >&2
+  exit 1
+fi
+
+remote_head=$(git ls-remote $first_remote --tags $current_branch | cut -f1)
+
+if [ -z "$remote_head" ]; then
+  echo "Branch not pushed to remote, aborting..." >&2
+  exit 1
+fi
+
+if [ "$KAMAL_VERSION" != "$remote_head" ]; then
+  echo "Version ($KAMAL_VERSION) does not match remote HEAD ($remote_head), aborting..." >&2
+  exit 1
+fi
+
+exit 0

.kamal/hooks/pre-connect.sample

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+# A sample pre-connect check
+#
+# Warms DNS before connecting to hosts in parallel
+#
+# These environment variables are available:
+# KAMAL_RECORDED_AT
+# KAMAL_PERFORMER
+# KAMAL_VERSION
+# KAMAL_HOSTS
+# KAMAL_ROLE (if set)
+# KAMAL_DESTINATION (if set)
+# KAMAL_RUNTIME
+
+hosts = ENV["KAMAL_HOSTS"].split(",")
+results = nil
+max = 3
+
+elapsed = Benchmark.realtime do
+  results = hosts.map do |host|
+    Thread.new do
+      tries = 1
+
+      begin
+        Socket.getaddrinfo(host, 0, Socket::AF_UNSPEC, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME)
+      rescue SocketError
+        if tries < max
+          puts "Retrying DNS warmup: #{host}"
+          tries += 1
+          sleep rand
+          retry
+        else
+          puts "DNS warmup failed: #{host}"
+          host
+        end
+      end
+
+      tries
+    end
+  end.map(&:value)
+end
+
+retries = results.sum - hosts.size
+nopes = results.count { |r| r == max }
+
+puts "Prewarmed %d DNS lookups in %.2f sec: %d retries, %d failures" % [ hosts.size, elapsed, retries, nopes ]

.kamal/hooks/pre-deploy.sample

@@ -0,0 +1,109 @@
+#!/usr/bin/env ruby
+
+# A sample pre-deploy hook
+#
+# Checks the Github status of the build, waiting for a pending build to complete for up to 720 seconds.
+#
+# Fails unless the combined status is "success"
+#
+# These environment variables are available:
+# KAMAL_RECORDED_AT
+# KAMAL_PERFORMER
+# KAMAL_VERSION
+# KAMAL_HOSTS
+# KAMAL_COMMAND
+# KAMAL_SUBCOMMAND
+# KAMAL_ROLE (if set)
+# KAMAL_DESTINATION (if set)
+
+# Only check the build status for production deployments
+if ENV["KAMAL_COMMAND"] == "rollback" || ENV["KAMAL_DESTINATION"] != "production"
+  exit 0
+end
+
+require "bundler/inline"
+
+# true = install gems so this is fast on repeat invocations
+gemfile(true, quiet: true) do
+  source "https://rubygems.org"
+
+  gem "octokit"
+  gem "faraday-retry"
+end
+
+MAX_ATTEMPTS = 72
+ATTEMPTS_GAP = 10
+
+def exit_with_error(message)
+  $stderr.puts message
+  exit 1
+end
+
+class GithubStatusChecks
+  attr_reader :remote_url, :git_sha, :github_client, :combined_status
+
+  def initialize
+    @remote_url = `git config --get remote.origin.url`.strip.delete_prefix("https://github.com/")
+    @git_sha = `git rev-parse HEAD`.strip
+    @github_client = Octokit::Client.new(access_token: ENV["GITHUB_TOKEN"])
+    refresh!
+  end
+
+  def refresh!
+    @combined_status = github_client.combined_status(remote_url, git_sha)
+  end
+
+  def state
+    combined_status[:state]
+  end
+
+  def first_status_url
+    first_status = combined_status[:statuses].find { |status| status[:state] == state }
+    first_status && first_status[:target_url]
+  end
+
+  def complete_count
+    combined_status[:statuses].count { |status| status[:state] != "pending"}
+  end
+
+  def total_count
+    combined_status[:statuses].count
+  end
+
+  def current_status
+    if total_count > 0
+      "Completed #{complete_count}/#{total_count} checks, see #{first_status_url} ..."
+    else
+      "Build not started..."
+    end
+  end
+end
+
+
+$stdout.sync = true
+
+puts "Checking build status..."
+attempts = 0
+checks = GithubStatusChecks.new
+
+begin
+  loop do
+    case checks.state
+    when "success"
+      puts "Checks passed, see #{checks.first_status_url}"
+      exit 0
+    when "failure"
+      exit_with_error "Checks failed, see #{checks.first_status_url}"
+    when "pending"
+      attempts += 1
+    end
+
+    exit_with_error "Checks are still pending, gave up after #{MAX_ATTEMPTS * ATTEMPTS_GAP} seconds" if attempts == MAX_ATTEMPTS
+
+    puts checks.current_status
+    sleep(ATTEMPTS_GAP)
+    checks.refresh!
+  end
+rescue Octokit::NotFound
+  exit_with_error "Build status could not be found"
+end

.kamal/hooks/pre-traefik-reboot.sample

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "Rebooting Traefik on $KAMAL_HOSTS..."

README.md

@@ -160,7 +160,7 @@ Here is what you need to be able to run Formbricks:
 
 ### Local Setup
 
-To get started locally, we've got a [guide to help you](https://formbricks.com/docs/developer-docs/contributing/get-started#local-machine-setup).
+To get started locally, we've got a [guide to help you](https://formbricks.com/docs/contributing/setup).
 
 ### Gitpod Setup
 
@@ -184,7 +184,7 @@ Here are a few options:
 
 - Upvote issues with 👍 reaction so we know what the demand for a particular issue is to prioritize it within the roadmap.
 
-Please check out [our contribution guide](https://formbricks.com/docs/developer-docs/contributing/get-started) and our [list of open issues](https://github.com/formbricks/formbricks/issues) for more information.
+Please check out [our contribution guide](https://formbricks.com/docs/contributing/introduction) and our [list of open issues](https://github.com/formbricks/formbricks/issues) for more information.
 
 ## All Thanks To Our Contributors
 

apps/demo/package.json

@@ -13,8 +13,8 @@
   "dependencies": {
     "@formbricks/js": "workspace:*",
     "@formbricks/ui": "workspace:*",
-    "lucide-react": "^0.418.0",
-    "next": "14.2.5",
+    "lucide-react": "^0.395.0",
+    "next": "14.2.4",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   },

apps/demo/pages/app/index.tsx

@@ -62,7 +62,7 @@ const AppPage = ({}) => {
   return (
     <div className="h-screen bg-white px-12 py-6 dark:bg-slate-800">
       <div className="flex flex-col justify-between md:flex-row">
-        <div className="flex flex-col items-center gap-2 sm:flex-row">
+        <div className="flex items-center gap-2">
           <SurveySwitch value="app" formbricks={formbricks} />
           <div>
             <h1 className="text-2xl font-bold text-slate-900 dark:text-white">
@@ -140,7 +140,7 @@ const AppPage = ({}) => {
 
           <div className="p-6">
             <div>
-              <button className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600">
+              <button className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700  dark:bg-slate-700 dark:hover:bg-slate-600">
                 No-Code Action
               </button>
             </div>
@@ -169,7 +169,7 @@ const AppPage = ({}) => {
                 onClick={() => {
                   formbricks.setAttribute("Plan", "Free");
                 }}
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600">
+                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700  dark:bg-slate-700 dark:hover:bg-slate-600">
                 Set Plan to &apos;Free&apos;
               </button>
             </div>
@@ -192,7 +192,7 @@ const AppPage = ({}) => {
                 onClick={() => {
                   formbricks.setAttribute("Plan", "Paid");
                 }}
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600">
+                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700  dark:bg-slate-700 dark:hover:bg-slate-600">
                 Set Plan to &apos;Paid&apos;
               </button>
             </div>
@@ -215,7 +215,7 @@ const AppPage = ({}) => {
                 onClick={() => {
                   formbricks.setEmail("test@web.com");
                 }}
-                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600">
+                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700  dark:bg-slate-700 dark:hover:bg-slate-600">
                 Set Email
               </button>
             </div>

apps/demo/pages/website/index.tsx

@@ -58,7 +58,7 @@ const AppPage = ({}) => {
   return (
     <div className="h-screen bg-white px-12 py-6 dark:bg-slate-800">
       <div className="flex flex-col items-center justify-between md:flex-row">
-        <div className="flex flex-col items-center gap-2 sm:flex-row">
+        <div className="flex items-center gap-2">
           <SurveySwitch value="website" formbricks={formbricks} />
           <div>
             <h1 className="text-2xl font-bold text-slate-900 dark:text-white">

apps/docs/app/app-surveys/advanced-targeting/page.mdx

@@ -17,17 +17,11 @@ export const metadata = {
 
 # Advanced Targeting
 
-<Note>
-  Targeting based on actions is deprecated in Advanced Targeting and will be removed soon. We recommend using
-  filters on user attributes to target the survey only to specific groups of users.
-</Note>
+Advanced Targeting allows you to show surveys to the right group of people. You can target surveys based on user attributes, user events, and more instead of spraying and praying. This helps you get more relevant feedback and make data-driven decisions. All of this without writing a single line of code.
 
-Advanced Targeting allows you to show surveys to the right group of people. You can target surveys based on user attributes, device type, and more instead of spraying and praying. This helps you get more relevant feedback and make data-driven decisions. All of this without writing a single line of code.
+<ResponsiveVideo title="Formbricks Multi-language Surveys"
+ src="https://www.youtube-nocookie.com/embed/0BQp6N4cXzU?si=KeBM7G7Ch1xtrsOm&amp;controls=0" />
 
-<ResponsiveVideo
-  title="Formbricks Multi-language Surveys"
-  src="https://www.youtube-nocookie.com/embed/0BQp6N4cXzU?si=KeBM7G7Ch1xtrsOm&amp;controls=0"
-/>
 
 ## How to setup Advanced Targeting
 

apps/docs/app/app-surveys/framework-guides/page.mdx

@@ -69,18 +69,18 @@ Refer to our [Example HTML project](https://github.com/formbricks/examples/tree/
 
 ## ReactJS
 
-Install the Formbricks SDK using one of the package managers ie `npm`,`pnpm`,`yarn`. Note that zod is required as a peer dependency must also be installed in your project.
+Install the Formbricks SDK using one of the package managers ie `npm`,`pnpm`,`yarn`.
 
 <Col>
 <CodeGroup title="Install Formbricks JS library">
 ```shell {{ title: 'npm' }}
-npm install @formbricks/js zod
+npm install @formbricks/js
 ```
 ```shell {{ title: 'pnpm' }}
-pnpm add @formbricks/js zod
+pnpm add @formbricks/js
 ```
 ```shell {{ title: 'yarn' }}
-yarn add @formbricks/js zod
+yarn add @formbricks/js
 ```
 
 </CodeGroup>
@@ -142,13 +142,13 @@ Code snippets for the integration for both conventions are provided to further a
 <Col>
 <CodeGroup title="Install Formbricks JS library">
 ```shell {{ title: 'npm' }}
-npm install @formbricks/js zod
+npm install @formbricks/js
 ```
 ```shell {{ title: 'pnpm' }}
-pnpm add @formbricks/js zod
+pnpm add @formbricks/js
 ```
 ```shell {{ title: 'yarn' }}
-yarn add @formbricks/js zod
+yarn add @formbricks/js
 ```
 
 </CodeGroup>
@@ -164,6 +164,7 @@ yarn add @formbricks/js zod
 
 import { usePathname, useSearchParams } from "next/navigation";
 import { useEffect } from "react";
+
 import formbricks from "@formbricks/js/app";
 
 export default function FormbricksProvider() {
@@ -217,6 +218,7 @@ Refer to our [Example NextJS App Directory project](https://github.com/formbrick
 // other import
 import { useRouter } from "next/router";
 import { useEffect } from "react";
+
 import formbricks from "@formbricks/js/app";
 
 if (typeof window !== "undefined") {

apps/docs/app/developer-docs/contributing/codespaces/page.mdx

@@ -1,66 +0,0 @@
-import { MdxImage } from "@/components/MdxImage";
-
-
-import GithubCodespaceLoading from "./images/loading.webp";
-import GithubCodespaceNew from "./images/new.webp";
-import GithubCodespacePorts from "./images/ports.webp";
-
-
-export const metadata = {
-  title: "Formbricks Open Source Contribution Guide: How to Enhance yourself and Contribute to Formbricks",
-  description:
-    "Join the Formbricks community and learn how to effectively contribute. From raising issues and feature requests to creating PRs, discover the best practices and communicate with our responsive team on Discord",
-};
-
-#### Contributing
-
-# Github Codespaces Guide
-
-1. After clicking the one-click setup button, you will be redirected to the Github Codespaces page. Review the configuration and click on the 'Create Codespace' button to create a new Codespace.
-
-<MdxImage
-  src={GithubCodespaceNew}
-  alt="New Github Codespace"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-2. This will start loading the Codespace. Keep in mind this might take a few minutes to complete depending on your internet connection and the instance availability.
-
-<MdxImage
-  src={GithubCodespaceLoading}
-  alt="Loading Github Codespace"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-3. Once the Codespace is loaded, you will be redirected to the VSCode editor. You can start working on your project in this environment.
-
-4. Monitor the logs in the terminal and once you see the following, you are good to go!
-
-<Col>
-<CodeGroup title="The WebApp is running">
-
-```bash
-@formbricks/web:dev:   ▲ Next.js 13.5.6
-@formbricks/web:dev:   - Local:        http://localhost:3000
-@formbricks/web:dev:   - Environments: .env
-@formbricks/web:dev:   - Experiments (use at your own risk):
-@formbricks/web:dev:      · serverActions
-@formbricks/web:dev:
-@formbricks/web:dev:  ✓ Ready in 9.4s
-```
-
-</CodeGroup>
-</Col>
-
-5. Right next to the Terminal, you will see a **Ports** tab, click on it to see the ports and their respective URLs. Now access the Forwarded Address for port 3000 and you should be able to visit your Formbricks App!
-
-<MdxImage
-  src={GithubCodespacePorts}
-  alt="Github Codespace Ports"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-Now make the changes you want to and see them live in action!

apps/docs/app/developer-docs/contributing/get-started/page.mdx

@@ -1,168 +0,0 @@
-import { MdxImage } from "@/components/MdxImage";
-
-export const metadata = {
-  title: "Formbricks Open Source Contribution Guide: How to Enhance yourself and Contribute to Formbricks",
-  description:
-    "Join the Formbricks community and learn how to effectively contribute. From raising issues and feature requests to creating PRs, discover the best practices and communicate with our responsive team on Discord",
-};
-
-#### Contributing
-
-# Get started
-
-We are so happy that you are interested in contributing to Formbricks 🤗 There are many ways to contribute to Formbricks like writing issues, fixing bugs, building new features or updating the docs.
-
-- **Issues**: Spotted a bug? Has deployment gone wrong? Do you have user feedback? [Raise an issue](https://github.com/formbricks/formbricks/issues/new/choose) for the fastest response.
-- **Feature requests**: Raise an issue for these and tag it as an Enhancement. We love every idea. Please [open a feature request](https://github.com/formbricks/formbricks/issues/new?assignees=&labels=enhancement&projects=&template=feature_request.yml&title=%5BFEATURE%5D) clearly describing the problem you want to solve.
-- **How we Code at Formbricks**: [View this Notion document](https://formbricks.notion.site/How-we-code-at-Formbricks-8bcaa0304a20445db4871831149c0cf5?pvs=4) and understand the coding practises we follow so that you can adhere to them for uniformity.
-- **Creating a PR**: Please fork the repository, make your changes and create a new pull request if you want to make an update.
-- **E2E Tests**: [Understand how we write E2E tests](https://formbricks.notion.site/Formbricks-End-to-End-Tests-06dc830d71604deaa8da24714540f7ab?pvs=4) and make sure to consider writing a test whenever you ship a feature.
-- **New Question Types**:[Follow this guide](https://formbricks.notion.site/Guidelines-for-Implementing-a-New-Question-Type-9ac0d1c362714addb24b9abeb326d1c1?pvs=4) to keep everything in mind when you want to add a new question type.
-- **How to create a service**: [Read this document to understand how we use services](https://formbricks.notion.site/How-to-create-a-service-8e0c035704bb40cb9ea5e5beeeeabd67?pvs=4). This is particulalry important when you need to write a new one.
-
-## Talk to us first
-
-We highly recommend connecting with us on [Discord server](https://formbricks.com/discord) before you ship a contribution. This will increase the likelihood of your PR being merged. And it will decrease the likelihood of you wasting your time :)
-
-## Contributor License Agreement (CLA)
-
-To be able to keep working on Formbricks over the coming years, we need to collect a CLA from all relevant contributors.
-
-Once you open a PR, you will get a message from the CLA bot to fill out the form. Please note that we can only get your contribution merged when we have a CLA signed by you.
-
-## Setup Dev Environment
-
-We currently officially support the below methods to set up your development environment for Formbricks:
-
-- [Gitpod](/docs/developer-docs/contributing/gitpod)
-- [GitHub Codespaces](/docs/developer-docs/contributing/codespaces)
-- [Local Machine Setup](#local-machine-setup)
-
-Both Gitpod and GitHub Codespaces have a **generous free tier** to explore and develop. For junior developers we suggest using either of these, because you can dive into coding within minutes, not hours.
-
-## Local Machine Setup
-
-<Note>
-The below only works for **Mac**, **Linux** & **WSL2** on Windows (not on pure Windows)!
-
-This method is recommended **only for advanced users** & we won't be able to provide official support for this.
-
-</Note>
-
-To get the project running locally on your machine you need to have the following development tools installed:
-
-- Node.JS (we recommend v20)
-- [pnpm](https://pnpm.io/)
-- [Docker](https://www.docker.com/) (to run PostgreSQL / MailHog)
-
-1. Clone the project & move into the directory:
-
-<Col>
-   <CodeGroup title="Git clone Formbricks monorepo">
-
-```bash
-git clone https://github.com/formbricks/formbricks && cd formbricks
-```
-
-   </CodeGroup>
-</Col>
-
-2. Install Node.JS packages via pnpm. Don't have pnpm? Get it [here](https://pnpm.io/installation)
-
-<Col>
-   <CodeGroup title="Install dependencies via pnpm">
-
-```bash
-pnpm install
-```
-
-   </CodeGroup>
-</Col>
-
-3. Create a `.env` file based on `.env.example`. It's already preset to work with the local development setup but you can also change values if needed.
-
-<Col>
-   <CodeGroup title="Define environment variables">
-
-```bash
-cp .env.example .env
-```
-
-   </CodeGroup>
-</Col>
-
-4. Generate & set some secret values mandatory for the `ENCRYPTION_KEY`, `NEXTAUTH_SECRET` and `CRON_SECRET` in the .env file. You can use the following command to generate the random string of required length:
-
-- For Linux
-<Col>
-   <CodeGroup title="For Linux">
-
-```bash
-sed -i '/^ENCRYPTION_KEY=/c\ENCRYPTION_KEY='$(openssl rand -hex 32) .env
-sed -i '/^NEXTAUTH_SECRET=/c\NEXTAUTH_SECRET='$(openssl rand -hex 32) .env
-sed -i '/^CRON_SECRET=/c\CRON_SECRET='$(openssl rand -hex 32) .env
-```
-
-   </CodeGroup>
-</Col>
-
-- For Mac   
-<Col>
-   <CodeGroup title="For Mac">
-
-```bash
-sed -i '' '/^ENCRYPTION_KEY=/s|.*|ENCRYPTION_KEY='$(openssl rand -hex 32)'|' .env
-sed -i '' '/^NEXTAUTH_SECRET=/s|.*|NEXTAUTH_SECRET='$(openssl rand -hex 32)'|' .env
-sed -i '' '/^CRON_SECRET=/s|.*|CRON_SECRET='$(openssl rand -hex 32)'|' .env
-```
-
-   </CodeGroup>
-</Col>
-
-5. Make sure you have [`Docker`](https://docs.docker.com/compose/) & [`docker-compose`](https://docs.docker.com/compose/) installed and running on your machine. Then run the following command to start the Formbricks dev setup:
-
-<Col>
-   <CodeGroup title="Start Formbricks Dev Setup">
-
-```bash
-pnpm go
-```
-
-   </CodeGroup>
-</Col>
-   This starts the Formbricks main app (plus all its dependencies) as well as the following services using Docker:
-
-- A `postgres` container for hosting your database,
-- A `mailhog` container that acts as a mock SMTP server and shows received mails in a web UI (forwarded to your host's `localhost:8025`)
-- Demo App at [http://localhost:3002](http://localhost:3002)
-- Landing Page at [http://localhost:3001](http://localhost:3001)
-
-<Note>
-  **WSL2 users**: If you encounter connection issues with Prisma, ensure your WSL2 instance's PostgreSQL
-  service is stopped before running `pnpm go`. Use the command `sudo systemctl stop postgresql` to stop the
-  service.
-</Note>
-
-**You can now access the Formbricks app on [http://localhost:3000](http://localhost:3000)**. You will be automatically redirected to the login. To use your local installation of formbricks, create a new account.
-
-{" "}
-
-<Note>
-  A fresh setup does not have a default account. Please create a new account and proceed accordingly.
-</Note>
-
-For viewing the emails sent by the system, you can access mailhog at [http://localhost:8025](http://localhost:8025)
-
-### Build
-
-To build all apps and packages and check for build errors, run the following command:
-
-<Col>
-<CodeGroup title="Build Formbricks stack">
-
-```bash
-pnpm build
-```
-
-</CodeGroup>
-</Col>

apps/docs/app/developer-docs/contributing/gitpod/page.mdx

@@ -1,172 +0,0 @@
-import { MdxImage } from "@/components/MdxImage";
-
-import GitpodAuth from "./images/auth.webp";
-import GitpodNewWorkspace from "./images/new-workspace.webp";
-import GitpodPorts from "./images/ports.webp";
-import GitpodPreparing from "./images/preparing.webp";
-import GitpodRunning from "./images/running.webp";
-
-export const metadata = {
-  title: "Formbricks Open Source Contribution Guide: How to Enhance yourself and Contribute to Formbricks",
-  description:
-    "Join the Formbricks community and learn how to effectively contribute. From raising issues and feature requests to creating PRs, discover the best practices and communicate with our responsive team on Discord",
-};
-
-#### Contributing
-
-# Gitpod Guide
-
-    **Building custom image for the workspace:**
-    - This includes : Installing `yq` and `turbo` globally before the workspace starts. This is accomplished within the `.gitpod.Dockerfile` along with starting upon a base custom image building on [workspace-full](https://hub.docker.com/r/workspace-full/dockerfile).
-
-    **Initialization of Formbricks:**
-     - During the prebuilds phase, we initialize Formbricks by performing the following tasks:
-        1. Setting up environment variables.
-        2. Installing monorepo dependencies.
-        3. Installing Docker images by extracting them from the `packages/database/docker-compose.yml` file.
-        4. Building the @formbricks/js component.
-     - When the workspace starts:
-        1. Wait for the web and demo apps to launch on Gitpod. This automatically opens the `apps/demo/.env` file. Utilize dynamic localhost URLs (e.g., `localhost:3000` for signup and `localhost:8025` for email confirmation) to configure `NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID`. After creating your account and finding the `ID` in the URL at `localhost:3000`, replace `YOUR_ENVIRONMENT_ID` in the `.env` file located in `app/demo`.
-
-    **Web Component Initialization:**
-     - We initialize the @formbricks/web component during prebuilds. This involves:
-        1. Installing build dependencies for the `@formbricks/web#go` task from turbo.json in prebuilds to save time.
-        2. Starting PostgreSQL and Mailhog containers for running migrations in prebuilds.
-        3. To prevent the "Init" task from running indefinitely due to prebuild rules, a cleanup `docker compose down` step i.e. `db:down` is added to `turbo.json`. This step is designed to halt the execution of containers that are currently running.
-     - When the workspace starts:
-        1. Initializing environment variables.
-        2. Replacing `NEXT_PUBLIC_WEBAPP_URL` to take in Gitpod URL's ports when running on VSCode browser.
-        3. Starting the `@formbricks/web` dev environment.
-
-    **Demo Component Initialization:**
-     - Similar to the web component, the demo component is also initialized during prebuilds. This includes:
-        1. Installing build dependencies for the `formbricks/demo#go` task from turbo.json in prebuilds to save time.
-        2. Caching hits and replaying builds from the `@formbricks/js` component.
-     - When the workspace starts:
-        1. Initializing environment variables.
-        2. Replaces `NEXT_PUBLIC_FORMBRICKS_API_HOST` to take in Gitpod URL's ports when running on VSCode browser.
-        3. Starting the `@formbricks/demo` dev environment.
-
-    **Github Prebuilds Configuration:**
-     - This configures Github Prebuilds for the master branch, pull requests, and adding comments. This helps automate the prebuild process for the specified branches and actions.
-
-    **VSCode Extensions:**
-     - This includes a list of VSCode extensions that are added to the configuration when using Gitpod. These extensions can enhance the development experience within Gitpod.
-
-### 1. Browser Redirection
-
-After clicking the one-click setup button, Gitpod will open a new tab or window. Please ensure that your browser allows redirection to successfully access the services:
-
-### 2. Authorizing in Gitpod
-
-<MdxImage
-  src={GitpodAuth}
-  alt="Gitpod Auth Page"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-- This is the Gitpod Authentication Page. It appears when you click the "Open in GitPod" button and Gitpod
-needs to authenticate your access to the workspace. Click on 'Continue With Github' to authorize your GitPod
-session.
-
-### 3. Creating a New Workspace
-
-<MdxImage
-  src={GitpodNewWorkspace}
-  alt="Gitpod New workspace Page"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-- After authentication, Gitpod asks to create a new workspace for you. This page displays the configurations
-of your workspace. - You can use either choose either VS Code Browser or VS Code Desktop editor with the
-'Standard Class' for your workspace class. - If you opt for the VS Code Desktop, follow the following steps 1.
-Gitpod will prompt you to grant access to the VSCode app. Once approved, install the GitPod extension from the
-VSCode Marketplace and follow the prompts to authorize the integration. 2. Change the `WEBAPP_URL` to
-`https://localhost:3000`
-
-### 4. Gitpod preparing the created Workspace
-
-<MdxImage
-  src={GitpodPreparing}
-  alt="Gitpod Preparing workspace Page"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-- Gitpod is preparing your workspace with all the necessary dependencies and configurations. You will see this
-page while Gitpod sets up your development environment.
-
-### 5. Gitpod running the Workspace
-
-<MdxImage
-  src={GitpodRunning}
-  alt="Gitpod Running Workspace Page"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-- Once the workspace is fully prepared, voila, it enters the running state. You can start working on your
-project in this environment.
-
-### Ports and Services
-
-Here are the ports and corresponding URLs for the services within your Gitpod environment:
-
-- **Port 3000**:
-
-  - **Service**: Demo App
-  - **Description**: This port hosts the demo application of your project. You can access and interact with your application's demo by navigating to this port.
-
-- **Port 3001**:
-
-  - **Service**: Formbricks website
-  - **Description**: This port hosts the [Formbricks](https://formbricks.com) website, which contains documents, pricing, blogs, best practices, and concierge service.
-
-- **Port 3002**:
-
-  - **Service**: Formbricks In-product Survey Demo App
-  - **Description**: This app helps you test your app & website surveys. You can create and test user actions, create and update user attributes, etc.
-
-- **Port 5432**:
-
-  - **Service**: PostgreSQL Database Server
-  - **Description**: The PostgreSQL DB is hosted on this port.
-
-- **Port 1025**:
-
-  - **Service**: SMTP server
-  - **Description**: SMTP Server for sending and receiving email messages. This server is responsible for handling email communication.
-
-- **Port 8025**:
-  - **Service**: Mailhog
-
-### Accessing port URLs
-
-1. **Direct URL Composition**:
-
-- You can access the dedicated port URL by pre-pending the port number to the workspace URL.
-- For example, if you want to access port 3000, you can use the URL format: `3000-yourworkspace.ws-eu45.gitpod.io`.
-
-2. **Using [gp CLI](https://www.gitpod.io/docs/references-cli)**:
-
-- Gitpod provides a convenient command, `gp url`, to quickly retrieve the URL for a specific port.
-- Simply use the command followed by the desired port number. For example, to get the URL for port 3000, run: `gp url 3000`.
-
-3. **Listing All Open Port URLs**:
-
-- If you prefer to see a list of all open port URLs at once, you can use the `gp ports list` command.
-- Running this command will display a list of ports along with their corresponding URLs.
-
-4. **Viewing All Ports in Panel**:
-
-- Gitpod also offers a user-friendly 'Ports' tab in the Gitpod panel.
-- Click on the 'Ports' tab to view a list of all open ports and their respective URLs.
-
-{" "}
-
-<MdxImage
-  src={GitpodPorts}
-  alt="Gitpod Ports tab"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-These URLs and port numbers represent various services and endpoints within your Gitpod environment. You can access and interact with these services by the Port URL for the respective service.

apps/docs/app/developer-docs/contributing/page.mdx

@@ -0,0 +1,469 @@
+import { MdxImage } from "@/components/MdxImage";
+
+import GitpodAuth from "./images/gitpod/auth.webp";
+import GitpodNewWorkspace from "./images/gitpod/new-workspace.webp";
+import GitpodPorts from "./images/gitpod/ports.webp";
+import GitpodPreparing from "./images/gitpod/preparing.webp";
+import GitpodRunning from "./images/gitpod/running.webp";
+
+import GithubCodespaceLoading from "./images/github-codespaces/loading.webp";
+import GithubCodespaceNew from "./images/github-codespaces/new.webp";
+import GithubCodespacePorts from "./images/github-codespaces/ports.webp";
+
+import ClearAppData from "./images/troubleshooting/clear-app-data.webp";
+import Logout from "./images/troubleshooting/logout.webp";
+import UncaughtPromise from "./images/troubleshooting/uncaught-promise.webp";
+
+export const metadata = {
+  title: "Formbricks Open Source Contribution Guide: How to Enhance yourself and Contribute to Formbricks",
+  description:
+    "Join the Formbricks community and learn how to effectively contribute. From raising issues and feature requests to creating PRs, discover the best practices and communicate with our responsive team on Discord",
+};
+
+#### Contributing
+
+# Overview
+
+We are so happy that you are interested in contributing to Formbricks 🤗 There are many ways to contribute to Formbricks with writing Issues, fixing bugs, building new features or updating the docs.
+
+- **Issues**: Spotted a bug? Has deployment gone wrong? Do you have user feedback? [Raise an issue](https://github.com/formbricks/formbricks/issues/new/choose) for the fastest response.
+- **Feature requests**: Raise an issue for these and tag it as an Enhancement. We love every idea. Please give us as much context on the why as possible.
+- **Creating a PR**: Please fork the repository, make your changes and create a new pull request if you want to make an update.
+  - **E2E Tests**: Understand how we write E2E tests and make sure to write whenever you ship a feature [here](https://www.notion.so/Formbricks-End-to-End-Tests-06dc830d71604deaa8da24714540f7ab?pvs=21).
+  - **Introducing a new Question Type?**: Adding a new question type to our surveys? Follow this guide to make sure you’re on the right track [here](https://www.notion.so/Guidelines-for-Implementing-a-New-Question-Type-9ac0d1c362714addb24b9abeb326d1c1?pvs=21).
+  - **How we Code at Formbricks**: View this Notion document and understand the coding practises we follow so that you can adhere to them for uniformity.
+  - **How to create a service**: Services are our Database abstraction layer where we connect Prisma (our DB ORM) with logical methods that are reusable across the server. View this document to understand when & how to write them.
+- **Roadmap**: Our roadmap is open on GitHub tickets and some customer and community tickets on GitHub.
+
+If you want to speak to us before doing lots of work, please join our **[Discord server](https://formbricks.com/discord)** and tell us what you would like to work on - we're very responsive and friendly!
+
+## Contributor License Agreement (CLA)
+
+To be able to keep working on Formbricks over the coming years, we need to collect a CLA from all relevant contributors.
+
+Once you open a PR, you will get a message from the CLA bot to fill out the form. Please note that we can only get your contribution merged when we have a CLA signed by you.
+
+## Setup Dev Environment
+
+We currently officially support the below methods to set up your development environment for Formbricks.
+
+<Note>
+  Both the below cloud IDEs have a **generous free tier** to explore and develop! But make sure to not overuse
+  the machines as Formbricks will not be responsible for any charges incurred.
+</Note>
+
+### GitPod
+
+This will open a fully configured workspace in your browser with all the necessary dependencies already installed. Click the button below to open this project in Gitpod. For a detailed guide, visit the **Gitpod Setup Guide** section below.
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://Github.com/formbricks/formbricks)
+
+### Github Codespaces
+
+This will open a Github VSCode Interface on the cloud for you. This setup will have the Formbricks codebase, all the dependencies installed & Formbricks running. Click the button below to configure your instance and open the project in Github Codespaces. For a detailed guide, visit the **Github Codespaces Setup Guide** section below.
+
+[![Open in Github Codespaces](https://img.shields.io/badge/Open%20in-Github%20Codespaces-blue?logo=Github)](https://Github.com/codespaces/new?machine=standardLinux32gb&repo=500289888&ref=main&devcontainer_path=.devcontainer%2Fdevcontainer.json&location=EastUs2)
+
+### Local Machine
+
+This will install the Formbricks codebase and all the dependencies on your local machine. Note that this method is recommended **only for advanced users**. If you're an advanced user, access the steps for **Local Machine Setup here** below.
+
+<Note>
+  For a smooth experience, we suggest the above cloud IDE methods. Assistance with setup issues on your local
+  machine may be limited due to varying factors like OS and permissions.
+</Note>
+
+## Gitpod Guide
+
+    **Building custom image for the workspace:**
+    - This includes : Installing `yq` and `turbo` globally before the workspace starts. This is accomplished within the `.gitpod.Dockerfile` along with starting upon a base custom image building on [workspace-full](https://hub.docker.com/r/gitpod/workspace-full/dockerfile).
+
+    **Initialization of Formbricks:**
+     - During the prebuilds phase, we initialize Formbricks by performing the following tasks:
+        1. Setting up environment variables.
+        2. Installing monorepo dependencies.
+        3. Installing Docker images by extracting them from the `packages/database/docker-compose.yml` file.
+        4. Building the @formbricks/js component.
+     - When the workspace starts:
+        1. Wait for the web and demo apps to launch on Gitpod. This automatically opens the `apps/demo/.env` file. Utilize dynamic localhost URLs (e.g., `localhost:3000` for signup and `localhost:8025` for email confirmation) to configure `NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID`. After creating your account and finding the `ID` in the URL at `localhost:3000`, replace `YOUR_ENVIRONMENT_ID` in the `.env` file located in `app/demo`.
+
+    **Web Component Initialization:**
+     - We initialize the @formbricks/web component during prebuilds. This involves:
+        1. Installing build dependencies for the `@formbricks/web#go` task from turbo.json in prebuilds to save time.
+        2. Starting PostgreSQL and Mailhog containers for running migrations in prebuilds.
+        3. To prevent the "Init" task from running indefinitely due to prebuild rules, a cleanup `docker compose down` step i.e. `db:down` is added to `turbo.json`. This step is designed to halt the execution of containers that are currently running.
+     - When the workspace starts:
+        1. Initializing environment variables.
+        2. Replacing `NEXT_PUBLIC_WEBAPP_URL` and `NEXTAUTH_URL` to take in Gitpod URL's ports when running on VSCode browser.
+        3. Starting the `@formbricks/web` dev environment.
+
+    **Demo Component Initialization:**
+     - Similar to the web component, the demo component is also initialized during prebuilds. This includes:
+        1. Installing build dependencies for the `formbricks/demo#go` task from turbo.json in prebuilds to save time.
+        2. Caching hits and replaying builds from the `@formbricks/js` component.
+     - When the workspace starts:
+        1. Initializing environment variables.
+        2. Replaces `NEXT_PUBLIC_FORMBRICKS_API_HOST` to take in Gitpod URL's ports when running on VSCode browser.
+        3. Starting the `@formbricks/demo` dev environment.
+
+    **Github Prebuilds Configuration:**
+     - This configures Github Prebuilds for the master branch, pull requests, and adding comments. This helps automate the prebuild process for the specified branches and actions.
+
+    **VSCode Extensions:**
+     - This includes a list of VSCode extensions that are added to the configuration when using Gitpod. These extensions can enhance the development experience within Gitpod.
+
+### 1. Browser Redirection
+
+After clicking the one-click setup button, Gitpod will open a new tab or window. Please ensure that your browser allows redirection to successfully access the services:
+
+### 2. Authorizing in Gitpod
+
+<MdxImage
+  src={GitpodAuth}
+  alt="Gitpod Auth Page"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+- This is the Gitpod Authentication Page. It appears when you click the "Open in GitPod" button and Gitpod needs
+to authenticate your access to the workspace. Click on 'Continue With Github' to authorize your GitPod session.
+
+### 3. Creating a New Workspace
+
+<MdxImage
+  src={GitpodNewWorkspace}
+  alt="Gitpod New workspace Page"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+- After authentication, Gitpod asks to create a new workspace for you. This page displays the configurations of
+your workspace. - You can use either choose either VS Code Browser or VS Code Desktop editor with the 'Standard
+Class' for your workspace class. - If you opt for the VS Code Desktop, follow the following steps 1. Gitpod will
+prompt you to grant access to the VSCode app. Once approved, install the GitPod extension from the VSCode Marketplace
+and follow the prompts to authorize the integration. 2. Change the `WEBAPP_URL` and the `NEXTAUTH_URL` to `https://localhost:3000`
+
+### 4. Gitpod preparing the created Workspace
+
+<MdxImage
+  src={GitpodPreparing}
+  alt="Gitpod Preparing workspace Page"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+- Gitpod is preparing your workspace with all the necessary dependencies and configurations. You will see this
+page while Gitpod sets up your development environment.
+
+### 5. Gitpod running the Workspace
+
+<MdxImage
+  src={GitpodRunning}
+  alt="Gitpod Running Workspace Page"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+- Once the workspace is fully prepared, voila, it enters the running state. You can start working on your project
+in this environment.
+
+### Ports and Services
+
+Here are the ports and corresponding URLs for the services within your Gitpod environment:
+
+- **Port 3000**:
+
+  - **Service**: Demo App
+  - **Description**: This port hosts the demo application of your project. You can access and interact with your application's demo by navigating to this port.
+
+- **Port 3001**:
+
+  - **Service**: Formbricks website
+  - **Description**: This port hosts the [Formbricks](https://formbricks.com) website, which contains documents, pricing, blogs, best practices, and concierge service.
+
+- **Port 3002**:
+
+  - **Service**: Formbricks In-product Survey Demo App
+  - **Description**: This app helps you test your app & website surveys. You can create and test user actions, create and update user attributes, etc.
+
+- **Port 5432**:
+
+  - **Service**: PostgreSQL Database Server
+  - **Description**: The PostgreSQL DB is hosted on this port.
+
+- **Port 1025**:
+
+  - **Service**: SMTP server
+  - **Description**: SMTP Server for sending and receiving email messages. This server is responsible for handling email communication.
+
+- **Port 8025**:
+  - **Service**: Mailhog
+
+### Accessing port URLs
+
+1. **Direct URL Composition**:
+
+- You can access the dedicated port URL by pre-pending the port number to the workspace URL.
+- For example, if you want to access port 3000, you can use the URL format: `3000-yourworkspace.ws-eu45.gitpod.io`.
+
+2. **Using [gp CLI](https://www.gitpod.io/docs/references/gitpod-cli)**:
+
+- Gitpod provides a convenient command, `gp url`, to quickly retrieve the URL for a specific port.
+- Simply use the command followed by the desired port number. For example, to get the URL for port 3000, run: `gp url 3000`.
+
+3. **Listing All Open Port URLs**:
+
+- If you prefer to see a list of all open port URLs at once, you can use the `gp ports list` command.
+- Running this command will display a list of ports along with their corresponding URLs.
+
+4. **Viewing All Ports in Panel**:
+
+- Gitpod also offers a user-friendly 'Ports' tab in the Gitpod panel.
+- Click on the 'Ports' tab to view a list of all open ports and their respective URLs.
+
+{" "}
+
+<MdxImage
+  src={GitpodPorts}
+  alt="Gitpod Ports tab"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+
+These URLs and port numbers represent various services and endpoints within your Gitpod environment. You can access and interact with these services by the Port URL for the respective service.
+
+---
+
+## Github Codespaces Guide
+
+1. After clicking the one-click setup button, you will be redirected to the Github Codespaces page. Review the configuration and click on the 'Create Codespace' button to create a new Codespace.
+
+<MdxImage
+  src={GithubCodespaceNew}
+  alt="New Github Codespace"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+
+2. This will start loading the Codespace. Keep in mind this might take a few minutes to complete depending on your internet connection and the instance availability.
+
+<MdxImage
+  src={GithubCodespaceLoading}
+  alt="Loading Github Codespace"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+
+3. Once the Codespace is loaded, you will be redirected to the VSCode editor. You can start working on your project in this environment.
+
+4. Monitor the logs in the terminal and once you see the following, you are good to go!
+
+<Col>
+<CodeGroup title="The WebApp is running">
+
+```bash
+@formbricks/web:dev:   ▲ Next.js 13.5.6
+@formbricks/web:dev:   - Local:        http://localhost:3000
+@formbricks/web:dev:   - Environments: .env
+@formbricks/web:dev:   - Experiments (use at your own risk):
+@formbricks/web:dev:      · serverActions
+@formbricks/web:dev:
+@formbricks/web:dev:  ✓ Ready in 9.4s
+```
+
+</CodeGroup>
+</Col>
+
+5. Right next to the Terminal, you will see a **Ports** tab, click on it to see the ports and their respective URLs. Now access the Forwarded Address for port 3000 and you should be able to visit your Formbricks App!
+
+<MdxImage
+  src={GithubCodespacePorts}
+  alt="Github Codespace Ports"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+
+Now make the changes you want to and see them live in action!
+
+---
+
+## Local Machine Setup
+
+<Note>
+The below only works for **Mac**, **Linux** & **WSL2** on Windows (not on pure Windows)!
+
+This method is recommended **only for advanced users** & we won't be able to provide official support for this.
+
+</Note>
+
+To get the project running locally on your machine you need to have the following development tools installed:
+
+- Node.JS (we recommend v20)
+- [pnpm](https://pnpm.io/)
+- [Docker](https://www.docker.com/) (to run PostgreSQL / MailHog)
+
+1. Clone the project & move into the directory:
+
+<Col>
+   <CodeGroup title="Git clone Formbricks monorepo">
+
+```bash
+git clone https://github.com/formbricks/formbricks && cd formbricks
+```
+
+   </CodeGroup>
+</Col>
+
+2. Install Node.JS packages via pnpm. Don't have pnpm? Get it [here](https://pnpm.io/installation)
+
+<Col>
+   <CodeGroup title="Install dependencies via pnpm">
+
+```bash
+pnpm install
+```
+
+   </CodeGroup>
+</Col>
+
+3. Create a `.env` file based on `.env.example`. It's already preset to work with the local development setup but you can also change values if needed.
+
+<Col>
+   <CodeGroup title="Define environment variables">
+
+```bash
+cp .env.example .env
+```
+
+   </CodeGroup>
+</Col>
+
+4. Generate & set some secret values mandatory for the `ENCRYPTION_KEY` & `NEXTAUTH_SECRET` in the .env file. You can use the following command to generate the random string of required length:
+
+<Col>
+   <CodeGroup title="Set value of ENCRYPTION_KEY">
+
+```bash
+sed -i '/^ENCRYPTION_KEY=/c\ENCRYPTION_KEY='$(openssl rand -hex 32) .env
+sed -i '/^NEXTAUTH_SECRET=/c\NEXTAUTH_SECRET='$(openssl rand -hex 32) .env
+```
+
+   </CodeGroup>
+</Col>
+
+5. Make sure you have [`Docker`](https://docs.docker.com/compose/) & [`docker-compose`](https://docs.docker.com/compose/) installed and running on your machine. Then run the following command to start the Formbricks dev setup:
+
+<Col>
+   <CodeGroup title="Start Formbricks Dev Setup">
+
+```bash
+pnpm go
+```
+
+   </CodeGroup>
+</Col>
+   This starts the Formbricks main app (plus all its dependencies) as well as the following services using Docker:
+
+- A `postgres` container for hosting your database,
+- A `mailhog` container that acts as a mock SMTP server and shows received mails in a web UI (forwarded to your host's `localhost:8025`)
+- Demo App at [http://localhost:3002](http://localhost:3002)
+- Landing Page at [http://localhost:3001](http://localhost:3001)
+
+<Note>
+  **WSL2 users**: If you encounter connection issues with Prisma, ensure your WSL2 instance's PostgreSQL
+  service is stopped before running `pnpm go`. Use the command `sudo systemctl stop postgresql` to stop the
+  service.
+</Note>
+
+**You can now access the Formbricks app on [http://localhost:3000](http://localhost:3000)**. You will be automatically redirected to the login. To use your local installation of formbricks, create a new account.
+
+{" "}
+
+<Note>
+  A fresh setup does not have a default account. Please create a new account and proceed accordingly.
+</Note>
+
+For viewing the emails sent by the system, you can access mailhog at [http://localhost:8025](http://localhost:8025)
+
+### Build
+
+To build all apps and packages and check for build errors, run the following command:
+
+<Col>
+<CodeGroup title="Build Formbricks stack">
+
+```bash
+pnpm build
+```
+
+</CodeGroup>
+</Col>
+
+---
+
+# Troubleshooting
+
+Here you'll find help with frequently recurring problems
+
+## "The app doesn't work after doing a prisma migration"
+
+This can happen but fear not, the fix is easy: Delete the application storage of your browser and reload the page. This will force the app to re-fetch the data from the server:
+
+<MdxImage
+  src={ClearAppData}
+  alt="Demo App Preview"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+
+## "I ran 'pnpm i' but there seems to be an error with the packages"
+
+If nothing helps, run `pnpm clean` and then `pnpm i` again. This solves a lot.
+
+## "I get a full-screen error with cryptic strings"
+
+This usually happens when the Formbricks Widget wasn't correctly or completely built.
+
+<Col>
+<CodeGroup title="Build js library first and then run again">
+
+```bash
+pnpm build --filter=@formbricks/js
+
+// Run the app again
+pnpm dev
+```
+
+</CodeGroup>
+</Col>
+## My machine struggles with the repository
+
+Since we're working with a monorepo structure, the repository can get quite big. If you're having trouble working with the repository, try the following:
+
+<Col>
+<CodeGroup title="Only run the required project">
+
+```bash {{ title: 'Formbricks Web-App' }}
+pnpm dev --filter=@formbricks/web...
+```
+
+```bash {{ title: 'Formbricks Docs' }}
+pnpm dev --filter=@formbricks/docs...
+```
+
+```bash {{ title: 'Formbricks Demo App' }}
+pnpm dev --filter=@formbricks/demo...
+```
+
+</CodeGroup>
+</Col>
+However, in our experience it's better to run `pnpm dev` than having two terminals open (one with the Formbricks app and one with the demo).
+
+## Uncaught (in promise) SyntaxError: Unexpected token !DOCTYPE ... is not valid JSON
+
+<MdxImage
+  src={UncaughtPromise}
+  alt="Uncaught promise"
+  quality="100"
+  className="max-w-full rounded-lg sm:max-w-3xl"
+/>
+
+This happens when you're using the Demo App and delete the Person within the Formbricks app which the widget is currently connected with. We're fixing it, but you can also just logout your test person and reload the page to get rid of it.
+
+<MdxImage src={Logout} alt="Logout Person" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />

apps/docs/app/developer-docs/contributing/troubleshooting/page.mdx

@@ -1,84 +0,0 @@
-import { MdxImage } from "@/components/MdxImage";
-
-import ClearAppData from "./images/clear-app-data.webp";
-import Logout from "./images/logout.webp";
-import UncaughtPromise from "./images/uncaught-promise.webp";
-
-export const metadata = {
-  title: "Formbricks Open Source Contribution Guide: How to Enhance yourself and Contribute to Formbricks",
-  description:
-    "Join the Formbricks community and learn how to effectively contribute. From raising issues and feature requests to creating PRs, discover the best practices and communicate with our responsive team on Discord",
-};
-
-#### Contributing
-
-# Troubleshooting
-
-Here you'll find help with frequently recurring problems
-
-## "The app doesn't work after doing a prisma migration"
-
-This can happen but fear not, the fix is easy: Delete the application storage of your browser and reload the page. This will force the app to re-fetch the data from the server:
-
-<MdxImage
-  src={ClearAppData}
-  alt="Demo App Preview"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-## "I ran 'pnpm i' but there seems to be an error with the packages"
-
-If nothing helps, run `pnpm clean` and then `pnpm i` again. This solves a lot.
-
-## "I get a full-screen error with cryptic strings"
-
-This usually happens when the Formbricks Widget wasn't correctly or completely built.
-
-<Col>
-<CodeGroup title="Build js library first and then run again">
-
-```bash
-pnpm build --filter=@formbricks/js
-
-// Run the app again
-pnpm dev
-```
-
-</CodeGroup>
-</Col>
-## My machine struggles with the repository
-
-Since we're working with a monorepo structure, the repository can get quite big. If you're having trouble working with the repository, try the following:
-
-<Col>
-<CodeGroup title="Only run the required project">
-
-```bash {{ title: 'Formbricks Web-App' }}
-pnpm dev --filter=@formbricks/web...
-```
-
-```bash {{ title: 'Formbricks Docs' }}
-pnpm dev --filter=@formbricks/docs...
-```
-
-```bash {{ title: 'Formbricks Demo App' }}
-pnpm dev --filter=@formbricks/demo...
-```
-
-</CodeGroup>
-</Col>
-However, in our experience it's better to run `pnpm dev` than having two terminals open (one with the Formbricks app and one with the demo).
-
-## Uncaught (in promise) SyntaxError: Unexpected token !DOCTYPE ... is not valid JSON
-
-<MdxImage
-  src={UncaughtPromise}
-  alt="Uncaught promise"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-This happens when you're using the Demo App and delete the Person within the Formbricks app which the widget is currently connected with. We're fixing it, but you can also just logout your test person and reload the page to get rid of it.
-
-<MdxImage src={Logout} alt="Logout Person" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />

apps/docs/app/developer-docs/integrations/make/page.mdx

@@ -4,7 +4,7 @@ import AddModule from "./add-module.webp";
 import CreateNewScenario from "./create-new-scenario.webp";
 import CreateWebhook from "./create-webhook.webp";
 import DuplicateSurvey from "./duplicate-survey.webp";
-import EnterApiKeyAndHost from "./enter-api-key-and-host.webp";
+import EnterApiKey from "./enter-api-key.webp";
 import Result from "./result.webp";
 import SearchFormbricks from "./search-formbricks.webp";
 import SelectAction from "./select-action.webp";
@@ -27,8 +27,8 @@ export const metadata = {
 Make is a powerful tool to send information between Formbricks and thousands of apps. Here's how to set it up.
 
 <Note>
-  Nailed down your survey?? Any changes in the survey cause additional work in the _Scenario_. It makes sense
-  to first settle on the survey you want to run and then get to setting up Make.
+Nailed down your survey?? Any changes in the survey cause additional work in the _Scenario_. It
+  makes sense to first settle on the survey you want to run and then get to setting up Make.
 </Note>
 
 ## Step 1: Setup your survey incl. `questionId` for every question
@@ -95,10 +95,10 @@ Click "Create a webhook":
   className="max-w-full rounded-lg sm:max-w-3xl"
 />
 
-Enter the Formbricks API Host and API Key. API Host is by default set to https://app.formbricks.com but can be modified for self hosting instances. Learn how to get an API Key from the [API Key tutorial](/additional-features/api#how-to-generate-an-api-key).
+Enter the Formbricks API key. Learn how to get one from the [API Key tutorial](/additional-features/api#how-to-generate-an-api-key).
 
 <MdxImage
-  src={EnterApiKeyAndHost}
+  src={EnterApiKey}
   alt="Enter API Key"
   quality="100"
   className="max-w-full rounded-lg sm:max-w-3xl"

apps/docs/app/developer-docs/integrations/slack/page.mdx

@@ -112,7 +112,7 @@ Enabling the Slack Integration in a self-hosted environment requires a setup usi
       "go": next dev --experimental-https -p 3000
     ```
 
-- You also need to update the .env file in the `apps/web` directory to include the `WEBAPP_URL` as `https://localhost:3000` instead of `http://localhost:3000`.
+- You also need to update the .env file in the `apps/web` directory to include the `NEXTAUTH_URL` and `WEBAPP_URL` as `https://localhost:3000` instead of `http://localhost:3000`.
 
 - You also need to run the terminal in admin mode to run the `go` script(to acquire the SSL certificate). You can do this by running the terminal as an administrator or using the `sudo` command in Unix-based systems.
 

apps/docs/app/developer-docs/rest-api/page.mdx

@@ -15,7 +15,15 @@ export const metadata = {
 
 Formbricks offers two types of APIs: the **Public Client API** and the **Management API**. Each API serves a different purpose, has different authentication requirements, and provides access to different data and settings.
 
-View our [API Documentation](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh) in more than 30 frameworks and languages.
+View our [API Documentation](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh) in more than 30 frameworks and languages. Or directly try out our APIs in Postman by clicking the button below:
+
+<div className="max-w-full sm:max-w-3xl">
+  <a
+    target="_blank"
+    href="https://formbricks.postman.co/collection/11026000-927c954f-85a9-4f8f-b0ec-14191b903737?source=rip_html">
+    <img alt="Run in Postman" src="https://run.pstmn.io/button.svg" />
+  </a>
+</div>
 
 ## Public Client API
 
@@ -59,8 +67,7 @@ The API requests are authorized with a personal API key. This API key gives you
    />
 
 <Note>
-  ### Store API key safely! Anyone who has your API key has full control over your account. For security
-  reasons, you cannot view the API key again.
+  ### Store API key safely! Anyone who has your API key has full control over your account. For security reasons, you cannot view the API key again.
 </Note>
 
 ### Test your API Key

apps/docs/app/global/access-roles/page.mdx

@@ -40,7 +40,8 @@ For more information on user roles & permissions, see below:
 | Update Member Access             | ✅    | ✅    | ❌     | ❌        | ❌     |
 | Update Billing                   | ✅    | ✅    | ❌     | ❌        | ❌     |
 | **Product**                      |       |       |        |           |        |
-| Create Product                   | ✅    | ✅    | ❌     | ❌        | ❌     |
+| Create Product                   | ✅    | ✅    | ✅     | ✅        | ❌     |
+| Update Product Name              | ✅    | ✅    | ✅     | ❌        | ❌     |
 | Update Product Name              | ✅    | ✅    | ✅     | ❌        | ❌     |
 | Update Product Recontact Options | ✅    | ✅    | ✅     | ✅        | ❌     |
 | Update Look & Feel               | ✅    | ✅    | ✅     | ✅        | ❌     |
@@ -84,7 +85,7 @@ There are two ways to invite organization members: One by one or in bulk.
   src={MenuItem}
   alt="Where to find the Menu Item for Organization Settings"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="max-w-full rounded-lg sm:max-w-3xl "
 />
 
 2. Click on the `Add Member` button:
@@ -93,7 +94,7 @@ There are two ways to invite organization members: One by one or in bulk.
   src={AddMember}
   alt="Add Member Button Position"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="max-w-full rounded-lg sm:max-w-3xl "
 />
 
 3. In the modal, add the Name, Email and Role of the organization member you want to invite:
@@ -102,7 +103,7 @@ There are two ways to invite organization members: One by one or in bulk.
   src={IndvInvite}
   alt="Individual Invite Modal Tab"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="max-w-full rounded-lg sm:max-w-3xl "
 />
 
 <Note>
@@ -120,7 +121,7 @@ Formbricks sends an email to the organization member with an invitation link. Th
   src={MenuItem}
   alt="Where to find the Menu Item for Organization Settings"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="max-w-full rounded-lg sm:max-w-3xl "
 />
 
 2. Click on the `Add Member` button:
@@ -129,7 +130,7 @@ Formbricks sends an email to the organization member with an invitation link. Th
   src={AddMember}
   alt="Add Member Button Position"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="max-w-full rounded-lg sm:max-w-3xl "
 />
 
 3. In the modal, switch to `Bulk Invite`. You can download an example .CSV file to fill in the Name, Email and Role of the organization members you want to invite:
@@ -138,7 +139,7 @@ Formbricks sends an email to the organization member with an invitation link. Th
   src={BulkInvite}
   alt="Individual Invite Modal Tab"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="max-w-full rounded-lg sm:max-w-3xl "
 />
 
 4. Upload the filled .CSV file and invite the organization members in bulk ✅

apps/docs/app/global/api/page.mdx

@@ -0,0 +1,139 @@
+import { MdxImage } from "@/components/MdxImage";
+
+import AddApiKey from "./add-api-key.webp";
+import ApiKeySecret from "./api-key-secret.webp";
+
+export const metadata = {
+  title: "Formbricks API Overview: Public Client & Management API Breakdown",
+  description:
+    "Formbricks provides a powerful API to manage your surveys, responses, users, displays, actions, attributes & webhooks programmatically. Get a detailed understanding of Formbricks' dual API offerings: the unauthenticated Public Client API optimized for client-side tasks and the secured Management API for advanced account operations. Choose the perfect fit for your integration needs and ensure robust data handling",
+};
+
+#### API
+
+# API Overview
+
+Formbricks offers two types of APIs: the **Public Client API** and the **Management API**. Each API serves a different purpose, has different authentication requirements, and provides access to different data and settings.
+
+View our [API Documentation](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh) in more than 30 frameworks and languages. Or directly try out our APIs in Postman by clicking the button below:
+
+<div className="max-w-full sm:max-w-3xl">
+  <a
+    target="_blank"
+    href="https://formbricks.postman.co/collection/11026000-927c954f-85a9-4f8f-b0ec-14191b903737?source=rip_html">
+    <img alt="Run in Postman" src="https://run.pstmn.io/button.svg" />
+  </a>
+</div>
+
+## Public Client API
+
+The [Public Client API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#5c981d9e-5e7d-455d-9795-b9c45bc2f930) is designed for our SDKs and **does not require authentication**. This API is ideal for client-side interactions, as it doesn't expose sensitive information.
+
+We currently have the following Client API methods exposed and below is their documentation attached in Postman:
+
+- [Actions API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#b8f3a10e-1642-4d82-a629-fef0a8c6c86c) - Create actions for a Person
+- [Displays API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#949272bf-daec-4d72-9b52-47af3d74a62c) - Mark Survey as Displayed or Update an existing Display by linking it with a Response for a Person
+- [People API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#ee3d2188-4253-4bca-9238-6b76455805a9) - Create & Update a Person (e.g. attributes, email, userId, etc)
+- [Responses API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#8c773032-536c-483c-a237-c7697347946e) - Create & Update a Response for a Survey
+
+## Management API
+
+The [Management API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#98fce5a1-1365-4125-8de1-acdb28206766) provides access to all data and settings that your account has access to in the Formbricks app. This API **requires a personal API Key** for authentication, which can be generated in the Settings section of the Formbricks app. Checkout the [API Key Setup](#how-to-generate-an-api-key) below to generate & manage API Keys.
+
+We currently have the following Management API methods exposed and below is their documentation attached in Postman:
+
+- [Action Class API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#81947f69-99fc-41c9-a184-f3260e02be48) - Create, List, and Delete Action Classes
+- [Attribute Class API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#31089010-d468-4a7c-943e-8ebe71b9a36e) - Create, List, and Delete Attribute Classes
+- [Me API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#79e08365-641d-4b2d-aea2-9a855e0438ec) - Retrieve Account Information
+- [People API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#cffc27a6-dafb-428f-8ea7-5165bedb911e) - List and Delete People
+- [Response API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#e544ec0d-8b30-4e33-8d35-2441cb40d676) - List, List by Survey, Update, and Delete Responses
+- [Survey API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#953189b2-37b5-4429-a7bd-f4d01ceae242) - List, Create, Update, and Delete Surveys
+- [Webhook API](https://documenter.getpostman.com/view/11026000/2sA3Bq5XEh#62e6ec65-021b-42a4-ac93-d1434b393c6c) - List, Create, and Delete Webhooks
+
+## How to Generate an API key
+
+The API requests are authorized with a personal API key. This API key gives you the same rights as if you were logged in at formbricks.com - **don't share it around!**
+
+1. Go to your settings on [app.formbricks.com](https://app.formbricks.com).
+2. Go to page “API keys”
+   <MdxImage src={AddApiKey} alt="Add API Key" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />
+3. Create a key for the development or production environment.
+4. Copy the key immediately. You won’t be able to see it again.
+   <MdxImage
+     src={ApiKeySecret}
+     alt="API Key Secret"
+     quality="100"
+     className="max-w-full rounded-lg sm:max-w-3xl"
+   />
+
+<Note>
+  ### Store API key safely! Anyone who has your API key has full control over your account. For security reasons, you cannot view the API key again.
+</Note>
+
+### Test your API Key
+
+Hit the below request to verify that you are authenticated with your API Key and the server is responding.
+
+## Get My Profile {{ tag: 'GET', label: '/api/v1/me' }}
+
+<Row>
+  <Col>
+
+    Get the product details and environment type of your account.
+
+    ### Mandatory Headers
+
+    <Properties>
+      <Property name="x-Api-Key" type="string">
+        Your Formbricks API key.
+      </Property>
+    </Properties>
+
+    ### Delete a personal API key
+
+    1. Go to settings on [app.formbricks.com](https://app.formbricks.com/).
+    2. Go to page “API keys”.
+    3. Find the key you wish to revoke and select “Delete”.
+    4. Your API key will stop working immediately.
+
+  </Col>
+  <Col sticky>
+
+    <CodeGroup title="Request" tag="GET" label="/api/v1/me">
+
+    ```bash {{ title: 'cURL' }}
+    curl --location \
+    'https://app.formbricks.com/api/v1/me' \
+    --header \
+    'x-api-key: <your-api-key>'
+    ```
+
+    </CodeGroup>
+
+    <CodeGroup title="Response">
+
+    ```json {{title:'200 Success'}}
+    {
+      "id": "cll2m30r70004mx0huqkitgqv",
+      "createdAt": "2023-08-08T18:04:59.922Z",
+      "updatedAt": "2023-08-08T18:04:59.922Z",
+      "type": "production",
+      "product": {
+          "id": "cll2m30r60003mx0hnemjfckr",
+          "name": "My Product"
+      },
+      "appSetupCompleted": false,
+      "websiteSetupCompleted": false,
+    }
+    ```
+    ```json {{ title: '401 Not Authenticated' }}
+    Not authenticated
+    ```
+    </CodeGroup>
+
+  </Col>
+</Row>
+
+Can’t figure it out? Join our [Discord](https://discord.com/invite/3YFcABF2Ts) and we'd be glad to assist you!
+
+---

apps/docs/app/link-surveys/embed-surveys/page.mdx

@@ -3,17 +3,13 @@ import { TellaVideo } from "@/components/TellaVideo";
 
 import EmailContentWithSurvey from "./images/email-content-with-survey.webp";
 import EmailContentWithoutSurvey from "./images/email-content-without-survey.webp";
-import EmbedModeDisabled from "./images/embed-mode-disabled.webp";
-import EmbedModeEnabled from "./images/embed-mode-enabled.webp";
-import EmbedModeToggle from "./images/embed-mode-toggle.webp";
 import JoSignature from "./images/jo-signature.webp";
 import PluginAddSurvey from "./images/plugin-add-survey.webp";
 import PluginSourceTab from "./images/plugin-source-tab.webp";
 
 export const metadata = {
   title: "Embed Surveys in Your Web Page & Email",
-  description:
-    "Embed Formbricks surveys seamlessly into your website using an iframe & Email using code snippets.",
+  description: "Embed Formbricks surveys seamlessly into your website using an iframe & Email using code snippets.",
 };
 
 #### Embed Surveys
@@ -91,43 +87,6 @@ window.addEventListener("message", (event) => {
 </CodeGroup>
 </Col>
 
-## Emebd Mode
-
-Embed your survey with a minimalist design, disregarding padding and background.
-
-### How to enable it?
-
-It can be enabled by simply appending **?embed=true** to your survey link or from UI
-
-1. Open Embed survey tab in survey share modal
-
-2. Toggle **Embed mode**
-
-<MdxImage
-  src={EmbedModeToggle}
-  alt="Toggle embed mode"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-### With Embed mode enabled
-
-<MdxImage
-  src={EmbedModeEnabled}
-  alt="Toggle embed mode"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-### With Embed mode disabled
-
-<MdxImage
-  src={EmbedModeDisabled}
-  alt="Toggle embed mode"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
 ## Embedding Surveys in Emails
 
 Embedding Formbricks surveys directly into your emails allows you to collect valuable feedback from your users at every touchpoint. Seamlessly integrate interactive surveys into your email campaigns to gather insights and improve user experience.
@@ -168,7 +127,7 @@ Gmail does not support HTML embedding natively. It's a WYSIWYG (What You See Is
   src={EmailContentWithoutSurvey}
   alt="Choose a link survey template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="max-w-full rounded-lg sm:max-w-3xl "
 />
 
 - Right next to the Send button you will see a new button called **HTML Editor**. Click on it.
@@ -180,7 +139,7 @@ Gmail does not support HTML embedding natively. It's a WYSIWYG (What You See Is
   src={PluginSourceTab}
   alt="Choose a link survey template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="max-w-full rounded-lg sm:max-w-3xl "
 />
 
 - Now paste the copied HTML code from Formbricks into this window. On the right, you will see a preview of how the email will look.
@@ -191,7 +150,7 @@ Gmail does not support HTML embedding natively. It's a WYSIWYG (What You See Is
   src={PluginAddSurvey}
   alt="Choose a link survey template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="max-w-full rounded-lg sm:max-w-3xl "
 />
 
 - Click on the **Close Editor** button to save the changes & close the editor.
@@ -202,7 +161,7 @@ Gmail does not support HTML embedding natively. It's a WYSIWYG (What You See Is
   src={EmailContentWithSurvey}
   alt="Choose a link survey template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="max-w-full rounded-lg sm:max-w-3xl "
 />
 
 - Voila! You have successfully embedded the survey in your email.
@@ -240,7 +199,7 @@ Embed a survey link in your email signature to collect feedback subtly yet effec
   src={JoSignature}
   alt="Choose a link survey template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="max-w-full rounded-lg sm:max-w-3xl "
 />
 
 1. Create a Survey: Adjust an existing survey or create a new one.

apps/docs/app/link-surveys/market-research-panel/page.mdx

@@ -1,131 +0,0 @@
-import { MdxImage } from "@/components/MdxImage";
-
-import CopySurveyLink from "./copy-survey-link.webp";
-import CreateStudy from "./create-study.webp";
-import HiddenFields from "./hidden-fields.webp";
-import PreviewComplete from "./preview-complete.webp";
-import PreviewStudy from "./preview-study.webp";
-import AddRedirectUrl from "./redirect-url-formbricks.webp";
-import RedirectUrl from "./redirect-url.webp";
-import ScreeningOut from "./screening-out.webp";
-import UrlParameters from "./url-parameters.webp";
-
-
-export const metadata = {
-  title: "Creating a Research Panel with Prolific",
-  description:
-    "Formbricks surveys can be integrated with Prolifics participant panel easily. This tutorial walks you through the steps on how to access a pool of over 200.000 participants for your research.",
-};
-
-#### Research Panel
-
-# Creating a Research Panel with Prolific
-
-You need a lot of research participants that match your target audience fast? 
-
-Formbricks integrates well with Prolific. Prolific provides a pool of over 200.000 research participants you can choose from. Run market research with Formbricks within hours, not days.
-
-<Note>
-  Prolific is a paid service. You need to fund your account to access the pool of participants. The cost depends on the number of participants you want to reach and the demographics you're targeting. You can get an estimate of the cost with the [Prolific price calculator](https://www.prolific.com/calculator)
-</Note>
-
-## Purpose
-
-External research panels are useful when:
-
-- You don't have access to enough people who match your target audience
-- You want to reach a specific demographic
-- You want to reach a large number of people quickly
-
-## Steps to Follow
-
-### Step 1: Add hidden fields to the Formbricks survey
-To be able to attribute a completed answer to a research participant, you need to add hidden fields to your Formbricks survey. To do so, edit your survey and scroll down to the Hidden Fields card. 
-
-Add three fields with the IDs `PROLIFIC_PID`, `STUDY_ID`, and `SESSION_ID`.
-
-<MdxImage
-  src={HiddenFields}
-  alt="Hidden fields added"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-### Step 2: Create an account on Prolific
-Go to [Prolific](https://app.prolific.co/) and create an account.
-
-### Step 3: Create a study on Prolific
-Once you're logged in to Prolific, create a new study.
-<MdxImage
-  src={CreateStudy}
-  alt="Create a study on Prolific"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-
-### Step 4: Copy the Formbricks survey link to the Prolific study
-We connect the Formbricks survey with the Prolific study by copying the survey link from Formbricks and pasting it into the Prolific study:
-
-<MdxImage
-  src={CopySurveyLink}
-  alt="Copy the survey link"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-### Step 5: Choose URL parameters for attribution
-To attribute responses to the correct participant, you need to add URL parameters to the Formbricks survey link. The parameters are `PROLIFIC_PID`, `STUDY_ID`, and `SESSION_ID`, exactly like the hidden fields you added.
-<MdxImage
-  src={UrlParameters}
-  alt="Adding URL parameters to the survey"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-### Step 6: Update the Formbricks Redirect URL
-To ensure that participants are redirected back to Prolific after completing the survey, add the redirect URL provided in the Prolific study setup (e.g. `https://app.prolific.co/submissions/complete?cc=I2PWSFRG`)
-
-Copy from Prolific:
-<MdxImage
-  src={RedirectUrl}
-  alt="Copy redirect URL"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-Set it up as Redirect URL in the Response Options in Formbricks:
-<MdxImage
-  src={AddRedirectUrl}
-  alt="Add redirect URL to Formbricks"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-### Step 7: Preview the study
-Preview the study using Prolific's [Preview-functionality](https://researcher-help.prolific.com/hc/en-gb/articles/360009222853-Previewing-your-study)
-
-<MdxImage
-  src={PreviewStudy}
-  alt="Preview study"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-Got to the success screen? Then you're ready to publish your study!
-<MdxImage
-  src={PreviewComplete}
-  alt="Preview complete"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-### Step 8: Publish the study
-After you've published the study, you'll get the first responses within a few hours.
-
-<Note>
-  Prolific is a paid service. You need to fund your account to publish your study.
-</Note>
-
-### That's it! 🎉
-Once you've published the survey, you can sit back and watch the responses come in. Prolific will take care of the rest.

apps/docs/app/link-surveys/user-identification/page.mdx

@@ -3,7 +3,7 @@ import { MdxImage } from "@/components/MdxImage";
 import PeopleView from "./people-view.webp";
 
 export const metadata = {
-  title: "Effectively identify users in Formbricks link surveys",
+  title: "Effective Identify Users in Formbricks Link Surveys",
   description:
     "Discover how to seamlessly connect responses from Formbricks link surveys to existing users in your database. Learn the intricacies of the userId URL parameter to enhance user tracking, profiling, and segmentation, ensuring more personalized interactions and data-driven decisions.",
 };

apps/docs/app/self-hosting/configuration/page.mdx

@@ -1,16 +1,3 @@
-import { MdxImage } from "@/components/MdxImage";
-
-import EntraIDAppReg01 from "./images/entra_app_reg_01.png";
-import EntraIDAppReg02 from "./images/entra_app_reg_02.png";
-import EntraIDAppReg03 from "./images/entra_app_reg_03.png";
-import EntraIDAppReg04 from "./images/entra_app_reg_04.png";
-import EntraIDAppReg05 from "./images/entra_app_reg_05.png";
-import EntraIDAppReg06 from "./images/entra_app_reg_06.png";
-import EntraIDAppReg07 from "./images/entra_app_reg_07.png";
-import EntraIDAppReg08 from "./images/entra_app_reg_08.png";
-import EntraIDAppReg09 from "./images/entra_app_reg_09.png";
-import EntraIDAppReg10 from "./images/entra_app_reg_10.png";
-
 export const metadata = {
   title: "Configure Formbricks with External auth providers",
   description:
@@ -25,56 +12,54 @@ export const metadata = {
 
 These variables are present inside your machine’s docker-compose file. Restart the docker containers if you change any variables for them to take effect.
 
-| Variable                     | Description                                                                                                    | Required                                                | Default                   |
-| ---------------------------- | -------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------- | ------------------------- |
-| WEBAPP_URL                   | Base URL of the site.                                                                                          | required                                                | http://localhost:3000     |
-| NEXTAUTH_URL                 | Location of the auth server. This should normally be the same as WEBAPP_URL                                    | required                                                | http://localhost:3000     |
-| DATABASE_URL                 | Database URL with credentials.                                                                                 | required                                                |                           |
-| NEXTAUTH_SECRET              | Secret for NextAuth, used for session signing and encryption.                                                  | required                                                | (Generated by the user)   |
-| ENCRYPTION_KEY               | Secret for used by Formbricks for data encryption                                                              | required                                                | (Generated by the user)   |
-| CRON_SECRET                  | API Secret for running cron jobs.                                                                              | required                                                |                           |
-| UPLOADS_DIR                  | Local directory for storing uploads.                                                                           | optional                                                | ./uploads                 |
-| S3_ACCESS_KEY                | Access key for S3.                                                                                             | optional                                                | (resolved by the AWS SDK) |
-| S3_SECRET_KEY                | Secret key for S3.                                                                                             | optional                                                | (resolved by the AWS SDK) |
-| S3_REGION                    | Region for S3.                                                                                                 | optional                                                | (resolved by the AWS SDK) |
-| S3_BUCKET_NAME               | S3 bucket name for data storage. Formbricks enables S3 storage when this is set.                               | optional (required if S3 is enabled)                    |                           |
-| S3_ENDPOINT                  | Endpoint for S3.                                                                                               | optional                                                | (resolved by the AWS SDK) |
-| PRIVACY_URL                  | URL for privacy policy.                                                                                        | optional                                                |                           |
-| TERMS_URL                    | URL for terms of service.                                                                                      | optional                                                |                           |
-| IMPRINT_URL                  | URL for imprint.                                                                                               | optional                                                |                           |
-| EMAIL_AUTH_DISABLED          | Disables the ability for users to signup or login via email and password if set to 1.                          | optional                                                |                           |
-| PASSWORD_RESET_DISABLED      | Disables password reset functionality if set to 1.                                                             | optional                                                |                           |
-| EMAIL_VERIFICATION_DISABLED  | Disables email verification if set to 1.                                                                       | optional                                                |                           |
-| RATE_LIMITING_DISABLED       | Disables rate limiting if set to 1.                                                                            | optional                                                |                           |
-| INVITE_DISABLED              | Disables the ability for invited users to create an account if set to 1.                                       | optional                                                |                           |
-| MAIL_FROM                    | Email address to send emails from.                                                                             | optional (required if email services are to be enabled) |                           |
-| SMTP_HOST                    | Host URL of your SMTP server.                                                                                  | optional (required if email services are to be enabled) |                           |
-| SMTP_PORT                    | Host Port of your SMTP server.                                                                                 | optional (required if email services are to be enabled) |                           |
-| SMTP_USER                    | Username for your SMTP Server.                                                                                 | optional (required if email services are to be enabled) |                           |
-| SMTP_PASSWORD                | Password for your SMTP Server.                                                                                 | optional (required if email services are to be enabled) |                           |
-| SMTP_SECURE_ENABLED          | SMTP secure connection. For using TLS, set to 1 else to 0.                                                     | optional (required if email services are to be enabled) |                           |
-| SMTP_REJECT_UNAUTHORIZED_TLS | If set to 0, the server will accept connections without requiring authorization from the list of supplied CAs. | optional                                                | 1                         |
-| GITHUB_ID                    | Client ID for GitHub.                                                                                          | optional (required if GitHub auth is enabled)           |                           |
-| GITHUB_SECRET                | Secret for GitHub.                                                                                             | optional (required if GitHub auth is enabled)           |                           |
-| GOOGLE_CLIENT_ID             | Client ID for Google.                                                                                          | optional (required if Google auth is enabled)           |                           |
-| GOOGLE_CLIENT_SECRET         | Secret for Google.                                                                                             | optional (required if Google auth is enabled)           |                           |
-| STRIPE_SECRET_KEY            | Secret key for Stripe integration.                                                                             | optional                                                |                           |
-| STRIPE_WEBHOOK_SECRET        | Webhook secret for Stripe integration.                                                                         | optional                                                |                           |
-| TELEMETRY_DISABLED           | Disables telemetry if set to 1.                                                                                | optional                                                |                           |
-| INSTANCE_ID                  | Instance ID for Formbricks Cloud to be sent to Telemetry.                                                      | optional                                                |                           |
-| INTERNAL_SECRET              | Internal Secret (Currently we overwrite the value with a random value).                                        | optional                                                |                           |
-| DEFAULT_BRAND_COLOR          | Default brand color for your app (Can be overwritten from the UI as well).                                     | optional                                                | #64748b                   |
-| DEFAULT_ORGANIZATION_ID      | Automatically assign new users to a specific organization when joining                                         | optional                                                |                           |
-| DEFAULT_ORGANIZATION_ROLE    | Role of the user in the default organization.                                                                  | optional                                                | admin                     |
-| OIDC_DISPLAY_NAME            | Display name for Custom OpenID Connect Provider                                                                | optional                                                |                           |
-| OIDC_CLIENT_ID               | Client ID for Custom OpenID Connect Provider                                                                   | optional (required if OIDC auth is enabled)             |                           |
-| OIDC_CLIENT_SECRET           | Secret for Custom OpenID Connect Provider                                                                      | optional (required if OIDC auth is enabled)             |                           |
-| OIDC_ISSUER                  | Issuer URL for Custom OpenID Connect Provider (should have .well-known configured at this)                     | optional (required if OIDC auth is enabled)             |                           |
-| OIDC_SIGNING_ALGORITHM       | Signing Algorithm for Custom OpenID Connect Provider                                                           | optional                                                | RS256                     |
-| OPENTELEMETRY_LISTENER_URL   | URL for OpenTelemetry listener inside Formbricks.                                                              | optional                                                |                           |
-| CUSTOM_CACHE_DISABLED        | Disables custom cache handler if set to 1 (required for deployment on Vercel)                                  | optional                                                |                           |
-| `<add more>`                 |                                                                                                                |                                                         |                           |
-|                              |                                                                                                                |                                                         |                           |
+| Variable                    | Description                                                                                | Required                                                | Default                   |
+| --------------------------- | ------------------------------------------------------------------------------------------ | ------------------------------------------------------- | ------------------------- |
+| WEBAPP_URL                  | Base URL of the site.                                                                      | required                                                | http://localhost:3000     |
+| DATABASE_URL                | Database URL with credentials.                                                             | required                                                |                           |
+| NEXTAUTH_SECRET             | Secret for NextAuth, used for session signing and encryption.                              | required                                                | (Generated by the user)   |
+| ENCRYPTION_KEY              | Secret for used by Formbricks for data encryption                                          | required                                                | (Generated by the user)   |
+| NEXTAUTH_URL                | Location of the auth server. By default, this is the Formbricks docker instance itself.    | required                                                | http://localhost:3000     |
+| UPLOADS_DIR                 | Local directory for storing uploads.                                                       | optional                                                | ./uploads                 |
+| S3_ACCESS_KEY               | Access key for S3.                                                                         | optional                                                | (resolved by the AWS SDK) |
+| S3_SECRET_KEY               | Secret key for S3.                                                                         | optional                                                | (resolved by the AWS SDK) |
+| S3_REGION                   | Region for S3.                                                                             | optional                                                | (resolved by the AWS SDK) |
+| S3_BUCKET_NAME              | S3 bucket name for data storage. Formbricks enables S3 storage when this is set.           | optional (required if S3 is enabled)                    |                           |
+| S3_ENDPOINT                 | Endpoint for S3.                                                                           | optional                                                | (resolved by the AWS SDK) |
+| PRIVACY_URL                 | URL for privacy policy.                                                                    | optional                                                |                           |
+| TERMS_URL                   | URL for terms of service.                                                                  | optional                                                |                           |
+| IMPRINT_URL                 | URL for imprint.                                                                           | optional                                                |                           |
+| EMAIL_AUTH_DISABLED         | Disables the ability for users to signup or login via email and password if set to 1.      | optional                                                |                           |
+| PASSWORD_RESET_DISABLED     | Disables password reset functionality if set to 1.                                         | optional                                                |                           |
+| EMAIL_VERIFICATION_DISABLED | Disables email verification if set to 1.                                                   | optional                                                |                           |
+| RATE_LIMITING_DISABLED      | Disables rate limiting if set to 1.                                                        | optional                                                |                           |
+| INVITE_DISABLED             | Disables the ability for invited users to create an account if set to 1.                   | optional                                                |                           |
+| MAIL_FROM                   | Email address to send emails from.                                                         | optional (required if email services are to be enabled) |                           |
+| SMTP_HOST                   | Host URL of your SMTP server.                                                              | optional (required if email services are to be enabled) |                           |
+| SMTP_PORT                   | Host Port of your SMTP server.                                                             | optional (required if email services are to be enabled) |                           |
+| SMTP_USER                   | Username for your SMTP Server.                                                             | optional (required if email services are to be enabled) |                           |
+| SMTP_PASSWORD               | Password for your SMTP Server.                                                             | optional (required if email services are to be enabled) |                           |
+| SMTP_SECURE_ENABLED         | SMTP secure connection. For using TLS, set to 1 else to 0.                                 | optional (required if email services are to be enabled) |                           |
+| GITHUB_ID                   | Client ID for GitHub.                                                                      | optional (required if GitHub auth is enabled)           |                           |
+| GITHUB_SECRET               | Secret for GitHub.                                                                         | optional (required if GitHub auth is enabled)           |                           |
+| GOOGLE_CLIENT_ID            | Client ID for Google.                                                                      | optional (required if Google auth is enabled)           |                           |
+| GOOGLE_CLIENT_SECRET        | Secret for Google.                                                                         | optional (required if Google auth is enabled)           |                           |
+| CRON_SECRET                 | API Secret for running cron jobs.                                                          | optional                                                |                           |
+| STRIPE_SECRET_KEY           | Secret key for Stripe integration.                                                         | optional                                                |                           |
+| STRIPE_WEBHOOK_SECRET       | Webhook secret for Stripe integration.                                                     | optional                                                |                           |
+| TELEMETRY_DISABLED          | Disables telemetry if set to 1.                                                            | optional                                                |                           |
+| INSTANCE_ID                 | Instance ID for Formbricks Cloud to be sent to Telemetry.                                  | optional                                                |                           |
+| INTERNAL_SECRET             | Internal Secret (Currently we overwrite the value with a random value).                    | optional                                                |                           |
+| DEFAULT_BRAND_COLOR         | Default brand color for your app (Can be overwritten from the UI as well).                 | optional                                                | #64748b                   |
+| DEFAULT_ORGANIZATION_ID     | Automatically assign new users to a specific organization when joining                     | optional                                                |                           |
+| DEFAULT_ORGANIZATION_ROLE   | Role of the user in the default organization.                                              | optional                                                | admin                     |
+| OIDC_DISPLAY_NAME           | Display name for Custom OpenID Connect Provider                                            | optional                                                |                           |
+| OIDC_CLIENT_ID              | Client ID for Custom OpenID Connect Provider                                               | optional (required if OIDC auth is enabled)             |                           |
+| OIDC_CLIENT_SECRET          | Secret for Custom OpenID Connect Provider                                                  | optional (required if OIDC auth is enabled)             |                           |
+| OIDC_ISSUER                 | Issuer URL for Custom OpenID Connect Provider (should have .well-known configured at this) | optional (required if OIDC auth is enabled)             |                           |
+| OIDC_SIGNING_ALGORITHM      | Signing Algorithm for Custom OpenID Connect Provider                                       | optional                                                | RS256                     |
+| OPENTELEMETRY_LISTENER_URL  | URL for OpenTelemetry listener inside Formbricks.                                          | optional                                                |                           |
+| `<add more>`                |                                                                                            |                                                         |                           |
+|                             |                                                                                            |                                                         |                           |
 
 Note: If you want to configure something that is not possible via above, please open an issue on our GitHub repo here or reach out to us on Discord and we’ll try our best to work out a solution with you.
 
@@ -148,141 +133,26 @@ GOOGLE_CLIENT_SECRET=your-client-secret-here
    - Navigate to your Docker setup directory where your `docker-compose.yml` file is located.
    - Run the following command to bring down your current Docker containers and then bring them back up with the updated environment configuration:
 
-### Microsoft Entra ID (Azure Active Directory) SSO OAuth
+### Azure SSO OAuth
 
-Do you have a Microsoft Entra ID Tenant? Integrate it with your Formbricks instance to allow users to log in using their existing Microsoft credentials. This guide will walk you through the process of setting up an Application Registration for your Formbricks instance.
+Have an Azure Active Directory (AAD) instance? Integrate it with your Formbricks instance to allow users to log in using their existing AAD credentials. This guide will walk you through the process of setting up Azure SSO for your Formbricks instance.
 
-#### Requirements
+### Requirements
 
-- A Microsoft Entra ID Tenant populated with users. [Create a tenant as per Microsoft's documentation](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant).
+- An Azure Active Directory (AAD) instance.
 - A Formbricks instance running and accessible.
-- The callback URI for your Formbricks instance: `{WEBAPP_URL}/api/auth/callback/azure-ad`
 
-#### Creating an App Registration
+### Steps
 
-1. Login to the [Microsoft Entra admin center](https://entra.microsoft.com/).
-2. Go to **Applications** > **App registrations** in the left menu.
-
-<MdxImage
-  src={EntraIDAppReg01}
-  alt="App Registration Name Field"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-3. Click the **New registration** button at the top.
-
-<MdxImage
-  src={EntraIDAppReg02}
-  alt="App Registration Name Field"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-4. Name your application something descriptive, such as `Formbricks SSO`.
-
-<MdxImage
-  src={EntraIDAppReg03}
-  alt="App Registration Name Field"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-5. If you have multiple tenants/organizations, choose the appropriate **Supported account types** option. Otherwise, leave the default option for _Single Tenant_.
-
-<MdxImage
-  src={EntraIDAppReg04}
-  alt="Supported Account Types List"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-6. Under **Redirect URI**, select **Web** for the platform and paste your Formbricks callback URI (see Requirements above).
-
-<MdxImage
-  src={EntraIDAppReg05}
-  alt="Redirect URI Field"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-7. Click **Register** to create the App registration. You will be redirected to your new app's _Overview_ page after it is created.
-
-8. On the _Overview_ page, under **Essentials**:
-  - Copy the entry for **Application (client) ID** to populate the `AZUREAD_CLIENT_ID` variable.
-  - Copy the entry for **Directory (tenant) ID** to populate the `AZUREAD_TENANT_ID` variable.
-
-<MdxImage
-  src={EntraIDAppReg06}
-  alt="Client and Tenant ID Fields"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-9. From your App registration's _Overview_ page, go to **Manage** > **Certificates & secrets**.
-
-<MdxImage
-  src={EntraIDAppReg07}
-  alt="Certificates & secrets link"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-10. Make sure you have the **Client secrets** tab active, and click **New client secret**.
-
-<MdxImage
-  src={EntraIDAppReg08}
-  alt="New Client Secret Tab & Button"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-11. Enter a **Description**, set an **Expires** period, then click **Add**.
-
-<Note>
-  You will need to create a new client secret using these steps whenever your chosen expiry period ends.
-</Note>
-
-<MdxImage
-  src={EntraIDAppReg09}
-  alt="Description & Expires Fields"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-12. Copy the entry under **Value** to populate the `AZUREAD_CLIENT_SECRET` variable.
-
-<Note>
-  Microsoft will only show this value to you immediately after creation, and you will not be able to access it again. If you lose it, simply start from step 9 to create a new secret.
-</Note>
-
-<MdxImage
-  src={EntraIDAppReg10}
-  alt="Client Secret Value Field"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-13. Update these environment variables in your `docker-compose.yml` or pass it like your other environment variables to the Formbricks container.
-
-<Note>
-  You must wrap the `AZUREAD_CLIENT_SECRET` value in double quotes (e.g., `"THis~iS4faKe.53CreTvALu3"`) to prevent issues with special characters.
-</Note>
-
-An example `.env` for Microsoft Entra ID in Formbricks would look like:
-
-<Col>
-  <CodeGroup title="Formbricks Env for Microsoft Entra ID SSO">
-    ```yml {{ title: ".env" }}
-    AZUREAD_CLIENT_ID=a25cadbd-f049-4690-ada3-56a163a72f4c
-    AZUREAD_TENANT_ID=2746c29a-a3a6-4ea1-8762-37816d4b7885
-    AZUREAD_CLIENT_SECRET="THis~iS4faKe.53CreTvALu3"
-    ```
-  </CodeGroup>
-</Col>
-
-14. Restart your Formbricks instance.
-15. You're all set! Users can now sign up & log in using their Microsoft credentials associated with your Entra ID Tenant.
+1. Create a new Tenant in Azure Active Directory as per their [official documentation](https://learn.microsoft.com/en-us/entra/fundamentals/create-new-tenant).
+2. Add Users & Groups to your AAD instance.
+3. Now we need to fill the below environment variables in our Formbricks instance so get them from your AD configuration:
+   - `AZUREAD_CLIENT_ID`
+   - `AZUREAD_CLIENT_SECRET`
+   - `AZUREAD_TENANT_ID`
+4. Update these environment variables in your `docker-compose.yml` or pass it like your other environment variables to the Formbricks container.
+5. Restart your Formbricks instance.
+6. You're all set! Users can now signup & log in using their AAD credentials.
 
 ## OpenID Configuration
 
@@ -305,10 +175,8 @@ An example configuration for a FusionAuth OpenID Connect in Formbricks would loo
 <Col>
   <CodeGroup title="Formbricks Env for FusionAuth OIDC">
     ```yml {{ title: ".env" }}
-    OIDC_CLIENT_ID=59cada54-56d4-4aa8-a5e7-5823bbe0e5b7
-    OIDC_CLIENT_SECRET=4f4dwP0ZoOAqMW8fM9290A7uIS3E8Xg29xe1umhlB_s
-    OIDC_ISSUER=http://localhost:9011
-    OIDC_DISPLAY_NAME=FusionAuth OIDC_SIGNING_ALGORITHM=HS256
+    OIDC_CLIENT_ID=59cada54-56d4-4aa8-a5e7-5823bbe0e5b7 OIDC_CLIENT_SECRET=4f4dwP0ZoOAqMW8fM9290A7uIS3E8Xg29xe1umhlB_s
+    OIDC_ISSUER=http://localhost:9011 OIDC_DISPLAY_NAME=FusionAuth OIDC_SIGNING_ALGORITHM=HS256 
     ```
   </CodeGroup>
 </Col>

apps/docs/app/self-hosting/docker/page.mdx

@@ -83,22 +83,7 @@ Next, you need to generate an Encryption Key. This will be used for authenticati
 
 </Col>
 
-5.  **Generate Cron Secret**
-
-Next, you need to generate a Cron secret. This will be used as an API Secret for running cron jobs. The `sed` command below generates a random string using `openssl`, then replaces the `CRON_SECRET:` placeholder in the `docker-compose.yml` file with this generated secret:
-
-<Col>
-   <CodeGroup title="Generate Cron Secret">
-
-    ```bash
-    sed -i "/CRON_SECRET:$/s/CRON_SECRET:.*/CRON_SECRET: $(openssl rand -hex 32)/" docker-compose.yml
-    ```
-
-    </CodeGroup>
-
-</Col>
-
-6.  **Start the Docker Setup**
+5.  **Start the Docker Setup**
 
 You're now ready to start the Formbricks Docker setup. The following command will start Formbricks together with a postgreSQL database using Docker Compose:
 
@@ -113,7 +98,7 @@ You're now ready to start the Formbricks Docker setup. The following command wil
 </Col>
    The `-d` flag will run the containers in detached mode, meaning they'll run in the background.
 
-7. **Visit Formbricks in Your Browser**
+6. **Visit Formbricks in Your Browser**
 
    After starting the Docker setup, visit http://localhost:3000 in your browser to interact with the Formbricks application. The first time you access this page, you'll be greeted by a setup wizard. Follow the prompts to define your first user and get started.
 
@@ -224,7 +209,7 @@ You can close the logs again with `CTRL + C`.
 <Note>
 ## Customizing environment variables
 
-To edit any of the available environment variables, check out our [Configure](/self-hosting/configuration) section!
+To edit any of the available environment variables, check out our [Configure](/self-hosting/configure) section!
 
 </Note>
 

apps/docs/app/self-hosting/license/page.mdx

@@ -9,7 +9,7 @@ export const metadata = {
 
 ## Overview
 
-The Formbricks Core source code is licensed under AGPLv3 and available on GitHub. Additionally, we offer features for bigger organisations & enterprises for self-hosters under a separate Enterprise License.
+The Formbricks Core source code is licensed under AGPLv3 and available on GitHub. Additionally, we offer features for bigger organisations & enterprises for self-hostesr under a separate Enterprise License.
 
 <Note>
   Want to present a proof of concept? Request a free 30-day Enterprise Edition trial by [filling out the form

apps/docs/app/self-hosting/migration-guide/page.mdx

@@ -8,208 +8,6 @@ export const metadata = {
 
 # Migration Guide
 
-## v2.4
-
-Formbricks v2.4 allows you to create multiple endings for your surveys and decide which ending the user should see based on logic jumps. This release also includes many bug fixes and performance improvements.
-
-<Note>
-  This release will drop support for advanced targeting (enterprise targeting for app surveys) with actions
-  (e.g. only target users that triggered action x 3 times in the last month). This means that actions can
-  still be used as triggers, but will no longer be stored on the server in order to improve the overall
-  performance of the Formbricks system.
-</Note>
-
-### Steps to Migrate
-
-This guide is for users who are self-hosting Formbricks using our one-click setup. If you are using a different setup, you might adjust the commands accordingly.
-
-To run all these steps, please navigate to the `formbricks` folder where your `docker-compose.yml` file is located.
-
-1. **Backup your Database**: This is a crucial step. Please make sure to backup your database before proceeding with the upgrade. You can use the following command to backup your database:
-
-<Col>
-<CodeGroup title="Backup Postgres">
-
-```bash
-docker exec formbricks-postgres-1 pg_dump -Fc -U postgres -d formbricks > formbricks_pre_v2.4_$(date +%Y%m%d_%H%M%S).dump
-```
-
-</CodeGroup>
-</Col>
-
-<Note>
-  If you run into “No such container”, use `docker ps` to find your container name, e.g.
-  `formbricks_postgres_1`.
-</Note>
-
-<Note>
-  If you prefer storing the backup as an `*.sql` file remove the `-Fc` (custom format) option. In case of a
-  restore scenario you will need to use `psql` then with an empty `formbricks` database.
-</Note>
-
-2. Pull the latest version of Formbricks:
-
-<Col>
-<CodeGroup title="Stop the containers">
-
-```bash
-docker compose pull
-```
-
-</CodeGroup>
-</Col>
-
-3. Stop the running Formbricks instance & remove the related containers:
-
-<Col>
-<CodeGroup title="Stop the containers">
-
-```bash
-docker compose down
-```
-
-</CodeGroup>
-</Col>
-
-4. Restarting the containers with the latest version of Formbricks:
-
-<Col>
-<CodeGroup title="Restart the containers">
-
-```bash
-docker compose up -d
-```
-
-</CodeGroup>
-</Col>
-
-5. Now let's migrate the data to the latest schema:
-
-<Note>To find your Docker Network name for your Postgres Database, find it using `docker network ls`</Note>
-
-<Col>
-<CodeGroup title="Migrate the data">
-
-```bash
-docker pull ghcr.io/formbricks/data-migrations:latest && \
-docker run --rm \
-  --network=formbricks_default \
-  -e DATABASE_URL="postgresql://postgres:postgres@postgres:5432/formbricks?schema=public" \
-  -e UPGRADE_TO_VERSION="v2.4" \
-  ghcr.io/formbricks/data-migrations:latest
-```
-
-</CodeGroup>
-</Col>
-
-The above command will migrate your data to the latest schema. This is a crucial step to migrate your existing data to the new structure. Only if the script runs successful, changes are made to the database. The script can safely run multiple times.
-
-6. That's it! Once the migration is complete, you can **now access your Formbricks instance** at the same URL as before.
-
-### Additional Updates
-
-- The `CRON_SECRET` environment variable is now required to improve the security of the internal cron APIs. Please make sure that the variable is set in your environment / docker-compose.yml. You can use `openssl rand -hex 32` to generate a secure secret.
-
-## v2.3
-
-Formbricks v2.3 includes new color options for rating questions, improved multi-language functionality for Chinese (Simplified & Traditional), and various bug fixes and performance improvements.
-
-### Steps to Migrate
-
-<Note>
-  You only need to run the data migration if you have multi language surveys set up in the Chinese language
-  (`zh`). If you don't have any surveys in Chinese, you can skip the data migration step.
-</Note>
-
-This guide is for users who are self-hosting Formbricks using our one-click setup. If you are using a different setup, you might adjust the commands accordingly.
-
-To run all these steps, please navigate to the `formbricks` folder where your `docker-compose.yml` file is located.
-
-1. **Backup your Database**: This is a crucial step. Please make sure to backup your database before proceeding with the upgrade. You can use the following command to backup your database:
-
-<Col>
-<CodeGroup title="Backup Postgres">
-
-```bash
-docker exec formbricks-postgres-1 pg_dump -Fc -U postgres -d formbricks > formbricks_pre_v2.3_$(date +%Y%m%d_%H%M%S).dump
-```
-
-</CodeGroup>
-</Col>
-
-<Note>
-  If you run into “No such container”, use `docker ps` to find your container name, e.g.
-  `formbricks_postgres_1`.
-</Note>
-
-<Note>
-  If you prefer storing the backup as an `*.sql` file remove the `-Fc` (custom format) option. In case of a
-  restore scenario you will need to use `psql` then with an empty `formbricks` database.
-</Note>
-
-2. Pull the latest version of Formbricks:
-
-<Col>
-<CodeGroup title="Stop the containers">
-
-```bash
-docker compose pull
-```
-
-</CodeGroup>
-</Col>
-
-3. Stop the running Formbricks instance & remove the related containers:
-
-<Col>
-<CodeGroup title="Stop the containers">
-
-```bash
-docker compose down
-```
-
-</CodeGroup>
-</Col>
-
-4. Restarting the containers with the latest version of Formbricks:
-
-<Col>
-<CodeGroup title="Restart the containers">
-
-```bash
-docker compose up -d
-```
-
-</CodeGroup>
-</Col>
-
-5. Now let's migrate the data to the latest schema:
-
-<Note>To find your Docker Network name for your Postgres Database, find it using `docker network ls`</Note>
-
-<Col>
-<CodeGroup title="Migrate the data">
-
-```bash
-docker pull ghcr.io/formbricks/data-migrations:v2.3.0 && \
-docker run --rm \
-  --network=formbricks_default \
-  -e DATABASE_URL="postgresql://postgres:postgres@postgres:5432/formbricks?schema=public" \
-  -e UPGRADE_TO_VERSION="v2.3" \
-  ghcr.io/formbricks/data-migrations:v2.3.0
-```
-
-</CodeGroup>
-</Col>
-
-The above command will migrate your data to the latest schema. This is a crucial step to migrate your existing data to the new structure. Only if the script runs successful, changes are made to the database. The script can safely run multiple times.
-
-6. That's it! Once the migration is complete, you can **now access your Formbricks instance** at the same URL as before.
-
-### Additional Updates
-
-The feature to create short urls in Formbricks is now deprecated. Previously generated short urls will keep working for now but we recommend to use the long urls instead. Redirect support for short urls will be removed in a future release.
-
 ## v2.2
 
 Formbricks v2.2 introduces XM research presets into your products with a brand new product onboarding. Our objective is to make user research “obviously easy”, industry by industry. And we're starting with Software-as-a-Service and E-Commerce.
@@ -286,12 +84,12 @@ docker compose up -d
 <CodeGroup title="Migrate the data">
 
 ```bash
-docker pull ghcr.io/formbricks/data-migrations:v2.2 && \
+docker pull ghcr.io/formbricks/data-migrations:latest && \
 docker run --rm \
   --network=formbricks_default \
   -e DATABASE_URL="postgresql://postgres:postgres@postgres:5432/formbricks?schema=public" \
   -e UPGRADE_TO_VERSION="v2.2" \
-  ghcr.io/formbricks/data-migrations:v2.2
+  ghcr.io/formbricks/data-migrations:latest
 ```
 
 </CodeGroup>
@@ -390,12 +188,12 @@ docker compose up -d
 <CodeGroup title="Migrate the data">
 
 ```bash
-docker pull ghcr.io/formbricks/data-migrations:v2.1.0 && \
+docker pull ghcr.io/formbricks/data-migrations:latest && \
 docker run --rm \
   --network=formbricks_default \
   -e DATABASE_URL="postgresql://postgres:postgres@postgres:5432/formbricks?schema=public" \
   -e UPGRADE_TO_VERSION="v2.1" \
-  ghcr.io/formbricks/data-migrations:v2.1.0
+  ghcr.io/formbricks/data-migrations:latest
 ```
 
 </CodeGroup>
@@ -504,12 +302,12 @@ docker compose up -d
 <CodeGroup title="Migrate the data">
 
 ```bash
-docker pull ghcr.io/formbricks/data-migrations:v2.0.3 && \
+docker pull ghcr.io/formbricks/data-migrations:latest && \
 docker run --rm \
   --network=formbricks_default \
   -e DATABASE_URL="postgresql://postgres:postgres@postgres:5432/formbricks?schema=public" \
   -e UPGRADE_TO_VERSION="v2.0" \
-  ghcr.io/formbricks/data-migrations:v2.0.3
+  ghcr.io/formbricks/data-migrations:latest
 ```
 
 </CodeGroup>
@@ -779,9 +577,6 @@ x-environment: &environment
     # The url of your Formbricks instance used in the admin panel
     WEBAPP_URL:
 
-    # Required for next-auth. Should be the same as WEBAPP_URL
-    NEXTAUTH_URL:
-
     # PostgreSQL DB for Formbricks to connect to
     DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/formbricks?schema=public"
 
@@ -790,6 +585,10 @@ x-environment: &environment
     # You can use: `openssl rand -hex 32` to generate one
     NEXTAUTH_SECRET:
 
+    # Set this to your public-facing URL, e.g., https://example.com
+    # You do not need the NEXTAUTH_URL environment variable in Vercel.
+    NEXTAUTH_URL: http://localhost:3000
+
     # PostgreSQL password
     POSTGRES_PASSWORD: postgres
 

apps/docs/app/self-hosting/one-click/page.mdx

@@ -26,7 +26,6 @@ Before you proceed, make sure you have the following:
 
 - A **Linux Ubuntu** Virtual Machine deployed with SSH access.
 - An **A record** set up to connect a custom domain to your instance. Formbricks will **automatically create an SSL certificate** for your domain using Let's Encrypt.
-- **Port 80 and 443** open in your VM's Security Group to allow Traefik to create the SSL certificate.
 
 ## Start
 
@@ -50,10 +49,9 @@ The script will prompt you for the following information:
 <CodeGroup title="Docker GPG Keys Overwrite Prompt">
 
 ```bash
-🚀 Executing default step of installing Formbricks
-🧱 Welcome to the Formbricks Setup Script
+🧱 Welcome to the Formbricks single instance installer
 
-🛸 Fasten your seatbelts! We're setting up your Formbricks environment on your Ubuntu 24.04 LTS server.
+🛸 Fasten your seatbelts! We're setting up your Formbricks environment on your Ubuntu 22.04.2 LTS server.
 
 🧹 Time to sweep away any old Docker installations.
 🔄 Updating your package list.
@@ -65,149 +63,48 @@ File '/etc/apt/keyrings/docker.gpg' exists. Overwrite? (y/N)
 </CodeGroup>
 </Col>
 
-2. **Domain Name**: You will be asked to enter the domain name where you want to host Formbricks. This domain will be used to generate an SSL certificate.
+2. **Email Address**: Provide your email address for SSL certificate registration with Let's Encrypt.
 
 <Col>
 <CodeGroup title="Email Prompt">
 
 ```bash
-🚀 Executing default step of installing Formbricks
-🧱 Welcome to the Formbricks Setup Script
+ 🧱 Welcome to the Formbricks single instance installer
+ 🛸 Fasten your seatbelts! We're setting up your Formbricks environment on your Ubuntu 22.04.2 LTS server.
 
-🛸 Fasten your seatbelts! We're setting up your Formbricks environment on your Ubuntu 24.04 LTS server.
-
-🧹 Time to sweep away any old Docker installations.
-🔄 Updating your package list.
-📦 Installing the necessary dependencies.
-🔑 Adding Docker's official GPG key and setting up the stable repository.
-File '/etc/apt/keyrings/docker.gpg' exists. Overwrite? (y/N) y
-🔄 Updating your package list again.
-🐳 Installing Docker.
-🚀 Testing your Docker installation.
-🎉 Docker is installed!
-🐳 Adding your user to the Docker group to avoid using sudo with docker commands.
-🎉 Hooray! Docker is all set and ready to go. You're now ready to run your Formbricks instance!
-📁 Created Formbricks Quickstart directory at ./formbricks.
-🔗 Please enter your domain name for the SSL certificate (🚨 do NOT enter the protocol (http/https/etc)):
+ 🧹 Time to sweep away any old Docker installations.
+ 🔄 Updating your package list.
+ 📦 Installing the necessary dependencies.
+ 🔑 Adding Docker's official GPG key and setting up the stable repository.
+ File '/etc/apt/keyrings/docker.gpg' exists. Overwrite? (y/N) y
+ 🔄 Updating your package list again.
+ 🐳 Installing Docker.
+ 🚀 Testing your Docker installation.
+ 🎉 Docker is installed!
+ 🐳 Adding your user to the Docker group to avoid using sudo with docker commands.
+ 🎉 Hooray! Docker is all set and ready to go. Youre now ready to run your Formbricks instance!
+ 🚗 Installing Traefik...
+ 📁 Created Formbricks Quickstart directory at ./formbricks.
+ 💡 Please enter your email address for the SSL certificate:
 ```
 
 </CodeGroup>
 </Col>
 
-3. **HTTPS Certificate Prompt**: The script will ask if you want to create an HTTPS certificate for your domain. Enter Y to proceed. This is highly recommended for secure access to your Formbricks instance.
-
-<Col>
-<CodeGroup>
-
-```bash
-🚀 Executing default step of installing Formbricks
-🧱 Welcome to the Formbricks Setup Script
-
-🛸 Fasten your seatbelts! We're setting up your Formbricks environment on your Ubuntu 24.04 LTS server.
-
-🧹 Time to sweep away any old Docker installations.
-🔄 Updating your package list.
-📦 Installing the necessary dependencies.
-🔑 Adding Docker's official GPG key and setting up the stable repository.
-File '/etc/apt/keyrings/docker.gpg' exists. Overwrite? (y/N) y
-🔄 Updating your package list again.
-🐳 Installing Docker.
-🚀 Testing your Docker installation.
-🎉 Docker is installed!
-🐳 Adding your user to the Docker group to avoid using sudo with docker commands.
-🎉 Hooray! Docker is all set and ready to go. You're now ready to run your Formbricks instance!
-📁 Created Formbricks Quickstart directory at ./formbricks.
-🔗 Please enter your domain name for the SSL certificate (🚨 do NOT enter the protocol (http/https/etc)):
-my.hosted.url.com
-🔗 Do you want us to set up an HTTPS certificate for you? [Y/n]
-```
-
-</CodeGroup>
-</Col>
-
-4. **DNS Setup Prompt**: Ensure that your domain's DNS is correctly configured and ports 80 and 443 are open. Confirm this by entering Y. This step is crucial for proper SSL certificate issuance and secure server access.
-
-<Col>
-<CodeGroup>
-
-```bash
-🚀 Executing default step of installing Formbricks
-🧱 Welcome to the Formbricks Setup Script
-
-🛸 Fasten your seatbelts! We're setting up your Formbricks environment on your Ubuntu 24.04 LTS server.
-
-🧹 Time to sweep away any old Docker installations.
-🔄 Updating your package list.
-📦 Installing the necessary dependencies.
-🔑 Adding Docker's official GPG key and setting up the stable repository.
-File '/etc/apt/keyrings/docker.gpg' exists. Overwrite? (y/N) y
-🔄 Updating your package list again.
-🐳 Installing Docker.
-🚀 Testing your Docker installation.
-🎉 Docker is installed!
-🐳 Adding your user to the Docker group to avoid using sudo with docker commands.
-🎉 Hooray! Docker is all set and ready to go. You're now ready to run your Formbricks instance!
-📁 Created Formbricks Quickstart directory at ./formbricks.
-🔗 Please enter your domain name for the SSL certificate (🚨 do NOT enter the protocol (http/https/etc)):
-my.hosted.url.com
-🔗 Do you want us to set up an HTTPS certificate for you? [Y/n]
-Y
-🔗 Please make sure that the domain points to the server's IP address and that ports 80 & 443 are open in your server's firewall. Is everything set up? [Y/n]
-```
-
-</CodeGroup>
-</Col>
-
-5. **Email Address**: Provide an email address for SSL certificate registration. This email will be used for notifications regarding your SSL certificate from Let's Encrypt.
-
-<Col>
-<CodeGroup title="Email Prompt">
-
-```bash
-🚀 Executing default step of installing Formbricks
-🧱 Welcome to the Formbricks Setup Script
-
-🛸 Fasten your seatbelts! We're setting up your Formbricks environment on your Ubuntu 24.04 LTS server.
-
-🧹 Time to sweep away any old Docker installations.
-🔄 Updating your package list.
-📦 Installing the necessary dependencies.
-🔑 Adding Docker's official GPG key and setting up the stable repository.
-File '/etc/apt/keyrings/docker.gpg' exists. Overwrite? (y/N) y
-🔄 Updating your package list again.
-🐳 Installing Docker.
-🚀 Testing your Docker installation.
-🎉 Docker is installed!
-🐳 Adding your user to the Docker group to avoid using sudo with docker commands.
-🎉 Hooray! Docker is all set and ready to go. You're now ready to run your Formbricks instance!
-📁 Created Formbricks Quickstart directory at ./formbricks.
-🔗 Please enter your domain name for the SSL certificate (🚨 do NOT enter the protocol (http/https/etc)):
-my.hosted.url.com
-🔗 Do you want us to set up an HTTPS certificate for you? [Y/n]
-Y
-🔗 Please make sure that the domain points to the server's IP address and that ports 80 & 443 are open in your server's firewall. Is everything set up? [Y/n]
-Y
-💡 Please enter your email address for the SSL certificate:
-```
-
-</CodeGroup>
-</Col>
-
-6. **Enforce HTTPS (HSTS) Prompt**: Enforcing HTTPS with HSTS is a good security practice, as it ensures all communication with your server is encrypted. Enter Y to enable this setting.
+3. **Domain Name**: Enter the domain name that Traefik will use to create the SSL certificate and forward requests to Formbricks.
 
 <Col>
 <CodeGroup title="Domain Name for SSL certificate Prompt">
 
 ```bash
-🚀 Executing default step of installing Formbricks
-🧱 Welcome to the Formbricks Setup Script
+🧱 Welcome to the Formbricks single instance installer
 
-🛸 Fasten your seatbelts! We're setting up your Formbricks environment on your Ubuntu 24.04 LTS server.
+🛸 Fasten your seatbelts! We're setting up your Formbricks environment on your Ubuntu 22.04.2 LTS server.
 
 🧹 Time to sweep away any old Docker installations.
 🔄 Updating your package list.
 📦 Installing the necessary dependencies.
-🔑 Adding Docker's official GPG key and setting up the stable repository.
+🔑 Adding Dockers official GPG key and setting up the stable repository.
 File '/etc/apt/keyrings/docker.gpg' exists. Overwrite? (y/N) y
 🔄 Updating your package list again.
 🐳 Installing Docker.
@@ -215,58 +112,13 @@ File '/etc/apt/keyrings/docker.gpg' exists. Overwrite? (y/N) y
 🎉 Docker is installed!
 🐳 Adding your user to the Docker group to avoid using sudo with docker commands.
 🎉 Hooray! Docker is all set and ready to go. You're now ready to run your Formbricks instance!
+🚗 Installing Traefik...
 📁 Created Formbricks Quickstart directory at ./formbricks.
-🔗 Please enter your domain name for the SSL certificate (🚨 do NOT enter the protocol (http/https/etc)):
-my.hosted.url.com
-🔗 Do you want us to set up an HTTPS certificate for you? [Y/n]
-Y
-🔗 Please make sure that the domain points to the server's IP address and that ports 80 & 443 are open in your server's firewall. Is everything set up? [Y/n]
-Y
 💡 Please enter your email address for the SSL certificate:
 docs@formbricks.com
-🔗 Do you want to enforce HTTPS (HSTS)? [Y/n]
-```
-
-</CodeGroup>
-</Col>
-
-7. **Email Service Setup Prompt**: The script will ask if you want to set up the email service. Enter `Y` to proceed.(default is `N`). You can skip this step if you don't want to set up the email service. You will still be able to use Formbricks without setting up the email service.
-
-<Col>
-<CodeGroup>
-
-```bash
-🚀 Executing default step of installing Formbricks
-🧱 Welcome to the Formbricks Setup Script
-
-🛸 Fasten your seatbelts! We're setting up your Formbricks environment on your Ubuntu 24.04 LTS server.
-
-🧹 Time to sweep away any old Docker installations.
-🔄 Updating your package list.
-📦 Installing the necessary dependencies.
-🔑 Adding Docker's official GPG key and setting up the stable repository.
-File '/etc/apt/keyrings/docker.gpg' exists. Overwrite? (y/N) y
-🔄 Updating your package list again.
-🐳 Installing Docker.
-🚀 Testing your Docker installation.
-🎉 Docker is installed!
-🐳 Adding your user to the Docker group to avoid using sudo with docker commands.
-🎉 Hooray! Docker is all set and ready to go. You're now ready to run your Formbricks instance!
-📁 Created Formbricks Quickstart directory at ./formbricks.
-🔗 Please enter your domain name for the SSL certificate (🚨 do NOT enter the protocol (http/https/etc)):
-my.hosted.url.com
-🔗 Do you want us to set up an HTTPS certificate for you? [Y/n]
-Y
-🔗 Please make sure that the domain points to the server's IP address and that ports 80 & 443 are open in your server's firewall. Is everything set up? [Y/n]
-Y
-💡 Please enter your email address for the SSL certificate:
-docs@formbricks.com
-🔗 Do you want to enforce HTTPS (HSTS)? [Y/n]
-Y
-🚗 Configuring Traefik...
-💡 Created traefik.yaml and traefik-dynamic.yaml file.
+💡 Created traefik.yaml file with your provided email address.
 💡 Created acme.json file with correct permissions.
-📧 Do you want to set up the email service? You will need SMTP credentials for the same! [y/N]
+🔗 Please enter your domain name for the SSL certificate (🚨 do NOT enter the protocol (http/https/etc)):
 ```
 
 </CodeGroup>
@@ -278,56 +130,39 @@ Y
 <CodeGroup title="Successfully setup Formbricks on your Ubuntu machine">
 
 ```bash
-🚀 Executing default step of installing Formbricks
-🧱 Welcome to the Formbricks Setup Script
+🧱 Welcome to the Formbricks single instance installer
 
-🛸 Fasten your seatbelts! We're setting up your Formbricks environment on your Ubuntu 24.04 LTS server.
+🛸 Fasten your seatbelts! Were setting up your Formbricks environment on your Ubuntu 22.04.2 LTS server.
 
 🧹 Time to sweep away any old Docker installations.
 🔄 Updating your package list.
 📦 Installing the necessary dependencies.
-🔑 Adding Docker's official GPG key and setting up the stable repository.
+🔑 Adding Dockers official GPG key and setting up the stable repository.
 File '/etc/apt/keyrings/docker.gpg' exists. Overwrite? (y/N) y
 🔄 Updating your package list again.
 🐳 Installing Docker.
 🚀 Testing your Docker installation.
 🎉 Docker is installed!
 🐳 Adding your user to the Docker group to avoid using sudo with docker commands.
-🎉 Hooray! Docker is all set and ready to go. You're now ready to run your Formbricks instance!
+🎉 Hooray! Docker is all set and ready to go. Youre now ready to run your Formbricks instance!
+🚗 Installing Traefik...
 📁 Created Formbricks Quickstart directory at ./formbricks.
-🔗 Please enter your domain name for the SSL certificate (🚨 do NOT enter the protocol (http/https/etc)):
-docs@formbricks.com
-🔗 Do you want us to set up an HTTPS certificate for you? [Y/n]
-Y
-🔗 Please make sure that the domain points to the server's IP address and that ports 80 & 443 are open in your server's firewall. Is everything set up? [Y/n]
-Y
 💡 Please enter your email address for the SSL certificate:
 docs@formbricks.com
-🔗 Do you want to enforce HTTPS (HSTS)? [Y/n]
-Y
-🚗 Configuring Traefik...
-💡 Created traefik.yaml and traefik-dynamic.yaml file.
+💡 Created traefik.yaml file with your provided email address.
 💡 Created acme.json file with correct permissions.
-📧 Do you want to set up the email service? You will need SMTP credentials for the same! [y/N] N
-📥 Downloading docker-compose.yml from Formbricks GitHub repository...
-  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
-                                 Dload  Upload   Total   Spent    Left  Speed
-100  6632  100  6632    0     0  24280      0 --:--:-- --:--:-- --:--:-- 24382
-🚙 Updating docker-compose.yml with your custom inputs...
+🔗 Please enter your domain name for the SSL certificate (🚨 do NOT enter the protocol (http/https/etc)):
+my.hosted.url.com
+🚙 Updating NEXTAUTH_SECRET in the Formbricks container...
 🚗 NEXTAUTH_SECRET updated successfully!
-🚗 ENCRYPTION_KEY updated successfully!
-🚗 CRON_SECRET updated successfully!
-
 [+] Running 4/4
- ✔ Network formbricks_default         Created                                                                                                                                                    0.2s
- ✔ Container formbricks-postgres-1    Started                                                                                                                                                    1.0s
- ✔ Container formbricks-formbricks-1  Started                                                                                                                                                    1.6s
- ✔ Container traefik                  Started                                                                                                                                                    2.8s
-🔗 To edit more variables and deeper config, go to the formbricks/docker-compose.yml, edit the file, and restart the container!
+✔ Network formbricks_default         Created                                                                                                                                                                                           0.1s
+✔ Container formbricks-postgres-1    Started                                                                                                                                                                                           0.5s
+✔ Container formbricks-formbricks-1  Started                                                                                                                                                                                           0.7s
+✔ Container traefik                  Started                                                                                                                                                                                           1.1s
 🚨 Make sure you have set up the DNS records as well as inbound rules for the domain name and IP address of this instance.
 
-🎉 All done! Please setup your Formbricks instance by visiting your domain at https://tls.piyush.formbricks.com. You can check the status of Formbricks & Traefik with 'cd formbricks && sudo docker compose ps.'
-
+🎉 All done! Check the status of Formbricks & Traefik with 'cd formbricks && sudo docker compose ps.'
 ```
 
 </CodeGroup>

apps/docs/app/website-surveys/framework-guides/page.mdx

@@ -71,18 +71,18 @@ Refer to our [Example HTML project](https://github.com/formbricks/examples/tree/
 
 ## ReactJS
 
-Install the Formbricks SDK using one of the package managers ie `npm`,`pnpm`,`yarn`. Note that zod is required as a peer dependency and must also be installed in your project.
+Install the Formbricks SDK using one of the package managers ie `npm`,`pnpm`,`yarn`.
 
 <Col>
 <CodeGroup title="Install Formbricks JS library">
 ```shell {{ title: 'npm' }}
-npm install @formbricks/js zod
+npm install @formbricks/js
 ```
 ```shell {{ title: 'pnpm' }}
-pnpm add @formbricks/js zod
+pnpm add @formbricks/js
 ```
 ```shell {{ title: 'yarn' }}
-yarn add @formbricks/js zod
+yarn add @formbricks/js
 ```
 
 </CodeGroup>
@@ -142,13 +142,13 @@ Code snippets for the integration for both conventions are provided to further a
 <Col>
 <CodeGroup title="Install Formbricks JS library">
 ```shell {{ title: 'npm' }}
-npm install @formbricks/js zod
+npm install @formbricks/js
 ```
 ```shell {{ title: 'pnpm' }}
-pnpm add @formbricks/js zod
+pnpm add @formbricks/js
 ```
 ```shell {{ title: 'yarn' }}
-yarn add @formbricks/js zod
+yarn add @formbricks/js
 ```
 
 </CodeGroup>
@@ -164,6 +164,7 @@ yarn add @formbricks/js zod
 
 import { usePathname, useSearchParams } from "next/navigation";
 import { useEffect } from "react";
+
 import formbricks from "@formbricks/js/website";
 
 export default function FormbricksProvider() {
@@ -216,6 +217,7 @@ Refer to our [Example NextJS App Directory project](https://github.com/formbrick
 // other import
 import { useRouter } from "next/router";
 import { useEffect } from "react";
+
 import formbricks from "@formbricks/js/website";
 
 if (typeof window !== "undefined") {

apps/docs/components/Heading.tsx

@@ -33,7 +33,7 @@ const Anchor = ({ id, inView, children }: { id: string; inView: boolean; childre
   return (
     <Link href={`#${id}`} className="group text-inherit no-underline hover:text-inherit">
       {inView && (
-        <div className="absolute ml-[calc(-1*var(--width))] mt-1 hidden w-[var(--width)] opacity-0 transition [--width:calc(1.35rem+0.85px+38%-min(38%,calc(theme(maxWidth.lg)+theme(spacing.2))))] group-hover:opacity-100 group-focus:opacity-100 md:block lg:z-50 2xl:[--width:theme(spacing.10)]">
+        <div className="absolute ml-[calc(-1*var(--width))] mt-1 hidden w-[var(--width)] opacity-0 transition [--width:calc(2.625rem+0.5px+50%-min(50%,calc(theme(maxWidth.lg)+theme(spacing.8))))] group-hover:opacity-100 group-focus:opacity-100 md:block lg:z-50 2xl:[--width:theme(spacing.10)]">
           <div className="group/anchor block h-5 w-5 rounded-lg bg-zinc-50 ring-1 ring-inset ring-zinc-300 transition hover:ring-zinc-500 dark:bg-zinc-800 dark:ring-zinc-700 dark:hover:bg-zinc-700 dark:hover:ring-zinc-600">
             <AnchorIcon className="h-5 w-5 stroke-zinc-500 transition dark:stroke-zinc-400 dark:group-hover/anchor:stroke-white" />
           </div>

apps/docs/components/SideNavigation.tsx

@@ -47,13 +47,13 @@ export const SideNavigation = ({ pathname }) => {
           return (
             <li
               key={heading.text}
-              className={`mb-4 ml-4 text-slate-900 dark:text-white ml-${heading.level === 2 ? 0 : heading.level === 3 ? 4 : 6}`}>
+              className={`mb-4 ml-4 text-slate-900 dark:text-white  ml-${heading.level === 2 ? 0 : heading.level === 3 ? 4 : 6}`}>
               <Link
                 href={`#${heading.id}`}
                 onClick={() => setSelectedId(heading.id)}
                 className={`${
                   heading.id === selectedId
-                    ? "text-brand font-medium"
+                    ? "text-brand font-medium text-opacity-35"
                     : "font-normal text-slate-600 hover:text-slate-950 dark:text-white dark:hover:text-slate-50"
                 }`}>
                 {heading.text}

apps/docs/lib/navigation.ts

@@ -84,7 +84,6 @@ export const navigation: Array<NavGroup> = [
           { title: "Hidden Fields", href: "/link-surveys/hidden-fields" },
           { title: "Start At Question", href: "/link-surveys/start-at-question" },
           { title: "Embed Surveys Anywhere", href: "/link-surveys/embed-surveys" },
-          { title: "Market Research Panel", href: "/link-surveys/market-research-panel" },
           { title: "Multi Language Surveys", href: "/global/multi-language-surveys" },
           { title: "User Metadata", href: "/global/metadata" },
           { title: "Custom Styling", href: "/global/overwrite-styling" }, // global
@@ -141,15 +140,7 @@ export const navigation: Array<NavGroup> = [
       { title: "SDK: Formbricks API", href: "/developer-docs/api-sdk" },
       { title: "REST API", href: "/developer-docs/rest-api" },
       { title: "Webhooks", href: "/developer-docs/webhooks" },
-      {
-        title: "Contributing",
-        children: [
-          { title: "Get started", href: "/developer-docs/contributing/get-started" },
-          { title: "Codespaces", href: "/developer-docs/contributing/codespaces" },
-          { title: "Gitpod", href: "/developer-docs/contributing/gitpod" },
-          { title: "Troubleshooting", href: "/developer-docs/contributing/troubleshooting" },
-        ],
-      },
+      { title: "Contributing", href: "/developer-docs/contributing" },
     ],
   },
 ];

apps/docs/package.json

@@ -12,34 +12,34 @@
   },
   "browserslist": "defaults, not ie <= 11",
   "dependencies": {
-    "@algolia/autocomplete-core": "^1.17.4",
+    "@algolia/autocomplete-core": "^1.17.2",
     "@calcom/embed-react": "^1.5.0",
     "@docsearch/css": "3",
-    "@docsearch/react": "^3.6.1",
+    "@docsearch/react": "^3.6.0",
     "@formbricks/lib": "workspace:*",
     "@formbricks/types": "workspace:*",
     "@formbricks/ui": "workspace:*",
-    "@headlessui/react": "^2.1.2",
+    "@headlessui/react": "^2.0.4",
     "@headlessui/tailwindcss": "^0.2.1",
     "@mapbox/rehype-prism": "^0.9.0",
     "@mdx-js/loader": "^3.0.1",
     "@mdx-js/react": "^3.0.1",
-    "@next/mdx": "14.2.5",
+    "@next/mdx": "14.2.4",
     "@paralleldrive/cuid2": "^2.2.2",
     "@sindresorhus/slugify": "^2.2.1",
     "@tailwindcss/typography": "^0.5.13",
-    "acorn": "^8.12.1",
+    "acorn": "^8.12.0",
     "autoprefixer": "^10.4.19",
     "clsx": "^2.1.1",
     "fast-glob": "^3.3.2",
     "flexsearch": "^0.7.43",
-    "framer-motion": "11.3.20",
+    "framer-motion": "11.2.11",
     "lottie-web": "^5.12.2",
-    "lucide": "^0.418.0",
-    "lucide-react": "^0.418.0",
+    "lucide": "^0.395.0",
+    "lucide-react": "^0.395.0",
     "mdast-util-to-string": "^4.0.0",
     "mdx-annotations": "^0.1.4",
-    "next": "14.2.5",
+    "next": "14.2.4",
     "next-plausible": "^3.12.0",
     "next-seo": "^6.5.0",
     "next-sitemap": "^4.2.3",
@@ -59,10 +59,10 @@
     "sharp": "^0.33.4",
     "shiki": "^0.14.7",
     "simple-functional-loader": "^1.2.1",
-    "tailwindcss": "^3.4.7",
+    "tailwindcss": "^3.4.4",
     "unist-util-filter": "^5.0.1",
     "unist-util-visit": "^5.0.0",
-    "zustand": "^4.5.4"
+    "zustand": "^4.5.2"
   },
   "devDependencies": {
     "@formbricks/config-typescript": "workspace:*",

apps/storybook/.storybook/main.ts

@@ -21,7 +21,6 @@ const config: StorybookConfig = {
     getAbsolutePath("@storybook/addon-essentials"),
     getAbsolutePath("@chromatic-com/storybook"),
     getAbsolutePath("@storybook/addon-interactions"),
-    getAbsolutePath("@storybook/addon-a11y"),
   ],
   framework: {
     name: getAbsolutePath("@storybook/react-vite"),

apps/storybook/package.json

@@ -12,30 +12,29 @@
   },
   "dependencies": {
     "@formbricks/ui": "workspace:*",
-    "eslint-plugin-react-refresh": "^0.4.9",
+    "eslint-plugin-react-refresh": "^0.4.7",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@chromatic-com/storybook": "^1.6.1",
+    "@chromatic-com/storybook": "^1.5.0",
     "@formbricks/config-typescript": "workspace:*",
-    "@storybook/addon-a11y": "^8.2.7",
-    "@storybook/addon-essentials": "^8.2.7",
-    "@storybook/addon-interactions": "^8.2.7",
-    "@storybook/addon-links": "^8.2.7",
-    "@storybook/addon-onboarding": "^8.2.7",
-    "@storybook/blocks": "^8.2.7",
-    "@storybook/react": "^8.2.7",
-    "@storybook/react-vite": "^8.2.7",
-    "@storybook/test": "^8.2.7",
-    "@typescript-eslint/eslint-plugin": "^8.0.0",
-    "@typescript-eslint/parser": "^8.0.0",
+    "@storybook/addon-essentials": "^8.1.10",
+    "@storybook/addon-interactions": "^8.1.10",
+    "@storybook/addon-links": "^8.1.10",
+    "@storybook/addon-onboarding": "^8.1.10",
+    "@storybook/blocks": "^8.1.10",
+    "@storybook/react": "^8.1.10",
+    "@storybook/react-vite": "^8.1.10",
+    "@storybook/test": "^8.1.10",
+    "@typescript-eslint/eslint-plugin": "^7.13.1",
+    "@typescript-eslint/parser": "^7.13.1",
     "@vitejs/plugin-react": "^4.3.1",
-    "esbuild": "^0.23.0",
+    "esbuild": "^0.21.5",
     "eslint-plugin-storybook": "^0.8.0",
     "prop-types": "^15.8.1",
-    "storybook": "^8.2.7",
-    "tsup": "^8.2.3",
-    "vite": "^5.3.5"
+    "storybook": "^8.1.10",
+    "tsup": "^8.1.0",
+    "vite": "^5.3.1"
   }
 }

apps/web/Dockerfile

@@ -27,7 +27,6 @@ RUN apk update && apk add --no-cache g++ cmake make gcc python3 openssl-dev jq
 ENV DATABASE_URL="postgresql://placeholder:for@build:5432/gets_overwritten_at_runtime?schema=public"
 ENV NEXTAUTH_SECRET="placeholder_for_next_auth_of_64_chars_get_overwritten_at_runtime"
 ENV ENCRYPTION_KEY="placeholder_for_build_key_of_64_chars_get_overwritten_at_runtime"
-ENV CRON_SECRET="placeholder_for_cron_secret_of_64_chars_get_overwritten_at_runtime"
 
 ARG NEXT_PUBLIC_SENTRY_DSN
 ARG SENTRY_AUTH_TOKEN
@@ -87,7 +86,7 @@ RUN PRISMA_VERSION=$(cat prisma_version.txt) && npm install -g prisma@$PRISMA_VE
 
 EXPOSE 3000
 ENV HOSTNAME "0.0.0.0"
-# USER nextjs
+USER nextjs
 
 # Prepare volume for uploads
 RUN mkdir -p /home/nextjs/apps/web/uploads/

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/components/ConnectWithFormbricks.tsx

@@ -73,19 +73,17 @@ export const ConnectWithFormbricks = ({
           ) : (
             <div className="space-y-4">
               <Image src={Lost} alt="lost" height={250} />
-              <p className="animate-pulse pt-4 text-sm font-semibold text-slate-700">
-                Waiting for your signal...
-              </p>
+              <p className="pt-4 text-slate-400">Waiting for your signal...</p>
             </div>
           )}
         </div>
       </div>
       <Button
         id="finishOnboarding"
-        variant={widgetSetupCompleted ? "primary" : "minimal"}
+        variant={widgetSetupCompleted ? "darkCTA" : "minimal"}
         onClick={handleFinishOnboarding}
         EndIcon={ArrowRight}>
-        {widgetSetupCompleted ? "Finish Onboarding" : "I don't know how to do it"}
+        {widgetSetupCompleted ? "Finish Onboarding" : "Skip"}
       </Button>
     </div>
   );

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/components/InviteOrganizationMember.tsx

@@ -65,7 +65,7 @@ export const InviteOrganizationMember = ({ organization, environmentId }: Invite
                         value={field.value}
                         onChange={(email) => field.onChange(email)}
                         placeholder="engineering@acme.com"
-                        className="bg-white"
+                        className=" bg-white"
                       />
                       {error?.message && <FormError className="text-left">{error.message}</FormError>}
                     </div>
@@ -103,9 +103,13 @@ export const InviteOrganizationMember = ({ organization, environmentId }: Invite
                   e.preventDefault();
                   finishOnboarding();
                 }}>
-                Not now
+                Skip
               </Button>
-              <Button id="onboarding-inapp-invite-send-invite" type={"submit"} loading={isSubmitting}>
+              <Button
+                id="onboarding-inapp-invite-send-invite"
+                variant="darkCTA"
+                type={"submit"}
+                loading={isSubmitting}>
                 Invite
               </Button>
             </div>

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/components/OnboardingSetupInstructions.tsx

@@ -136,7 +136,7 @@ export const OnboardingSetupInstructions = ({
             <div className="mt-4 flex justify-between space-x-2">
               <Button
                 id="onboarding-inapp-connect-copy-code"
-                variant={widgetSetupCompleted ? "secondary" : "primary"}
+                variant={widgetSetupCompleted ? "secondary" : "darkCTA"}
                 onClick={() => {
                   navigator.clipboard.writeText(
                     channel === "app" ? htmlSnippetForAppSurveys : htmlSnippetForWebsiteSurveys

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/invite/page.tsx

@@ -32,8 +32,8 @@ const Page = async ({ params }: InvitePageProps) => {
   return (
     <div className="flex min-h-full min-w-full flex-col items-center justify-center">
       <Header
-        title="Who is your favorite engineer?"
-        subtitle="Invite your tech-savvy co-worker to help with the setup 🤓"
+        title="Invite your organization to help out"
+        subtitle="Ask your tech-savvy co-worker to finish the setup:"
       />
       <div className="space-y-4 text-center">
         <p className="text-4xl font-medium text-slate-800"></p>

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/page.tsx

@@ -38,7 +38,7 @@ const Page = async ({ params }: ConnectPageProps) => {
     <div className="flex min-h-full flex-col items-center justify-center py-10">
       <Header
         title={`Let's connect your ${customHeadline} with Formbricks`}
-        subtitle="It takes less than 4 minutes, pinky promise!"
+        subtitle="If you don't do it now, chances are low that you will ever do it!"
       />
       <div className="space-y-4 text-center">
         <p className="text-4xl font-medium text-slate-800"></p>

apps/web/app/(app)/(onboarding)/lib/utils.ts

@@ -4,10 +4,8 @@ export const getCustomHeadline = (channel: TProductConfigChannel, industry: TPro
   const combinations = {
     "website+eCommerce": "web shop",
     "website+saas": "landing page",
-    "website+other": "website",
     "app+eCommerce": "shopping app",
     "app+saas": "SaaS app",
-    "app+other": "app",
   };
-  return combinations[`${channel}+${industry}`] || "product";
+  return combinations[`${channel}+${industry}`] || "app";
 };

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/layout.tsx

@@ -1,11 +1,8 @@
-import { PosthogIdentify } from "@/app/(app)/environments/[environmentId]/components/PosthogIdentify";
 import { getServerSession } from "next-auth";
 import { notFound, redirect } from "next/navigation";
 import { authOptions } from "@formbricks/lib/authOptions";
 import { getMembershipByUserIdOrganizationId } from "@formbricks/lib/membership/service";
 import { canUserAccessOrganization } from "@formbricks/lib/organization/auth";
-import { getOrganization } from "@formbricks/lib/organization/service";
-import { getUser } from "@formbricks/lib/user/service";
 import { AuthorizationError } from "@formbricks/types/errors";
 import { ToasterClient } from "@formbricks/ui/ToasterClient";
 
@@ -15,11 +12,6 @@ const ProductOnboardingLayout = async ({ children, params }) => {
     return redirect(`/auth/login`);
   }
 
-  const user = await getUser(session.user.id);
-  if (!user) {
-    throw new Error("User not found");
-  }
-
   const isAuthorized = await canUserAccessOrganization(session.user.id, params.organizationId);
   if (!isAuthorized) {
     throw AuthorizationError;
@@ -28,20 +20,8 @@ const ProductOnboardingLayout = async ({ children, params }) => {
   const membership = await getMembershipByUserIdOrganizationId(session.user.id, params.organizationId);
   if (!membership || membership.role === "viewer") return notFound();
 
-  const organization = await getOrganization(params.organizationId);
-  if (!organization) {
-    throw new Error("Organization not found");
-  }
-
   return (
     <div className="flex-1 bg-slate-50">
-      <PosthogIdentify
-        session={session}
-        user={user}
-        organizationId={organization.id}
-        organizationName={organization.name}
-        organizationBilling={organization.billing}
-      />
       <ToasterClient />
       {children}
     </div>

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/products/new/channel/page.tsx

@@ -1,5 +1,5 @@
 import { OnboardingOptionsContainer } from "@/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer";
-import { GlobeIcon, GlobeLockIcon, LinkIcon, XIcon } from "lucide-react";
+import { CircleUserRoundIcon, EarthIcon, SendHorizonalIcon, XIcon } from "lucide-react";
 import { getProducts } from "@formbricks/lib/product/service";
 import { Button } from "@formbricks/ui/Button";
 import { Header } from "@formbricks/ui/Header";
@@ -14,24 +14,24 @@ const Page = async ({ params }: ChannelPageProps) => {
   const channelOptions = [
     {
       title: "Public website",
-      description: "Run well-timed pop-up surveys.",
-      icon: GlobeIcon,
+      description: "Display surveys on public websites, well timed and targeted.",
+      icon: EarthIcon,
       iconText: "Built for scale",
       href: `/organizations/${params.organizationId}/products/new/industry?channel=website`,
     },
     {
       title: "App with sign up",
-      description: "Run highly-targeted micro-surveys.",
-      icon: GlobeLockIcon,
+      description: "Run highly targeted surveys with any user cohort.",
+      icon: CircleUserRoundIcon,
       iconText: "Enrich user profiles",
       href: `/organizations/${params.organizationId}/products/new/industry?channel=app`,
     },
     {
       channel: "link",
-      title: "Link & email surveys",
-      description: "Reach people anywhere online.",
-      icon: LinkIcon,
-      iconText: "Anywhere online",
+      title: "Anywhere online",
+      description: "Create link and email surveys, reach your people anywhere.",
+      icon: SendHorizonalIcon,
+      iconText: "100% custom branding",
       href: `/organizations/${params.organizationId}/products/new/industry?channel=link`,
     },
   ];
@@ -42,7 +42,7 @@ const Page = async ({ params }: ChannelPageProps) => {
     <div className="flex min-h-full min-w-full flex-col items-center justify-center space-y-12">
       <Header
         title="Where do you want to survey people?"
-        subtitle="Run surveys on public websites, in your app, or with shareable links & emails."
+        subtitle="Get started with proven best practices 🚀"
       />
       <OnboardingOptionsContainer options={channelOptions} />
       {products.length >= 1 && (

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/products/new/industry/page.tsx

@@ -1,6 +1,7 @@
 import { OnboardingOptionsContainer } from "@/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer";
 import { HeartIcon, MonitorIcon, ShoppingCart, XIcon } from "lucide-react";
 import { notFound } from "next/navigation";
+import { IS_FORMBRICKS_CLOUD } from "@formbricks/lib/constants";
 import { getProducts } from "@formbricks/lib/product/service";
 import { TProductConfigChannel } from "@formbricks/types/product";
 import { Button } from "@formbricks/ui/Button";
@@ -26,33 +27,32 @@ const Page = async ({ params, searchParams }: IndustryPageProps) => {
   const industryOptions = [
     {
       title: "E-Commerce",
-      description: "Understand why people buy.",
+      description: "Implement proven best practices to understand why people buy.",
       icon: ShoppingCart,
       iconText: "B2B and B2C",
       href: `/organizations/${params.organizationId}/products/new/settings?channel=${channel}&industry=eCommerce`,
     },
     {
       title: "SaaS",
-      description: "Improve product-market fit.",
+      description: "Gather contextualized feedback to improve product-market fit.",
       icon: MonitorIcon,
       iconText: "Proven methods",
       href: `/organizations/${params.organizationId}/products/new/settings?channel=${channel}&industry=saas`,
     },
     {
       title: "Other",
-      description: "Listen to your customers.",
+      description: "Universal Formricks experience with features for every industry.",
       icon: HeartIcon,
       iconText: "Customer insights",
-      href: `/organizations/${params.organizationId}/products/new/settings?channel=${channel}&industry=other`,
+      href: IS_FORMBRICKS_CLOUD
+        ? `/organizations/${params.organizationId}/products/new/survey?channel=${channel}&industry=other`
+        : `/organizations/${params.organizationId}/products/new/settings?channel=${channel}&industry=other`,
     },
   ];
 
   return (
     <div className="flex min-h-full min-w-full flex-col items-center justify-center space-y-12">
-      <Header
-        title="Which industry do you work for?"
-        subtitle="Get started with battle-tested best practices."
-      />
+      <Header title="Which industry do you work for?" subtitle="Get started with proven best practices 🚀" />
       <OnboardingOptionsContainer options={industryOptions} />
       {products.length >= 1 && (
         <Button