From af79d4dae3c16a5283ad3fcdc5f59657eba7efd0 Mon Sep 17 00:00:00 2001 From: Nastya Date: Thu, 24 Oct 2024 16:46:05 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BE=D1=81=D1=82=D1=8B=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B2=D1=8B=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D1=87=D1=82=D0=B0.=20=D0=9A=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D1=8B=D0=BB=D1=8C=D0=BD=D0=BE=20=D0=B2=D1=8B=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=D0=B5=D0=BD=D0=B0=20=D0=BD=D0=B0=20=D0=BD=D0=B5?= =?UTF-8?q?=D1=91=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewPublicationPage/ContactForm/ContactForm.tsx | 12 +++++++++++- .../ContactForm/Inputs/Inputs.tsx | 9 ++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx b/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx index c3db902..14d83c6 100644 --- a/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx +++ b/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx @@ -30,6 +30,10 @@ type Props = { currentQuestion: AnyTypedQuizQuestion; onShowResult: () => void; }; +//Костыль для особого квиза. Для него не нужно показывать email адрес +const isDisableEmail = window.location.pathname.includes("/377c7570-1bee-4320-ac1e-d731b6223ce8"); +console.log("isDisableEmail"); +console.log(isDisableEmail); export const ContactForm = ({ currentQuestion, onShowResult }: Props) => { const theme = useTheme(); @@ -115,7 +119,10 @@ export const ContactForm = ({ currentQuestion, onShowResult }: Props) => { async function handleShowResultsClick() { const FC = settings.cfg.formContact.fields; - if (FC["email"].used !== EMAIL_REGEXP.test(email)) { + + console.log("некорректная"); + console.log(!isDisableEmail && FC["email"].used !== EMAIL_REGEXP.test(email)); + if (!isDisableEmail && FC["email"].used !== EMAIL_REGEXP.test(email)) { return enqueueSnackbar("введена некорректная почта"); } @@ -251,6 +258,9 @@ export const ContactForm = ({ currentQuestion, onShowResult }: Props) => { setText={setText} adress={adress} setAdress={setAdress} + crutch={{ + disableEmail: isDisableEmail, + }} /> >; adress: string; setAdress: Dispatch>; + crutch: { + disableEmail: boolean; + }; }; export const Inputs = ({ @@ -32,10 +35,14 @@ export const Inputs = ({ setText, adress, setAdress, + crutch, }: InputsProps) => { const { settings } = useQuizSettings(); const FC = settings.cfg.formContact.fields; + console.log("crutch.disableEmail"); + console.log(crutch.disableEmail); + if (!FC) return null; const Name = ( {FC["name"].used ? Name : <>} - {FC["email"].used ? Email : <>} + {FC["email"].used && !crutch.disableEmail ? Email : <>} {FC["phone"].used ? Phone : <>} {FC["text"].used ? Text : <>} {FC["address"].used ? Adress : <>}