diff --git a/src/pages/ContactFormPage/ContactFormPage.tsx b/src/pages/ContactFormPage/ContactFormPage.tsx index 1e16d3a7..28da8dcd 100644 --- a/src/pages/ContactFormPage/ContactFormPage.tsx +++ b/src/pages/ContactFormPage/ContactFormPage.tsx @@ -1,5 +1,4 @@ import React from "react"; -import Stepper from "@ui_kit/Stepper"; import { Box, Button, IconButton, Typography, Paper, useTheme, Link, SxProps, Theme, TextField } from "@mui/material"; import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; import CustomTextField from "@ui_kit/CustomTextField"; @@ -41,7 +40,6 @@ export default function ContactFormPage() { const theme = useTheme(); return ( <> - { - setActiveStep((prevActiveStep) => prevActiveStep + 1); - }; - - const handleBack = () => { - setActiveStep((prevActiveStep) => prevActiveStep - 1); - }; - const [display, setDisplay] = React.useState("1"); + const quizId = Number(useParams().quizId); const handleChange = (event: SelectChangeEvent) => { setDisplay(event.target.value); }; @@ -96,9 +88,14 @@ export default function InstallQuiz() { const [backgroundType, setBackgroundType] = useState("text"); const theme = useTheme(); + const { listQuizes, updateQuizesList } = quizStore(); + + const handleNext = () => { + updateQuizesList(quizId, { step: listQuizes[quizId].step + 1 }); + }; + return ( <> - - + { - const {listQuizes, updateQuizesList} = quizStore(); - const params = Number(useParams().quizId); - const handleNext = () => { - updateQuizesList(params, {step: listQuizes[params].step + 1}) - } + const { listQuizes, updateQuizesList } = quizStore(); + const params = Number(useParams().quizId); + const handleNext = () => { + updateQuizesList(params, { createResult: true }); + }; const theme = useTheme(); return ( @@ -22,16 +22,16 @@ export const Result = () => { image={image} /> - + diff --git a/src/pages/startPage/StartPage.tsx b/src/pages/startPage/StartPage.tsx index a4037374..62e48ebe 100755 --- a/src/pages/startPage/StartPage.tsx +++ b/src/pages/startPage/StartPage.tsx @@ -2,7 +2,16 @@ import Stepper from "@ui_kit/Stepper"; import SwitchStepPages from "@ui_kit/switchStepPages"; import React, { useState } from "react"; import PenaLogo from "@ui_kit/PenaLogo"; -import { Box, Button, Container, FormControl, IconButton, TextField, useMediaQuery, useTheme } from "@mui/material"; +import { + Box, + Button, + Container, + FormControl, + IconButton, + TextField, + useMediaQuery, + useTheme, +} from "@mui/material"; import BackArrowIcon from "@icons/BackArrowIcon"; import NavMenuItem from "@ui_kit/Header/NavMenuItem"; import EyeIcon from "@icons/EyeIcon"; @@ -14,6 +23,15 @@ import { Burger } from "@icons/Burger"; import { PenaLogoIcon } from "@icons/PenaLogoIcon"; import { SidebarMobile } from "./Sidebar/SidebarMobile"; +const DESCRIPTIONS = [ + "Настройка стартовой страницы", + "Задайте вопросы", + "Настройте авторезультаты", + "Настройте форму контактов", + "Установите квиз", + "Запустите рекламу", +] as const; + export default function StartPage() { const { listQuizes, updateQuizesList, removeQuiz, createBlank } = quizStore(); const params = Number(useParams().quizId); @@ -24,10 +42,6 @@ export default function StartPage() { const [mobileSidebar, setMobileSidebar] = useState(false); - const handleNext = () => { - updateQuizesList(params, { step: listQuizes[params].step + 1 }); - }; - const handleBack = () => { let result = listQuizes[params].step - 1; updateQuizesList(params, { step: result ? result : 1 }); @@ -50,7 +64,11 @@ export default function StartPage() { zIndex: theme.zIndex.drawer + 1, }} > - {isMobile ? : } + {isMobile ? ( + + ) : ( + + )} ) : ( )} @@ -157,7 +180,12 @@ export default function StartPage() { Опубликовать @@ -180,8 +208,16 @@ export default function StartPage() { boxSizing: "border-box", }} > - - + + diff --git a/src/pages/startPage/StartPageSettings.tsx b/src/pages/startPage/StartPageSettings.tsx index ec1239a1..cfa1b465 100755 --- a/src/pages/startPage/StartPageSettings.tsx +++ b/src/pages/startPage/StartPageSettings.tsx @@ -36,10 +36,6 @@ import AlignCenterIcon from "@icons/AlignCenterIcon"; import DropFav from "./dropfavicon"; import { createQuestion } from "@root/questions"; -interface HandleNext { - handleNext: () => void; -} - const designTypes = [ [ "standard", @@ -62,7 +58,7 @@ const designTypes = [ type BackgroundType = "image" | "video"; type AlignType = "left" | "right" | "center"; -export default function StartPageSettings({ handleNext }: HandleNext) { +export default function StartPageSettings() { const { listQuizes, updateQuizesList, removeQuiz, createBlank } = quizStore(); const params = Number(useParams().quizId); const theme = useTheme(); @@ -73,6 +69,10 @@ export default function StartPageSettings({ handleNext }: HandleNext) { ); const [alignType, setAlignType] = useState("left"); + const handleNext = () => { + updateQuizesList(params, { step: listQuizes[params].step + 1 }); + }; + const videoHC = (videoInp: HTMLInputElement) => { const file = videoInp.files?.[0]; diff --git a/src/pages/startPage/stepOne.tsx b/src/pages/startPage/stepOne.tsx index bf13c9c0..f591b82a 100755 --- a/src/pages/startPage/stepOne.tsx +++ b/src/pages/startPage/stepOne.tsx @@ -5,11 +5,7 @@ import quizCreationImage2 from "../../assets/quiz-creation-2.png"; import {useParams} from "react-router-dom"; import {quizStore} from "@root/quizes"; -interface HandleNext { - handleNext: () => void; -} - -export default function StepOne({ handleNext }: HandleNext) { +export default function StepOne() { const theme = useTheme(); const params = Number(useParams().quizId); @@ -28,7 +24,6 @@ export default function StepOne({ handleNext }: HandleNext) { let SPageClone = listQuizes[params].config SPageClone.type = "quize" updateQuizesList(params, {config: SPageClone }) - handleNext() } }> void -} - -export default function Steptwo ({handleNext}:HandleNext) { +export default function Steptwo () { const params = Number(useParams().quizId); const {listQuizes, updateQuizesList} = quizStore() return ( @@ -27,7 +23,6 @@ export default function Steptwo ({handleNext}:HandleNext) {