From 3e63e536e0728e2489be6922ba91b1592347f84f Mon Sep 17 00:00:00 2001 From: Matthias Nannt Date: Tue, 18 Oct 2022 13:41:48 +0200 Subject: [PATCH] apply prettier in react lib, make packages private --- packages/database/package.json | 1 + packages/eslint-config-custom/package.json | 4 +- packages/prettier-config/package.json | 6 +- packages/snoopforms-react/README.md | 18 +--- .../src/components/Elements/Cards.tsx | 92 +++++++------------ .../src/components/Elements/Checkbox.tsx | 61 ++++-------- .../src/components/Elements/Email.tsx | 53 ++++------- .../src/components/Elements/Number.tsx | 47 +++------- .../src/components/Elements/Phone.tsx | 47 +++------- .../src/components/Elements/Radio.tsx | 56 +++-------- .../src/components/Elements/Submit.tsx | 13 ++- .../src/components/Elements/Text.tsx | 49 +++------- .../src/components/Elements/Textarea.tsx | 41 +++------ .../src/components/Elements/Website.tsx | 53 ++++------- .../SnoopElement/SnoopElement.stories.tsx | 16 ++-- .../components/SnoopElement/SnoopElement.tsx | 68 +++++++------- .../src/components/SnoopForm/SnoopForm.tsx | 44 ++++----- .../src/components/SnoopPage/SnoopPage.tsx | 45 +++------ packages/snoopforms-react/src/index.ts | 6 +- packages/snoopforms-react/src/lib/elements.ts | 12 +-- packages/snoopforms-react/src/lib/utils.ts | 2 +- packages/tailwind-config/package.json | 4 +- packages/tsconfig/package.json | 6 +- packages/ui/package.json | 4 +- 24 files changed, 242 insertions(+), 506 deletions(-) diff --git a/packages/database/package.json b/packages/database/package.json index adbf4bf3f3..85962b0da3 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -1,6 +1,7 @@ { "name": "@formbricks/database", "version": "1.0.0", + "private": true, "license": "MIT", "main": "./dist/index.js", "module": "./dist/index.mjs", diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json index b7839f3ccf..0e59cb8dab 100644 --- a/packages/eslint-config-custom/package.json +++ b/packages/eslint-config-custom/package.json @@ -1,6 +1,7 @@ { "name": "eslint-config-formbricks", "version": "1.0.0", + "private": true, "main": "index.js", "license": "MIT", "dependencies": { @@ -12,8 +13,5 @@ }, "devDependencies": { "typescript": "^4.8.4" - }, - "publishConfig": { - "access": "public" } } diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json index 944e98bed1..5fb6d01c1d 100644 --- a/packages/prettier-config/package.json +++ b/packages/prettier-config/package.json @@ -1,10 +1,8 @@ { - "name": "@snoopforms/prettier-config", + "name": "@formbricks/prettier-config", "version": "1.0.0", + "private": true, "license": "MIT", - "publishConfig": { - "access": "public" - }, "devDependencies": { "prettier": "^2.7.1", "prettier-plugin-tailwindcss": "^0.1.13" diff --git a/packages/snoopforms-react/README.md b/packages/snoopforms-react/README.md index 88db2acf77..3e503d7dae 100644 --- a/packages/snoopforms-react/README.md +++ b/packages/snoopforms-react/README.md @@ -27,20 +27,8 @@ Use the SnoopForm components to build your form easily. ```jsx - - + + @@ -48,7 +36,7 @@ Use the SnoopForm components to build your form easily. type="checkbox" name="programming-lanuguages" label="What programming languages do you love?" - options={['C++', 'Javascript', 'Scala', 'Assembler']} + options={["C++", "Javascript", "Scala", "Assembler"]} /> diff --git a/packages/snoopforms-react/src/components/Elements/Cards.tsx b/packages/snoopforms-react/src/components/Elements/Cards.tsx index b18a442a87..152c2e1f61 100644 --- a/packages/snoopforms-react/src/components/Elements/Cards.tsx +++ b/packages/snoopforms-react/src/components/Elements/Cards.tsx @@ -1,13 +1,10 @@ -import { RadioGroup } from '@headlessui/react'; -import React, { FC, useContext, useEffect, useState } from 'react'; -import { getOptionValue, setSubmissionValue } from '../../lib/elements'; -import { classNamesConcat } from '../../lib/utils'; -import { ClassNames, Option } from '../../types'; -import { - SubmissionContext, - SubmitHandlerContext, -} from '../SnoopForm/SnoopForm'; -import { PageContext } from '../SnoopPage/SnoopPage'; +import { RadioGroup } from "@headlessui/react"; +import React, { FC, useContext, useEffect, useState } from "react"; +import { getOptionValue, setSubmissionValue } from "../../lib/elements"; +import { classNamesConcat } from "../../lib/utils"; +import { ClassNames, Option } from "../../types"; +import { SubmissionContext, SubmitHandlerContext } from "../SnoopForm/SnoopForm"; +import { PageContext } from "../SnoopPage/SnoopPage"; interface Props { name: string; @@ -21,15 +18,7 @@ interface Props { required?: boolean; } -export const Cards: FC = ({ - name, - label, - help, - cols, - autoSubmit, - options, - classNames, -}) => { +export const Cards: FC = ({ name, label, help, cols, autoSubmit, options, classNames }) => { const { submission, setSubmission }: any = useContext(SubmissionContext); const handleSubmit = useContext(SubmitHandlerContext); const pageName = useContext(PageContext); @@ -45,13 +34,7 @@ export const Cards: FC = ({ return (
{label && ( - + )} = ({ setTriggerSubmit(true); } }} - className="mt-2" - > - - Choose an option - + className="mt-2"> + Choose an option
+ ? "grid-cols-10" + : "grid-cols-1 sm:grid-cols-6" + )}> {options.map((option) => ( = ({ value={option} className={({ active, checked }) => classNamesConcat( - 'cursor-pointer focus:outline-none', - active ? 'ring-2 ring-offset-2 ring-gray-500' : '', + "cursor-pointer focus:outline-none", + active ? "ring-2 ring-gray-500 ring-offset-2" : "", checked - ? 'bg-gray-600 border-transparent text-white hover:bg-gray-700' - : 'bg-white border-gray-200 text-gray-900 hover:bg-gray-50', - 'border rounded-md py-3 px-3 flex items-center justify-center text-sm font-medium uppercase sm:flex-1' + ? "border-transparent bg-gray-600 text-white hover:bg-gray-700" + : "border-gray-200 bg-white text-gray-900 hover:bg-gray-50", + "flex items-center justify-center rounded-md border py-3 px-3 text-sm font-medium uppercase sm:flex-1" ) - } - > - - {getOptionValue(option)} - + }> + {getOptionValue(option)} ))}
- {help && ( -

- {help} -

- )} + {help &&

{help}

}
); }; diff --git a/packages/snoopforms-react/src/components/Elements/Checkbox.tsx b/packages/snoopforms-react/src/components/Elements/Checkbox.tsx index 46e13f81f7..6b17e6fcf3 100644 --- a/packages/snoopforms-react/src/components/Elements/Checkbox.tsx +++ b/packages/snoopforms-react/src/components/Elements/Checkbox.tsx @@ -1,8 +1,8 @@ -import React, { FC, useContext, useEffect, useState } from 'react'; -import { setSubmissionValue } from '../../lib/elements'; -import { ClassNames } from '../../types'; -import { SubmissionContext } from '../SnoopForm/SnoopForm'; -import { PageContext } from '../SnoopPage/SnoopPage'; +import React, { FC, useContext, useEffect, useState } from "react"; +import { setSubmissionValue } from "../../lib/elements"; +import { ClassNames } from "../../types"; +import { SubmissionContext } from "../SnoopForm/SnoopForm"; +import { PageContext } from "../SnoopPage/SnoopPage"; interface Option { label: string; @@ -19,13 +19,7 @@ interface Props { required?: boolean; } -export const Checkbox: FC = ({ - name, - label, - help, - options, - classNames, -}) => { +export const Checkbox: FC = ({ name, label, help, options, classNames }) => { const [checked, setChecked] = useState([]); const { setSubmission }: any = useContext(SubmissionContext); const pageName = useContext(PageContext); @@ -37,38 +31,26 @@ export const Checkbox: FC = ({ return (
{label && ( - + )}
{options.map((option) => ( -
-
+
+
{ const newChecked: string[] = [...checked]; - const value = - typeof option === 'object' ? option.value : option; + const value = typeof option === "object" ? option.value : option; if (e.target.checked) { newChecked.push(value); } else { @@ -84,22 +66,15 @@ export const Checkbox: FC = ({
))}
- {help && ( -

- {help} -

- )} + {help &&

{help}

}
); }; diff --git a/packages/snoopforms-react/src/components/Elements/Email.tsx b/packages/snoopforms-react/src/components/Elements/Email.tsx index 657ae2dc60..a507a90c75 100644 --- a/packages/snoopforms-react/src/components/Elements/Email.tsx +++ b/packages/snoopforms-react/src/components/Elements/Email.tsx @@ -1,9 +1,9 @@ -import React, { FC, useContext } from 'react'; -import { setSubmissionValue } from '../../lib/elements'; -import { classNamesConcat } from '../../lib/utils'; -import { ClassNames } from '../../types'; -import { SubmissionContext } from '../SnoopForm/SnoopForm'; -import { PageContext } from '../SnoopPage/SnoopPage'; +import React, { FC, useContext } from "react"; +import { setSubmissionValue } from "../../lib/elements"; +import { classNamesConcat } from "../../lib/utils"; +import { ClassNames } from "../../types"; +import { SubmissionContext } from "../SnoopForm/SnoopForm"; +import { PageContext } from "../SnoopPage/SnoopPage"; interface Props { name: string; @@ -15,62 +15,41 @@ interface Props { required: boolean; } -export const Email: FC = ({ - name, - label, - help, - Icon, - classNames, - placeholder, - required, -}) => { +export const Email: FC = ({ name, label, help, Icon, classNames, placeholder, required }) => { const { setSubmission } = useContext(SubmissionContext); const pageName = useContext(PageContext); return (
{label && ( -