fix: stripe action not running due to invalid env check in github action

.github/workflows/cron-reportUsageToStripe.yml

@@ -4,8 +4,8 @@ on:
   # "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 22:00 UTC every day of every month.
-    - cron: "0 22 * * *"
+    # This will run the job at 23:00 UTC every day of every month.
+    - cron: "0 21 * * *"
 jobs:
   cron-reportUsageToStripe:
     env:
@@ -19,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/playwright.yml

@@ -1,37 +0,0 @@
-name: E2E Tests
-on:
-  workflow_call:
-jobs:
-  build:
-    name: Run E2E Tests
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - name: Install Docker Compose
-        run: sudo apt-get update && sudo apt-get install -y docker-compose
-
-      - name: Install dependencies
-        run: npm install -g pnpm && pnpm install
-
-      - name: Build Formbricks Image & Run
-        run: docker-compose up -d
-
-      - name: Install Playwright Browsers
-        run: pnpm exec playwright install --with-deps
-
-      - name: Run Playwright tests
-        run: pnpm test:e2e
-
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: playwright-report
-          path: playwright-report/
-          retention-days: 30

.github/workflows/pr.yml

@@ -27,13 +27,8 @@ jobs:
     uses: ./.github/workflows/build-web.yml
     secrets: inherit
 
-  e2e-test:
-    name: Run E2E Tests
-    uses: ./.github/workflows/playwright.yml
-    secrets: inherit
-
   required:
-    needs: [lint, test, build, e2e-test]
+    needs: [lint, test, build]
     if: always()
     runs-on: ubuntu-latest
     steps:

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

@@ -52,22 +52,19 @@ jobs:
         with:
           cosign-release: "v2.1.1"
 
-        # Add support for more platforms with QEMU (optional)
-        # https://github.com/docker/setup-qemu-action
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       # 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@v3 # v3.0.0
+        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+        with:
+          platforms: linux/amd64,linux/arm64
 
       # 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 }}
@@ -77,7 +74,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 }}
 
@@ -85,11 +82,10 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@v5 # v5.0.0
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           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 }}

.gitignore

@@ -44,10 +44,4 @@ packages/database/zod
 # nixos stuff
 .direnv
 
-Zone.Identifier
-
-# Playwright
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/
+Zone.Identifier

apps/demo/pages/app/index.tsx

