Merge branch 'staging' into 'main'

Staging

See merge request frontend/squiz!387

Dockerfile

@@ -9,7 +9,7 @@ RUN npm config set -- //penahub.gitlab.yandexcloud.net/api/v4/projects/43/packag
 RUN npm config set @frontend:registry https://penahub.gitlab.yandexcloud.net/api/v4/packages/npm/
 RUN yarn config set '//penahub.gitlab.yandexcloud.net/api/v4/packages/npm/:_authToken' "glpat-JL_7wSM1QpW7xGfd-oWX"
 RUN yarn config set '//penahub.gitlab.yandexcloud.net/api/v4/projects/:_authToken' "glpat-JL_7wSM1QpW7xGfd-oWX"
-RUN yarn install --ignore-scripts --non-interactive --frozen-lockfile && yarn cache clean
+RUN yarn install --ignore-scripts --non-interactive && yarn cache clean
 RUN yarn build
 
 

package.json

@@ -6,8 +6,8 @@
     "@craco/craco": "^7.0.0",
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
-    "@frontend/kitui": "^1.0.85",
+    "@frontend/kitui": "^1.0.86",
-    "@frontend/squzanswerer": "^1.0.56",
+    "@frontend/squzanswerer": "^1.0.57",
     "@mui/icons-material": "^5.10.14",
     "@mui/material": "^5.10.14",
     "@mui/x-charts": "^6.19.5",

src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/SideWidgetSetup/SideWidgetPreviewDesktop.tsx

@@ -4,9 +4,10 @@ import RunningStripe from "@ui_kit/RunningStripe";
 interface Props {
   position: "left" | "right";
   buttonFlash: boolean;
+  text: string;
 }
 
-export default function SideWidgetPreviewDesktop({ buttonFlash, position }: Props) {
+export default function SideWidgetPreviewDesktop({ buttonFlash, position, text }: Props) {
   return (
     <Box
       sx={[
@@ -46,7 +47,7 @@ export default function SideWidgetPreviewDesktop({ buttonFlash, position }: Prop
           fontSize="40cqh"
           color="white"
         >
-          Пройти квиз
+          { text || "Пройти квиз" }
         </Typography>
         {buttonFlash && <RunningStripe />}
       </Box>

src/pages/InstallQuiz/QuizInstallationCard/WidgetSetupByType/SideWidgetSetup/SideWidgetSetup.tsx

@@ -12,6 +12,7 @@ import { useWidgetUrl } from "../../useWidgetUrl";
 import SideWidgetPositionButton from "./SideWidgetPositionButton";
 import SideWidgetPreviewDesktop from "./SideWidgetPreviewDesktop";
 import SideWidgetPreviewMobile from "./SideWidgetPreviewMobile";
+import CustomTextField from "@ui_kit/CustomTextField";
 
 interface Props {
   step: 2 | 3;
@@ -30,6 +31,7 @@ export default function SideWidgetSetup({ step, nextButton }: Props) {
   const [autoShowQuizTime, setAutoShowQuizTime] = useState<number>(10);
   const [autoShowWidgetTime, setAutoShowWidgetTime] = useState<number>(10);
   const [position, setPosition] = useState<SideWidgetParams["position"]>("left");
+  const [buttonText, setButtonText] = useState<string>("Пройти квиз");
   const [fullScreen, setFullScreen] = useState<boolean>(false);
   const [buttonFlash, setButtonFlash] = useState<boolean>(false);
   const [buttonBackgroundColor, setButtonBackgroundColor] = useState<string>(theme.palette.brightPurple.main);
@@ -48,13 +50,14 @@ export default function SideWidgetSetup({ step, nextButton }: Props) {
         fullScreen: fullScreen || undefined,
         buttonFlash: buttonFlash || undefined,
         buttonTextColor,
+        buttonText: buttonText,
         buttonBackgroundColor,
         dialogDimensions:
           !fullScreen && (widgetWidth || widgetHeight)
             ? {
-                width: widgetWidth ? `${widgetWidth}px` : "100%",
+              width: widgetWidth ? `${widgetWidth}px` : "100%",
-                height: widgetHeight ? `${widgetHeight}px` : "100%",
+              height: widgetHeight ? `${widgetHeight}px` : "100%",
-              }
+            }
             : undefined,
       },
       widgetUrl
@@ -100,6 +103,7 @@ export default function SideWidgetSetup({ step, nextButton }: Props) {
           <SideWidgetPreviewDesktop
             position={position}
             buttonFlash={buttonFlash}
+            text={buttonText}
           />
           <SideWidgetPreviewMobile buttonFlash={buttonFlash} />
         </Box>
@@ -274,10 +278,20 @@ export default function SideWidgetSetup({ step, nextButton }: Props) {
             </Typography>
           </Collapse>
         </Box>
-        <CustomCheckbox
+        <Typography sx={{ color: theme.palette.grey2.main }}>Текст кнопки</Typography>
-          label="Отключить на мобильных устройствах"
+        <CustomTextField
-          checked={hideOnMobile}
+          id="headingInput"
-          handleChange={(e) => setHideOnMobile(e.target.checked)}
+          onChange={(e) => setButtonText(e.target.value)}
+          placeholder="Пройти тест"
+          value={buttonText}
+          sx={{
+            borderColor: theme.palette.brightPurple.main,
+          }}
+          sxForm={{
+            maxWidth: "360px",
+
+          }}
+          maxLength={17}
         />
         <Box
           sx={{

src/pages/startPage/StartPageSettings.tsx

@@ -854,6 +854,24 @@ export default function StartPageSettings() {
                   Включить антифрод
                 </Typography>
               </Box>
+              <Box sx={{ display: "flex", gap: "20px", alignItems: "center", mt: "20px" }}>
+                <CustomizedSwitch
+                  checked={quiz.config?.isUnSc}
+                  onChange={(e) => {
+                    updateQuiz(quiz.id, (quiz) => {
+                      quiz.config.isUnSc = e.target.checked;
+                    });
+                  }}
+                />
+                <Typography
+                  sx={{
+                    fontWeight: 500,
+                    color: theme.palette.grey3.main,
+                  }}
+                >
+                  Включить защиту от копирования
+                </Typography>
+              </Box>
             </>
           )}
         </Box>