diff --git a/lib/components/ViewPublicationPage/ContactForm.tsx b/lib/components/ViewPublicationPage/ContactForm.tsx
index 2908263..e2f96f6 100644
--- a/lib/components/ViewPublicationPage/ContactForm.tsx
+++ b/lib/components/ViewPublicationPage/ContactForm.tsx
@@ -160,6 +160,7 @@ export const ContactForm = ({ currentQuestion, onShowResult }: Props) => {
width: isWide && !isMobile ? "100%" : isMobile ? undefined : "530px",
borderRadius: "4px",
height: "100%",
+ minHeight: "100vh",
display: isWide && !isMobile ? "flex" : undefined,
}}
>
diff --git a/lib/components/ViewPublicationPage/Footer.tsx b/lib/components/ViewPublicationPage/Footer.tsx
index 7debe23..874b75d 100644
--- a/lib/components/ViewPublicationPage/Footer.tsx
+++ b/lib/components/ViewPublicationPage/Footer.tsx
@@ -2,87 +2,86 @@ import { useQuizData } from "@contexts/QuizDataContext";
import { Box, Typography, useTheme } from "@mui/material";
import { ReactNode } from "react";
-
type FooterProps = {
- stepNumber: number | null;
- nextButton: ReactNode;
- prevButton: ReactNode;
+ stepNumber: number | null;
+ nextButton: ReactNode;
+ prevButton: ReactNode;
};
export const Footer = ({ stepNumber, nextButton, prevButton }: FooterProps) => {
- const theme = useTheme();
- const { questions } = useQuizData();
- console.log(questions)
+ const theme = useTheme();
+ const { questions } = useQuizData();
+ console.log(questions);
- return (
-
+
+ {/*{mode[settings.cfg.theme] ? (*/}
+ {/* */}
+ {/*):(*/}
+ {/* */}
+ {/*)}*/}
+ {stepNumber !== null && (
+
-
+ Шаг
+
- {/*{mode[settings.cfg.theme] ? (*/}
- {/* */}
- {/*):(*/}
- {/* */}
- {/*)}*/}
- {stepNumber !== null &&
-
- Шаг
-
- {stepNumber}
-
- Из
-
- {questions.filter(q => q.type !== "result").length}
-
-
- }
+ {stepNumber}
+
+ Из
+
+ {questions.filter((q) => q.type !== "result").length}
+
+
+ )}
-
- {/* Шаг
+
+ {/* Шаг
{
}}
>
{stepNumber} */}
- {/* */}
- {/* Из
+ {/* */}
+ {/* Из
{questions.length}
*/}
-
- {prevButton}
- {nextButton}
-
- );
+ {prevButton}
+ {nextButton}
+
+
+ );
};
diff --git a/lib/components/ViewPublicationPage/Question.tsx b/lib/components/ViewPublicationPage/Question.tsx
index 392adcb..1feefb6 100644
--- a/lib/components/ViewPublicationPage/Question.tsx
+++ b/lib/components/ViewPublicationPage/Question.tsx
@@ -23,74 +23,101 @@ import { quizThemes } from "@utils/themes/Publication/themePublication";
import { ReactNode } from "react";
type Props = {
- currentQuestion: RealTypedQuizQuestion;
- currentQuestionStepNumber: number | null;
- nextButton: ReactNode;
- prevButton: ReactNode;
+ currentQuestion: RealTypedQuizQuestion;
+ currentQuestionStepNumber: number | null;
+ nextButton: ReactNode;
+ prevButton: ReactNode;
};
export const Question = ({
- currentQuestion,
- currentQuestionStepNumber,
- nextButton,
- prevButton,
+ currentQuestion,
+ currentQuestionStepNumber,
+ nextButton,
+ prevButton,
}: Props) => {
- const theme = useTheme();
- const { settings } = useQuizData();
- console.log(currentQuestionStepNumber)
- return (
-
-
-
- {quizThemes[settings.cfg.theme].isLight ? (
-
-
-
- ) : (
-
-
-
-
- )}
-
-
+
+
+ );
};
-function QuestionByType({ question, stepNumber }: {
- question: RealTypedQuizQuestion;
- stepNumber: number | null;
+function QuestionByType({
+ question,
+ stepNumber,
+}: {
+ question: RealTypedQuizQuestion;
+ stepNumber: number | null;
}) {
- switch (question.type) {
- case "variant": return ;
- case "images": return ;
- case "varimg": return ;
- case "emoji": return ;
- case "text": return ;
- case "select": return ;
- case "date": return ;
- case "number": return ;
- case "file": return ;
- case "page": return ;
- case "rating": return ;
- default: notReachable(question);
- }
+ switch (question.type) {
+ case "variant":
+ return ;
+ case "images":
+ return ;
+ case "varimg":
+ return ;
+ case "emoji":
+ return ;
+ case "text":
+ return ;
+ case "select":
+ return ;
+ case "date":
+ return ;
+ case "number":
+ return ;
+ case "file":
+ return ;
+ case "page":
+ return ;
+ case "rating":
+ return ;
+ default:
+ notReachable(question);
+ }
}
diff --git a/lib/components/ViewPublicationPage/ResultForm.tsx b/lib/components/ViewPublicationPage/ResultForm.tsx
index 8a3992e..79665d0 100644
--- a/lib/components/ViewPublicationPage/ResultForm.tsx
+++ b/lib/components/ViewPublicationPage/ResultForm.tsx
@@ -33,11 +33,12 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
alignItems: "center",
justifyContent: "space-between",
height: "100%",
+ minHeight: "100vh",
width: "100%",
pt: "28px",
overflow: "auto",
backgroundColor: theme.palette.background.default,
- }}
+ }}
>