From 888d4a4f67a18b4ce9771aa622a57f32c7df6edf Mon Sep 17 00:00:00 2001
From: Nastya <nastyab015@yandex.ru>
Date: Sat, 16 Dec 2023 23:17:42 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B5=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82=D0=BE=D0=B2=20=D0=B8?=
 =?UTF-8?q?=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ResultPage/cards/WhenCard.tsx       |  4 +-
 src/pages/ViewPublicationPage/ApologyPage.tsx | 21 ++++++
 src/pages/ViewPublicationPage/ContactForm.tsx |  8 ++-
 src/pages/ViewPublicationPage/Footer.tsx      | 15 +++--
 src/pages/ViewPublicationPage/Question.tsx    | 65 +++++++++++--------
 src/pages/ViewPublicationPage/ResultForm.tsx  | 53 ++++++++-------
 src/pages/ViewPublicationPage/index.tsx       |  2 +
 7 files changed, 101 insertions(+), 67 deletions(-)
 create mode 100644 src/pages/ViewPublicationPage/ApologyPage.tsx

diff --git a/src/pages/ResultPage/cards/WhenCard.tsx b/src/pages/ResultPage/cards/WhenCard.tsx
index fdd8fe94..ef29c844 100644
--- a/src/pages/ResultPage/cards/WhenCard.tsx
+++ b/src/pages/ResultPage/cards/WhenCard.tsx
@@ -159,7 +159,7 @@ export const WhenCard = ({ quizExpand }: Props) => {
                         </Box>
 
 
-                        {
+                        {/* {
                             (quiz?.config.resultInfo.when !== "email") && <SwitchSetting
                                 icon={ShareNetwork}
                                 text="Поделиться результатами"
@@ -174,7 +174,7 @@ export const WhenCard = ({ quizExpand }: Props) => {
                                 onClick={(event) => updateQuiz(quiz.id, (quiz) => quiz.config.resultInfo.replay = event.target.checked)}
                                 value={quiz?.config.resultInfo.replay}
                             />
-                        }
+                        } */}
 
 
 
diff --git a/src/pages/ViewPublicationPage/ApologyPage.tsx b/src/pages/ViewPublicationPage/ApologyPage.tsx
new file mode 100644
index 00000000..658abd54
--- /dev/null
+++ b/src/pages/ViewPublicationPage/ApologyPage.tsx
@@ -0,0 +1,21 @@
+import { Box, Typography } from "@mui/material";
+
+export const ApologyPage = (message: string) => {
+    return (
+        <Box
+            sx={{
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center"
+            }}
+        >
+            <Typography
+                sx={{
+                    textAlign: "center"
+                }}
+            >{message || "что-то пошло не так"}</Typography>
+        </Box>
+
+
+    )
+}
\ No newline at end of file
diff --git a/src/pages/ViewPublicationPage/ContactForm.tsx b/src/pages/ViewPublicationPage/ContactForm.tsx
index 1509b5b7..5e66e0af 100644
--- a/src/pages/ViewPublicationPage/ContactForm.tsx
+++ b/src/pages/ViewPublicationPage/ContactForm.tsx
@@ -1,4 +1,4 @@
-import { Box, Typography, Button, Paper, TextField, Link, FormControl } from "@mui/material";
+import { Box, Typography, Button, Paper, TextField, Link, InputAdornment } from "@mui/material";
 import NameIcon from "@icons/ContactFormIcon/NameIcon";
 import EmailIcon from "@icons/ContactFormIcon/EmailIcon";
 import PhoneIcon from "@icons/ContactFormIcon/PhoneIcon";
@@ -108,7 +108,9 @@ export const ContactForm = ({
             (
               <Button
                 disabled={!ready}
-                variant="contained" onClick={followNextForm}>
+                variant="contained" onClick={() => {
+                  if (quiz?.config.resultInfo.when === "after") followNextForm()
+                }}>
                 Получить результаты
               </Button>
             )}
@@ -145,7 +147,7 @@ const CustomInput = ({ title, desc, Icon }: any) => {
       }}
       placeholder={desc}
       InputProps={{
-        startAdornment: <Icon color="gray" />,
+        startAdornment: <InputAdornment position="start"><Icon color="gray" /></InputAdornment>,
       }}
     />
   </Box>
diff --git a/src/pages/ViewPublicationPage/Footer.tsx b/src/pages/ViewPublicationPage/Footer.tsx
index a6708f37..f036634a 100644
--- a/src/pages/ViewPublicationPage/Footer.tsx
+++ b/src/pages/ViewPublicationPage/Footer.tsx
@@ -95,13 +95,11 @@ export const Footer = ({
     }
   }, [question, answers]);
 
-  const showResult = () => {
-    const resultQuestion = questions.find(
-      ({ type, content }) =>
-        type === "result" && content.rule.parentId === question.content.id
-    );
+  const showResult = nextQuestion => {
 
-    if (quiz?.config.resultInfo.when !== "after" && resultQuestion) {
+    console.log(nextQuestion)
+
+    if (nextQuestion && quiz?.config.resultInfo.when === "before") {
       setShowResultForm(true);
     } else {
       setShowContactForm(true);
@@ -183,10 +181,13 @@ export const Footer = ({
       const questionIndex = questions.findIndex(({ id }) => id === question.id);
       const nextQuestion = questions[questionIndex + 1];
 
+      console.log(nextQuestion)
       if (nextQuestion && nextQuestion.type !== "result") {
+        console.log("следующий вопрос результирующий ", (nextQuestion.type === "result"))
         setCurrentQuestion(nextQuestion);
       } else {
-        showResult();
+        console.log("следующий вопрос результирующий ", (nextQuestion.type === "result"))
+        showResult(nextQuestion);
       }
 
       return;
diff --git a/src/pages/ViewPublicationPage/Question.tsx b/src/pages/ViewPublicationPage/Question.tsx
index 89a7c9a7..a0e9128a 100644
--- a/src/pages/ViewPublicationPage/Question.tsx
+++ b/src/pages/ViewPublicationPage/Question.tsx
@@ -65,37 +65,46 @@ export const Question = ({ questions }: QuestionProps) => {
   const QuestionComponent =
     QUESTIONS_MAP[currentQuestion.type as Exclude<QuestionType, "nonselected">];
 
+    console.log("showResultForm " , showResultForm)
   return (
     <Box>
-      <Box
-        sx={{
-          minHeight: "calc(100vh - 75px)",
-          width: "100%",
-          maxWidth: "1440px",
-          padding: "40px 25px 20px",
-          margin: "0 auto",
-        }}
-      >
-        {!showContactForm && !showResultForm && (
+      {!showContactForm && !showResultForm && (
+        <Box
+          sx={{
+            minHeight: "calc(100vh - 75px)",
+            width: "100%",
+            maxWidth: "1440px",
+            padding: "40px 25px 20px",
+            margin: "0 auto",
+          }}
+        >
           <QuestionComponent currentQuestion={currentQuestion} />
-        )}
-        {showContactForm && (
-          <ContactForm
-            currentQuestion={currentQuestion}
-            showResultForm={showResultForm}
-            setShowContactForm={setShowContactForm}
-            setShowResultForm={setShowResultForm}
-          />
-        )}
-        {showResultForm && (
-          <ResultForm
-            currentQuestion={currentQuestion}
-            showContactForm={showContactForm}
-            setShowContactForm={setShowContactForm}
-            setShowResultForm={setShowResultForm}
-          />
-        )}
-      </Box>
+        </Box>
+      )}
+      {showResultForm && quiz?.config.resultInfo.when === "before" && (
+        <ResultForm
+          currentQuestion={currentQuestion}
+          showContactForm={showContactForm}
+          setShowContactForm={setShowContactForm}
+          setShowResultForm={setShowResultForm}
+        />
+      )}
+      {showContactForm && (
+        <ContactForm
+          currentQuestion={currentQuestion}
+          showResultForm={showResultForm}
+          setShowContactForm={setShowContactForm}
+          setShowResultForm={setShowResultForm}
+        />
+      )}
+      {showResultForm && quiz?.config.resultInfo.when === "after" && (
+        <ResultForm
+          currentQuestion={currentQuestion}
+          showContactForm={showContactForm}
+          setShowContactForm={setShowContactForm}
+          setShowResultForm={setShowResultForm}
+        />
+      )}
       {!showContactForm && !showResultForm && (
         <Footer
           question={currentQuestion}
diff --git a/src/pages/ViewPublicationPage/ResultForm.tsx b/src/pages/ViewPublicationPage/ResultForm.tsx
index de37037c..8b63c998 100644
--- a/src/pages/ViewPublicationPage/ResultForm.tsx
+++ b/src/pages/ViewPublicationPage/ResultForm.tsx
@@ -26,9 +26,11 @@ export const ResultForm = ({
   const resultQuestion = questions.find(
     (question) =>
       question.type === "result" &&
-      question.content.rule.parentId === currentQuestion.content.id
+      question.content.rule.parentId === currentQuestion.content.id || "line"
   );
-
+  console.log(currentQuestion)
+  console.log(questions)
+  console.log(quiz?.config.resultInfo.when)
   const followNextForm = () => {
     setShowResultForm(false);
     setShowContactForm(true);
@@ -79,7 +81,6 @@ export const ResultForm = ({
           >
           </Box>
         }
-
         {resultQuestion.description !== "" && resultQuestion.description !== " " && <Typography
           sx={{
             fontSize: "23px",
@@ -97,33 +98,31 @@ export const ResultForm = ({
 
       </Box>
 
-      <Box
-        sx={{
-          height: "100px",
-          boxShadow: "0 0 15px 0 rgba(0,0,0,.08)",
-          width: "100%",
-          display: "flex",
-          justifyContent: "center",
-          alignItems: "center"
-        }}
-      >
-        <Button
-          variant="contained"
+      {
+        quiz?.config.resultInfo.when === "before" &&
+        <Box
           sx={{
-            p:"10px 20px",
-            width: "210px",
-            height: "50px"
+            height: "100px",
+            boxShadow: "0 0 15px 0 rgba(0,0,0,.08)",
+            width: "100%",
+            display: "flex",
+            justifyContent: "center",
+            alignItems: "center"
           }}
         >
-          {resultQuestion.content.hint.text || "Узнать подробнее"}
-        </Button>
-      </Box>
-
-      {!showContactForm && quiz?.config.resultInfo.when !== "after" && (
-        <Button variant="contained" onClick={followNextForm}>
-          Показать форму контактов
-        </Button>
-      )}
+          <Button
+            onClick={followNextForm}
+            variant="contained"
+            sx={{
+              p: "10px 20px",
+              width: "210px",
+              height: "50px"
+            }}
+          >
+            {resultQuestion.content.hint.text || "Узнать подробнее"}
+          </Button>
+        </Box>
+      }
     </Box>
   );
 };
diff --git a/src/pages/ViewPublicationPage/index.tsx b/src/pages/ViewPublicationPage/index.tsx
index 2a6712f4..5b71d6b6 100644
--- a/src/pages/ViewPublicationPage/index.tsx
+++ b/src/pages/ViewPublicationPage/index.tsx
@@ -17,6 +17,7 @@ import { enqueueSnackbar } from "notistack";
 import { useQuestionsStore } from "@root/questions/store";
 import { setQuestions } from "@root/questions/actions";
 import { questionApi } from "@api/question";
+import { ApologyPage } from "./ApologyPage"
 
 export const ViewPage = () => {
   const quiz = useCurrentQuiz();
@@ -53,6 +54,7 @@ export const ViewPage = () => {
 
   console.log("visualStartPage ", visualStartPage);
   if (visualStartPage === undefined) return <></>;
+  if (questions.length === 0) return <ApologyPage message="Нет созданных вопросов"/>
   return (
     <Box>
       {!visualStartPage ? (

From 408ecf9826d0568b093558af86ef4753a97428ac Mon Sep 17 00:00:00 2001
From: Nastya <nastyab015@yandex.ru>
Date: Sat, 16 Dec 2023 23:52:01 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20FC=20=D0=B8=D0=BD=D0=BF=D1=83=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ContactFormPage/ContactFormPage.tsx |  2 +-
 src/pages/ViewPublicationPage/ContactForm.tsx | 48 +++++++++++++++----
 src/pages/ViewPublicationPage/ResultForm.tsx  |  8 +++-
 3 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/pages/ContactFormPage/ContactFormPage.tsx b/src/pages/ContactFormPage/ContactFormPage.tsx
index f7ff4176..44e9f9e9 100644
--- a/src/pages/ContactFormPage/ContactFormPage.tsx
+++ b/src/pages/ContactFormPage/ContactFormPage.tsx
@@ -350,7 +350,7 @@ const EmptyCard = ({ drawerNewFieldHC }: { drawerNewFieldHC: (a: string) => void
           disableRestoreFocus
         >
           <Typography sx={{ m: "20px", textAlign: "center" }}>
-            Если вам не нужно собирать контакты, <br></br> отключите форму контактов
+            Будут поля:<br></br> Имя, Email, Телефон
           </Typography>
 
         </Popover>
diff --git a/src/pages/ViewPublicationPage/ContactForm.tsx b/src/pages/ViewPublicationPage/ContactForm.tsx
index 5e66e0af..760026aa 100644
--- a/src/pages/ViewPublicationPage/ContactForm.tsx
+++ b/src/pages/ViewPublicationPage/ContactForm.tsx
@@ -70,8 +70,21 @@ export const ContactForm = ({
               fontSize: "28px"
             }}
           >
-            Заполните форму, чтобы получить результаты теста
+            {quiz?.config.formContact.title || "Заполните форму, чтобы получить результаты теста"}
+            
           </Typography>
+          {
+            quiz?.config.formContact.desc &&
+          <Typography
+            sx={{
+              textAlign: "center",
+              m: "20px 0",
+              fontSize: "18px"
+            }}
+          >
+            {quiz?.config.formContact.desc}
+          </Typography>
+          }
         </Box>
 
 
@@ -91,14 +104,7 @@ export const ContactForm = ({
               my: "20px"
             }}
           >
-            {
-              icons.map((data) => {
-                const FC = quiz?.config.formContact[data.type]
-                return FC.used ? <CustomInput title={FC.innerText || data.defaultText} desc={FC.text || data.defaultTitle} Icon={data.icon} />
-                  :
-                  <></>
-              })
-            }
+            <Inputs />
 
           </Box>
 
@@ -138,6 +144,30 @@ export const ContactForm = ({
   );
 };
 
+const Inputs = () => {
+  const quiz = useCurrentQuiz();
+
+  let someUsed = []
+
+  const Icons = icons.map((data) => {
+    const FC = quiz?.config.formContact[data.type]
+    if (FC.used) someUsed.push(<CustomInput title={FC.innerText || data.defaultText} desc={FC.text || data.defaultTitle} Icon={data.icon} />)
+    return <CustomInput title={FC.innerText || data.defaultText} desc={FC.text || data.defaultTitle} Icon={data.icon} />
+  })
+
+  console.log(someUsed)
+  console.log(Icons)
+  if (someUsed.length) {
+    return <>{someUsed}</>
+  } else {
+    return <>
+    {Icons[0]}
+    {Icons[1]}
+    {Icons[2]}
+    </>
+  }
+}
+
 const CustomInput = ({ title, desc, Icon }: any) => {
   return <Box m="15px 0">
     <Typography mb="7px">{title}</Typography>
diff --git a/src/pages/ViewPublicationPage/ResultForm.tsx b/src/pages/ViewPublicationPage/ResultForm.tsx
index 8b63c998..70c30671 100644
--- a/src/pages/ViewPublicationPage/ResultForm.tsx
+++ b/src/pages/ViewPublicationPage/ResultForm.tsx
@@ -26,11 +26,17 @@ export const ResultForm = ({
   const resultQuestion = questions.find(
     (question) =>
       question.type === "result" &&
-      question.content.rule.parentId === currentQuestion.content.id || "line"
+      (question.content.rule.parentId === "line" || currentQuestion.content.id)
   );
+
+  
   console.log(currentQuestion)
+  console.log(resultQuestion
+    )
   console.log(questions)
   console.log(quiz?.config.resultInfo.when)
+
+
   const followNextForm = () => {
     setShowResultForm(false);
     setShowContactForm(true);