feat: fix and add recall from previous questions with recall string

.changeset/README.md

@@ -0,0 +1,8 @@
+# Changesets
+
+Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
+with multi-package repos, or single-package repos to help you version and publish your code. You can
+find the full documentation for it [in our repository](https://github.com/changesets/changesets)
+
+We have a quick list of common questions to get you started engaging with this project in
+[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.devcontainer/Dockerfile

@@ -1,5 +1,5 @@
 # [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=20
+ARG VARIANT=18-bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 
 # [Optional] Uncomment this section to install additional OS packages.
@@ -13,4 +13,4 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 # [Optional] Uncomment if you want to install more global node modules
 # RUN su node -c "npm install -g <your-package-list-here>"
 
-RUN su node -c "npm install -g pnpm"
+RUN su node -c "npm install -g pnpm"

.devcontainer/devcontainer.json

@@ -2,28 +2,29 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/javascript-node-postgres
 // Update the VARIANT arg in docker-compose.yml to pick a Node.js version
 {
-  "name": "Node.js & PostgreSQL",
-  "dockerComposeFile": "docker-compose.yml",
-  "service": "app",
-  "workspaceFolder": "/workspace",
+	"name": "Node.js & PostgreSQL",
+	"dockerComposeFile": "docker-compose.yml",
+	"service": "app",
+	"workspaceFolder": "/workspace",
 
-  // Configure tool-specific properties.
-  "customizations": {
-    // Configure properties specific to VS Code.
-    "vscode": {
-      // Add the IDs of extensions you want installed when the container is created.
-      "extensions": ["dbaeumer.vscode-eslint"]
-    }
-  },
+	// Configure tool-specific properties.
+	"customizations": {
+		// Configure properties specific to VS Code.
+		"vscode": {
+			// Add the IDs of extensions you want installed when the container is created.
+			"extensions": [
+				"dbaeumer.vscode-eslint"
+			]
+		}
+	},
 
-  // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  // This can be used to network with other containers or with the host.
-  "forwardPorts": [3000, 5432, 8025],
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// This can be used to network with other containers or with the host.
+	"forwardPorts": [3000, 5432, 8025],
 
-  // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "cp .env.example .env && sed -i '/^ENCRYPTION_KEY=/c\\ENCRYPTION_KEY='$(openssl rand -hex 32) .env && sed -i '/^NEXTAUTH_SECRET=/c\\NEXTAUTH_SECRET='$(openssl rand -hex 32) .env && pnpm install && pnpm db:migrate:dev",
-  "postAttachCommand": "pnpm dev --filter=web... --filter=demo...",
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "pnpm install",
 
-  // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-  "remoteUser": "node"
+	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "node"
 }

.devcontainer/docker-compose.yml

@@ -6,10 +6,10 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        # Update 'VARIANT' to pick an LTS version of Node.js: 20, 18, 16, 14.
+        # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14.
         # Append -bullseye or -buster to pin to an OS version.
         # Use -bullseye variants on local arm64/Apple Silicon.
-        VARIANT: "20"
+        VARIANT: "18"
 
     volumes:
       - ..:/workspace:cached
@@ -33,7 +33,7 @@ services:
     environment:
       POSTGRES_PASSWORD: postgres
       POSTGRES_USER: postgres
-      POSTGRES_DB: formbricks
+      POSTGRES_DB: postgres
     # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 

.dockerignore

@@ -1,7 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-# **/node_modules
+**/node_modules
 .pnp
 .pnp.js
 .pnpm-store/

.env.example

@@ -1,7 +1,9 @@
+/*
 ########################################################################
-# ------------ MANDATORY (CHANGE ACCORDING TO YOUR SETUP) ------------ #
+# ------------ MANDATORY (CHANGE ACCORDING TO YOUR SETUP) ------------#
 ########################################################################
 
+
 ############
 #  BASICS  #
 ############
@@ -50,44 +52,26 @@ SMTP_SECURE_ENABLED=0
 SMTP_USER=smtpUser
 SMTP_PASSWORD=smtpPassword
 
+
 ########################################################################
 # ------------------------------ OPTIONAL -----------------------------#
 ########################################################################
 
 # Uncomment the variables you would like to use and customize the values.
 
-# Custom local storage path for file uploads
-#UPLOADS_DIR=
-
-##############
-# S3 STORAGE #
-##############
-
-# S3 Storage is required for the file upload in serverless environments like Vercel
-S3_ACCESS_KEY=
-S3_SECRET_KEY=
-S3_REGION=
-S3_BUCKET_NAME=
-# Configure a third party S3 compatible storage service endpoint like StorJ leave empty if you use Amazon S3
-# e.g., https://gateway.storjshare.io
-S3_ENDPOINT_URL=
-
 #####################
 # Disable Features  #
 #####################
 
 # Email Verification. If you enable Email Verification you have to setup SMTP-Settings, too.
-EMAIL_VERIFICATION_DISABLED=1
+# EMAIL_VERIFICATION_DISABLED=1
 
 # Password Reset. If you enable Password Reset functionality you have to setup SMTP-Settings, too.
-PASSWORD_RESET_DISABLED=1
+# PASSWORD_RESET_DISABLED=1
 
 # Signup. Disable the ability for new users to create an account.
 # SIGNUP_DISABLED=1
 
-# Email login. Disable the ability for users to login with email.
-# EMAIL_AUTH_DISABLED=1
-
 # Team Invite. Disable the ability for invited users to create an account.
 # INVITE_DISABLED=1
 
@@ -101,24 +85,21 @@ TERMS_URL=
 IMPRINT_URL=
 
 # Configure Github Login
+GITHUB_AUTH_ENABLED=0
 GITHUB_ID=
 GITHUB_SECRET=
 
 # Configure Google Login
+GOOGLE_AUTH_ENABLED=0
 GOOGLE_CLIENT_ID=
 GOOGLE_CLIENT_SECRET=
 
 # Configure Azure Active Directory Login
+AZUREAD_AUTH_ENABLED=0
 AZUREAD_CLIENT_ID=
 AZUREAD_CLIENT_SECRET=
 AZUREAD_TENANT_ID=
-
-# OpenID Connect (OIDC) configuration
-# OIDC_CLIENT_ID=
-# OIDC_CLIENT_SECRET=
-# OIDC_ISSUER=
-# OIDC_DISPLAY_NAME=
-# OIDC_SIGNING_ALGORITHM=
+AZURE_DIRECT_REDIRECT=0
 
 # Cron Secret
 CRON_SECRET=
@@ -126,10 +107,6 @@ CRON_SECRET=
 # Configure this when you want to ship JS & CSS files from a complete URL instead of the current domain
 # ASSET_PREFIX_URL=
 
-# Oauth credentials for Notion Integration
-NOTION_OAUTH_CLIENT_ID=
-NOTION_OAUTH_CLIENT_SECRET=
-
 # Stripe Billing Variables
 STRIPE_SECRET_KEY=
 STRIPE_WEBHOOK_SECRET=
@@ -139,42 +116,15 @@ NEXT_PUBLIC_FORMBRICKS_API_HOST=
 NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID=
 NEXT_PUBLIC_FORMBRICKS_ONBOARDING_SURVEY_ID=
 
-# Oauth credentials for Google sheet integration
+# Oauth credentials for Google sheet integration 
 GOOGLE_SHEETS_CLIENT_ID=
 GOOGLE_SHEETS_CLIENT_SECRET=
 GOOGLE_SHEETS_REDIRECT_URL=
 
-# Oauth credentials for Airtable integration
+# Oauth credentials for Airtable integration 
 AIRTABLE_CLIENT_ID=
 
-# Oauth credentials for Slack integration
-SLACK_CLIENT_ID=
-SLACK_CLIENT_SECRET=
-
 # Enterprise License Key
 ENTERPRISE_LICENSE_KEY=
 
-# Automatically assign new users to a specific team and role within that team
-# Insert an existing team id or generate a valid CUID for a new one at https://www.getuniqueid.com/cuid (e.g. cjld2cjxh0000qzrmn831i7rn)
-# (Role Management is an Enterprise feature)
-# DEFAULT_TEAM_ID=
-# DEFAULT_TEAM_ROLE=admin
-
-# set to 1 to skip onboarding for new users
-# ONBOARDING_DISABLED=1
-
-# Send new users to customer.io
-# CUSTOMER_IO_API_KEY=
-# CUSTOMER_IO_SITE_ID=
-
-# Ignore Rate Limiting across the Formbricks app
-# RATE_LIMITING_DISABLED=1
-
-# OpenTelemetry URL for tracing
-# OPENTELEMETRY_LISTENER_URL=http://localhost:4318/v1/traces
-
-# The below is used for Next Caching (uses In-Memory from Next Cache if not provided)
-# 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:
+*/

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -42,6 +42,7 @@ body:
         - First time: Please read our [introductory blog post](https://formbricks.com/blog/join-the-formtribe)
         - All UI components are in the package `formbricks/ui`
         - Run `pnpm go` to find a demo app to test in-app surveys at `localhost:3002`
-        - Everything is type-safe.
-        - We use **chatGPT** to help refactor code.
+        - Everything is type-safe
+        - We use **chatGPT** to help refactor code. Use our [Formbricks ✨ megaprompt ✨](https://github.com/formbricks/formbricks/blob/main/megaprompt.md) to create the right 
+          context before you write your prompt.
         - Anything unclear? [Ask in Discord](https://formbricks.com/discord)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,3 @@
-<!-- We require pull request titles to follow the Conventional Commits specification ( https://www.conventionalcommits.org/en/v1.0.0/#summary ). Please make sure your title follow these conventions -->
-
 ## What does this PR do?
 
 <!-- Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. -->
@@ -10,6 +8,18 @@ Fixes # (issue)
  Loom Video: https://www.loom.com/
 -->
 
+## Type of change
+
+<!-- Please mark the relevant points by using [x] -->
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] Chore (refactoring code, technical debt, workflow improvements)
+- [ ] Enhancement (small improvements)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change adds a new database migration
+- [ ] This change requires a documentation update
+
 ## How should this be tested?
 
 <!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration -->
@@ -32,7 +42,7 @@ Fixes # (issue)
 - [ ] Removed all `console.logs`
 - [ ] Merged the latest changes from main onto my branch with `git pull origin main`
 - [ ] My changes don't cause any responsiveness issues
-- [ ] First PR at Formbricks? [Please sign the CLA!](https://cla-assistant.io/formbricks/formbricks) Without it we wont be able to merge it 🙏
+- [ ] First PR at Formbricks? [Please sign the CLA!](https://formbricks.com/clmyhzfrymr4ko00hycsg1tvx) Without it we wont be able to merge it 🙏
 
 ### Appreciated
 

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

@@ -1,55 +0,0 @@
-name: Build & Cache Web App
-
-runs:
-  using: "composite"
-  steps:
-    - name: Checkout repo
-      uses: actions/checkout@v3
-
-    - uses: ./.github/actions/dangerous-git-checkout
-
-    - name: Cache Build
-      uses: actions/cache@v3
-      id: cache-build
-      env:
-        cache-name: prod-build
-        key-1: ${{ hashFiles('pnpm-lock.yaml') }}
-        key-2: ${{ hashFiles('apps/**/**.[jt]s', 'apps/**/**.[jt]sx', 'packages/**/**.[jt]s', 'packages/**/**.[jt]sx', '!**/node_modules') }}
-      with:
-        path: |
-          ${{ github.workspace }}/apps/web/.next
-          **/.turbo/**
-          **/dist/**
-        key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}
-
-    - name: Setup Node.js 20.x
-      uses: actions/setup-node@v3
-      with:
-        node-version: 20.x
-      if: steps.cache-build.outputs.cache-hit != 'true'
-
-    - name: Install pnpm
-      uses: pnpm/action-setup@v2
-      if: steps.cache-build.outputs.cache-hit != 'true'
-
-    - name: Install dependencies
-      run: pnpm install --config.platform=linux --config.architecture=x64
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      shell: bash
-
-    - name: create .env
-      run: cp .env.example .env
-      shell: bash
-
-    - name: Generate Random ENCRYPTION_KEY
-      run: |
-        SECRET=$(openssl rand -hex 32)
-        echo "ENCRYPTION_KEY=$SECRET" >> $GITHUB_ENV
-        echo "ENTERPRISE_LICENSE_KEY=$SECRET" >> $GITHUB_ENV
-      shell: bash
-
-    - run: |
-        pnpm build --filter=web...
-
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      shell: bash

.github/actions/dangerous-git-checkout/action.yml

@@ -1,10 +0,0 @@
-name: Dangerous git Checkout
-description: "Git Checkout from PR code so we can run checks from forks"
-runs:
-  using: "composite"
-  steps:
-    - name: Checkout repo
-      uses: actions/checkout@v3
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 2

.github/workflows/build-formbricks-com.yml

@@ -1,4 +1,4 @@
-name: Build formbricks-com
+name: Build
 on:
   workflow_call:
 jobs:
@@ -11,10 +11,10 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v3
 
-      - 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@v2

.github/workflows/build-web.yml

@@ -1,4 +1,4 @@
-name: Build web
+name: Build
 on:
   workflow_call:
 jobs:
@@ -8,13 +8,13 @@ jobs:
     timeout-minutes: 30
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/dangerous-git-checkout
+      - name: Checkout repo
+        uses: actions/checkout@v3
 
-      - 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@v2
@@ -25,7 +25,7 @@ jobs:
       - name: create .env
         run: cp .env.example .env
 
-      - name: Generate Random ENCRYPTION_KEY
+      - name: Generate Random NEXTAUTH_SECRET
         run: |
           SECRET=$(openssl rand -hex 32)
           echo "ENCRYPTION_KEY=$SECRET" >> $GITHUB_ENV

.github/workflows/cron-closeOnDate.yml

@@ -1,12 +1,11 @@
-name: Cron - Survey status update
+name: Cron - closeOnDate
 
 on:
-  workflow_dispatch:
   # "Scheduled workflows run on the latest commit on the default or base branch."
   # — https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#schedule
-  # schedule:
-  # Runs “At 00:00.” (see https://crontab.guru)
-  # - cron: "0 0 * * *"
+  schedule:
+    # Runs “At 00:00.” (see https://crontab.guru)
+    - cron: "0 0 * * *"
 jobs:
   cron-weeklySummary:
     env:
@@ -17,7 +16,7 @@ jobs:
       - name: cURL request
         if: ${{ env.APP_URL && env.CRON_SECRET }}
         run: |
-          curl ${{ env.APP_URL }}/api/cron/survey-status \
+          curl ${{ env.APP_URL }}/api/cron/close_surveys \
             -X POST \
             -H 'content-type: application/json' \
             -H 'x-api-key: ${{ env.CRON_SECRET }}' \

.github/workflows/cron-reportUsageToStripe.yml

@@ -1,12 +1,11 @@
-name: Cron - Report usage to Stripe
+name: Cron - reportUsageToStripe
 
 on:
-  workflow_dispatch:
   # "Scheduled workflows run on the latest commit on the default or base branch."
   # — https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#schedule
-  # schedule:
-  # This will run the job at 20:00 UTC every day of every month.
-  # - cron: "0 20 * * *"
+  schedule:
+    # This will run the job at 23:00 UTC every day of every month.
+    - cron: "0 21 * * *"
 jobs:
   cron-reportUsageToStripe:
     env:
@@ -20,5 +19,4 @@ jobs:
           curl ${{ env.APP_URL }}/api/cron/report-usage \
             -X POST \
             -H 'x-api-key: ${{ env.CRON_SECRET }}' \
-            -H 'Cache-Control: no-cache' \
             --fail

.github/workflows/cron-weeklySummary.yml

@@ -1,12 +1,11 @@
-name: Cron - Weekly summary
+name: Cron - weeklySummary
 
 on:
-  workflow_dispatch:
   # "Scheduled workflows run on the latest commit on the default or base branch."
   # — https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#schedule
-  # schedule:
-  # Runs “At 08:00 on Monday.” (see https://crontab.guru)
-  # - cron: "0 8 * * 1"
+  schedule:
+    # Runs “At 08:00 on Monday.” (see https://crontab.guru)
+    - cron: "0 8 * * 1"
 jobs:
   cron-weeklySummary:
     env:
@@ -17,7 +16,7 @@ jobs:
       - name: cURL request
         if: ${{ env.APP_URL && env.CRON_SECRET }}
         run: |
-          curl ${{ env.APP_URL }}/api/cron/weekly-summary \
+          curl ${{ env.APP_URL }}/api/cron/weekly_summary \
             -X POST \
             -H 'content-type: application/json' \
             -H 'x-api-key: ${{ env.CRON_SECRET }}' \

.github/workflows/e2e.yml

@@ -1,75 +0,0 @@
-name: E2E Tests
-on:
-  workflow_call:
-  workflow_dispatch:
-jobs:
-  build:
-    name: Run E2E Tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/dangerous-git-checkout
-
-      - name: Build & Cache Web Binaries
-        uses: ./.github/actions/cache-build-web
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v2
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Start PostgreSQL
-        run: |
-          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=web &
-          for attempt in {1..20}; do
-            if [ $(curl -o /dev/null -s -w "%{http_code}" http://localhost:3000/health) -eq 200 ]; then
-              echo "Ready"
-              break
-            fi
-            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
-        with:
-          path: ~/.cache/ms-playwright
-          key: ${{ runner.os }}-playwright-${{ hashFiles('pnpm-lock.yaml') }}
-
-      - name: Install Playwright
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: pnpm exec playwright install --with-deps
-
-      - name: Run E2E Tests
-        run: |
-          pnpm test:e2e
-
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: playwright-report
-          path: playwright-report/
-          retention-days: 30

.github/workflows/kamal-deploy.yml

@@ -1,131 +0,0 @@
-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_TEAM_ID: ${{ vars.DEFAULT_TEAM_ID }}
-      ONBOARDING_DISABLED: ${{ vars.ONBOARDING_DISABLED }}
-      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

@@ -1,128 +0,0 @@
-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_TEAM_ID: ${{ vars.DEFAULT_TEAM_ID }}
-      ONBOARDING_DISABLED: ${{ vars.ONBOARDING_DISABLED }}
-      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

@@ -8,8 +8,8 @@ jobs:
     timeout-minutes: 15
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/dangerous-git-checkout
+      - name: Checkout repo
+        uses: actions/checkout@v3
 
       - name: Setup Node.js 18.x
         uses: actions/setup-node@v3
@@ -25,7 +25,7 @@ jobs:
       - name: create .env
         run: cp .env.example .env
 
-      - name: Generate Random ENCRYPTION_KEY
+      - name: Generate Random NEXTAUTH_SECRET
         run: |
           SECRET=$(openssl rand -hex 32)
           echo "ENCRYPTION_KEY=$SECRET" >> $GITHUB_ENV

.github/workflows/pr.yml

@@ -1,7 +1,7 @@
 name: PR Update
 
 on:
-  pull_request:
+  pull_request_target:
     branches:
       - main
   merge_group:
@@ -12,54 +12,23 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  changes:
-    name: Detect changes
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: read
-    outputs:
-      has-files-requiring-all-checks: ${{ steps.filter.outputs.has-files-requiring-all-checks }}
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/dangerous-git-checkout
-      - uses: dorny/paths-filter@v2
-        id: filter
-        with:
-          filters: |
-            has-files-requiring-all-checks:
-              - "!(**.md|.github/CODEOWNERS)"
-
   test:
-    name: Run Unit Tests
-    needs: [changes]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    name: Run Tests
     uses: ./.github/workflows/test.yml
     secrets: inherit
 
   lint:
     name: Run Linters
-    needs: [changes]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/lint.yml
     secrets: inherit
 
   build:
     name: Build Formbricks-web
-    needs: [changes]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/build-web.yml
     secrets: inherit
 
-  e2e-test:
-    name: Run E2E Tests
-    needs: [changes]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
-    uses: ./.github/workflows/e2e.yml
-    secrets: inherit
-
   required:
-    name: PR Check Summary
-    needs: [lint, test, build, e2e-test]
+    needs: [lint, test, build]
     if: always()
     runs-on: ubuntu-latest
     steps:

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

@@ -1,70 +0,0 @@
-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:
-    tags:
-      - "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"
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    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:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Install cosign
-        if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 #v3.1.1
-        with:
-          cosign-release: "v2.1.1"
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=tag
-            type=raw,value=${{ github.ref_name }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./packages/database/Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            DATABASE_URL=${{ env.DATABASE_URL }}
-
-      - name: Sign the published Docker image
-        if: ${{ github.event_name != 'pull_request' }}
-        run: |
-          cosign sign --yes ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}

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

@@ -6,7 +6,6 @@ name: Docker
 # documentation.
 
 on:
-  workflow_dispatch:
   push:
     tags:
       - "v*"
@@ -16,12 +15,11 @@ env:
   REGISTRY: ghcr.io
   # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-  TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
-  DATABASE_URL: "postgresql://postgres:postgres@localhost:5432/formbricks?schema=public"
+
 
 jobs:
   build:
+
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -34,22 +32,25 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Set up Depot CLI
-        uses: depot/setup-action@v1
-
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
         if: github.event_name != 'pull_request'
         uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 #v3.1.1
         with:
-          cosign-release: "v2.1.1"
+          cosign-release: 'v2.1.1'
+
+      # Set up BuildKit Docker container builder to be able to build
+      # multi-platform images and export cache
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3 # v3.0.0
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -59,7 +60,7 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v5 # v5.0.0
+        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
@@ -67,13 +68,9 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: depot/build-push-action@v1
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
-          project: tw0fqmsx3c
-          token: ${{ secrets.DEPOT_PROJECT_TOKEN }}
           context: .
-          file: ./apps/web/Dockerfile
-          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release-docker.yml

@@ -14,6 +14,16 @@ jobs:
       TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
       DATABASE_URL: "postgresql://postgres:postgres@localhost:5432/formbricks?schema=public"
     steps:
+      - name: Generate Random NEXTAUTH_SECRET
+        run: |
+          SECRET=$(openssl rand -hex 32)
+          echo "NEXTAUTH_SECRET=$SECRET" >> $GITHUB_ENV
+
+      - name: Generate Random ENCRYPTION_KEY
+        run: |
+          SECRET=$(openssl rand -hex 32)
+          echo "ENCRYPTION_KEY=$SECRET" >> $GITHUB_ENV
+
       - name: Checkout Repo
         uses: actions/checkout@v2
 
@@ -42,3 +52,7 @@ jobs:
           tags: |
             ${{ secrets.DOCKER_USERNAME }}/formbricks:${{ env.RELEASE_TAG }}
             ${{ secrets.DOCKER_USERNAME }}/formbricks:latest
+          build-args: |
+            NEXTAUTH_SECRET=${{ env.NEXTAUTH_SECRET }}
+            DATABASE_URL=${{ env.DATABASE_URL }}
+            ENCRYPTION_KEY=${{ env.ENCRYPTION_KEY }}

.github/workflows/test.yml

@@ -3,18 +3,22 @@ on:
   workflow_call:
 jobs:
   build:
-    name: Unit Tests
+    name: Tests
     runs-on: ubuntu-latest
     timeout-minutes: 15
 
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/dangerous-git-checkout
+    env:
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+      TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
 
-      - name: Setup Node.js 20.x
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - 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@v2
@@ -25,10 +29,8 @@ jobs:
       - 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-js dependencies
+        run: pnpm build --filter=js
 
       - name: Test
         run: pnpm test

.gitignore

@@ -44,17 +44,4 @@ packages/database/zod
 # nixos stuff
 .direnv
 
-Zone.Identifier
-
-# Playwright
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/
-
-# uploads
-packages/lib/uploads
-
-# Vite Timestamps
-vite.config.*.timestamp-*
-
+Zone.Identifier

.kamal/hooks/post-deploy.sample

@@ -1,14 +0,0 @@
-#!/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

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

.kamal/hooks/pre-build.sample

@@ -1,51 +0,0 @@
-#!/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

@@ -1,47 +0,0 @@
-#!/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

@@ -1,109 +0,0 @@
-#!/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

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

.prettierrc.js

@@ -1,6 +1 @@
-const baseConfig = require("./packages/prettier-config/prettier-preset");
-
-module.exports = {
-  ...baseConfig,
-  plugins: ["@trivago/prettier-plugin-sort-imports", "prettier-plugin-tailwindcss"],
-};
+module.exports = require("./packages/prettier-config/prettier-preset");

README.md

@@ -1,111 +1,85 @@
 <div id="top"></div>
-
 <p align="center">
-
 <a href="https://formbricks.com">
+    <img width="120" alt="Open Source Experience Management Solution Qualtrics Alternative Logo" src="https://github.com/formbricks/formbricks/assets/72809645/0086704f-bee7-4d38-9cc8-fa42ee59e004">
+  </a>
+  <h3 align="center">Formbricks</h3>
 
-<img width="120" alt="Open Source Privacy First Experience Management Solution Qualtrics Alternative Logo" src="https://github.com/formbricks/formbricks/assets/72809645/0086704f-bee7-4d38-9cc8-fa42ee59e004">
-
-</a>
-
-<h3 align="center">Formbricks</h3>
-
-<p align="center">
-Harvest user-insights, build irresistible experiences.
-<br />
-<a href="https://formbricks.com/">Website</a> | <a href="https://formbricks.com/discord">Join Discord community</a>
-</p>
+  <p align="center">
+    The Open Source Survey Toolbox
+    <br />
+    <a href="https://formbricks.com/">Website</a>  |  <a href="https://formbricks.com/discord">Join Discord community</a>
+  </p>
 </p>
 
 <p align="center">
 <a href="https://github.com/formbricks/formbricks/blob/main/LICENSE"><img src="https://img.shields.io/badge/License-AGPL-purple" alt="License"></a> <a href="https://formbricks.com/discord"><img src="https://img.shields.io/discord/979077669410979880?label=Discord&logo=discord&logoColor=%23fff" alt="Join Formbricks Discord"></a> <a href="https://github.com/formbricks/formbricks/stargazers"><img src="https://img.shields.io/github/stars/formbricks/formbricks?logo=github" alt="Github Stars"></a>
-<a href="https://news.ycombinator.com/item?id=32303986"><img src="https://img.shields.io/badge/Hacker%20News-122-%23FF6600" alt="Hacker News"></a>
-<a href="[https://www.producthunt.com/products/formbricks](https://www.producthunt.com/posts/formbricks)"><img src="https://img.shields.io/badge/Product%20Hunt-455-orange?logo=producthunt&logoColor=%23fff" alt="Product Hunt"></a>
-<a href="https://github.blog/2023-04-12-github-accelerator-our-first-cohort-and-whats-next/"><img src="https://img.shields.io/badge/2023-blue?logo=github&label=Github%20Accelerator" alt="Github Accelerator"></a>
+   <a href="https://news.ycombinator.com/item?id=32303986"><img src="https://img.shields.io/badge/Hacker%20News-122-%23FF6600" alt="Hacker News"></a>
+   <a href="[https://www.producthunt.com/products/formbricks](https://www.producthunt.com/posts/formbricks)"><img src="https://img.shields.io/badge/Product%20Hunt-455-orange?logo=producthunt&logoColor=%23fff" alt="Product Hunt"></a>
+   <a href="https://github.blog/2023-04-12-github-accelerator-our-first-cohort-and-whats-next/"><img src="https://img.shields.io/badge/2023-blue?logo=github&label=Github%20Accelerator" alt="Github Accelerator"></a>
 <a href="https://github.com/formbricks/formbricks/issues?q=is:issue+is:open+label:%22%F0%9F%99%8B%F0%9F%8F%BB%E2%80%8D%E2%99%82%EF%B8%8Fhelp+wanted%22"><img src="https://img.shields.io/badge/Help%20Wanted-Contribute-blue"></a>
 </p>
 
 <br/>
 
-<div style="background-color:#f8fafc; border-radius:5px;">
 <p align="center">
-<i>Trusted by</i><br/>
-  <img width="867" alt="clients-hi-res" src="https://github.com/formbricks/formbricks/assets/72809645/924d3693-f66a-4063-bb31-6e5789a8175a">
+<i>Trusted by</i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://github.com/calcom/cal.com/"><img src="https://github.com/formbricks/formbricks/assets/675065/1a8763cf-f47e-4960-90f6-334f6dc12a17#gh-light-mode-only" height="20px"></a><a href="https://github.com/calcom/cal.com/"><img src="https://github.com/formbricks/formbricks/assets/72809645/9a031e8d-538f-4fdc-9338-b77e9a57d6ac#gh-dark-mode-only" height="20px"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://github.com/CrowdDotDev/crowd.dev"><img src="https://github.com/formbricks/formbricks/assets/675065/59b1a4d4-25e4-4ef3-b0bf-4426446fbfd0#gh-light-mode-only" height="20px"></a><a href="https://github.com/CrowdDotDev/crowd.dev"><img src="https://github.com/formbricks/formbricks/assets/72809645/4bb4caf7-4b64-44c8-94bd-850606d181c1#gh-dark-mode-only" height="20px"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://clovyr.io/"><img src="https://github.com/formbricks/formbricks/assets/675065/9291c8df-9aac-423a-a430-a9a581240075" height="20px"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<a href="https://neverinstall.com/"><img src="https://github.com/formbricks/formbricks/assets/675065/72e5e37b-8ef7-4340-b06e-f1d12a05330f#gh-light-mode-only" height="20px"></a><a href="https://neverinstall.com/"><img src="https://github.com/formbricks/formbricks/assets/72809645/9d9711dc-75e5-4084-b7fa-bbaf621064a8#gh-dark-mode-only" height="20px">
 </p>
-<div>
 
 <p align="center">
-<a href="https://trendshift.io/repositories/2570" target="_blank"><img src="https://trendshift.io/api/badge/repositories/2570" alt="Trendshift Badge for formbricks/formbricks" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+  <a href="https://trendshift.io/repositories/2570" target="_blank"><img src="https://trendshift.io/api/badge/repositories/2570" alt="Trendshift Badge for formbricks/formbricks" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 </p>
 
 ## ✨ About Formbricks
 
 <img width="1527" alt="formbricks-sneak" src="https://github-production-user-asset-6210df.s3.amazonaws.com/675065/249441967-ccb89ea3-82b4-4bf2-8d2c-528721ec313b.png">
 
-Formbricks provides a free and open source surveying platform. Gather feedback at every point in the user journey with beautiful in-app, website, link and email surveys. Build on top of Formbricks or leverage prebuilt data analysis capabilities.
+Formbricks is your go-to solution for in-product micro-surveys that will supercharge your product experience. Use micro-surveys to target the right users at the right time without making surveys annoying.
 
-**Try it out in the cloud at [formbricks.com](https://app.formbricks.com/auth/signup)**
+**Try it out in the cloud at [formbricks.com](https://formbricks.com)**
 
-## 💪 Mission: Empower your team, craft an irresistible experience.
+## 💪 Mission: Make customer-centric decisions based on data.
 
-Formbricks is both a free and open source survey platform - and a privacy-first experience management platform. Use in-app, website, link and email surveys to gather user and customer insights at every point of their journey. Leverage Formbricks Insight Platform or build your own. Life's too short for mediocre UX.
+Formbricks is a powerful tool for creating in-product micro-surveys - and leverage a significantly higher conversion rate. It allows you to gather valuable insights from your users, enabling you to make data-driven decisions that enhance your product's user experience. With Formbricks, you can create surveys with our no-code editor, choose from a variety of templates, target specific user groups, and much more.
 
 ### Table of Contents
 
 - [Features](#features)
-
 - [Getting Started](#getting-started)
-
-- [Cloud Version](#cloud-version)
-
-- [Self-hosted Version](#self-hosted-version)
-
-- [Development](#development)
-
+  - [Cloud Version](#cloud-version)
+  - [Self-hosted Version](#self-hosted-version)
+  - [Development](#development)
 - [Contribution](#contribution)
-
 - [Contact](#contact-us)
-
-- [Security](#security)
-
 - [License](#license)
+- [Security](#security)
 
 <a id="features"></a>
 
 ### Features
 
-- 📲 Create **conversion-optimized surveys** with our no-code editor with several question types.
-
+- 📲 Create **in-product surveys** with our no-code editor with multiple question types.
 - 📚 Choose from a variety of best-practice **templates**.
-
 - 👩🏻 Launch and **target your surveys to specific user groups** without changing your application code.
-
 - 🔗 Create shareable **link surveys**.
-
 - 👨‍👩‍👦 Invite your team members to **collaborate** on your surveys.
-
-- 🔌 Integrate Formbricks with **Slack, Notion, Zapier, n8n and more**.
-
+- 🔌 Integrate Formbricks with **Slack, Posthog, Zapier, n8n and more**.
 - 🔒 All **open source**, transparent and self-hostable.
 
 ### Built on Open Source
 
 - 💻 [Typescript](https://www.typescriptlang.org/)
-
 - 🚀 [Next.js](https://nextjs.org/)
-
 - ⚛️ [React](https://reactjs.org/)
-
 - 🎨 [TailwindCSS](https://tailwindcss.com/)
-
 - 📚 [Prisma](https://prisma.io/)
-
 - 🔒 [Auth.js](https://authjs.dev/)
-
 - 🧘‍♂️ [Zod](https://zod.dev/)
 
-- 🐛 [Vitest](https://vitest.dev/)
-
 <a id="getting-started"></a>
 
 ## 🚀 Getting started
@@ -116,14 +90,16 @@ We've got several options depending on your need to help you quickly get started
 
 ### ☁️ Cloud Version
 
-Formbricks has a hosted cloud offering with a generous free plan to get you up and running as quickly as possible. To get started, please visit [formbricks.com](https://app.formbricks.com/auth/signup).
+Formbricks has a hosted cloud offering with a generous free plan to get you up and running as quickly as possible. To get started, please visit [formbricks.com](https://formbricks.com).
 
 <a id="self-hosted-version"></a>
 
-### 🐳 Self-hosting Formbricks
+### 🐳 Self-hosted version
 
 Formbricks is available Open-Source under AGPLv3 license. You can host Formbricks on your own servers using Docker without a subscription.
 
+(In the future we may develop additional features that aren't in the free Open-Source version).
+
 If you opt for self-hosting Formbricks, here are a few options to consider:
 
 #### Docker
@@ -138,31 +114,23 @@ You can deploy Formbricks on [Railway](https://railway.app) using the button bel
 
 [![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/new/template/PPDzCd)
 
-##### RepoCloud
-
-Or you can also deploy Formbricks on [RepoCloud](https://repocloud.io) using the button below.
-
-[![Deploy on RepoCloud](https://d16t0pc4846x52.cloudfront.net/deploy.png)](https://repocloud.io/details/?app_id=254)
-
 <a id="development"></a>
 
-## 👨‍💻 Development
+### 👨‍💻 Development
 
-### Prerequisites
+#### Prerequisites
 
 Here is what you need to be able to run Formbricks:
 
 - [Node.js](https://nodejs.org/en) (Version: >=18.x)
-
 - [Pnpm](https://pnpm.io/)
-
 - [Docker](https://www.docker.com/) - to run PostgreSQL and MailHog
 
-### Local Setup
+#### Local Setup
 
 To get started locally, we've got a [guide to help you](https://formbricks.com/docs/contributing/setup).
 
-### Gitpod Setup
+#### Gitpod Setup
 
 1. Click the button below to open this project in Gitpod.
 
@@ -179,9 +147,7 @@ We are very happy if you are interested in contributing to Formbricks 🤗
 Here are a few options:
 
 - Star this repo.
-
 - Create issues every time you feel something is missing or goes wrong.
-
 - 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/contributing/introduction) and our [list of open issues](https://github.com/formbricks/formbricks/issues) for more information.
@@ -189,9 +155,7 @@ Please check out [our contribution guide](https://formbricks.com/docs/contributi
 ## All Thanks To Our Contributors
 
 <a href="https://github.com/formbricks/formbricks/graphs/contributors">
-
-<img src="https://contrib.rocks/image?repo=formbricks/formbricks" />
-
+  <img src="https://contrib.rocks/image?repo=formbricks/formbricks" />
 </a>
 
 <a id="contact-us"></a>
@@ -204,30 +168,14 @@ Let's have a chat about your survey needs and get you started.
 
 <a id="license"></a>
 
+## ⚖️ License
+
+Distributed under the AGPLv3 License. See [`LICENSE`](./LICENSE) for more information.
+
 <a id="security"></a>
 
 ## 🔒 Security
 
 We take security very seriously. If you come across any security vulnerabilities, please disclose them by sending an email to security@formbricks.com. We appreciate your help in making our platform as secure as possible and are committed to working with you to resolve any issues quickly and efficiently. See [`SECURITY.md`](./SECURITY.md) for more information.
 
-<a id="license"></a>
-
-## 👩‍⚖️ License
-
-### The AGPL Formbricks Core
-
-The Formbricks core application is licensed under the [AGPLv3 Open Source License](https://github.com/formbricks/formbricks/blob/main/LICENSE). The core application is fully functional and includes everything you need to design & run link surveys, website surveys and in-app surveys. You can use the software for free for personal and commercial use. You're also allowed to create and distribute modified versions as long as you document the changes you make incl. date. The AGPL license requires you to publish your modified version under the AGPLv3 license as well.
-
-### The Enterprise Edition
-
-Additional to the AGPL licensed Formbricks core, this repository contains code licensed under an Enterprise license. The [code](https://github.com/formbricks/formbricks/tree/main/packages/ee) and [license](https://github.com/formbricks/formbricks/blob/main/packages/ee/LICENSE) for the enterprise functionality can be found in the `/packages/ee` folder of this repository. This additional functionality is not part of the AGPLv3 licensed Formbricks core and is designed to meet the needs of larger teams and enterprises. This advanced functionality is already included in the Docker images, but you need an [Enterprise License Key](https://formbricks.com/docs/self-hosting/enterprise) to unlock it.
-
-### White-Labeling Formbricks and Other Licensing Needs
-
-If you have other licensing requirements such as White-Labeling please [send us an email](mailto:hola@formbricks.com).
-
-### Why charge for Enterprise Features?
-
-The Enterprise Edition and White-Label Licenses allow us to fund the development of Formbricks sustainably. It guarantees that the open-source surveying infrastructure we're building will be around for decades to come.
-
 <p align="right"><a href="#top">🔼 Back to top</a></p>

apps/demo/components/Sidebar.tsx

@@ -1,28 +1,27 @@
+import { classNames } from "@/lib/utils";
 import {
   ClockIcon,
   CogIcon,
   CreditCardIcon,
-  FileBarChartIcon,
-  HelpCircleIcon,
+  DocumentChartBarIcon,
   HomeIcon,
+  QuestionMarkCircleIcon,
   ScaleIcon,
   ShieldCheckIcon,
-  UsersIcon,
-} from "lucide-react";
-
-import { classNames } from "../lib/utils";
+  UserGroupIcon,
+} from "@heroicons/react/24/outline";
 
 const navigation = [
   { name: "Home", href: "#", icon: HomeIcon, current: true },
   { name: "History", href: "#", icon: ClockIcon, current: false },
   { name: "Balances", href: "#", icon: ScaleIcon, current: false },
   { name: "Cards", href: "#", icon: CreditCardIcon, current: false },
-  { name: "Recipients", href: "#", icon: UsersIcon, current: false },
-  { name: "Reports", href: "#", icon: FileBarChartIcon, current: false },
+  { name: "Recipients", href: "#", icon: UserGroupIcon, current: false },
+  { name: "Reports", href: "#", icon: DocumentChartBarIcon, current: false },
 ];
 const secondaryNavigation = [
   { name: "Settings", href: "#", icon: CogIcon },
-  { name: "Help", href: "#", icon: HelpCircleIcon },
+  { name: "Help", href: "#", icon: QuestionMarkCircleIcon },
   { name: "Privacy", href: "#", icon: ShieldCheckIcon },
 ];
 

apps/demo/package.json

@@ -12,13 +12,12 @@
   },
   "dependencies": {
     "@formbricks/js": "workspace:*",
-    "lucide-react": "^0.368.0",
-    "next": "14.2.1",
+    "@heroicons/react": "^2.0.18",
+    "next": "14.0.0",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "eslint-config-formbricks": "workspace:*",
-    "@formbricks/tsconfig": "workspace:*"
+    "eslint-config-formbricks": "workspace:*"
   }
 }

apps/demo/pages/_app.tsx

@@ -1,6 +1,5 @@
 import type { AppProps } from "next/app";
 import Head from "next/head";
-
 import "../styles/globals.css";
 
 export default function App({ Component, pageProps }: AppProps) {

apps/demo/pages/_document.tsx

@@ -1,8 +1,8 @@
-import { Head, Html, Main, NextScript } from "next/document";
+import { Html, Head, Main, NextScript } from "next/document";
 
 export default function Document() {
   return (
-    <Html lang="en" className="h-full bg-slate-50">
+    <Html lang="en" className="h-full bg-gray-50">
       <Head />
       <body className="h-full">
         <Main />

apps/demo/pages/app/index.tsx

@@ -1,11 +1,8 @@
-import { EarthIcon } from "lucide-react";
+import formbricks from "@formbricks/js";
 import Image from "next/image";
-import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
-
-import formbricksApp from "@formbricks/js/app";
-
 import fbsetup from "../../public/fb-setup.png";
+import { useRouter } from "next/router";
 
 declare const window: any;
 
@@ -22,33 +19,21 @@ export default function AppPage({}) {
   }, [darkMode]);
 
   useEffect(() => {
-    // enable Formbricks debug mode by adding formbricksDebug=true GET parameter
-    const addFormbricksDebugParam = () => {
-      const urlParams = new URLSearchParams(window.location.search);
-      if (!urlParams.has("formbricksDebug")) {
-        urlParams.set("formbricksDebug", "true");
-        const newUrl = `${window.location.pathname}?${urlParams.toString()}`;
-        window.history.replaceState({}, "", newUrl);
-      }
-    };
-
-    addFormbricksDebugParam();
-
     if (process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID && process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST) {
-      const userId = "THIS-IS-A-VERY-LONG-USER-ID-FOR-TESTING";
-      const userInitAttributes = { language: "de", "Init Attribute 1": "eight", "Init Attribute 2": "two" };
-
-      formbricksApp.init({
+      const isUserId = window.location.href.includes("userId=true");
+      const userId = isUserId ? "THIS-IS-A-VERY-LONG-USER-ID-FOR-TESTING" : undefined;
+      formbricks.init({
         environmentId: process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID,
         apiHost: process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST,
         userId,
-        attributes: userInitAttributes,
+        debug: true,
       });
+      window.formbricks = formbricks;
     }
 
     // Connect next.js router to Formbricks
     if (process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID && process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST) {
-      const handleRouteChange = formbricksApp?.registerRouteChange;
+      const handleRouteChange = formbricks?.registerRouteChange;
       router.events.on("routeChangeComplete", handleRouteChange);
 
       return () => {
@@ -57,38 +42,18 @@ export default function AppPage({}) {
     }
   });
 
-  const removeFormbricksContainer = () => {
-    document.getElementById("formbricks-modal-container")?.remove();
-    document.getElementById("formbricks-app-container")?.remove();
-    localStorage.removeItem("formbricks-js-app");
-  };
-
   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 items-center gap-2">
-          <button
-            className="rounded-lg bg-[#038178] p-2 text-white focus:outline-none focus:ring-2 focus:ring-slate-900 focus:ring-offset-1"
-            onClick={() => {
-              removeFormbricksContainer();
-              window.location.href = "/website";
-            }}>
-            <div className="flex items-center gap-2">
-              <EarthIcon className="h-10 w-10" />
-              <span>Website Demo</span>
-            </div>
-          </button>
-          <div>
-            <h1 className="text-2xl font-bold text-slate-900 dark:text-white">
-              Formbricks In-product Survey Demo App
-            </h1>
-            <p className="text-slate-700 dark:text-slate-300">
-              This app helps you test your app surveys. You can create and test user actions, create and
-              update user attributes, etc.
-            </p>
-          </div>
+        <div>
+          <h1 className="text-2xl font-bold text-slate-900 dark:text-white">
+            Formbricks In-product Survey Demo App
+          </h1>
+          <p className="text-slate-700 dark:text-slate-300">
+            This app helps you test your in-app surveys. You can create and test user actions, create and
+            update user attributes, etc.
+          </p>
         </div>
-
         <button
           className="mt-2 rounded-lg bg-slate-200 px-6 py-1 dark:bg-slate-700 dark:text-slate-100"
           onClick={() => setDarkMode(!darkMode)}>
@@ -101,18 +66,18 @@ export default function AppPage({}) {
           <div className="rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-900">
             <h3 className="text-lg font-semibold text-slate-900 dark:text-white">1. Setup .env</h3>
             <p className="text-slate-700 dark:text-slate-300">
-              Copy the environment ID of your Formbricks app to the env variable in /apps/demo/.env
+              Copy the environment ID of your Formbricks app to the env variable in demo/.env
             </p>
             <Image src={fbsetup} alt="fb setup" className="mt-4 rounded" priority />
 
-            <div className="mt-4 flex-col items-start text-sm text-slate-700 sm:flex sm:items-center sm:text-base dark:text-slate-300">
+            <div className="mt-4 flex-col items-start text-sm text-slate-700 dark:text-slate-300 sm:flex sm:items-center sm:text-base">
               <p className="mb-1 sm:mb-0 sm:mr-2">You&apos;re connected with env:</p>
               <div className="flex items-center">
                 <strong className="w-32 truncate sm:w-auto">
                   {process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID}
                 </strong>
                 <span className="relative ml-2 flex h-3 w-3">
-                  <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-500 opacity-75"></span>
+                  <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-400 opacity-75"></span>
                   <span className="relative inline-flex h-3 w-3 rounded-full bg-green-500"></span>
                 </span>
               </div>
@@ -131,22 +96,22 @@ export default function AppPage({}) {
         </div>
 
         <div className="md:grid md:grid-cols-3">
-          <div className="col-span-3 rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-800">
+          <div className="col-span-3 rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-gray-600 dark:bg-gray-800">
             <h3 className="text-lg font-semibold dark:text-white">
               Reset person / pull data from Formbricks app
             </h3>
-            <p className="text-slate-700 dark:text-slate-300">
-              On formbricks.reset() the local state will <strong>be deleted</strong> and formbricks gets{" "}
-              <strong>reinitialized</strong>.
+            <p className="text-slate-700 dark:text-gray-300">
+              On formbricks.reset() a few things happen: <strong>New person is created</strong> and{" "}
+              <strong>surveys & no-code actions are pulled from Formbricks:</strong>.
             </p>
             <button
-              className="my-4 rounded-lg bg-slate-500 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600"
+              className="my-4 rounded-lg bg-slate-500 px-6 py-3 text-white hover:bg-slate-700 dark:bg-gray-700 dark:hover:bg-gray-600"
               onClick={() => {
-                formbricksApp.reset();
+                formbricks.reset();
               }}>
               Reset
             </button>
-            <p className="text-xs text-slate-700 dark:text-slate-300">
+            <p className="text-xs text-slate-700 dark:text-gray-300">
               If you made a change in Formbricks app and it does not seem to work, hit &apos;Reset&apos; and
               try again.
             </p>
@@ -155,15 +120,15 @@ export default function 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"
+                className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-gray-700 dark:hover:bg-gray-600"
                 onClick={() => {
-                  formbricksApp.track("Code Action");
+                  formbricks.track("Code Action");
                 }}>
                 Code Action
               </button>
             </div>
             <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
+              <p className="text-xs text-slate-700 dark:text-gray-300">
                 This button sends a{" "}
                 <a href="https://formbricks.com/docs/actions/code" className="underline" target="_blank">
                   Code Action
@@ -174,12 +139,12 @@ export default function AppPage({}) {
           </div>
           <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-gray-700 dark:hover:bg-gray-600">
                 No-Code Action
               </button>
             </div>
             <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
+              <p className="text-xs text-slate-700 dark:text-gray-300">
                 This button sends a{" "}
                 <a
                   href="https://formbricks.com/docs/actions/no-code"
@@ -201,14 +166,14 @@ export default function AppPage({}) {
             <div>
               <button
                 onClick={() => {
-                  formbricksApp.setAttribute("Plan", "Free");
+                  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-gray-700 dark:hover:bg-gray-600">
                 Set Plan to &apos;Free&apos;
               </button>
             </div>
             <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
+              <p className="text-xs text-slate-700 dark:text-gray-300">
                 This button sets the{" "}
                 <a
                   href="https://formbricks.com/docs/attributes/custom-attributes"
@@ -224,14 +189,14 @@ export default function AppPage({}) {
             <div>
               <button
                 onClick={() => {
-                  formbricksApp.setAttribute("Plan", "Paid");
+                  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-gray-700 dark:hover:bg-gray-600">
                 Set Plan to &apos;Paid&apos;
               </button>
             </div>
             <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
+              <p className="text-xs text-slate-700 dark:text-gray-300">
                 This button sets the{" "}
                 <a
                   href="https://formbricks.com/docs/attributes/custom-attributes"
@@ -247,14 +212,14 @@ export default function AppPage({}) {
             <div>
               <button
                 onClick={() => {
-                  formbricksApp.setEmail("test@web.com");
+                  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-gray-700 dark:hover:bg-gray-600">
                 Set Email
               </button>
             </div>
             <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
+              <p className="text-xs text-slate-700 dark:text-gray-300">
                 This button sets the{" "}
                 <a
                   href="https://formbricks.com/docs/attributes/identify-users"
@@ -266,6 +231,41 @@ export default function AppPage({}) {
               </p>
             </div>
           </div>
+          <div className="p-6">
+            {router.query.userId === "true" ? (
+              <div>
+                <button
+                  onClick={() => {
+                    window.location.href = "/app";
+                  }}
+                  className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700  dark:bg-gray-700 dark:hover:bg-gray-600">
+                  Deactivate User Identification
+                </button>
+              </div>
+            ) : (
+              <div>
+                <button
+                  onClick={() => {
+                    window.location.href = "/app?userId=true";
+                  }}
+                  className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700  dark:bg-gray-700 dark:hover:bg-gray-600">
+                  Activate User Identification
+                </button>
+              </div>
+            )}
+            <div>
+              <p className="text-xs text-slate-700 dark:text-gray-300">
+                This button activates/deactivates{" "}
+                <a
+                  href="https://formbricks.com/docs/attributes/identify-users"
+                  target="_blank"
+                  className="underline dark:text-blue-500">
+                  user identification
+                </a>{" "}
+                with the userId &apos;THIS-IS-A-VERY-LONG-USER-ID-FOR-TESTING&apos;
+              </p>
+            </div>
+          </div>
         </div>
       </div>
     </div>

apps/demo/pages/website/index.tsx

@@ -1,212 +0,0 @@
-import { MonitorIcon } from "lucide-react";
-import Image from "next/image";
-import { useRouter } from "next/router";
-import { useEffect, useState } from "react";
-
-import formbricksWebsite from "@formbricks/js/website";
-
-import fbsetup from "../../public/fb-setup.png";
-
-declare const window: any;
-
-export default function AppPage({}) {
-  const [darkMode, setDarkMode] = useState(false);
-  const router = useRouter();
-
-  useEffect(() => {
-    if (darkMode) {
-      document.body.classList.add("dark");
-    } else {
-      document.body.classList.remove("dark");
-    }
-  }, [darkMode]);
-
-  useEffect(() => {
-    // enable Formbricks debug mode by adding formbricksDebug=true GET parameter
-    const addFormbricksDebugParam = () => {
-      const urlParams = new URLSearchParams(window.location.search);
-      if (!urlParams.has("formbricksDebug")) {
-        urlParams.set("formbricksDebug", "true");
-        const newUrl = `${window.location.pathname}?${urlParams.toString()}`;
-        window.history.replaceState({}, "", newUrl);
-      }
-    };
-
-    addFormbricksDebugParam();
-
-    if (process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID && process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST) {
-      const defaultAttributes = {
-        language: "de",
-      };
-
-      formbricksWebsite.init({
-        environmentId: process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID,
-        apiHost: process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST,
-        attributes: defaultAttributes,
-      });
-    }
-
-    // Connect next.js router to Formbricks
-    if (process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID && process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST) {
-      const handleRouteChange = formbricksWebsite?.registerRouteChange;
-      router.events.on("routeChangeComplete", handleRouteChange);
-
-      return () => {
-        router.events.off("routeChangeComplete", handleRouteChange);
-      };
-    }
-  });
-
-  const removeFormbricksContainer = () => {
-    document.getElementById("formbricks-modal-container")?.remove();
-    document.getElementById("formbricks-website-container")?.remove();
-    localStorage.removeItem("formbricks-js-website");
-  };
-
-  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 items-center gap-2">
-          <button
-            className="rounded-lg bg-[#038178] p-2 text-white focus:outline-none focus:ring-2 focus:ring-slate-900 focus:ring-offset-1"
-            onClick={() => {
-              removeFormbricksContainer();
-              window.location.href = "/app";
-            }}>
-            <div className="flex items-center gap-2">
-              <MonitorIcon className="h-10 w-10" />
-              <span>App Demo</span>
-            </div>
-          </button>
-          <div>
-            <h1 className="text-2xl font-bold text-slate-900 dark:text-white">
-              Formbricks Website Survey Demo App
-            </h1>
-            <p className="text-slate-700 dark:text-slate-300">
-              This app helps you test your app surveys. You can create and test user actions, create and
-              update user attributes, etc.
-            </p>
-          </div>
-        </div>
-
-        <button
-          className="mt-2 rounded-lg bg-slate-200 px-6 py-1 dark:bg-slate-700 dark:text-slate-100"
-          onClick={() => setDarkMode(!darkMode)}>
-          {darkMode ? "Toggle Light Mode" : "Toggle Dark Mode"}
-        </button>
-      </div>
-
-      <div className="my-4 grid grid-cols-1 gap-6 md:grid-cols-2">
-        <div>
-          <div className="rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-900">
-            <h3 className="text-lg font-semibold text-slate-900 dark:text-white">1. Setup .env</h3>
-            <p className="text-slate-700 dark:text-slate-300">
-              Copy the environment ID of your Formbricks app to the env variable in /apps/demo/.env
-            </p>
-            <Image src={fbsetup} alt="fb setup" className="mt-4 rounded" priority />
-
-            <div className="mt-4 flex-col items-start text-sm text-slate-700 sm:flex sm:items-center sm:text-base dark:text-slate-300">
-              <p className="mb-1 sm:mb-0 sm:mr-2">You&apos;re connected with env:</p>
-              <div className="flex items-center">
-                <strong className="w-32 truncate sm:w-auto">
-                  {process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID}
-                </strong>
-                <span className="relative ml-2 flex h-3 w-3">
-                  <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-500 opacity-75"></span>
-                  <span className="relative inline-flex h-3 w-3 rounded-full bg-green-500"></span>
-                </span>
-              </div>
-            </div>
-          </div>
-          <div className="mt-4 rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-900">
-            <h3 className="text-lg font-semibold text-slate-900 dark:text-white">2. Widget Logs</h3>
-            <p className="text-slate-700 dark:text-slate-300">
-              Look at the logs to understand how the widget works.{" "}
-              <strong className="dark:text-white">Open your browser console</strong> to see the logs.
-            </p>
-            {/* <div className="max-h-[40vh] overflow-y-auto py-4">
-              <LogsContainer />
-            </div> */}
-          </div>
-        </div>
-
-        <div className="md:grid md:grid-cols-3">
-          <div className="col-span-3 rounded-lg border border-slate-300 bg-slate-100 p-6 dark:border-slate-600 dark:bg-slate-800">
-            <h3 className="text-lg font-semibold dark:text-white">
-              Reset person / pull data from Formbricks app
-            </h3>
-            <p className="text-slate-700 dark:text-slate-300">
-              On formbricks.reset() the local state will <strong>be deleted</strong> and formbricks gets{" "}
-              <strong>reinitialized</strong>.
-            </p>
-            <button
-              className="my-4 rounded-lg bg-slate-500 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600"
-              onClick={() => {
-                formbricksWebsite.reset();
-              }}>
-              Reset
-            </button>
-            <p className="text-xs text-slate-700 dark:text-slate-300">
-              If you made a change in Formbricks app and it does not seem to work, hit &apos;Reset&apos; and
-              try again.
-            </p>
-          </div>
-
-          <div className="pt-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"
-                onClick={() => {
-                  formbricksWebsite.track("New Session");
-                }}>
-                Track New Session
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
-                This button sends an Action to the Formbricks API called &apos;New Session&apos;. You will
-                find it in the Actions Tab.
-              </p>
-            </div>
-          </div>
-
-          <div className="pt-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"
-                onClick={() => {
-                  formbricksWebsite.track("Exit Intent");
-                }}>
-                Track Exit Intent
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
-                This button sends an Action to the Formbricks API called &apos;Exit Intent&apos;. You can also
-                move your mouse to the top of the browser to trigger the exit intent.
-              </p>
-            </div>
-          </div>
-
-          <div className="pt-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"
-                onClick={() => {
-                  formbricksWebsite.track("50% Scroll");
-                }}>
-                Track 50% Scroll
-              </button>
-            </div>
-            <div>
-              <p className="text-xs text-slate-700 dark:text-slate-300">
-                This button sends an Action to the Formbricks API called &apos;50% Scroll&apos;. You can also
-                scroll down to trigger the 50% scroll.
-              </p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

apps/demo/tsconfig.json

@@ -1,5 +1,23 @@
 {
-  "extends": "@formbricks/tsconfig/nextjs.json",
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "paths": {
+      "@/*": ["./*"]
+    }
+  },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules"]
 }

apps/formbricks-com/.env.example

@@ -4,7 +4,3 @@ NEXT_PUBLIC_FORMBRICKS_COM_DOCS_FEEDBACK_SURVEY_ID=
 
 # Strapi API Key
 STRAPI_API_KEY=
-
-NEXT_PUBLIC_DOCSEARCH_APP_ID=
-NEXT_PUBLIC_DOCSEARCH_API_KEY=
-NEXT_PUBLIC_DOCSEARCH_INDEX_NAME=

apps/formbricks-com/app/[surveyId]/route.ts

@@ -1,5 +0,0 @@
-export async function GET(_: Request, { params }: { params: { surveyId: string } }) {
-  const surveyId = params.surveyId;
-  // redirect to Formbricks Cloud
-  return Response.redirect(`https://app.formbricks.com/s/${surveyId}`, 301);
-}

apps/formbricks-com/app/docs/actions/code/page.mdx

@@ -0,0 +1,37 @@
+export const metadata = {
+  title: "Implementing Code Actions in Formbricks | Real-time User Action Tracking",
+  description:
+    "Dive into the world of Formbricks' code actions. Learn how to seamlessly integrate formbricks.track() method into your codebase, enabling real-time tracking of user actions like button clicks, visiting a specific URL. Up your survey game with precise and exact triggers.",
+};
+
+#### Actions
+
+# Code Actions
+
+Actions can also be set in the codebase to trigger surveys. Please add the code action first in the Formbricks web interface to be able to configure your surveys to use this action.
+
+After that you can fire an action using `formbricks.track()`
+
+<Col>
+<CodeGroup title="Track an action">
+
+```javascript
+formbricks.track("Action Name");
+```
+
+</CodeGroup>
+</Col>
+Here is an example of how to fire an action when a user clicks a button:
+<Col>
+<CodeGroup title="Track Button Click">
+
+```javascript
+const handleClick = () => {
+  formbricks.track("Button Clicked");
+};
+
+return <button onClick={handleClick}>Click Me</button>;
+```
+
+</CodeGroup>
+</Col>

apps/formbricks-com/app/docs/actions/no-code/page.mdx

@@ -0,0 +1,30 @@
+export const metadata = {
+  title: "Implementing No-Code Actions in Formbricks | Real-time User Action Tracking",
+  description:
+    "Discover the power of Formbricks' No-Code Actions. Easily set up triggers based on Page URL, innerText, and CSS Selectors without touching a line of code. Inccrease user engagement and get insights at precise moments in the user journey.",
+};
+
+#### Actions
+
+# No-Code Actions
+
+No-Code actions can be set up within Formbricks with just a few clicks. There are three types of No-Code actions:
+
+## Page URL Action
+
+The page URL action is triggered, when a user visits a specific page in your application. There are several match conditions:
+
+- `exactMatch`: The URL should exactly match the provided string.
+- `contains`: The URL should contain the specified string as a substring.
+- `startsWith`: The URL should start with the specified string.
+- `endsWith`: The URL should end with the specified string.
+- `notMatch`: The URL should not match the specified condition.
+- `notContains`: The URL should not contain the specified string as a substring.
+
+## innerText Action
+
+The innerText action checks if the `innerText` of a clicked HTML element matches a specific text, e.g. the label of a button. Display a survey on any button click!
+
+## CSS Selector Action
+
+The CSS Selector action checks if the provided CSS selector matches the selector of a clicked HTML element. The CSS selector can be a class, id or any other CSS selector within your website. Display a survey on any element click!

apps/formbricks-com/app/docs/actions/why/page.mdx

@@ -0,0 +1,23 @@
+export const metadata = {
+  title: "Using Actions in Formbricks | Fine-tuning User Moments",
+  description:
+    "Dive deep into how actions in Formbricks help products and teams to engage users at precise moments in their journey. Discover the power of actions, from coding to no-code setups, to refine user targeting and generate richer, more detailed user insights.",
+};
+
+#### Actions
+
+# What are actions and why are they useful?
+
+You want to understand what your users think and feel during specific moments in the user journey. To be able to ask at exactly the right point in time, you need actions.
+
+## What are actions?
+
+Actions are a little notification sent from your application to Formbricks. You decide which actions are sent either in your [Code](/docs/actions/code) or by setting up a [No-Code](/docs/actions/no-code) action within Formbricks.
+
+## How do actions work?
+
+When a predefined action happens in your app, the Formbricks widget notices. This action can then trigger a survey to be shown to the user and is stored in the database.
+
+## Why are actions useful?
+
+Actions help you to display your surveys at the right time. Later on, you will be able to segment your users based on the actions they have triggered in the past. This way, you can create much more granular user segments, e.g. only target users that already have used a specific feature.

apps/formbricks-com/app/docs/additional-features/multi-language-surveys/page.mdx

@@ -1,174 +0,0 @@
-import { MdxImage } from "@/components/shared/MdxImage";
-
-import AddLanguageInSurvey from "./add-language-in-survey.webp";
-import AddLanguages from "./add-languages.webp";
-import EditMultiLang from "./edit-multi-lang.webp";
-import EnableMultiLang from "./enable-multi-lang.webp";
-import SeeSurveyInLanguage from "./see-survey-in-language.webp";
-import SurveyLanguagesFromHome from "./survey-languages-from-home.webp";
-import SurveyLanguageSettings from "./survey-languague-settings.webp";
-import SurveySharing from "./survey-sharing.webp";
-import SurveysHome from "./surveys-home.webp";
-import TranslateAsPerLanguage from "./translate-as-per-language.webp";
-
-export const metadata = {
-  title: "Multi-language Surveys | Formbricks",
-  description:
-    "Create multi-language link & in-app surveys with Formbricks. Get feedback from your users in their preferred language without writing a single line of code.",
-};
-
-#### Additional Features
-
-# Multi-language Surveys
-
-Multi-Language Surveys allow you to create surveys that support multiple languages using translations. This makes it easier to reach a diverse audience without creating separate surveys for each language. This feature simplifies the creation, delivery, and analysis of surveys for a multilingual audience.
-
-How to deliver a specific language depends on the survey type (in-app or link survey):
-
-- In-app survey: Set a `language` attribute for the user. [See the guide below for In-App Surveys](#in-app-surveys-configuration)
-- Link survey: Add a `lang` parameter in the survey URL. [See the guide below for Link Surveys](#link-surveys-configuration)
-
-<Note>
-  Multi-Language is feature of the Enterprise Edition. You can use it for **free** by adding your credit card details
-  on the Formbricks Cloud.
-</Note>
-
-<iframe
-  width="700"
-  height="450"
-  src="https://www.youtube.com/embed/Vol5zjYIoos?si=FOeDSqcy_OgtaUyM"
-  title="YouTube video player: Formbricks"
-  frameborder="0"
-  allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"></iframe>
-
----
-
-## Creating a Multi-language Survey
-
-1. Open the **Survey Languages** page in the Formbricks settings via the top-right menu:
-
-<MdxImage
-  src={SurveyLanguagesFromHome}
-  alt="Formbricks Home"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-2. Click on the **Edit Languages** button, to add a new language to your survey
-
-<MdxImage
-  src={SurveyLanguageSettings}
-  alt="Formbricks Home"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-3. Select the preferred language from the dropdown and assign an identifier Alias. Click the **Add Language** button to add the language to your product.
-
-<MdxImage
-  src={AddLanguages}
-  alt="Add Multiple Languages to your Product"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-You can come back to this page anytime to add more languages or remove existing ones.
-
-4. Now, return to the dashboard to create a new survey or edit an existing one.
-
-<MdxImage
-  src={SurveysHome}
-  alt="Add Multiple Languages to your Product"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-5. In the survey editor, scroll down to the **Multiple Languages** section at the bottom and enable the toggle next to it.
-
-<MdxImage
-  src={EnableMultiLang}
-  alt="Enable Multi-language for a survey"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-6. Now choose a **Default Language** for your survey. This is the language that will be shown to users who have not selected a preferred language.
-
-<Note>Changing the default language will reset all the translations you have made for the survey.</Note>
-
-7. Now, add the languages from the dropdown that you want to support in your survey.
-
-<MdxImage
-  src={AddLanguageInSurvey}
-  alt="Enable Multi-language for a survey"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-8. You can now see the survey in the selected language by clicking on the language dropdown in any of the questions.
-
-<MdxImage
-  src={SeeSurveyInLanguage}
-  alt="Enable Multi-language for a survey"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-9. You can now translate all survey content, including questions, options, and button placeholders, into the selected language.
-
-<MdxImage
-  src={TranslateAsPerLanguage}
-  alt="Enable Multi-language for a survey"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-10. Once you are done, click on the **Publish** button to save the survey.
-
-## In-App Surveys Configuration
-
-1. When you initialise the Formbricks SDK for your user, you can pass a `language` attribute with the language code. This can be either the ISO identifier or the Alias you set when creating the language. The `language` attribute makes sure that this user only sees surveys with a translation in this specific language available.
-<Col>
-  <CodeGroup title="Configuring Formbricks SDK with Multi-language">
-
-```js
-Formbricks.init({
-  environmentId: "<environment-id>",
-  apiHost: "<api-host>",
-  userId: "<user_id>",
-  attributes: {
-    language: "de", // ISO identifier or Alias set when creating language
-  },
-});
-```
-
-  </CodeGroup>
-</Col>
-
-
-<Note>If a user has a language assigned, a survey has multi-language activate and it is missing a translation in the language of the user, the survey will not be displayed.</Note>
-
-
-2. That's it! Now, users with the language attribute set will see the survey in their preferred language. You can start collecting responses in multiple languages and filter them by language on the summary page.
-
----
-
-## Link Surveys Configuration
-
-For link surveys, the translation delivery is dependent on the `land` URL parameter.
-
-After publishing the survey, just copy the survey link and append the `lang` query parameter with the language alias you have set.
-
-For example, if you have set the alias for French as `fr`, you can share the survey link as
-
-`https://your-survey-url.com?lang=fr`
-
-Here are two examples:
-
-- English: https://app.Formbricks.com/s/clptfos2i1pj516pvhxqyu3bn?lang=en
-- German: https://app.Formbricks.com/s/clptfos2i1pj516pvhxqyu3bn?lang=de
-
-Without the `lang` parameter, Formbricks will show the survey in the default language you have set.
-
-You can now start collecting responses in multiple languages! 
-
-Can’t figure it out? Join our [Discord](https://discord.com/invite/3YFcABF2Ts)!

apps/formbricks-com/app/docs/api/client/actions/page.mdx

@@ -1,85 +0,0 @@
-import { Fence } from "@/components/shared/Fence";
-
-export const metadata = {
-  title: "Formbricks Actions API Documentation - Manage Your Survey Data Seamlessly",
-  description:
-    "Unlock the full potential of Formbricks' Client Actions API. Create Actions right from the API.",
-};
-
-#### Client API
-
-# Actions API
-
-The Public Client API is designed for the JavaScript SDK and does not require authentication. It's primarily used for creating persons, sessions, and responses within the Formbricks platform. This API is ideal for client-side interactions, as it doesn't expose sensitive information.
-
-This API can be used to:
-
-- [Add Action for User](#add-action-for-user)
-
----
-
-## Add Action for User {{ tag: 'POST', label: '/api/v1/client/<environment-id>/actions' }}
-
-Adds an Actions for a given User by their User ID
-
-<Row>
-  <Col>
-
-    ### Mandatory Body Fields
-
-    <Properties>
-      <Property name="userId" type="string">
-        The id of the user for whom the action is being created.
-      </Property>
-      <Property name="name" type="string">
-        The name of the Action being created.
-      </Property>
-    </Properties>
-
-  </Col>
-  <Col sticky>
-
-    <CodeGroup title="Request" tag="POST" label="/api/v1/client/<environment-id>/actions">
-
-    ```bash {{ title: 'cURL' }}
-    curl --location --request POST 'https://app.formbricks.com/api/v1/client/<environment-id>/actions' \
-    --data-raw '{
-        "userId": "1",
-        "name": "new_action_v2"
-
-    }'
-    ```
-
-    ```json {{ title: 'Example Request Body' }}
-    {
-        "userId": "1",
-        "name": "new_action_v3"
-    }
-    ```
-
-    </CodeGroup>
-
-    <CodeGroup title="Response">
-
-    ```json {{ title: '200 Success' }}
-    {
-    "data": {}
-    }
-    ```
-
-    ```json {{ title: '400 Bad Request' }}
-    {
-        "code": "bad_request",
-        "message": "Fields are missing or incorrectly formatted",
-        "details": {
-            "name": "Required"
-        }
-    }
-    ```
-
-    </CodeGroup>
-
-  </Col>
-</Row>
-
----

apps/formbricks-com/app/docs/api/client/displays/page.mdx

@@ -3,7 +3,7 @@ import { Fence } from "@/components/shared/Fence";
 export const metadata = {
   title: "Formbricks Public Client API Guide: Manage Survey Displays & Responses",
   description:
-    "Dive deep into Formbricks' Public Client API designed for customisation. This comprehensive guide provides detailed instructions on how to mark create and update survey displays for users.",
+    "Dive deep into Formbricks' Public Client API designed for customisation. This comprehensive guide provides detailed instructions on how to mark surveys as displayed as well as responded for individual persons, ensuring seamless client-side interactions without compromising data security.",
 };
 
 #### Client API
@@ -13,17 +13,17 @@ export const metadata = {
 The Public Client API is designed for the JavaScript SDK and does not require authentication. It's primarily used for creating persons, sessions, and responses within the Formbricks platform. This API is ideal for client-side interactions, as it doesn't expose sensitive information.
 
 This set of API can be used to
-- [Create Display](#create-display)
-- [Update Display](#update-display)
+- [Mark Survey as Displayed](#mark-survey-as-displayed-for-person)
+- [Mark Survey as Responded](#mark-survey-as-responded-for-person)
 
 ---
 
-## Create Display {{ tag: 'POST', label: '/api/v1/client/<environment-id>/diplays' }}
+## Mark Survey as Displayed for Person {{ tag: 'POST', label: '/api/v1/client/diplays' }}
 
 <Row>
   <Col>
 
-    Create Display of survey for a user
+    Mark a Survey as seen for a Person provided valid SurveyId and PersonId.
 
     ### Mandatory Request Body JSON Keys
     <Properties>
@@ -32,30 +32,25 @@ This set of API can be used to
       </Property>
     </Properties>
 
-    ### Optional Request Body JSON Keys
     <Properties>
-      <Property name="userId" type="string">
-        Already existing user's ID to mark as viewed for a survey
-      </Property>
-      <Property name="responseId" type="string">
-        Already existing response's ID to link with this new Display
+      <Property name="personId" type="string">
+        Person ID for whom mark a survey as viewed
       </Property>
     </Properties>
 
-
   </Col>
   <Col sticky>
 
-    <CodeGroup title="Request" tag="POST" label="/api/v1/client/<environment-id>/displays">
+    <CodeGroup title="Request" tag="POST" label="/api/v1/displays">
 
     ```bash {{ title: 'cURL' }}
     curl -X POST \
     'https://app.formbricks.com/api/v1/client/displays' \
     -H 'Content-Type: application/json' \
     -d '{
-        "surveyId":"<survey-id>",
-        "userId":"<user-id>"
-      }'
+        "surveyId": "<survey-id>",
+        "personId": "<person-id>"
+    }'
     ```
 
     </CodeGroup>
@@ -65,8 +60,29 @@ This set of API can be used to
     ```json {{title:'200 Success'}}
     {
       "data": {
-        "id": "clphzz6oo00083zdmc7e0nwzi"
-      }
+        "id": "clm4qiygr00uqs60h5f5ola5h",
+        "createdAt": "2023-09-04T10:24:36.603Z",
+        "updatedAt": "2023-09-04T10:24:36.603Z",
+        "surveyId": "<survey-id>",
+        "person": {
+            "id": "<person-id>",
+            "attributes": {
+                "userId": "CYO600",
+                "email": "wei@google.com",
+                "Name": "Wei Zhu",
+                "Role": "Manager",
+                "Company": "Google",
+                "Experience": "2 years",
+                "Usage Frequency": "Daily",
+                "Company Size": "2401 employees",
+                "Product Satisfaction Score": "4",
+                "Recommendation Likelihood": "3"
+                },
+            "createdAt": "2023-08-08T18:05:01.483Z",
+            "updatedAt": "2023-08-08T18:05:01.483Z"
+            },
+        "status": "seen"
+        }
     }
     ```
 
@@ -76,7 +92,7 @@ This set of API can be used to
       "message": "Fields are missing or incorrectly formatted",
       "details": {
         "surveyId": "Required"
-        }
+      }
     }
     ```
     </CodeGroup>
@@ -86,36 +102,22 @@ This set of API can be used to
 
 ---
 
-## Update Display {{ tag: 'PUT', label: '/api/v1/client/<environment-id>/diplays/<display-id>' }}
+## Mark Survey as Responded for Person {{ tag: 'POST', label: '/api/v1/client/diplays/[displayId]/responded' }}
 
 <Row>
   <Col>
 
-    Update a display by it's ID
-
-    ### Optional Request Body JSON Keys
-    <Properties>
-      <Property name="userId" type="string">
-        Already existing user's ID to mark as viewed for a survey
-      </Property>
-      <Property name="responseId" type="string">
-        Already existing response's ID to link with this new Display
-      </Property>
-    </Properties>
-
+    Mark a Displayed Survey as responded for a Person.
 
   </Col>
   <Col sticky>
 
-    <CodeGroup title="Request" tag="PUT" label="/api/v1/client/<environment-id>/displays/<display-id>">
+    <CodeGroup title="Request" tag="POST" label="/api/v1/client/diplays/[displayId]/responded">
 
     ```bash {{ title: 'cURL' }}
     curl -X POST \
-    'https://app.formbricks.com/api/v1/client/<environment-id>/displays/<display-id>' \
-    -H 'Content-Type: application/json' \
-    -d '{
-        "userId":"<user-id>"
-      }'
+    --location \
+    'https://app.formbricks.com/api/v1/client/displays/<displayId>/responded'
     ```
 
     </CodeGroup>
@@ -124,17 +126,38 @@ This set of API can be used to
 
     ```json {{title:'200 Success'}}
     {
-      "data": {}
+      "data": {
+        "id": "<displayId>",
+        "createdAt": "2023-09-04T10:24:36.603Z",
+        "updatedAt": "2023-09-04T10:33:56.978Z",
+        "surveyId": "<surveyId>",
+        "person": {
+            "id": "<personId>",
+            "attributes": {
+                "userId": "CYO600",
+                "email": "wei@google.com",
+                "Name": "Wei Zhu",
+                "Role": "Manager",
+                "Company": "Google",
+                "Experience": "2 years",
+                "Usage Frequency": "Daily",
+                "Company Size": "2401 employees",
+                "Product Satisfaction Score": "4",
+                "Recommendation Likelihood": "3"
+            },
+            "createdAt": "2023-08-08T18:05:01.483Z",
+            "updatedAt": "2023-08-08T18:05:01.483Z"
+        },
+        "status": "responded"
+      }
     }
     ```
 
-    ```json {{ title: '400 Bad Request' }}
+    ```json {{ title: '500 Internal Server Error' }}
     {
-      "code": "bad_request",
-      "message": "Fields are missing or incorrectly formatted",
-      "details": {
-        "surveyId": "Required"
-      }
+      "code": "internal_server_error",
+      "message": "Database operation failed",
+      "details": {}
     }
     ```
     </CodeGroup>

apps/formbricks-com/app/docs/api/client/overview/page.mdx

@@ -10,15 +10,13 @@ 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.
 
-Checkout the [API Key Setup](/docs/api/management/api-key-setup) - to generate, store, or delete API Keys.
+Checkout the [API Key Setup](/docs/api/api-key-setup) - to generate, store, or delete API Keys.
 
 ## Public Client API
 
 The Public Client API is designed for the JavaScript SDK and does not require authentication. It's primarily used for creating persons, sessions, and responses within the Formbricks platform. This API is ideal for client-side interactions, as it doesn't expose sensitive information.
 
-- [Actions API](/docs/api/client/actions) - Create actions for a person
 - [Displays API](/docs/api/client/displays) - Mark Survey as Displayed or Responded for a Person
-- [People API](/docs/api/client/people) - Create & update people (e.g. attributes)
 - [Responses API](/docs/api/client/responses) - Create & update responses for a survey
 
 ## Management API
@@ -29,7 +27,7 @@ The Management API provides access to all data and settings that are visible in
 
 API requests made to the Management API are authorized using a personal API key. This key grants the same rights and access as if you were logged in at formbricks.com. It's essential to keep your API key secure and not share it with others.
 
-To generate, store, or delete an API key, follow the instructions provided on the following page [API Key](/docs/api/management/api-key-setup).
+To generate, store, or delete an API key, follow the instructions provided on the following page [API Key](/docs/api/api-key-setup).
 
 - [Action Class API](/docs/api/management/action-classes) - Create, Update, and Delete Action Classes
 - [Attribute Class API](/docs/api/management/attribute-classes) - Create, Update, and Delete Attribute Classes

apps/formbricks-com/app/docs/api/client/people/page.mdx

@@ -1,130 +0,0 @@
-import { Fence } from "@/components/shared/Fence";
-
-export const metadata = {
-  title: "Formbricks Public Client API Guide: Manage Users",
-  description:
-    "Dive deep into Formbricks' Public Client API designed for customisation. This comprehensive guide provides detailed instructions on creating and updating users to help in user identification.",
-};
-
-#### Client API
-
-# People API
-
-The Public Client API is designed for the JavaScript SDK and does not require authentication. It's primarily used for creating persons, sessions, and responses within the Formbricks platform. This API is ideal for client-side interactions, as it doesn't expose sensitive information.
-
-This set of API can be used to
-- [Create Person](#create-person)
-- [Update Person](#update-person)
-
----
-
-## Create Person {{ tag: 'POST', label: '/api/v1/client/<environment-id>/people' }}
-
-<Row>
-  <Col>
-
-    Create User with your own User ID
-
-    ### Mandatory Request Body JSON Keys
-    <Properties>
-      <Property name="userId" type="string">
-        User ID which you would like to identify the person with
-      </Property>
-    </Properties>
-
-  </Col>
-  <Col sticky>
-
-    <CodeGroup title="Request" tag="POST" label="/api/v1/client/<environment-id>/people">
-
-    ```bash {{ title: 'cURL' }}
-    curl -X POST \
-    'https://app.formbricks.com/api/v1/client/<environment-id>/people' \
-    -H 'Content-Type: application/json' \
-    -d '{
-        "userId":"docs_user"
-    }'
-    ```
-
-    </CodeGroup>
-
-    <CodeGroup title="Response">
-
-    ```json {{title:'200 Success'}}
-    {
-      "data": {
-          "userId": "docs_user"
-        }
-    }
-    ```
-
-    ```json {{ title: '400 Bad Request' }}
-    {
-      "code": "bad_request",
-      "message": "Fields are missing or incorrectly formatted",
-      "details": {
-        "surveyId": "Required"
-      }
-    }
-    ```
-    </CodeGroup>
-
-  </Col>
-</Row>
-
----
-
-## Update Person {{ tag: 'POST', label: '/api/v1/client/<environment-id>/people/<user-id>' }}
-
-<Row>
-  <Col>
-
-    Update Person by their User ID
-
-    ### Mandatory Request Body JSON Keys
-    <Properties>
-      <Property name="attributes" type="JSON">
-        Key Value pairs of attributes to add to the user
-      </Property>
-    </Properties>
-
-  </Col>
-  <Col sticky>
-
-    <CodeGroup title="Request" tag="POST" label="/api/v1/client/<environment-id>/people/<user-id>">
-
-    ```bash {{ title: 'cURL' }}
-    curl -X POST \
-    --location \
-    'https://app.formbricks.com/api/v1/client/<environment-id>/people/<user-id>'
-    -H 'Content-Type: application/json' \
-    -d '{
-        "attributes":{
-            "welcome_to":"formbricks"
-        }
-    }'
-    ```
-
-    </CodeGroup>
-
-    <CodeGroup title="Response">
-
-    ```json {{title:'200 Success'}}
-    {
-      "data": {}
-    }
-    ```
-
-    ```json {{ title: '500 Internal Server Error' }}
-    {
-      "code": "internal_server_error",
-      "message": "Database operation failed",
-      "details": {}
-    }
-    ```
-    </CodeGroup>
-
-  </Col>
-</Row>
-
----

apps/formbricks-com/app/docs/api/client/responses/page.mdx

@@ -6,19 +6,15 @@ export const metadata = {
     "Unlock the full potential of Formbricks' Responses API. From fetching to updating survey responses, our comprehensive guide helps you integrate and manage survey data efficiently without compromising security. Ideal for client-side interactions.",
 };
 
-#### Client API
+#### Management API
 
 # Responses API
 
 The Public Client API is designed for the JavaScript SDK and does not require authentication. It's primarily used for creating persons, sessions, and responses within the Formbricks platform. This API is ideal for client-side interactions, as it doesn't expose sensitive information.
 
-This set of API can be used to
-- [Create Response](#create-response)
-- [Update Response](#update-response)
-
 ---
 
-## Create Response {{ tag: 'POST', label: '/api/v1/client/<environment-id>/responses' }}
+## Create a response {{ tag: 'POST', label: '/api/v1/client/responses' }}
 
 Add a new response to a survey.
 
@@ -43,8 +39,8 @@ Add a new response to a survey.
     ### Optional Body Fields
 
     <Properties>
-      <Property name="userId" type="string" required>
-        Pre-existing User ID to identify the user sending the response
+      <Property name="personId" type="string" required>
+        Internal Formbricks id to identify the user sending the response
       </Property>
     </Properties>
 
@@ -53,20 +49,20 @@ Add a new response to a survey.
 | field name | required | default | description                                                                                                                                    |
 | ---------- | -------- | ------- | ---------------------------------------------------------------------------------------------------------------------------------------------- |
 | data       | yes      | -       | The response data object (answers to the survey). In this object the key is the questionId, the value the answer of the user to this question. |
-| userId     | no       | -       | The person this response is connected to.                                                                                                      |
+| personId   | no       | -       | The person this response is connected to.                                                                                                      |
 | surveyId   | yes      | -       | The survey this response is connected to.                                                                                                      |
 | finished   | yes      | false   | Mark a response as complete to be able to filter accordingly.                                                                                  |
 
   </Col>
   <Col sticky>
 
-    <CodeGroup title="Request" tag="POST" label="/api/v1/client/<environment-id>/responses">
+    <CodeGroup title="Request" tag="POST" label="/api/v1/client/responses">
 
     ```bash {{ title: 'cURL' }}
-    curl --location --request POST 'https://app.formbricks.com/api/v1/client/<environment-id>/responses' \
+    curl --location --request POST 'https://app.formbricks.com/api/v1/client/responses' \
     --data-raw '{
-      "surveyId":"cloqzeuu70000z8khcirufo60",
-      "userId": "1",
+      "surveyId":"clfqz1esd0000yzah51trddn8",
+      "personId": "clfqjny0v000ayzgsycx54a2c",
       "finished": true,
       "data": {
           "clfqjny0v0003yzgscnog1j9i": 10,
@@ -77,8 +73,8 @@ Add a new response to a survey.
 
     ```json {{ title: 'Example Request Body' }}
     {
-      "userId": "1",
-      "surveyId": "cloqzeuu70000z8khcirufo60",
+      "personId": "clfqjny0v000ayzgsycx54a2c",
+      "surveyId": "clfqz1esd0000yzah51trddn8",
       "finished": true,
       "data": {
           "clfqjny0v0003yzgscnog1j9i": 10,
@@ -94,7 +90,19 @@ Add a new response to a survey.
     ```json {{ title: '200 Success' }}
     {
     "data": {
-        "id": "clp84xdld0002px36fkgue5ka",
+      "id": "clisyqeoi000219t52m5gopke",
+      "surveyId": "clfqz1esd0000yzah51trddn8",
+      "finished": true,
+      "person": {
+        "id": "clfqjny0v000ayzgsycx54a2c",
+        "attributes": {
+          "email": "me@johndoe.com"
+        }
+      },
+      "data": {
+          "clfqjny0v0003yzgscnog1j9i": 10,
+          "clfqjtn8n0070yzgs6jgx9rog": "I love Formbricks"
+        }
       }
     }
     ```
@@ -116,7 +124,7 @@ Add a new response to a survey.
 
 ---
 
-## Update Response {{ tag: 'PUT', label: '/api/v1/client/<environment-id>/responses/<response-id>' }}
+## Update a response {{ tag: 'POST', label: '/api/v1/client/responses/<response-id>' }}
 
 Update an existing response in a survey.
 
@@ -126,9 +134,6 @@ Update an existing response in a survey.
     ### Mandatory Body Fields
 
     <Properties>
-      <Property name="finished" type="boolean">
-        Marks whether the response is complete or not.
-      </Property>
       <Property name="data" type="string">
         The data of the response as JSON object (key: questionId, value: answer).
       </Property>
@@ -144,25 +149,27 @@ Update an existing response in a survey.
   </Col>
   <Col sticky>
 
-    <CodeGroup title="Request" tag="PUT" label="/api/v1/client/<environment-id>/responses/<response-id>">
+    <CodeGroup title="Request" tag="POST" label="/api/v1/client/responses/<response-id>">
 
     ```bash {{ title: 'cURL' }}
-    curl --location --request PUT 'https://app.formbricks.com/api/v1/client/<environment-id>/responses/<response-id>' \
+    curl --location --request POST 'https://app.formbricks.com/api/v1/client/responses/<response-id>' \
     --data-raw '{
-      "finished":false,
-        "data": {
-        "clfqjny0v0003yzgscnog1j9i": 10,
-        "clfqjtn8n0070yzgs6jgx9rog": "I love Formbricks"
+      "personId": "clfqjny0v000ayzgsycx54a2c",
+      "surveyId": "clfqz1esd0000yzah51trddn8",
+      "finished": true,
+      "data": {
+          "clggpvpvu0009n40g8ikawby8": 5,
       }
     }'
     ```
 
     ```json {{ title: 'Example Request Body' }}
     {
-      "finished":false,
-        "data": {
-        "clfqjny0v0003yzgscnog1j9i": 10,
-        "clfqjtn8n0070yzgs6jgx9rog": "I love Formbricks"
+      "personId": "clfqjny0v000ayzgsycx54a2c",
+      "surveyId": "clfqz1esd0000yzah51trddn8",
+      "finished": true,
+      "data": {
+          "clggpvpvu0009n40g8ikawby8": 5,
       }
     }
     ```
@@ -173,7 +180,22 @@ Update an existing response in a survey.
 
     ```json {{ title: '200 Success' }}
     {
-      "data": {}
+      "data": {
+        "id": "clisyqeoi000219t52m5gopke",
+        "surveyId": "clfqz1esd0000yzah51trddn8",
+        "finished": true,
+        "person": {
+          "id": "clfqjny0v000ayzgsycx54a2c",
+          "attributes": {
+            "email": "me@johndoe.com"
+          }
+        },
+        "data": {
+          "clfqjny0v0003yzgscnog1j9i": 10,
+          "clfqjtn8n0070yzgs6jgx9rog": "I love Formbricks",
+          "clggpvpvu0009n40g8ikawby8": 5
+        }
+      }
     }
     ```
 

apps/formbricks-com/app/docs/api/management/action-classes/page.mdx

@@ -1,6 +1,10 @@
 import { Fence } from "@/components/shared/Fence";
-import {generateManagementApiMetadata} from "@/lib/utils"
-export const metadata = generateManagementApiMetadata("Action Class",["Fetch","Create","Delete"])
+
+export const metadata = {
+  title: "Formbricks People API: Fetch or Create Person Overview",
+  description:
+    "Dive into Formbricks' People API within the Public Client API suite, designed to work without authentication requirements. Seamlessly fetch or create a person by their userId and environmentId, optimizing client-side interactions while maintaining data privacy.",
+};
 
 #### Management API
 

apps/formbricks-com/app/docs/api/management/api-key-setup/page.mdx

@@ -1,4 +1,4 @@
-import { MdxImage } from "@/components/shared/MdxImage";
+import Image from "next/image";
 
 import AddApiKey from "./add-api-key.webp";
 import ApiKeySecret from "./api-key-secret.webp";
@@ -21,25 +21,25 @@ The API requests are authorized with a personal API key. This API key gives you
 
 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" />
+   <Image src={AddApiKey} alt="Add API Key" quality="100" className="rounded-lg max-w-full 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
+   <Image
      src={ApiKeySecret}
      alt="API Key Secret"
      quality="100"
-     className="max-w-full rounded-lg sm:max-w-3xl"
+     className="rounded-lg max-w-full 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.
+  ### 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.
+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' }}
 

apps/formbricks-com/app/docs/api/management/attribute-classes/page.mdx

@@ -1,7 +1,10 @@
 import { Fence } from "@/components/shared/Fence";
-import {generateManagementApiMetadata} from "@/lib/utils"
 
-export const metadata = generateManagementApiMetadata("Attribute Class",["Fetch","Create","Delete"])
+export const metadata = {
+  title: "Formbricks People API: Fetch or Create Person Overview",
+  description:
+    "Dive into Formbricks' People API within the Public Client API suite, designed to work without authentication requirements. Seamlessly fetch or create a person by their userId and environmentId, optimizing client-side interAttributes while maintaining data privacy.",
+};
 
 #### Management API
 

apps/formbricks-com/app/docs/api/management/me/page.mdx

@@ -1,9 +1,9 @@
 import { Fence } from "@/components/shared/Fence";
 
 export const metadata = {
-  title: "Formbricks Me API: Fetch your environment details",
+  title: "Formbricks People API: Fetch or Create Person Overview",
   description:
-    "Dive into Formbricks' Me API within the Public Client API suite. Seamlessly fetch your own current environment details.",
+    "Dive into Formbricks' People API within the Public Client API suite, designed to work without authentication requirements. Seamlessly fetch or create a person by their userId and environmentId, optimizing client-side interactions while maintaining data privacy.",
 };
 
 #### Management API

apps/formbricks-com/app/docs/api/management/people/page.mdx

@@ -1,8 +1,10 @@
 import { Fence } from "@/components/shared/Fence";
-import {generateManagementApiMetadata} from "@/lib/utils"
-
-export const metadata = generateManagementApiMetadata("People",["Fetch","Delete"])
 
+export const metadata = {
+  title: "Formbricks People API: Fetch or Create Person Overview",
+  description:
+    "Dive into Formbricks' People API within the Public Client API suite, designed to work without authentication requirements. Seamlessly fetch or create a person by their userId and environmentId, optimizing client-side interactions while maintaining data privacy.",
+};
 
 #### Management API
 

apps/formbricks-com/app/docs/api/management/responses/page.mdx

@@ -1,16 +1,17 @@
 import { Fence } from "@/components/shared/Fence";
-import { generateManagementApiMetadata } from "@/lib/utils";
 
-export const metadata = generateManagementApiMetadata("Responses", ["Fetch", "Delete"]);
+export const metadata = {
+  title: "Formbricks Responses API Documentation - Manage Your Survey Data Seamlessly",
+  description:
+    "Unlock the full potential of Formbricks' Responses API. From fetching to updating survey responses, our comprehensive guide helps you integrate and manage survey data efficiently without compromising security. Ideal for client-side interactions.",
+};
 
 #### Management API
 
 # Responses API
 
 This set of API can be used to
-
 - [List Responses](#list-all-responses)
-- [List all Responses by surveyId](#list-all-responses-by-survey-id)
 - [Get Response](#get-response-by-id)
 - [Delete Response](#delete-a-response)
 
@@ -109,97 +110,6 @@ This set of API can be used to
 
 ---
 
-## List all Responses by surveyId {{ tag: 'GET', label: '/api/v1/management/responses?surveyId=<survey-Id>' }}
-
-<Row>
-  <Col>
-
-    Retrieve all the responses received in your survey.
-
-    ### Mandatory Headers
-
-    <Properties>
-      <Property name="x-Api-Key" type="string">
-        Your Formbricks API key.
-      </Property>
-    </Properties>
-
-  </Col>
-  <Col sticky>
-
-    <CodeGroup title="Request" tag="GET" label="/api/v1/management/responses?surveyId=<survey-Id>">
-
-    ```bash {{ title: 'cURL' }}
-    curl --location \
-    'https://app.formbricks.com/api/v1/management/responses?surveyId=<survey-Id>' \
-    --header \
-    'x-api-key: <your-api-key>'
-    ```
-
-    </CodeGroup>
-
-    <CodeGroup title="Response">
-
-    ```json {{title:'200 Success'}}
-    {
-      "data":[
-        {
-            "id": "cln8k0tqv00pcz87no4qrw333",
-            "createdAt": "2023-10-02T07:13:20.023Z",
-            "updatedAt": "2023-10-02T07:13:20.023Z",
-            "surveyId": "cln8k0tqu00p7z87nqr4thi3k",
-            "finished": true,
-            "data": {
-                "interview-prompt": "clicked"
-            },
-            "meta": {
-                "userAgent": {
-                    "os": "MacOS",
-                    "browser": "Chrome"
-                }
-            },
-            "personAttributes": null,
-            "person": {
-                "id": "e0x4i5tvsp8puxfztyrwykvn",
-                "attributes": {
-                    "userId": "CYO675",
-                    "email": "ravi@netflix.com",
-                    "Name": "Ravi Kumar",
-                    "Role": "Manager",
-                    "Company": "Netflix",
-                    "Experience": "6 years",
-                    "Usage Frequency": "Monthly",
-                    "Company Size": "4610 employees",
-                    "Product Satisfaction Score": "43",
-                    "Recommendation Likelihood": "4"
-                },
-                "environmentId": "cln8k0t47000fz87njmmu2bck",
-                "createdAt": "2023-10-02T07:13:19.444Z",
-                "updatedAt": "2023-10-02T07:13:19.444Z"
-            },
-            "notes": [],
-            "tags": []
-        },
-      ]
-    }
-    ```
-
-    ```json {{ title: '401 Not Authenticated' }}
-    {
-      "code": "not_authenticated",
-      "message": "Not authenticated",
-      "details": {
-        "x-Api-Key": "Header not provided or API Key invalid"
-        }
-    }
-    ```
-    </CodeGroup>
-
-  </Col>
-</Row>
-
----
-
 ## Get Response by ID {{ tag: 'GET', label: '/api/v1/management/responses/<response-id>' }}
 
 <Row>
@@ -311,7 +221,7 @@ This set of API can be used to
     <CodeGroup title="Request" tag="DELETE" label="/api/v1/client/responses/<response-id>">
 
     ```bash {{ title: 'cURL' }}
-    curl -X DELETE https://app.formbricks.com/api/v1/management/responses/<response-id> \
+    curl -X DELETE https://app.formbricks.com/api/v1/management/resposnes/<response-id> \
      --header 'x-api-key: <your-api-key>'
     ```
 

apps/formbricks-com/app/docs/api/management/surveys/page.mdx

@@ -1,18 +1,19 @@
 import { Fence } from "@/components/shared/Fence";
-import { generateManagementApiMetadata } from "@/lib/utils";
 
-export const metadata = generateManagementApiMetadata("Surveys", ["Fetch", "Create", "Update", "Delete"]);
+export const metadata = {
+  title: "Formbricks Surveys API Documentation - How to Retrieve All Surveys",
+  description:
+    "Explore the comprehensive guide to the Formbricks Surveys API. Learn how to effectively retrieve all the surveys in your environment with the necessary headers and API key setup. Includes sample request and response formats.",
+};
 
 #### Management API
 
 # Surveys API
 
 This set of API can be used to
-
 - [List All Surveys](#list-all-surveys)
 - [Get Survey](#get-survey-by-id)
 - [Create Survey](#create-survey)
-- [Update Survey](#update-survey-by-id)
 - [Delete Survey](#delete-survey-by-id)
 
 <Note>You will need an API Key to interact with these APIs.</Note>
@@ -23,7 +24,8 @@ This set of API can be used to
 
 <Row>
   <Col>
-    Retrieve all the surveys you have for the environment with pagination.
+
+    Retrieve all the surveys you have for the environment.
 
     ### Mandatory Headers
 
@@ -33,26 +35,14 @@ This set of API can be used to
       </Property>
     </Properties>
 
-    ### Query Parameters
-    <Properties>
-      <Property name="offset" type="number">
-        The number of surveys to skip before returning the results.
-      </Property>
-
-      <Property name="limit" type="number">
-        The number of surveys to return.
-      </Property>
-    </Properties>
-
   </Col>
   <Col sticky>
 
     <CodeGroup title="Request" tag="GET" label="/api/v1/management/surveys">
 
     ```bash {{ title: 'cURL' }}
-
     curl --location \
-    'https://app.formbricks.com/api/v1/management/surveys?offset=20&limit=10' \
+    'https://app.formbricks.com/api/v1/management/surveys' \
     --header \
     'x-api-key: <your-api-key>'
     ```
@@ -91,7 +81,7 @@ This set of API can be used to
                                 "destination": "end"
                             }
                         ],
-                        "html": "<p class=\"fb-editor-paragraph\" dir=\"ltr\"><span>We would love to understand your user experience better. Sharing your insight helps a lot.</span></p>",
+                        "html": "<p class=\"fb-editor-paragraph\" dir=\"ltr\"><span>We would love to understand your user experience better. Sharing your insight helps a lot!</span></p>",
                         "buttonExternal": false,
                         "dismissButtonLabel": "No, thanks."
                     },
@@ -415,6 +405,7 @@ This set of API can be used to
     ```
     </CodeGroup>
 
+
   </Col>
   <Col sticky>
 
@@ -464,7 +455,7 @@ This set of API can be used to
         }
     }
     ```
-
+    
     ```json {{ title: '401 Not Authenticated' }}
     {
       "code": "not_authenticated",
@@ -481,119 +472,6 @@ This set of API can be used to
 
 ---
 
-## Update Survey by ID {{ tag: 'PUT', label: '/api/v1/management/surveys/<survey-id>' }}
-
-<Row>
-  <Col>
-
-    Update a survey by its ID
-
-    ### Mandatory Headers
-
-    <Properties>
-      <Property name="x-Api-Key" type="string">
-        Your Formbricks API key.
-      </Property>
-    </Properties>
-
-    ### Body
-
-    <CodeGroup title="Request Body">
-    ```json {{ title: 'cURL' }}
-    {
-        "name": "My renamed Survey",
-        "redirectUrl":"https://formbricks.com",
-        "type":"web"
-    }
-    ```
-    </CodeGroup>
-
-  </Col>
-  <Col sticky>
-
-    <CodeGroup title="Request" tag="PUT" label="/api/v1/management/surveys/<survey-id>">
-
-    ```bash {{ title: 'cURL' }}
-    curl -X PUT https://app.formbricks.com/api/v1/management/surveys/<survey-id> \
-     --header 'Content-Type: application/json' \
-     --header 'x-api-key: <your-api-key>' \
-     -d '{"name": "My renamed Survey"}'
-    ```
-
-    </CodeGroup>
-
-    <CodeGroup title="Response">
-
-    ```json {{title:'200 Success'}}
-    {
-        "data": {
-            "id": "cloqzeuu70000z8khcirufo60",
-            "createdAt": "2023-11-09T09:23:42.367Z",
-            "updatedAt": "2023-11-09T09:23:42.367Z",
-            "name": "My renamed Survey",
-            "redirectUrl": null,
-            "type": "link",
-            "environmentId": "clonzr6vc0009z8md7y06hipl",
-            "status": "inProgress",
-            "welcomeCard": {
-                "html": "Thanks for providing your feedback - let's go!",
-                "enabled": false,
-                "headline": "Welcome!",
-                "timeToFinish": false
-            },
-            "questions": [
-                {
-                    "id": "l9rwn5nbk48y44tvnyyjcvca",
-                    "type": "openText",
-                    "headline": "Why did you leave the platform?",
-                    "required": true,
-                    "inputType": "text"
-                }
-            ],
-            "thankYouCard": {
-                "enabled": true,
-                "headline": "Thank you!",
-                "subheader": "We appreciate your feedback."
-            },
-            "hiddenFields": {
-                "enabled": true,
-                "fieldIds": []
-            },
-            "displayOption": "displayOnce",
-            "recontactDays": null,
-            "autoClose": null,
-            "delay": 0,
-            "autoComplete": 50,
-            "closeOnDate": null,
-            "surveyClosedMessage": null,
-            "productOverwrites": null,
-            "singleUse": {
-                "enabled": false,
-                "isEncrypted": true
-            },
-            "verifyEmail": null,
-            "pin": null,
-            "triggers": [],
-            "attributeFilters": []
-        }
-    }
-    ```
-
-    ```json {{ title: '401 Not Authenticated' }}
-    {
-      "code": "not_authenticated",
-      "message": "Not authenticated",
-      "details": {
-        "x-Api-Key": "Header not provided or API Key invalid"
-        }
-    }
-    ```
-    </CodeGroup>
-
-  </Col>
-</Row>
-
----
 
 ## Delete Survey by ID {{ tag: 'DELETE', label: '/api/v1/management/surveys/<survey-id>' }}
 

apps/formbricks-com/app/docs/api/management/webhooks/page.mdx

@@ -1,6 +1,8 @@
-import {generateManagementApiMetadata} from "@/lib/utils"
-
-export const metadata = generateManagementApiMetadata("Webhook",["Fetch","Create","Delete"])
+export const metadata = {
+  title: "Formbricks Webhook API Documentation - List, Retrieve, Create, and Delete Webhooks",
+  description:
+    "Explore the comprehensive guide to the Formbricks Webhooks API. This is all you need to interact and play with the Formbricks Webhooks and integrate them into any third party app of your choice",
+};
 
 #### Management API
 

apps/formbricks-com/app/docs/attributes/custom-attributes/page.mdx

@@ -0,0 +1,35 @@
+export const metadata = {
+  title: "Guide for Setting Custom Attributes | Formbricks Documentation",
+  description:
+    "Learn how to set attributes in code using setAttribute function. Enhance user segmentation, target surveys effectively, and gather valuable insights for better decisions. Easily send user-specific details for better survey segmentation and gain deeper insights.",
+};
+
+#### Attributes
+
+# Setting attributes with code
+
+One way to send attributes to Formbricks is in your code. In Formbricks, there are two special attributes for [user identification](/docs/attributes/identify-users)(user ID & email) and custom attributes. An example:
+
+## Setting Custom User Attributes
+
+You can use the setAttribute function to set any custom attribute for the user (e.g. name, plan, etc.):
+<Col>
+<CodeGroup title="Setting Plan to Pro">
+
+```javascript
+formbricks.setAttribute("Plan", "Pro");
+```
+
+</CodeGroup>
+</Col>
+Generally speaking, the setAttribute function works like this:
+<Col>
+<CodeGroup title="Setting Custom Attributes">
+
+```javascript
+formbricks.setAttribute("attribute_key", "attribute_value");
+```
+
+</CodeGroup>
+</Col>
+Where `attributeName` is the name of the attribute you want to set, and `attributeValue` is the value of the attribute you want to set.

apps/formbricks-com/app/docs/attributes/identify-users/page.mdx

@@ -0,0 +1,70 @@
+export const metadata = {
+  title: "User Identification in Formbricks | Enhancing Survey Feedback",
+  description:
+    "A comprehensive guide on identifying users in Formbricks without compromising privacy. Learn how to set User ID, email, and custom attributes to optimize survey targeting, recontact users, and control survey intervals, all while respecting user anonymity.",
+};
+
+#### Attributes
+
+# Identifying Users
+
+At Formbricks, we value user privacy. By default, Formbricks doesn't collect or store any personal information from your users. However, we understand that it can be helpful for you to know which user submitted the feedback and also functionality like recontacting users and controlling the waiting period between surveys requires identifying the users. That's why we provide a way for you to share existing user data from your app, so you can view it in our dashboard.
+
+If you would like to use the User Identification feature of Formbricks, target surveys to specific user segments and see more information about the user who responded to a survey, you can identify users by setting a User ID, email, and custom attributes. This guide will walk you through how to do that.
+
+## Setting User ID
+
+To enable the User identification feature you need to set the `userId` in the init() call of Formbricks. Only when the `userId` is set the person will be visible in the Formbricks dashboard. The `userId` can be any string and it's best to use the default identifier you use in your app (e.g. unique id from database or the email address if it's unique) but you can also anonymize these as long as they are unique for every user.
+
+<Col>
+<CodeGroup title="Setting User ID">
+
+```javascript
+formbricks.init({
+  environmentId: "<environment-id>",
+  apiHost: "<api-host>",
+  userId: "<user_id>",
+});
+```
+
+</CodeGroup>
+</Col>
+## Setting User Email
+
+The `userId` is the main identifier used in Formbricks and user identification is only enabled when it is set. In addition to the userId you can also set attributes that describes the user better. The email address can be set using the setEmail function:
+
+<Col>
+<CodeGroup title="Setting Email">
+
+```javascript
+formbricks.setEmail("user@example.com");
+```
+
+</CodeGroup>
+</Col>
+### Setting Custom User Attributes
+
+You can use the setAttribute function to set any custom attribute for the user (e.g. name, plan, etc.):
+
+<Col>
+<CodeGroup title="Setting Custom Attributes">
+
+```javascript
+formbricks.setAttribute("Plan", "free");
+```
+
+</CodeGroup>
+</Col>
+### Logging Out Users
+
+When a user logs out of your webpage, make sure to log them out of Formbricks as well. This will prevent new activity from being associated with an incorrect user. Use the logout function:
+
+<Col>
+<CodeGroup title="Logging out User">
+
+```javascript
+formbricks.logout();
+```
+
+</CodeGroup>
+</Col>

apps/formbricks-com/app/docs/attributes/why/page.mdx

@@ -0,0 +1,23 @@
+export const metadata = {
+  title: "Understanding User Attributes in Formbricks Surveys",
+  description:
+    "Dive into the importance of attributes in surveys. Learn how key-value pairs can significantly improve survey targeting, enhance feedback quality, and guide data-driven decisions with Formbricks.",
+};
+
+#### Attributes
+
+# What are attributes and why are they useful?
+
+Surveying your user base without segmentation leads to weak results and survey fatigue. Attributes help you segment your users into groups.
+
+## What are attributes?
+
+Attributes are key-value pairs that you can set for each person individually. For example, the attribute "Plan" can be set to "Free" or "Paid".
+
+## How do attributes work?
+
+Attributes are sent from your application to Formbricks and are associated with the current user. We store it in our database and allow you to use it the next time you create a survey.
+
+## Why are attributes useful?
+
+Attributes help show surveys to the right group of people. For example, you can show a survey to all users who have a "Plan" attribute set to "Paid".

apps/formbricks-com/app/docs/best-practices/cancel-subscription/page.mdx

@@ -1,19 +1,18 @@
+import Image from "next/image";
 import DemoPreview from "@/components/dummyUI/DemoPreview";
-import { MdxImage } from "@/components/shared/MdxImage";
 
-import ChangeText from "./change-text.webp";
 import CreateChurnFlow from "./create-cancel-flow.webp";
-import PublishSurvey from "./publish-survey.webp";
-import RecontactOptions from "./recontact-options.webp";
-import SelectAction from "./select-action.webp";
-import TriggerCSS from "./trigger-css-selector.webp";
+import ChangeText from "./change-text.webp";
 import TriggerInnerText from "./trigger-inner-text.webp";
+import TriggerCSS from "./trigger-css-selector.webp";
 import TriggerPageUrl from "./trigger-page-url.webp";
+import RecontactOptions from "./recontact-options.webp";
+import PublishSurvey from "./publish-survey.webp";
+import SelectAction from "./select-action.webp";
 
 export const metadata = {
   title: "Mastering Churn Surveys with Formbricks | Essential Tips & Steps",
-  description:
-    "Learn how to effectively utilize Formbricks' Churn Surveys to gain deeper insights into user departures. Dive into a step-by-step guide to craft, trigger, and optimize your churn surveys, ensuring you capture invaluable feedback at critical junctures",
+  description: "Learn how to effectively utilize Formbricks' Churn Surveys to gain deeper insights into user departures. Dive into a step-by-step guide to craft, trigger, and optimize your churn surveys, ensuring you capture invaluable feedback at critical junctures",
 };
 
 #### Best Practices
@@ -40,15 +39,15 @@ The Churn Survey is among the most effective ways to identify weaknesses in your
 
 To run the Churn Survey in your app you want to proceed as follows:
 
-1. Create new Churn Survey at [app.formbricks.com](https://app.formbricks.com/)
+1. Create new Churn Survey at [app.formbricks.com](http://app.formbricks.com/)
 2. Set up the user action to display survey at right point in time
 3. Choose correct recontact options to never miss a feedback
 4. Prevent that churn!
 
 <Note>
-  ## Formbricks Widget running? We assume that you have already installed the Formbricks Widget in your web
-  app. It’s required to display messages and surveys in your app. If not, please follow the [Quick Start Guide
-  (takes 15mins max.)](/docs/getting-started/quickstart-in-app-survey)
+  ## Formbricks Widget running?
+  We assume that you have already installed the Formbricks Widget in your web app. It’s required to display messages
+  and surveys in your app. If not, please follow the [Quick Start Guide (takes 15mins max.)](/docs/getting-started/quickstart-in-app-survey)
 </Note>
 
 ### 1. Create new Churn Survey
@@ -57,22 +56,22 @@ If you don't have an account yet, create one at [app.formbricks.com](https://app
 
 Click on "Create Survey" and choose the template “Churn Survey”:
 
-<MdxImage
+<Image
   src={CreateChurnFlow}
   alt="Create churn survey by template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 2. Update questions (if you like)
 
 You’re free to update the question and answer options. However, based on our experience, we suggest giving the provided template a go 😊
 
-<MdxImage
+<Image
   src={ChangeText}
   alt="Change text content"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 _Want to change the button color? You can do so in the product settings._
@@ -89,29 +88,29 @@ To create the trigger for your Churn Survey, you have two options to choose from
 
 1. **Trigger by innerText:** You likely have a “Cancel Subscription” button in your app. You can setup a user Action with the according `innerText` to trigger the survey, like so:
 
-<MdxImage
+<Image
   src={TriggerInnerText}
   alt="Set the trigger by inner Text"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 2. **Trigger by CSS Selector:** In case you have more than one button saying “Cancel Subscription” in your app and only want to display the survey when one of them is clicked, you want to be more specific. The best way to do that is to give this button the HTML `id=“cancel-subscription”` and set your user action up like so:
 
-<MdxImage
+<Image
   src={TriggerCSS}
   alt="Set the trigger by CSS Selector"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 3. **Trigger by pageURL:** Lastly, you could also display your survey on a subpage “/subscription-cancelled” where you forward users once they cancelled the trial subscription. You can then create a user Action with the type `pageURL` with the following settings:
 
-<MdxImage
+<Image
   src={TriggerPageUrl}
   alt="Set the trigger by page URL"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 Whenever a user visits this page, matches the filter conditions above and the recontact options (below) the survey will be displayed ✅
@@ -119,46 +118,47 @@ Whenever a user visits this page, matches the filter conditions above and the re
 Here is our complete [Actions manual](/docs/actions/why) covering [Code](/docs/actions/code) and [No-Code](/docs/actions/no-code) Actions.
 
 <Note>
-  ## Pre-churn flow coming soon We’re currently building full-screen survey pop-ups. You’ll be able to prevent
-  users from closing the survey unless they respond to it. It’s certainly debatable if you want that but you
-  could force them to click through the survey before letting them cancel 🤷
+  ## Pre-churn flow coming soon 
+  We’re currently building full-screen survey pop-ups. You’ll be able to prevent users from closing the survey
+  unless they respond to it. It’s certainly debatable if you want that but you could force them to click through
+  the survey before letting them cancel 🤷
 </Note>
 
 ### 5. Select Action in the “When to ask” card
 
-<MdxImage
+<Image
   src={SelectAction}
   alt="Select feedback button action"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 6. Last step: Set Recontact Options correctly
 
 Lastly, scroll down to “Recontact Options”. Here you have to choose the correct settings to make sure you milk these super valuable insights. You want to make sure that this survey is always displayed, no matter if the user has already seen a survey in the past days:
 
-<MdxImage
+<Image
   src={RecontactOptions}
   alt="Set recontact options"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 These settings make sure the survey is always displayed, when a user wants to Cancel their subscription.
 
 ### 7. Congrats! You’re ready to publish your survey 💃
 
-<MdxImage
+<Image
   src={PublishSurvey}
   alt="Publish survey"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 <Note>
-  ## Formbricks Widget running? You need to have the Formbricks Widget installed to display the Churn Survey
-  in your app. Please follow [this tutorial (Step 4 onwards)](/docs/getting-started/quickstart-in-app-survey)
-  to install the widget.
+  ## Formbricks Widget running? 
+  You need to have the Formbricks Widget installed to display the Churn Survey in your app. Please follow [this
+  tutorial (Step 4 onwards)](/docs/getting-started/quickstart-in-app-survey) to install the widget.
 </Note>
 
 ###

apps/formbricks-com/app/docs/best-practices/docs-feedback/page.mdx

@@ -1,4 +1,4 @@
-import { MdxImage } from "@/components/shared/MdxImage";
+import Image from "next/image";
 
 import DocsFeedback from "@/components/docs/DocsFeedback";
 import AddAction from "./add-action.webp";
@@ -40,13 +40,13 @@ To get this running, you'll need a bit of time. Here are the steps we're going t
 3. Connect to API
 4. Test
 
-## 1. Setting up Formbricks Cloud
+### 1. Setting up Formbricks Cloud
 
 1. To get started, create an account for the [Formbricks Cloud](https://app.formbricks.com/auth/signup).
 
 2. In the Menu (top right) you see that you can switch between a “Development” and a “Production” environment. These are two separate environments so your test data doesn’t mess up the insights from prod. Switch to “Development”:
 
-<MdxImage
+<Image
   src={SwitchToDev}
   alt="switch to dev environment"
   quality="100"
@@ -55,7 +55,7 @@ To get this running, you'll need a bit of time. Here are the steps we're going t
 
 3. Then, create a survey using the template “Docs Feedback”:
 
-<MdxImage
+<Image
   src={DocsTemplate}
   alt="select docs template"
   quality="100"
@@ -64,7 +64,7 @@ To get this running, you'll need a bit of time. Here are the steps we're going t
 
 4. Change the Internal Question ID of the first question to **“isHelpful”** to make your life easier 😉
 
-<MdxImage
+<Image
   src={ChangeId}
   alt="switch to dev environment"
   quality="100"
@@ -74,13 +74,13 @@ To get this running, you'll need a bit of time. Here are the steps we're going t
 5. In the same way, you can change the Internal Question ID of the _Please elaborate_ question to **“additionalFeedback”** and the one of the _Page URL_ question to **“pageUrl”**.
 
 <Note>
-  Answers need to be identical If you want different answers than “Yes 👍” and “No 👎” you need to update the
+  ## Answers need to be identical If you want different answers than “Yes 👍” and “No 👎” you need to update the
   choices accordingly. They have to be identical to the frontend we're building in the next step.
 </Note>
 
 6. Click on “Continue to Settings or select the audience tab manually. Scroll down to “When to ask” and create a new Action:
 
-<MdxImage
+<Image
   src={WhenToAsk}
   alt="set up when to ask card"
   quality="100"
@@ -89,7 +89,7 @@ To get this running, you'll need a bit of time. Here are the steps we're going t
 
 7. Our goal is to create an event that never fires. This is a bit nonsensical because it is a workaround. Stick with me 😃 Fill the action out like on the screenshot:
 
-<MdxImage
+<Image
   src={AddAction}
   alt="add action"
   quality="100"
@@ -99,7 +99,7 @@ To get this running, you'll need a bit of time. Here are the steps we're going t
 
 8. Select the Non-Event in the dropdown. Now you see that the “Publish survey” button is active. Publish your survey 🤝
 
-<MdxImage
+<Image
   src={SelectNonevent}
   alt="select nonevent"
   quality="100"
@@ -108,10 +108,10 @@ To get this running, you'll need a bit of time. Here are the steps we're going t
 
 **You’re all setup in Formbricks Cloud for now 👍**
 
-## 2. Build the frontend
+### 2. Build the frontend
 
 <Note>
-  Your frontend might work differently Your frontend likely looks and works differently. This is an example
+  ## Your frontend might work differently Your frontend likely looks and works differently. This is an example
   specific to our tech stack. We want to illustrate what you should consider building yours 😊
 </Note>
 
@@ -128,7 +128,7 @@ This allows us to capture and analyze partial feedback where the user is not wil
 
 2. Likely, you have a template file or similar which renders the navigation at the bottom of the page:
 
-<MdxImage
+<Image
   src={DocsNavi}
   alt="doc navigation"
   quality="100"
@@ -311,7 +311,7 @@ return (
 </Col>
 ## 3. Connecting to the Formbricks API
 
-The last step is to hook up your sparkling new frontend to the Formbricks API. To do so, we followed the “[Create Response](/docs/api/client/responses#create-a-response)” and “[Update Response](/docs/api/client/responses#update-a-response)” pages in our docs.
+The last step is to hook up your sparkling new frontend to the Formbricks API. To do so, we followed the “[Create Response](/docs/client-api/create-response)” and “[Update Response](/docs/client-api/update-response)” pages in our docs.
 
 Here is the code for the `handleFeedbackSubmit` function with comments:
 <Col>
@@ -412,7 +412,7 @@ Before you roll it out in production, you want to test it. To do so, you need tw
 
 When you are on the survey detail page, you’ll find both of them in the URL:
 
-<MdxImage src={CopyIds} alt="copy IDs" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />
+<Image src={CopyIds} alt="copy IDs" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />
 
 Now, you have to replace the IDs and the API host accordingly in your `handleFeedbackSubmit`:
 <Col>

apps/formbricks-com/app/docs/best-practices/feature-chaser/page.mdx

@@ -1,5 +1,5 @@
 import DemoPreview from "@/components/dummyUI/DemoPreview";
-import { MdxImage } from "@/components/shared/MdxImage";
+import Image from "next/image";
 
 import ActionCSS from "./action-css.webp";
 import ActionText from "./action-text.webp";
@@ -11,8 +11,7 @@ import SelectAction from "./select-action.webp";
 
 export const metadata = {
   title: "Setting Up Feature Chaser Surveys with Formbricks: A Comprehensive Guide",
-  description:
-    "Learn how to harness the power of Formbricks to gather targeted user feedback on specific features. Dive deep into creating, triggering, and publishing the Feature Chaser survey to enhance your product with actionable insights for specific users.",
+  description: "Learn how to harness the power of Formbricks to gather targeted user feedback on specific features. Dive deep into creating, triggering, and publishing the Feature Chaser survey to enhance your product with actionable insights for specific users.",
 };
 
 #### Best Practices
@@ -39,13 +38,13 @@ Product analytics never tell you why a feature is used - and why not. Following
 
 To run the Feature Chaser survey in your app you want to proceed as follows:
 
-1. Create new Feature Chaser survey at [app.formbricks.com](https://app.formbricks.com/)
+1. Create new Feature Chaser survey at [app.formbricks.com](http://app.formbricks.com/)
 2. Setup a user action to display survey at the right point in time
 
 <Note>
-  ## Formbricks Widget running? We assume that you have already installed the Formbricks Widget in your web
-  app. It’s required to display messages and surveys in your app. If not, please follow the [Quick Start Guide
-  (takes 15mins max.)](/docs/getting-started/quickstart-in-app-survey)
+  ## Formbricks Widget running? 
+  We assume that you have already installed the Formbricks Widget in your web app. It’s required to display messages
+  and surveys in your app. If not, please follow the [Quick Start Guide (takes 15mins max.)](/docs/getting-started/quickstart-in-app-survey)
 </Note>
 
 ### 1. Create new Feature Chaser
@@ -54,22 +53,22 @@ If you don't have an account yet, create one at [app.formbricks.com](https://app
 
 Click on "Create Survey" and choose the template “Feature Chaser”:
 
-<MdxImage
+<Image
   src={CreateSurvey}
   alt="Create survey by template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 2. Update questions
 
 The questions you want to ask are dependent on your feature and can be very specific. In the template, we suggest a high-level check on how easy it was for the user to achieve their goal. We also add an opportunity to provide context:
 
-<MdxImage
+<Image
   src={ChangeText}
   alt="Change text content"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 Save, and move over to where the magic happens: The “Audience” tab.
@@ -84,52 +83,52 @@ There are two ways to track a button:
 
 1. **Trigger by innerText:** You might have a button with a unique text at the end of your feature e.g. "Export Report". You can setup a user Action with the according `innerText` to trigger the survey, like so:
 
-<MdxImage
+<Image
   src={ActionText}
   alt="Set the trigger by inner Text"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 2. **Trigger by CSS Selector:** In case you have more than one button saying “Export Report” in your app and only want to display the survey when one of them is clicked, you want to be more specific. The best way to do that is to give this button the HTML `id=“export-report-featurename”` and set your user action up like so:
 
-<MdxImage
+<Image
   src={ActionCSS}
   alt="Set the trigger by CSS Selector"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 Please follow our [Actions manual](/docs/actions/why) for an in-depth description of how Actions work.
 
 ### 4. Select Action in the “When to ask” card
 
-<MdxImage
+<Image
   src={SelectAction}
   alt="Select PMF trigger button action"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 5. Last step: Set Recontact Options correctly
 
 Lastly, scroll down to “Recontact Options”. Here you have full freedom to decide who you want to ask. Generally, you only want to ask every user once and prevent survey fatigue. It's up to you to decide if you want to ask again, when the user did not yet reply:
 
-<MdxImage
+<Image
   src={RecontactOptions}
   alt="Set recontact options"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 7. Congrats! You’re ready to publish your survey 💃
 
-<MdxImage src={Publish} alt="Publish survey" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />
+<Image src={Publish} alt="Publish survey" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
 
 <Note>
-  ## Formbricks Widget running? You need to have the Formbricks Widget installed to display the Feature Chaser
-  in your app. Please follow [this tutorial (Step 4 onwards)](/docs/getting-started/quickstart-in-app-survey)
-  to install the widget.
+  ## Formbricks Widget running? 
+  You need to have the Formbricks Widget installed to display the Feature Chaser in your app. Please follow [this
+  tutorial (Step 4 onwards)](/docs/getting-started/quickstart-in-app-survey) to install the widget.
 </Note>
 
 ###

apps/formbricks-com/app/docs/best-practices/feedback-box/page.mdx

@@ -1,6 +1,6 @@
-import DemoPreview from "@/components/dummyUI/DemoPreview";
-import { MdxImage } from "@/components/shared/MdxImage";
 import Link from "next/link";
+import Image from "next/image";
+import DemoPreview from "@/components/dummyUI/DemoPreview";
 
 import AddAction from "./add-action.webp";
 import AddCSSAction from "./add-css-action.webp";
@@ -13,8 +13,7 @@ import RecontactOptions from "./set-recontact-options.webp";
 
 export const metadata = {
   title: "Implementing the Feedback Box with Formbricks: A Step-by-Step Tutorial",
-  description:
-    "Unlock user insights effortlessly! Discover how to set up the Feedback Box in your app using Formbricks, allowing your users to provide real-time feedback. Follow our comprehensive guide to enhance user experience and respond rapidly to feedback",
+  description: "Unlock user insights effortlessly! Discover how to set up the Feedback Box in your app using Formbricks, allowing your users to provide real-time feedback. Follow our comprehensive guide to enhance user experience and respond rapidly to feedback",
 };
 
 #### Best Practices
@@ -50,34 +49,34 @@ If you don't have an account yet, create one at [app.formbricks.com](https://app
 
 Then, create a new survey and look for the "Feedback Box" template:
 
-<MdxImage
+<Image
   src={CreateFeedbackBox}
   alt="Create feedback box by template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 2. Update question content
 
 Change the questions and answer options according to your preference:
 
-<MdxImage
+<Image
   src={ChangeTextContent}
   alt="Change text content"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 3. Create user action to trigger Feedback Box:
 
 Go to the “Audience” tab, find the “When to send” card and choose “Add Action”. We will now use our super cool No-Code User Action Tracker:
 
-<MdxImage src={AddAction} alt="Add action" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />
+<Image src={AddAction} alt="Add action" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
 
 <Note>
-  ## You can also add actions in your code You can also create [Code Actions](/docs/actions/code) using
-  `formbricks.track("Eventname")` - they will automatically appear in your Actions overview as long as the SDK
-  is embedded.
+  ## You can also add actions in your code 
+  You can also create [Code Actions](/docs/actions/code) using `formbricks.track("Eventname")` - they will automatically
+  appear in your Actions overview as long as the SDK is embedded.
 </Note>
 
 We have two options to track the Feedback Button in your application: innerText and CSS-Selector:
@@ -85,46 +84,46 @@ We have two options to track the Feedback Button in your application: innerText
 1. **innerText:** This means that whenever a user clicks any HTML item in your app which has an `innerText` of `Feedback` the Feedback Box will be displayed.
 2. **CSS-Selector:** This means that when an element with a specific CSS-Selector like `#feedback-button` is clicked, your Feedback Box is triggered.
 
-<div className="grid max-w-full grid-cols-2 space-x-2 sm:max-w-3xl">
-  <MdxImage src={AddHTMLAction} alt="Add HTML action" quality="100" className="rounded-lg" />
-  <MdxImage src={AddCSSAction} alt="Add CSS action" quality="100" className="rounded-lg" />
+<div className="grid grid-cols-2 space-x-2 max-w-full sm:max-w-3xl">
+  <Image src={AddHTMLAction} alt="Add HTML action" quality="100" className="rounded-lg" />
+  <Image src={AddCSSAction} alt="Add CSS action" quality="100" className="rounded-lg" />
 </div>
 
 ### 4. Select action in the “When to ask” card
 
-<MdxImage
+<Image
   src={SelectAction}
   alt="Select feedback button action"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 5. Set Recontact Options correctly
 
 Scroll down to “Recontact Options”. Here you have to choose the right settings so that the Feedback Box pops up every time the user action is performed. (Our default is that every user sees every survey only once):
 
-<MdxImage
+<Image
   src={RecontactOptions}
   alt="Set recontact options"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 6. You’re ready publish your survey!
 
-<MdxImage
+<Image
   src={PublishSurvey}
   alt="Publish survey"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ## Setting up the Widget
 
 <Note>
-  ## Formbricks Widget running? You need to have the Formbricks Widget installed to display the Feedback Box
-  in your app. Please follow [this tutorial (Step 4 onwards)](/docs/getting-started/quickstart-in-app-survey)
-  to install the widget.
+  ## Formbricks Widget running?
+  You need to have the Formbricks Widget installed to display the Feedback Box in your app. Please follow [this
+  tutorial (Step 4 onwards)](/docs/getting-started/quickstart-in-app-survey) to install the widget.
 </Note>
 
 ### &nbsp;

apps/formbricks-com/app/docs/best-practices/improve-email-content/page.mdx

@@ -1,115 +0,0 @@
-import DemoPreview from "@/components/dummyUI/DemoPreview";
-import { MdxImage } from "@/components/shared/MdxImage";
-
-import NewsletterSurveyType from "./choose-survey-type.webp";
-import NewsletterSurveyEmbedCode from "./embed-survey-code-in-your-email.webp";
-import NewsletterSurveyEmbedPrompt from "./embed-survey-prompt.webp";
-import NewsletterSurveyEditor from "./improve-newsletter-content-editor-formbricks.webp";
-import NewsletterSurvey from "./improve-newsletter-content-survey-location.webp";
-
-export const metadata = {
-  title: "Measure email content quality with Formbricks",
-  description:
-    "Measuring the content quality of both transactional and marketing email is a key element for improving customer communication.",
-};
-
-#### Best Practices
-
-# Improve Email Content
-
-Email remains the predominant way to communicate with your customers. Measure the effectiveness to improve your offering.
-
-## Purpose
-
-Measuring the content quality of both transactional and marketing email is a key element for improving customer communication.
-
-## Preview
-
-<DemoPreview template="Improve Newsletter Content" />
-
-## Formbricks Approach
-
-- Embed the survey into your email so it’s part of the newsletter.
-- Use link prefilling to store the answer users clicked on in the email.
-- Dynamic user identification to append reader's email for personalized profiles and follow ups.
-
-## Installation
-
-To embed the newsletter survey into your email, follow these steps:
-
-1. Create new 'Improve Newsletter Content' survey at [app.formbricks.com](https://app.formbricks.com/)
-2. Select how you where you want to display the survey.
-3. Copy the embed code anywhere you want in your newsletter.
-
-### 1. Create new 'Improve Newsletter Content' Survey
-
-If you don't have an account yet, create one at [app.formbricks.com](https://app.formbricks.com/auth/signup)
-
-Then, create a new survey and look for the "Improve Newsletter Content" template:
-
-<MdxImage
-  src={NewsletterSurvey}
-  alt="Create Improve Newsletter Content by template"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-### 2. Customize Survey questions
-
-Customize survey questions, emojis or stars however you like:
-
-<MdxImage
-  src={NewsletterSurveyEditor}
-  alt="Edit Improve Newsletter Content template"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-### 3. Configure Survey Settings
-
-When you are done customizing your survey questions, navigate to the Settings tab and choose the type of survey you want. You need to choose Link Survey:
-
-<MdxImage
-  src={NewsletterSurveyType}
-  alt="Choose survey type"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-### 4. Choose how you want to embed your survey
-
-After publishing your survey, a modal that prompts you to embed your survey will pop up.
-
-<MdxImage
-  src={NewsletterSurveyEmbedPrompt}
-  alt="Embed newsletter survey"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-Select the Embed Survey card and you will be directed to another modal, where the first embed option displayed will be to embed the survey in an email.
-
-### 5. Copy code to embed the survey in your newsletter
-
-Click the button with the “View Embed Code” text at the top right corner of the modal and simply paste the HTML code for your survey anywhere you want it in your newsletter. You can see the preview in the below image:
-
-<MdxImage
-  src={NewsletterSurveyEmbedCode}
-  alt="Embed survey code"
-  quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
-/>
-
-And you're done! Send a test email to yourself and try it out 🤓
-
-## Learn about data prefilling
-
-<Note>
-  ## How does data prefilling work? Learn about how link prefilling and user identification maximize your
-  insights in [this detailed
-  guide](/blog/how-smart-writers-use-formbricks-open-source-tool-to-measure-the-quality-of-their-newsletter-content).
-</Note>
-
-### &nbsp;
-
-# That’s it! 🎉

apps/formbricks-com/app/docs/best-practices/improve-trial-cr/page.mdx

@@ -1,5 +1,5 @@
 import DemoPreview from "@/components/dummyUI/DemoPreview";
-import { MdxImage } from "@/components/shared/MdxImage";
+import Image from "next/image";
 
 import ActionText from "./action-innertext.webp";
 import ActionPageurl from "./action-pageurl.webp";
@@ -11,8 +11,7 @@ import SelectAction from "./select-action.webp";
 
 export const metadata = {
   title: "Boost Your Trial Conversion Rates with Formbricks: Comprehensive Guide",
-  description:
-    "Unlock the secret to converting more trial users into paying customers using Formbricks. Understand insights behind trial cancellations and tailor your offering to fit user needs. Dive into our step-by-step tutorial and improve your conversion strategy today",
+  description: "Unlock the secret to converting more trial users into paying customers using Formbricks. Understand insights behind trial cancellations and tailor your offering to fit user needs. Dive into our step-by-step tutorial and improve your conversion strategy today",
 };
 
 #### Best Practices
@@ -38,14 +37,14 @@ The better you understand why free users don’t convert to paid users, the high
 
 To display the Trial Conversion Survey in your app you want to proceed as follows:
 
-1. Create new Trial Conversion Survey at [app.formbricks.com](https://app.formbricks.com/)
+1. Create new Trial Conversion Survey at [app.formbricks.com](http://app.formbricks.com/)
 2. Set up the user action to display survey at right point in time
 3. Print that 💸
 
 <Note>
-  ## Formbricks Widget running? We assume that you have already installed the Formbricks Widget in your web
-  app. It’s required to display messages and surveys in your app. If not, please follow the [Quick Start Guide
-  (takes 15mins max.)](/docs/getting-started/quickstart-in-app-survey)
+  ## Formbricks Widget running? 
+  We assume that you have already installed the Formbricks Widget in your web app. It’s required to display messages
+  and surveys in your app. If not, please follow the [Quick Start Guide (takes 15mins max.)](/docs/getting-started/quickstart-in-app-survey)
 </Note>
 
 ### 1. Create new Trial Conversion Survey
@@ -54,22 +53,22 @@ If you don't have an account yet, create one at [app.formbricks.com](https://app
 
 Click on "Create Survey" and choose the template “Improve Trial Conversion”:
 
-<MdxImage
+<Image
   src={CreateSurvey}
   alt="Create survey by template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 2. Update questions (if you like)
 
 You’re free to update the questions and answer options. However, based on our experience, we suggest giving the provided template a go 😊
 
-<MdxImage
+<Image
   src={ChangeText}
   alt="Change text content"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 _Want to change the button color? You can do so in the product settings!_
@@ -79,8 +78,8 @@ Save, and move over to the “Audience” tab.
 ### 3. Pre-segment your audience (coming soon)
 
 <Note>
-  ## Filter by attribute coming soon We're working on pre-segmenting users by attributes. We will update this
-  manual in the next days.
+  ## Filter by attribute coming soon 
+  We're working on pre-segmenting users by attributes. We will update this manual in the next days.
 </Note>
 
 Pre-segmentation isn't relevant for this survey because you likely want to solve all people who cancel their trial. You probably have a specific user action e.g. clicking on "Cancel Trial" you can use to only display the survey to users trialing your product.
@@ -91,54 +90,54 @@ How you trigger your survey depends on your product. There are two options:
 
 1. **Trigger by pageURL:** Let’s say you have a page under “/trial-cancelled” where you forward users once they cancelled the trial subscription. You can then create an user Action with the type `pageURL` with the following settings:
 
-<MdxImage
+<Image
   src={ActionPageurl}
   alt="Change text content"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 Whenever a user visits this page, the survey will be displayed ✅
 
 2. **Trigger by Button Click:** In a different case, you have a “Cancel Trial button in your app. You can setup a user Action with the according `innerText` like so:
 
-<MdxImage
+<Image
   src={ActionText}
   alt="Change text content"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 Please have a look at our complete [Actions manual](/docs/actions/why) if you have questions.
 
 ### 5. Select Action in the “When to ask” card
 
-<MdxImage
+<Image
   src={SelectAction}
   alt="Select feedback button action"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 6. Last step: Set Recontact Options correctly
 
 Lastly, scroll down to “Recontact Options”. Here you have to choose the correct settings to make sure you gather as many insights as possible. You want to make sure that this survey is always displayed, no matter if the user has already seen a survey in the past days:
 
-<MdxImage
+<Image
   src={RecontactOptions}
   alt="Set recontact options"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 7. Congrats! You’re ready to publish your survey 💃
 
-<MdxImage src={Publish} alt="Publish survey" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />
+<Image src={Publish} alt="Publish survey" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
 
 <Note>
-  ## Formbricks Widget running? You need to have the Formbricks Widget installed to display the Feedback Box
-  in your app. Please follow [this tutorial (Step 4 onwards)](/docs/getting-started/quickstart-in-app-survey)
-  to install the widget.
+  ## Formbricks Widget running? 
+  You need to have the Formbricks Widget installed to display the Feedback Box in your app. Please follow [this
+  tutorial (Step 4 onwards)](/docs/getting-started/quickstart-in-app-survey) to install the widget.
 </Note>
 
 ###

apps/formbricks-com/app/docs/best-practices/interview-prompt/page.mdx

@@ -1,5 +1,5 @@
 import DemoPreview from "@/components/dummyUI/DemoPreview";
-import { MdxImage } from "@/components/shared/MdxImage";
+import Image from "next/image";
 
 import ActionCSS from "./action-css.webp";
 import ActionInner from "./action-innertext.webp";
@@ -14,8 +14,7 @@ import SelectAction from "./select-action.webp";
 
 export const metadata = {
   title: "Maximize User Interview Participation with In-app Interview Prompts",
-  description:
-    "Engage with your power users seamlessly using Formbricks' In-app Interview Prompt. Ditch traditional email invites and experience way more more respondents. Dive into our comprehensive guide on setting up auto-scheduled interviews today and enhance your user understanding",
+  description: "Engage with your power users seamlessly using Formbricks' In-app Interview Prompt. Ditch traditional email invites and experience way more more respondents. Dive into our comprehensive guide on setting up auto-scheduled interviews today and enhance your user understanding",
 };
 
 #### Best Practices
@@ -43,14 +42,14 @@ Product analytics and in-app surveys are incomplete without user interviews. Set
 
 To display an Interview Prompt in your app you want to proceed as follows:
 
-1. Create new Interview Prompt at [app.formbricks.com](https://app.formbricks.com/)
+1. Create new Interview Prompt at [app.formbricks.com](http://app.formbricks.com/)
 2. Adjust content and settings
 3. That’s it! 🎉
 
 <Note>
-  ## Formbricks Widget running? We assume that you have already installed the Formbricks Widget in your web
-  app. It’s required to display messages and surveys in your app. If not, please follow the [Quick Start Guide
-  (15mins).](/docs/getting-started/quickstart-in-app-survey)
+  ## Formbricks Widget running? 
+  We assume that you have already installed the Formbricks Widget in your web app. It’s required to display messages
+  and surveys in your app. If not, please follow the [Quick Start Guide (15mins).](/docs/getting-started/quickstart-in-app-survey)
 </Note>
 
 ### 1. Create new Interview Prompt
@@ -59,31 +58,31 @@ If you don't have an account yet, create one at [app.formbricks.com](https://app
 
 Click on "Create Survey" and choose the template “Interview Prompt”:
 
-<MdxImage
+<Image
   src={CreatePrompt}
   alt="Create interview prompt by template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 2. Update prompt and CTA
 
 Update the prompt, description and button text to match your products tonality. You can also update the button color in the Product Settings.
 
-<MdxImage
+<Image
   src={ChangeText}
   alt="Change text content"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 In the button settings you have to make sure it is set to “External URL”. In the URL field, copy your booking link (e.g. https://cal.com/company/user-interview). If you don’t have a booking link yet, head over to [cal.com](http://cal.com) and get one - they have the best free plan out there!
 
-<MdxImage
+<Image
   src={InterviewExample}
   alt="Add CSS action"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 Save, and move over to the “Audience” tab.
@@ -91,8 +90,8 @@ Save, and move over to the “Audience” tab.
 ### 3. Pre-segment your audience (coming soon)
 
 <Note>
-  ## Filter by attribute coming soon We're working on pre-segmenting users by attributes. We will update this
-  manual in the next few days.
+  ## Filter by attribute coming soon 
+  We're working on pre-segmenting users by attributes. We will update this manual in the next few days.
 </Note>
 
 Once you clicked over to the “Audience” tab you can change the settings. In the **Who To Send** card, select “Filter audience by attribute”. This allows you to only show the prompt to a specific segment of your user base.
@@ -105,70 +104,65 @@ Great, now only the “Power User” segment will see our Interview Prompt. But
 
 To create the trigger to show your Interview Prompt, go to the “Audience” tab, find the “When to send” card and choose “Add Action”. We will now use our super cool No-Code User Action Tracker:
 
-<MdxImage src={AddAction} alt="Add action" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />
+<Image src={AddAction} alt="Add action" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
 
 <Note>
-  ## You can also add actions in your code You can also create [Code Actions](/docs/actions/code) using
-  `formbricks.track("Eventname")` - they will automatically appear in your Actions overview as long as the SDK
-  is embedded.
+  ## You can also add actions in your code 
+  You can also create [Code Actions](/docs/actions/code) using `formbricks.track("Eventname")` - they will automatically
+  appear in your Actions overview as long as the SDK is embedded.
 </Note>
 
 Generally, we have two types of user actions: Page views and clicks. The Interview Prompt, you’ll likely want to display it on a page visit since you already filter who sees the prompt by attributes.
 
 1. **pageURL:** Whenever a user visits a page the survey will be displayed, as long as the other conditions match. Other conditions are pre-segmentation, if this user has seen a survey in the past 2 weeks, etc.
 
-<MdxImage
+<Image
   src={ActionPageurl}
   alt="Add page URL action"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 2. **innerText & CSS-Selector:** When a user clicks an element (like a button) with a specific text content or CSS selector, the prompt will be displayed as long as the other conditions also match.
 
 <div className="flex max-w-full flex-col sm:max-w-3xl lg:gap-1">
-  <MdxImage
-    src={ActionCSS}
-    alt="Add CSS action"
-    quality="100"
-    className="max-w-full rounded-lg sm:max-w-3xl"
-  />
-  <MdxImage
+  <Image src={ActionCSS} alt="Add CSS action" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
+  <Image
     src={ActionInner}
     alt="Add inner text action"
     quality="100"
-    className="max-w-full rounded-lg sm:max-w-3xl"
+    className="rounded-lg max-w-full sm:max-w-3xl"
   />
 </div>
 
 ### 5. Select action in the “When to ask” card
 
-<MdxImage
+<Image
   src={SelectAction}
   alt="Select feedback button action"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 6. Set Recontact Options correctly
 
 Scroll down to “Recontact Options”. Here you have to choose the correct settings to strike the right balance between asking for user feedback and preventing survey fatigue. Your settings also depend on the size of your user base or segment. If you e.g. have thousands of “Power Users” you can easily afford to only display the prompt once. If you have a smaller user base you might want to ask twice to get a sufficient amount of bookings:
 
-<MdxImage
+<Image
   src={RecontactOptions}
   alt="Set recontact options"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 7. Congrats! You’re ready to publish your survey 💃 🤸
 
-<MdxImage src={Publish} alt="Publish survey" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />
+<Image src={Publish} alt="Publish survey" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
 
 <Note>
-  ## Formbricks Widget running? You need to have the Formbricks Widget installed to display the Feedback Box
-  in your app. Please follow [this tutorial (Step 4 onwards)](/docs/getting-started/quickstart-in-app-survey)
-  to install the widget.
+  ## Formbricks Widget running? 
+  You need to have the Formbricks Widget installed to display the Feedback Box in your app. Please follow [this
+  tutorial (Step 4 onwards)](/docs/getting-started/quickstart-in-app-survey) to install the widget.
 </Note>
 
 ###

apps/formbricks-com/app/docs/best-practices/pmf-survey/page.mdx

@@ -1,5 +1,5 @@
 import DemoPreview from "@/components/dummyUI/DemoPreview";
-import { MdxImage } from "@/components/shared/MdxImage";
+import Image from "next/image";
 
 import ActionCSS from "./action-css.webp";
 import ActionPageurl from "./action-pageurl.webp";
@@ -11,8 +11,7 @@ import SelectAction from "./select-action.webp";
 
 export const metadata = {
   title: "How to Set Up a Product-Market Fit Survey Using Formbricks - Step-by-Step Guide",
-  description:
-    "Learn to leverage Formbricks to create and implement a Product-Market Fit survey in your web app. Follow our detailed step-by-step guide to measure and understand your PMF effectively. Ensure high data quality, efficient triggers, and actionable insights.",
+  description: "Learn to leverage Formbricks to create and implement a Product-Market Fit survey in your web app. Follow our detailed step-by-step guide to measure and understand your PMF effectively. Ensure high data quality, efficient triggers, and actionable insights.",
 };
 
 #### Best Practices
@@ -37,14 +36,14 @@ Measuring and understanding your PMF is essential to build a large, successful b
 
 To display the Product-Market Fit survey in your app you want to proceed as follows:
 
-1. Create new Product-Market Fit survey at [app.formbricks.com](https://app.formbricks.com/)
+1. Create new Product-Market Fit survey at [app.formbricks.com](http://app.formbricks.com/)
 2. Setup pre-segmentation to assure high data quality
 3. Setup the user action to display survey at good point in time
 
 <Note>
-  ## Formbricks Widget running? We assume that you have already installed the Formbricks Widget in your web
-  app. It’s required to display messages and surveys in your app. If not, please follow the [Quick Start Guide
-  (15mins).](/docs/getting-started/quickstart-in-app-survey)
+  ## Formbricks Widget running? 
+  We assume that you have already installed the Formbricks Widget in your web app. It’s required to display messages
+  and surveys in your app. If not, please follow the [Quick Start Guide (15mins).](/docs/getting-started/quickstart-in-app-survey)
 </Note>
 
 ### 1. Create new PMF survey
@@ -53,22 +52,22 @@ If you don't have an account yet, create one at [app.formbricks.com](https://app
 
 Click on "Create Survey" and choose one of the PMF survey templates. The first one is rather short, the latter builds on the ["Product-Market Fit Engine"](https://review.firstround.com/how-superhuman-built-an-engine-to-find-product-market-fit) developed by Superhuman:
 
-<MdxImage
+<Image
   src={CreateSurvey}
   alt="Create survey by template"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 2. Update questions (if you like)
 
 You’re free to update the question and answer options. However, based on our experience, we suggest giving the provided template a go 😊 Here is a very [detailed description](https://coda.io/@rahulvohra/superhuman-product-market-fit-engine) of what to do with the data you’re collecting.
 
-<MdxImage
+<Image
   src={ChangeText}
   alt="Change text content"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 _Want to change the button color? You can do so in the product settings!_
@@ -78,8 +77,8 @@ Save, and move over to where the magic happens: The “Audience” tab.
 ### 3. Pre-segment your audience (coming soon)
 
 <Note>
-  ## Filter by attribute coming soon We're working on pre-segmenting users by attributes. We will update this
-  manual in the next days.
+  ## Filter by attribute coming soon 
+  We're working on pre-segmenting users by attributes. We will update this manual in the next days.
 </Note>
 
 To run this survey properly, you should pre-segment your user base. As touched upon earlier: if you ask every user you’ll get lots of opinions which are often misleading. You only want to gather feedback from people who invested the time to get to know and use your product:
@@ -97,51 +96,45 @@ This way you make sure that you separate potentially misleading opinions from va
 ### 4. Set up a trigger for the Product-Market Fit survey:
 
 You need a trigger to display the survey but in this case, the filtering does all the work. It’s up to you to decide to display the survey after the user viewed a specific subpage (pageURL) or after clicking an element. Have a look at the [Actions manual](/docs/actions/why) if you are not sure how to set them up:
-
 <Col>
-  <div>
-    <MdxImage
-      src={ActionCSS}
-      alt="Add CSS action"
-      quality="100"
-      className="max-w-full rounded-lg sm:max-w-3xl"
-    />
-    <MdxImage
-      src={ActionPageurl}
-      alt="Add inner text action"
-      quality="100"
-      className="max-w-full rounded-lg sm:max-w-3xl"
-    />
-  </div>
+<div>
+  <Image src={ActionCSS} alt="Add CSS action" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
+  <Image
+    src={ActionPageurl}
+    alt="Add inner text action"
+    quality="100"
+    className="rounded-lg max-w-full sm:max-w-3xl"
+  />
+</div>
 </Col>
 ### 5. Select Action in the “When to ask” card
 <Col>
-  <MdxImage
-    src={SelectAction}
-    alt="Select PMF trigger button action"
-    quality="100"
-    className="max-w-full rounded-lg sm:max-w-3xl"
-  />
+<Image
+  src={SelectAction}
+  alt="Select PMF trigger button action"
+  quality="100"
+  className="rounded-lg max-w-full sm:max-w-3xl"
+/>
 </Col>
 ### 6. Last step: Set Recontact Options correctly
 
 Lastly, scroll down to “Recontact Options”. Here you have to choose the correct settings to make sure your data remains of high quality. You want to make sure that this survey is only responded to once per user. It is up to you to decide if you want to display it several times until the user responds:
 
-<MdxImage
+<Image
   src={RecontactOptions}
   alt="Set recontact options"
   quality="100"
-  className="max-w-full rounded-lg sm:max-w-3xl"
+  className="rounded-lg max-w-full sm:max-w-3xl"
 />
 
 ### 7. Congrats! You’re ready to publish your survey 💃
 
-<MdxImage src={Publish} alt="Publish survey" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />
+<Image src={Publish} alt="Publish survey" quality="100" className="rounded-lg max-w-full sm:max-w-3xl" />
 
 <Note>
-  ## Formbricks Widget running? You need to have the Formbricks Widget installed to display the Feedback Box
-  in your app. Please follow [this tutorial (Step 4 onwards)](/docs/getting-started/quickstart-in-app-survey)
-  to install the widget.
+  ## Formbricks Widget running? 
+  You need to have the Formbricks Widget installed to display the Feedback Box in your app. Please follow [this
+  tutorial (Step 4 onwards)](/docs/getting-started/quickstart-in-app-survey) to install the widget.
 </Note>
 
 ###

apps/formbricks-com/app/docs/contributing/creating-a-service/page.mdx

@@ -1,5 +1,4 @@
-import { MdxImage } from "@/components/shared/MdxImage";
-
+import Image from "next/image";
 import UnstableCache from "./unstable-cache-documentation.webp";
 
 export const metadata = {
@@ -210,7 +209,6 @@ We will rewrite the function `getApiKey` we created in the `service.ts` file to
 
 ```ts
 import { unstable_cache } from "next/cache";
-
 import { SERVICES_REVALIDATION_INTERVAL } from "../constants";
 import { apiKeyCache } from "./cache";
 
@@ -254,7 +252,7 @@ _Breakdown of the above code._
 
 In the above code we only introduce something new called `unstable_cache`, read more about it [here](https://nextjs.org/docs/app/api-reference/functions/unstable_cache#parameters). In a nutshell these are its parameters:
 
-<MdxImage
+<Image
   src={UnstableCache}
   alt="Unstable Cache Parameters"
   quality="100"

apps/formbricks-com/app/docs/contributing/demo/page.mdx

@@ -1,4 +1,4 @@
-import { MdxImage } from "@/components/shared/MdxImage";
+import Image from "next/image";
 
 import DemoApp from "./demoapp.webp";
 
@@ -14,7 +14,7 @@ export const metadata = {
 
 To play around with the in-app [User Actions](/docs/actions/why), you can use the Demo App. It's a simple React app that you can run locally and use to trigger actions and set [Attributes](/docs/attributes/why).
 
-<MdxImage src={DemoApp} alt="Demo App Preview" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />
+<Image src={DemoApp} alt="Demo App Preview" quality="100" className="max-w-full rounded-lg sm:max-w-3xl" />
 
 ## Functionality
 

apps/formbricks-com/app/docs/contributing/gitpod/page.mdx

@@ -0,0 +1,141 @@
+import Image from "next/image";
+import GitpodPorts from "./gitpod-ports.webp";
+import GitpodAuth from "./gitpod-auth.webp";
+import GitpodNewWorkspace from "./gitpod-new-workspace.webp";
+import GitpodPreparing from "./gitpod-preparing.webp";
+import GitpodRunning from "./gitpod-running.webp";
+
+export const metadata = {
+  title: "Gitpod Setup",
+  description:
+    "With one click, you can setup the Formbricks developer environment in your browser using Gitpod",
+};
+
+#### Contributing
+
+# Gitpod
+
+### One Click Setup
+
+- 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.
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/formbricks/formbricks)
+ 
+## Gitpod Setup Overview
+
+    **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.
+
+
+## Gitpod Guide  
+
+### 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
+<Image src={GitpodAuth} alt="Gitpod Auth Page" quality="100" className="rounded-lg max-w-full 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
+<Image src={GitpodNewWorkspace} alt="Gitpod New workspace Page" quality="100" className="rounded-lg max-w-full 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
+<Image src={GitpodPreparing} alt="Gitpod Preparing workspace Page" quality="100" className="rounded-lg max-w-full 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
+<Image src={GitpodRunning} alt="Gitpod Running Workspace Page" quality="100" className="rounded-lg max-w-full 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 in-app 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**: SMPT 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.
+
+  <Image src={GitpodPorts} alt="Gitpod Ports tab" quality="100" className="rounded-lg max-w-full 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.
+
+Still can’t figure it out? Join our [Discord](https://discord.com/invite/3YFcABF2Ts)!

apps/formbricks-com/app/docs/contributing/how-we-code/page.mdx

@@ -1,5 +1,4 @@
-import { MdxImage } from "@/components/shared/MdxImage";
-
+import Image from "next/image";
 import CorsHandling from "./cors-handling-in-api.webp";
 
 export const metadata = {
@@ -26,7 +25,7 @@ Thank you for choosing to contribute to Formbricks. Before you start, please fam
 - Constants should be in the packages folder
 - Types should be in the packages folder
 - How we handle Pull Requests
-- Read server-side environment variables from `constants.ts`
+- Read environment variables from `.env.mjs`
 
 ---
 
@@ -65,7 +64,7 @@ Please keep the following in mind:
 - When dealing with Management APIs always make sure to require authentication via API keys and a sufficient authorization check.
 - Make sure to handle CORS requests in any new Client API endpoint you create as these are called from the browser in link surveys or `formbricks-js`. Example below:
 
-<MdxImage
+<Image
   src={CorsHandling}
   alt="Cors handling within an API"
   quality="100"
@@ -84,9 +83,9 @@ You should store constants in `packages/lib/constants`
 
 You should store type in `packages/types`
 
-## Read server-side environment variables from `constants.ts`
+## Read environment variables from `.env.mjs`
 
-Server-side environment variables (`process.env`) shouldn’t be accessed directly but included into the `constants.ts` file and read from there. This way we can assure they are used only on the server side and are also type-safe.
+Environment variables (`process.env`) shouldn’t be accessed directly but be added in the `.env.mjs` and should be accessed from here. This practice helps us ensure that the variables are typesafe.
 
 ## How we handle Pull Requests
 

apps/formbricks-com/app/docs/contributing/introduction/page.mdx

@@ -42,4 +42,6 @@ If you are at all unsure, just raise it as an enhancement issue first and tell u
 
 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.
+Please note that we can only get your contribution merged when we have a CLA signed by you.
+
+To access the CLA form, please click [here](https://formbricks.com/clmyhzfrymr4ko00hycsg1tvx)

apps/formbricks-com/app/docs/contributing/setup/page.mdx

@@ -1,360 +1,98 @@
-import { MdxImage } from "@/components/shared/MdxImage";
-
-import GitpodAuth from "./gitpod/auth.webp";
-import GitpodNewWorkspace from "./gitpod/new-workspace.webp";
-import GitpodPorts from "./gitpod/ports.webp";
-import GitpodPreparing from "./gitpod/preparing.webp";
-import GitpodRunning from "./gitpod/running.webp";
-
-import GithubCodespaceLoading from "./github-codespaces/loading.webp";
-import GithubCodespaceNew from "./github-codespaces/new.webp";
-import GithubCodespacePorts from "./github-codespaces/ports.webp";
-
 export const metadata = {
   title: "Formbricks Development Setup: Complete Guide to Local Environment Configuration for Dev",
   description:
-    "Step-by-step guide to setting up a development environment for Formbricks. We officially support Gitpod and Github Codespaces for quick setup. Our advanced users can also setup Formbricks locally on their machine.",
+    "Step-by-step guide to setting up your local development environment for Formbricks. Includes installing essential tools like Node.JS, pnpm, and Docker, and accessing the entire Formbricks stack including the Demo app and the main website",
 };
 
 #### Contributing
 
 # 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](#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](#gitpod-guide) section below.
-
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://Github.com/formbricks/formbricks)
-
-### [Github Codespaces](#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](#github-codespaces-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](#local-machine-setup)
-
-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](#local-machine-setup).
-
-<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 in-app 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)
+- Node.JS (we recommend v18)
 - [pnpm](https://pnpm.io/)
 - [Docker](https://www.docker.com/) (to run PostgreSQL / MailHog)
 
-1. Clone the project & move into the directory:
+1. Clone the project:
 
 <Col>
    <CodeGroup title="Git clone Formbricks monorepo">
 
-```bash
-git clone https://github.com/formbricks/formbricks && cd formbricks
-```
+   ```bash
+   git clone https://github.com/formbricks/formbricks
+   ```
+
+   </CodeGroup>
+</Col>
+   and move into the directory
+<Col>
+   <CodeGroup title="Move into the Formbricks monorepo">
+
+   ```bash
+   cd formbricks
+   ```
 
    </CodeGroup>
 </Col>
 
-2. Install Node.JS packages via pnpm. Don't have pnpm? Get it [here](https://pnpm.io/installation)
+1. 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
-```
+   ```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.
+1. Create a `.env` file based on `.env.example`. It's already preset to work with the docker-compose setup but you can also change values if needed.
 
 <Col>
    <CodeGroup title="Define environment variables">
 
-```bash
-cp .env.example .env
-```
+   ```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:
+1. Generate a secret value mandatory to be set for the key ENCRYPTION_KEY 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
-```
+   ```bash
+   openssl rand -hex 32
+   ```
 
    </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:
+1. 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
-```
+   ```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)
+   - 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`)
 
-<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.
 
-**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>
 
-{" "}
-
-<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)
+   For viewing the confirmation email and other emails the system sends you, you can access mailhog at [http://localhost:8025](http://localhost:8025)
 
 ### Build
 
@@ -369,7 +107,32 @@ pnpm build
 
 </CodeGroup>
 </Col>
+### Access Demo app
 
----
+To run the [Demo app](/docs/contributing/demo), run the following command in a separate terminal window:
 
-Can’t figure it out? Join our [Discord](https://discord.com/invite/3YFcABF2Ts)!
+<Col>
+<CodeGroup title="Start Formbricks Demo App">
+
+```bash
+pnpm dev --filter=demo
+```
+
+</CodeGroup>
+</Col>
+You can now access the Demo app on [http://localhost:3002](http://localhost:3002).
+
+### Access Formbricks website
+
+If you want to make changes to the Formbricks website, e.g. to update the documentation, run the following command in a separate terminal window:
+
+<Col>
+<CodeGroup title="Start Formbricks Website">
+
+```bash
+pnpm dev --filter=formbricks-com
+```
+
+</CodeGroup>
+</Col>
+You can now access the Formbricks website on [http://localhost:3001](http://localhost:3001).