From c38c75af9ade26c8d3ab222aab82cbbf0a161e7e Mon Sep 17 00:00:00 2001 From: Nastya Date: Sun, 24 Dec 2023 18:03:46 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=81=D1=82=D0=BA=D0=B8=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D0=BE=D0=B9=20=D0=BF=D1=83=D0=B1=D0=BB=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ResultPage/ResultSettings.tsx | 2 ++ src/pages/ViewPublicationPage/ContactForm.tsx | 4 ++-- src/pages/ViewPublicationPage/ResultForm.tsx | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/pages/ResultPage/ResultSettings.tsx b/src/pages/ResultPage/ResultSettings.tsx index 2dbe24e7..cbf592ae 100644 --- a/src/pages/ResultPage/ResultSettings.tsx +++ b/src/pages/ResultPage/ResultSettings.tsx @@ -25,6 +25,8 @@ export const ResultSettings = () => { const [resultContract, setResultContract] = useState(true); const isReadyToLeaveRef = useRef(true); +console.log('quiz ', quiz) + useEffect( function calcIsReadyToLeave() { let isReadyToLeave = true; diff --git a/src/pages/ViewPublicationPage/ContactForm.tsx b/src/pages/ViewPublicationPage/ContactForm.tsx index b3b8621d..6689e82d 100644 --- a/src/pages/ViewPublicationPage/ContactForm.tsx +++ b/src/pages/ViewPublicationPage/ContactForm.tsx @@ -135,7 +135,7 @@ export const ContactForm = ({ setShowResultForm(true) } }}> - Получить результаты + {quiz?.config.formContact?.button || "Получить результаты"} )} @@ -201,7 +201,7 @@ const Inputs = (currentQuestion: any) => { //@ts-ignore - if (questions.some((data) => data.used)) { + if (Object.values(questions).some((data) => data.used)) { return <> {FC["name"].used ? Name : <>} {FC["email"].used ? Email : <>} diff --git a/src/pages/ViewPublicationPage/ResultForm.tsx b/src/pages/ViewPublicationPage/ResultForm.tsx index 5f1b166f..c6bac1bb 100644 --- a/src/pages/ViewPublicationPage/ResultForm.tsx +++ b/src/pages/ViewPublicationPage/ResultForm.tsx @@ -99,6 +99,14 @@ export const ResultForm = ({ >{resultQuestion.title || "Форма результатов"} + {resultQuestion.content.text !== "" && resultQuestion.content.text !== " " && {resultQuestion.content.text}} + +