Merge branch 'dev' into fix

This commit is contained in:
Nastya 2023-12-14 02:35:28 +03:00
commit 8b0c679b22
3 changed files with 15 additions and 12 deletions

@ -7,7 +7,7 @@ import QuizLogo from "./images/icons/QuizLogo";
import { useMediaQuery, useTheme } from "@mui/material";
import { setIsContactFormOpen } from "../../stores/contactForm";
import { useUserStore } from "@root/user";
import { useNavigate } from "react-router-dom";
import { useNavigate, Link, } from "react-router-dom";
const buttonMenu = ["Меню 1", "Меню 2", "Меню 3", "Меню 4", "Меню 5", "Меню 1", "Меню 2"];
@ -19,7 +19,7 @@ export default function Component() {
const userId = useUserStore((state) => state.userId);
const navigate = useNavigate();
const onClick = () => (userId ? navigate("/list") : setIsContactFormOpen(true));
const onClick = () => (userId ? navigate("/list") : navigate("/signin"));
return (
<SectionStyled
@ -66,7 +66,7 @@ export default function Component() {
{/* ))}*/}
{/*</Box>*/}
<Button
variant="outlined"
variant="outlined"
onClick={onClick}
sx={{
color: "black",

@ -1,3 +1,5 @@
import {Box, Typography, Switch, useTheme, Button, useMediaQuery} from "@mui/material";
import { QuestionsList } from "./QuestionsList";
@ -10,6 +12,7 @@ export const SwitchBranchingPanel = () => {
const theme = useTheme();
const isMobile = useMediaQuery(theme.breakpoints.down(660));
const {openBranchingPanel} = useQuestionsStore.getState()
console.log(openBranchingPanel)
const ref = useRef()
return (
<Box sx={{ userSelect: "none", maxWidth: "350px", width: "100%" }}>
@ -25,10 +28,10 @@ export const SwitchBranchingPanel = () => {
}}
>
<Switch
clicked={openBranchingPanel}
onChange={(_, value) => {
updateOpenBranchingPanel(value)
}}
checked={openBranchingPanel}
onChange={
(e) => updateOpenBranchingPanel(e.target.checked)
}
sx={{
width: 50,
height: 30,

@ -253,7 +253,7 @@ export default function EditPage() {
>
<Box
sx={{
display: openBranchingPanel ? "none" : "display",
display: "flex",
alignItems: "center",
gap: "15px",
padding: "18px",
@ -263,10 +263,10 @@ export default function EditPage() {
}}
>
<Switch
clicked={openBranchingPanel}
onChange={(_, value) => {
updateOpenBranchingPanel(value)
}}
checked={openBranchingPanel}
onChange={
(e) => updateOpenBranchingPanel(e.target.checked)
}
sx={{
width: 50,
height: 30,