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] =?UTF-8?q?=D1=83=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=BA=D0=BE=D1=81=D1=8F=D0=BA=D0=B8=20=D0=BF?=
 =?UTF-8?q?=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",