Compare commits

..

41 Commits

Author SHA1 Message Date
Matti Nannt
acc6674ec5 chore: update surveys package to 1.0.1 (#1763) 2023-12-08 11:41:44 +00:00
Anshuman Pandey
dd0d296c6a feat: question-date (#1660)
Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>
2023-12-08 11:22:19 +00:00
Matti Nannt
f5110fe9c1 fix: docker build errors (#1762) 2023-12-07 22:24:22 +00:00
Matti Nannt
8244a5fa48 fix: update next-config remotePatterns to work with http (#1761) 2023-12-07 14:37:03 +00:00
Dhruwang Jariwala
59936e54a0 feat: add playwright e2e tests infrastructure (#1742)
Co-authored-by: ShubhamPalriwala <spalriwalau@gmail.com>
2023-12-07 10:51:45 +00:00
Dhruwang Jariwala
5468287f9b fix: Survey editor caution text fix (#1755)
Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>
2023-12-07 09:40:48 +00:00
Anjy Gupta
22e55677ae fix: Gitpod file upload and background overlay (#1756) 2023-12-07 09:28:54 +00:00
Filip Wojda
8d422eeda0 style: tiny BestPractice component styling fix (#1758) 2023-12-07 09:22:26 +00:00
Anshuman Pandey
62dbd9e121 fix: fixes safari in-app preview (#1759) 2023-12-07 09:19:17 +00:00
Shubham Palriwala
c950c96934 fix: code block formatting in self-hosting/configure page (#1750) 2023-12-06 13:30:37 +00:00
Anshuman Pandey
1fa12d473c feat: attributes on initialising formbricks (#1736)
Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>
2023-12-06 12:39:46 +00:00
Matti Nannt
b9def78d2e chore: prepare 1.3.5 release (#1752) 2023-12-06 12:06:50 +00:00
Matti Nannt
626356be55 fix: landing page title typo (#1748) 2023-12-05 15:31:30 +00:00
Matti Nannt
85f5425d89 fix: onboarding ending in endless loop because of validation error (#1745) 2023-12-05 13:56:32 +00:00
Anshuman Pandey
d2c703ef60 fix: adds default values for overlay and click outside close (#1740) 2023-12-05 10:46:17 +00:00
Matti Nannt
4e8e6390b1 docs: minor docs hygiene (#1744) 2023-12-05 10:45:06 +00:00
Anjy Gupta
9271e375af feat: add image/color/animation as survey background (#1515)
Co-authored-by: Johannes <72809645+jobenjada@users.noreply.github.com>
Co-authored-by: Johannes <johannes@formbricks.com>
Co-authored-by: Neil Chauhan <neilchauhan2@gmail.com>
Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>
2023-12-04 18:22:28 +00:00
Matti Nannt
35a9685b71 fix: let report usage cron run with no-cache headers (#1739) 2023-12-04 17:37:24 +00:00
Matti Nannt
723ea558fa fix: remove person validation in syncSurveys for backwards compatibility (#1737) 2023-12-04 15:24:51 +00:00
Matti Nannt
8a4a635ee3 fix: in-app surveys not pulled correctly when user attributes get set (#1735) 2023-12-04 12:58:36 +00:00
Shubham Palriwala
1a30e9fd11 fix: error handling in next-auth (#1734) 2023-12-04 12:52:08 +00:00
Dhruwang Jariwala
dc8e1c764b fix: empty trigger save issue (#1733) 2023-12-04 11:38:08 +00:00
Dhruwang Jariwala
48e9148728 fix: made ttc and userAgent optional (#1727) 2023-12-04 11:36:31 +00:00
Shubham Palriwala
25525e0b03 fix: docker builds to work with node 20 (#1728) 2023-12-04 11:13:56 +00:00
Shubham Palriwala
9720c0ecba fix: remove configuration option for asset prefix URL (#1729) 2023-12-04 11:13:22 +00:00
Dhruwang Jariwala
33cbe7cf22 fix: eliminate empty attribute filter (#1730) 2023-12-04 11:12:41 +00:00
Johannes
4b0eef9c2e feat: community page revamp (#1725) 2023-12-03 19:49:35 +00:00
Naitik Kapadia
6e08a94da7 feat: Show the number of Responses to Respondents (#1720)
Co-authored-by: Johannes <johannes@formbricks.com>
2023-12-03 19:27:05 +00:00
Matti Nannt
c8f621cea2 fix: increase rate limit for client endpoints (#1718) 2023-12-01 13:27:37 +00:00
Shubham Palriwala
6436ec6416 fix: add docs + increase size about increasing size of changing button text (#1714) 2023-12-01 10:49:21 +00:00
Matti Nannt
e7c3d9abee chore: use node 20 in dockerfiles (#1716) 2023-12-01 09:10:05 +00:00
Matti Nannt
c8bc942eb4 chore: prepare 1.3.4 release (#1715) 2023-11-30 17:53:31 +00:00
Dhruwang Jariwala
d4fcaa54ba fix: progress bar (#1698)
Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>
2023-11-30 15:12:40 +00:00
Dhruwang Jariwala
2118f881f6 feat: Time to complete Metadata (#1416)
Co-authored-by: Johannes <johannes@formbricks.com>
Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>
2023-11-30 14:22:33 +00:00
Shubham Palriwala
05884ead56 fix: validate string before fetching survey (#1701) 2023-11-30 08:45:34 +00:00
Dhruwang Jariwala
e53e04ca05 fix: duplicate title tags and meta descriptions (and other titles) (#1683)
Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>
2023-11-30 08:30:38 +00:00
Dhruwang Jariwala
32b2cd9ef3 chore: added individual eslints (#1710)
Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>
2023-11-30 08:24:20 +00:00
Anshuman Pandey
f734a76588 fix: team invites (#1699) 2023-11-30 08:23:05 +00:00
Anshuman Pandey
d71b1ee052 fix: fixes encoding of file name (#1712) 2023-11-30 07:41:03 +00:00
Dhruwang Jariwala
6b1d4a249a refactor: Auth options refactor (#1617)
Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>
2023-11-29 15:24:07 +00:00
Sidi jeddou
6b69d7c9af feat: Add devhunt open source to the list of oss-friends in api route (#1708)
Co-authored-by: Matthias Nannt <mail@matthiasnannt.com>
2023-11-29 13:55:18 +00:00
176 changed files with 6555 additions and 4709 deletions

View File

@@ -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 23:00 UTC every day of every month.
- cron: "0 21 * * *"
# This will run the job at 22:00 UTC every day of every month.
- cron: "0 22 * * *"
jobs:
cron-reportUsageToStripe:
env:
@@ -19,4 +19,5 @@ jobs:
curl ${{ env.APP_URL }}/api/cron/report-usage \
-X POST \
-H 'x-api-key: ${{ env.CRON_SECRET }}' \
-H 'Cache-Control: no-cache' \
--fail

37
.github/workflows/playwright.yml vendored Normal file
View File

@@ -0,0 +1,37 @@
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

View File

@@ -27,8 +27,13 @@ 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]
needs: [lint, test, build, e2e-test]
if: always()
runs-on: ubuntu-latest
steps:

View File

@@ -52,17 +52,22 @@ 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@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
uses: docker/setup-buildx-action@v3 # v3.0.0
# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
uses: docker/login-action@v3 # v3.0.0
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
@@ -72,7 +77,7 @@ jobs:
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
uses: docker/metadata-action@v5 # v5.0.0
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
@@ -80,10 +85,11 @@ jobs:
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
uses: docker/build-push-action@v5 # 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 }}

8
.gitignore vendored
View File

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

View File

@@ -22,11 +22,13 @@ 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;
}

View File

@@ -16,7 +16,9 @@ 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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,10 +1,7 @@
import { Fence } from "@/components/shared/Fence";
import {generateManagementApiMetadata} from "@/lib/utils"
export const metadata = {
title: "Formbricks Responses API Documentation - Manage Your Survey Data Seamlessly",
description:
"Unlock the full potential of Formbricks' Responses API. From fetching to updating survey responses, our comprehensive guide helps you integrate and manage survey data efficiently without compromising security. Ideal for client-side interactions.",
};
export const metadata = generateManagementApiMetadata("Responses",["Fetch","Delete"])
#### Management API

View File

@@ -1,10 +1,7 @@
import { Fence } from "@/components/shared/Fence";
import {generateManagementApiMetadata} from "@/lib/utils"
export const metadata = {
title: "Formbricks Surveys API Documentation - How to Retrieve All Surveys",
description:
"Explore the comprehensive guide to the Formbricks Surveys API. Learn how to effectively retrieve all the surveys in your environment with the necessary headers and API key setup. Includes sample request and response formats.",
};
export const metadata = generateManagementApiMetadata("Surveys",["Fetch","Create","Update","Delete"])
#### Management API

View File

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

View File

@@ -10,9 +10,31 @@ 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 Custom User Attributes
## 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.
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">

View File

@@ -29,6 +29,29 @@ 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:

View File

@@ -1,5 +1,4 @@
import { GettingStarted } from "@/components/docs/GettingStarted";
import BestPractices from "@/components/docs/BestPractices";
import { HeroPattern } from "@/components/docs/HeroPattern";
import { Button } from "@/components/docs/Button";
@@ -9,10 +8,7 @@ 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 = [
{ title: "Getting Started", id: "getting-started" },
{ title: "Best Practices", id: "best-practices" },
];
export const sections = [];
<HeroPattern />
@@ -20,7 +16,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">
<div className="mb-16 mt-6 flex gap-3" id="why-formbricks">
<Button href="/docs/getting-started/quickstart-in-app-survey" arrow="right" children="Quickstart" />
</div>

View File

@@ -39,17 +39,24 @@ 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
@@ -57,12 +64,15 @@ 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:

View File

@@ -18,7 +18,6 @@ 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

View File

@@ -45,6 +45,15 @@ const FAQ_DATA = [
</>
),
},
{
question: "How can I change Button texts in my survey?",
answer: () => (
<>
For the question that you want to change the button text, click on the <b>Show Advanced Settings</b>{" "}
toggle and change the button label in the <b>Button Text</b> field.
</>
),
},
];
export const faqJsonLdData = FAQ_DATA.map((faq) => ({

View File

@@ -22,9 +22,9 @@ import {
VideoTabletAdjustIcon,
} from "@formbricks/ui/icons";
import { createId } from "@paralleldrive/cuid2";
import { TTemplate } from "@formbricks/types/templates";
import { TSurveyQuestionType } from "@formbricks/types/surveys";
import { TTemplate } from "@formbricks/types/templates";
import { createId } from "@paralleldrive/cuid2";
const thankYouCardDefault = {
enabled: true,
@@ -32,6 +32,12 @@ const thankYouCardDefault = {
subheader: "We appreciate your feedback.",
};
const welcomeCardDefault = {
enabled: true,
timeToFinish: false,
showResponseCount: false,
};
export const customSurvey: TTemplate = {
name: "Start from scratch",
description: "Create a survey without template.",
@@ -51,10 +57,7 @@ export const customSurvey: TTemplate = {
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -150,10 +153,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -260,10 +260,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -340,10 +337,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -389,10 +383,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -447,10 +438,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -513,10 +501,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -582,10 +567,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -640,10 +622,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -685,10 +664,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -723,10 +699,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -752,10 +725,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -803,10 +773,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -848,10 +815,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -905,10 +869,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -961,10 +922,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -1013,10 +971,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -1043,10 +998,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -1071,10 +1023,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -1098,10 +1047,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -1142,10 +1088,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -1179,10 +1122,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -1216,10 +1156,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},
@@ -1281,10 +1218,7 @@ export const templates: TTemplate[] = [
},
],
thankYouCard: thankYouCardDefault,
welcomeCard: {
enabled: false,
timeToFinish: false,
},
welcomeCard: welcomeCardDefault,
hiddenFields: {
enabled: false,
},

View File

@@ -1,5 +1,3 @@
import PHIcon from "@/images/formtribe/ph-logo.png";
import Image from "next/image";
import Link from "next/link";
export const GitHubSponsorship: React.FC = () => {
@@ -38,7 +36,7 @@ export const GitHubSponsorship: React.FC = () => {
</p>
</div>
<div className="flex items-center justify-end">
<Image src={PHIcon} alt="Product Hunt Logo" width={80} className="" />
{/* <Image src={PHIcon} alt="Product Hunt Logo" width={80} className="" /> */}
</div>
</div>
</Link>

View File

@@ -27,11 +27,11 @@ 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">The Open Source Survey Suite</span>
<span className="xl:inline">Privacy-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">
Run link surveys, in-app surveys and email surveys in one app {" "}
Turn customer insights into irresistible experiences {" "}
<span className="decoration-brand-dark underline underline-offset-4">all privacy-first.</span>
</p>
@@ -92,7 +92,7 @@ export const Hero: React.FC = ({}) => {
router.push("https://app.formbricks.com/auth/signup");
plausible("Hero_CTA_CreateSurvey");
}}>
Create survey
Get started
</Button>
<Button
variant="secondary"

View File

@@ -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 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">
<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">
<div
className={clsx(
// base styles independent what type of button it is
@@ -105,7 +105,9 @@ 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="text-sm text-slate-600 dark:text-slate-400">{bestPractice.description}</p>
<p className="flex self-end text-sm text-slate-600 dark:text-slate-400">
{bestPractice.description}
</p>
</div>
</Link>
))}

View File

@@ -1,6 +1,6 @@
import Link from "next/link";
import { FaDiscord, FaGithub, FaXTwitter } from "react-icons/fa6";
import { FooterLogo } from "./Logo";
import { FaGithub, FaXTwitter, FaDiscord } from "react-icons/fa6";
const navigation = {
other: [
@@ -33,7 +33,7 @@ export default function Footer() {
return (
<footer
className="mt-32 bg-gradient-to-b from-slate-50 to-slate-200 dark:from-slate-900 dark:to-slate-800"
className="bg-gradient-to-b from-slate-50 to-slate-200 pt-32 dark:from-slate-900 dark:to-slate-800"
aria-labelledby="footer-heading">
<h2 id="footer-heading" className="sr-only">
Footer

View File

@@ -278,6 +278,11 @@ export default function Header() {
className="text-sm font-medium text-slate-400 hover:text-slate-700 dark:hover:text-slate-300 lg:text-base">
Pricing
</Link>
<Link
href="/concierge"
className="text-sm font-medium text-slate-400 hover:text-slate-700 dark:hover:text-slate-300 lg:text-base">
Concierge
</Link>
<Link
href="/docs"
className="text-sm font-medium text-slate-400 hover:text-slate-700 dark:hover:text-slate-300 lg:text-base">
@@ -293,12 +298,6 @@ export default function Header() {
className="text-base font-medium text-slate-400 hover:text-slate-700 dark:hover:text-slate-300">
Careers <p className="bg-brand inline rounded-full px-2 text-xs text-white">1</p>
</Link> */}
<Link
href="/concierge"
className="text-sm font-medium text-slate-400 hover:text-slate-700 dark:hover:text-slate-300 lg:text-base">
Concierge
</Link>
</Popover.Group>
<div className="hidden flex-1 items-center justify-end md:flex">
<ThemeSelector className="relative z-10 mr-2 lg:mr-5" />

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 KiB

View File

@@ -6,3 +6,14 @@ export function formatDate(dateString: string) {
timeZone: "UTC",
});
}
export function generateManagementApiMetadata(title, methods) {
// Create a string from the methods array, formatted for title and description
const formattedMethods = methods.join(", ").replace(/, ([^,]*)$/, " or $1");
return {
title: `Formbricks ${title} API: ${
formattedMethods.charAt(0).toUpperCase() + formattedMethods.slice(1)
} ${title}`,
description: `Dive into Formbricks' ${title} API within the Public Client API suite. This API is designed for ${formattedMethods} operations on ${title}, facilitating client-side interactions without the need for authentication, thereby ensuring data privacy and efficiency.`,
};
}

View File

@@ -25,6 +25,11 @@ const nextConfig = {
hostname: "seo-strapi-aws-s3.s3.eu-central-1.amazonaws.com",
port: "",
},
{
protocol: "https",
hostname: "avatars.githubusercontent.com",
port: "",
},
],
},
async redirects() {
@@ -160,6 +165,11 @@ const nextConfig = {
destination: "/docs/contributing/setup#gitpod",
permanent: true,
},
{
source: "/formtribe",
destination: "/community",
permanent: true,
},
];
},
async rewrites() {

View File

@@ -28,6 +28,11 @@ export default async function handle(req: NextApiRequest, res: NextApiResponse)
"Centralize community, product, and customer data to understand which companies are engaging with your open source project.",
href: "https://www.crowd.dev",
},
{
name: "DevHunt",
description: "Find the best Dev Tools upvoted by the community every week.",
href: "https://devhunt.org/",
},
{
name: "Documenso",
description:

View File

@@ -1,101 +0,0 @@
import Layout from "@/components/shared/Layout";
import HeroTitle from "@/components/shared/HeroTitle";
import { Button } from "@formbricks/ui/Button";
import { ArrowTopRightOnSquareIcon } from "@heroicons/react/24/outline";
import { useRouter } from "next/router";
import { ChatBubbleOvalLeftEllipsisIcon, EnvelopeIcon } from "@heroicons/react/24/solid";
const topContributors = [
{
name: "Midka",
href: "https://github.com/kymppi",
},
{
name: "Pandeyman",
href: "https://github.com/pandeymangg",
},
{
name: "Ashu",
href: "https://github.com/Ashutosh-Bhadauriya",
},
{
name: "Timothy",
href: "https://github.com/timothyde",
},
{
name: "Shubhdeep",
href: "https://github.com/Shubhdeep12",
},
];
const CommunityPage = () => {
const router = useRouter();
return (
<Layout
title="Community | Formbricks Open Source Forms & Surveys"
description="You're building open source forms and surveys? So are we! Get support for anything your building - or just say hi!">
<HeroTitle headingPt1="Join the" headingTeal="Formbricks" headingPt2="Community 🤍" />
<div className="mb-32 grid grid-cols-1 px-4 md:grid-cols-2 md:gap-8 md:px-16">
<div className="mb-6 rounded-lg bg-gradient-to-b from-slate-200 to-slate-300 px-10 py-6 dark:from-slate-800 dark:to-slate-700 md:mb-0">
<h2 className="mt-7 text-3xl font-bold text-slate-800 dark:text-slate-200 xl:text-4xl">
Top Contributors
</h2>
<p className="mt-2 text-sm text-slate-500 dark:text-slate-400">
Super thankful to have you guys contribute for Formbricks 🙌
</p>
<ol className="ml-4 mt-10 list-decimal">
{topContributors.map((MVP) => (
<li
key={MVP.name}
className="my-3 text-lg font-bold text-slate-700 hover:text-slate-600 dark:text-slate-300 dark:hover:text-slate-400">
<a href={MVP.href} className="" target="_blank" rel="noreferrer">
{MVP.name}
<ArrowTopRightOnSquareIcon className="text-brand-dark dark:text-brand-light mb-1 ml-1 inline h-5 w-5" />
</a>
</li>
))}
</ol>
</div>
<div>
<div className="rounded-lg bg-gradient-to-b from-slate-200 to-slate-300 px-10 pb-12 pt-6 dark:from-slate-800 dark:to-slate-700">
<h3 className="mt-7 text-3xl font-bold text-slate-800 dark:text-slate-200 xl:text-4xl">
Community Discord
</h3>
<p className="mt-2 text-sm text-slate-500 dark:text-slate-400">
Get support for anything your building - or just say hi 👋
</p>
<Button
className="mt-7 w-full justify-center"
variant="highlight"
onClick={() => router.push("/discord")}>
Join Discord <ChatBubbleOvalLeftEllipsisIcon className="ml-1 inline h-5 w-5" />
</Button>
</div>
<div className="mt-7 flex">
<a
href="https://twitter.com/formbricks"
target="_blank"
rel="noreferrer"
className="delay-50 w-1/2 transition ease-in-out hover:scale-105">
<div className="mr-3 flex justify-center rounded-lg bg-gradient-to-b from-slate-200 to-slate-300 py-6 dark:from-slate-800 dark:to-slate-700">
<svg fill="currentColor" viewBox="0 0 24 24" className="h-20 w-20 text-[#1DA1F2]">
<path d="M8.29 20.251c7.547 0 11.675-6.253 11.675-11.675 0-.178 0-.355-.012-.53A8.348 8.348 0 0022 5.92a8.19 8.19 0 01-2.357.646 4.118 4.118 0 001.804-2.27 8.224 8.224 0 01-2.605.996 4.107 4.107 0 00-6.993 3.743 11.65 11.65 0 01-8.457-4.287 4.106 4.106 0 001.27 5.477A4.072 4.072 0 012.8 9.713v.052a4.105 4.105 0 003.292 4.022 4.095 4.095 0 01-1.853.07 4.108 4.108 0 003.834 2.85A8.233 8.233 0 012 18.407a11.616 11.616 0 006.29 1.84" />
</svg>
</div>
</a>
<a
href="mailto:hola@formbricks.com"
className="delay-50 w-1/2 transition ease-in-out hover:scale-105">
<div className="ml-3 flex justify-center rounded-lg bg-gradient-to-b from-slate-200 to-slate-300 py-6 dark:from-slate-800 dark:to-slate-700">
<EnvelopeIcon className="ml-1 h-20 w-20 text-slate-400 " />
</div>
</a>
</div>
</div>
</div>
</Layout>
);
};
export default CommunityPage;

View File

@@ -0,0 +1,44 @@
import Image from "next/image";
import Link from "next/link";
import { FaGithub } from "react-icons/fa6";
type Contributor = {
githubId: string;
imgUrl: string;
name: string;
};
type GridComponentProps = {
contributors: Contributor[];
};
const ContributorGrid: React.FC<GridComponentProps> = ({ contributors }) => {
return (
<div className="-mb-64 mt-24 grid scale-105 grid-cols-4 gap-6 md:-mb-32 md:grid-cols-8">
{contributors?.map((contributor, index) => (
<div key={index} className={`col-span-1 ${index % 2 !== 0 ? "-mt-8" : ""}`}>
<Link
href={`https://github.com/${contributor.githubId}`}
target="_blank"
className="group transition-transform">
<div className="bg-brand-dark mx-auto -mb-12 flex w-fit max-w-[90%] items-center justify-center rounded-t-xl px-4 pb-3 pt-1 text-sm text-slate-100 transition-all group-hover:-mt-12 group-hover:mb-0">
<FaGithub className="mr-2 h-4 w-4" />
<p className="max-w-[100px] overflow-hidden text-ellipsis whitespace-nowrap">
{contributor.githubId}
</p>
</div>
<Image
src={contributor.imgUrl}
alt={contributor.name}
className="ring-brand-dark rounded-lg ring-offset-4 ring-offset-slate-900 transition-all hover:scale-110 hover:ring-1"
width={500}
height={500}
/>
</Link>
</div>
))}
</div>
);
};
export default ContributorGrid;

View File

@@ -0,0 +1,93 @@
import DeputyBadge from "@/images/formtribe/deputy-batch.png";
import LegendBadge from "@/images/formtribe/legend-batch.png";
import PrimeBadge from "@/images/formtribe/prime-batch.png";
import RookieBadge from "@/images/formtribe/rookie-batch.png";
import Image from "next/image";
import Link from "next/link";
interface Member {
name: string;
githubId: string;
level: string;
imgUrl: string;
}
interface RoadmapProps {
members: Member[];
}
interface BadgeSectionProps {
badgeImage: any;
level: string;
members: Member[];
className: string; // New property for styling
}
const BadgeSection: React.FC<BadgeSectionProps> = ({ badgeImage, level, members, className }) => {
const filteredMembers = members?.filter((member) => member.level === level);
return (
<div className="group flex flex-col items-center space-y-6 pt-12 md:flex-row md:space-x-10 md:px-4">
<Image
src={badgeImage}
alt={`${level} badge`}
className="h-32 w-32 transition-all delay-100 duration-300 group-hover:-rotate-6 group-hover:scale-110"
/>
<div className="grid w-full gap-2 md:grid-cols-3">
{filteredMembers?.length > 0 ? (
filteredMembers?.map((member) => (
<Link
key={member.githubId}
href={`https://github.com/formbricks/formbricks/pulls?q=is:pr+author:${member.githubId}`}
target="_blank"
className={`flex w-full items-center space-x-3 rounded-xl border px-4 py-1 transition-all hover:scale-105 md:px-5 md:py-2 ${className}`}>
<Image
src={member.imgUrl}
alt={member.githubId}
className="mr-3 h-8 w-8 rounded-full md:h-12 md:w-12"
width={100}
height={100}
/>
{member.name}
</Link>
))
) : (
<div className="text-center text-slate-700">No Legends around yet 👀</div>
)}
</div>
</div>
);
};
export const HallOfFame: React.FC<RoadmapProps> = ({ members }) => {
return (
<div className="mx-auto space-y-12 divide-y-2">
<BadgeSection
badgeImage={LegendBadge}
level="legend"
members={members}
className="border-green-300 bg-green-100 text-green-700"
/>
<BadgeSection
badgeImage={PrimeBadge}
level="prime"
members={members}
className="border-indigo-200 bg-indigo-100 text-indigo-700"
/>
<BadgeSection
badgeImage={DeputyBadge}
level="deputy"
members={members}
className="border-orange-200 bg-orange-100 text-orange-700"
/>
<BadgeSection
badgeImage={RookieBadge}
level="rookie"
members={members}
className="border-amber-200 bg-amber-100 text-amber-700"
/>
</div>
);
};
export default HallOfFame;

View File

@@ -1,15 +1,15 @@
import Logo from "@/images/formtribe/formtribe-logo.png";
import { Popover, PopoverContent, PopoverTrigger } from "@formbricks/ui/Popover";
import footerLogoDark from "@/images/logo/footerlogo-dark.svg";
import { Button } from "@formbricks/ui/Button";
import { Popover, PopoverContent, PopoverTrigger } from "@formbricks/ui/Popover";
import { Bars3Icon } from "@heroicons/react/24/solid";
import Image from "next/image";
import Link from "next/link";
import { useState } from "react";
const navigation = [
{ name: "How it works", href: "#how" },
{ name: "Prizes", href: "#prizes" },
{ name: "Leaderboard", href: "#leaderboard" },
{ name: "Roadmap", href: "#roadmap" },
{ name: "Levels", href: "#levels" },
{ name: "Hall of Fame", href: "#hof" },
{ name: "FAQ", href: "#faq" },
];
@@ -17,33 +17,30 @@ export default function HeaderLight() {
const [mobileNavMenuOpen, setMobileNavMenuOpen] = useState(false);
return (
<div className="mx-auto flex w-full items-center justify-between py-6 sm:px-2 ">
<div className="= mx-auto flex w-full max-w-7xl items-center justify-between py-6 sm:px-2 ">
<div className="flex items-center justify-start">
<Link href="/">
<span className="sr-only">FormTribe</span>
<Image alt="Formtribe Logo" src={Logo} className="ml-7 h-8 w-auto sm:h-10" />
<Image alt="Formbricks Logo" src={footerLogoDark} className="h-8 w-auto pl-4 sm:h-10" />
</Link>
<Link
href="https://formbricks.com/github"
target="_blank"
className="ml-6 mt-1 text-sm text-slate-500 hover:scale-105">
className="ml-6 mt-1 text-sm text-slate-300 hover:scale-105">
Star us
</Link>
</div>
{/* Desktop Menu */}
<div className="hidden items-center gap-x-8 text-slate-700 md:flex">
<div className="hidden items-center gap-x-8 text-slate-300 md:flex">
{navigation.map((navItem) => (
<Link key={navItem.name} href={navItem.href} className="hover:scale-105">
{navItem.name}
</Link>
))}
<Button
variant="highlight"
className="font-kablammo ml-2 bg-gradient-to-br from-[#032E1E] via-[#032E1E] to-[#013C27] text-xl"
href="#join">
Join
<Button variant="secondary" size="sm" className="ml-2" href="https://formbricks.com/discord">
Join us!
</Button>
</div>
@@ -52,17 +49,17 @@ export default function HeaderLight() {
<Popover open={mobileNavMenuOpen} onOpenChange={setMobileNavMenuOpen}>
<PopoverTrigger onClick={() => setMobileNavMenuOpen(!mobileNavMenuOpen)}>
<span>
<Bars3Icon className="h-8 w-8 rounded-md bg-slate-200 p-1 text-slate-600" />
<Bars3Icon className="h-8 w-8 rounded-md bg-slate-700 p-1 text-slate-200" />
</span>
</PopoverTrigger>
<PopoverContent className="mr-4 bg-slate-100 shadow">
<PopoverContent className="border-slate-600 bg-slate-700 shadow">
<div className="flex flex-col">
{navigation.map((navItem) => (
<Link key={navItem.name} href={navItem.href}>
<div
onClick={() => setMobileNavMenuOpen(false)}
className="flex items-center space-x-2 rounded-md p-2">
<span className="font-medium text-slate-600">{navItem.name}</span>
<span className="font-medium text-slate-200">{navItem.name}</span>
</div>
</Link>
))}

View File

@@ -10,14 +10,10 @@ interface LayoutProps {
export default function Layout({ title, description, children }: LayoutProps) {
return (
<div className="max-w-8xl mx-auto">
<div className="mx-auto bg-gradient-to-br from-gray-800 via-gray-900 to-gray-900">
<MetaInformation title={title} description={description} />
<HeaderTribe />
{
<main className="relative mx-auto flex w-full max-w-6xl flex-col justify-center px-2 lg:px-8 xl:px-12">
{children}
</main>
}
<main className="">{children}</main>
<Footer />
</div>
);

View File

@@ -0,0 +1,41 @@
import Image from "next/image";
import React from "react";
import { StaticImageData } from "next/image";
type Task = {
title: string;
description: string;
};
type LevelCardProps = {
badgeSrc: StaticImageData; // or string if it's a URL
badgeAlt: string;
title: string;
points: string;
tasks: Task[];
};
const LevelCard: React.FC<LevelCardProps> = ({ badgeSrc, badgeAlt, title, points, tasks }) => (
<div className="group">
<div className="flex w-full flex-col items-center rounded-t-xl bg-slate-700 p-10 transition-colors">
<Image
src={badgeSrc}
alt={badgeAlt}
className="h-32 w-32 transition-all delay-100 duration-300 group-hover:-rotate-6 group-hover:scale-110"
/>
<p className="mt-4 text-lg font-bold text-slate-200">{title}</p>
<p className="text-sm leading-5 text-slate-400">{points}</p>
</div>
<div className="w-full rounded-b-xl bg-slate-600 p-10 text-left">
{tasks?.map((task, index) => (
<React.Fragment key={index}>
<p className="font-bold text-slate-200">{task.title}</p>
<p className="mb-6 leading-5 text-slate-400">{task.description}</p>
</React.Fragment>
))}
</div>
</div>
);
export default LevelCard;

View File

@@ -0,0 +1,45 @@
import Image from "next/image";
import Link from "next/link";
import { FaGithub } from "react-icons/fa6";
type Contributor = {
githubId: string;
imgUrl: string;
name: string;
};
type LevelGridProps = {
contributors: Contributor[];
};
const LevelGrid: React.FC<LevelGridProps> = ({ contributors }) => {
return (
<div className="-mt-64 grid scale-105 grid-cols-4 gap-6 md:-mt-32 md:grid-cols-8">
{contributors?.map((contributor, index) => (
<div key={index} className={`col-span-1 ${index % 2 !== 0 ? "-mt-8" : ""}`}>
<Link
href={`https://github.com/${contributor.githubId}`}
target="_blank"
rel="noopener noreferrer"
className="group transition-transform">
<div className="bg-brand-dark mx-auto -mb-12 flex w-fit max-w-[90%] items-center justify-center rounded-t-xl px-4 pb-3 pt-1 text-sm text-slate-100 transition-all group-hover:-mt-12 group-hover:mb-0">
<FaGithub className="mr-2 h-4 w-4" />
<p className="max-w-[100px] overflow-hidden text-ellipsis whitespace-nowrap">
{contributor.githubId}
</p>
</div>
<Image
src={contributor.imgUrl}
alt={contributor.name}
className="ring-brand-dark rounded-lg ring-offset-4 ring-offset-slate-900 transition-all hover:scale-110 hover:ring-1"
width={500}
height={500}
/>
</Link>
</div>
))}
</div>
);
};
export default LevelGrid;

View File

@@ -0,0 +1,67 @@
import { Button } from "@formbricks/ui/Button";
import { ChevronDownIcon } from "@heroicons/react/24/outline";
import Link from "next/link";
import { FaGithub } from "react-icons/fa6";
interface Event {
name: string;
link?: string;
}
interface EventBlock {
id: string;
description: string;
period: string;
events: Event[];
}
interface RoadmapProps {
data: EventBlock[];
}
export const Roadmap: React.FC<RoadmapProps> = ({ data }) => {
return (
<div className="px-6 text-left">
{data?.map((eventblock) => (
<div key={eventblock.id} className="relative mb-6 border-l-2 border-slate-400 pb-2 pl-12">
<h3 className="my-4 hidden pt-2 font-semibold text-slate-800 md:block">
{eventblock.description} <span className="font-normal">{eventblock.period}</span>
</h3>
<h3 className="my-4 block pt-2 font-semibold text-slate-800 md:hidden">
{eventblock.description} <br></br> <span className="font-normal">{eventblock.period}</span>
</h3>
{eventblock?.events?.map((event) => (
<div key={event.name}>
{event.link ? (
<Link
href={event.link}
target="_blank"
className="group mb-2 flex max-w-fit justify-between rounded-xl border border-slate-200 bg-slate-100 px-6 py-3 text-slate-700 transition-all hover:scale-105 hover:border-slate-300 hover:bg-slate-200">
{event.name}
<FaGithub className="ml-0 inline-block h-6 w-0 text-slate-800 opacity-0 transition-all group-hover:ml-6 group-hover:w-6 group-hover:opacity-100" />
</Link>
) : (
<div className="mb-2 block max-w-fit rounded-xl border border-slate-200 bg-slate-100 px-6 py-3 text-slate-700 transition-all">
{event.name}
</div>
)}
</div>
))}
{eventblock.id === "phlaunch" && (
<Button
href="https://formbricks.com/discord"
target="_blank"
variant="darkCTA"
className="rounded-xl px-5 py-2 text-base transition-all hover:scale-105">
Whats next? Request Features
</Button>
)}
<ChevronDownIcon className="absolute -left-[17px] -mt-3 h-8 w-8 text-slate-400" />
</div>
))}
<h3 className="text-xl font-bold">Internet Domination 😇</h3>
</div>
);
};
export default Roadmap;

View File

@@ -0,0 +1,723 @@
import ArrowGift from "@/images/formtribe/arrow-gift.png";
import HoodieSticker from "@/images/formtribe/arrow-hoodie.png";
import ArrowSticker from "@/images/formtribe/arrow-stickers.png";
import DeputyBadge from "@/images/formtribe/deputy-batch.png";
import LegendBadge from "@/images/formtribe/legend-batch.png";
import PrimeBadge from "@/images/formtribe/prime-batch.png";
import RookieBadge from "@/images/formtribe/rookie-batch.png";
import HallOfFame from "@/pages/community/HallOfFame";
import Roadmap from "@/pages/community/Roadmap";
import LoadingSpinner from "@formbricks/ui/LoadingSpinner";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@formbricks/ui/Tooltip";
import Image from "next/image";
import Link from "next/link";
import { useEffect } from "react";
import ContributorGrid from "./ContributorGrid";
import LayoutTribe from "./LayoutTribe";
import LevelCard from "./LevelCard";
import LevelsGrid from "./LevelGrid";
/* const SideQuests = [
{
points: "Spread the Word Tweet (100 Points)",
quest: "Tweet “🧱🚀” on the day of the ProductHunt launch to spread the word.",
proof: "Share the link to the tweet in the “side-quest” channel.",
},
{
points: "Meme Magic (50 Points + up to 100 Points)",
quest:
"Craft a meme where a brick plays a role. For extra points, tweet it, tag us and score +5 for each like.",
proof: "Share meme or link to the tweet in the “side-quest” channel.",
},
{
points: "GIF Magic (100 Points)",
quest:
"Create a branded gif related to Formbricks. Upload it to Giphy. For extra points, tweet it, tag us and score +5 for each like.",
proof: "Share link to Giphy in the “side-quest” channel.",
},
{
points: "Design a background (250 Points)",
quest: "Illustrate a captivating background for survey enthusiasts (more infos on Notion).",
proof: "Share the design in the “side-quest” channel.",
},
{
points: "Starry-eyed Supporter (250 Points)",
quest: "Get five friends to star our repository.",
proof: "Share 5 screenshots of the chats where you asked them and they confirmed + their GitHub names",
},
{
points: "Bug Hunter (100 Points)",
quest:
"Find and report any bugs in our core product. We will close all bugs on the landing page bc we don't have time for that before the launch :)",
proof: "Open a bug issue in our repository.",
},
{
points: "Brickify someone famous with AI (200 Points + up to 100 Points)",
quest:
"Find someone whose name would be funny as a play on words with “brick”. Then, with the help of AI, create a brick version of this person like Brick Astley, Brickj Minaj, etc. For extra points, tweet it, tag us and score +5 for each like.",
proof: "Share your art or link to the tweet in the “side-quest” channel.",
},
{
points: "Community Connector (50 points each, up to 250 points)",
quest:
"Introduce and onboard new members to the community. Have them join Discord and reply to their automated welcome message with your discord handle (in “say-hi” channel).",
proof: "New member joined and commented with your Discord handle",
},
{
points: "Feedback Fanatic (50 Points)",
quest: "Fill out our feedback survey after the hackathon with suggestions for improvement.",
proof: "Submit the survey.",
},
{
points: "Side Quest Babo (500 Points)",
quest: "Complete all side quests.",
proof: "All quests marked as completed.",
},
]; */
const LevelsData = [
{
badgeSrc: RookieBadge,
badgeAlt: "Rookie Badge",
title: "Repository Rookie",
points: "Level 1",
tasks: [
{ title: "Easy issues", description: "Warm up with the repo, get your first PR merged." },
{ title: "DevRel tasks", description: "Write docs and manuals for better understanding." },
],
},
{
badgeSrc: DeputyBadge,
badgeAlt: "Deputy Badge",
title: "Deploy Deputy",
points: "Level 2",
tasks: [
{ title: "Core Contributions", description: "Work on more complex issues. Get guidance." },
{ title: "Work with core team", description: "Work closely with the core team, learn faster." },
],
},
{
badgeSrc: PrimeBadge,
badgeAlt: "Prime Badge",
title: "Pushmaster Prime",
points: "Level 3",
tasks: [
{ title: "Cash Bounties", description: "Get access to issues with $$$ bounties." },
{ title: "Job Listings", description: "We hire top contributors. Hear about new jobs first!" },
],
},
{
badgeSrc: LegendBadge,
badgeAlt: "Legend Badge",
title: "Formbricks Legend",
points: "Special Honor",
tasks: [{ title: "Unconditional Love", description: "Finally. From the community and core team 🤍" }],
},
];
const TheDeal = [
{
os: "100% free",
free: "Unlimited Surveys",
pro: "Custom URL",
},
{
os: "All community features included",
free: "Unlimited Link Survey Submissions",
pro: "Remove Branding",
},
{
os: "It's your storage, go nuts!",
free: "Upload Limit 10 MB",
pro: "Unlimited Uploads",
},
{
os: "Hook up your own Stripe",
free: "Payments with 2% Mark Up",
pro: "Remove Mark Up from Payments",
},
{
os: "Your server, your rules",
free: "Invite Team Members",
pro: "",
},
{
os: "The 'Do what you want' plan",
free: "Verify Email before Submission",
pro: "",
},
{
os: "at this point I'm just filling rows",
free: "Partial Submissions",
pro: "",
},
{
os: "I should stop",
free: "Custom Thank You Page",
pro: "",
},
{
os: "ok one more",
free: "Close Survey after Submission Limit",
pro: "",
},
{
os: "no flavor like free flavor",
free: "Custom Survey Closed Message",
pro: "",
},
{
os: "...",
free: "Close Survey on Date",
pro: "",
},
{
free: "Redirect on Completion",
pro: "",
},
{
free: "+ all upcoming community-built features",
pro: "",
},
];
const FAQ = [
{
question: "Why do I have to sign a CLA?",
answer:
"To assure this project to be financially viable, we have to be able to relicense the code for enterprise customers and governments. To be able to do so, we are legally obliged to have you sign a CLA.",
},
{
question: "Where will this be hosted?",
answer:
"We offer a Formbricks Cloud hosted in Germany with a generous free plan but you can also easily self-host using Docker.",
},
{
question: "Why is there a Commercial plan?",
answer:
"The commercial plan is for features who break the OSS WIN-WIN Loop or incur additional cost. We charge 29$ if you want a custom domain, remove Formbricks branding, collect large files in surveys or collect payments. We think thats fair :)",
},
{
question: "Are your in app surveys also free forever?",
answer:
"The in app surveys you can run with Formbricks are not part of this Deal. We offer a generous free plan but keep full control over the pricing in the long run. In app surveys are really powerful for products with thousands of users and something has to bring in the dollars.",
},
{
question: "Can anyone join?",
answer:
"Yes! Even when you dont know how to write code you can become part of the community completing side quests. As long as you know how to open a PR you are very welcome to take part irrespective of your age, gender, nationality, food preferences, taste in clothing and favorite Pokemon.",
},
{
question: "How do I level up?",
answer:
"Every PR gives you points - doesnt matter if its for code related tasks or non-code ones. With every point, you move closer to levelling up!",
},
];
const roadmapDates = [
{
id: "earlywork",
description: "Previously at Formbricks",
period: "February until September 2023",
events: [{ name: "Formbricks team building out surveying infrastructure" }],
},
{
id: "hackathon",
description: "Hackathon Kick-Off 🔥",
period: "1st October 2023",
events: [
{ name: "✅ Email Embeds", link: "https://github.com/formbricks/formbricks/pull/873" },
{ name: "✅ Hidden Fields", link: "https://github.com/formbricks/formbricks/pull/1144" },
{
name: "✅ Question Type: Picture Choice",
link: "https://github.com/formbricks/formbricks/pull/1388",
},
{ name: "✅ Question Type: Welcome Card", link: "https://github.com/formbricks/formbricks/pull/1073" },
{ name: "✅ Add Image to Question", link: "https://github.com/formbricks/formbricks/pull/1305" },
{ name: "✅ Dynamic Link Previews", link: "https://github.com/formbricks/formbricks/pull/1093" },
{ name: "✅ Fullscreen Previews", link: "https://github.com/formbricks/formbricks/pull/898" },
{ name: "✅ PIN protected surveys", link: "https://github.com/formbricks/formbricks/pull/1142" },
{ name: "✅ Source Tracking", link: "https://github.com/formbricks/formbricks/pull/1486" },
{ name: "✅ Time To Complete Indicator", link: "https://github.com/formbricks/formbricks/pull/1461" },
],
},
{
id: "phlaunch",
description: "Product Hunt Launch 🚀",
period: "31st October 2023",
events: [
{ name: "✅ Question Type: File Upload", link: "https://github.com/formbricks/formbricks/pull/1277" },
{ name: "✅ Notion Integration", link: "https://github.com/formbricks/formbricks/pull/1197" },
{ name: "✅ Media Backgrounds", link: "https://github.com/formbricks/formbricks/pull/1515" },
{ name: "🚧 Custom Styling", link: "https://github.com/formbricks/formbricks/pull/916" },
{ name: "🚧 Recall Information", link: "https://github.com/formbricks/formbricks/issues/884" },
{ name: "⏳ Unsplash Backgrounds" },
{ name: "⏳ Question Type: Matrix" },
{ name: "⏳ Question Type: Collect payment" },
{ name: "⏳Question Type: Schedule a call (Powered by Cal.com)" },
{ name: "⏳ Question Type: Signature (Powered by Documenso)" },
],
},
];
const members = [
{
name: "Shubham Palriwala",
githubId: "ShubhamPalriwala",
points: "100",
level: "prime",
imgUrl: "https://avatars.githubusercontent.com/u/55556994?v=4",
},
{
name: "Rotimi Best",
githubId: "rotimi-best",
points: "100",
level: "prime",
imgUrl: "https://avatars.githubusercontent.com/u/31730715?v=4",
},
{
name: "Dhruwang Jariwala",
githubId: "Dhruwang",
points: "100",
level: "prime",
imgUrl: "https://avatars.githubusercontent.com/u/67850763?v=4",
},
{
name: "Piyush Gupta",
githubId: "gupta-piyush19",
points: "100",
level: "prime",
imgUrl: "https://avatars.githubusercontent.com/u/56182734?v=4",
},
{
name: "Naitik Kapadia",
githubId: "KapadiaNaitik",
points: "100",
level: "deputy",
imgUrl: "https://avatars.githubusercontent.com/u/88614335?v=4",
},
{
name: "Anshuman Pandey",
githubId: "pandeymangg",
points: "100",
level: "prime",
imgUrl: "https://avatars.githubusercontent.com/u/54475686?v=4",
},
{
name: "Midka",
githubId: "kymppi",
points: "100",
level: "deputy",
imgUrl: "https://avatars.githubusercontent.com/u/48528700?v=4",
},
{
name: "Meet Patel",
githubId: "Meetcpatel",
points: "100",
level: "rookie",
imgUrl: "https://avatars.githubusercontent.com/u/26919832?v=4",
},
{
name: "Ankur Datta",
githubId: "Ankur-Datta-4",
points: "100",
level: "rookie",
imgUrl: "https://avatars.githubusercontent.com/u/75306530?v=4",
},
{
name: "Abhinav Arya",
githubId: "itzabhinavarya",
points: "100",
level: "rookie",
imgUrl: "https://avatars.githubusercontent.com/u/95561280?v=4",
},
{
name: "Anjy Gupta",
githubId: "anjy7",
points: "100",
level: "deputy",
imgUrl: "https://avatars.githubusercontent.com/u/92802904?v=4",
},
{
name: "Aditya Deshlahre",
githubId: "adityadeshlahre",
points: "100",
level: "rookie",
imgUrl: "https://avatars.githubusercontent.com/u/132184385?v=4",
},
{
name: "Ashutosh Bhadauriya",
githubId: "Ashutosh-Bhadauriya",
points: "100",
level: "rookie",
imgUrl: "https://avatars.githubusercontent.com/u/62984427?v=4",
},
{
name: "Bilal Mirza",
githubId: "bilalmirza74",
points: "100",
level: "rookie",
imgUrl: "https://avatars.githubusercontent.com/u/84387676?v=4",
},
{
name: "Timothy",
githubId: "timothyde",
points: "100",
level: "rookie",
imgUrl: "https://avatars.githubusercontent.com/u/13225886?v=4",
},
{
name: "Jonas Höbenreich",
githubId: "jonas-hoebenreich",
points: "100",
level: "rookie",
imgUrl: "https://avatars.githubusercontent.com/u/64426524?v=4",
},
{
name: "Pratik Awaik",
githubId: "PratikAwaik",
points: "100",
level: "deputy",
imgUrl: "https://avatars.githubusercontent.com/u/54103265?v=4",
},
{
name: "Rohan Gupta",
githubId: "rohan9896",
points: "100",
level: "rookie",
imgUrl: "https://avatars.githubusercontent.com/u/56235204?v=4",
},
{
name: "Shubham Khunt",
githubId: "shubhamkhunt04",
points: "100",
level: "rookie",
imgUrl: "https://avatars.githubusercontent.com/u/55044317?v=4",
},
{
name: "Joe",
githubId: "joe-shajan",
points: "100",
level: "rookie",
imgUrl: "https://avatars.githubusercontent.com/u/69904519?v=4",
},
{
name: "Ty Kerr",
githubId: "ty-kerr",
points: "100",
level: "deputy",
imgUrl: "https://avatars.githubusercontent.com/u/17407010?v=4",
},
{
name: "Olasunkanmi Balogun",
githubId: "SiR-PENt",
points: "100",
level: "rookie",
imgUrl: "https://avatars.githubusercontent.com/u/80556643?v=4",
},
{
name: "Ronit Panda",
githubId: "rtpa25",
points: "100",
level: "deputy",
imgUrl: "https://avatars.githubusercontent.com/u/72537293?v=4",
},
{
name: "Nafees Nazik",
githubId: "G3root",
points: "100",
level: "deputy",
imgUrl: "https://avatars.githubusercontent.com/u/84864519?v=4",
},
];
export default function FormTribeHackathon() {
// dark mode fix
useEffect(() => {
document.documentElement.classList.remove("dark");
}, []);
return (
<LayoutTribe
title="Join the FormTribe"
description="We build an Open Source Typeform alternative together and give it to the world. Join us!">
{/* Header */}
<div className="flex h-full w-full flex-col items-center justify-center overflow-clip text-center">
<div className="py-16 md:py-24">
<h1 className="mt-10 px-6 text-3xl font-bold text-slate-100 sm:text-4xl md:text-5xl">
<span className="xl:inline">
Beautiful Open Source Surveys. <br className="hidden md:block"></br>Built as a community, free
forever.
</span>
</h1>
<p className="xs:max-w-none mx-auto mt-3 max-w-xs text-base text-slate-300 sm:text-lg md:mt-6 md:text-xl">
The time is ripe, this is needed. So we ship it as a community - and give it back to the world!
<br></br>Join us and build surveying infrastructure for millions - free and open source.
</p>
</div>
<ContributorGrid contributors={members} />
</div>
{/* Roadmap */}
<div
className="flex flex-col items-center justify-center bg-gradient-to-br from-white to-slate-100 pb-12 text-center md:pb-24"
id="roadmap">
<div className="py-16 md:py-24">
<h2 className="mt-10 text-2xl font-bold text-slate-800 sm:text-3xl md:text-4xl">
<span className="xl:inline">
First Things First: <br></br>An Open Source Typeform Alternative
</span>
</h2>
<p className="xs:max-w-none mx-auto mt-3 max-w-xs text-base text-slate-600 sm:text-lg md:mt-6 md:text-xl">
It&apos;s been requested many times over, so Typeform-like surveys is where we start.
<br></br>In October, we kicked it off in style with a 30-day hackathon.
</p>
</div>
<Roadmap data={roadmapDates} />
</div>
{/* Levels */}
<div
className="mb-12 flex flex-col items-center justify-center overflow-clip text-center lg:mb-40"
id="levels">
<LevelsGrid contributors={members} />
<div className="py-16 md:py-24">
<h2 className="mt-10 px-8 text-2xl font-bold text-slate-100 sm:text-3xl md:text-4xl">
<span className="xl:inline">Write Code, Level Up and Unlock Benefits</span>
</h2>
<p className="xs:max-w-none mx-auto mt-3 max-w-xs text-base text-slate-300 sm:text-lg md:mt-6 md:text-xl">
The more you contribute, the more points you collect.
<br className="hidden md:block"></br> Unlock benefits like cash bounties, limited merch and more!
</p>
</div>
<div className="max-w-8xl grid gap-6 px-8 md:grid-cols-4 lg:px-24">
{LevelsData.map((badge, index) => (
<LevelCard key={index} {...badge} />
))}
</div>
<div className="max-w-8xl mt-8 grid grid-cols-3 gap-4 px-56">
<div className="px-8">
<p className="h-0 text-lg font-bold text-slate-300">+ Sticker Set</p>
<Image src={ArrowSticker} alt="rookie batch" className="" />
</div>
<div className="px-8">
<p className="h-0 text-lg font-bold text-slate-300">+ Hoodie</p>
<Image src={HoodieSticker} alt="rookie batch" className="" />
</div>
<div className="px-8">
<p className="h-0 text-lg font-bold text-slate-300">+ Handmade Gift</p>
<Image src={ArrowGift} alt="rookie batch" className="" />
</div>
</div>
</div>
{/* Become a Legend */}
<div
className="flex flex-col items-center justify-center bg-gradient-to-br from-white to-slate-100 pb-24 text-center"
id="hof">
<div className="py-16 md:py-24">
<h2 className="mt-10 text-2xl font-bold text-slate-800 sm:text-3xl md:text-4xl">
<span className="xl:inline">
Become a<br className="md:hidden"></br> Formbricks Legend
</span>
</h2>
<p className="xs:max-w-none mx-auto mt-3 max-w-xs text-base text-slate-600 sm:text-lg md:mt-6 md:text-xl">
This is your wall of fame. Were honoured to be in this together!
</p>
</div>
<HallOfFame members={members} />
</div>
{/* Our values */}
<div className="mb-24 flex flex-col items-center justify-center text-center md:mb-40">
<div className="py-16 md:py-24">
<h2 className="mt-10 text-2xl font-bold text-slate-100 sm:text-3xl md:text-4xl">
<span className="xl:inline">Our values</span>
</h2>
<p className="xs:max-w-none mx-auto mt-3 max-w-xs text-base text-slate-300 sm:text-lg md:mt-6 md:text-xl">
Apart from being decent human beings, this is what we value:
</p>
</div>
<div className="max-w-8xl grid gap-x-6 gap-y-6 px-8 md:grid-cols-3 md:px-16">
<ValueCard
emoji="🧘‍♂️"
title="Less is more."
description="Like with friends, were about forming deep and meaningful relationships within our community. If you want to merge a PR with improved punctuation to catch a green square, this is likely not the right place for you :)"
/>
<ValueCard
emoji="🤝"
title="Show up & Pull through."
description="When you pick a task up, please make sure to complete it in timely manner. The longer it floats around, the more merge conflicts arise."
/>
<ValueCard
emoji="🍔"
title="Only bite off what you can chew."
description="Open source is all about learning and so is our community. We love help you learn but have to manage our resources well. Please dont take up tasks far outside your area of competence."
/>
</div>
</div>
{/* Side Quests
<div className="mt-16" id="side-quests">
<h3 className="font-kablammo my-4 text-4xl text-slate-800">🏰 Side Quests: Increase your chances</h3>
<p className="w-3/4 text-slate-600">
While code contributions are what gives the most points, everyone gets to bump up their chance of
winning. Here is a list of side quests you can complete:
</p>
<div className="mt-8">
<TooltipProvider delayDuration={50}>
{SideQuests.map((quest) => (
<div key={quest.points}>
<Tooltip>
<TooltipTrigger>
<div className="mb-2 flex items-center gap-x-6">
<div className="text-2xl">✅</div>
<p className="text-left font-bold text-slate-700">
{quest.points}: <span className="font-normal">{quest.quest}</span>
</p>
</div>
</TooltipTrigger>
<TooltipContent side={"top"}>
<p className="py-2 text-center text-slate-500 dark:text-slate-400">
<p className="mt-1 text-sm text-slate-600">Proof: {quest.proof}</p>
</p>
</TooltipContent>
</Tooltip>
</div>
))}
</TooltipProvider>
</div>
<Button
variant="darkCTA"
href="https://formbricks.notion.site/FormTribe-Side-Quests-4ab3b294cfa04e94b77dfddd66378ea2?pvs=4"
target="_blank"
className="mt-6 bg-gradient-to-br from-[#032E1E] via-[#032E1E] to-[#013C27] text-white ">
Keep track with Notion Template
</Button>
</div> */}
{/* The Promise */}
<div className="flex flex-col items-center justify-center bg-gradient-to-br from-white to-slate-100 pb-24 text-center">
<div className="py-16 md:py-24">
<h2 className="mt-10 text-2xl font-bold text-slate-800 sm:text-3xl md:text-4xl">
<span className="xl:inline">The Deal</span>
</h2>
<p className="xs:max-w-none mx-auto mt-3 max-w-xs text-base text-slate-600 sm:text-lg md:mt-6 md:text-xl">
We&apos;re kinda making a handshake agreement here. This is it:
</p>
</div>
<div className="mx-auto max-w-4xl px-4">
<div>
<div className="grid grid-cols-2 items-end rounded-t-lg border border-slate-200 bg-slate-100 px-6 py-3 text-sm font-bold text-slate-800 sm:text-base md:grid-cols-3">
<div>Self-hosted</div>
<div>Formbricks Cloud</div>
<TooltipProvider delayDuration={50}>
<Tooltip>
<TooltipTrigger asChild>
<div className="hidden md:block">
Formbricks Cloud Pro{" "}
<span className="ml-1 hidden rounded-full bg-slate-700 px-2 text-xs font-normal text-white sm:inline">
Why tho?
</span>
</div>
</TooltipTrigger>
<TooltipContent sideOffset={5} className="max-w-lg font-normal">
You can always self-host to get all features free.
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
{TheDeal.map((feature) => (
<div
key={feature.free}
className="grid grid-cols-2 gap-x-2 border-x border-b border-slate-200 px-6 py-3 text-sm text-slate-900 last:rounded-b-lg md:grid-cols-3">
<div>{feature.os}</div>
<div>{feature.free}</div>
<div className="hidden md:block">{feature.pro}</div>
</div>
))}
</div>
<div className="rounded-lg-12 mt-6 grid-cols-6 rounded-lg bg-slate-100 py-12 sm:grid">
<div className="col-span-1 mr-8 flex items-center justify-center sm:justify-end">
<div className="flex h-12 w-12 items-center justify-center rounded-full bg-white text-3xl">
🤓
</div>
</div>
<div className="col-span-5 px-8 text-left sm:px-0">
<h3 className="mt-4 text-lg font-semibold text-slate-700 sm:mt-0">
Are Formbricks in-app surveys also free?
</h3>
<p className="text-slate-500 sm:pr-16">
Just a heads-up: this deal doesn&apos;t cover Formbricks&apos; in-app surveys. We&apos;ve got
a solid free plan, but we&apos;ve gotta keep some control over pricing to keep things running
long-term.
</p>
</div>
</div>
</div>
</div>
{/* Get started */}
<div className=" mb-40 flex flex-col items-center justify-center text-center">
<div className="py-16 md:py-24">
<h2 className="mt-10 text-2xl font-bold text-slate-100 sm:text-3xl md:text-4xl">
<span className="xl:inline">Get started</span>
</h2>
<p className="xs:max-w-none mx-auto mt-3 max-w-xs text-base italic text-slate-300 sm:text-lg md:mt-6 md:text-xl">
We&apos;re still setting things up,{" "}
<Link
href="https://formbricks.com/discord"
className="decoration-brand-dark underline underline-offset-2">
join our Discord
</Link>{" "}
to stay in the loop :)
</p>
</div>
<LoadingSpinner />
</div>
{/* FAQ */}
<div id="faq" className="bg-gradient-to-br from-white to-slate-100 px-8 pb-24 lg:px-32 ">
<div className="max-w-6xl">
<div className="py-16 md:py-24 ">
<h2 className="mt-10 text-2xl font-bold text-slate-800 sm:text-3xl md:text-4xl">
<span className="xl:inline">FAQ</span>
</h2>
<p className="xs:max-w-none mx-auto mt-3 max-w-xs text-base text-slate-600 sm:text-lg md:mt-6 md:text-xl">
Anything unclear?
</p>
</div>
{FAQ.map((question) => (
<div key={question.question} className="">
<div>
<h3 className="mt-6 text-lg font-bold text-slate-700">{question.question} </h3>
<p className="text-slate-600">{question.answer}</p>
</div>
</div>
))}
</div>
</div>
</LayoutTribe>
);
}
const ValueCard = ({ title, description, emoji }) => {
return (
<div className="rounded-xl bg-slate-800 p-3 text-left">
<div className="mb-4 flex h-24 items-center justify-center rounded-xl border border-slate-600 bg-slate-700 text-6xl">
{emoji}
</div>
<div className="px-2">
<h2 className="text-xl font-bold text-slate-300">
<span className="xl:inline">{title}</span>
</h2>
<p className=" leading-6 text-slate-400">{description}</p>
</div>
</div>
);
};

File diff suppressed because it is too large Load Diff

View File

@@ -97,7 +97,7 @@ const linkSurveys = {
{ name: "Custom Styling", free: true, paid: true, comingSoon: true },
{ name: "Recall Information", free: true, paid: true, comingSoon: true },
{ name: "Collect Payments, Signatures and Appointments", free: true, paid: true, comingSoon: true },
{ name: "Custom URL", free: false, paid: true },
{ name: "Custom URL", free: false, paid: true, comingSoon: true },
{ name: "Remove Formbricks Branding", free: false, paid: true },
],

View File

@@ -15,23 +15,23 @@
"@formbricks/ui": "workspace:*",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"storybook": "^7.4.6"
"storybook": "^7.6.3"
},
"devDependencies": {
"@formbricks/tsconfig": "workspace:*",
"@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/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/testing-library": "^0.2.2",
"@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"
"@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"
}
}

View File

@@ -1,13 +1,19 @@
# Installer stage: Building the application
FROM node:18-alpine AS installer
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
@@ -17,19 +23,25 @@ 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...
# Runner stage: Setting up the runtime environment
FROM node:18-alpine AS runner
FROM node:20-alpine AS runner
RUN corepack enable && corepack prepare pnpm@latest --activate
RUN apk add --no-cache curl \

View File

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

View File

@@ -0,0 +1,95 @@
import React, { useState } from "react";
import { getPersonIdentifier } from "@formbricks/lib/person/util";
import Headline from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/Headline";
import { timeSince } from "@formbricks/lib/time";
import type { TSurveyDateQuestion, TSurveyQuestionSummary } from "@formbricks/types/surveys";
import { PersonAvatar } from "@formbricks/ui/Avatars";
import { InboxStackIcon } from "@heroicons/react/24/solid";
import Link from "next/link";
import { questionTypes } from "@/app/lib/questions";
import { formatDateWithOrdinal } from "@formbricks/lib/utils/datetime";
interface DateQuestionSummary {
questionSummary: TSurveyQuestionSummary<TSurveyDateQuestion>;
environmentId: string;
responsesPerPage: number;
}
export default function DateQuestionSummary({
questionSummary,
environmentId,
responsesPerPage,
}: DateQuestionSummary) {
const questionTypeInfo = questionTypes.find((type) => type.id === questionSummary.question.type);
const [displayCount, setDisplayCount] = useState(responsesPerPage);
return (
<div className="rounded-lg border border-slate-200 bg-slate-50 shadow-sm">
<div className="space-y-2 px-4 pb-5 pt-6 md:px-6">
<Headline headline={questionSummary.question.headline} required={questionSummary.question.required} />
<div className="flex space-x-2 text-xs font-semibold text-slate-600 md:text-sm">
<div className="flex items-center rounded-lg bg-slate-100 p-2 ">
{questionTypeInfo && <questionTypeInfo.icon className="mr-2 h-4 w-4 " />}
{questionTypeInfo ? questionTypeInfo.label : "Unknown Question Type"} Question
</div>
<div className=" flex items-center rounded-lg bg-slate-100 p-2">
<InboxStackIcon className="mr-2 h-4 w-4" />
{questionSummary.responses.length} Responses
</div>
</div>
</div>
<div className="rounded-b-lg bg-white ">
<div className="grid h-10 grid-cols-4 items-center border-y border-slate-200 bg-slate-100 text-sm font-bold text-slate-600">
<div className="pl-4 md:pl-6">User</div>
<div className="col-span-2 pl-4 md:pl-6">Response</div>
<div className="px-4 md:px-6">Time</div>
</div>
{questionSummary.responses.slice(0, displayCount).map((response) => {
const displayIdentifier = getPersonIdentifier(response.person!);
return (
<div
key={response.id}
className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 md:text-base">
<div className="pl-4 md:pl-6">
{response.person ? (
<Link
className="ph-no-capture group flex items-center"
href={`/environments/${environmentId}/people/${response.person.id}`}>
<div className="hidden md:flex">
<PersonAvatar personId={response.person.id} />
</div>
<p className="ph-no-capture break-all text-slate-600 group-hover:underline md:ml-2">
{displayIdentifier}
</p>
</Link>
) : (
<div className="group flex items-center">
<div className="hidden md:flex">
<PersonAvatar personId="anonymous" />
</div>
<p className="break-all text-slate-600 md:ml-2">Anonymous</p>
</div>
)}
</div>
<div className="ph-no-capture col-span-2 whitespace-pre-wrap pl-6 font-semibold">
{formatDateWithOrdinal(new Date(response.value as string))}
</div>
<div className="px-4 text-slate-500 md:px-6">{timeSince(response.updatedAt.toISOString())}</div>
</div>
);
})}
<div className="my-1 flex justify-center">
{displayCount < questionSummary.responses.length && (
<button
onClick={() => setDisplayCount((prevCount) => prevCount + responsesPerPage)}
className="my-2 flex h-8 items-center justify-center rounded-lg border border-gray-300 bg-white px-3 text-sm text-gray-500 hover:bg-gray-100 hover:text-gray-700">
Show more
</button>
)}
</div>
</div>
</div>
);
}

View File

@@ -78,7 +78,7 @@ export default function FileUploadSummary({ questionSummary, environmentId }: Fi
{Array.isArray(response.value) &&
(response.value.length > 0 ? (
response.value.map((fileUrl, index) => (
<div className="relative m-2 rounded-lg bg-slate-200">
<div className="relative m-2 rounded-lg bg-slate-200" key={fileUrl}>
<a href={fileUrl as string} key={index} download target="_blank">
<div className="absolute right-0 top-0 m-2">
<div className="flex h-8 w-8 items-center justify-center rounded-lg bg-slate-50 hover:bg-white">

View File

@@ -1,7 +1,9 @@
import { evaluateCondition } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/evaluateLogic";
import { TResponse } from "@formbricks/types/responses";
import { TSurvey } from "@formbricks/types/surveys";
import { useMemo } from "react";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@formbricks/ui/Tooltip";
import { TimerIcon } from "lucide-react";
import { useCallback, useEffect, useMemo, useState } from "react";
interface SummaryDropOffsProps {
survey: TSurvey;
@@ -10,12 +12,45 @@ interface SummaryDropOffsProps {
}
export default function SummaryDropOffs({ responses, survey, displayCount }: SummaryDropOffsProps) {
const getDropoff = () => {
const initialAvgTtc = useMemo(
() =>
survey.questions.reduce((acc, question) => {
acc[question.id] = 0;
return acc;
}, {}),
[survey.questions]
);
const [avgTtc, setAvgTtc] = useState(initialAvgTtc);
interface DropoffMetricsType {
dropoffCount: number[];
viewsCount: number[];
dropoffPercentage: number[];
}
const [dropoffMetrics, setDropoffMetrics] = useState<DropoffMetricsType>({
dropoffCount: [],
viewsCount: [],
dropoffPercentage: [],
});
const calculateMetrics = useCallback(() => {
let totalTtc = { ...initialAvgTtc };
let responseCounts = { ...initialAvgTtc };
let dropoffArr = new Array(survey.questions.length).fill(0);
let viewsArr = new Array(survey.questions.length).fill(0);
let dropoffPercentageArr = new Array(survey.questions.length).fill(0);
responses.forEach((response) => {
// Calculate total time-to-completion
Object.keys(avgTtc).forEach((questionId) => {
if (response.ttc && response.ttc[questionId]) {
totalTtc[questionId] += response.ttc[questionId];
responseCounts[questionId]++;
}
});
let currQuesIdx = 0;
while (currQuesIdx < survey.questions.length) {
@@ -84,6 +119,13 @@ export default function SummaryDropOffs({ responses, survey, displayCount }: Sum
}
});
// Calculate the average time for each question
Object.keys(totalTtc).forEach((questionId) => {
totalTtc[questionId] =
responseCounts[questionId] > 0 ? totalTtc[questionId] / responseCounts[questionId] : 0;
});
// Calculate drop-off percentages
dropoffPercentageArr[0] = (dropoffArr[0] / displayCount) * 100 || 0;
for (let i = 1; i < survey.questions.length; i++) {
if (viewsArr[i - 1] !== 0) {
@@ -91,28 +133,54 @@ export default function SummaryDropOffs({ responses, survey, displayCount }: Sum
}
}
return [dropoffArr, viewsArr, dropoffPercentageArr];
};
return {
newAvgTtc: totalTtc,
dropoffCount: dropoffArr,
viewsCount: viewsArr,
dropoffPercentage: dropoffPercentageArr,
};
}, [responses, survey.questions, displayCount, initialAvgTtc, avgTtc]);
const [dropoffCount, viewsCount, dropoffPercentage] = useMemo(() => getDropoff(), [responses]);
useEffect(() => {
const { newAvgTtc, dropoffCount, viewsCount, dropoffPercentage } = calculateMetrics();
setAvgTtc(newAvgTtc);
setDropoffMetrics({ dropoffCount, viewsCount, dropoffPercentage });
}, [responses]);
return (
<div className="rounded-lg border border-slate-200 bg-slate-50 shadow-sm">
<div className="rounded-b-lg bg-white ">
<div className="grid h-10 grid-cols-5 items-center border-y border-slate-200 bg-slate-100 text-sm font-bold text-slate-600">
<div className="grid h-10 grid-cols-6 items-center border-y border-slate-200 bg-slate-100 text-sm font-semibold text-slate-600">
<div className="col-span-3 pl-4 md:pl-6">Questions</div>
<div className="pl-4 text-center md:pl-6">Views</div>
<div className="px-4 text-center md:px-6">Drop-off</div>
<div className="flex justify-center">
<TooltipProvider delayDuration={50}>
<Tooltip>
<TooltipTrigger>
<TimerIcon className="h-5 w-5" />
</TooltipTrigger>
<TooltipContent side={"top"}>
<p className="text-center font-normal">Average time to complete each question.</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
<div className="px-4 text-center md:px-6">Views</div>
<div className="pr-6 text-center md:pl-6">Drop Offs</div>
</div>
{survey.questions.map((question, i) => (
<div
key={question.id}
className="grid grid-cols-5 items-center border-b border-slate-100 py-2 text-sm text-slate-800 md:text-base">
className="grid grid-cols-6 items-center border-b border-slate-100 py-2 text-sm text-slate-800 md:text-base">
<div className="col-span-3 pl-4 md:pl-6">{question.headline}</div>
<div className="whitespace-pre-wrap pl-6 text-center font-semibold">{viewsCount[i]}</div>
<div className="px-4 text-center md:px-6">
<span className="font-semibold">{dropoffCount[i]} </span>
<span>({Math.round(dropoffPercentage[i])}%)</span>
<div className="whitespace-pre-wrap text-center font-semibold">
{avgTtc[question.id] !== undefined ? (avgTtc[question.id] / 1000).toFixed(2) + "s" : "N/A"}
</div>
<div className="whitespace-pre-wrap text-center font-semibold">
{dropoffMetrics.viewsCount[i]}
</div>
<div className=" pl-6 text-center md:px-6">
<span className="font-semibold">{dropoffMetrics.dropoffCount[i]} </span>
<span>({Math.round(dropoffMetrics.dropoffPercentage[i])}%)</span>
</div>
</div>
))}

View File

@@ -4,6 +4,7 @@ import HiddenFieldsSummary from "@/app/(app)/environments/[environmentId]/survey
import EmptySpaceFiller from "@formbricks/ui/EmptySpaceFiller";
import { TSurveyQuestionType } from "@formbricks/types/surveys";
import type {
TSurveyDateQuestion,
TSurveyFileUploadQuestion,
TSurveyPictureSelectionQuestion,
TSurveyQuestionSummary,
@@ -26,6 +27,7 @@ import MultipleChoiceSummary from "./MultipleChoiceSummary";
import NPSSummary from "./NPSSummary";
import OpenTextSummary from "./OpenTextSummary";
import RatingSummary from "./RatingSummary";
import DateQuestionSummary from "./DateQuestionSummary";
import FileUploadSummary from "./FileUploadSummary";
import PictureChoiceSummary from "./PictureChoiceSummary";
@@ -47,6 +49,7 @@ export default function SummaryList({ environment, survey, responses, responsesP
updatedAt: r.updatedAt,
person: r.person,
}));
return {
question,
responses: questionResponses,
@@ -54,115 +57,123 @@ export default function SummaryList({ environment, survey, responses, responsesP
});
return (
<>
<div className="mt-10 space-y-8">
{survey.type === "web" && responses.length === 0 && !environment.widgetSetupCompleted ? (
<EmptyInAppSurveys environment={environment} />
) : responses.length === 0 ? (
<EmptySpaceFiller
type="response"
environment={environment}
noWidgetRequired={survey.type === "link"}
/>
) : (
<>
{getSummaryData().map((questionSummary) => {
if (questionSummary.question.type === TSurveyQuestionType.OpenText) {
return (
<OpenTextSummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyOpenTextQuestion>}
environmentId={environment.id}
responsesPerPage={responsesPerPage}
/>
);
}
if (
questionSummary.question.type === TSurveyQuestionType.MultipleChoiceSingle ||
questionSummary.question.type === TSurveyQuestionType.MultipleChoiceMulti
) {
return (
<MultipleChoiceSummary
key={questionSummary.question.id}
questionSummary={
questionSummary as TSurveyQuestionSummary<
TSurveyMultipleChoiceMultiQuestion | TSurveyMultipleChoiceSingleQuestion
>
}
environmentId={environment.id}
surveyType={survey.type}
responsesPerPage={responsesPerPage}
/>
);
}
if (questionSummary.question.type === TSurveyQuestionType.NPS) {
return (
<NPSSummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyNPSQuestion>}
/>
);
}
if (questionSummary.question.type === TSurveyQuestionType.CTA) {
return (
<CTASummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyCTAQuestion>}
/>
);
}
if (questionSummary.question.type === TSurveyQuestionType.Rating) {
return (
<RatingSummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyRatingQuestion>}
/>
);
}
if (questionSummary.question.type === TSurveyQuestionType.Consent) {
return (
<ConsentSummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyConsentQuestion>}
/>
);
}
if (questionSummary.question.type === TSurveyQuestionType.FileUpload) {
return (
<FileUploadSummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyFileUploadQuestion>}
environmentId={environment.id}
/>
);
}
if (questionSummary.question.type === TSurveyQuestionType.PictureSelection) {
return (
<PictureChoiceSummary
key={questionSummary.question.id}
questionSummary={
questionSummary as TSurveyQuestionSummary<TSurveyPictureSelectionQuestion>
}
/>
);
}
return null;
<div className="mt-10 space-y-8">
{survey.type === "web" && responses.length === 0 && !environment.widgetSetupCompleted ? (
<EmptyInAppSurveys environment={environment} />
) : responses.length === 0 ? (
<EmptySpaceFiller
type="response"
environment={environment}
noWidgetRequired={survey.type === "link"}
/>
) : (
<>
{getSummaryData().map((questionSummary) => {
if (questionSummary.question.type === TSurveyQuestionType.OpenText) {
return (
<OpenTextSummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyOpenTextQuestion>}
environmentId={environment.id}
responsesPerPage={responsesPerPage}
/>
);
}
if (
questionSummary.question.type === TSurveyQuestionType.MultipleChoiceSingle ||
questionSummary.question.type === TSurveyQuestionType.MultipleChoiceMulti
) {
return (
<MultipleChoiceSummary
key={questionSummary.question.id}
questionSummary={
questionSummary as TSurveyQuestionSummary<
TSurveyMultipleChoiceMultiQuestion | TSurveyMultipleChoiceSingleQuestion
>
}
environmentId={environment.id}
surveyType={survey.type}
responsesPerPage={responsesPerPage}
/>
);
}
if (questionSummary.question.type === TSurveyQuestionType.NPS) {
return (
<NPSSummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyNPSQuestion>}
/>
);
}
if (questionSummary.question.type === TSurveyQuestionType.CTA) {
return (
<CTASummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyCTAQuestion>}
/>
);
}
if (questionSummary.question.type === TSurveyQuestionType.Rating) {
return (
<RatingSummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyRatingQuestion>}
/>
);
}
if (questionSummary.question.type === TSurveyQuestionType.Consent) {
return (
<ConsentSummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyConsentQuestion>}
/>
);
}
if (questionSummary.question.type === TSurveyQuestionType.PictureSelection) {
return (
<PictureChoiceSummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyPictureSelectionQuestion>}
/>
);
}
if (questionSummary.question.type === TSurveyQuestionType.Date) {
return (
<DateQuestionSummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyDateQuestion>}
environmentId={environment.id}
responsesPerPage={responsesPerPage}
/>
);
}
if (questionSummary.question.type === TSurveyQuestionType.FileUpload) {
return (
<FileUploadSummary
key={questionSummary.question.id}
questionSummary={questionSummary as TSurveyQuestionSummary<TSurveyFileUploadQuestion>}
environmentId={environment.id}
/>
);
}
return null;
})}
{survey.hiddenFields?.enabled &&
survey.hiddenFields.fieldIds?.map((question) => {
return (
<HiddenFieldsSummary
environment={environment}
question={question}
responses={responses}
survey={survey}
key={question}
/>
);
})}
{survey.hiddenFields?.enabled &&
survey.hiddenFields.fieldIds?.map((question) => {
return (
<HiddenFieldsSummary
environment={environment}
question={question}
responses={responses}
survey={survey}
key={question}
/>
);
})}
</>
)}
</div>
</>
</>
)}
</div>
);
}

View File

@@ -1,9 +1,10 @@
import { timeSinceConditionally } from "@formbricks/lib/time";
import { Button } from "@formbricks/ui/Button";
import { TResponse } from "@formbricks/types/responses";
import { TSurvey } from "@formbricks/types/surveys";
import { Button } from "@formbricks/ui/Button";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@formbricks/ui/Tooltip";
import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/react/24/solid";
import { useMemo, useState } from "react";
interface SummaryMetadataProps {
responses: TResponse[];
@@ -34,6 +35,21 @@ const StatCard = ({ label, percentage, value, tooltipText }) => (
</TooltipProvider>
);
function formatTime(ttc, totalResponses) {
const seconds = ttc / (1000 * totalResponses);
let formattedValue;
if (seconds >= 60) {
const minutes = Math.floor(seconds / 60);
const remainingSeconds = seconds % 60;
formattedValue = `${minutes}m ${remainingSeconds.toFixed(2)}s`;
} else {
formattedValue = `${seconds.toFixed(2)}s`;
}
return formattedValue;
}
export default function SummaryMetadata({
responses,
survey,
@@ -41,13 +57,28 @@ export default function SummaryMetadata({
setShowDropOffs,
showDropOffs,
}: SummaryMetadataProps) {
const completedResponses = responses.filter((r) => r.finished).length;
const completedResponsesCount = useMemo(() => responses.filter((r) => r.finished).length, [responses]);
const [validTtcResponsesCount, setValidResponsesCount] = useState(0);
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) {
validTtcResponsesCountAcc++;
return acc + response.ttc._total;
}
return acc;
}, 0);
setValidResponsesCount(validTtcResponsesCountAcc);
return ttc;
}, [responses]);
const totalResponses = responses.length;
return (
<div className="mb-4">
<div className="flex flex-col-reverse gap-y-2 lg:grid lg:grid-cols-2 lg:gap-x-2">
<div className="grid grid-cols-2 gap-4 md:grid md:grid-cols-4 md:gap-x-2">
<div className="flex flex-col-reverse gap-y-2 lg:grid lg:grid-cols-3 lg:gap-x-2">
<div className="grid grid-cols-2 gap-4 md:grid-cols-5 md:gap-x-2 lg:col-span-2">
<div className="flex flex-col justify-between space-y-2 rounded-lg border border-slate-200 bg-white p-4 shadow-sm">
<p className="text-sm text-slate-600">Displays</p>
<p className="text-2xl font-bold text-slate-800">
@@ -62,16 +93,24 @@ export default function SummaryMetadata({
/>
<StatCard
label="Responses"
percentage={`${Math.round((completedResponses / displayCount) * 100)}%`}
value={responses.length === 0 ? <span>-</span> : completedResponses}
percentage={`${Math.round((completedResponsesCount / displayCount) * 100)}%`}
value={responses.length === 0 ? <span>-</span> : completedResponsesCount}
tooltipText="People who completed the survey."
/>
<StatCard
label="Drop Offs"
percentage={`${Math.round(((totalResponses - completedResponses) / totalResponses) * 100)}%`}
value={responses.length === 0 ? <span>-</span> : totalResponses - completedResponses}
percentage={`${Math.round(((totalResponses - completedResponsesCount) / totalResponses) * 100)}%`}
value={responses.length === 0 ? <span>-</span> : totalResponses - completedResponsesCount}
tooltipText="People who started but not completed the survey."
/>
<StatCard
label="Time to Complete"
percentage={null}
value={
validTtcResponsesCount === 0 ? <span>-</span> : `${formatTime(ttc, validTtcResponsesCount)}`
}
tooltipText="Average time to complete the survey."
/>
</div>
<div className="flex flex-col justify-between gap-2 lg:col-span-1">
<div className="text-right text-xs text-slate-400">

View File

@@ -17,6 +17,7 @@ import {
Text,
} from "@react-email/components";
import { render } from "@react-email/render";
import { CalendarDaysIcon } from "lucide-react";
interface EmailTemplateProps {
survey: TSurvey;
@@ -283,6 +284,22 @@ const EmailTemplate = ({ survey, surveyUrl, brandColor }: EmailTemplateProps) =>
<EmailFooter />
</EmailTemplateWrapper>
);
case TSurveyQuestionType.Date:
return (
<EmailTemplateWrapper surveyUrl={url} brandColor={brandColor}>
<Text className="m-0 mr-8 block p-0 text-base font-semibold leading-6 text-slate-800">
{firstQuestion.headline}
</Text>
<Text className="m-0 block p-0 text-sm font-normal leading-6 text-slate-500">
{firstQuestion.subheader}
</Text>
<Section className="mt-4 flex h-12 w-full items-center justify-center rounded-lg border border-solid border-gray-200 bg-white">
<CalendarDaysIcon className="mb-1 inline h-4 w-4" />
<Text className="inline text-sm font-medium">Select a date</Text>
</Section>
<EmailFooter />
</EmailTemplateWrapper>
);
}
};

View File

@@ -0,0 +1,107 @@
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>
);
}

View File

@@ -0,0 +1,38 @@
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>
);
}

View File

@@ -0,0 +1,94 @@
import { TSurvey, TSurveyDateQuestion } from "@formbricks/types/surveys";
import { Button } from "@formbricks/ui/Button";
import { Label } from "@formbricks/ui/Label";
import { Input } from "@formbricks/ui/Input";
import { PlusIcon, TrashIcon } from "@heroicons/react/24/solid";
import { useState } from "react";
import QuestionFormInput from "./QuestionFormInput";
import { OptionsSwitcher } from "@formbricks/ui/QuestionTypeSelector";
interface IDateQuestionFormProps {
localSurvey: TSurvey;
question: TSurveyDateQuestion;
questionIdx: number;
updateQuestion: (questionIdx: number, updatedAttributes: any) => void;
lastQuestion: boolean;
isInValid: boolean;
}
const dateOptions = [
{
value: "M-d-y",
label: "MM-DD-YYYY",
},
{
value: "d-M-y",
label: "DD-MM-YYYY",
},
{
value: "y-M-d",
label: "YYYY-MM-DD",
},
];
export default function DateQuestionForm({
question,
questionIdx,
updateQuestion,
isInValid,
localSurvey,
}: IDateQuestionFormProps): JSX.Element {
const [showSubheader, setShowSubheader] = useState(!!question.subheader);
return (
<form>
<QuestionFormInput
environmentId={localSurvey.environmentId}
isInValid={isInValid}
question={question}
questionIdx={questionIdx}
updateQuestion={updateQuestion}
/>
<div className="mt-3">
{showSubheader && (
<>
<Label htmlFor="subheader">Description</Label>
<div className="mt-2 inline-flex w-full items-center">
<Input
id="subheader"
name="subheader"
value={question.subheader}
onChange={(e) => updateQuestion(questionIdx, { subheader: e.target.value })}
/>
<TrashIcon
className="ml-2 h-4 w-4 cursor-pointer text-slate-400 hover:text-slate-500"
onClick={() => {
setShowSubheader(false);
updateQuestion(questionIdx, { subheader: "" });
}}
/>
</div>
</>
)}
{!showSubheader && (
<Button size="sm" variant="minimal" type="button" onClick={() => setShowSubheader(true)}>
<PlusIcon className="mr-1 h-4 w-4" />
Add Description
</Button>
)}
</div>
<div className="mt-3">
<Label htmlFor="questionType">Date Format</Label>
<div className="mt-2 flex items-center">
<OptionsSwitcher
options={dateOptions}
currentOption={question.format}
handleTypeChange={(value) => updateQuestion(questionIdx, { format: value })}
/>
</div>
</div>
</form>
);
}

View File

@@ -177,6 +177,28 @@ export default function EditWelcomeCard({
</div>
</div>
</div>
{localSurvey?.type === "link" && (
<div className="mt-6 flex items-center">
<div className="mr-2">
<Switch
id="showResponseCount"
name="showResponseCount"
checked={localSurvey?.welcomeCard?.showResponseCount}
onCheckedChange={() =>
updateSurvey({ showResponseCount: !localSurvey.welcomeCard.showResponseCount })
}
/>
</div>
<div className="flex-column">
<Label htmlFor="showResponseCount" className="">
Show Response Count
</Label>
<div className="text-sm text-gray-500 dark:text-gray-400">
Display number of responses for survey
</div>
</div>
</div>
)}
</form>
</Collapsible.CollapsibleContent>
</Collapsible.Root>

View File

@@ -0,0 +1,42 @@
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>
);
}

View File

@@ -9,16 +9,23 @@ import {
import { Button } from "@formbricks/ui/Button";
import { Input } from "@formbricks/ui/Input";
import { Label } from "@formbricks/ui/Label";
import { QuestionTypeSelector } from "@formbricks/ui/QuestionTypeSelector";
import { OptionsSwitcher } from "@formbricks/ui/QuestionTypeSelector";
import { PlusIcon, TrashIcon } from "@heroicons/react/24/solid";
import { useState } from "react";
import {
ChatBubbleBottomCenterTextIcon,
EnvelopeIcon,
HashtagIcon,
LinkIcon,
PhoneIcon,
} from "@heroicons/react/24/solid";
const questionTypes = [
{ value: "text", label: "Text" },
{ value: "email", label: "Email" },
{ value: "url", label: "URL" },
{ value: "number", label: "Number" },
{ value: "phone", label: "Phone" },
{ value: "text", label: "Text", icon: <ChatBubbleBottomCenterTextIcon /> },
{ value: "email", label: "Email", icon: <EnvelopeIcon /> },
{ value: "url", label: "URL", icon: <LinkIcon /> },
{ value: "number", label: "Number", icon: <HashtagIcon /> },
{ value: "phone", label: "Phone", icon: <PhoneIcon /> },
];
interface OpenQuestionFormProps {
@@ -106,9 +113,9 @@ export default function OpenQuestionForm({
<div className="mt-3">
<Label htmlFor="questionType">Input Type</Label>
<div className="mt-2 flex items-center">
<QuestionTypeSelector
questionTypes={questionTypes}
currentType={question.inputType}
<OptionsSwitcher
options={questionTypes}
currentOption={question.inputType}
handleTypeChange={handleInputChange} // Use the merged function
/>
</div>

View File

@@ -20,6 +20,7 @@ import {
StarIcon,
ArrowUpTrayIcon,
PhotoIcon,
CalendarDaysIcon,
} from "@heroicons/react/24/solid";
import * as Collapsible from "@radix-ui/react-collapsible";
import { useState } from "react";
@@ -33,6 +34,7 @@ import NPSQuestionForm from "./NPSQuestionForm";
import OpenQuestionForm from "./OpenQuestionForm";
import QuestionDropdown from "./QuestionMenu";
import RatingQuestionForm from "./RatingQuestionForm";
import DateQuestionForm from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/DateQuestionForm";
import PictureSelectionForm from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/components/PictureSelectionForm";
import { TProduct } from "@formbricks/types/product";
@@ -146,6 +148,8 @@ export default function QuestionCard({
<CheckIcon />
) : question.type === TSurveyQuestionType.PictureSelection ? (
<PhotoIcon />
) : question.type === TSurveyQuestionType.Date ? (
<CalendarDaysIcon />
) : null}
</div>
<div>
@@ -234,6 +238,15 @@ export default function QuestionCard({
updateQuestion={updateQuestion}
isInValid={isInValid}
/>
) : question.type === TSurveyQuestionType.Date ? (
<DateQuestionForm
localSurvey={localSurvey}
question={question}
questionIdx={questionIdx}
updateQuestion={updateQuestion}
lastQuestion={lastQuestion}
isInValid={isInValid}
/>
) : question.type === TSurveyQuestionType.PictureSelection ? (
<PictureSelectionForm
localSurvey={localSurvey}
@@ -256,7 +269,7 @@ export default function QuestionCard({
) : null}
<div className="mt-4">
<Collapsible.Root open={openAdvanced} onOpenChange={setOpenAdvanced} className="mt-5">
<Collapsible.CollapsibleTrigger className="flex items-center text-xs text-slate-700">
<Collapsible.CollapsibleTrigger className="flex items-center text-sm text-slate-700">
{openAdvanced ? (
<ChevronDownIcon className="mr-1 h-4 w-3" />
) : (

View File

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

View File

@@ -1,7 +1,7 @@
"use client";
import { TPlacement } from "@formbricks/types/common";
import { TSurvey } from "@formbricks/types/surveys";
import { TSurvey, TSurveyBackgroundBgType } from "@formbricks/types/surveys";
import { ColorPicker } from "@formbricks/ui/ColorPicker";
import { Label } from "@formbricks/ui/Label";
import { Switch } from "@formbricks/ui/Switch";
@@ -9,18 +9,28 @@ 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 }: StylingCardProps) {
export default function StylingCard({ localSurvey, setLocalSurvey, colours }: StylingCardProps) {
const [open, setOpen] = useState(false);
const { type, productOverwrites } = localSurvey;
const { type, productOverwrites, styling } = 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({
@@ -28,6 +38,8 @@ export default function StylingCard({ localSurvey, setLocalSurvey }: StylingCard
productOverwrites: {
...localSurvey.productOverwrites,
placement: !!placement ? null : "bottomRight",
clickOutsideClose: false,
darkOverlay: false,
},
});
};
@@ -42,6 +54,34 @@ export default function StylingCard({ localSurvey, setLocalSurvey }: StylingCard
});
};
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,
@@ -62,6 +102,35 @@ export default function StylingCard({ localSurvey, setLocalSurvey }: StylingCard
});
};
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,
@@ -143,6 +212,66 @@ export default function StylingCard({ localSurvey, setLocalSurvey }: StylingCard
</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 ">

View File

@@ -0,0 +1,61 @@
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>
);
}

View File

@@ -23,6 +23,7 @@ interface SurveyEditorProps {
attributeClasses: TAttributeClass[];
responseCount: number;
membershipRole?: TMembershipRole;
colours: string[];
}
export default function SurveyEditor({
@@ -33,6 +34,7 @@ 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);
@@ -99,6 +101,7 @@ export default function SurveyEditor({
attributeClasses={attributeClasses}
responseCount={responseCount}
membershipRole={membershipRole}
colours={colours}
/>
)}
</main>

View File

@@ -16,6 +16,7 @@ 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;
@@ -48,6 +49,7 @@ 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[] = [];
@@ -222,6 +224,11 @@ 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)) {
@@ -252,6 +259,14 @@ export default function SurveyMenuBar({
}
};
function containsEmptyTriggers() {
return (
localSurvey.type === "web" &&
localSurvey.triggers &&
(localSurvey.triggers[0] === "" || localSurvey.triggers.length === 0)
);
}
return (
<>
{environment?.type === "development" && (
@@ -282,11 +297,20 @@ export default function SurveyMenuBar({
/>
</div>
{responseCount > 0 && (
<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 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>
)}
<div className="mt-3 flex sm:ml-4 sm:mt-0">
@@ -298,7 +322,7 @@ export default function SurveyMenuBar({
/>
</div>
<Button
disabled={isSurveyPublishing}
disabled={isSurveyPublishing || containsEmptyTriggers()}
variant={localSurvey.status === "draft" ? "secondary" : "darkCTA"}
className="mr-3"
loading={isSurveySaving}
@@ -318,11 +342,7 @@ export default function SurveyMenuBar({
)}
{localSurvey.status === "draft" && !audiencePrompt && (
<Button
disabled={
localSurvey.type === "web" &&
localSurvey.triggers &&
(localSurvey.triggers[0] === "" || localSurvey.triggers.length === 0 || isSurveySaving)
}
disabled={isSurveySaving || containsEmptyTriggers()}
variant="darkCTA"
loading={isSurveyPublishing}
onClick={async () => {

View File

@@ -2,7 +2,7 @@ export const revalidate = REVALIDATION_INTERVAL;
import { getActionClasses } from "@formbricks/lib/actionClass/service";
import { getAttributeClasses } from "@formbricks/lib/attributeClass/service";
import { authOptions } from "@formbricks/lib/authOptions";
import { REVALIDATION_INTERVAL } from "@formbricks/lib/constants";
import { REVALIDATION_INTERVAL, colours } from "@formbricks/lib/constants";
import { getEnvironment } from "@formbricks/lib/environment/service";
import { getMembershipByUserIdTeamId } from "@formbricks/lib/membership/service";
import { getAccessFlags } from "@formbricks/lib/membership/utils";
@@ -58,16 +58,15 @@ export default async function SurveysEditPage({ params }) {
}
return (
<>
<SurveyEditor
survey={survey}
product={product}
environment={environment}
actionClasses={actionClasses}
attributeClasses={attributeClasses}
responseCount={responseCount}
membershipRole={currentUserMembership?.role}
/>
</>
<SurveyEditor
survey={survey}
product={product}
environment={environment}
actionClasses={actionClasses}
attributeClasses={attributeClasses}
responseCount={responseCount}
membershipRole={currentUserMembership?.role}
colours={colours}
/>
);
}

View File

@@ -20,11 +20,14 @@ export default function Modal({
const modalRef = useRef<HTMLDivElement | null>(null);
const highlightBorderColorStyle = useMemo(() => {
if (!highlightBorderColor) return {};
if (!highlightBorderColor)
return {
overflow: "visible",
};
return {
border: `2px solid ${highlightBorderColor}`,
overflow: "hidden",
overflow: "visible",
};
}, [highlightBorderColor]);
@@ -51,12 +54,12 @@ export default function Modal({
: "";
return (
<div aria-live="assertive" className="relative h-full w-full overflow-hidden">
<div aria-live="assertive" className="relative h-full w-full overflow-visible">
<div
ref={modalRef}
style={highlightBorderColorStyle}
className={cn(
"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",
"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 ",
previewMode === "desktop" ? getPlacementStyle(placement) : "max-w-full ",
slidingAnimationClass
)}>

View File

@@ -2,12 +2,13 @@
import Modal from "@/app/(app)/environments/[environmentId]/surveys/components/Modal";
import TabOption from "@/app/(app)/environments/[environmentId]/surveys/components/TabOption";
import { SurveyInline } from "@formbricks/ui/Survey";
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";
import { TSurvey } from "@formbricks/types/surveys";
import { Button } from "@formbricks/ui/Button";
import { SurveyInline } from "@formbricks/ui/Survey";
import { ArrowPathRoundedSquareIcon } from "@heroicons/react/24/outline";
import {
ArrowsPointingInIcon,
@@ -17,7 +18,6 @@ import {
} from "@heroicons/react/24/solid";
import { Variants, motion } from "framer-motion";
import { useEffect, useRef, useState } from "react";
import { TUploadFileConfig } from "@formbricks/types/storage";
type TPreviewType = "modal" | "fullwidth" | "email";
@@ -155,6 +155,20 @@ 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);
@@ -194,7 +208,7 @@ export default function PreviewSurvey({
<div className="absolute right-0 top-0 m-2">
<ResetProgressButton resetQuestionProgress={resetQuestionProgress} />
</div>
<div className="relative h-[90%] max-h-[40rem] w-80 overflow-hidden rounded-[3rem] border-8 border-slate-500 bg-slate-400">
<MediaBackground survey={survey} ContentRef={ContentRef} isMobilePreview>
{/* 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" ? (
@@ -214,24 +228,19 @@ export default function PreviewSurvey({
/>
</Modal>
) : (
<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}
/>
</div>
</div>
<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>
)}
</div>
</MediaBackground>
</>
)}
{previewMode === "desktop" && (
@@ -286,21 +295,20 @@ export default function PreviewSurvey({
/>
</Modal>
) : (
<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}
/>
</div>
<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>
</div>
</MediaBackground>
)}
</div>
)}

View File

@@ -23,6 +23,7 @@ const welcomeCardDefault: TSurveyWelcomeCard = {
headline: "Welcome!",
html: "Thanks for providing your feedback - let's go!",
timeToFinish: true,
showResponseCount: false,
};
export const testTemplate: TTemplate = {
@@ -320,6 +321,7 @@ export const testTemplate: TTemplate = {
welcomeCard: {
enabled: false,
timeToFinish: false,
showResponseCount: false,
},
hiddenFields: {
enabled: false,
@@ -2524,4 +2526,5 @@ export const minimalSurvey: TSurvey = {
},
productOverwrites: null,
singleUse: null,
styling: null,
};

View File

@@ -2,7 +2,6 @@ import { sendInviteAcceptedEmail } from "@/app/lib/email";
import { verifyInviteToken } from "@formbricks/lib/jwt";
import { authOptions } from "@formbricks/lib/authOptions";
import { getServerSession } from "next-auth";
import { prisma } from "@formbricks/database";
import {
NotLoggedInContent,
WrongAccountContent,
@@ -11,21 +10,20 @@ import {
RightAccountContent,
} from "./components/InviteContentComponents";
import { env } from "@formbricks/lib/env.mjs";
import { deleteInvite, getInvite } from "@formbricks/lib/invite/service";
import { createMembership } from "@formbricks/lib/membership/service";
export default async function JoinTeam({ searchParams }) {
const currentUser = await getServerSession(authOptions);
try {
const { inviteId, email } = await verifyInviteToken(searchParams.token);
const { inviteId, email } = verifyInviteToken(searchParams.token);
const invite = await prisma?.invite.findUnique({
where: { id: inviteId },
include: { creator: true },
});
const invite = await getInvite(inviteId);
const isExpired = (i) => new Date(i.expiresAt) < new Date();
const isInviteExpired = new Date(invite.expiresAt) < new Date();
if (!invite || isExpired(invite)) {
if (!invite || isInviteExpired) {
return <ExpiredContent />;
} else if (invite.accepted) {
return <UsedContent />;
@@ -35,32 +33,10 @@ export default async function JoinTeam({ searchParams }) {
} else if (currentUser.user?.email !== email) {
return <WrongAccountContent />;
} else {
// create membership
await prisma?.membership.create({
data: {
team: {
connect: {
id: invite.teamId,
},
},
user: {
connect: {
id: currentUser.user?.id,
},
},
role: invite.role,
accepted: true,
},
});
await createMembership(invite.teamId, currentUser.user.id, { accepted: true, role: invite.role });
await deleteInvite(inviteId);
// delete invite
await prisma?.invite.delete({
where: {
id: inviteId,
},
});
sendInviteAcceptedEmail(invite.creator.name, currentUser.user?.name, invite.creator.email);
sendInviteAcceptedEmail(invite.creator.name ?? "", currentUser.user?.name, invite.creator.email);
return <RightAccountContent />;
}

View File

@@ -16,6 +16,11 @@ export async function POST(request: NextRequest) {
const { json, fields, fileName } = data;
const fallbackFileName = fileName.replace(/[^A-Za-z0-9_.-]/g, "_");
const encodedFileName = encodeURIComponent(fileName)
.replace(/['()]/g, (match) => "%" + match.charCodeAt(0).toString(16))
.replace(/\*/g, "%2A");
const parser = new AsyncParser({
fields,
});
@@ -29,7 +34,10 @@ export async function POST(request: NextRequest) {
const headers = new Headers();
headers.set("Content-Type", "text/csv;charset=utf-8;");
headers.set("Content-Disposition", `attachment; filename=${fileName ?? "converted"}.csv`);
headers.set(
"Content-Disposition",
`attachment; filename="${fallbackFileName}"; filename*=UTF-8''${encodedFileName}`
);
return NextResponse.json(
{

View File

@@ -15,6 +15,11 @@ export async function POST(request: NextRequest) {
const { json, fields, fileName } = data;
const fallbackFileName = fileName.replace(/[^A-Za-z0-9_.-]/g, "_");
const encodedFileName = encodeURIComponent(fileName)
.replace(/['()]/g, (match) => "%" + match.charCodeAt(0).toString(16))
.replace(/\*/g, "%2A");
const wb = xlsx.utils.book_new();
const ws = xlsx.utils.json_to_sheet(json, { header: fields });
xlsx.utils.book_append_sheet(wb, ws, "Sheet1");
@@ -23,8 +28,12 @@ export async function POST(request: NextRequest) {
const base64String = buffer.toString("base64");
const headers = new Headers();
headers.set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
headers.set("Content-Disposition", `attachment; filename=${fileName ?? "converted"}.xlsx`);
headers.set(
"Content-Disposition",
`attachment; filename="${fallbackFileName}"; filename*=UTF-8''${encodedFileName}`
);
return NextResponse.json(
{

View File

@@ -46,7 +46,6 @@ export async function GET(
getActionClasses(environmentId),
getProductByEnvironmentId(environmentId),
]);
if (!product) {
throw new Error("Product not found");
}

View File

@@ -5,7 +5,7 @@ import { ErrorComponent } from "@formbricks/ui/ErrorComponent";
export default function Error({ error, reset }: { error: Error; reset: () => void }) {
if (process.env.NODE_ENV === "development") {
console.log(error.message);
console.error(error.message);
}
return (

View File

@@ -3,6 +3,7 @@ import { env } from "@formbricks/lib/env.mjs";
export const formbricksEnabled =
typeof env.NEXT_PUBLIC_FORMBRICKS_API_HOST && env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID;
const ttc = { onboarding: 0 };
export const createResponse = async (
surveyId: string,
@@ -11,12 +12,12 @@ export const createResponse = async (
finished: boolean = false
): Promise<any> => {
const api = formbricks.getApi();
return await api.client.response.create({
surveyId,
userId,
finished,
data,
ttc,
});
};
@@ -30,6 +31,7 @@ export const updateResponse = async (
responseId,
finished,
data,
ttc,
});
};

View File

@@ -2,13 +2,14 @@ import { TSurveyQuestionType as QuestionId } from "@formbricks/types/surveys";
import {
ArrowUpTrayIcon,
ChatBubbleBottomCenterTextIcon,
CheckIcon,
CursorArrowRippleIcon,
ListBulletIcon,
PhotoIcon,
PresentationChartBarIcon,
QueueListIcon,
StarIcon,
CheckIcon,
CalendarDaysIcon,
} from "@heroicons/react/24/solid";
import { createId } from "@paralleldrive/cuid2";
import { replaceQuestionPresetPlaceholders } from "./templates";
@@ -133,6 +134,16 @@ export const questionTypes: TSurveyQuestionType[] = [
dismissButtonLabel: "Skip",
},
},
{
id: QuestionId.Date,
label: "Date",
description: "Ask your users to select a date",
icon: CalendarDaysIcon,
preset: {
headline: "When is your birthday?",
format: "M-d-y",
},
},
{
id: QuestionId.FileUpload,
label: "File Upload",

View File

@@ -1,19 +1,28 @@
import { IMPRINT_URL, PRIVACY_URL } from "@formbricks/lib/constants";
import Link from "next/link";
export default function LegalFooter() {
interface LegalFooterProps {
bgColor?: string | null;
}
export default function LegalFooter({ bgColor }: LegalFooterProps) {
if (!IMPRINT_URL && !PRIVACY_URL) return null;
return (
<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">
<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">
{IMPRINT_URL && (
<Link href={IMPRINT_URL} target="_blank">
<Link href={IMPRINT_URL} target="_blank" className="hover:underline">
Imprint
</Link>
)}
{IMPRINT_URL && PRIVACY_URL && <span> | </span>}
{IMPRINT_URL && PRIVACY_URL && <span className="px-2">|</span>}
{PRIVACY_URL && (
<Link href={PRIVACY_URL} target="_blank">
<Link href={PRIVACY_URL} target="_blank" className="hover:underline">
Privacy Policy
</Link>
)}

View File

@@ -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;
@@ -25,6 +25,7 @@ interface LinkSurveyProps {
singleUseId?: string;
singleUseResponse?: TResponse;
webAppUrl: string;
responseCount?: number;
}
export default function LinkSurvey({
@@ -36,6 +37,7 @@ export default function LinkSurvey({
singleUseId,
singleUseResponse,
webAppUrl,
responseCount,
}: LinkSurveyProps) {
const responseId = singleUseResponse?.id;
const searchParams = useSearchParams();
@@ -117,7 +119,7 @@ export default function LinkSurvey({
return (
<>
<ContentWrapper className="h-full w-full p-0 md:max-w-lg">
<ContentWrapper className="h-full w-full p-0 md:max-w-md">
{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 />
@@ -161,6 +163,7 @@ export default function LinkSurvey({
...responseUpdate.data,
...hiddenFieldsRecord,
},
ttc: responseUpdate.ttc,
finished: responseUpdate.finished,
meta: {
url: window.location.href,
@@ -186,6 +189,7 @@ export default function LinkSurvey({
activeQuestionId={activeQuestionId}
autoFocus={autoFocus}
prefillResponseData={prefillResponseData}
responseCount={responseCount}
/>
</ContentWrapper>
</>

View File

@@ -0,0 +1,92 @@
"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>
);
}
};

View File

@@ -1,15 +1,15 @@
"use client";
import type { NextPage } from "next";
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 { TProduct } from "@formbricks/types/product";
import { TResponse } from "@formbricks/types/responses";
import { OTPInput } from "@formbricks/ui/OTPInput";
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";
import { OTPInput } from "@formbricks/ui/OTPInput";
import type { NextPage } from "next";
import { useCallback, useEffect, useState } from "react";
interface LinkSurveyPinScreenProps {
surveyId: string;

View File

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

View File

@@ -1,7 +1,9 @@
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";
@@ -12,8 +14,11 @@ 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";
import { getResponseCountBySurveyId } from "@formbricks/lib/response/service";
interface LinkSurveyPageProps {
params: {
@@ -27,6 +32,11 @@ interface LinkSurveyPageProps {
}
export async function generateMetadata({ params }: LinkSurveyPageProps): Promise<Metadata> {
const validId = ZId.safeParse(params.surveyId);
if (!validId.success) {
notFound();
}
const survey = await getSurvey(params.surveyId);
if (!survey || survey.type !== "link" || survey.status === "draft") {
@@ -74,6 +84,10 @@ export async function generateMetadata({ params }: LinkSurveyPageProps): Promise
}
export default async function LinkSurveyPage({ params, searchParams }: LinkSurveyPageProps) {
const validId = ZId.safeParse(params.surveyId);
if (!validId.success) {
notFound();
}
const survey = await getSurvey(params.surveyId);
const suId = searchParams.suId;
@@ -156,7 +170,7 @@ export default async function LinkSurveyPage({ params, searchParams }: LinkSurve
}
const isSurveyPinProtected = Boolean(!!survey && survey.pin);
const responseCount = await getResponseCountBySurveyId(survey.id);
if (isSurveyPinProtected) {
return (
<PinScreen
@@ -172,16 +186,22 @@ export default async function LinkSurveyPage({ params, searchParams }: LinkSurve
);
}
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}
/>
);
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;
}

View File

@@ -4,6 +4,11 @@ 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",
@@ -107,6 +112,10 @@ 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 = {

View File

@@ -1,6 +1,6 @@
{
"name": "@formbricks/web",
"version": "1.3.3",
"version": "1.3.5",
"private": true,
"scripts": {
"clean": "rimraf .turbo node_modules .next",
@@ -21,33 +21,33 @@
"@formbricks/ui": "workspace:*",
"@headlessui/react": "^1.7.17",
"@heroicons/react": "^2.0.18",
"@json2csv/node": "^7.0.3",
"@json2csv/node": "^7.0.4",
"@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.11",
"@sentry/nextjs": "^7.81.1",
"@react-email/components": "^0.0.12",
"@sentry/nextjs": "^7.85.0",
"@vercel/og": "^0.5.20",
"bcryptjs": "^2.4.3",
"dotenv": "^16.3.1",
"encoding": "^0.1.13",
"framer-motion": "10.16.5",
"googleapis": "^128.0.0",
"framer-motion": "10.16.14",
"googleapis": "^129.0.0",
"jsonwebtoken": "^9.0.2",
"lodash": "^4.17.21",
"lru-cache": "^10.1.0",
"lucide-react": "^0.293.0",
"mime": "^3.0.0",
"lucide-react": "^0.294.0",
"mime": "^4.0.0",
"next": "13.5.6",
"nodemailer": "^6.9.7",
"otplib": "^12.0.1",
"posthog-js": "^1.93.2",
"posthog-js": "^1.93.6",
"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.9.5",
"react-email": "^1.10.0",
"react-hook-form": "^7.48.2",
"react-hot-toast": "^2.4.1",
"react-icons": "^4.12.0",

View File

@@ -63,6 +63,7 @@ export default async function handle(req: NextApiRequest, res: NextApiResponse)
surveyId: true,
finished: true,
data: true,
ttc: true,
meta: true,
personAttributes: true,
singleUseId: true,

View File

@@ -107,6 +107,7 @@ export default async function handle(req: NextApiRequest, res: NextApiResponse)
surveyId: true,
finished: true,
data: true,
ttc: true,
meta: true,
personAttributes: true,
singleUseId: true,

Some files were not shown because too many files have changed in this diff Show More