From 6df0a401b2169d06ad0bcfe7e40c3867c0f3d87b Mon Sep 17 00:00:00 2001 From: Nastya Date: Thu, 21 Dec 2023 14:47:34 +0300 Subject: [PATCH] =?UTF-8?q?=D1=88=D0=B8=D0=BB=D1=8C=D0=B4=D0=B8=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B2=20=D0=BF=D1=83=D0=B1=D0=BB=D0=B8=D0=BA=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/NameplateLogoFQ.tsx | 23 +++++++ src/pages/ResultPage/ResultPage.tsx | 18 +++++- src/pages/ViewPublicationPage/ContactForm.tsx | 39 +++++++----- src/pages/ViewPublicationPage/Footer.tsx | 20 ++---- src/pages/ViewPublicationPage/Question.tsx | 7 ++- src/pages/ViewPublicationPage/ResultForm.tsx | 63 ++++++++++++++----- 6 files changed, 121 insertions(+), 49 deletions(-) create mode 100644 src/assets/icons/NameplateLogoFQ.tsx diff --git a/src/assets/icons/NameplateLogoFQ.tsx b/src/assets/icons/NameplateLogoFQ.tsx new file mode 100644 index 00000000..db350ab5 --- /dev/null +++ b/src/assets/icons/NameplateLogoFQ.tsx @@ -0,0 +1,23 @@ +import { FC, SVGProps } from "react"; + +export const NameplateLogoFQ: FC> = (props) => ( + + + + + + + + + + + + + + + + + + + +); diff --git a/src/pages/ResultPage/ResultPage.tsx b/src/pages/ResultPage/ResultPage.tsx index 00808381..913fe71a 100644 --- a/src/pages/ResultPage/ResultPage.tsx +++ b/src/pages/ResultPage/ResultPage.tsx @@ -1,6 +1,6 @@ import { FirstEntry } from "./FirstEntry" import { ResultSettings } from "./ResultSettings" -import { decrementCurrentStep } from "@root/quizes/actions"; +import { decrementCurrentStep, incrementCurrentStep } from "@root/quizes/actions"; import { Box, Button } from "@mui/material"; import ArrowLeft from "@icons/questionsPage/arrowLeft" @@ -21,6 +21,22 @@ export const ResultPage = () => { > + + ) diff --git a/src/pages/ViewPublicationPage/ContactForm.tsx b/src/pages/ViewPublicationPage/ContactForm.tsx index ddef90fd..728c7ba5 100644 --- a/src/pages/ViewPublicationPage/ContactForm.tsx +++ b/src/pages/ViewPublicationPage/ContactForm.tsx @@ -6,6 +6,7 @@ import TextIcon from "@icons/ContactFormIcon/TextIcon"; import AddressIcon from "@icons/ContactFormIcon/AddressIcon"; import { useCurrentQuiz } from "@root/quizes/hooks"; +import { NameplateLogo } from "@icons/NameplateLogo"; import CustomCheckbox from "@ui_kit/CustomCheckbox"; import { useState } from "react"; import { useQuestionsStore } from "@root/questions/store"; @@ -71,19 +72,19 @@ export const ContactForm = ({ }} > {quiz?.config.formContact.title || "Заполните форму, чтобы получить результаты теста"} - + { quiz?.config.formContact.desc && - - {quiz?.config.formContact.desc} - + + {quiz?.config.formContact.desc} + } @@ -138,6 +139,16 @@ export const ContactForm = ({ + + + Сделано на PenaQuiz + @@ -154,14 +165,14 @@ const Inputs = () => { if (FC.used) someUsed.push() return }) - + if (someUsed.length) { return <>{someUsed} } else { return <> - {Icons[0]} - {Icons[1]} - {Icons[2]} + {Icons[0]} + {Icons[1]} + {Icons[2]} } } diff --git a/src/pages/ViewPublicationPage/Footer.tsx b/src/pages/ViewPublicationPage/Footer.tsx index 8a1f2dea..6833117d 100644 --- a/src/pages/ViewPublicationPage/Footer.tsx +++ b/src/pages/ViewPublicationPage/Footer.tsx @@ -8,7 +8,7 @@ import { useQuestionsStore } from "@root/questions/store"; import type { AnyTypedQuizQuestion, QuizQuestionBase } from "../../model/questionTypes/shared"; import { getQuestionByContentId } from "@root/questions/actions"; import { enqueueSnackbar } from "notistack"; -import { NameplateLogo } from "@icons/NameplateLogo"; +import { NameplateLogoFQ } from "@icons/NameplateLogoFQ"; type FooterProps = { setCurrentQuestion: (step: AnyTypedQuizQuestion) => void; @@ -189,22 +189,11 @@ export const Footer = ({ setCurrentQuestion, question, setShowContactForm, setSh position: "relative", padding: "15px 0", borderTop: `1px solid ${theme.palette.grey[400]}`, + height: '75px', + + display: "flex" }} > - - - Сделано на PenaQuiz - + { QUESTIONS_MAP[currentQuestion.type as Exclude]; return ( - + {!showContactForm && !showResultForm && ( { @@ -100,31 +101,59 @@ export const ResultForm = ({ - { - quiz?.config.resultInfo.when === "before" && + - + + Сделано на PenaQuiz + + - } + + { + quiz?.config.resultInfo.when === "before" && + <> + + + + + } + + + ); };