From 13d2dfeeb18246376c8d6768772aee26b6f3981e Mon Sep 17 00:00:00 2001 From: Tamara Date: Fri, 5 Jan 2024 14:51:05 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D1=8C=20=D0=B8?= =?UTF-8?q?=20=D0=B0=D0=B4=D0=B0=D0=BF=D1=82=D0=B0=D1=86=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82?= =?UTF-8?q?=D0=B0=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Tariffs/Tariffs.tsx | 23 ++++++++++---------- src/pages/ViewPublicationPage/ResultForm.tsx | 23 ++++++++++++++------ src/ui_kit/Header/Header.tsx | 2 +- src/ui_kit/Header/HeaderFull.tsx | 2 +- 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/src/pages/Tariffs/Tariffs.tsx b/src/pages/Tariffs/Tariffs.tsx index 2d619642..8ad4d2b4 100644 --- a/src/pages/Tariffs/Tariffs.tsx +++ b/src/pages/Tariffs/Tariffs.tsx @@ -15,7 +15,7 @@ import { Typography, useMediaQuery, useTheme, - IconButton + IconButton, } from "@mui/material"; import { enqueueSnackbar } from "notistack"; import { Tariff, getMessageFromFetchError } from "@frontend/kitui"; @@ -58,8 +58,8 @@ function TariffPage() { setUser(user); setTariffs(tariffs); setDiscounts(discounts.Discounts); - let c = currencyFormatter.format(Number(user.wallet.cash) / 100) - setCash(c) + let c = currencyFormatter.format(Number(user.wallet.cash) / 100); + setCash(c); }; get(); }, []); @@ -85,9 +85,8 @@ function TariffPage() { method: "POST", url: "https://squiz.pena.digital/customer/cart/pay", }); - setCash(currencyFormatter.format(Number(data.wallet.cash) / 100)) + setCash(currencyFormatter.format(Number(data.wallet.cash) / 100)); enqueueSnackbar("Тариф успешно приобретён"); - } catch (e) { enqueueSnackbar("Произошла ошибка. Попробуйте позже"); } @@ -98,8 +97,9 @@ function TariffPage() { // history.pushState({}, null, "https://hub.pena.digital/wallet?action=squizpay"); var link = document.createElement("a"); - link.href = `https://hub.pena.digital/payment?action=squizpay&dif=${(price - Number(user.wallet.cash)) * 100 - }`; + link.href = `https://hub.pena.digital/payment?action=squizpay&dif=${ + (price - Number(user.wallet.cash)) * 100 + }`; document.body.appendChild(link); // link.click(); } @@ -179,8 +179,9 @@ function TariffPage() { display: "grid", gap: "40px", p: "20px", - gridTemplateColumns: `repeat(auto-fit, minmax(300px, ${isTablet ? "436px" : "360px" - }))`, + gridTemplateColumns: `repeat(auto-fit, minmax(300px, ${ + isTablet ? "436px" : "360px" + }))`, }} > {createTariffElements( @@ -231,7 +232,7 @@ export const Tariffs = withErrorBoundary(TariffPage, { Ошибка загрузки тарифов ), - onError: () => { }, + onError: () => {}, }); const LoadingPage = () => ( @@ -269,7 +270,7 @@ export const inCart = () => { } }); } else { - localStorage.setItem("saveCart", "[]") + localStorage.setItem("saveCart", "[]"); } }; const outCart = (cart: string[]) => { diff --git a/src/pages/ViewPublicationPage/ResultForm.tsx b/src/pages/ViewPublicationPage/ResultForm.tsx index 223e0e66..ad127e3d 100644 --- a/src/pages/ViewPublicationPage/ResultForm.tsx +++ b/src/pages/ViewPublicationPage/ResultForm.tsx @@ -1,4 +1,10 @@ -import { Box, Typography, Button } from "@mui/material"; +import { + Box, + Typography, + Button, + useMediaQuery, + useTheme, +} from "@mui/material"; import { getQuestionByContentId } from "@root/questions/actions"; import { useCurrentQuiz } from "@root/quizes/hooks"; @@ -24,6 +30,8 @@ export const ResultForm = ({ }: ResultFormProps) => { const quiz = useCurrentQuiz(); const mode = modes; + const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down(650)); const { questions } = useQuestionsStore(); const resultQuestion = (questions.find( (question) => @@ -58,15 +66,16 @@ export const ResultForm = ({ display: "flex", flexDirection: "column", alignItems: "start", - width: "490px", + width: isMobile ? "100%" : "490px", + padding: isMobile ? "0 16px" : undefined, }} > {!resultQuestion?.content.useImage && resultQuestion.content.video && ( )} @@ -75,10 +84,10 @@ export const ResultForm = ({ component="img" src={resultQuestion.content.back} sx={{ - width: "490px", - height: "280px", + width: isMobile ? "100%" : "490px", + height: isMobile ? "100%" : "280px", }} - > + /> )} {resultQuestion.description !== "" && resultQuestion.description !== " " && ( diff --git a/src/ui_kit/Header/Header.tsx b/src/ui_kit/Header/Header.tsx index 9098bccd..d805d4aa 100644 --- a/src/ui_kit/Header/Header.tsx +++ b/src/ui_kit/Header/Header.tsx @@ -131,7 +131,6 @@ export const Header = ({ setMobileSidebar }: HeaderProps) => { /> ) : ( <> - { gap: "15px", }} > + diff --git a/src/ui_kit/Header/HeaderFull.tsx b/src/ui_kit/Header/HeaderFull.tsx index 8da43757..23284a29 100644 --- a/src/ui_kit/Header/HeaderFull.tsx +++ b/src/ui_kit/Header/HeaderFull.tsx @@ -58,7 +58,7 @@ export default function HeaderFull() { - + Date: Fri, 5 Jan 2024 15:00:36 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BB=D0=B8=D0=BD?= =?UTF-8?q?=D0=B5=D0=B9=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BE=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=81=D0=BD=D0=B8=D0=BA=D0=B0=20=D1=81=D1=80=D0=B0=D0=B7=D1=83?= =?UTF-8?q?=20=D0=B8=D1=89=D0=B5=D1=82=D1=81=D1=8F=20=D0=BB=D0=B8=D0=BD?= =?UTF-8?q?=D0=B5=D0=B9=D0=BD=D1=8B=D0=B9=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ViewPublicationPage/Footer.tsx | 2 ++ src/pages/ViewPublicationPage/ResultForm.tsx | 32 ++++++++++++++------ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/pages/ViewPublicationPage/Footer.tsx b/src/pages/ViewPublicationPage/Footer.tsx index f2d2350f..4be27c37 100644 --- a/src/pages/ViewPublicationPage/Footer.tsx +++ b/src/pages/ViewPublicationPage/Footer.tsx @@ -109,6 +109,7 @@ export const Footer = ({ }, [question, answers]); const showResult = (nextQuestion) => { + console.log("Следующий результат будет вот такой" , nextQuestion) if (nextQuestion && quiz?.config.resultInfo.when === "email") { setShowContactForm(true); return; @@ -241,6 +242,7 @@ export const Footer = ({ }; const followNextStep = () => { + console.log(" Я понимаю что нахожусь в линейном опроснике" + linear) if (linear) { setStepNumber((q) => q + 1); const questionIndex = questions.findIndex(({ id }) => id === question.id); diff --git a/src/pages/ViewPublicationPage/ResultForm.tsx b/src/pages/ViewPublicationPage/ResultForm.tsx index 223e0e66..b97ee917 100644 --- a/src/pages/ViewPublicationPage/ResultForm.tsx +++ b/src/pages/ViewPublicationPage/ResultForm.tsx @@ -25,15 +25,28 @@ export const ResultForm = ({ const quiz = useCurrentQuiz(); const mode = modes; const { questions } = useQuestionsStore(); - const resultQuestion = (questions.find( - (question) => - question.type === "result" && - question.content.rule.parentId === currentQuestion.content.id, - ) || - questions.find( - (question) => - question.type === "result" && question.content.rule.parentId === "line", - )) as AnyTypedQuizQuestion; + + const searchResult = () => { + if (Boolean(quiz?.config.haveRoot)) { + //ищём для ветвления + return (questions.find( + (question) => + question.type === "result" && + question.content.rule.parentId === currentQuestion.content.id, + ) || + questions.find( + (question) => + question.type === "result" && question.content.rule.parentId === "line", + )) as AnyTypedQuizQuestion; + } else { + return questions.find( + (question) => + question.type === "result" && question.content.rule.parentId === "line", + ) as AnyTypedQuizQuestion; + } + } + + const resultQuestion = searchResult() const followNextForm = () => { setShowResultForm(false); @@ -41,6 +54,7 @@ export const ResultForm = ({ }; if (resultQuestion === undefined) return <>; + console.log("Я форма показа резултата и он такой ", resultQuestion) return ( Date: Fri, 5 Jan 2024 17:43:28 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=B5=D1=89=D1=91=20=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BA=D0=B8=20=D0=BF=D0=BE=20=D0=B0=D0=B4=D0=B0=D0=BF?= =?UTF-8?q?=D1=82=D0=B8=D0=B2=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2=D0=BE=D0=B9=20=D0=BF=D1=83=D0=B1=D0=BB?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ViewPublicationPage/ContactForm.tsx | 9 ++++---- src/pages/ViewPublicationPage/Footer.tsx | 4 ++-- src/pages/ViewPublicationPage/Question.tsx | 20 ++++++++-------- src/pages/ViewPublicationPage/ResultForm.tsx | 23 ++++++++++++++----- .../StartPageViewPublication.tsx | 16 +++++++++---- .../ViewPublicationPage/questions/Variant.tsx | 10 +++++++- src/pages/main.tsx | 2 +- src/ui_kit/StartPagePreview/index.tsx | 1 + 8 files changed, 58 insertions(+), 27 deletions(-) diff --git a/src/pages/ViewPublicationPage/ContactForm.tsx b/src/pages/ViewPublicationPage/ContactForm.tsx index 33a11260..5e9a9f63 100644 --- a/src/pages/ViewPublicationPage/ContactForm.tsx +++ b/src/pages/ViewPublicationPage/ContactForm.tsx @@ -114,8 +114,6 @@ export const ContactForm = ({ borderRadius: "4px", overflow: "auto", height: "90vh", - boxShadow: - "rgba(0, 0, 0, 0.2) 0px 2px 1px -1px, rgba(0, 0, 0, 0.14) 0px 1px 1px 0px, rgba(0, 0, 0, 0.12) 0px 1px 3px 0px", }} > @@ -133,6 +131,7 @@ export const ContactForm = ({ {quiz?.config.formContact.desc && ( - + С  Положением об обработке персональных данных  и  @@ -328,7 +327,9 @@ const CustomInput = ({ title, desc, Icon }: any) => { const isMobile = useMediaQuery(theme.breakpoints.down(600)); return ( - {title} + + {title} + { - console.log("Следующий результат будет вот такой" , nextQuestion) + console.log("Следующий результат будет вот такой", nextQuestion); if (nextQuestion && quiz?.config.resultInfo.when === "email") { setShowContactForm(true); return; @@ -242,7 +242,7 @@ export const Footer = ({ }; const followNextStep = () => { - console.log(" Я понимаю что нахожусь в линейном опроснике" + linear) + console.log(" Я понимаю что нахожусь в линейном опроснике" + linear); if (linear) { setStepNumber((q) => q + 1); const questionIndex = questions.findIndex(({ id }) => id === question.id); diff --git a/src/pages/ViewPublicationPage/Question.tsx b/src/pages/ViewPublicationPage/Question.tsx index 2bb555dd..fe54fce5 100644 --- a/src/pages/ViewPublicationPage/Question.tsx +++ b/src/pages/ViewPublicationPage/Question.tsx @@ -90,15 +90,17 @@ export const Question = ({ questions }: QuestionProps) => { }} > - {mode[quiz.config.theme] ? ( - - ) : ( - - )} + + {mode[quiz.config.theme] ? ( + + ) : ( + + )} + )} {showResultForm && quiz?.config.resultInfo.when === "before" && ( diff --git a/src/pages/ViewPublicationPage/ResultForm.tsx b/src/pages/ViewPublicationPage/ResultForm.tsx index 5bc458a0..357a9afa 100644 --- a/src/pages/ViewPublicationPage/ResultForm.tsx +++ b/src/pages/ViewPublicationPage/ResultForm.tsx @@ -44,17 +44,19 @@ export const ResultForm = ({ ) || questions.find( (question) => - question.type === "result" && question.content.rule.parentId === "line", + question.type === "result" && + question.content.rule.parentId === "line", )) as AnyTypedQuizQuestion; } else { return questions.find( (question) => - question.type === "result" && question.content.rule.parentId === "line", + question.type === "result" && + question.content.rule.parentId === "line", ) as AnyTypedQuizQuestion; } - } + }; - const resultQuestion = searchResult() + const resultQuestion = searchResult(); const followNextForm = () => { setShowResultForm(false); @@ -62,7 +64,7 @@ export const ResultForm = ({ }; if (resultQuestion === undefined) return <>; - console.log("Я форма показа резултата и он такой ", resultQuestion) + console.log("Я форма показа резултата и он такой ", resultQuestion); return ( {resultQuestion.description} @@ -120,6 +123,7 @@ export const ResultForm = ({ {resultQuestion.title} @@ -132,6 +136,7 @@ export const ResultForm = ({ sx={{ fontSize: "18px", m: "20px 0", + color: theme.palette.text.primary, }} > {resultQuestion.content.text} @@ -153,9 +158,15 @@ export const ResultForm = ({ display: "flex", alignItems: "center", mt: "15px", + gap: "10px", }} > - + { const mode = modes; const { isMobileDevice } = useUADevice(); const isMobile = useMediaQuery(theme.breakpoints.down(650)); + const isTablet = useMediaQuery(theme.breakpoints.down(1000)); if (!quiz) return null; @@ -100,7 +101,6 @@ export const StartPageViewPublication = ({ setVisualStartPage }: Props) => { ? "linear-gradient(180deg,transparent,#272626)" : "linear-gradient(270deg,#272626,transparent)" : theme.palette.background.default, - color: quiz.config.startpageType === "expanded" ? "white" : "black", }} > @@ -197,6 +197,10 @@ export const StartPageViewPublication = ({ setVisualStartPage }: Props) => { quiz.config.startpageType === "centered" ? "center" : "-moz-initial", + color: + quiz.config.startpageType === "expanded" && !isMobile + ? "white" + : theme.palette.text.primary, }} > {quiz.config.startpage.description} @@ -229,10 +233,10 @@ export const StartPageViewPublication = ({ setVisualStartPage }: Props) => { sx={{ mt: "46px", display: "flex", - alignItems: "center", + alignItems: isTablet ? "start" : "center", justifyContent: "space-between", width: "100%", - flexDirection: isMobile ? "column" : "row", + flexDirection: isTablet ? "column" : "row", }} > @@ -272,7 +276,11 @@ export const StartPageViewPublication = ({ setVisualStartPage }: Props) => { width: "100%", overflowWrap: "break-word", fontSize: "12px", - textAlign: "end", + textAlign: isTablet ? "start" : "end", + color: + quiz.config.startpageType === "expanded" && !isMobile + ? "white" + : theme.palette.text.primary, }} > {quiz.config.info.law} diff --git a/src/pages/ViewPublicationPage/questions/Variant.tsx b/src/pages/ViewPublicationPage/questions/Variant.tsx index 12883911..bcd9e650 100644 --- a/src/pages/ViewPublicationPage/questions/Variant.tsx +++ b/src/pages/ViewPublicationPage/questions/Variant.tsx @@ -9,6 +9,7 @@ import { Checkbox, TextField, useTheme, + useMediaQuery, } from "@mui/material"; import { @@ -43,6 +44,7 @@ type VariantItemProps = { export const Variant = ({ currentQuestion }: VariantProps) => { const theme = useTheme(); + const isMobile = useMediaQuery(theme.breakpoints.down(650)); const { answers, ownVariants } = useQuizViewStore(); const { answer } = answers.find( @@ -65,7 +67,13 @@ export const Variant = ({ currentQuestion }: VariantProps) => { {currentQuestion.title} - + )} - {currentStep === 1 && ( + {currentStep <= 1 && ( { overflow: "hidden", pointerEvents: "auto", borderRadius: "5px", + boxShadow: "0px 5px 10px 2px rgba(34, 60, 80, 0.2)", }} > From 3e86ef34b1ead59e63bc8e18d00b3e43fbc52c22 Mon Sep 17 00:00:00 2001 From: Nastya Date: Fri, 5 Jan 2024 17:54:09 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D1=81=D1=82=D1=80=20=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE=D0=B2=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D1=8F=D0=B5=D1=82=20=D0=BD=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D1=87=D0=B8=D0=B5=20=D0=BB=D0=B8=D0=BD=D0=B5=D0=B9=D0=BD?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=82=D0=B0?= =?UTF-8?q?=20+=20=D0=B2=D1=8B=D1=85=D0=BE=D0=B4=20=D1=81=D0=BE=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=BA=D0=B8=D0=B4=D0=B0=D0=B5=D1=82=20=D0=BD=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5=20=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ResultPage/ResultSettings.tsx | 9 ++++++++- src/pages/startPage/EditPage.tsx | 3 +-- src/stores/uiTools/actions.ts | 3 +++ src/stores/uiTools/store.ts | 2 ++ src/ui_kit/Sidebar/Sidebar.tsx | 14 ++++++++------ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/pages/ResultPage/ResultSettings.tsx b/src/pages/ResultPage/ResultSettings.tsx index 65a40fd7..e583995e 100644 --- a/src/pages/ResultPage/ResultSettings.tsx +++ b/src/pages/ResultPage/ResultSettings.tsx @@ -18,7 +18,7 @@ import { ResultCard, checkEmptyData } from "./cards/ResultCard"; import { EmailSettingsCard } from "./cards/EmailSettingsCard"; import { useCurrentQuiz } from "@root/quizes/hooks"; import { useQuestionsStore } from "@root/questions/store"; -import { deleteQuestion } from "@root/questions/actions"; +import { createResult, deleteQuestion } from "@root/questions/actions"; import { QuizQuestionResult } from "@model/questionTypes/result"; import IconPlus from "@icons/IconPlus"; @@ -57,6 +57,13 @@ export const ResultSettings = () => { ); 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); diff --git a/src/pages/startPage/EditPage.tsx b/src/pages/startPage/EditPage.tsx index 2466efb7..778bbbe5 100755 --- a/src/pages/startPage/EditPage.tsx +++ b/src/pages/startPage/EditPage.tsx @@ -54,13 +54,12 @@ export default function EditPage({ const { editQuizId } = useQuizStore(); const { questions } = useQuestionsStore(); console.log(questions); - const { whyCantCreatePublic, showConfirmLeaveModal } = useUiTools(); + const { whyCantCreatePublic, showConfirmLeaveModal, nextStep } = useUiTools(); const theme = useTheme(); const navigate = useNavigate(); const currentStep = useQuizStore((state) => state.currentStep); const isBranchingLogic = useMediaQuery(theme.breakpoints.down(1100)); const isMobile = useMediaQuery(theme.breakpoints.down(660)); - const [nextStep, setNextStep] = useState(0); const quizConfig = quiz?.config; // const [openBranchingPage, setOpenBranchingPage] = useState(false); diff --git a/src/stores/uiTools/actions.ts b/src/stores/uiTools/actions.ts index 2f3cd9cd..2ec4526e 100644 --- a/src/stores/uiTools/actions.ts +++ b/src/stores/uiTools/actions.ts @@ -40,3 +40,6 @@ export const setShowConfirmLeaveModal = (showConfirmLeaveModal: boolean) => 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 3d297e39..122ccbf9 100644 --- a/src/stores/uiTools/store.ts +++ b/src/stores/uiTools/store.ts @@ -12,6 +12,7 @@ export type UiTools = { deleteNodeId: string | null; showConfirmLeaveModal: boolean; someWorkBackend: boolean; + nextStep: number }; export type WhyCantCreatePublic = { @@ -30,6 +31,7 @@ const initialState: UiTools = { deleteNodeId: null, showConfirmLeaveModal: false, someWorkBackend: false, + nextStep: -1 }; export const useUiTools = create()( diff --git a/src/ui_kit/Sidebar/Sidebar.tsx b/src/ui_kit/Sidebar/Sidebar.tsx index 9b11b3a2..915d72d3 100755 --- a/src/ui_kit/Sidebar/Sidebar.tsx +++ b/src/ui_kit/Sidebar/Sidebar.tsx @@ -11,6 +11,7 @@ import MenuItem from "../MenuItem"; import { useCurrentQuiz } from "@root/quizes/hooks"; import { useLocation, useNavigate } from "react-router-dom"; import { setCurrentStep } from "@root/quizes/actions"; +import { updateNextStep } from "@root/uiTools/actions"; const quizSettingsMenuItems = [ [TagIcon, "Дополнения"], @@ -37,6 +38,7 @@ export default function Sidebar({ changePage, disableCollapse }: SidebarProps) { navigate("/edit"); } + updateNextStep(index) changePage(index); }; @@ -106,9 +108,9 @@ export default function Sidebar({ changePage, disableCollapse }: SidebarProps) { key={index} text={menuItem.sidebarText} isCollapsed={isMenuCollapsed} - isActive={currentStep === index} + isActive={currentStep === index && pathname.startsWith("/edit")} disabled={ - index === 0 + pathname.startsWith("/edit") ? false : quiz === undefined ? true @@ -117,7 +119,7 @@ export default function Sidebar({ changePage, disableCollapse }: SidebarProps) { icon={