From fbc16b3a726d06d0d99ea9f4b8804c675ebca11d Mon Sep 17 00:00:00 2001 From: Abhinav Arya Date: Sun, 8 Oct 2023 07:07:42 +0000 Subject: [PATCH 1/7] Fix/Card overlapping issue #1001 --- .../BestPracticeNavigation.module.css | 14 ++++++++++++++ .../components/shared/BestPracticeNavigation.tsx | 10 +++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 apps/formbricks-com/components/customeStyles/BestPracticeNavigation.module.css diff --git a/apps/formbricks-com/components/customeStyles/BestPracticeNavigation.module.css b/apps/formbricks-com/components/customeStyles/BestPracticeNavigation.module.css new file mode 100644 index 0000000000..1c31b95843 --- /dev/null +++ b/apps/formbricks-com/components/customeStyles/BestPracticeNavigation.module.css @@ -0,0 +1,14 @@ +@media screen and (max-width:960px) and (min-width:831px){ + .category{ + font-size: 12px; + } +} +@media screen and (max-width:830px) and (min-width:640px) { + .heroCard{ + padding: 1rem; + } + .category{ + font-size: 10px; + right: 10px; + } +} \ No newline at end of file diff --git a/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx b/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx index 054cbebdbd..47c7251288 100644 --- a/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx +++ b/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx @@ -11,6 +11,9 @@ import { import clsx from "clsx"; import Link from "next/link"; +// Importing custom CSS file for BestPracticeNavigation.tsx File. +import style from "../customeStyles/BestPracticeNavigation.module.css"; + export default function BestPracticeNavigation() { const BestPractices = [ { @@ -81,14 +84,15 @@ export default function BestPracticeNavigation() { ]; return ( -
+
{BestPractices.map((bestPractice) => ( -
+
Date: Sun, 8 Oct 2023 09:54:32 +0000 Subject: [PATCH 2/7] Fix overlapping card content on the website using tailwind based approach --- apps/demo/.env.example | 2 +- .../BestPracticeNavigation.module.css | 14 -------------- .../components/shared/BestPracticeNavigation.tsx | 8 ++------ apps/formbricks-com/tailwind.config.ts | 2 ++ 4 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 apps/formbricks-com/components/customeStyles/BestPracticeNavigation.module.css diff --git a/apps/demo/.env.example b/apps/demo/.env.example index e6c657045e..91292118c9 100644 --- a/apps/demo/.env.example +++ b/apps/demo/.env.example @@ -1,5 +1,5 @@ NEXT_PUBLIC_FORMBRICKS_API_HOST=http://localhost:3000 -NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID=YOUR_ENVIRONMENT_ID +NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID=https://formbricks-formbricks-m4jive9c4tg.ws-us105.gitpod.io/ # Copy the environment ID for the URL of your Formbricks App and # paste it above to connect your Formbricks App with the Demo App. diff --git a/apps/formbricks-com/components/customeStyles/BestPracticeNavigation.module.css b/apps/formbricks-com/components/customeStyles/BestPracticeNavigation.module.css deleted file mode 100644 index 1c31b95843..0000000000 --- a/apps/formbricks-com/components/customeStyles/BestPracticeNavigation.module.css +++ /dev/null @@ -1,14 +0,0 @@ -@media screen and (max-width:960px) and (min-width:831px){ - .category{ - font-size: 12px; - } -} -@media screen and (max-width:830px) and (min-width:640px) { - .heroCard{ - padding: 1rem; - } - .category{ - font-size: 10px; - right: 10px; - } -} \ No newline at end of file diff --git a/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx b/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx index 47c7251288..6951141e5e 100644 --- a/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx +++ b/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx @@ -11,9 +11,6 @@ import { import clsx from "clsx"; import Link from "next/link"; -// Importing custom CSS file for BestPracticeNavigation.tsx File. -import style from "../customeStyles/BestPracticeNavigation.module.css"; - export default function BestPracticeNavigation() { const BestPractices = [ { @@ -87,12 +84,11 @@ export default function BestPracticeNavigation() {
{BestPractices.map((bestPractice) => ( -
+
Date: Sun, 8 Oct 2023 10:18:00 +0000 Subject: [PATCH 3/7] Fix overlapping card content on the website using tailwind based approach --- .../components/shared/BestPracticeNavigation.tsx | 4 ++-- apps/formbricks-com/tailwind.config.ts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx b/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx index 6951141e5e..8c82c59963 100644 --- a/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx +++ b/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx @@ -84,11 +84,11 @@ export default function BestPracticeNavigation() {
{BestPractices.map((bestPractice) => ( -
+
Date: Sun, 8 Oct 2023 16:03:42 +0530 Subject: [PATCH 4/7] Required Validator Update --- .../surveys/src/components/MultipleChoiceMultiQuestion.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/surveys/src/components/MultipleChoiceMultiQuestion.tsx b/packages/surveys/src/components/MultipleChoiceMultiQuestion.tsx index eeb70532bd..f28b52bda7 100644 --- a/packages/surveys/src/components/MultipleChoiceMultiQuestion.tsx +++ b/packages/surveys/src/components/MultipleChoiceMultiQuestion.tsx @@ -121,7 +121,9 @@ export default function MultipleChoiceSingleQuestion({ }} checked={Array.isArray(value) && value.includes(choice.label)} style={{ borderColor: brandColor, color: brandColor }} - required={question.required && idx === 0} + required={ + question.required && Array.isArray(value) && value.length ? false : question.required + } /> {choice.label} From 6ccbd559fb88886daa4e491ef60f0dd8500a1b59 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 8 Oct 2023 16:31:27 +0530 Subject: [PATCH 5/7] Reset env in demo app --- apps/demo/.env.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/demo/.env.example b/apps/demo/.env.example index 16c78f9d4e..e6c657045e 100644 --- a/apps/demo/.env.example +++ b/apps/demo/.env.example @@ -1,5 +1,5 @@ -NEXT_PUBLIC_FORMBRICKS_API_HOST= -NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID= +NEXT_PUBLIC_FORMBRICKS_API_HOST=http://localhost:3000 +NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID=YOUR_ENVIRONMENT_ID # Copy the environment ID for the URL of your Formbricks App and # paste it above to connect your Formbricks App with the Demo App. From 35e3cdcd0d6116e92e712bd3887bc63abc60a7f3 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sun, 8 Oct 2023 16:39:23 +0530 Subject: [PATCH 6/7] actually fix it ;) --- .../components/shared/BestPracticeNavigation.tsx | 8 ++++---- apps/formbricks-com/tailwind.config.ts | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx b/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx index 8c82c59963..b22034a06c 100644 --- a/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx +++ b/apps/formbricks-com/components/shared/BestPracticeNavigation.tsx @@ -1,12 +1,12 @@ import { + BaseballIcon, CancelSubscriptionIcon, + CodeBookIcon, DogChaserIcon, FeedbackIcon, InterviewPromptIcon, OnboardingIcon, PMFIcon, - BaseballIcon, - CodeBookIcon, } from "@formbricks/ui"; import clsx from "clsx"; import Link from "next/link"; @@ -81,14 +81,14 @@ export default function BestPracticeNavigation() { ]; return ( -
+
{BestPractices.map((bestPractice) => (
Date: Sun, 8 Oct 2023 19:15:27 +0530 Subject: [PATCH 7/7] update leaderboard --- apps/formbricks-com/pages/formtribe/index.tsx | 84 +++++++++++++++++-- 1 file changed, 75 insertions(+), 9 deletions(-) diff --git a/apps/formbricks-com/pages/formtribe/index.tsx b/apps/formbricks-com/pages/formtribe/index.tsx index a4561aa022..d0a816ae5d 100644 --- a/apps/formbricks-com/pages/formtribe/index.tsx +++ b/apps/formbricks-com/pages/formtribe/index.tsx @@ -280,7 +280,7 @@ const Leaderboard = [ }, { name: "Pratik", - points: "250", + points: "350", }, { name: "Karuppiah", @@ -300,7 +300,8 @@ const Leaderboard = [ }, { name: "Naitik Kapadia (Arjun)", - points: "200", + points: "1300", + link: "https://github.com/KapadiaNaitik", }, { name: "Yashhhh", @@ -355,17 +356,17 @@ const Leaderboard = [ points: "100", }, { - name: "Ardash Malviya", - points: "100", + name: "Adarsh Malviya", + points: "150", }, { name: "Aditya Deshlahre", - points: "820", + points: "870", link: "https://github.com/adityadeshlahre", }, { name: "Rutam", - points: "805", + points: "855", }, { name: "Sagnik Sahoo", @@ -373,7 +374,7 @@ const Leaderboard = [ }, { name: "Prasoon Mahawar", - points: "500", + points: "950", }, { name: "Dushmanta", @@ -409,7 +410,7 @@ const Leaderboard = [ }, { name: "Rajarshi Misra", - points: "300", + points: "500", }, { name: "Anjaneya Gupta", @@ -429,7 +430,72 @@ const Leaderboard = [ }, { name: "maciek", - points: "300", + points: "350", + }, + { + name: "yatharth", + points: "600", + }, + { + name: "Ratish Jain", + points: "150", + link: "https://github.com/ratishjain12", + }, + { + name: "yatharth", + points: "600", + }, + { + name: "Subham Raj", + points: "500", + }, + { + name: "Abhinav Arya", + points: "150", + link: "github.com/itzabhinavarya", + }, + { + name: "Yash Nirmal", + points: "100", + }, + { + name: "Rohan Gupta", + points: "500", + link: "https://github.com/rohan9896", + }, + { + name: "Eder Silva", + points: "100", + link: "https://github.com/edersilva78", + }, + { + name: "Eduardo Noronha", + points: "100", + }, + { + name: "Joyal", + points: "550", + link: "https://github.com/joyal007", + }, + { + name: "zaCKoZAck0", + points: "200", + }, + { + name: "Viswa Prasath (iamvp7)", + points: "100", + }, + { + name: "aman4444", + points: "100", + }, + { + name: "mohit.d404", + points: "100", + }, + { + name: "0xCgn", + points: "100", }, ];