From 24c1311631082befe83f16ac1e14b7cc207edf41 Mon Sep 17 00:00:00 2001 From: Nastya Date: Wed, 27 Dec 2023 11:42:10 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=D0=BE=D1=82=D0=BE=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BD=D0=BE=D0=BF?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B2=D0=B5=D1=82=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D1=83=204=20=D0=B2=D0=BE=D0=BF=D1=80=D0=BE=D1=81?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B1=D0=B5=D0=B7=20=D0=B2=D0=B5=D1=82=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 2 +- src/pages/Questions/ButtonsOptions.tsx | 104 +++++++++--------- src/pages/Questions/ButtonsOptionsAndPict.tsx | 10 +- 3 files changed, 60 insertions(+), 56 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 859a593e..7136bf2e 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -53,7 +53,7 @@ export default function App() { }); useUserAccountFetcher({ - url: "https://squiz.pena.digital/squiz/account", + url: "https://squiz.pena.digital/customer/account", userId, onNewUserAccount: setUserAccount, onError: (error) => { diff --git a/src/pages/Questions/ButtonsOptions.tsx b/src/pages/Questions/ButtonsOptions.tsx index aa89665b..f6eba2ac 100644 --- a/src/pages/Questions/ButtonsOptions.tsx +++ b/src/pages/Questions/ButtonsOptions.tsx @@ -118,53 +118,57 @@ export default function ButtonsOptions({ > {buttonSetting.map(({ icon, title, value, myFunc }) => ( - {value === "branching" ? ( - - - Будет показан при условии - - - Название - - - Условие 1, Условие 2 - - - Все условия обязательны - - - } - > + {value === "branching" ? + question.type === "page" || question.type === "text" || question.type === "date" || question.type === "number" ? + <> + : + ( + // + // + // Будет показан при условии + // + // + // Название + // + // + // Условие 1, Условие 2 + // + // + // Все условия обязательны + // + // + // } + // > { @@ -193,7 +197,7 @@ export default function ButtonsOptions({ {icon} {isWrappMiniButtonSetting ? null : title} - + // ) : ( <> ))} - <> + {/* <> - + */} <> - } - > + > */} setButtonHover("branching")} onMouseLeave={() => setButtonHover("")} @@ -232,7 +232,7 @@ export default function ButtonsOptionsAndPict({ /> {isIconMobile ? null : "Ветвление"} - + {/* */} setButtonHover("image")} onMouseLeave={() => setButtonHover("")} @@ -266,7 +266,7 @@ export default function ButtonsOptionsAndPict({ /> {isIconMobile ? null : "Изображение"} - setOpenedReallyChangingModal(true)} sx={{ minWidth: "30px", @@ -295,7 +295,7 @@ export default function ButtonsOptionsAndPict({ }} > - + */}