diff --git a/src/pages/InstallQuiz/InstallQuiz.tsx b/src/pages/InstallQuiz/InstallQuiz.tsx index 2aa70e96..db89f157 100644 --- a/src/pages/InstallQuiz/InstallQuiz.tsx +++ b/src/pages/InstallQuiz/InstallQuiz.tsx @@ -193,7 +193,8 @@ export default function InstallQuiz() { { - if(question.content.rule.parentId.length !== 0) { + if (question.type === null) deleteQuestion(question.id) + if(question?.content?.rule.parentId.length !== 0) { setOpenDelete(true) } else { deleteQuestionWithTimeout(question.id, deleteFn); diff --git a/src/pages/ViewPublicationPage/ContactForm.tsx b/src/pages/ViewPublicationPage/ContactForm.tsx index 760026aa..ddef90fd 100644 --- a/src/pages/ViewPublicationPage/ContactForm.tsx +++ b/src/pages/ViewPublicationPage/ContactForm.tsx @@ -154,9 +154,7 @@ const Inputs = () => { if (FC.used) someUsed.push() return }) - - console.log(someUsed) - console.log(Icons) + if (someUsed.length) { return <>{someUsed} } else { diff --git a/src/pages/ViewPublicationPage/Footer.tsx b/src/pages/ViewPublicationPage/Footer.tsx index 97ac0e39..720dd000 100644 --- a/src/pages/ViewPublicationPage/Footer.tsx +++ b/src/pages/ViewPublicationPage/Footer.tsx @@ -148,6 +148,8 @@ export const Footer = ({ setCurrentQuestion, question, setShowContactForm, setSh }; const followNextStep = () => { + + if (linear) { const questionIndex = questions.findIndex(({ id }) => id === question.id); const nextQuestion = questions[questionIndex + 1]; @@ -171,6 +173,7 @@ export const Footer = ({ setCurrentQuestion, question, setShowContactForm, setSh if (nextQuestionId) { const nextQuestion = getQuestionByContentId(nextQuestionId); + console.log(nextQuestion); if (nextQuestion?.type && nextQuestion.type !== "result") { setCurrentQuestion(nextQuestion); return; @@ -182,7 +185,7 @@ export const Footer = ({ setCurrentQuestion, question, setShowContactForm, setSh if (nextQuestion?.type && nextQuestion.type !== "result") { setCurrentQuestion(nextQuestion); } else { - showResult(); + showResult(nextQuestion); } } }; diff --git a/src/pages/ViewPublicationPage/Question.tsx b/src/pages/ViewPublicationPage/Question.tsx index a0e9128a..0832f7cf 100644 --- a/src/pages/ViewPublicationPage/Question.tsx +++ b/src/pages/ViewPublicationPage/Question.tsx @@ -43,8 +43,7 @@ const QUESTIONS_MAP: any = { export const Question = ({ questions }: QuestionProps) => { const quiz = useCurrentQuiz(); - const [currentQuestion, setCurrentQuestion] = - useState(); + const [currentQuestion, setCurrentQuestion] = useState(); const [showContactForm, setShowContactForm] = useState(false); const [showResultForm, setShowResultForm] = useState(false); @@ -62,8 +61,7 @@ export const Question = ({ questions }: QuestionProps) => { if (!currentQuestion) return <>не смог отобразить вопрос; - const QuestionComponent = - QUESTIONS_MAP[currentQuestion.type as Exclude]; + const QuestionComponent = QUESTIONS_MAP[currentQuestion.type as Exclude]; console.log("showResultForm " , showResultForm) return ( diff --git a/src/pages/ViewPublicationPage/StartPageViewPublication.tsx b/src/pages/ViewPublicationPage/StartPageViewPublication.tsx index 2754f88a..610cd0d7 100644 --- a/src/pages/ViewPublicationPage/StartPageViewPublication.tsx +++ b/src/pages/ViewPublicationPage/StartPageViewPublication.tsx @@ -1,24 +1,16 @@ -import { - Box, - Button, - ButtonBase, - Link, - Paper, - Typography, - useMediaQuery, - useTheme, -} from "@mui/material"; +import { Box, Button, ButtonBase, Link, Paper, Typography, useMediaQuery, useTheme } from "@mui/material"; import { useCurrentQuiz } from "@root/quizes/hooks"; import YoutubeEmbedIframe from "../../ui_kit/StartPagePreview/YoutubeEmbedIframe"; import { QuizStartpageAlignType, QuizStartpageType } from "@model/quizSettings"; import { notReachable } from "../../utils/notReachable"; import { useUADevice } from "../../utils/hooks/useUADevice"; +import { NameplateLogo } from "@icons/NameplateLogo"; interface Props { - setVisualStartPage: (a:boolean) => void + setVisualStartPage: (a: boolean) => void; } -export const StartPageViewPublication = ({setVisualStartPage}:Props) => { +export const StartPageViewPublication = ({ setVisualStartPage }: Props) => { const theme = useTheme(); const quiz = useCurrentQuiz(); const { isMobileDevice } = useUADevice(); @@ -29,9 +21,9 @@ export const StartPageViewPublication = ({setVisualStartPage}:Props) => { navigator.clipboard.writeText(quiz.config.info.phonenumber); }; - const background = quiz.config.startpage.background.type === "image" - ? quiz.config.startpage.background.desktop - ? ( + const background = + quiz.config.startpage.background.type === "image" ? ( + quiz.config.startpage.background.desktop ? ( { width: "100%", height: "100%", objectFit: "cover", - overflow: "hidden" + overflow: "hidden", }} /> - ) - : null - : quiz.config.startpage.background.type === "video" - ? quiz.config.startpage.background.video - ? ( - - ) - : null - : null; + ) : null + ) : quiz.config.startpage.background.type === "video" ? ( + quiz.config.startpage.background.video ? ( + + ) : null + ) : null; return ( - + background: + quiz.config.startpageType === "expanded" + ? quiz.config.startpage.position === "left" + ? "linear-gradient(90deg,#272626,transparent)" + : quiz.config.startpage.position === "center" + ? "linear-gradient(180deg,transparent,#272626)" + : "linear-gradient(270deg,#272626,transparent)" + : "", + color: quiz.config.startpageType === "expanded" ? "white" : "black", + }} + > - - {quiz.config.startpage.logo && ( - - )} - - {quiz.config.info.orgname} - + quizHeaderBlock={ + + + {quiz.config.startpage.logo && ( + + )} + {quiz.config.info.orgname} + + + + {quiz.config.info.site} + + - - - {quiz.config.info.site} - - - } - quizMainBlock={<> - - {quiz.name} - - {quiz.config.startpage.description} - - - - - - - {quiz.config.info.clickable ? ( - isMobileDevice ? ( - - - {quiz.config.info.phonenumber} - - - ) : ( - - - {quiz.config.info.phonenumber} - - - ) - ) : ( - - {quiz.config.info.phonenumber} + {quiz.config.startpage.description} - )} - - {quiz.config.info.law} - - - } + + + + + + + + {quiz.config.info.clickable ? ( + isMobileDevice ? ( + + + {quiz.config.info.phonenumber} + + + ) : ( + + + {quiz.config.info.phonenumber} + + + ) + ) : ( + + {quiz.config.info.phonenumber} + + )} + {quiz.config.info.law} + + + + + + Сделано на PenaQuiz + + + + + } backgroundBlock={background} startpageType={quiz.config.startpageType} alignType={quiz.config.startpage.position} /> ); -} +}; -function QuizPreviewLayoutByType({ quizHeaderBlock, quizMainBlock, backgroundBlock, startpageType, alignType }: { +function QuizPreviewLayoutByType({ + quizHeaderBlock, + quizMainBlock, + backgroundBlock, + startpageType, + alignType, +}: { quizHeaderBlock: JSX.Element; quizMainBlock: JSX.Element; backgroundBlock: JSX.Element | null; @@ -201,28 +237,35 @@ function QuizPreviewLayoutByType({ quizHeaderBlock, quizMainBlock, backgroundBlo case null: case "standard": { return ( - - + flexDirection: alignType === "left" ? "row" : "row-reverse", + flexGrow: 1, + height: "100vh", + "&::-webkit-scrollbar": { width: 0 }, + }} + > + {quizHeaderBlock} {quizMainBlock} - + + {backgroundBlock} @@ -230,36 +273,42 @@ function QuizPreviewLayoutByType({ quizHeaderBlock, quizMainBlock, backgroundBlo } case "expanded": { return ( - - + justifyContent: startpageAlignTypeToJustifyContent[alignType], + flexGrow: 1, + height: "100%", + "&::-webkit-scrollbar": { width: 0 }, + }} + > + {quizHeaderBlock} {quizMainBlock} - + {backgroundBlock} @@ -267,27 +316,26 @@ function QuizPreviewLayoutByType({ quizHeaderBlock, quizMainBlock, backgroundBlo } case "centered": { return ( - + {quizHeaderBlock} - {backgroundBlock && - - {backgroundBlock} - - } + {backgroundBlock && {backgroundBlock}} {quizMainBlock} ); } - default: notReachable(startpageType); + default: + notReachable(startpageType); } } diff --git a/src/pages/startPage/EditPage.tsx b/src/pages/startPage/EditPage.tsx index a737756b..2cd821bd 100755 --- a/src/pages/startPage/EditPage.tsx +++ b/src/pages/startPage/EditPage.tsx @@ -78,7 +78,9 @@ export default function EditPage() { [] ); console.log(currentStep) + console.log(quizConfig) + if (!quizConfig) return <> return ( <> {/*хедер*/} @@ -349,6 +351,14 @@ export default function EditPage() { ) }} >{quiz?.status === "start" ? "Стоп" : "Старт"} + + {quiz?.status === "start" && https://hbpn.link/{quiz.qid} }