From d35b65fc05e462be713c67f0bdd56b30585a3720 Mon Sep 17 00:00:00 2001 From: Tamara Date: Thu, 4 Jan 2024 14:00:13 +0300 Subject: [PATCH] =?UTF-8?q?fix:=D0=BF=D0=B5=D1=80=D0=B5=D0=BA=D0=BB=D1=8E?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B2=D0=B5=D1=82=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=BA=D0=B8=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 6 +++--- src/assets/icons/BackButtonIcon.tsx | 6 +++--- src/pages/main.tsx | 7 +++++-- src/pages/startPage/EditPage.tsx | 11 +++++++++-- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index e94417e5..66564c2a 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -103,14 +103,14 @@ dayjs.locale("ru"); const routeslink = [ { path: "/edit", - page: , + page: EditPage, header: true, sidebar: true, footer: true, }, { path: "/design", - page: , + page: DesignPage, header: true, sidebar: true, footer: true, @@ -200,7 +200,7 @@ export default function App() { path={e.path} element={
( ); diff --git a/src/pages/main.tsx b/src/pages/main.tsx index f745a727..850e1c74 100755 --- a/src/pages/main.tsx +++ b/src/pages/main.tsx @@ -27,7 +27,7 @@ interface Props { sidebar: boolean; header?: boolean; footer?: boolean; - Page: JSX.Element; + Page?: React.Component; } export default function Main({ sidebar, header, footer, Page }: Props) { @@ -132,7 +132,10 @@ export default function Main({ sidebar, header, footer, Page }: Props) { boxSizing: "border-box", }} > - + {footer && ( diff --git a/src/pages/startPage/EditPage.tsx b/src/pages/startPage/EditPage.tsx index 74528fa6..cb50dd5f 100755 --- a/src/pages/startPage/EditPage.tsx +++ b/src/pages/startPage/EditPage.tsx @@ -42,7 +42,14 @@ import { ModalInfoWhyCantCreate } from "./ModalInfoWhyCantCreate"; import { ConfirmLeaveModal } from "./ConfirmLeaveModal"; import { checkQuestionHint } from "@utils/checkQuestionHint"; -export default function EditPage() { +interface Props { + openBranchingPage: boolean; + setOpenBranchingPage: (a: boolean) => void; +} +export default function EditPage({ + openBranchingPage, + setOpenBranchingPage, +}: Props) { const quiz = useCurrentQuiz(); const { editQuizId } = useQuizStore(); const { questions } = useQuestionsStore(); @@ -55,7 +62,7 @@ export default function EditPage() { const isMobile = useMediaQuery(theme.breakpoints.down(660)); const [nextStep, setNextStep] = useState(0); const quizConfig = quiz?.config; - const [openBranchingPage, setOpenBranchingPage] = useState(false); + // const [openBranchingPage, setOpenBranchingPage] = useState(false); useEffect(() => { if (editQuizId === null) navigate("/list");