From 8bfe78550474ad900af467dde7d4204aa0e2af4a Mon Sep 17 00:00:00 2001 From: Nastya Date: Fri, 5 Jan 2024 22:43:58 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=BE?= =?UTF-8?q?=D0=B2=20=20=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=BF=D1=80=D0=BE=D1=81?= =?UTF-8?q?=D1=8B=20=D0=B8=20=D0=BA=D0=B2=D0=B8=D0=B7=D1=8B=20=D0=BD=D0=B5?= =?UTF-8?q?=20=D0=B1=D1=83=D0=B4=D0=B5=D1=82=20=D0=B4=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D1=88=D0=B5=20=D0=BC=D0=B5=D0=B9=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Questions/QuestionsPage.tsx | 7 +++++++ src/pages/ResultPage/ResultSettings.tsx | 19 ++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/pages/Questions/QuestionsPage.tsx b/src/pages/Questions/QuestionsPage.tsx index df99635e..10056da3 100755 --- a/src/pages/Questions/QuestionsPage.tsx +++ b/src/pages/Questions/QuestionsPage.tsx @@ -10,6 +10,7 @@ import { import { collapseAllQuestions, createUntypedQuestion, + setQuestions, } from "@root/questions/actions"; import { decrementCurrentStep, @@ -25,6 +26,8 @@ import { QuestionSwitchWindowTool } from "./QuestionSwitchWindowTool"; import { useQuestionsStore } from "@root/questions/store"; import { updateEditSomeQuestion } from "@root/uiTools/actions"; import { useUiTools } from "@root/uiTools/store"; +import { questionApi } from "@api/question"; +import { useNavigate } from "react-router-dom"; interface Props { openBranchingPage: boolean; @@ -39,6 +42,8 @@ export default function QuestionsPage({ const { openedModalSettingsId } = useUiTools(); const isMobile = useMediaQuery(theme.breakpoints.down(660)); const quiz = useCurrentQuiz(); + const navigate = useNavigate() + const { questions } = useQuestionsStore(); useLayoutEffect(() => { updateEditSomeQuestion(); }, []); @@ -46,6 +51,8 @@ export default function QuestionsPage({ const ref = useRef(); if (!quiz) return null; + + return ( <> { const { questions } = useQuestionsStore(); const quiz = useCurrentQuiz(); + const navigate = useNavigate() const results = useQuestionsStore().questions.filter( (q): q is QuizQuestionResult => q.type === "result", ); @@ -56,20 +59,6 @@ export const ResultSettings = () => { [results], ); - useEffect(() => { - //Всегда должен существовать хоть 1 резулт - "line" - if ( - !questions?.find( (q) => (q.type === "result" && q.content.rule.parentId === "line")) - ) { - createResult(quiz?.backendId, "line"); - console.log("Я не нашёл линейный резулт и собираюсь создать новый"); - } - return () => { - if (!isReadyToLeaveRef.current && window.location.pathname !== "/edit") { - setOpenNotificationModal(true); - } - }; - }, []); const cnsl = results.filter((q) => q.content.usage); From b47d0959016815888762c65edc5b5deb7a5d549d Mon Sep 17 00:00:00 2001 From: Tamara Date: Fri, 5 Jan 2024 23:59:40 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D1=86=D0=B5=D0=BD=D1=82=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8F=20=D1=81=D1=82=D0=B0=D1=80=D1=82=D0=BE=D0=B2=D0=BE?= =?UTF-8?q?=D0=B9,=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=20=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=D0=BA=D1=82=D0=BE=D0=B2=20=D0=B8=20=D0=BC=D0=BE?= =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D0=BA=D0=B0=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83?= =?UTF-8?q?=D0=B7=D0=BA=D0=B8=20=D0=B8=D0=B7=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ResultPage/ResultSettings.tsx | 4 +++- src/pages/ViewPublicationPage/Question.tsx | 8 +++++--- src/pages/ViewPublicationPage/ResultForm.tsx | 2 +- .../ViewPublicationPage/StartPageViewPublication.tsx | 2 +- src/stores/uiTools/actions.ts | 2 +- src/stores/uiTools/store.ts | 4 ++-- src/ui_kit/Modal/CropModal.tsx | 3 ++- src/ui_kit/Sidebar/Sidebar.tsx | 2 +- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/pages/ResultPage/ResultSettings.tsx b/src/pages/ResultPage/ResultSettings.tsx index e583995e..5b594188 100644 --- a/src/pages/ResultPage/ResultSettings.tsx +++ b/src/pages/ResultPage/ResultSettings.tsx @@ -59,7 +59,9 @@ export const ResultSettings = () => { useEffect(() => { //Всегда должен существовать хоть 1 резулт - "line" if ( - !questions?.find( (q) => (q.type === "result" && q.content.rule.parentId === "line")) + !questions?.find( + (q) => q.type === "result" && q.content.rule.parentId === "line", + ) ) { createResult(quiz?.backendId, "line"); console.log("Я не нашёл линейный резулт и собираюсь создать новый"); diff --git a/src/pages/ViewPublicationPage/Question.tsx b/src/pages/ViewPublicationPage/Question.tsx index fe54fce5..ca89e611 100644 --- a/src/pages/ViewPublicationPage/Question.tsx +++ b/src/pages/ViewPublicationPage/Question.tsx @@ -1,5 +1,5 @@ import { useState, useEffect } from "react"; -import { Box, useTheme } from "@mui/material"; +import { Box, useMediaQuery, useTheme } from "@mui/material"; import { useCurrentQuiz } from "@root/quizes/hooks"; import { getQuestionByContentId } from "@root/questions/actions"; @@ -46,6 +46,8 @@ const QUESTIONS_MAP: any = { export const Question = ({ questions }: QuestionProps) => { const quiz = useCurrentQuiz(); + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down(650)); const [currentQuestion, setCurrentQuestion] = useState(); const [showContactForm, setShowContactForm] = useState(false); @@ -67,13 +69,13 @@ export const Question = ({ questions }: QuestionProps) => { const QuestionComponent = QUESTIONS_MAP[currentQuestion.type as Exclude]; - const theme = useTheme(); + return ( {!showContactForm && !showResultForm && ( export const updateSomeWorkBackend = (someWorkBackend: boolean) => useUiTools.setState({ someWorkBackend }); - + export const updateNextStep = (nextStep: number) => useUiTools.setState({ nextStep }); diff --git a/src/stores/uiTools/store.ts b/src/stores/uiTools/store.ts index 122ccbf9..d42e0e50 100644 --- a/src/stores/uiTools/store.ts +++ b/src/stores/uiTools/store.ts @@ -12,7 +12,7 @@ export type UiTools = { deleteNodeId: string | null; showConfirmLeaveModal: boolean; someWorkBackend: boolean; - nextStep: number + nextStep: number; }; export type WhyCantCreatePublic = { @@ -31,7 +31,7 @@ const initialState: UiTools = { deleteNodeId: null, showConfirmLeaveModal: false, someWorkBackend: false, - nextStep: -1 + nextStep: -1, }; export const useUiTools = create()( diff --git a/src/ui_kit/Modal/CropModal.tsx b/src/ui_kit/Modal/CropModal.tsx index 9d6b2988..eac43cef 100644 --- a/src/ui_kit/Modal/CropModal.tsx +++ b/src/ui_kit/Modal/CropModal.tsx @@ -173,7 +173,8 @@ export const CropModal: FC = ({ height: isMobile ? "80vh" : undefined, display: isMobile ? "flex" : undefined, flexDirection: isMobile ? "column" : undefined, - justifyContent: isMobile ? "space-evenly" : undefined, + justifyContent: isMobile ? "flex-start" : undefined, + overflow: isMobile ? "auto" : undefined, }} >