From 1579ea1dd4f9c688d38fe014752fa0981f094a14 Mon Sep 17 00:00:00 2001
From: Tamara <tamara.zelenko555@yandex.ru>
Date: Thu, 14 Mar 2024 12:40:44 +0300
Subject: [PATCH 01/12] =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D0=B2=D0=B0=D1=8E?=
 =?UTF-8?q?=D1=89=D0=B0=D1=8F=20=D1=88=D0=B0=D0=BF=D0=BA=D0=B0,=20=D1=84?=
 =?UTF-8?q?=D0=B8=D0=BA=D1=81=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B5=20=D0=BD=D0=B8=D0=B6=D0=BD=D0=B5=D0=B5=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8E=20=D0=B2=20=D0=BC=D0=BE=D0=B1=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/DesignPage/DesignFilling.tsx | 12 ++--
 src/pages/DesignPage/DesignPage.tsx    |  3 -
 src/pages/InstallQuiz/InstallQuiz.tsx  | 81 ++++++++++++++++----------
 src/pages/main.tsx                     | 15 +++--
 src/pages/startPage/EditPage.tsx       | 35 +++++++++--
 src/ui_kit/Header/Header.tsx           |  7 ++-
 src/ui_kit/Sidebar/SidebarMobile.tsx   | 11 +++-
 7 files changed, 111 insertions(+), 53 deletions(-)