@@ -22,13 +22,11 @@ export default function AppPage({}) {
     if (process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID && process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST) {
       const isUserId = window.location.href.includes("userId=true");
       const userId = isUserId ? "THIS-IS-A-VERY-LONG-USER-ID-FOR-TESTING" : undefined;
-      const attributes = isUserId ? { "Init Attribute 1": "eight", "Init Attribute 2": "two" } : undefined;
       formbricks.init({
         environmentId: process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID,
         apiHost: process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST,
         userId,
         debug: true,
-        attributes,
       });
       window.formbricks = formbricks;
     }

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

@@ -16,9 +16,7 @@ Checkout the [API Key Setup](/docs/api/management/api-key-setup) - to generate,
 
 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

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

@@ -10,31 +10,9 @@ export const metadata = {
 
 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 during Initialization
-
-It's recommended to set custom user attributes directly during the initialization of Formbricks for better user identification.
-
-<Col>
-<CodeGroup title="Set custom attributes during initialization">
-
-```javascript
-formbricks.init({
-  environmentId: "<environment-id>",
-  apiHost: "<api-host>",
-  userId: "<user_id>",
-  attributes: {
-    plan: "free",
-  },
-});
-```
-
-</CodeGroup>
-</Col>
-
-## Setting independently
-
-You can use the setAttribute function to set any custom attribute for the user (e.g. name, plan, etc.) anywhere in the user journey. Formbricks maintains a state of the current user inside the browser and makes sure attributes aren't sent to the backend twice.
+## 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">
 

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

@@ -29,29 +29,6 @@ formbricks.init({
 
 </CodeGroup>
 </Col>
-
-## Enhanced Initialization with User Attributes
-
-In addition to setting the `userId`, Formbricks allows you to set user attributes right at the initialization. This ensures that your user data is seamlessly integrated from the start. Here's how you can include user attributes in the `init()` function:
-
-<Col>
-<CodeGroup title="Enhanced Initialization with User Attributes">
-
-```javascript
-formbricks.init({
-  environmentId: "<environment-id>",
-  apiHost: "<api-host>",
-  userId: "<user_id>",
-  attributes: {
-    // your custom attributes
-    Plan: "premium",
-  },
-});
-```
-
-</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:

apps/formbricks-com/app/docs/introduction/what-is-formbricks/page.mdx

@@ -1,4 +1,5 @@
 import { GettingStarted } from "@/components/docs/GettingStarted";
+import BestPractices from "@/components/docs/BestPractices";
 import { HeroPattern } from "@/components/docs/HeroPattern";
 import { Button } from "@/components/docs/Button";
 
@@ -8,7 +9,10 @@ export const metadata = {
     "Enhance your product with Formbricks – the leading open-source solution for in-product micro-surveys. Dive deep into user research, amplify product-market fit, and uncover the 'why' behind your analytics.",
 };
 
-export const sections = [];
+export const sections = [
+  { title: "Getting Started", id: "getting-started" },
+  { title: "Best Practices", id: "best-practices" },
+];
 
 <HeroPattern />
 
@@ -16,7 +20,7 @@ export const sections = [];
 
 Welcome to Formbricks, your go-to solution for in-product micro-surveys that will supercharge your product experience! 🚀 {{ className: 'lead' }}
 
-<div className="mb-16 mt-6 flex gap-3" id="why-formbricks">
+<div className="mb-16 mt-6 flex gap-3">
   <Button href="/docs/getting-started/quickstart-in-app-survey" arrow="right" children="Quickstart" />
 </div>
 

apps/formbricks-com/app/docs/self-hosting/external-auth-providers/page.mdx

@@ -39,24 +39,17 @@ Integrating Google OAuth with your Formbricks instance allows users to log in us
    - Select the application type **Web application** for your project and enter any additional information required.
    - Ensure to specify authorized JavaScript origins and authorized redirect URIs.
 
-<Col>
-<CodeGroup title="Configuration URLs">
-``` {{ title: 'Redirect & Origin URLs' }}
+```
 Authorized JavaScript origins: {WEBAPP_URL}
 Authorized redirect URIs: {WEBAPP_URL}/api/auth/callback/google
 ```
-</CodeGroup>
-</Col>
 
 5. **Update Environment Variables in Docker**:
    - To integrate the Google OAuth, you have two options: either update the environment variables in the docker-compose file or directly add them to the running container.
    - In your Docker setup directory, open the `.env` file, and add or update the following lines with the `Client ID` and `Client Secret` obtained from Google Cloud Platform:
    - Alternatively, you can add the environment variables directly to the running container using the following commands (replace `container_id` with your actual Docker container ID):
 
-<Col>
-<CodeGroup title="Set env vars">
-
-```sh {{ title: 'Shell commands' }}
+```
 docker exec -it container_id /bin/bash
 export GOOGLE_AUTH_ENABLED=1
 export GOOGLE_CLIENT_ID=your-client-id-here
@@ -64,15 +57,12 @@ export GOOGLE_CLIENT_SECRET=your-client-secret-here
 exit
 ```
 
-```sh {{ title: 'env file' }}
+```
 GOOGLE_AUTH_ENABLED=1
 GOOGLE_CLIENT_ID=your-client-id-here
 GOOGLE_CLIENT_SECRET=your-client-secret-here
 ```
 
-</CodeGroup>
-</Col>
-
 6. **Restart Your Formbricks Instance**:
    - **Note:** Restarting your Docker containers may cause a brief period of downtime. Plan accordingly.
    - Once the environment variables have been updated, it's crucial to restart your Docker containers to apply the changes. This ensures that your Formbricks instance can utilize the new Google OAuth configuration for user authentication. Here's how you can do it:

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

@@ -18,6 +18,7 @@ Formbricks v1.2 ships a lot of features targeting our Link Surveys. We have also
 | -------------------- | -------- | ------------------------------ | ----------------------------------------------------------- |
 | ENCRYPTION_KEY       | true     | `openssl rand -hex 32`         | Needed for 2 Factor Authentication                          |
 | SHORT_URL_BASE       | false    | `<your-short-base-url>`        | Needed if you want to enable shorter links for Link Surveys |
+| ASSET_PREFIX_URL     | false    | `<your-asset-hosted-base-url>` | Needed if you have a separate URL for hosted assets         |
 
 ### Deprecated / Removed Environment Variables
 

apps/formbricks-com/components/home/Hero.tsx

@@ -27,7 +27,7 @@ export const Hero: React.FC = ({}) => {
           <ChevronRightIcon className="mb-1 ml-1 inline h-4 w-4 text-slate-300" />
         </a>
         <h1 className="mt-10 text-3xl font-bold tracking-tight text-slate-800 dark:text-slate-200 sm:text-4xl md:text-5xl">
-          <span className="xl:inline">Privacy-first Experience Management</span>
+          <span className="xl:inline">Prviacy-first Experience Management</span>
         </h1>
 
         <p className="xs:max-w-none mx-auto mt-3 max-w-xs text-base text-slate-500 dark:text-slate-400 sm:text-lg md:mt-5 md:text-xl">

apps/formbricks-com/components/shared/BestPracticeNavigation.tsx

@@ -83,8 +83,8 @@ export default function BestPracticeNavigation() {
   return (
     <div className="mx-auto grid grid-cols-1 gap-6 px-2 md:grid-cols-3">
       {BestPractices.map((bestPractice) => (
-        <Link className="relative block" href={bestPractice.href} key={bestPractice.name}>
-          <div className="drop-shadow-card duration-120 hover:border-brand-dark relative h-full rounded-lg border border-slate-100 bg-slate-100 p-6 transition-all ease-in-out hover:scale-105 hover:cursor-pointer dark:border-slate-600 dark:bg-slate-800">
+        <Link href={bestPractice.href} key={bestPractice.name}>
+          <div className="drop-shadow-card duration-120 hover:border-brand-dark relative rounded-lg border border-slate-100 bg-slate-100 p-6 transition-all ease-in-out hover:scale-105 hover:cursor-pointer dark:border-slate-600 dark:bg-slate-800">
             <div
               className={clsx(
                 // base styles independent what type of button it is
@@ -105,9 +105,7 @@ export default function BestPracticeNavigation() {
             <h3 className="mb-1 mt-3 text-xl font-bold text-slate-700 dark:text-slate-200">
               {bestPractice.name}
             </h3>
-            <p className="flex self-end text-sm text-slate-600 dark:text-slate-400">
-              {bestPractice.description}
-            </p>
+            <p className="text-sm text-slate-600 dark:text-slate-400">{bestPractice.description}</p>
           </div>
         </Link>
       ))}

apps/storybook/package.json

@@ -15,23 +15,23 @@
     "@formbricks/ui": "workspace:*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "storybook": "^7.6.3"
+    "storybook": "^7.4.6"
   },
   "devDependencies": {
     "@formbricks/tsconfig": "workspace:*",
-    "@storybook/addon-essentials": "^7.6.3",
-    "@storybook/addon-interactions": "^7.6.3",
-    "@storybook/addon-links": "^7.6.3",
-    "@storybook/addon-onboarding": "^1.0.9",
-    "@storybook/blocks": "^7.6.3",
-    "@storybook/react": "^7.6.3",
-    "@storybook/react-vite": "^7.6.3",
+    "@storybook/addon-essentials": "^7.5.0-alpha.5",
+    "@storybook/addon-interactions": "^7.5.0-alpha.5",
+    "@storybook/addon-links": "^7.5.0-alpha.5",
+    "@storybook/addon-onboarding": "^1.0.8",
+    "@storybook/blocks": "^7.5.0-alpha.5",
+    "@storybook/react": "^7.5.0-alpha.5",
+    "@storybook/react-vite": "^7.5.0-alpha.5",
     "@storybook/testing-library": "^0.2.2",
-    "@typescript-eslint/eslint-plugin": "^6.13.2",
-    "@typescript-eslint/parser": "^6.13.2",
-    "@vitejs/plugin-react": "^4.2.1",
-    "esbuild": "^0.19.8",
-    "tsup": "^8.0.1",
-    "vite": "^5.0.6"
+    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/parser": "^6.8.0",
+    "@vitejs/plugin-react": "^4.1.0",
+    "esbuild": "^0.19.5",
+    "tsup": "^7.2.0",
+    "vite": "^4.4.11"
   }
 }

apps/web/Dockerfile

@@ -1,19 +1,13 @@
 # Installer stage: Building the application
 FROM node:20-alpine AS installer
-
-# Enable corepack and prepare pnpm
 RUN corepack enable && corepack prepare pnpm@latest --activate
 
-# Install necessary build tools and compilers
-RUN apk update && apk add --no-cache g++ cmake make gcc python3 openssl-dev
-
 # Install Supercronic (cron for containers without super user privileges)
 RUN apk add --no-cache curl \
     && curl -fsSLo /tmp/supercronic \
        "https://github.com/aptible/supercronic/releases/download/v0.2.27/supercronic-linux-amd64" \
     && chmod +x /tmp/supercronic
 
-# Set environment variables
 ARG DATABASE_URL
 ENV DATABASE_URL=$DATABASE_URL
 
@@ -23,19 +17,13 @@ ENV NEXTAUTH_SECRET=$NEXTAUTH_SECRET
 ARG ENCRYPTION_KEY
 ENV ENCRYPTION_KEY=$ENCRYPTION_KEY
 
-# Set the working directory
 WORKDIR /app
 
-# Copy the application files
 COPY . .
-
-# Create a .env file
 RUN touch /app/apps/web/.env
 
-# Install the dependencies
 RUN pnpm install
 
-
 # Build the project
 RUN pnpm post-install --filter=web...
 RUN pnpm turbo run build --filter=web...

apps/web/app/(app)/environments/[environmentId]/actions.ts

@@ -204,7 +204,6 @@ export async function copyToOtherEnvironmentAction(
       singleUse: existingSurvey.singleUse ?? prismaClient.JsonNull,
       productOverwrites: existingSurvey.productOverwrites ?? prismaClient.JsonNull,
       verifyEmail: existingSurvey.verifyEmail ?? prismaClient.JsonNull,
-      styling: existingSurvey.styling ?? prismaClient.JsonNull,
     },
   });
 

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryMetadata.tsx

@@ -63,7 +63,7 @@ export default function SummaryMetadata({
   const ttc = useMemo(() => {
     let validTtcResponsesCountAcc = 0; //stores the count of responses that contains a _total value
     const ttc = responses.reduce((acc, response) => {
-      if (response.ttc?._total) {
+      if (response.ttc._total) {
         validTtcResponsesCountAcc++;
         return acc + response.ttc._total;
       }

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/AnimatedSurveyBg.tsx

@@ -1,107 +0,0 @@
-import { TSurvey } from "@formbricks/types/surveys";
-import { useState } from "react";
-
-interface AnimatedSurveyBgProps {
-  localSurvey?: TSurvey;
-  handleBgChange: (bg: string, bgType: string) => void;
-}
-
-export default function AnimatedSurveyBg({ localSurvey, handleBgChange }: AnimatedSurveyBgProps) {
-  const [color, setColor] = useState(localSurvey?.styling?.background?.bg || "#ffff");
-  const [hoveredVideo, setHoveredVideo] = useState<number | null>(null);
-
-  const animationFiles = {
-    "/animated-bgs/Thumbnails/1_Thumb.mp4": "/animated-bgs/4K/1_4k.mp4",
-    "/animated-bgs/Thumbnails/2_Thumb.mp4": "/animated-bgs/4K/2_4k.mp4",
-    "/animated-bgs/Thumbnails/3_Thumb.mp4": "/animated-bgs/4K/3_4k.mp4",
-    "/animated-bgs/Thumbnails/4_Thumb.mp4": "/animated-bgs/4K/4_4k.mp4",
-    "/animated-bgs/Thumbnails/5_Thumb.mp4": "/animated-bgs/4K/5_4k.mp4",
-    "/animated-bgs/Thumbnails/6_Thumb.mp4": "/animated-bgs/4K/6_4k.mp4",
-    "/animated-bgs/Thumbnails/7_Thumb.mp4": "/animated-bgs/4K/7_4k.mp4",
-    "/animated-bgs/Thumbnails/8_Thumb.mp4": "/animated-bgs/4K/8_4k.mp4",
-    "/animated-bgs/Thumbnails/9_Thumb.mp4": "/animated-bgs/4K/9_4k.mp4",
-    "/animated-bgs/Thumbnails/10_Thumb.mp4": "/animated-bgs/4K/10_4k.mp4",
-    "/animated-bgs/Thumbnails/11_Thumb.mp4": "/animated-bgs/4K/11_4k.mp4",
-    "/animated-bgs/Thumbnails/12_Thumb.mp4": "/animated-bgs/4K/12_4k.mp4",
-    "/animated-bgs/Thumbnails/13_Thumb.mp4": "/animated-bgs/4K/13_4k.mp4",
-    "/animated-bgs/Thumbnails/14_Thumb.mp4": "/animated-bgs/4K/14_4k.mp4",
-    "/animated-bgs/Thumbnails/15_Thumb.mp4": "/animated-bgs/4K/15_4k.mp4",
-    "/animated-bgs/Thumbnails/16_Thumb.mp4": "/animated-bgs/4K/16_4k.mp4",
-    "/animated-bgs/Thumbnails/17_Thumb.mp4": "/animated-bgs/4K/17_4k.mp4",
-    "/animated-bgs/Thumbnails/18_Thumb.mp4": "/animated-bgs/4K/18_4k.mp4",
-    "/animated-bgs/Thumbnails/19_Thumb.mp4": "/animated-bgs/4K/19_4k.mp4",
-    "/animated-bgs/Thumbnails/20_Thumb.mp4": "/animated-bgs/4K/20_4k.mp4",
-    "/animated-bgs/Thumbnails/21_Thumb.mp4": "/animated-bgs/4K/21_4k.mp4",
-    "/animated-bgs/Thumbnails/22_Thumb.mp4": "/animated-bgs/4K/22_4k.mp4",
-    "/animated-bgs/Thumbnails/23_Thumb.mp4": "/animated-bgs/4K/23_4k.mp4",
-    "/animated-bgs/Thumbnails/24_Thumb.mp4": "/animated-bgs/4K/24_4k.mp4",
-    "/animated-bgs/Thumbnails/25_Thumb.mp4": "/animated-bgs/4K/25_4k.mp4",
-    "/animated-bgs/Thumbnails/26_Thumb.mp4": "/animated-bgs/4K/26_4k.mp4",
-    "/animated-bgs/Thumbnails/27_Thumb.mp4": "/animated-bgs/4K/27_4k.mp4",
-    "/animated-bgs/Thumbnails/28_Thumb.mp4": "/animated-bgs/4K/28_4k.mp4",
-    "/animated-bgs/Thumbnails/29_Thumb.mp4": "/animated-bgs/4K/29_4k.mp4",
-    "/animated-bgs/Thumbnails/30_Thumb.mp4": "/animated-bgs/4K/30_4k.mp4",
-  };
-
-  const handleMouseEnter = (index: number) => {
-    setHoveredVideo(index);
-    playVideo(index);
-  };
-
-  const handleMouseLeave = (index: number) => {
-    setHoveredVideo(null);
-    pauseVideo(index);
-  };
-
-  // Function to play the video
-  const playVideo = (index: number) => {
-    const video = document.getElementById(`video-${index}`) as HTMLVideoElement;
-    if (video) {
-      video.play();
-    }
-  };
-
-  // Function to pause the video
-  const pauseVideo = (index: number) => {
-    const video = document.getElementById(`video-${index}`) as HTMLVideoElement;
-    if (video) {
-      video.pause();
-    }
-  };
-
-  const handleBg = (x: string) => {
-    setColor(x);
-    handleBgChange(x, "animation");
-  };
-  return (
-    <div>
-      <div className="mt-4 grid grid-cols-6 gap-4">
-        {Object.keys(animationFiles).map((key, index) => {
-          const value = animationFiles[key];
-          return (
-            <div
-              key={index}
-              onMouseEnter={() => handleMouseEnter(index)}
-              onMouseLeave={() => handleMouseLeave(index)}
-              onClick={() => handleBg(value)}
-              className="relative cursor-pointer overflow-hidden rounded-lg">
-              <video
-                disablePictureInPicture
-                id={`video-${index}`}
-                autoPlay={hoveredVideo === index}
-                className="h-46 w-96 origin-center scale-105 transform">
-                <source src={`${key}`} type="video/mp4" />
-              </video>
-              <input
-                className="absolute right-2 top-2 h-4 w-4 rounded-sm bg-white "
-                type="checkbox"
-                checked={color === value}
-                onChange={() => handleBg(value)}
-              />
-            </div>
-          );
-        })}
-      </div>
-    </div>
-  );
-}

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/ColorSurveyBg.tsx

@@ -1,38 +0,0 @@
-import { TSurvey } from "@formbricks/types/surveys";
-import { ColorPicker } from "@formbricks/ui/ColorPicker";
-import { useState } from "react";
-
-interface ColorSurveyBgBgProps {
-  localSurvey?: TSurvey;
-  handleBgChange: (bg: string, bgType: string) => void;
-  colours: string[];
-}
-
-export default function ColorSurveyBg({ localSurvey, handleBgChange, colours }: ColorSurveyBgBgProps) {
-  const [color, setColor] = useState(localSurvey?.styling?.background?.bg || "#ffff");
-
-  const handleBg = (x: string) => {
-    setColor(x);
-    handleBgChange(x, "color");
-  };
-  return (
-    <div>
-      <div className="w-full max-w-xs py-2">
-        <ColorPicker color={color} onChange={handleBg} />
-      </div>
-      <div className="grid grid-cols-4 gap-4 md:grid-cols-5 xl:grid-cols-8 2xl:grid-cols-10">
-        {colours.map((x) => {
-          return (
-            <div
-              className={`h-16 w-16 cursor-pointer rounded-lg ${
-                color === x ? "border-4 border-slate-500" : ""
-              }`}
-              key={x}
-              style={{ backgroundColor: `${x}` }}
-              onClick={() => handleBg(x)}></div>
-          );
-        })}
-      </div>
-    </div>
-  );
-}

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/ImageSurveyBg.tsx

@@ -1,42 +0,0 @@
-import FileInput from "@formbricks/ui/FileInput";
-import { TSurvey } from "@formbricks/types/surveys";
-
-interface ImageSurveyBgBgProps {
-  localSurvey?: TSurvey;
-  handleBgChange: (url: string, bgType: string) => void;
-}
-
-export default function ImageSurveyBg({ localSurvey, handleBgChange }: ImageSurveyBgBgProps) {
-  const isUrl = (str: string) => {
-    try {
-      new URL(str);
-      return true;
-    } catch (error) {
-      return false;
-    }
-  };
-
-  const fileUrl = isUrl(localSurvey?.styling?.background?.bg ?? "")
-    ? localSurvey?.styling?.background?.bg ?? ""
-    : "";
-
-  return (
-    <div className="mb-2 mt-4 w-full rounded-lg border bg-slate-50 p-4">
-      <div className="flex w-full items-center justify-center">
-        <FileInput
-          id="survey-bg-file-input"
-          allowedFileExtensions={["png", "jpeg", "jpg"]}
-          environmentId={localSurvey?.environmentId}
-          onFileUpload={(url: string[]) => {
-            if (url.length > 0) {
-              handleBgChange(url[0], "image");
-            } else {
-              handleBgChange("#ffff", "color");
-            }
-          }}
-          fileUrl={fileUrl}
-        />
-      </div>
-    </div>
-  );
-}

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SettingsView.tsx

@@ -18,7 +18,6 @@ interface SettingsViewProps {
   attributeClasses: TAttributeClass[];
   responseCount: number;
   membershipRole?: TMembershipRole;
-  colours: string[];
 }
 
 export default function SettingsView({
@@ -29,7 +28,6 @@ export default function SettingsView({
   attributeClasses,
   responseCount,
   membershipRole,
-  colours,
 }: SettingsViewProps) {
   return (
     <div className="mt-12 space-y-3 p-5">
@@ -62,7 +60,7 @@ export default function SettingsView({
         environmentId={environment.id}
       />
 
-      <StylingCard localSurvey={localSurvey} setLocalSurvey={setLocalSurvey} colours={colours} />
+      <StylingCard localSurvey={localSurvey} setLocalSurvey={setLocalSurvey} />
     </div>
   );
 }

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/StylingCard.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { TPlacement } from "@formbricks/types/common";
-import { TSurvey, TSurveyBackgroundBgType } from "@formbricks/types/surveys";
+import { TSurvey } from "@formbricks/types/surveys";
 import { ColorPicker } from "@formbricks/ui/ColorPicker";
 import { Label } from "@formbricks/ui/Label";
 import { Switch } from "@formbricks/ui/Switch";
@@ -9,28 +9,18 @@ import { CheckCircleIcon } from "@heroicons/react/24/solid";
 import * as Collapsible from "@radix-ui/react-collapsible";
 import { useState } from "react";
 import Placement from "./Placement";
-import SurveyBgSelectorTab from "./SurveyBgSelectorTab";
 
 interface StylingCardProps {
   localSurvey: TSurvey;
   setLocalSurvey: React.Dispatch<React.SetStateAction<TSurvey>>;
-  colours: string[];
 }
 
-export default function StylingCard({ localSurvey, setLocalSurvey, colours }: StylingCardProps) {
+export default function StylingCard({ localSurvey, setLocalSurvey }: StylingCardProps) {
   const [open, setOpen] = useState(false);
 
-  const { type, productOverwrites, styling } = localSurvey;
+  const { type, productOverwrites } = localSurvey;
   const { brandColor, clickOutsideClose, darkOverlay, placement, highlightBorderColor } =
     productOverwrites ?? {};
-  const { bg, bgType, brightness } = styling?.background ?? {};
-
-  const [inputValue, setInputValue] = useState(100);
-
-  const handleInputChange = (e) => {
-    setInputValue(e.target.value);
-    handleBrightnessChange(parseInt(e.target.value));
-  };
 
   const togglePlacement = () => {
     setLocalSurvey({
@@ -38,8 +28,6 @@ export default function StylingCard({ localSurvey, setLocalSurvey, colours }: St
       productOverwrites: {
         ...localSurvey.productOverwrites,
         placement: !!placement ? null : "bottomRight",
-        clickOutsideClose: false,
-        darkOverlay: false,
       },
     });
   };
@@ -54,34 +42,6 @@ export default function StylingCard({ localSurvey, setLocalSurvey, colours }: St
     });
   };
 
-  const toggleBackgroundColor = () => {
-    setLocalSurvey({
-      ...localSurvey,
-      styling: {
-        ...localSurvey.styling,
-        background: {
-          ...localSurvey.styling?.background,
-          bg: !!bg ? undefined : "#ffff",
-          bgType: !!bg ? undefined : "color",
-        },
-      },
-    });
-  };
-
-  const toggleBrightness = () => {
-    setLocalSurvey({
-      ...localSurvey,
-      styling: {
-        ...localSurvey.styling,
-        background: {
-          ...localSurvey.styling?.background,
-          brightness: !!brightness ? undefined : 100,
-        },
-      },
-    });
-    setInputValue(100);
-  };
-
   const toggleHighlightBorderColor = () => {
     setLocalSurvey({
       ...localSurvey,
@@ -102,35 +62,6 @@ export default function StylingCard({ localSurvey, setLocalSurvey, colours }: St
     });
   };
 
-  const handleBgChange = (color: string, type: TSurveyBackgroundBgType) => {
-    setInputValue(100);
-    setLocalSurvey({
-      ...localSurvey,
-      styling: {
-        ...localSurvey.styling,
-        background: {
-          ...localSurvey.styling?.background,
-          bg: color,
-          bgType: type,
-          brightness: undefined,
-        },
-      },
-    });
-  };
-
-  const handleBrightnessChange = (percent: number) => {
-    setLocalSurvey({
-      ...localSurvey,
-      styling: {
-        ...(localSurvey.styling || {}),
-        background: {
-          ...localSurvey.styling?.background,
-          brightness: percent,
-        },
-      },
-    });
-  };
-
   const handleBorderColorChange = (color: string) => {
     setLocalSurvey({
       ...localSurvey,
@@ -212,66 +143,6 @@ export default function StylingCard({ localSurvey, setLocalSurvey, colours }: St
               </div>
             )}
           </div>
-          {type == "link" && (
-            <>
-              {/* Background */}
-              <div className="p-3">
-                <div className="ml-2 flex items-center space-x-1">
-                  <Switch id="autoCompleteBg" checked={!!bg} onCheckedChange={toggleBackgroundColor} />
-                  <Label htmlFor="autoCompleteBg" className="cursor-pointer">
-                    <div className="ml-2">
-                      <h3 className="text-sm font-semibold text-slate-700">Change Background</h3>
-                      <p className="text-xs font-normal text-slate-500">
-                        Pick a background from our library or upload your own.
-                      </p>
-                    </div>
-                  </Label>
-                </div>
-                {bg && (
-                  <SurveyBgSelectorTab
-                    localSurvey={localSurvey}
-                    handleBgChange={handleBgChange}
-                    colours={colours}
-                    bgType={bgType}
-                  />
-                )}
-              </div>
-              {/* Overlay */}
-              <div className="p-3">
-                <div className="ml-2 flex items-center space-x-1">
-                  <Switch
-                    id="autoCompleteOverlay"
-                    checked={!!brightness}
-                    onCheckedChange={toggleBrightness}
-                  />
-                  <Label htmlFor="autoCompleteOverlay" className="cursor-pointer">
-                    <div className="ml-2">
-                      <h3 className="text-sm font-semibold text-slate-700">Background Overlay</h3>
-                      <p className="text-xs font-normal text-slate-500">
-                        Darken or lighten background of your choice.
-                      </p>
-                    </div>
-                  </Label>
-                </div>
-                {brightness && (
-                  <div>
-                    <div className="mt-4 flex flex-col justify-center rounded-lg border bg-slate-50 p-4 px-8">
-                      <h3 className="mb-4 text-sm font-semibold text-slate-700">Transparency</h3>
-                      <input
-                        id="small-range"
-                        type="range"
-                        min="1"
-                        max="200"
-                        value={inputValue}
-                        onChange={handleInputChange}
-                        className="range-sm mb-6 h-1 w-full cursor-pointer appearance-none rounded-lg bg-gray-200 dark:bg-gray-700"
-                      />
-                    </div>
-                  </div>
-                )}
-              </div>
-            </>
-          )}
           {/* positioning */}
           {type !== "link" && (
             <div className="p-3 ">

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyBgSelectorTab.tsx

@@ -1,61 +0,0 @@
-import { TSurvey } from "@formbricks/types/surveys";
-import { useState } from "react";
-import AnimatedSurveyBg from "./AnimatedSurveyBg";
-import ColorSurveyBg from "./ColorSurveyBg";
-import ImageSurveyBg from "./ImageSurveyBg";
-
-interface SurveyBgSelectorTabProps {
-  localSurvey: TSurvey;
-  handleBgChange: (bg: string, bgType: string) => void;
-  colours: string[];
-  bgType: string | null | undefined;
-}
-
-const TabButton = ({ isActive, onClick, children }) => (
-  <button
-    className={`w-1/4 rounded-md p-2 text-sm font-medium leading-none text-slate-800 ${
-      isActive ? "bg-white shadow-sm" : ""
-    }`}
-    onClick={onClick}>
-    {children}
-  </button>
-);
-
-export default function SurveyBgSelectorTab({
-  localSurvey,
-  handleBgChange,
-  colours,
-  bgType,
-}: SurveyBgSelectorTabProps) {
-  const [tab, setTab] = useState(bgType || "image");
-
-  const renderContent = () => {
-    switch (tab) {
-      case "image":
-        return <ImageSurveyBg localSurvey={localSurvey} handleBgChange={handleBgChange} />;
-      case "animation":
-        return <AnimatedSurveyBg localSurvey={localSurvey} handleBgChange={handleBgChange} />;
-      case "color":
-        return <ColorSurveyBg localSurvey={localSurvey} handleBgChange={handleBgChange} colours={colours} />;
-      default:
-        return null;
-    }
-  };
-
-  return (
-    <div className="mt-4 flex flex-col items-center justify-center rounded-lg border bg-slate-50 p-4 px-8">
-      <div className="flex w-full items-center justify-between rounded-lg border border-slate-300 bg-slate-50 px-6 py-1.5">
-        <TabButton isActive={tab === "image"} onClick={() => setTab("image")}>
-          Image
-        </TabButton>
-        <TabButton isActive={tab === "animation"} onClick={() => setTab("animation")}>
-          Animation
-        </TabButton>
-        <TabButton isActive={tab === "color"} onClick={() => setTab("color")}>
-          Color
-        </TabButton>
-      </div>
-      {renderContent()}
-    </div>
-  );
-}

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyEditor.tsx

@@ -23,7 +23,6 @@ interface SurveyEditorProps {
   attributeClasses: TAttributeClass[];
   responseCount: number;
   membershipRole?: TMembershipRole;
-  colours: string[];
 }
 
 export default function SurveyEditor({
@@ -34,7 +33,6 @@ export default function SurveyEditor({
   attributeClasses,
   responseCount,
   membershipRole,
-  colours,
 }: SurveyEditorProps): JSX.Element {
   const [activeView, setActiveView] = useState<"questions" | "settings">("questions");
   const [activeQuestionId, setActiveQuestionId] = useState<string | null>(null);
@@ -101,7 +99,6 @@ export default function SurveyEditor({
                 attributeClasses={attributeClasses}
                 responseCount={responseCount}
                 membershipRole={membershipRole}
-                colours={colours}
               />
             )}
           </main>

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyMenuBar.tsx

@@ -16,7 +16,6 @@ import toast from "react-hot-toast";
 import { validateQuestion } from "./Validation";
 import { deleteSurveyAction, updateSurveyAction } from "../actions";
 import SurveyStatusDropdown from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/SurveyStatusDropdown";
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@formbricks/ui/Tooltip";
 
 interface SurveyMenuBarProps {
   localSurvey: TSurvey;
@@ -49,7 +48,6 @@ export default function SurveyMenuBar({
   const [isSurveySaving, setIsSurveySaving] = useState(false);
   const [isDeleting, setIsDeleting] = useState(false);
   const [isSaving, setIsSaving] = useState(false);
-  const cautionText = "This survey received responses, make changes with caution.";
 
   let faultyQuestions: String[] = [];
 
@@ -224,11 +222,6 @@ export default function SurveyMenuBar({
         const { isDraft, ...rest } = question;
         return rest;
       }),
-      attributeFilters: localSurvey.attributeFilters.filter((attributeFilter) => {
-        if (attributeFilter.attributeClassId && attributeFilter.value) {
-          return true;
-        }
-      }),
     };
 
     if (!validateSurvey(localSurvey)) {
@@ -259,14 +252,6 @@ export default function SurveyMenuBar({
     }
   };
 
-  function containsEmptyTriggers() {
-    return (
-      localSurvey.type === "web" &&
-      localSurvey.triggers &&
-      (localSurvey.triggers[0] === "" || localSurvey.triggers.length === 0)
-    );
-  }
-
   return (
     <>
       {environment?.type === "development" && (
@@ -297,20 +282,11 @@ export default function SurveyMenuBar({
           />
         </div>
         {responseCount > 0 && (
-          <div className="ju flex items-center rounded-lg border border-amber-200 bg-amber-100 p-2 text-amber-700 shadow-sm lg:mx-auto">
-            <TooltipProvider delayDuration={50}>
-              <Tooltip>
-                <TooltipTrigger>
-                  <ExclamationTriangleIcon className=" h-5 w-5 text-amber-400" />
-                </TooltipTrigger>
-                <TooltipContent side={"top"} className="lg:hidden">
-                  <p className="py-2 text-center text-xs text-slate-500 dark:text-slate-400 ">
-                    {cautionText}
-                  </p>
-                </TooltipContent>
-              </Tooltip>
-            </TooltipProvider>
-            <p className=" hidden pl-1 text-xs md:text-sm lg:block">{cautionText}</p>
+          <div className="mx-auto flex items-center rounded-full border border-amber-200 bg-amber-100 p-2 text-amber-700 shadow-sm">
+            <ExclamationTriangleIcon className=" h-5 w-5 text-amber-400" />
+            <p className=" pl-1 text-xs lg:text-sm">
+              This survey received responses, make changes with caution.
+            </p>
           </div>
         )}
         <div className="mt-3 flex sm:ml-4 sm:mt-0">
@@ -322,7 +298,7 @@ export default function SurveyMenuBar({
             />
           </div>
           <Button
-            disabled={isSurveyPublishing || containsEmptyTriggers()}
+            disabled={isSurveyPublishing}
             variant={localSurvey.status === "draft" ? "secondary" : "darkCTA"}
             className="mr-3"
             loading={isSurveySaving}
@@ -342,7 +318,11 @@ export default function SurveyMenuBar({
           )}
           {localSurvey.status === "draft" && !audiencePrompt && (
             <Button
-              disabled={isSurveySaving || containsEmptyTriggers()}
+              disabled={
+                localSurvey.type === "web" &&
+                localSurvey.triggers &&
+                (localSurvey.triggers[0] === "" || localSurvey.triggers.length === 0 || isSurveySaving)
+              }
               variant="darkCTA"
               loading={isSurveyPublishing}
               onClick={async () => {

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/page.tsx

@@ -12,7 +12,6 @@ import { getSurvey } from "@formbricks/lib/survey/service";
 import { getTeamByEnvironmentId } from "@formbricks/lib/team/service";
 import { ErrorComponent } from "@formbricks/ui/ErrorComponent";
 import { getServerSession } from "next-auth";
-import { colours } from "@formbricks/lib/constants";
 import SurveyEditor from "./components/SurveyEditor";
 
 export const generateMetadata = async ({ params }) => {
@@ -68,7 +67,6 @@ export default async function SurveysEditPage({ params }) {
         attributeClasses={attributeClasses}
         responseCount={responseCount}
         membershipRole={currentUserMembership?.role}
-        colours={colours}
       />
     </>
   );

apps/web/app/(app)/environments/[environmentId]/surveys/components/Modal.tsx

@@ -56,7 +56,7 @@ export default function Modal({
         ref={modalRef}
         style={highlightBorderColorStyle}
         className={cn(
-          "pointer-events-auto absolute h-auto max-h-[90%] w-full max-w-sm overflow-y-auto rounded-lg bg-white shadow-lg ring-1 ring-black ring-opacity-5 transition-all duration-500 ease-in-out ",
+          "pointer-events-auto absolute h-fit max-h-[90%] w-full max-w-sm overflow-y-auto rounded-lg bg-white shadow-lg ring-1 ring-black ring-opacity-5 transition-all duration-500 ease-in-out",
           previewMode === "desktop" ? getPlacementStyle(placement) : "max-w-full ",
           slidingAnimationClass
         )}>

apps/web/app/(app)/environments/[environmentId]/surveys/components/PreviewSurvey.tsx

@@ -2,7 +2,7 @@
 
 import Modal from "@/app/(app)/environments/[environmentId]/surveys/components/Modal";
 import TabOption from "@/app/(app)/environments/[environmentId]/surveys/components/TabOption";
-import { MediaBackground } from "@/app/s/[surveyId]/components/MediaBackground";
+
 import type { TEnvironment } from "@formbricks/types/environment";
 import type { TProduct } from "@formbricks/types/product";
 import { TUploadFileConfig } from "@formbricks/types/storage";
@@ -155,20 +155,6 @@ export default function PreviewSurvey({
     setActiveQuestionId(survey.welcomeCard.enabled ? "start" : survey?.questions[0]?.id);
   }
 
-  function animationTrigger() {
-    let storePreviewMode = previewMode;
-    setPreviewMode("null");
-    setTimeout(() => {
-      setPreviewMode(storePreviewMode);
-    }, 10);
-  }
-
-  useEffect(() => {
-    if (survey.styling?.background?.bgType === "animation") {
-      animationTrigger();
-    }
-  }, [survey.styling?.background?.bg]);
-
   useEffect(() => {
     if (environment && environment.widgetSetupCompleted) {
       setWidgetSetupCompleted(true);
@@ -208,7 +194,7 @@ export default function PreviewSurvey({
             <div className="absolute right-0 top-0 m-2">
               <ResetProgressButton resetQuestionProgress={resetQuestionProgress} />
             </div>
-            <MediaBackground survey={survey} ContentRef={ContentRef} isMobilePreview>
+            <div className="relative h-[90%] max-h-[40rem] w-80 overflow-hidden rounded-[3rem] border-8 border-slate-500 bg-slate-400">
               {/* below element is use to create notch for the mobile device mockup   */}
               <div className="absolute left-1/2 right-1/2 top-0 z-20 h-4 w-1/2 -translate-x-1/2 transform rounded-b-md bg-slate-500"></div>
               {previewType === "modal" ? (
@@ -228,19 +214,25 @@ export default function PreviewSurvey({
                   />
                 </Modal>
               ) : (
-                <div className="relative z-10 w-full max-w-md  px-4">
-                  <SurveyInline
-                    survey={survey}
-                    brandColor={brandColor}
-                    activeQuestionId={activeQuestionId || undefined}
-                    isBrandingEnabled={product.linkSurveyBranding}
-                    onActiveQuestionChange={setActiveQuestionId}
-                    onFileUpload={onFileUpload}
-                    responseCount={42}
-                  />
+                <div
+                  className="absolute top-0 z-10 flex h-full w-full flex-grow flex-col overflow-y-auto"
+                  ref={ContentRef}>
+                  <div className="flex w-full flex-grow flex-col items-center justify-center bg-white py-6">
+                    <div className="w-full max-w-md px-4">
+                      <SurveyInline
+                        survey={survey}
+                        brandColor={brandColor}
+                        activeQuestionId={activeQuestionId || undefined}
+                        isBrandingEnabled={product.linkSurveyBranding}
+                        onActiveQuestionChange={setActiveQuestionId}
+                        onFileUpload={onFileUpload}
+                        responseCount={42}
+                      />
+                    </div>
+                  </div>
                 </div>
               )}
-            </MediaBackground>
+            </div>
           </>
         )}
         {previewMode === "desktop" && (
@@ -295,20 +287,22 @@ export default function PreviewSurvey({
                 />
               </Modal>
             ) : (
-              <MediaBackground survey={survey} ContentRef={ContentRef} isEditorView>
-                <div className="z-0 w-full  max-w-md rounded-lg p-4">
-                  <SurveyInline
-                    survey={survey}
-                    brandColor={brandColor}
-                    activeQuestionId={activeQuestionId || undefined}
-                    isBrandingEnabled={product.linkSurveyBranding}
-                    onActiveQuestionChange={setActiveQuestionId}
-                    isRedirectDisabled={true}
-                    onFileUpload={onFileUpload}
-                    responseCount={42}
-                  />
+              <div className="flex flex-grow flex-col overflow-y-auto rounded-b-lg" ref={ContentRef}>
+                <div className="flex w-full flex-grow flex-col items-center justify-center bg-white p-4 py-6">
+                  <div className="w-full max-w-md">
+                    <SurveyInline
+                      survey={survey}
+                      brandColor={brandColor}
+                      activeQuestionId={activeQuestionId || undefined}
+                      isBrandingEnabled={product.linkSurveyBranding}
+                      onActiveQuestionChange={setActiveQuestionId}
+                      isRedirectDisabled={true}
+                      onFileUpload={onFileUpload}
+                      responseCount={42}
+                    />
+                  </div>
                 </div>
-              </MediaBackground>
+              </div>
             )}
           </div>
         )}

apps/web/app/(app)/environments/[environmentId]/surveys/templates/templates.ts

@@ -2526,5 +2526,4 @@ export const minimalSurvey: TSurvey = {
   },
   productOverwrites: null,
   singleUse: null,
-  styling: null,
 };

apps/web/app/api/cron/report-usage/route.ts

@@ -1,7 +1,7 @@
 import { responses } from "@/app/lib/api/response";
 import { reportUsageToStripe } from "@formbricks/ee/billing/lib/reportUsage";
 import { ProductFeatureKeys } from "@formbricks/ee/billing/lib/constants";
-import { CRON_SECRET, IS_FORMBRICKS_CLOUD } from "@formbricks/lib/constants";
+import { CRON_SECRET } from "@formbricks/lib/constants";
 import {
   getMonthlyActiveTeamPeopleCount,
   getMonthlyTeamResponseCount,
@@ -17,10 +17,6 @@ async function reportTeamUsage(team: TTeam) {
     return;
   }
 
-  if (!IS_FORMBRICKS_CLOUD) {
-    return;
-  }
-
   let calculateResponses =
     team.billing.features.inAppSurvey.status !== "inactive" && !team.billing.features.inAppSurvey.unlimited;
   let calculatePeople =

apps/web/app/s/[surveyId]/components/LegalFooter.tsx

@@ -1,28 +1,19 @@
 import { IMPRINT_URL, PRIVACY_URL } from "@formbricks/lib/constants";
 import Link from "next/link";
 
-interface LegalFooterProps {
-  bgColor?: string | null;
-}
-
-export default function LegalFooter({ bgColor }: LegalFooterProps) {
+export default function LegalFooter() {
   if (!IMPRINT_URL && !PRIVACY_URL) return null;
-
   return (
-    <div
-      className={`fixed bottom-0 h-12 w-full`}
-      style={{
-        backgroundColor: `${bgColor}`,
-      }}>
-      <div className="mx-auto max-w-lg p-3 text-center text-xs text-slate-400">
+    <div className="h-10 w-full border-t border-slate-200">
+      <div className="mx-auto max-w-lg p-3 text-center text-sm text-slate-400">
         {IMPRINT_URL && (
-          <Link href={IMPRINT_URL} target="_blank" className="hover:underline">
+          <Link href={IMPRINT_URL} target="_blank">
             Imprint
           </Link>
         )}
-        {IMPRINT_URL && PRIVACY_URL && <span className="px-2">|</span>}
+        {IMPRINT_URL && PRIVACY_URL && <span> | </span>}
         {PRIVACY_URL && (
-          <Link href={PRIVACY_URL} target="_blank" className="hover:underline">
+          <Link href={PRIVACY_URL} target="_blank">
             Privacy Policy
           </Link>
         )}

apps/web/app/s/[surveyId]/components/LinkSurvey.tsx

@@ -1,20 +1,20 @@
 "use client";
 
+import ContentWrapper from "@formbricks/ui/ContentWrapper";
+import { SurveyInline } from "@formbricks/ui/Survey";
 import SurveyLinkUsed from "@/app/s/[surveyId]/components/SurveyLinkUsed";
 import VerifyEmail from "@/app/s/[surveyId]/components/VerifyEmail";
 import { getPrefillResponseData } from "@/app/s/[surveyId]/lib/prefilling";
-import { FormbricksAPI } from "@formbricks/api";
 import { ResponseQueue } from "@formbricks/lib/responseQueue";
 import { SurveyState } from "@formbricks/lib/surveyState";
 import { TProduct } from "@formbricks/types/product";
 import { TResponse, TResponseData, TResponseUpdate } from "@formbricks/types/responses";
-import { TUploadFileConfig } from "@formbricks/types/storage";
 import { TSurvey } from "@formbricks/types/surveys";
-import ContentWrapper from "@formbricks/ui/ContentWrapper";
-import { SurveyInline } from "@formbricks/ui/Survey";
 import { ArrowPathIcon } from "@heroicons/react/24/solid";
 import { useSearchParams } from "next/navigation";
 import { useEffect, useMemo, useState } from "react";
+import { FormbricksAPI } from "@formbricks/api";
+import { TUploadFileConfig } from "@formbricks/types/storage";
 
 interface LinkSurveyProps {
   survey: TSurvey;
@@ -119,7 +119,7 @@ export default function LinkSurvey({
 
   return (
     <>
-      <ContentWrapper className="h-full w-full p-0 md:max-w-md">
+      <ContentWrapper className="h-full w-full p-0 md:max-w-lg">
         {isPreview && (
           <div className="fixed left-0 top-0 flex w-full items-center justify-between bg-slate-600 p-2 px-4 text-center text-sm text-white shadow-sm">
             <div />

apps/web/app/s/[surveyId]/components/MediaBackground.tsx

@@ -1,92 +0,0 @@
-"use client";
-
-import { TSurvey } from "@formbricks/types/surveys";
-import React from "react";
-
-interface MediaBackgroundProps {
-  children: React.ReactNode;
-  survey: TSurvey;
-  isEditorView?: boolean;
-  isMobilePreview?: boolean;
-  ContentRef?: React.RefObject<HTMLDivElement>;
-}
-
-export const MediaBackground: React.FC<MediaBackgroundProps> = ({
-  children,
-  survey,
-  isEditorView = false,
-  isMobilePreview = false,
-  ContentRef,
-}) => {
-  const getFilterStyle = () => {
-    return survey.styling?.background?.brightness
-      ? `brightness(${survey.styling?.background?.brightness}%)`
-      : "brightness(100%)";
-  };
-
-  const renderBackground = () => {
-    const filterStyle = getFilterStyle();
-    const baseClasses = "absolute inset-0 h-full w-full";
-
-    switch (survey.styling?.background?.bgType) {
-      case "color":
-        return (
-          <div
-            className={`${baseClasses}`}
-            style={{ backgroundColor: survey.styling?.background?.bg || "#ffff", filter: `${filterStyle}` }}
-          />
-        );
-      case "animation":
-        return (
-          <video
-            muted
-            loop
-            autoPlay
-            className={`${baseClasses} object-cover`}
-            style={{ filter: `${filterStyle}` }}>
-            <source src={survey.styling?.background?.bg || ""} type="video/mp4" />
-          </video>
-        );
-      case "image":
-        return (
-          <div
-            className={`${baseClasses} bg-cover bg-center`}
-            style={{ backgroundImage: `url(${survey.styling?.background?.bg})`, filter: `${filterStyle}` }}
-          />
-        );
-      default:
-        return <div className={`${baseClasses} bg-white`} />;
-    }
-  };
-
-  const renderContent = () => (
-    <div className="absolute flex h-full w-full items-center justify-center overflow-y-auto">{children}</div>
-  );
-
-  if (isMobilePreview) {
-    return (
-      <div
-        ref={ContentRef}
-        className={`relative h-[90%] max-h-[40rem] w-80 overflow-hidden rounded-3xl border-8 border-slate-500 ${getFilterStyle()}`}>
-        {renderBackground()}
-        {renderContent()}
-      </div>
-    );
-  } else if (isEditorView) {
-    return (
-      <div ref={ContentRef} className="flex flex-grow flex-col overflow-y-auto rounded-b-lg">
-        <div className="relative flex w-full flex-grow flex-col items-center justify-center p-4 py-6">
-          {renderBackground()}
-          <div className="flex h-full w-full items-center justify-center">{children}</div>
-        </div>
-      </div>
-    );
-  } else {
-    return (
-      <div className="flex min-h-screen flex-col items-center justify-center px-2">
-        {renderBackground()}
-        <div className="relative w-full">{children}</div>
-      </div>
-    );
-  }
-};

apps/web/app/s/[surveyId]/components/PinScreen.tsx

@@ -1,15 +1,15 @@
 "use client";
 
-import { validateSurveyPinAction } from "@/app/s/[surveyId]/actions";
-import LinkSurvey from "@/app/s/[surveyId]/components/LinkSurvey";
-import { TSurveyPinValidationResponseError } from "@/app/s/[surveyId]/types";
-import { cn } from "@formbricks/lib/cn";
+import type { NextPage } from "next";
 import { TProduct } from "@formbricks/types/product";
 import { TResponse } from "@formbricks/types/responses";
-import { TSurvey } from "@formbricks/types/surveys";
 import { OTPInput } from "@formbricks/ui/OTPInput";
-import type { NextPage } from "next";
 import { useCallback, useEffect, useState } from "react";
+import { validateSurveyPinAction } from "@/app/s/[surveyId]/actions";
+import { TSurvey } from "@formbricks/types/surveys";
+import { TSurveyPinValidationResponseError } from "@/app/s/[surveyId]/types";
+import LinkSurvey from "@/app/s/[surveyId]/components/LinkSurvey";
+import { cn } from "@formbricks/lib/cn";
 
 interface LinkSurveyPinScreenProps {
   surveyId: string;

apps/web/app/s/[surveyId]/layout.tsx

@@ -1,3 +1,10 @@
+import LegalFooter from "@/app/s/[surveyId]/components/LegalFooter";
+
 export default async function SurveyLayout({ children }) {
-  return <div>{children}</div>;
+  return (
+    <div className="flex h-full flex-col justify-between bg-white">
+      <div className="h-full overflow-y-auto">{children}</div>
+      <LegalFooter />
+    </div>
+  );
 }

apps/web/app/s/[surveyId]/page.tsx

@@ -1,9 +1,7 @@
 export const revalidate = REVALIDATION_INTERVAL;
 
 import { validateSurveySingleUseId } from "@/app/lib/singleUseSurveys";
-import LegalFooter from "@/app/s/[surveyId]/components/LegalFooter";
 import LinkSurvey from "@/app/s/[surveyId]/components/LinkSurvey";
-import { MediaBackground } from "@/app/s/[surveyId]/components/MediaBackground";
 import PinScreen from "@/app/s/[surveyId]/components/PinScreen";
 import SurveyInactive from "@/app/s/[surveyId]/components/SurveyInactive";
 import { checkValidity } from "@/app/s/[surveyId]/lib/prefilling";
@@ -14,7 +12,6 @@ import { getResponseBySingleUseId } from "@formbricks/lib/response/service";
 import { getSurvey } from "@formbricks/lib/survey/service";
 import { TResponse } from "@formbricks/types/responses";
 import type { Metadata } from "next";
-
 import { notFound } from "next/navigation";
 import { getEmailVerificationStatus } from "./lib/helpers";
 import { ZId } from "@formbricks/types/environment";
@@ -186,22 +183,17 @@ export default async function LinkSurveyPage({ params, searchParams }: LinkSurve
     );
   }
 
-  return survey ? (
-    <div>
-      <MediaBackground survey={survey}>
-        <LinkSurvey
-          survey={survey}
-          product={product}
-          userId={userId}
-          emailVerificationStatus={emailVerificationStatus}
-          prefillAnswer={isPrefilledAnswerValid ? prefillAnswer : null}
-          singleUseId={isSingleUseSurvey ? singleUseId : undefined}
-          singleUseResponse={singleUseResponse ? singleUseResponse : undefined}
-          webAppUrl={WEBAPP_URL}
-          responseCount={survey.welcomeCard.showResponseCount ? responseCount : undefined}
-        />
-      </MediaBackground>
-      <LegalFooter bgColor={survey.styling?.background?.bg || "#ffff"} />
-    </div>
-  ) : null;
+  return (
+    <LinkSurvey
+      survey={survey}
+      product={product}
+      userId={userId}
+      emailVerificationStatus={emailVerificationStatus}
+      prefillAnswer={isPrefilledAnswerValid ? prefillAnswer : null}
+      singleUseId={isSingleUseSurvey ? singleUseId : undefined}
+      singleUseResponse={singleUseResponse ? singleUseResponse : undefined}
+      webAppUrl={WEBAPP_URL}
+      responseCount={survey.welcomeCard.showResponseCount ? responseCount : undefined}
+    />
+  );
 }

apps/web/next.config.mjs

@@ -4,11 +4,6 @@ import "@formbricks/lib/env.mjs";
 
 /** @type {import('next').NextConfig} */
 
-function getHostname(url) {
-  const urlObj = new URL(url);
-  return urlObj.hostname;
-}
-
 const nextConfig = {
   assetPrefix: process.env.ASSET_PREFIX_URL || undefined,
   output: "standalone",
@@ -112,10 +107,6 @@ if (process.env.WEBAPP_URL) {
   nextConfig.experimental.serverActions = {
     allowedOrigins: [process.env.WEBAPP_URL.replace(/https?:\/\//, "")],
   };
-  nextConfig.images.remotePatterns.push({
-    protocol: "https",
-    hostname: getHostname(process.env.WEBAPP_URL),
-  });
 }
 
 const sentryOptions = {

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formbricks/web",
-  "version": "1.3.5",
+  "version": "1.3.4",
   "private": true,
   "scripts": {
     "clean": "rimraf .turbo node_modules .next",
@@ -25,13 +25,13 @@
     "@paralleldrive/cuid2": "^2.2.2",
     "@radix-ui/react-collapsible": "^1.0.3",
     "@radix-ui/react-dropdown-menu": "^2.0.6",
-    "@react-email/components": "^0.0.12",
-    "@sentry/nextjs": "^7.85.0",
+    "@react-email/components": "^0.0.11",
+    "@sentry/nextjs": "^7.84.0",
     "@vercel/og": "^0.5.20",
     "bcryptjs": "^2.4.3",
     "dotenv": "^16.3.1",
     "encoding": "^0.1.13",
-    "framer-motion": "10.16.14",
+    "framer-motion": "10.16.9",
     "googleapis": "^129.0.0",
     "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
@@ -41,13 +41,13 @@
     "next": "13.5.6",
     "nodemailer": "^6.9.7",
     "otplib": "^12.0.1",
-    "posthog-js": "^1.93.6",
+    "posthog-js": "^1.93.3",
     "prismjs": "^1.29.0",
     "qrcode": "^1.5.3",
     "react": "18.2.0",
     "react-beautiful-dnd": "^13.1.1",
     "react-dom": "18.2.0",
-    "react-email": "^1.10.0",
+    "react-email": "^1.9.5",
     "react-hook-form": "^7.48.2",
     "react-hot-toast": "^2.4.1",
     "react-icons": "^4.12.0",

apps/web/playwright/onboarding.spec.ts

@@ -1,45 +0,0 @@
-import { getTeam, getUser, signUpAndLogin } from "./utils";
-import { test, expect } from "@playwright/test";
-
-const { role, productName, useCase } = getTeam();
-
-test.describe("Onboarding Flow Test", async () => {
-  test.beforeEach(async ({ page }) => {
-    const { name, email, password } = getUser();
-    await signUpAndLogin(page, name, email, password);
-    await page.waitForURL("/onboarding");
-    await expect(page).toHaveURL("/onboarding");
-  });
-
-  test("Step by Step", async ({ page }) => {
-    await page.getByRole("button", { name: "Begin (1 min)" }).click();
-    await page.getByLabel(role).check();
-    await page.getByRole("button", { name: "Next" }).click();
-
-    await expect(page.getByLabel(useCase)).toBeVisible();
-    await page.getByLabel(useCase).check();
-    await page.getByRole("button", { name: "Next" }).click();
-
-    await expect(page.getByPlaceholder("e.g. Formbricks")).toBeVisible();
-    await page.getByPlaceholder("e.g. Formbricks").fill(productName);
-
-    await page.locator(".h-6").click();
-    await page.getByLabel("Hue").click();
-
-    await page.locator("div").filter({ hasText: "Create your team's product." }).nth(1).click();
-    await page.getByRole("button", { name: "Done" }).click();
-
-    await page.waitForURL(/\/environments\/[^/]+\/surveys/);
-    await expect(page).toHaveURL(/\/environments\/[^/]+\/surveys/);
-    await expect(page.getByText(productName)).toBeVisible();
-  });
-
-  test("Skip", async ({ page }) => {
-    await page.getByRole("button", { name: "I'll do it later" }).click();
-    await page.getByRole("button", { name: "I'll do it later" }).click();
-
-    await page.waitForURL(/\/environments\/[^/]+\/surveys/);
-    await expect(page).toHaveURL(/\/environments\/[^/]+\/surveys/);
-    await expect(page.getByText("My Product")).toBeVisible();
-  });
-});

apps/web/playwright/signup.spec.ts

@@ -1,61 +0,0 @@
-import { getUser } from "./utils";
-import { test, expect } from "@playwright/test";
-
-const { name, email, password } = getUser();
-
-test.describe("Email Signup Flow Test", async () => {
-  test.describe.configure({ mode: "serial" });
-  test.beforeEach(async ({ page }) => {
-    await page.goto("/auth/signup");
-    await page.getByText("Continue with Email").click();
-  });
-
-  test("Valid User", async ({ page }) => {
-    await page.fill('input[name="name"]', name);
-    await page.fill('input[name="email"]', email);
-    await page.fill('input[name="password"]', password);
-    await page.press('input[name="password"]', "Enter");
-    await page.waitForURL("/auth/signup-without-verification-success");
-    await expect(page).toHaveURL("/auth/signup-without-verification-success");
-  });
-
-  test("Email is taken", async ({ page }) => {
-    await page.fill('input[name="name"]', name);
-    await page.fill('input[name="email"]', email);
-    await page.fill('input[name="password"]', password);
-    await page.press('input[name="password"]', "Enter");
-
-    let alertMessage = "user with this email address already exists";
-    await (await page.waitForSelector(`text=${alertMessage}`)).isVisible();
-  });
-
-  test("No Name", async ({ page }) => {
-    await page.fill('input[name="name"]', "");
-    await page.fill('input[name="email"]', email);
-    await page.fill('input[name="password"]', password);
-    await page.press('input[name="password"]', "Enter");
-
-    const button = page.getByText("Continue with Email");
-    await expect(button).toBeDisabled();
-  });
-
-  test("Invalid Email", async ({ page }) => {
-    await page.fill('input[name="name"]', name);
-    await page.fill('input[name="email"]', "invalid");
-    await page.fill('input[name="password"]', password);
-    await page.press('input[name="password"]', "Enter");
-
-    const button = page.getByText("Continue with Email");
-    await expect(button).toBeDisabled();
-  });
-
-  test("Invalid Password", async ({ page }) => {
-    await page.fill('input[name="name"]', name);
-    await page.fill('input[name="email"]', email);
-    await page.fill('input[name="password"]', "invalid");
-    await page.press('input[name="password"]', "Enter");
-
-    const button = page.getByText("Continue with Email");
-    await expect(button).toBeDisabled();
-  });
-});

apps/web/playwright/survey.spec.ts

@@ -1,98 +0,0 @@
-import { getUser, login, signUpAndLogin, skipOnboarding } from "./utils";
-import { test, expect } from "@playwright/test";
-
-test.describe("Survey: Product Market Fit", async () => {
-  test.describe.configure({ mode: "serial" });
-  let url: string | null;
-  const { name, email, password } = getUser();
-
-  test("Create Survey", async ({ page }) => {
-    await signUpAndLogin(page, name, email, password);
-    await skipOnboarding(page);
-
-    await page.getByRole("heading", { name: "Product Market Fit (Superhuman)" }).click();
-    await page.getByRole("button", { name: "Continue to Settings" }).click();
-    await page.getByRole("button", { name: "Publish" }).click();
-
-    const regexPattern = /^http:\/\/localhost:3000\/s\//;
-    const urlElement = page.locator(`text=${regexPattern}`);
-
-    await expect(urlElement).toBeVisible();
-    url = await urlElement.textContent();
-    await page.getByRole("button", { name: "Close" }).click();
-  });
-
-  test("Submit Response: No", async ({ page }) => {
-    await page.goto(url!);
-
-    await expect(page.getByText("You are one of our power users! Do you have 5 minutes?")).toBeVisible();
-    await expect(page.getByText("Optional")).toBeVisible();
-
-    await page.getByRole("button", { name: "No, thanks." }).click();
-
-    await expect(page.getByText("Thank you!")).toBeVisible();
-    await expect(page.getByText("We appreciate your feedback.")).toBeVisible();
-  });
-
-  test("Submit Response: Yes", async ({ page }) => {
-    await page.goto(url!);
-
-    await expect(page.getByText("You are one of our power users! Do you have 5 minutes?")).toBeVisible();
-    await expect(page.getByText("Optional")).toBeVisible();
-
-    await page.getByRole("button", { name: "Happy to help!" }).click();
-
-    await expect(
-      page.getByText("How disappointed would you be if you could no longer use My Product?")
-    ).toBeVisible();
-    let answers = ["Not at all disappointed", "Somewhat disappointed", "Very disappointed"];
-    let answer = answers[Math.floor(Math.random() * answers.length)];
-    await page.getByText(answer).click();
-    await page.getByRole("button", { name: "Next" }).click();
-
-    await expect(page.getByText("What is your role?")).toBeVisible();
-    answers = ["Founder", "Executive", "Product Manager", "Product Owner", "Software Engineer"];
-    answer = answers[Math.floor(Math.random() * answers.length)];
-    await page.getByText(answer).click();
-    await page.getByRole("button", { name: "Next" }).click();
-
-    await expect(
-      page.getByText("What type of people do you think would most benefit from My Product?")
-    ).toBeVisible();
-    await page.getByLabel("").fill("Founders and Executives");
-    await page.getByRole("button", { name: "Next" }).click();
-
-    await expect(page.getByText("What is the main benefit you")).toBeVisible();
-    await page.getByLabel("").fill("Open Source and the UX!");
-    await page.getByRole("button", { name: "Next" }).click();
-
-    await expect(page.getByText("How can we improve My Product")).toBeVisible();
-    await page.getByLabel("").fill("More and more features, that's it! Keep shipping.");
-    await page.getByRole("button", { name: "Finish" }).click();
-
-    await expect(page.getByText("Thank you!")).toBeVisible();
-    await expect(page.getByText("We appreciate your feedback.")).toBeVisible();
-  });
-
-  test("View Responses", async ({ page }) => {
-    await login(page, email, password);
-    await page.waitForURL(/\/environments\/[^/]+\/surveys/);
-    await expect(page.getByText("Your Surveys")).toBeVisible();
-    await page.locator("li").filter({ hasText: "Link SurveyProduct Market Fit" }).getByRole("link").click();
-    await expect(page.getByText("Responses")).toBeVisible();
-    await expect(page.getByText("Product Market Fit (Superhuman)")).toBeVisible();
-    await expect(page.getByText("Displays2")).toBeVisible();
-    await page.getByRole("button", { name: "Responses100%" }).textContent();
-    await page.getByRole("link", { name: "Responses" }).click();
-    await page.waitForURL(/\/environments\/[^/]+\/surveys\/[^/]+\/responses/);
-    expect(await page.locator(".rounded-b-lg").count()).toEqual(2);
-
-    await expect(
-      page.getByText("You are one of our power users! Do you have 5 minutes?dismissed")
-    ).toBeVisible();
-
-    await expect(
-      page.getByText("You are one of our power users! Do you have 5 minutes?clicked")
-    ).toBeVisible();
-  });
-});

apps/web/playwright/utils.ts

@@ -1,65 +0,0 @@
-import { randomBytes } from "crypto";
-import { Page } from "playwright";
-import { expect } from "@playwright/test";
-
-export const getUser = () => {
-  const name = randomBytes(4).toString("hex");
-  const email = `${name}@gmail.com`;
-  const password = `Te${name}@123`;
-  return { name, email, password };
-};
-
-export const getTeam = () => {
-  let roles = ["Project Manager", "Engineer", "Founder", "Marketing Specialist"];
-  let useCases = [
-    "Increase conversion",
-    "Improve user retention",
-    "Increase user adoption",
-    "Sharpen marketing messaging",
-    "Support sales",
-  ];
-  const productName = randomBytes(8).toString("hex");
-  const role = roles[Math.floor(Math.random() * roles.length)];
-  const useCase = useCases[Math.floor(Math.random() * useCases.length)];
-  return { role, useCase, productName };
-};
-
-export const signUpAndLogin = async (
-  page: Page,
-  name: string,
-  email: string,
-  password: string
-): Promise<void> => {
-  await page.goto("/auth/login");
-  await page.getByRole("link", { name: "Create an account" }).click();
-  await page.getByRole("button", { name: "Continue with Email" }).click();
-  await page.getByPlaceholder("Full Name").fill(name);
-  await page.getByPlaceholder("work@email.com").fill(email);
-  await page.getByPlaceholder("*******").fill(password);
-  await page.press('input[name="password"]', "Enter");
-  await page.getByRole("link", { name: "Login" }).click();
-  await page.getByRole("button", { name: "Login with Email" }).click();
-  await page.getByPlaceholder("work@email.com").fill(email);
-  await page.getByPlaceholder("*******").click();
-  await page.getByPlaceholder("*******").fill(password);
-  await page.getByRole("button", { name: "Login with Email" }).click();
-};
-
-export const login = async (page: Page, email: string, password: string): Promise<void> => {
-  await page.goto("/auth/login");
-  await page.getByRole("button", { name: "Login with Email" }).click();
-  await page.getByPlaceholder("work@email.com").fill(email);
-  await page.getByPlaceholder("*******").click();
-  await page.getByPlaceholder("*******").fill(password);
-  await page.getByRole("button", { name: "Login with Email" }).click();
-};
-
-export const skipOnboarding = async (page: Page): Promise<void> => {
-  await page.waitForURL("/onboarding");
-  await expect(page).toHaveURL("/onboarding");
-  await page.getByRole("button", { name: "I'll do it later" }).click();
-  await page.getByRole("button", { name: "I'll do it later" }).click();
-  await page.waitForURL(/\/environments\/[^/]+\/surveys/);
-  await expect(page).toHaveURL(/\/environments\/[^/]+\/surveys/);
-  await expect(page.getByText("My Product")).toBeVisible();
-};

docker-compose.yml

@@ -24,15 +24,18 @@ x-encryption-key: &encryption_key 1b3d888592454d23b520040950654669
 
 x-mail-from: &mail_from
 x-smtp-host: &smtp_host
-x-smtp-port: &smtp_port
-x-smtp-secure-enabled: &smtp_secure_enabled # Enable SMTP_SECURE_ENABLED for TLS (port 465)
+x-smtp-port: &smtp_port # Enable SMTP_SECURE_ENABLED for TLS (port 465)
 
 
+x-smtp-secure-enabled: &smtp_secure_enabled
 x-smtp-user: &smtp_user
 x-smtp-password: &smtp_password
+  # Set the below value to your public-facing URL, e.g., https://example.com
+
+  # Set the below value if you have and want to share a shorter base URL than the x-survey-base-url
 
 x-short-url-base:
-  &short_url_base # Set the below value if you have and want to share a shorter base URL than the x-survey-base-url
+  &short_url_base # Email Verification. If you enable Email Verification you have to setup SMTP-Settings, too.
 
 
 x-email-verification-disabled: &email_verification_disabled 1
@@ -49,21 +52,30 @@ x-invite-disabled: &invite_disabled 0
 # Set the below values to display privacy policy, imprint and terms of service links in the footer of signup & public pages.
 x-privacy-url: &privacy_url
 x-terms-url: &terms_url
-x-imprint-url: &imprint_url
+x-imprint-url: &imprint_url # Configure Github Login
 
-x-github-auth-enabled: &github_auth_enabled 0 # Configure Github Login
+
+x-github-auth-enabled: &github_auth_enabled 0
 x-github-id: &github_id
-x-github-secret: &github_secret
+x-github-secret: &github_secret # Configure Google Login
 
-x-google-auth-enabled: &google_auth_enabled 0 # Configure Google Login
+
+x-google-auth-enabled: &google_auth_enabled 0
 x-google-client-id: &google_client_id
-x-google-client-secret: &google_client_secret
+x-google-client-secret: &google_client_secret # Disable Sentry warning
 
-x-sentry-ignore-api-resolution-error: &sentry_ignore_api_resolution_error # Disable Sentry warning
 
-x-next-public-sentry-dsn: &next_public_sentry_dsn # Enable Sentry Error Tracking
+x-sentry-ignore-api-resolution-error: &sentry_ignore_api_resolution_error # Enable Sentry Error Tracking
 
-x-cron-secret: &cron_secret YOUR_CRON_SECRET # Set this to a random string to secure your cron endpoints
+
+x-next-public-sentry-dsn: &next_public_sentry_dsn # Cron Secret
+
+# Set this to a random string to secure your cron endpoints
+x-cron-secret: &cron_secret YOUR_CRON_SECRET
+
+  
+# Configure ASSET_PREFIX_URL when you want to ship JS & CSS files from a complete URL instead of the current domain
+x-asset-prefix-url: &asset_prefix_url
 
 services:
   postgres:
@@ -118,6 +130,7 @@ services:
       GOOGLE_CLIENT_ID: *google_client_id
       GOOGLE_CLIENT_SECRET: *google_client_secret
       CRON_SECRET: *cron_secret
+      ASSET_PREFIX_URL: *asset_prefix_url
 
 volumes:
   postgres:

docker/docker-compose.yml

@@ -65,6 +65,9 @@ x-environment: &environment
     # GOOGLE_CLIENT_ID:
     # GOOGLE_CLIENT_SECRET:
 
+    # Configure ASSET_PREFIX_URL when you want to ship JS & CSS files from a complete URL instead of the current domain
+    # ASSET_PREFIX_URL: *asset_prefix_url
+
 services:
   postgres:
     restart: always

package.json

@@ -26,12 +26,10 @@
     "lint": "turbo run lint",
     "release": "turbo run build --filter=js... && turbo run build --filter=n8n-node... && changeset publish",
     "test": "turbo run test",
-    "test:e2e": "playwright test",
     "prepare": "husky install"
   },
   "devDependencies": {
     "@changesets/cli": "^2.26.2",
-    "@playwright/test": "^1.40.1",
     "eslint-config-formbricks": "workspace:*",
     "husky": "^8.0.3",
     "lint-staged": "^15.1.0",
@@ -54,14 +52,11 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "packageManager": "pnpm@8.11.0",
+  "packageManager": "pnpm@8.1.1",
   "nextBundleAnalysis": {
     "budget": 358400,
     "budgetPercentIncreaseRed": 20,
     "minimumChangeThreshold": 0,
     "showDetails": true
-  },
-  "dependencies": {
-    "playwright": "^1.40.1"
   }
 }

packages/api/package.json

@@ -33,10 +33,10 @@
   "devDependencies": {
     "@formbricks/types": "workspace:*",
     "@formbricks/tsconfig": "workspace:*",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-config-turbo": "latest",
-    "terser": "^5.25.0",
-    "vite": "^5.0.6",
+    "terser": "^5.24.0",
+    "vite": "^5.0.4",
     "vite-plugin-dts": "^3.6.4"
   }
 }

packages/database/jsonTypes.ts

@@ -6,7 +6,6 @@ import {
   TSurveyClosedMessage,
   TSurveyHiddenFields,
   TSurveyProductOverwrites,
-  TSurveyStyling,
   TSurveyQuestions,
   TSurveySingleUse,
   TSurveyThankYouCard,
@@ -28,7 +27,6 @@ declare global {
     export type SurveyThankYouCard = TSurveyThankYouCard;
     export type SurveyHiddenFields = TSurveyHiddenFields;
     export type SurveyProductOverwrites = TSurveyProductOverwrites;
-    export type SurveyStyling = TSurveyStyling;
     export type SurveyClosedMessage = TSurveyClosedMessage;
     export type SurveySingleUse = TSurveySingleUse;
     export type SurveyVerifyEmail = TSurveyVerifyEmail;

packages/database/migrations/20231204180155_add_styling/migration.sql

@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "Survey" ADD COLUMN     "styling" JSONB;

packages/database/schema.prisma

@@ -289,9 +289,6 @@ model Survey {
   /// @zod.custom(imports.ZSurveyProductOverwrites)
   /// [SurveyProductOverwrites]
   productOverwrites Json?
-  /// @zod.custom(imports.ZSurveyStyling)
-  /// [SurveyStyling]
-  styling           Json?
   /// @zod.custom(imports.ZSurveySingleUse)
   /// [SurveySingleUse]
   singleUse         Json?   @default("{\"enabled\": false, \"isEncrypted\": true}")

packages/database/zod-utils.ts

@@ -18,7 +18,6 @@ export {
   ZSurveyHiddenFields,
   ZSurveyClosedMessage,
   ZSurveyProductOverwrites,
-  ZSurveyStyling,
   ZSurveyVerifyEmail,
   ZSurveySingleUse,
 } from "@formbricks/types/surveys";

packages/ee/package.json

@@ -18,6 +18,6 @@
   },
   "dependencies": {
     "@formbricks/lib": "workspace:*",
-    "stripe": "^14.7.0"
+    "stripe": "^14.6.0"
   }
 }

packages/eslint-config-formbricks/package.json

@@ -8,13 +8,13 @@
     "clean": "rimraf node_modules .turbo"
   },
   "devDependencies": {
-    "eslint": "^8.55.0",
+    "eslint": "^8.54.0",
     "eslint-config-next": "^14.0.3",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-config-turbo": "latest",
     "eslint-plugin-react": "7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.5",
+    "eslint-plugin-react-refresh": "^0.4.4",
     "eslint-plugin-storybook": "^0.6.15"
   }
 }

packages/js/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formbricks/js",
   "license": "MIT",
-  "version": "1.2.7",
+  "version": "1.2.6",
   "description": "Formbricks-js allows you to connect your app to Formbricks, display surveys and trigger events.",
   "keywords": [
     "Formbricks",
@@ -42,19 +42,19 @@
     "@formbricks/surveys": "workspace:*",
     "@formbricks/tsconfig": "workspace:*",
     "@formbricks/types": "workspace:*",
-    "@types/jest": "^29.5.11",
-    "@typescript-eslint/eslint-plugin": "^6.13.2",
-    "@typescript-eslint/parser": "^6.13.2",
+    "@types/jest": "^29.5.10",
+    "@typescript-eslint/eslint-plugin": "^6.13.1",
+    "@typescript-eslint/parser": "^6.13.1",
     "babel-jest": "^29.7.0",
     "cross-env": "^7.0.3",
     "isomorphic-fetch": "^3.0.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-fetch-mock": "^3.0.3",
-    "terser": "^5.25.0",
-    "vite": "^5.0.6",
+    "terser": "^5.24.0",
+    "vite": "^5.0.4",
     "vite-plugin-dts": "^3.6.4",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-config-turbo": "latest"
   },
   "jest": {

packages/js/src/lib/config.ts

@@ -7,13 +7,6 @@ export class Config {
   private static instance: Config | undefined;
   private config: TJsConfig | null = null;
 
-  private constructor() {
-    const localConfig = this.loadFromLocalStorage();
-    if (localConfig.ok) {
-      this.config = localConfig.value;
-    }
-  }
-
   static getInstance(): Config {
     if (!Config.instance) {
       Config.instance = new Config();

packages/js/src/lib/initialize.ts

@@ -1,4 +1,4 @@
-import type { TJsConfig, TJsConfigInput } from "@formbricks/types/js";
+import type { TJsConfigInput } from "@formbricks/types/js";
 import { Config } from "./config";
 import {
   ErrorHandler,
@@ -16,8 +16,6 @@ import { checkPageUrl } from "./noCodeActions";
 import { sync } from "./sync";
 import { addWidgetContainer, closeSurvey } from "./widget";
 import { trackAction } from "./actions";
-import { updatePersonAttributes } from "./person";
-import { TPersonAttributes } from "@formbricks/types/people";
 
 const config = Config.getInstance();
 const logger = Logger.getInstance();
@@ -65,44 +63,19 @@ export const initialize = async (
   logger.debug("Adding widget container to DOM");
   addWidgetContainer();
 
-  if (!c.userId && c.attributes) {
-    logger.error("No userId provided but attributes. Cannot update attributes without userId.");
-    return err({
-      code: "missing_field",
-      field: "userId",
-    });
-  }
-
-  // if userId and attributes are available, set them in backend
-  let updatedAttributes: TPersonAttributes | null = null;
-  if (c.userId && c.attributes) {
-    const res = await updatePersonAttributes(c.apiHost, c.environmentId, c.userId, c.attributes);
-
-    if (res.ok !== true) {
-      return err(res.error);
-    }
-    updatedAttributes = res.value;
-  }
-
-  let existingConfig: TJsConfig | undefined;
-  try {
-    existingConfig = config.get();
-  } catch (e) {
-    logger.debug("No existing configuration found.");
-  }
+  const localConfigResult = config.loadFromLocalStorage();
 
   if (
-    existingConfig &&
-    existingConfig.state &&
-    existingConfig.environmentId === c.environmentId &&
-    existingConfig.apiHost === c.apiHost &&
-    existingConfig.userId === c.userId &&
-    existingConfig.expiresAt // only accept config when they follow new config version with expiresAt
+    localConfigResult.ok &&
+    localConfigResult.value.state &&
+    localConfigResult.value.environmentId === c.environmentId &&
+    localConfigResult.value.apiHost === c.apiHost &&
+    localConfigResult.value.userId === c.userId &&
+    localConfigResult.value.expiresAt // only accept config when they follow new config version with expiresAt
   ) {
     logger.debug("Found existing configuration.");
-    if (existingConfig.expiresAt < new Date()) {
+    if (localConfigResult.value.expiresAt < new Date()) {
       logger.debug("Configuration expired.");
-
       await sync({
         apiHost: c.apiHost,
         environmentId: c.environmentId,
@@ -110,12 +83,14 @@ export const initialize = async (
       });
     } else {
       logger.debug("Configuration not expired. Extending expiration.");
-      config.update(existingConfig);
+      config.update(localConfigResult.value);
     }
   } else {
     logger.debug("No valid configuration found or it has been expired. Creating new config.");
     logger.debug("Syncing.");
 
+    // when the local storage is expired / empty, we sync to get the latest config
+
     await sync({
       apiHost: c.apiHost,
       environmentId: c.environmentId,
@@ -123,20 +98,7 @@ export const initialize = async (
     });
 
     // and track the new session event
-    await trackAction("New Session");
-  }
-
-  // update attributes in config
-  if (updatedAttributes && Object.keys(updatedAttributes).length > 0) {
-    config.update({
-      environmentId: config.get().environmentId,
-      apiHost: config.get().apiHost,
-      userId: config.get().userId,
-      state: {
-        ...config.get().state,
-        attributes: { ...config.get().state.attributes, ...c.attributes },
-      },
-    });
+    trackAction("New Session");
   }
 
   logger.debug("Adding event listeners");

packages/js/src/lib/person.ts

@@ -1,15 +1,7 @@
 import { FormbricksAPI } from "@formbricks/api";
-import { TPersonAttributes, TPersonUpdateInput } from "@formbricks/types/people";
+import { TPersonUpdateInput } from "@formbricks/types/people";
 import { Config } from "./config";
-import {
-  AttributeAlreadyExistsError,
-  MissingPersonError,
-  NetworkError,
-  Result,
-  err,
-  ok,
-  okVoid,
-} from "./errors";
+import { AttributeAlreadyExistsError, MissingPersonError, NetworkError, Result, err, okVoid } from "./errors";
 import { deinitalize, initialize } from "./initialize";
 import { Logger } from "./logger";
 import { sync } from "./sync";
@@ -63,66 +55,6 @@ export const updatePersonAttribute = async (
   return okVoid();
 };
 
-export const updatePersonAttributes = async (
-  apiHost: string,
-  environmentId: string,
-  userId: string,
-  attributes: TPersonAttributes
-): Promise<Result<TPersonAttributes, NetworkError | MissingPersonError>> => {
-  if (!userId) {
-    return err({
-      code: "missing_person",
-      message: "Unable to update attribute. User identification deactivated. No userId set.",
-    });
-  }
-
-  // clean attributes and remove existing attributes if config already exists
-  const updatedAttributes = { ...attributes };
-  try {
-    const existingAttributes = config.get()?.state?.attributes;
-    if (existingAttributes) {
-      for (const [key, value] of Object.entries(existingAttributes)) {
-        if (updatedAttributes[key] === value) {
-          delete updatedAttributes[key];
-        }
-      }
-    }
-  } catch (e) {
-    logger.debug("config not set; sending all attributes to backend");
-  }
-
-  // send to backend if updatedAttributes is not empty
-  if (Object.keys(updatedAttributes).length === 0) {
-    logger.debug("No attributes to update. Skipping update.");
-    return ok(updatedAttributes);
-  }
-
-  logger.debug("Updating attributes: " + JSON.stringify(updatedAttributes));
-
-  const input: TPersonUpdateInput = {
-    attributes: updatedAttributes,
-  };
-
-  const api = new FormbricksAPI({
-    apiHost,
-    environmentId,
-  });
-
-  const res = await api.client.people.update(userId, input);
-
-  if (res.ok) {
-    return ok(updatedAttributes);
-  }
-
-  return err({
-    code: "network_error",
-    status: 500,
-    message: `Error updating person with userId ${userId}`,
-    url: `${apiHost}/api/v1/client/${environmentId}/people/${userId}`,
-    responseMessage: res.error.message,
-  });
-};
-
 export const isExistingAttribute = (key: string, value: string): boolean => {
   if (config.get().state.attributes[key] === value) {
     return true;

packages/lib/authOptions.ts

@@ -154,7 +154,7 @@ export const authOptions: NextAuthOptions = {
     async signIn({ user, account }: any) {
       if (account.provider === "credentials" || account.provider === "token") {
         if (!user.emailVerified && !EMAIL_VERIFICATION_DISABLED) {
-          throw new Error("Email Verification is Pending");
+          return `/auth/verification-requested?email=${encodeURIComponent(user.email)}`;
         }
         return true;
       }
@@ -197,9 +197,7 @@ export const authOptions: NextAuthOptions = {
             await updateProfile(existingUserWithAccount.id, { email: user.email });
             return true;
           }
-          throw new Error(
-            "Looks like you updated your email somewhere else. A user with this new email exists already."
-          );
+          return "/auth/login?error=Looks%20like%20you%20updated%20your%20email%20somewhere%20else.%0AA%20user%20with%20this%20new%20email%20exists%20already.";
         }
 
         // There is no existing account for this identity provider / account id
@@ -208,7 +206,7 @@ export const authOptions: NextAuthOptions = {
         const existingUserWithEmail = await getProfileByEmail(user.email);
 
         if (existingUserWithEmail) {
-          throw new Error("A user with this email exists already.");
+          return "/auth/login?error=A%20user%20with%20this%20email%20exists%20already.";
         }
 
         const userProfile = await createProfile({

packages/lib/constants.ts

@@ -71,34 +71,6 @@ export const IS_S3_CONFIGURED: boolean =
 export const PRICING_USERTARGETING_FREE_MTU = 2500;
 export const PRICING_APPSURVEYS_FREE_RESPONSES = 250;
 
-// Colors for Survey Bg
-export const colours = [
-  "#FFF2D8",
-  "#EAD7BB",
-  "#BCA37F",
-  "#113946",
-  "#04364A",
-  "#176B87",
-  "#64CCC5",
-  "#DAFFFB",
-  "#132043",
-  "#1F4172",
-  "#F1B4BB",
-  "#FDF0F0",
-  "#001524",
-  "#445D48",
-  "#D6CC99",
-  "#FDE5D4",
-  "#BEADFA",
-  "#D0BFFF",
-  "#DFCCFB",
-  "#FFF8C9",
-  "#FF8080",
-  "#FFCF96",
-  "#F6FDC3",
-  "#CDFAD5",
-];
-
 // Rate Limiting
 export const SIGNUP_RATE_LIMIT = {
   interval: 60 * 60 * 1000, // 60 minutes

packages/lib/package.json

@@ -12,9 +12,9 @@
     "lint:report": "eslint . --format json --output-file ../../lint-results/app-store.json"
   },
   "dependencies": {
-    "@aws-sdk/s3-presigned-post": "3.465.0",
-    "@aws-sdk/client-s3": "3.465.0",
-    "@aws-sdk/s3-request-presigner": "3.465.0",
+    "@aws-sdk/s3-presigned-post": "3.458.0",
+    "@aws-sdk/client-s3": "3.458.0",
+    "@aws-sdk/s3-request-presigner": "3.458.0",
     "@t3-oss/env-nextjs": "^0.7.1",
     "mime": "4.0.0",
     "@formbricks/api": "*",
@@ -25,12 +25,12 @@
     "date-fns": "^2.30.0",
     "jsonwebtoken": "^9.0.2",
     "markdown-it": "^13.0.2",
-    "nanoid": "^5.0.4",
+    "nanoid": "^5.0.3",
     "next-auth": "^4.24.5",
     "nodemailer": "^6.9.7",
-    "posthog-node": "^3.2.0",
+    "posthog-node": "^3.1.3",
     "server-only": "^0.0.1",
-    "tailwind-merge": "^2.1.0"
+    "tailwind-merge": "^2.0.0"
   },
   "devDependencies": {
     "@formbricks/tsconfig": "*",

packages/lib/profile/service.ts

@@ -14,11 +14,10 @@ import { Prisma } from "@prisma/client";
 import { unstable_cache } from "next/cache";
 import { z } from "zod";
 import { SERVICES_REVALIDATION_INTERVAL } from "../constants";
-import { updateMembership } from "../membership/service";
 import { deleteTeam } from "../team/service";
 import { validateInputs } from "../utils/validate";
 import { profileCache } from "./cache";
-import { formatProfileDateFields } from "./util";
+import { updateMembership } from "../membership/service";
 
 const responseSelection = {
   id: true,
@@ -35,8 +34,8 @@ const responseSelection = {
 };
 
 // function to retrive basic information about a user's profile
-export const getProfile = async (id: string): Promise<TProfile | null> => {
-  const profile = await unstable_cache(
+export const getProfile = async (id: string): Promise<TProfile | null> =>
+  unstable_cache(
     async () => {
       validateInputs([id, ZId]);
 
@@ -68,18 +67,8 @@ export const getProfile = async (id: string): Promise<TProfile | null> => {
     }
   )();
 
-  if (!profile) {
-    return null;
-  }
-
-  return {
-    ...profile,
-    ...formatProfileDateFields(profile),
-  } as TProfile;
-};
-
-export const getProfileByEmail = async (email: string): Promise<TProfile | null> => {
-  const profile = await unstable_cache(
+export const getProfileByEmail = async (email: string): Promise<TProfile | null> =>
+  unstable_cache(
     async () => {
       validateInputs([email, z.string().email()]);
 
@@ -111,16 +100,6 @@ export const getProfileByEmail = async (email: string): Promise<TProfile | null>
     }
   )();
 
-  if (!profile) {
-    return null;
-  }
-
-  return {
-    ...profile,
-    ...formatProfileDateFields(profile),
-  } as TProfile;
-};
-
 const getAdminMemberships = (memberships: TMembership[]): TMembership[] =>
   memberships.filter((membership) => membership.role === "admin");
 

packages/lib/profile/util.ts

@@ -1,15 +0,0 @@
-import { TProfile } from "@formbricks/types/profile";
-
-export const formatProfileDateFields = (profile: TProfile): TProfile => {
-  if (typeof profile.createdAt === "string") {
-    profile.createdAt = new Date(profile.createdAt);
-  }
-  if (typeof profile.updatedAt === "string") {
-    profile.updatedAt = new Date(profile.updatedAt);
-  }
-  if (typeof profile.emailVerified === "string") {
-    profile.emailVerified = new Date(profile.emailVerified);
-  }
-
-  return profile;
-};

packages/lib/response/service.ts

@@ -270,15 +270,14 @@ export const createResponseLegacy = async (responseInput: TResponseLegacyInput):
     if (responseInput.personId) {
       person = await getPerson(responseInput.personId);
     }
-    const ttcTemp = responseInput.ttc ?? {};
+    const ttcTemp = responseInput.ttc;
     const questionId = Object.keys(ttcTemp)[0];
-    const ttc =
-      responseInput.finished && responseInput.ttc
-        ? {
-            ...ttcTemp,
-            _total: ttcTemp[questionId], // Add _total property with the same value
-          }
-        : ttcTemp;
+    const ttc = responseInput.finished
+      ? {
+          ...ttcTemp,
+          _total: ttcTemp[questionId], // Add _total property with the same value
+        }
+      : ttcTemp;
     const responsePrisma = await prisma.response.create({
       data: {
         survey: {
@@ -513,11 +512,7 @@ export const updateResponse = async (
       ...currentResponse.data,
       ...responseInput.data,
     };
-    const ttc = responseInput.ttc
-      ? responseInput.finished
-        ? calculateTtcTotal(responseInput.ttc)
-        : responseInput.ttc
-      : {};
+    const ttc = responseInput.finished ? calculateTtcTotal(responseInput.ttc) : responseInput.ttc;
 
     const responsePrisma = await prisma.response.update({
       where: {

packages/lib/response/util.ts

@@ -1,8 +1,8 @@
 import "server-only";
 
-import { TResponse, TResponseTtc } from "@formbricks/types/responses";
+import { TResponseDates, TResponseTtc } from "@formbricks/types/responses";
 
-export const formatResponseDateFields = (response: TResponse): TResponse => {
+export const formatResponseDateFields = (response: TResponseDates): TResponseDates => {
   if (typeof response.createdAt === "string") {
     response.createdAt = new Date(response.createdAt);
   }

packages/lib/survey/service.ts

@@ -14,7 +14,6 @@ import { getAttributeClasses } from "../attributeClass/service";
 import { ITEMS_PER_PAGE, SERVICES_REVALIDATION_INTERVAL } from "../constants";
 import { displayCache } from "../display/cache";
 import { getDisplaysByPersonId } from "../display/service";
-import { personCache } from "../person/cache";
 import { productCache } from "../product/cache";
 import { getProductByEnvironmentId } from "../product/service";
 import { responseCache } from "../response/cache";
@@ -45,7 +44,6 @@ export const selectSurvey = {
   verifyEmail: true,
   redirectUrl: true,
   productOverwrites: true,
-  styling: true,
   surveyClosedMessage: true,
   singleUse: true,
   pin: true,
@@ -542,7 +540,6 @@ export const createSurvey = async (environmentId: string, surveyBody: TSurveyInp
 };
 
 export const duplicateSurvey = async (environmentId: string, surveyId: string) => {
-  validateInputs([environmentId, ZId], [surveyId, ZId]);
   const existingSurvey = await getSurvey(surveyId);
 
   if (!existingSurvey) {
@@ -588,7 +585,6 @@ export const duplicateSurvey = async (environmentId: string, surveyId: string) =
       productOverwrites: existingSurvey.productOverwrites
         ? JSON.parse(JSON.stringify(existingSurvey.productOverwrites))
         : Prisma.JsonNull,
-      styling: existingSurvey.styling ? JSON.parse(JSON.stringify(existingSurvey.styling)) : Prisma.JsonNull,
       verifyEmail: existingSurvey.verifyEmail
         ? JSON.parse(JSON.stringify(existingSurvey.verifyEmail))
         : Prisma.JsonNull,
@@ -609,10 +605,8 @@ export const duplicateSurvey = async (environmentId: string, surveyId: string) =
   return newSurvey;
 };
 
-export const getSyncSurveys = (environmentId: string, person: TPerson): Promise<TSurvey[]> => {
-  validateInputs([environmentId, ZId]);
-
-  return unstable_cache(
+export const getSyncSurveys = (environmentId: string, person: TPerson): Promise<TSurvey[]> =>
+  unstable_cache(
     async () => {
       const product = await getProductByEnvironmentId(environmentId);
 
@@ -691,10 +685,9 @@ export const getSyncSurveys = (environmentId: string, person: TPerson): Promise<
 
       return surveys;
     },
-    [`getSyncSurveys-${environmentId}-${person.userId}`],
+    [`getSyncSurveys-${environmentId}`],
     {
       tags: [
-        personCache.tag.byEnvironmentIdAndUserId(environmentId, person.userId),
         displayCache.tag.byPersonId(person.id),
         surveyCache.tag.byEnvironmentId(environmentId),
         productCache.tag.byEnvironmentId(environmentId),
@@ -702,4 +695,3 @@ export const getSyncSurveys = (environmentId: string, person: TPerson): Promise<
       revalidate: SERVICES_REVALIDATION_INTERVAL,
     }
   )();
-};

packages/surveys/package.json

@@ -28,14 +28,14 @@
     "@formbricks/types": "workspace:*",
     "@preact/preset-vite": "^2.7.0",
     "autoprefixer": "^10.4.16",
-    "postcss": "^8.4.32",
+    "postcss": "^8.4.31",
     "preact": "^10.19.2",
-    "tailwindcss": "^3.3.6",
-    "terser": "^5.25.0",
-    "vite": "^5.0.6",
+    "tailwindcss": "^3.3.5",
+    "terser": "^5.24.0",
+    "vite": "^5.0.4",
     "vite-plugin-dts": "^3.6.4",
     "vite-tsconfig-paths": "^4.2.1",
-    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-config-turbo": "latest"
   }
 }

packages/surveys/src/components/general/Headline.tsx

@@ -13,10 +13,11 @@ export default function Headline({
 }: HeadlineProps) {
   return (
     <label htmlFor={questionId} className="text-heading mb-1.5 block text-base font-semibold leading-6">
-      <div className={`flex items-center  ${alignTextCenter ? "justify-center" : "justify-between"}`}>
+      <div
+        className={`flex items-center  ${alignTextCenter ? "justify-center" : "mr-[3ch] justify-between"}`}>
         {headline}
         {!required && (
-          <span className="text-info-text ml-2 self-start text-sm font-normal leading-7" tabIndex={-1}>
+          <span className="text-info-text self-start	text-sm font-normal leading-7" tabIndex={-1}>
             Optional
           </span>
         )}

packages/surveys/src/components/general/Survey.tsx

@@ -174,7 +174,7 @@ export function Survey({
   return (
     <>
       <AutoCloseWrapper survey={survey} onClose={onClose}>
-        <div className="flex h-full w-full flex-col justify-between rounded-lg bg-[--fb-survey-background-color] px-6 pb-3 pt-6">
+        <div className="flex h-full w-full flex-col justify-between bg-[--fb-survey-background-color] px-6 pb-3 pt-6">
           <div ref={contentRef} className={cn(loadingElement ? "animate-pulse opacity-60" : "", "my-auto")}>
             {survey.questions.length === 0 && !survey.welcomeCard.enabled && !survey.thankYouCard.enabled ? (
               // Handle the case when there are no questions and both welcome and thank you cards are disabled

packages/tailwind-config/package.json

@@ -10,7 +10,7 @@
     "@tailwindcss/forms": "^0.5.7",
     "@tailwindcss/typography": "^0.5.10",
     "autoprefixer": "^10.4.16",
-    "postcss": "^8.4.32",
-    "tailwindcss": "^3.3.6"
+    "postcss": "^8.4.31",
+    "tailwindcss": "^3.3.5"
   }
 }

packages/tsconfig/package.json

@@ -7,8 +7,8 @@
     "clean": "rimraf node_modules dist turbo"
   },
   "devDependencies": {
-    "@types/node": "20.10.3",
-    "@types/react": "18.2.42",
+    "@types/node": "20.10.1",
+    "@types/react": "18.2.39",
     "@types/react-dom": "18.2.17",
     "typescript": "^5.3.2"
   }

packages/types/js.ts

@@ -96,7 +96,6 @@ export const ZJsConfigInput = z.object({
   debug: z.boolean().optional(),
   errorHandler: z.function().args(z.any()).returns(z.void()).optional(),
   userId: z.string().optional(),
-  attributes: ZPersonAttributes.optional(),
 });
 
 export type TJsConfigInput = z.infer<typeof ZJsConfigInput>;

packages/types/responses.ts

@@ -37,13 +37,11 @@ export type TResponseNote = z.infer<typeof ZResponseNote>;
 export const ZResponseMeta = z.object({
   source: z.string().optional(),
   url: z.string().optional(),
-  userAgent: z
-    .object({
-      browser: z.string().optional(),
-      os: z.string().optional(),
-      device: z.string().optional(),
-    })
-    .optional(),
+  userAgent: z.object({
+    browser: z.string().optional(),
+    os: z.string().optional(),
+    device: z.string().optional(),
+  }),
 });
 
 export type TResponseMeta = z.infer<typeof ZResponseMeta>;
@@ -57,7 +55,7 @@ export const ZResponse = z.object({
   personAttributes: ZResponsePersonAttributes,
   finished: z.boolean(),
   data: ZResponseData,
-  ttc: ZResponseTtc.optional(),
+  ttc: ZResponseTtc,
   notes: z.array(ZResponseNote),
   tags: z.array(ZTag),
   meta: ZResponseMeta.nullable(),
@@ -66,6 +64,12 @@ export const ZResponse = z.object({
 
 export type TResponse = z.infer<typeof ZResponse>;
 
+export type TResponseDates = {
+  createdAt: TResponse["createdAt"];
+  updatedAt: TResponse["updatedAt"];
+  notes: TResponse["notes"];
+};
+
 export const ZResponseInput = z.object({
   environmentId: z.string().cuid2(),
   surveyId: z.string().cuid2(),
@@ -73,7 +77,7 @@ export const ZResponseInput = z.object({
   singleUseId: z.string().nullable().optional(),
   finished: z.boolean(),
   data: ZResponseData,
-  ttc: ZResponseTtc.optional(),
+  ttc: ZResponseTtc,
   meta: z
     .object({
       source: z.string().optional(),
@@ -100,7 +104,7 @@ export type TResponseLegacyInput = z.infer<typeof ZResponseLegacyInput>;
 export const ZResponseUpdateInput = z.object({
   finished: z.boolean(),
   data: ZResponseData,
-  ttc: ZResponseTtc.optional(),
+  ttc: ZResponseTtc,
 });
 
 export type TResponseUpdateInput = z.infer<typeof ZResponseUpdateInput>;
@@ -114,7 +118,7 @@ export type TResponseWithSurvey = z.infer<typeof ZResponseWithSurvey>;
 export const ZResponseUpdate = z.object({
   finished: z.boolean(),
   data: ZResponseData,
-  ttc: ZResponseTtc.optional(),
+  ttc: ZResponseTtc,
   meta: z
     .object({
       url: z.string().optional(),

packages/types/surveys.ts

@@ -45,24 +45,6 @@ export const ZSurveyProductOverwrites = z.object({
 
 export type TSurveyProductOverwrites = z.infer<typeof ZSurveyProductOverwrites>;
 
-export const ZSurveyBackgroundBgType = z.enum(["animation", "color", "image"]);
-
-export type TSurveyBackgroundBgType = z.infer<typeof ZSurveyBackgroundBgType>;
-
-export const ZSurveyStylingBackground = z.object({
-  bg: z.string().nullish(),
-  bgType: z.enum(["animation", "color", "image"]).nullish(),
-  brightness: z.number().nullish(),
-});
-
-export type TSurveyStylingBackground = z.infer<typeof ZSurveyStylingBackground>;
-
-export const ZSurveyStyling = z.object({
-  background: ZSurveyStylingBackground.nullish(),
-});
-
-export type TSurveyStyling = z.infer<typeof ZSurveyStyling>;
-
 export const ZSurveyClosedMessage = z
   .object({
     enabled: z.boolean().optional(),
@@ -397,7 +379,6 @@ export const ZSurvey = z.object({
   autoComplete: z.number().nullable(),
   closeOnDate: z.date().nullable(),
   productOverwrites: ZSurveyProductOverwrites.nullable(),
-  styling: ZSurveyStyling.nullable(),
   surveyClosedMessage: ZSurveyClosedMessage.nullable(),
   singleUse: ZSurveySingleUse.nullable(),
   verifyEmail: ZSurveyVerifyEmail.nullable(),

packages/ui/package.json

@@ -12,7 +12,7 @@
     "@formbricks/types": "workspace:*",
     "concurrently": "^8.2.2",
     "eslint-config-formbricks": "workspace:*",
-    "postcss": "^8.4.32",
+    "postcss": "^8.4.31",
     "react": "18.2.0"
   },
   "dependencies": {
@@ -47,7 +47,7 @@
     "react-day-picker": "^8.9.1",
     "react-hot-toast": "^2.4.1",
     "react-radio-group": "^3.0.3",
-    "react-use": "^17.4.2",
+    "react-use": "^17.4.1",
     "mime": "^4.0.0"
   }
 }

playwright.config.ts

@@ -1,68 +0,0 @@
-import { defineConfig, devices } from "@playwright/test";
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// require('dotenv').config();
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: "./apps/web/playwright",
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Retry on CI only */
-  retries: 2,
-  /* Opt out of parallel tests on CI. */
-  workers: 1,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: "html",
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: "http://localhost:3000",
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: "on-first-retry",
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: "chromium",
-      use: { ...devices["Desktop Chrome"] },
-    },
-
-    // {
-    //   name: "firefox",
-    //   use: { ...devices["Desktop Firefox"] },
-    // },
-
-    // {
-    //   name: "webkit",
-    //   use: { ...devices["Desktop Safari"] },
-    // },
-
-    /* Test against mobile viewports. */
-    // {
-    //   name: "Mobile Chrome",
-    //   use: { ...devices["Pixel 5"] },
-    // },
-    // {
-    //   name: "Mobile Safari",
-    //   use: { ...devices["iPhone 12"] },
-    // },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: "Microsoft Edge",
-    //   use: { ...devices["Desktop Edge"], channel: "msedge" },
-    // },
-    // {
-    //   name: "Google Chrome",
-    //   use: { ...devices["Desktop Chrome"], channel: "chrome" },
-    // },
-  ],
-});

turbo.json

@@ -119,8 +119,7 @@
         "S3_SECRET_KEY",
         "S3_REGION",
         "S3_BUCKET_NAME",
-        "ENTERPRISE_LICENSE_KEY",
-        "PLAYWRIGHT_CI"
+        "ENTERPRISE_LICENSE_KEY"
       ]
     },
     "post-install": {