diff --git a/src/pages/DesignPage/DesignFilling.tsx b/src/pages/DesignPage/DesignFilling.tsx
index 9c4e702c..576670dc 100644
--- a/src/pages/DesignPage/DesignFilling.tsx
+++ b/src/pages/DesignPage/DesignFilling.tsx
@@ -105,12 +105,12 @@ export const DesignFilling = ({
     <Box
       sx={{
         width: "100%",
-        padding: "25px",
-        height: isMobile
+        padding: isMobile
           ? mobileSidebar
-            ? `calc(100vh - ${heightBar}px)`
-            : "calc(100vh - 127px)"
-          : "calc(100vh - 80px)",
+            ? `calc(${heightBar}px - 92px) 16px 70px 16px`
+            : "67px 16px 70px 16px"
+          : "25px",
+        height: isMobile ? "100vh" : "calc(100vh - 80px)",
       }}
     >
       <Typography variant="h5" sx={{ marginBottom: "40px", color: "#333647" }}>
@@ -122,7 +122,7 @@ export const DesignFilling = ({
           maxWidth: "796px",
           width: "100%",
           borderRadius: "12px",
-          height: "calc(100vh - 280px)",
+          height: "calc(100vh - 300px)",
           overflow: "auto",
         }}
       >
diff --git a/src/pages/DesignPage/DesignPage.tsx b/src/pages/DesignPage/DesignPage.tsx
index 23aaa5ea..f73e20dc 100644
--- a/src/pages/DesignPage/DesignPage.tsx
+++ b/src/pages/DesignPage/DesignPage.tsx
@@ -3,10 +3,8 @@ import { Box, useMediaQuery, useTheme, Skeleton } from "@mui/material";
 import { setQuizes, setCurrentStep } from "@root/quizes/actions";
 import { useCurrentQuiz } from "@root/quizes/hooks";
 import { useQuizStore } from "@root/quizes/store";
-import Sidebar from "@ui_kit/Sidebar/Sidebar";
 import { useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { SidebarMobile } from "../../ui_kit/Sidebar/SidebarMobile";
 import { cleanQuestions, setQuestions } from "@root/questions/actions";
 import {
   updateModalInfoWhyCantCreate,
@@ -17,7 +15,6 @@ import { questionApi } from "@api/question";
 import { useUiTools } from "@root/uiTools/store";
 
 import { ConfirmLeaveModal } from "../startPage/ConfirmLeaveModal";
-import { Header } from "@ui_kit/Header/Header";
 import { DesignFilling } from "./DesignFilling";
 import { createPortal } from "react-dom";
 import QuizPreview from "@ui_kit/QuizPreview/QuizPreview";
diff --git a/src/pages/InstallQuiz/InstallQuiz.tsx b/src/pages/InstallQuiz/InstallQuiz.tsx
index b4ba07dd..b55b25ed 100644
--- a/src/pages/InstallQuiz/InstallQuiz.tsx
+++ b/src/pages/InstallQuiz/InstallQuiz.tsx
@@ -1,22 +1,23 @@
 import React, { useState } from "react";
 import {
-    Box,
-    Button,
-    ButtonBase,
-    FormControl,
-    IconButton,
-    InputAdornment,
-    Link,
-    MenuItem,
-    Modal,
-    OutlinedInput,
-    Paper,
-    Select,
-    SelectChangeEvent,
-    TextField,
-    Typography,
-    Tooltip,
-    useTheme, useMediaQuery,
+  Box,
+  Button,
+  ButtonBase,
+  FormControl,
+  IconButton,
+  InputAdornment,
+  Link,
+  MenuItem,
+  Modal,
+  OutlinedInput,
+  Paper,
+  Select,
+  SelectChangeEvent,
+  TextField,
+  Typography,
+  Tooltip,
+  useTheme,
+  useMediaQuery,
 } from "@mui/material";
 import LinkIcon from "../../assets/icons/LinkIcon";
 import InfoIcon from "../../assets/icons/InfoIcon";
@@ -41,7 +42,11 @@ import InBodyInstall from "./InBodyInstall";
 import AutoOpenInstall from "./AutoOpenInstall";
 import VidjetInstall from "./VidjetInstall";
 import InstallQzCode from "./InstallQzCode";
-import {decrementCurrentStep, incrementCurrentStep, updateQuiz} from "@root/quizes/actions";
+import {
+  decrementCurrentStep,
+  incrementCurrentStep,
+  updateQuiz,
+} from "@root/quizes/actions";
 import { useCurrentQuiz } from "@root/quizes/hooks";
 import { useDomainDefine } from "@utils/hooks/useDomainDefine";
 import NumberTwo from "@icons/NumberTwo";
@@ -56,7 +61,6 @@ export default function InstallQuiz() {
     setDisplay(event.target.value);
   };
 
-
   const [openVk, setOpenVk] = React.useState(false);
   const [stepState, setStepState] = React.useState("step1");
   const handleOpenVk = () => setOpenVk(true);
@@ -101,16 +105,22 @@ export default function InstallQuiz() {
               "0px 100px 309px rgba(210, 208, 225, 0.24), 0px 41.7776px 129.093px rgba(210, 208, 225, 0.172525), 0px 22.3363px 69.0192px rgba(210, 208, 225, 0.143066), 0px 12.5216px 38.6916px rgba(210, 208, 225, 0.12), 0px 6.6501px 20.5488px rgba(210, 208, 225, 0.0969343), 0px 2.76726px 8.55082px rgba(210, 208, 225, 0.0674749)",
           }}
         >
-          <Box sx={{ display: "flex", alignItems: isMobile ? "flex-start" : "center", gap: "10px", flexDirection: isMobile ? "column" : "row" }}>
-            <Box sx={{display: "flex", alignItems: "center", gap: "10px"}}>
-                <LinkIcon
-                    color={theme.palette.brightPurple.main}
-                    bgcolor={"#EEE4FC"}
-                />
-                <Typography>Ссылка на quiz</Typography>
+          <Box
+            sx={{
+              display: "flex",
+              alignItems: isMobile ? "flex-start" : "center",
+              gap: "10px",
+              flexDirection: isMobile ? "column" : "row",
+            }}
+          >
+            <Box sx={{ display: "flex", alignItems: "center", gap: "10px" }}>
+              <LinkIcon
+                color={theme.palette.brightPurple.main}
+                bgcolor={"#EEE4FC"}
+              />
+              <Typography>Ссылка на quiz</Typography>
             </Box>
 
-
             {/*<Tooltip*/}
             {/*  title="Скопируйте или укажите свою ссылку на quiz. Ссылка должна быть от 4 до 20 символов включительно, может содержать латинские буквы, цифры, тире '-' и нижнее подчеркивание '_'."*/}
             {/*  placement="top"*/}
@@ -282,9 +292,16 @@ export default function InstallQuiz() {
               "0px 100px 309px rgba(210, 208, 225, 0.24), 0px 41.7776px 129.093px rgba(210, 208, 225, 0.172525), 0px 22.3363px 69.0192px rgba(210, 208, 225, 0.143066), 0px 12.5216px 38.6916px rgba(210, 208, 225, 0.12), 0px 6.6501px 20.5488px rgba(210, 208, 225, 0.0969343), 0px 2.76726px 8.55082px rgba(210, 208, 225, 0.0674749)",
           }}
         >
-          <Box sx={{ display: "flex", alignItems: isMobile ? "flex-start" : "center", gap: "30px", flexDirection: isMobile ? "column" : "row" }}>
+          <Box
+            sx={{
+              display: "flex",
+              alignItems: isMobile ? "flex-start" : "center",
+              gap: "30px",
+              flexDirection: isMobile ? "column" : "row",
+            }}
+          >
             <Typography variant="h5" sx={{ paddingRight: "30px" }}>
-              Установка квизов на сайте
+              Установка quiz на сайте
             </Typography>
             <ButtonBase
               onClick={() => {
@@ -382,9 +399,9 @@ export default function InstallQuiz() {
                       gap: "20px",
                     }}
                   >
-                    <Typography>1. Код вставки опросника</Typography>
+                    <Typography>1. Код вставки quiz</Typography>
                     <Typography sx={{ color: theme.palette.grey2.main }}>
-                      Установите код в то место, где должен быть опросник
+                      Установите код в то место, где должен быть quiz
                     </Typography>
                     <TextField
                       id="outlined-multiline-static"
@@ -453,7 +470,7 @@ export default function InstallQuiz() {
             gap: "8px",
             justifyContent: "end",
             mt: "30px",
-            mr: "60px"
+            mr: "60px",
           }}
         >
           <Button
diff --git a/src/pages/main.tsx b/src/pages/main.tsx
index d5bcf8d8..17f97894 100755
--- a/src/pages/main.tsx
+++ b/src/pages/main.tsx
@@ -95,6 +95,7 @@ export default function Main({ sidebar, header, footer, Page }: Props) {
 
   const [widthMain, setWidthMain] = useState(null);
   const [heightSidebar, setHeightSidebar] = useState(null);
+  const [scrollDown, setScrollDown] = useState<boolean | null>(null);
   const mainBlock = useRef(0);
   const heightHeader = heightSidebar + 51 + 36;
   const observer = useRef(
@@ -111,7 +112,7 @@ export default function Main({ sidebar, header, footer, Page }: Props) {
   if (!quizConfig) return <></>;
   return (
     <>
-      <Header setMobileSidebar={setMobileSidebar} />
+      <Header setMobileSidebar={setMobileSidebar} scrollDown={scrollDown} />
       <Box
         sx={{
           display: "flex",
@@ -125,6 +126,7 @@ export default function Main({ sidebar, header, footer, Page }: Props) {
                 open={mobileSidebar}
                 changePage={changePage}
                 setHeightSitebar={setHeightSidebar}
+                scrollDown={scrollDown}
               />
             ) : (
               <Sidebar changePage={changePage} />
@@ -137,9 +139,10 @@ export default function Main({ sidebar, header, footer, Page }: Props) {
           sx={{
             width: "100%",
             height: isMobile
-              ? mobileSidebar
-                ? `calc(100vh - ${heightHeader}px)`
-                : "calc(100vh - 51px)"
+              ? // ? mobileSidebar
+                //   ? `calc(100vh - ${heightHeader}px)`
+                //    "calc(100vh - 51px)"
+                "100vh"
               : "calc(100vh - 80px)",
             display: "flex",
             flexDirection: "column",
@@ -162,6 +165,8 @@ export default function Main({ sidebar, header, footer, Page }: Props) {
               widthMain={widthMain}
               mobileSidebar={mobileSidebar}
               heightSidebar={heightSidebar}
+              scrollDown={scrollDown}
+              setScrollDown={setScrollDown}
             />
           </Box>
 
@@ -182,6 +187,8 @@ export default function Main({ sidebar, header, footer, Page }: Props) {
                 background: "#FFF",
                 borderTop: "#f2f3f7 2px solid",
                 zIndex: 1,
+                position: isMobile ? "fixed" : undefined,
+                bottom: isMobile ? 0 : undefined,
               }}
             >
               {isConditionMet &&
diff --git a/src/pages/startPage/EditPage.tsx b/src/pages/startPage/EditPage.tsx
index 83dd3801..134eb2cb 100755
--- a/src/pages/startPage/EditPage.tsx
+++ b/src/pages/startPage/EditPage.tsx
@@ -17,7 +17,7 @@ import { useQuizStore } from "@root/quizes/store";
 import Sidebar from "@ui_kit/Sidebar/Sidebar";
 import Stepper from "@ui_kit/Stepper";
 import SwitchStepPages from "@ui_kit/switchStepPages";
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { Link, useNavigate } from "react-router-dom";
 import { useDebouncedCallback } from "use-debounce";
 import { SidebarMobile } from "../../ui_kit/Sidebar/SidebarMobile";
@@ -48,6 +48,8 @@ interface Props {
   widthMain: number;
   mobileSidebar: boolean;
   heightSidebar: number;
+  scrollDown: boolean;
+  setScrollDown: (a: boolean) => void;
 }
 export default function EditPage({
   openBranchingPage,
@@ -55,6 +57,8 @@ export default function EditPage({
   widthMain,
   mobileSidebar,
   heightSidebar,
+  scrollDown,
+  setScrollDown,
 }: Props) {
   const quiz = useCurrentQuiz();
   const { editQuizId } = useQuizStore();
@@ -67,8 +71,9 @@ export default function EditPage({
   const isMobile = useMediaQuery(theme.breakpoints.down(650));
   const quizConfig = quiz?.config;
   // const [openBranchingPage, setOpenBranchingPage] = useState<boolean>(false);
+  const mainBlock = useRef(0);
 
-  const heightBar = heightSidebar + 51 + 88 + 23;
+  const heightBar = heightSidebar + 51 + 88;
   useEffect(() => {
     if (editQuizId === null) navigate("/list");
   }, [navigate, editQuizId]);
@@ -108,6 +113,17 @@ export default function EditPage({
     setCurrentStep(nextStep);
   };
 
+  let lastScroll = mainBlock.current.scrollTop;
+  const onScroll = (e) => {
+    if ((mainBlock.current.scrollTop > lastScroll && !scrollDown) || null) {
+      setScrollDown(true);
+    }
+    if (mainBlock.current.scrollTop < lastScroll && scrollDown) {
+      setScrollDown(false);
+    }
+    lastScroll = mainBlock.current.scrollTop;
+  };
+
   if (!quizConfig) return <></>;
 
   const isConditionMet =
@@ -129,19 +145,26 @@ export default function EditPage({
           }}
         >
           <Box
+            onScroll={onScroll}
+            ref={mainBlock}
             sx={{
-              padding: isMobile ? "16px 16px 20px 16px" : "25px 25px 20px 25px",
+              padding: isMobile
+                ? mobileSidebar
+                  ? `${heightBar}px 16px 70px 16px`
+                  : "67px 16px 70px 16px"
+                : "25px 25px 20px 25px",
               overflow: "auto",
               height: isMobile
-                ? mobileSidebar
-                  ? `calc(100vh - ${heightBar}px)`
-                  : `calc(100vh - 125px)`
+                ? "100vh"
                 : isConditionMet
                   ? isBranchingLogic
                     ? `calc(100vh - 166px)`
                     : `calc(100vh - 186px)`
                   : `calc(100vh - 166px)`,
               boxSizing: "border-box",
+              transition: "transform 0.3s",
+              transform:
+                scrollDown && isMobile ? "translateY(-51px)" : undefined,
             }}
           >
             {/* Выбор текущей страницы редактирования чего-либо - находится здесь */}
diff --git a/src/ui_kit/Header/Header.tsx b/src/ui_kit/Header/Header.tsx
index 26c7a97b..d6f853d0 100644
--- a/src/ui_kit/Header/Header.tsx
+++ b/src/ui_kit/Header/Header.tsx
@@ -30,9 +30,10 @@ import { cleanAuthTicketData } from "@root/ticket";
 
 type HeaderProps = {
   setMobileSidebar: (callback: (visible: boolean) => boolean) => void;
+  scrollDown: boolean;
 };
 
-export const Header = ({ setMobileSidebar }: HeaderProps) => {
+export const Header = ({ setMobileSidebar, scrollDown }: HeaderProps) => {
   const quiz = useCurrentQuiz();
   const theme = useTheme();
   const navigate = useNavigate();
@@ -65,6 +66,10 @@ export const Header = ({ setMobileSidebar }: HeaderProps) => {
         bgcolor: isMobile ? "#333647" : "white",
         borderBottom: "1px solid #E3E3E3",
         zIndex: theme.zIndex.drawer + 1,
+        transition: "transform 0.3s",
+        transform: scrollDown && isMobile ? "translateY(-51px)" : undefined,
+        position: isMobile ? "fixed" : undefined,
+        top: isMobile ? 0 : undefined,
       }}
     >
       <Link to="/" style={{ display: "flex" }}>
diff --git a/src/ui_kit/Sidebar/SidebarMobile.tsx b/src/ui_kit/Sidebar/SidebarMobile.tsx
index f121a9f1..373a65e1 100644
--- a/src/ui_kit/Sidebar/SidebarMobile.tsx
+++ b/src/ui_kit/Sidebar/SidebarMobile.tsx
@@ -48,12 +48,14 @@ interface Iprops {
   open: boolean;
   changePage: (step: number) => void;
   setHeightSitebar: any;
+  scrollDown: boolean;
 }
 
 export const SidebarMobile: FC<Iprops> = ({
   open,
   changePage,
   setHeightSitebar,
+  scrollDown,
 }) => {
   const theme = useTheme();
   const isWrappSidebar = useMediaQuery(theme.breakpoints.down(400));
@@ -118,7 +120,9 @@ export const SidebarMobile: FC<Iprops> = ({
     <Box
       ref={heightSidebar}
       sx={{
-        display: open ? "block" : "none",
+        display: open ? "flex" : "none",
+        flexDirection: "column",
+        width: "100%",
         minHeight: "134px",
         padding: "20px 16px 16px 16px",
         background: "#333647",
@@ -126,6 +130,11 @@ export const SidebarMobile: FC<Iprops> = ({
         borderBottomLeftRadius: "8px",
         borderBottomRightRadius: "8px",
         transitionDuration: "200ms",
+        position: "fixed",
+        top: "51px",
+        zIndex: theme.zIndex.drawer + 1,
+        transition: "transform 0.3s",
+        transform: scrollDown ? "translateY(-200px)" : undefined,
       }}
     >
       <Box sx={{ display: "flex", alignItems: "center", position: "relative" }}>

From aff2120637ea4091dd7a9514b9038ab91176b64f Mon Sep 17 00:00:00 2001
From: IlyaDoronin <ryletd@gmail.com>
Date: Thu, 14 Mar 2024 18:13:01 +0300
Subject: [PATCH 02/12] fix: full-screen

---
 .../FloatingSupportChat.tsx                   | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/ui_kit/FloatingSupportChat/FloatingSupportChat.tsx b/src/ui_kit/FloatingSupportChat/FloatingSupportChat.tsx
index a90cd389..b657dc3b 100644
--- a/src/ui_kit/FloatingSupportChat/FloatingSupportChat.tsx
+++ b/src/ui_kit/FloatingSupportChat/FloatingSupportChat.tsx
@@ -1,3 +1,4 @@
+import { useState, useEffect, forwardRef } from "react";
 import {
   Box,
   Fab,
@@ -9,9 +10,7 @@ import {
   Modal,
   Typography,
 } from "@mui/material";
-import { ReactNode } from "react";
 import CircleDoubleDown from "./QuestionIcon";
-import * as React from "react";
 import Chat from "./Chat";
 import { TransitionProps } from "@mui/material/transitions";
 import { useLocation } from "react-router-dom";
@@ -19,6 +18,8 @@ import { useTicketStore } from "@root/ticket";
 import { useUserStore } from "@root/user";
 import { ACCEPT_SEND_FILE_TYPES_MAP } from "@frontend/squzanswerer/dist-package/components/ViewPublicationPage/tools/fileUpload";
 
+import type { ReactNode, Ref } from "react";
+
 const animation = {
   "@keyframes runningStripe": {
     "0%": { left: "10%", backgroundColor: "transparent" },
@@ -29,11 +30,11 @@ const animation = {
   },
 };
 
-const Transition = React.forwardRef(function Transition(
+const Transition = forwardRef(function Transition(
   props: TransitionProps & {
     children: ReactNode;
   },
-  ref: React.Ref<unknown>,
+  ref: Ref<unknown>,
 ) {
   return <Slide direction="up" ref={ref} {...props} />;
 });
@@ -59,7 +60,9 @@ export default function FloatingSupportChat({
   modalWarningType,
   setModalWarningType,
 }: Props) {
+  const [monitorType, setMonitorType] = useState<"desktop" | "mobile" | "">("");
   const theme = useTheme();
+  const isMobile = useMediaQuery(theme.breakpoints.down(800));
   const location = useLocation();
   const locationChat = location.pathname;
   const user = useUserStore((state) => state.user?._id);
@@ -68,9 +71,24 @@ export default function FloatingSupportChat({
     (state) => state[user ? "authData" : "unauthData"],
   );
 
-  const isMobile = useMediaQuery(theme.breakpoints.down(800));
+  useEffect(() => {
+    const onResize = () => {
+      if (document.fullscreenElement) {
+        setMonitorType(isMobile ? "mobile" : "desktop");
+
+        return;
+      }
+
+      setMonitorType("");
+    };
+
+    window.addEventListener("resize", onResize);
+
+    return () => {
+      window.removeEventListener("resize", onResize);
+    };
+  }, [isMobile]);
 
-  console.log(messages);
   return (
     <Box
       sx={{
@@ -85,19 +103,19 @@ export default function FloatingSupportChat({
       }}
     >
       <Chat
-        open={isChatOpened && !isMobile}
+        open={isChatOpened && (monitorType === "desktop" || !isMobile)}
         sx={{ alignSelf: "start", width: "clamp(200px, 100%, 400px)" }}
         sendMessage={sendMessage}
         sendFile={sendFile}
       />
       <Dialog
         fullScreen
-        open={isChatOpened && isMobile}
+        open={isChatOpened && (monitorType === "mobile" || isMobile)}
         onClose={handleChatClickClose}
         TransitionComponent={Transition}
       >
         <Chat
-          open={isChatOpened && isMobile}
+          open={isChatOpened && (monitorType === "mobile" || isMobile)}
           onclickArrow={handleChatClickClose}
           sendMessage={sendMessage}
           sendFile={sendFile}

From 0eceb3a72797db98b576d169febc6713df58d25b Mon Sep 17 00:00:00 2001
From: Tamara <tamara.zelenko555@yandex.ru>
Date: Fri, 15 Mar 2024 00:49:14 +0300
Subject: [PATCH 03/12] =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D0=BF=D1=82=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D1=82=D0=B0=D1=80=D0=B8=D1=84=D0=BE=D0=B2?=
 =?UTF-8?q?,=20=D1=83=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B5=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=BE=D0=B3=D1=80=D0=B0=D0=BD=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B0=20=D1=81?=
 =?UTF-8?q?=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=BD=D0=B0=20=D1=81=D0=B0?=
 =?UTF-8?q?=D0=B9=D1=82=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8F,=20=D1=80=D0=B0=D1=81=D0=BA=D1=80?=
 =?UTF-8?q?=D1=8B=D1=82=D0=B8=D0=B5=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=82=D0=B0=D1=82=D0=BE=D0=B2=20=D0=B2=20=D0=B7=D0=B0=D1=8F?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B5=20=D0=BF=D0=BE=20=D0=BA=D0=BB=D0=BC=D0=BB?=
 =?UTF-8?q?=D0=BA=D1=83=20=D0=BD=D0=B0=20=D1=81=D0=B0=D0=BC=D1=83=20=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=80=D1=82=D0=BE=D1=87=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/QuizAnswersPage/CardAnswer.tsx      | 61 +++++++++----------
 src/pages/Tariffs/Tariffs.tsx                 | 11 +++-
 src/pages/Tariffs/tariffsUtils/TariffCard.tsx |  6 +-
 src/pages/startPage/StartPageSettings.tsx     |  2 +-
 4 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/src/pages/QuizAnswersPage/CardAnswer.tsx b/src/pages/QuizAnswersPage/CardAnswer.tsx
index 918e852f..5aa0e3dc 100644
--- a/src/pages/QuizAnswersPage/CardAnswer.tsx
+++ b/src/pages/QuizAnswersPage/CardAnswer.tsx
@@ -63,10 +63,37 @@ export const CardAnswer = ({
   const { editQuizId } = useQuizStore();
   const { questions } = useQuestionsStore();
 
+  const openResults = async () => {
+    setIsOpen(!isOpen);
+    if (!isOpen) {
+      try {
+        let resAnswer = await resultApi.getAnswerList(Number(idResult));
+
+        let resAnswerOnly = resAnswer.filter((res) => res.Result !== true);
+        let resQuiz = resAnswer.filter((res) => res.Result === true);
+        setResultQuiz(resQuiz);
+        setResultsAnswer(resAnswerOnly);
+        let idResults = resQuiz[0].question_id;
+        let questionsResult = questions.filter(
+          (q) => q.backendId === idResults,
+        );
+        setQuestionsResultState(questionsResult);
+        console.log("тут хранятся ответы", resAnswerOnly);
+      } catch (nativeError) {
+        const error = nativeError as AxiosError;
+
+        if (error.response?.statusText === "Payment Required") {
+          openPrePaymentModal();
+        }
+      }
+    }
+  };
+
   return (
     <Box
       onClick={() => {
         obsolescenceResult(idResult, editQuizId);
+        openResults();
       }}
       sx={{
         borderRadius: "12px",
@@ -129,39 +156,7 @@ export const CardAnswer = ({
               >
                 {idResult}
               </Box>
-              <IconButton
-                onClick={async () => {
-                  setIsOpen(!isOpen);
-                  if (!isOpen) {
-                    try {
-                      let resAnswer = await resultApi.getAnswerList(
-                        Number(idResult),
-                      );
-
-                      let resAnswerOnly = resAnswer.filter(
-                        (res) => res.Result !== true,
-                      );
-                      let resQuiz = resAnswer.filter(
-                        (res) => res.Result === true,
-                      );
-                      setResultQuiz(resQuiz);
-                      setResultsAnswer(resAnswerOnly);
-                      let idResults = resQuiz[0].question_id;
-                      let questionsResult = questions.filter(
-                        (q) => q.backendId === idResults,
-                      );
-                      setQuestionsResultState(questionsResult);
-                      console.log("тут хранятся ответы", resAnswerOnly);
-                    } catch (nativeError) {
-                      const error = nativeError as AxiosError;
-
-                      if (error.response?.statusText === "Payment Required") {
-                        openPrePaymentModal();
-                      }
-                    }
-                  }
-                }}
-              >
+              <IconButton onClick={openResults}>
                 <ArrowDownIcon
                   style={{
                     transform: isOpen ? "rotate(180deg)" : "rotate(360deg)",
diff --git a/src/pages/Tariffs/Tariffs.tsx b/src/pages/Tariffs/Tariffs.tsx
index f218daaf..d115c19d 100644
--- a/src/pages/Tariffs/Tariffs.tsx
+++ b/src/pages/Tariffs/Tariffs.tsx
@@ -41,6 +41,7 @@ function TariffPage() {
   const theme = useTheme();
   const token = useToken();
   const isTablet = useMediaQuery(theme.breakpoints.down(1000));
+  const isMobile = useMediaQuery(theme.breakpoints.down(600));
   const userId = useUserStore((state) => state.userId);
   const location = useLocation();
   const navigate = useNavigate();
@@ -175,7 +176,7 @@ function TariffPage() {
           display: "flex",
           height: "80px",
           alignItems: "center",
-          gap: isTablet ? "20px" : "60px",
+          gap: isMobile ? "7px" : isTablet ? "20px" : "60px",
           flexDirection: "row",
           justifyContent: "space-between",
           bgcolor: "white",
@@ -189,7 +190,7 @@ function TariffPage() {
           <ArrowLeft color="black" />
         </IconButton>
         <Box sx={{ display: "flex", ml: "auto" }}>
-          <Box sx={{ whiteSpace: "nowrap" }}>
+          <Box sx={{ whiteSpace: "nowrap" }} onClick={() => console.log(cash)}>
             <Typography
               sx={{
                 fontSize: "12px",
@@ -199,7 +200,11 @@ function TariffPage() {
             >
               Мой баланс
             </Typography>
-            <Typography variant="body2" color={"#7e2aea"}>
+            <Typography
+              variant="body2"
+              color={"#7e2aea"}
+              fontSize={isMobile ? (cash.length > 9 ? "13px" : "16px") : "16px"}
+            >
               {cash}
             </Typography>
           </Box>
diff --git a/src/pages/Tariffs/tariffsUtils/TariffCard.tsx b/src/pages/Tariffs/tariffsUtils/TariffCard.tsx
index d00be039..205e7a23 100644
--- a/src/pages/Tariffs/tariffsUtils/TariffCard.tsx
+++ b/src/pages/Tariffs/tariffsUtils/TariffCard.tsx
@@ -6,6 +6,8 @@ import {
   Theme,
   Button,
   Badge,
+  useTheme,
+  useMediaQuery,
 } from "@mui/material";
 import { MouseEventHandler, ReactNode } from "react";
 
@@ -33,7 +35,8 @@ export default function TariffCard({
   discount,
 }: Props) {
   text = Array.isArray(text) ? text : [text];
-
+  const theme = useTheme();
+  const isMobile = useMediaQuery(theme.breakpoints.down(600));
   return (
     <Box
       sx={{
@@ -68,6 +71,7 @@ export default function TariffCard({
               flexWrap: "wrap",
               columnGap: "10px",
               rowGap: 0,
+              flexDirection: isMobile ? "column-reverse" : undefined,
             }}
           >
             {price}
diff --git a/src/pages/startPage/StartPageSettings.tsx b/src/pages/startPage/StartPageSettings.tsx
index d00de37c..3af679b8 100755
--- a/src/pages/startPage/StartPageSettings.tsx
+++ b/src/pages/startPage/StartPageSettings.tsx
@@ -817,7 +817,7 @@ export default function StartPageSettings() {
                     quiz.config.info.site = e.target.value;
                   })
                 }
-                maxLength={100}
+                maxLength={2000}
               />
               <Typography
                 sx={{

From 75a3042e3bf20ef79f0103d76a655c0ce4c00012 Mon Sep 17 00:00:00 2001
From: IlyaDoronin <ryletd@gmail.com>
Date: Fri, 15 Mar 2024 17:22:36 +0300
Subject: [PATCH 04/12] fix: drag&drop scroll


From 26e41b6e2a92bd3fd36bb26107732b30c4578cfe Mon Sep 17 00:00:00 2001
From: IlyaDoronin <ryletd@gmail.com>
Date: Fri, 15 Mar 2024 17:24:13 +0300
Subject: [PATCH 05/12] fix: drag&drop

---
 src/pages/InstallQuiz/InstallQuiz.tsx         | 75 ++++++++++++-------
 .../DraggableList/QuestionPageCardTitle.tsx   | 24 +++---
 2 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/src/pages/InstallQuiz/InstallQuiz.tsx b/src/pages/InstallQuiz/InstallQuiz.tsx
index b4ba07dd..7866afd0 100644
--- a/src/pages/InstallQuiz/InstallQuiz.tsx
+++ b/src/pages/InstallQuiz/InstallQuiz.tsx
@@ -1,22 +1,23 @@
 import React, { useState } from "react";
 import {
-    Box,
-    Button,
-    ButtonBase,
-    FormControl,
-    IconButton,
-    InputAdornment,
-    Link,
-    MenuItem,
-    Modal,
-    OutlinedInput,
-    Paper,
-    Select,
-    SelectChangeEvent,
-    TextField,
-    Typography,
-    Tooltip,
-    useTheme, useMediaQuery,
+  Box,
+  Button,
+  ButtonBase,
+  FormControl,
+  IconButton,
+  InputAdornment,
+  Link,
+  MenuItem,
+  Modal,
+  OutlinedInput,
+  Paper,
+  Select,
+  SelectChangeEvent,
+  TextField,
+  Typography,
+  Tooltip,
+  useTheme,
+  useMediaQuery,
 } from "@mui/material";
 import LinkIcon from "../../assets/icons/LinkIcon";
 import InfoIcon from "../../assets/icons/InfoIcon";
@@ -41,7 +42,11 @@ import InBodyInstall from "./InBodyInstall";
 import AutoOpenInstall from "./AutoOpenInstall";
 import VidjetInstall from "./VidjetInstall";
 import InstallQzCode from "./InstallQzCode";
-import {decrementCurrentStep, incrementCurrentStep, updateQuiz} from "@root/quizes/actions";
+import {
+  decrementCurrentStep,
+  incrementCurrentStep,
+  updateQuiz,
+} from "@root/quizes/actions";
 import { useCurrentQuiz } from "@root/quizes/hooks";
 import { useDomainDefine } from "@utils/hooks/useDomainDefine";
 import NumberTwo from "@icons/NumberTwo";
@@ -56,7 +61,6 @@ export default function InstallQuiz() {
     setDisplay(event.target.value);
   };
 
-
   const [openVk, setOpenVk] = React.useState(false);
   const [stepState, setStepState] = React.useState("step1");
   const handleOpenVk = () => setOpenVk(true);
@@ -101,16 +105,22 @@ export default function InstallQuiz() {
               "0px 100px 309px rgba(210, 208, 225, 0.24), 0px 41.7776px 129.093px rgba(210, 208, 225, 0.172525), 0px 22.3363px 69.0192px rgba(210, 208, 225, 0.143066), 0px 12.5216px 38.6916px rgba(210, 208, 225, 0.12), 0px 6.6501px 20.5488px rgba(210, 208, 225, 0.0969343), 0px 2.76726px 8.55082px rgba(210, 208, 225, 0.0674749)",
           }}
         >
-          <Box sx={{ display: "flex", alignItems: isMobile ? "flex-start" : "center", gap: "10px", flexDirection: isMobile ? "column" : "row" }}>
-            <Box sx={{display: "flex", alignItems: "center", gap: "10px"}}>
-                <LinkIcon
-                    color={theme.palette.brightPurple.main}
-                    bgcolor={"#EEE4FC"}
-                />
-                <Typography>Ссылка на quiz</Typography>
+          <Box
+            sx={{
+              display: "flex",
+              alignItems: isMobile ? "flex-start" : "center",
+              gap: "10px",
+              flexDirection: isMobile ? "column" : "row",
+            }}
+          >
+            <Box sx={{ display: "flex", alignItems: "center", gap: "10px" }}>
+              <LinkIcon
+                color={theme.palette.brightPurple.main}
+                bgcolor={"#EEE4FC"}
+              />
+              <Typography>Ссылка на quiz</Typography>
             </Box>
 
-
             {/*<Tooltip*/}
             {/*  title="Скопируйте или укажите свою ссылку на quiz. Ссылка должна быть от 4 до 20 символов включительно, может содержать латинские буквы, цифры, тире '-' и нижнее подчеркивание '_'."*/}
             {/*  placement="top"*/}
@@ -282,7 +292,14 @@ export default function InstallQuiz() {
               "0px 100px 309px rgba(210, 208, 225, 0.24), 0px 41.7776px 129.093px rgba(210, 208, 225, 0.172525), 0px 22.3363px 69.0192px rgba(210, 208, 225, 0.143066), 0px 12.5216px 38.6916px rgba(210, 208, 225, 0.12), 0px 6.6501px 20.5488px rgba(210, 208, 225, 0.0969343), 0px 2.76726px 8.55082px rgba(210, 208, 225, 0.0674749)",
           }}
         >
-          <Box sx={{ display: "flex", alignItems: isMobile ? "flex-start" : "center", gap: "30px", flexDirection: isMobile ? "column" : "row" }}>
+          <Box
+            sx={{
+              display: "flex",
+              alignItems: isMobile ? "flex-start" : "center",
+              gap: "30px",
+              flexDirection: isMobile ? "column" : "row",
+            }}
+          >
             <Typography variant="h5" sx={{ paddingRight: "30px" }}>
               Установка квизов на сайте
             </Typography>
@@ -453,7 +470,7 @@ export default function InstallQuiz() {
             gap: "8px",
             justifyContent: "end",
             mt: "30px",
-            mr: "60px"
+            mr: "60px",
           }}
         >
           <Button
diff --git a/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx b/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx
index 305298dc..e4cad07a 100644
--- a/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx
+++ b/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx
@@ -324,17 +324,19 @@ const QuestionPageCardTitle = memo<Props>(function ({
             {page + 1}
           </Box>
         )}
-        <IconButton
-          disableRipple
-          sx={{
-            padding: isMobile ? "0" : "0 5px",
-            right: isMobile ? "0" : null,
-            bottom: isMobile ? "0" : null,
-          }}
-          {...draggableProps}
-        >
-          <PointsIcon style={{ color: "#4D4D4D", fontSize: "30px" }} />
-        </IconButton>
+        {!isExpanded && (
+          <IconButton
+            disableRipple
+            sx={{
+              padding: isMobile ? "0" : "0 5px",
+              right: isMobile ? "0" : null,
+              bottom: isMobile ? "0" : null,
+            }}
+            {...draggableProps}
+          >
+            <PointsIcon style={{ color: "#4D4D4D", fontSize: "30px" }} />
+          </IconButton>
+        )}
       </Box>
     </Box>
   );

From c4ad3de036b3db422018c4e5e2e3c0fb1098e4cd Mon Sep 17 00:00:00 2001
From: IlyaDoronin <ryletd@gmail.com>
Date: Fri, 15 Mar 2024 17:56:39 +0300
Subject: [PATCH 06/12] fix: close on drag start

---
 .../DraggableList/QuestionPageCardTitle.tsx   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx b/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx
index e4cad07a..e8d48d29 100644
--- a/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx
+++ b/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx
@@ -29,6 +29,7 @@ import {
   useTheme,
 } from "@mui/material";
 import {
+  collapseAllQuestions,
   copyQuestion,
   deleteQuestion,
   deleteQuestionWithTimeout,
@@ -324,19 +325,19 @@ const QuestionPageCardTitle = memo<Props>(function ({
             {page + 1}
           </Box>
         )}
-        {!isExpanded && (
-          <IconButton
-            disableRipple
-            sx={{
-              padding: isMobile ? "0" : "0 5px",
-              right: isMobile ? "0" : null,
-              bottom: isMobile ? "0" : null,
-            }}
-            {...draggableProps}
-          >
-            <PointsIcon style={{ color: "#4D4D4D", fontSize: "30px" }} />
-          </IconButton>
-        )}
+        <IconButton
+          disableRipple
+          sx={{
+            padding: isMobile ? "0" : "0 5px",
+            right: isMobile ? "0" : null,
+            bottom: isMobile ? "0" : null,
+          }}
+          {...draggableProps}
+          onMouseDown={collapseAllQuestions}
+          onTouchStart={collapseAllQuestions}
+        >
+          <PointsIcon style={{ color: "#4D4D4D", fontSize: "30px" }} />
+        </IconButton>
       </Box>
     </Box>
   );

From 5f42a86e1f39370630bc73dac86b233652309c3a Mon Sep 17 00:00:00 2001
From: Nastya <nastyab015@yandex.ru>
Date: Sat, 16 Mar 2024 15:14:25 +0300
Subject: [PATCH 07/12] =?UTF-8?q?=D0=BD=D0=B0=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D1=81=D1=82?=
 =?UTF-8?q?=D0=B5=D0=B9=D0=B4=D0=B6=D0=B8=D0=BD=D0=B3=20=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=BA=D1=83=D0=BF=D0=BA=D0=B5=20=D1=82=D0=B0?=
 =?UTF-8?q?=D1=80=D0=B8=D1=84=D0=B0=20=D1=81=20=D1=81=D1=82=D0=B5=D0=B9?=
 =?UTF-8?q?=D0=B4=D0=B6=D0=B8=D0=BD=D0=B3=D0=B0=20=D0=B8=D0=BB=D0=B8=20?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=85=D0=BE=D1=81=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Tariffs/Tariffs.tsx      | 5 +++--
 src/utils/hooks/useDomainDefine.ts | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/Tariffs/Tariffs.tsx b/src/pages/Tariffs/Tariffs.tsx
index d115c19d..244f3136 100644
--- a/src/pages/Tariffs/Tariffs.tsx
+++ b/src/pages/Tariffs/Tariffs.tsx
@@ -31,6 +31,7 @@ import { currencyFormatter } from "./tariffsUtils/currencyFormatter";
 import type { Tariff } from "@frontend/kitui";
 import { Tabs } from "./Tabs";
 import { cleanAuthTicketData } from "@root/ticket";
+import { useDomainDefine } from "@utils/hooks/useDomainDefine";
 
 const StepperText: Record<string, string> = {
   count: "Тарифы на объём",
@@ -53,6 +54,7 @@ function TariffPage() {
   const [openModal, setOpenModal] = useState({});
   const [cash, setCash] = useState("0");
   const [selectedItem, setSelectedItem] = useState<"count" | "day">("count");
+  const { isTestServer } = useDomainDefine();
 
   const getTariffsList = async (): Promise<Tariff[]> => {
     const tariffsList: Tariff[] = [];
@@ -134,8 +136,7 @@ function TariffPage() {
 
       var link = document.createElement("a");
       link.href =
-        "https://hub.pena.digital" +
-        `/quizpayment?action=squizpay&dif=${
+        `https://${isTestServer ? "s" : ""}hub.pena.digital/quizpayment?action=squizpay&dif=${
           (price - Number(user.wallet.cash)) * 100
         }&data=${token}&userid=${userId}
         `;
diff --git a/src/utils/hooks/useDomainDefine.ts b/src/utils/hooks/useDomainDefine.ts
index 66f93752..73a893b7 100644
--- a/src/utils/hooks/useDomainDefine.ts
+++ b/src/utils/hooks/useDomainDefine.ts
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 
 export function useDomainDefine(): { isTestServer: boolean } {
-  const [isTestServer, setIsTestServer] = useState<boolean>(null);
+  const [isTestServer, setIsTestServer] = useState<boolean>(false);
 
   useEffect(() => {
     const host = window.location.hostname;

From 248ffe406b2e15bdb9d1dd2148d6a9a2e3e54925 Mon Sep 17 00:00:00 2001
From: Nastya <nastyab015@yandex.ru>
Date: Mon, 18 Mar 2024 05:46:04 +0300
Subject: [PATCH 08/12] =?UTF-8?q?=D1=83=20=D0=BE=D1=81=D0=BE=D0=B1=D1=8B?=
 =?UTF-8?q?=D1=85=20=D0=B2=D0=BE=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D0=B1=D0=BE=D0=BB=D0=B5=D0=B5=201=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=BC=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Questions/BranchingMap/CsNodeButtons.tsx  |  1 +
 src/pages/Questions/BranchingMap/helper.ts    | 26 +++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/pages/Questions/BranchingMap/CsNodeButtons.tsx b/src/pages/Questions/BranchingMap/CsNodeButtons.tsx
index 7cf81ffb..46c071cb 100644
--- a/src/pages/Questions/BranchingMap/CsNodeButtons.tsx
+++ b/src/pages/Questions/BranchingMap/CsNodeButtons.tsx
@@ -20,6 +20,7 @@ import {
   addNode,
   isElementANode,
   isNodeInViewport,
+  isQuestionProhibited,
   storeToNodes,
 } from "./helper";
 
diff --git a/src/pages/Questions/BranchingMap/helper.ts b/src/pages/Questions/BranchingMap/helper.ts
index ad36bcaf..911e7e80 100644
--- a/src/pages/Questions/BranchingMap/helper.ts
+++ b/src/pages/Questions/BranchingMap/helper.ts
@@ -1,3 +1,4 @@
+import { QuestionType } from "@model/question/question";
 import { QuizQuestionResult } from "@model/questionTypes/result";
 import {
   AnyTypedQuizQuestion,
@@ -22,6 +23,7 @@ export interface Node {
     isRoot: boolean;
     id: string;
     label: string;
+    qtype: QuestionType;
     parent?: string;
   };
   classes: string;
@@ -59,13 +61,14 @@ export const storeToNodes = (questions: AnyTypedQuizQuestion[]) => {
         question.title === "" || question.title === " "
           ? "noname"
           : question.title;
-      if (label.length > 25) label = label.slice(0, 25) + "…";
+      if (label.length > 10) label = label.slice(0, 10).toLowerCase() + "…";
 
       nodes.push({
         data: {
           isRoot: question.content.rule.parentId === "root",
           id: question.content.id,
           label,
+          qtype: question.type
         },
         classes: "multiline-auto",
       });
@@ -330,6 +333,18 @@ export const addNode = ({
   //запрещаем работу родителя-ребенка если это один и тот же вопрос
   if (parentNodeContentId === targetNodeContentId) return;
 
+  //У 4 типов вопросов не может быть больше 1 потомка
+  const parentQuestion = {
+    ...getQuestionByContentId(parentNodeContentId),
+  } as AnyTypedQuizQuestion;
+  if ((parentQuestion.type !== undefined && isQuestionProhibited(parentQuestion.type)) &&
+    parentQuestion.content.rule.children.length > 0
+  ) {
+    enqueueSnackbar("у вопроса этого типа может быть только 1 потомок");
+    return;
+  }
+
+
   //если есть инфо о выбранном вопросе из модалки - берём родителя из инфо модалки. Иначе из значения дропа
   const targetQuestion = {
     ...getQuestionByContentId(
@@ -341,6 +356,13 @@ export const addNode = ({
     clearDataAfterAddNode({ parentNodeContentId, targetQuestion });
     createResult(useQuizStore.getState().editQuizId, targetQuestion.content.id);
   } else {
-    enqueueSnackbar("Добавляемый вопрос не найден");
+    enqueueSnackbar("Добавляемый вопрос не найден. Перетащите вопрос из списка");
   }
 };
+
+export const isQuestionProhibited = (parentQType: QuestionType) => (
+  parentQType === "text" ||
+  parentQType === "date" ||
+  parentQType === "number" ||
+  parentQType === "page"
+)

From a9c912378bf39a1c4d92e7de61ef402881778093 Mon Sep 17 00:00:00 2001
From: IlyaDoronin <ryletd@gmail.com>
Date: Mon, 18 Mar 2024 17:24:43 +0300
Subject: [PATCH 09/12] fix: scrollbar and drag&drop

---
 src/pages/DesignPage/DesignFilling.tsx        | 118 ++++++++++--------
 .../DraggableList/QuestionPageCardTitle.tsx   |   2 +-
 src/pages/Questions/DraggableList/index.tsx   |  14 ++-
 3 files changed, 81 insertions(+), 53 deletions(-)

diff --git a/src/pages/DesignPage/DesignFilling.tsx b/src/pages/DesignPage/DesignFilling.tsx
index 576670dc..df0c1173 100644
--- a/src/pages/DesignPage/DesignFilling.tsx
+++ b/src/pages/DesignPage/DesignFilling.tsx
@@ -118,63 +118,79 @@ export const DesignFilling = ({
       </Typography>
       <Paper
         sx={{
-          padding: "20px",
+          padding: "5px",
           maxWidth: "796px",
           width: "100%",
           borderRadius: "12px",
           height: "calc(100vh - 300px)",
-          overflow: "auto",
         }}
       >
-        <Box sx={{ display: "flex", gap: "20px", flexWrap: "wrap" }}>
-          <DesignGroup
-            title="Со светлым фоном"
-            value={quiz?.config.design ? "" : quiz?.config.theme || ""}
-            list={LIGHT_THEME_BUTTONS}
-            onChange={(name) =>
-              updateQuiz(quiz?.id, (quiz) => {
-                quiz.config.design = false;
-                quiz.config.theme = name;
-              })
-            }
-          />
-          <DesignGroup
-            title="С тёмным фоном"
-            value={quiz?.config.design ? "" : quiz?.config.theme || ""}
-            list={DARK_THEME_BUTTONS}
-            onChange={(name) =>
-              updateQuiz(quiz?.id, (quiz) => {
-                quiz.config.design = false;
-                quiz.config.theme = name;
-              })
-            }
-          />
-        </Box>
-        <Box>
-          <Divider sx={{ margin: "20px 0", background: "#7E2AEA33" }} />
-        </Box>
-        <Box sx={{ display: "flex", gap: "20px", flexWrap: "wrap" }}>
-          <DesignGroup
-            title="С картинкой"
-            value={quiz?.config.theme || ""}
-            list={DESIGNG_LIST_FIRST}
-            onChange={(name) =>
-              updateQuiz(quiz?.id, (quiz) => {
-                quiz.config.design = true;
-                quiz.config.theme = name;
-              })
-            }
-          />
-          <DesignGroup
-            value={quiz?.config.theme || ""}
-            list={DESIGNG_LIST_SECOND}
-            onChange={(name) =>
-              updateQuiz(quiz?.id, (quiz) => {
-                quiz.config.design = true;
-                quiz.config.theme = name;
-              })
-            }
-          />
+        <Box
+          sx={{
+            padding: "20px",
+            height: "100%",
+            overflow: "auto",
+            scrollbarWidth: "auto",
+            "&::-webkit-scrollbar": {
+              display: "block",
+              width: "8px",
+            },
+            "&::-webkit-scrollbar-thumb": {
+              backgroundColor: theme.palette.brightPurple.main,
+              borderRadius: "4px",
+            },
+          }}
+        >
+          <Box sx={{ display: "flex", gap: "20px", flexWrap: "wrap" }}>
+            <DesignGroup
+              title="Со светлым фоном"
+              value={quiz?.config.design ? "" : quiz?.config.theme || ""}
+              list={LIGHT_THEME_BUTTONS}
+              onChange={(name) =>
+                updateQuiz(quiz?.id, (quiz) => {
+                  quiz.config.design = false;
+                  quiz.config.theme = name;
+                })
+              }
+            />
+            <DesignGroup
+              title="С тёмным фоном"
+              value={quiz?.config.design ? "" : quiz?.config.theme || ""}
+              list={DARK_THEME_BUTTONS}
+              onChange={(name) =>
+                updateQuiz(quiz?.id, (quiz) => {
+                  quiz.config.design = false;
+                  quiz.config.theme = name;
+                })
+              }
+            />
+          </Box>
+          <Box>
+            <Divider sx={{ margin: "20px 0", background: "#7E2AEA33" }} />
+          </Box>
+          <Box sx={{ display: "flex", gap: "20px", flexWrap: "wrap" }}>
+            <DesignGroup
+              title="С картинкой"
+              value={quiz?.config.theme || ""}
+              list={DESIGNG_LIST_FIRST}
+              onChange={(name) =>
+                updateQuiz(quiz?.id, (quiz) => {
+                  quiz.config.design = true;
+                  quiz.config.theme = name;
+                })
+              }
+            />
+            <DesignGroup
+              value={quiz?.config.theme || ""}
+              list={DESIGNG_LIST_SECOND}
+              onChange={(name) =>
+                updateQuiz(quiz?.id, (quiz) => {
+                  quiz.config.design = true;
+                  quiz.config.theme = name;
+                })
+              }
+            />
+          </Box>
         </Box>
       </Paper>
     </Box>
diff --git a/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx b/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx
index e8d48d29..162c983d 100644
--- a/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx
+++ b/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx
@@ -100,7 +100,7 @@ const QuestionPageCardTitle = memo<Props>(function ({
         display: "flex",
         alignItems: "center",
         padding: isMobile ? "10px" : "20px 10px 20px 20px",
-        flexDirection: isMobile ? "column" : null,
+        flexDirection: "row",
       }}
     >
       <FormControl
diff --git a/src/pages/Questions/DraggableList/index.tsx b/src/pages/Questions/DraggableList/index.tsx
index d43a1db9..6d596b12 100644
--- a/src/pages/Questions/DraggableList/index.tsx
+++ b/src/pages/Questions/DraggableList/index.tsx
@@ -1,18 +1,24 @@
+import { useEffect } from "react";
 import { Box } from "@mui/material";
 import { reorderQuestions } from "@root/questions/actions";
 import type { DropResult } from "react-beautiful-dnd";
 import { DragDropContext, Droppable } from "react-beautiful-dnd";
 import DraggableListItem from "./DraggableListItem";
 import { useQuestions } from "@root/questions/hooks";
+import { createUntypedQuestion } from "@root/questions/actions";
+import { useCurrentQuiz } from "@root/quizes/hooks";
+
 interface Props {
   openBranchingPage: boolean;
   setOpenBranchingPage: (a: boolean) => void;
 }
+
 export const DraggableList = ({
   openBranchingPage,
   setOpenBranchingPage,
 }: Props) => {
-  const { questions } = useQuestions();
+  const quiz = useCurrentQuiz();
+  const { isLoading, questions } = useQuestions();
   const filteredQuestions = questions.filter(
     (question) => question.type !== "result",
   );
@@ -20,6 +26,12 @@ export const DraggableList = ({
     if (destination) reorderQuestions(source.index, destination.index);
   };
 
+  useEffect(() => {
+    if (!isLoading && quiz && !filteredQuestions.length) {
+      createUntypedQuestion(Number(quiz.id));
+    }
+  }, [quiz, filteredQuestions]);
+
   return (
     <DragDropContext onDragEnd={onDragEnd}>
       <Droppable droppableId="droppable-list">

From 1a9c26ccf75f4acf5559709883c29b889ef021f2 Mon Sep 17 00:00:00 2001
From: Nastya <nastyab015@yandex.ru>
Date: Tue, 19 Mar 2024 04:38:37 +0300
Subject: [PATCH 10/12] =?UTF-8?q?=D0=BD=D0=B5=20=D0=BE=D1=82=D0=BA=D1=80?=
 =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=BC=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=BA=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B5=D0=BD=D0=BD=D1=8B=D1=85,=20=D0=BD=D0=B5=20?=
 =?UTF-8?q?=D1=80=D0=B8=D1=81=D1=83=D0=B5=D1=82=D1=81=D1=8F=20=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=BA=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B9=D0=BA=D0=B8=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BE=D1=81=D0=BE=D0=B1=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Questions/BranchingMap/CsNodeButtons.tsx | 13 +++++++------
 src/pages/Questions/BranchingMap/helper.ts         | 13 ++++++++++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/pages/Questions/BranchingMap/CsNodeButtons.tsx b/src/pages/Questions/BranchingMap/CsNodeButtons.tsx
index 46c071cb..6c6b7656 100644
--- a/src/pages/Questions/BranchingMap/CsNodeButtons.tsx
+++ b/src/pages/Questions/BranchingMap/CsNodeButtons.tsx
@@ -48,7 +48,6 @@ export default function CsNodeButtons({ csElements, cyRef }: Props) {
       (acc, node) => ((acc[node.data.id] = {}), acc),
       {},
     );
-
     return (
       <Box
         sx={{
@@ -81,18 +80,19 @@ export default function CsNodeButtons({ csElements, cyRef }: Props) {
               cleardragQuestionContentId();
             }}
           />,
-          !csElement.data.isRoot && (
+          (!csElement.data.isRoot && !isQuestionProhibited(csElement.data.qtype)) && (
             <CsSettingsButton
               key={`settings-${csElement.data.id}`}
               ref={(r) => {
                 const buttonData = buttonRefsById.current[csElement.data.id];
                 if (buttonData) buttonData.settings = r;
               }}
-              onClick={() => {
-                updateOpenedModalSettingsId(csElement.data.id);
-              }}
+               onClick={() => {
+                 updateOpenedModalSettingsId(csElement.data.id,);
+               }}
             />
           ),
+          //оболочка узла
           <CsSelectButton
             key={`select-${csElement.data.id}`}
             ref={(r) => {
@@ -101,7 +101,8 @@ export default function CsNodeButtons({ csElements, cyRef }: Props) {
             }}
             onClick={() => {
               setModalQuestionParentContentId(csElement.data.id);
-              setOpenedModalQuestions(true);
+              console.log("csElement ", csElement)
+              setOpenedModalQuestions(!(isQuestionProhibited(csElement.data.type) && csElement.data.children > 0));
             }}
           />,
         ])}
diff --git a/src/pages/Questions/BranchingMap/helper.ts b/src/pages/Questions/BranchingMap/helper.ts
index 911e7e80..94d59e60 100644
--- a/src/pages/Questions/BranchingMap/helper.ts
+++ b/src/pages/Questions/BranchingMap/helper.ts
@@ -23,8 +23,10 @@ export interface Node {
     isRoot: boolean;
     id: string;
     label: string;
-    qtype: QuestionType;
+    qtype: string;
+    type: string;
     parent?: string;
+    children: number;
   };
   classes: string;
 }
@@ -57,6 +59,9 @@ export const storeToNodes = (questions: AnyTypedQuizQuestion[]) => {
   const edges: Edge[] = [];
   questions.forEach((question) => {
     if (question.content.rule.parentId) {
+      const parentQuestion = {
+        ...getQuestionByContentId(question.content.rule.parentId),
+      } as AnyTypedQuizQuestion;
       let label =
         question.title === "" || question.title === " "
           ? "noname"
@@ -68,7 +73,9 @@ export const storeToNodes = (questions: AnyTypedQuizQuestion[]) => {
           isRoot: question.content.rule.parentId === "root",
           id: question.content.id,
           label,
-          qtype: question.type
+          qtype: question.content.rule.parentId === "root" ? "root" : parentQuestion.type,
+          type: question.type,
+          children: question.content.rule.children.length
         },
         classes: "multiline-auto",
       });
@@ -360,7 +367,7 @@ export const addNode = ({
   }
 };
 
-export const isQuestionProhibited = (parentQType: QuestionType) => (
+export const isQuestionProhibited = (parentQType: string) => (
   parentQType === "text" ||
   parentQType === "date" ||
   parentQType === "number" ||

From 870935015141134af7450be71a763455633a609f Mon Sep 17 00:00:00 2001
From: IlyaDoronin <ryletd@gmail.com>
Date: Tue, 19 Mar 2024 16:52:33 +0300
Subject: [PATCH 11/12] fix: Drag&Drop

---
 .../DraggableList/QuestionPageCardTitle.tsx   | 33 +++++++++++--------
 src/pages/Questions/QuestionsPage.tsx         |  9 ++---
 src/pages/Tariffs/Tariffs.tsx                 |  7 ++--
 src/pages/startPage/EditPage.tsx              |  4 +--
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx b/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx
index 162c983d..a78ce508 100644
--- a/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx
+++ b/src/pages/Questions/DraggableList/QuestionPageCardTitle.tsx
@@ -101,6 +101,7 @@ const QuestionPageCardTitle = memo<Props>(function ({
         alignItems: "center",
         padding: isMobile ? "10px" : "20px 10px 20px 20px",
         flexDirection: "row",
+        flexWrap: isMobile && isExpanded ? "wrap" : "nowrap",
       }}
     >
       <FormControl
@@ -110,6 +111,9 @@ const QuestionPageCardTitle = memo<Props>(function ({
           maxWidth: isTablet ? "549px" : "640px",
           width: "100%",
           marginRight: isMobile ? "0px" : "16.1px",
+          display: "flex",
+          flexDirection: "row",
+          flexBasis: isMobile && isExpanded ? "calc(100% - 30px)" : null,
         }}
       >
         <TextField
@@ -162,6 +166,7 @@ const QuestionPageCardTitle = memo<Props>(function ({
               ),
           }}
           sx={{
+            flexGrow: 1,
             margin: isMobile ? "10px 0" : 0,
             "& .MuiInputBase-root": {
               color: "#000000",
@@ -182,6 +187,21 @@ const QuestionPageCardTitle = memo<Props>(function ({
           }}
         />
       </FormControl>
+      <IconButton
+        disableRipple
+        sx={{
+          order: isMobile && isExpanded ? "0" : "1",
+          padding: isMobile ? "0" : "0 5px",
+          right: isMobile ? "0" : null,
+          bottom: isMobile ? "0" : null,
+          marginLeft: !isMobile && isExpanded ? "10px" : null,
+        }}
+        {...draggableProps}
+        onMouseDown={collapseAllQuestions}
+        onTouchStart={collapseAllQuestions}
+      >
+        <PointsIcon style={{ color: "#4D4D4D", fontSize: "30px" }} />
+      </IconButton>
       <Box
         sx={{
           display: "flex",
@@ -325,19 +345,6 @@ const QuestionPageCardTitle = memo<Props>(function ({
             {page + 1}
           </Box>
         )}
-        <IconButton
-          disableRipple
-          sx={{
-            padding: isMobile ? "0" : "0 5px",
-            right: isMobile ? "0" : null,
-            bottom: isMobile ? "0" : null,
-          }}
-          {...draggableProps}
-          onMouseDown={collapseAllQuestions}
-          onTouchStart={collapseAllQuestions}
-        >
-          <PointsIcon style={{ color: "#4D4D4D", fontSize: "30px" }} />
-        </IconButton>
       </Box>
     </Box>
   );
diff --git a/src/pages/Questions/QuestionsPage.tsx b/src/pages/Questions/QuestionsPage.tsx
index 0341dfaf..e9798472 100755
--- a/src/pages/Questions/QuestionsPage.tsx
+++ b/src/pages/Questions/QuestionsPage.tsx
@@ -84,13 +84,8 @@ export default function QuestionsPage({
       >
         {!openBranchingPage && (
           <IconButton
-            onClick={() => {
-              createUntypedQuestion(quiz.backendId);
-            }}
-            sx={{
-              position: "fixed",
-              bottom: "103px",
-            }}
+            onClick={() => createUntypedQuestion(quiz.backendId)}
+            sx={{ position: "fixed", bottom: "103px" }}
             data-cy="create-question"
           >
             <AddPlus />
diff --git a/src/pages/Tariffs/Tariffs.tsx b/src/pages/Tariffs/Tariffs.tsx
index 244f3136..99a6db40 100644
--- a/src/pages/Tariffs/Tariffs.tsx
+++ b/src/pages/Tariffs/Tariffs.tsx
@@ -135,10 +135,9 @@ function TariffPage() {
       // history.pushState({}, null, "https://hub.pena.digital/wallet?action=squizpay");
 
       var link = document.createElement("a");
-      link.href =
-        `https://${isTestServer ? "s" : ""}hub.pena.digital/quizpayment?action=squizpay&dif=${
-          (price - Number(user.wallet.cash)) * 100
-        }&data=${token}&userid=${userId}
+      link.href = `https://${isTestServer ? "s" : ""}hub.pena.digital/quizpayment?action=squizpay&dif=${
+        (price - Number(user.wallet.cash)) * 100
+      }&data=${token}&userid=${userId}
         `;
       document.body.appendChild(link);
       link.click();
diff --git a/src/pages/startPage/EditPage.tsx b/src/pages/startPage/EditPage.tsx
index 134eb2cb..a2fc261a 100755
--- a/src/pages/startPage/EditPage.tsx
+++ b/src/pages/startPage/EditPage.tsx
@@ -163,8 +163,7 @@ export default function EditPage({
                   : `calc(100vh - 166px)`,
               boxSizing: "border-box",
               transition: "transform 0.3s",
-              transform:
-                scrollDown && isMobile ? "translateY(-51px)" : undefined,
+              paddingBottom: scrollDown && isMobile ? "120px" : undefined,
             }}
           >
             {/* Выбор текущей страницы редактирования чего-либо - находится здесь */}
@@ -185,7 +184,6 @@ export default function EditPage({
           </Box>
         </Box>
       </Box>
-
       <ModalInfoWhyCantCreate />
       <ConfirmLeaveModal
         open={showConfirmLeaveModal}

From 881822abbd76cd1278abac31b43aef579c83f63f Mon Sep 17 00:00:00 2001
From: Tamara <tamara.zelenko555@yandex.ru>
Date: Tue, 19 Mar 2024 18:58:20 +0300
Subject: [PATCH 12/12] =?UTF-8?q?=D1=83=D1=81=D1=82=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=BE=D1=81=D1=8F=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=BF=D0=BE=20=D0=B2=D0=B8=D0=B7=D1=83=D0=B0=D0=BB=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/InstallQuiz/InstallQuiz.tsx         |  5 +++--
 .../BranchingQuestionsModal.tsx               | 19 ++++++++++++++++++-
 src/pages/QuizAnswersPage/QuizAnswersPage.tsx |  7 ++++---
 src/pages/Tariffs/Tariffs.tsx                 |  7 +++----
 src/ui_kit/Header/HeaderFull.tsx              | 10 +++++++++-
 src/ui_kit/Sidebar/Sidebar.tsx                |  4 ++--
 src/ui_kit/Sidebar/SidebarMobile.tsx          |  6 +++---
 7 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/src/pages/InstallQuiz/InstallQuiz.tsx b/src/pages/InstallQuiz/InstallQuiz.tsx
index b55b25ed..d63f3257 100644
--- a/src/pages/InstallQuiz/InstallQuiz.tsx
+++ b/src/pages/InstallQuiz/InstallQuiz.tsx
@@ -74,6 +74,7 @@ export default function InstallQuiz() {
 
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down(600));
+  const isSmallMonitor = useMediaQuery(theme.breakpoints.down(1065));
   const CopyLink = () => {
     let one = document.getElementById("inputLinkone").value;
     let text = document.getElementById("inputLink").value;
@@ -295,9 +296,9 @@ export default function InstallQuiz() {
           <Box
             sx={{
               display: "flex",
-              alignItems: isMobile ? "flex-start" : "center",
+              alignItems: isSmallMonitor ? "flex-start" : "center",
               gap: "30px",
-              flexDirection: isMobile ? "column" : "row",
+              flexDirection: isSmallMonitor ? "column" : "row",
             }}
           >
             <Typography variant="h5" sx={{ paddingRight: "30px" }}>
diff --git a/src/pages/Questions/BranchingModal/BranchingQuestionsModal.tsx b/src/pages/Questions/BranchingModal/BranchingQuestionsModal.tsx
index f6a01e5d..b07b75d9 100644
--- a/src/pages/Questions/BranchingModal/BranchingQuestionsModal.tsx
+++ b/src/pages/Questions/BranchingModal/BranchingQuestionsModal.tsx
@@ -39,6 +39,7 @@ import TooltipClickInfo from "@ui_kit/Toolbars/TooltipClickInfo";
 export default function BranchingQuestions() {
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down(650));
+  const isSmallMobile = useMediaQuery(theme.breakpoints.down(400));
   const { openedModalSettingsId } = useUiTools();
   const [targetQuestion, setTargetQuestion] =
     useState<AnyTypedQuizQuestion | null>(
@@ -119,7 +120,23 @@ export default function BranchingQuestions() {
               }}
             >
               <Box sx={{ color: "#4d4d4d" }}>
-                <Typography component="span">{targetQuestion.title}</Typography>
+                <Typography
+                  component="span"
+                  sx={{
+                    overflow: "hidden",
+                    textOverflow: "ellipsis",
+                    whiteSpace: "nowrap",
+                    maxWidth: isSmallMobile
+                      ? "250px"
+                      : isMobile
+                        ? "350px"
+                        : "450px",
+                    display: "inline-block",
+                    width: "100%",
+                  }}
+                >
+                  {targetQuestion.title}
+                </Typography>
               </Box>
               {isMobile ? (
                 <TooltipClickInfo
diff --git a/src/pages/QuizAnswersPage/QuizAnswersPage.tsx b/src/pages/QuizAnswersPage/QuizAnswersPage.tsx
index eea6574c..103e839e 100644
--- a/src/pages/QuizAnswersPage/QuizAnswersPage.tsx
+++ b/src/pages/QuizAnswersPage/QuizAnswersPage.tsx
@@ -128,9 +128,9 @@ export const QuizAnswersPage: FC = () => {
 
   return (
     <Box>
-      <HeaderFull isRequest={true} />
+      <HeaderFull isRequest={true} sx={{ position: "fixed", zIndex: 9 }} />
       <SectionWrapper
-        sx={{ padding: isMobile ? "0 16px" : "20px" }}
+        sx={{ padding: isMobile ? "115px 16px" : "115px 20px 20px" }}
         maxWidth="lg"
       >
         <Typography
@@ -138,8 +138,9 @@ export const QuizAnswersPage: FC = () => {
             fontSize: "36px",
             fontWeight: "500",
             mb: "50px",
-            mt: "60px",
+
             lineHeight: "normal",
+            wordBreak: "break-word",
           }}
         >
           {quiz.name}
diff --git a/src/pages/Tariffs/Tariffs.tsx b/src/pages/Tariffs/Tariffs.tsx
index 244f3136..99a6db40 100644
--- a/src/pages/Tariffs/Tariffs.tsx
+++ b/src/pages/Tariffs/Tariffs.tsx
@@ -135,10 +135,9 @@ function TariffPage() {
       // history.pushState({}, null, "https://hub.pena.digital/wallet?action=squizpay");
 
       var link = document.createElement("a");
-      link.href =
-        `https://${isTestServer ? "s" : ""}hub.pena.digital/quizpayment?action=squizpay&dif=${
-          (price - Number(user.wallet.cash)) * 100
-        }&data=${token}&userid=${userId}
+      link.href = `https://${isTestServer ? "s" : ""}hub.pena.digital/quizpayment?action=squizpay&dif=${
+        (price - Number(user.wallet.cash)) * 100
+      }&data=${token}&userid=${userId}
         `;
       document.body.appendChild(link);
       link.click();
diff --git a/src/ui_kit/Header/HeaderFull.tsx b/src/ui_kit/Header/HeaderFull.tsx
index 319c74cc..a9827891 100644
--- a/src/ui_kit/Header/HeaderFull.tsx
+++ b/src/ui_kit/Header/HeaderFull.tsx
@@ -5,6 +5,8 @@ import {
   Typography,
   useTheme,
   useMediaQuery,
+  SxProps,
+  Theme,
 } from "@mui/material";
 import NavMenuItem from "./NavMenuItem";
 import Logotip from "../../pages/Landing/images/icons/QuizLogo";
@@ -21,7 +23,12 @@ import { ToTariffsButton } from "@ui_kit/Toolbars/ToTariffsButton";
 import ArrowLeft from "@icons/questionsPage/arrowLeft";
 import { cleanAuthTicketData } from "@root/ticket";
 
-export default function HeaderFull({ isRequest }: boolean) {
+interface Props {
+  isRequest: boolean;
+  sx?: SxProps<Theme>;
+}
+
+export default function HeaderFull({ isRequest, sx }: Props) {
   const theme = useTheme();
   const navigate = useNavigate();
   const isTablet = useMediaQuery(theme.breakpoints.down(1000));
@@ -55,6 +62,7 @@ export default function HeaderFull({ isRequest }: boolean) {
         justifyContent: isMobile ? "space-between" : "center",
         bgcolor: "white",
         borderBottom: "1px solid #E3E3E3",
+        ...sx,
       }}
     >
       <Link to="/">
diff --git a/src/ui_kit/Sidebar/Sidebar.tsx b/src/ui_kit/Sidebar/Sidebar.tsx
index 5f1a807a..6f179b66 100755
--- a/src/ui_kit/Sidebar/Sidebar.tsx
+++ b/src/ui_kit/Sidebar/Sidebar.tsx
@@ -81,7 +81,7 @@ export default function Sidebar({ changePage, disableCollapse }: SidebarProps) {
               color: theme.palette.grey2.main,
             }}
           >
-            Создание quiz
+            {`Создание ${quiz.config.type}`}
           </Typography>
         )}
         {!disableCollapse && (
@@ -145,7 +145,7 @@ export default function Sidebar({ changePage, disableCollapse }: SidebarProps) {
             color: theme.palette.grey2.main,
           }}
         >
-          Настройки quiz
+          {`Настройки ${quiz.config.type}`}
         </Typography>
       )}
       <List disablePadding>
diff --git a/src/ui_kit/Sidebar/SidebarMobile.tsx b/src/ui_kit/Sidebar/SidebarMobile.tsx
index 373a65e1..22a07d1a 100644
--- a/src/ui_kit/Sidebar/SidebarMobile.tsx
+++ b/src/ui_kit/Sidebar/SidebarMobile.tsx
@@ -148,7 +148,7 @@ export const SidebarMobile: FC<Iprops> = ({
           sx={{
             ml: "15px",
             display: "flex",
-            alignItems: "end",
+            alignItems: "center",
             width: "100%",
             justifyContent: "space-between",
           }}
@@ -174,7 +174,7 @@ export const SidebarMobile: FC<Iprops> = ({
                   id="project-name"
                   placeholder="Название проекта"
                   sx={{
-                    width: "270px",
+                    width: "85%",
                     "& .MuiInputBase-root": {
                       height: "34px",
                       borderRadius: "8px",
@@ -202,7 +202,7 @@ export const SidebarMobile: FC<Iprops> = ({
               </Typography>
             )}
           </Box>
-          <IconButton onClick={() => setInputOpen(true)}>
+          <IconButton onClick={() => setInputOpen(true)} sx={{ mt: "10px" }}>
             <Pencil
               style={{
                 position: "absolute",