From 373dd511971367aed4037b71cc4094e33638d341 Mon Sep 17 00:00:00 2001 From: Tamara Date: Thu, 6 Jul 2023 21:48:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B5=D1=89=D1=91=20=D0=B8=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D0=BA=D0=B8=20+=20=D0=BE=D1=82=D1=80=D0=B8=D1=81=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D0=BB=D1=8F=20=D0=B2=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0(=D0=B2=D1=81=D1=91=20=D0=B5=D1=89=D0=B5=20=D0=BD=D0=B5?= =?UTF-8?q?=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/questionsPage/CopyIcon.tsx | 12 ++++++------ src/assets/icons/questionsPage/deleteIcon.tsx | 18 +++++++++--------- src/assets/icons/questionsPage/hideIcon.tsx | 14 +++++++------- src/pages/Questions/ButtonsOptions.tsx | 6 +++--- src/pages/Questions/ButtonsOptionsAndPict.tsx | 6 +++--- src/pages/Questions/QuestionPageCard.tsx | 6 +++--- .../Questions/answerOptions/AnswerOptions.tsx | 18 ++++++++---------- src/pages/Questions/branchingQuestions.tsx | 2 +- .../DescriptionForm/ButtinsOptionsForm.tsx | 6 +++--- .../Result/DescriptionForm/DescriptionForm.tsx | 4 ++-- .../Result/DescriptionForm/DiscountButtons.tsx | 2 +- .../Result/DescriptionForm/PriceButton.tsx | 2 +- 12 files changed, 47 insertions(+), 49 deletions(-) diff --git a/src/assets/icons/questionsPage/CopyIcon.tsx b/src/assets/icons/questionsPage/CopyIcon.tsx index 8706d6d5..9609b9d0 100755 --- a/src/assets/icons/questionsPage/CopyIcon.tsx +++ b/src/assets/icons/questionsPage/CopyIcon.tsx @@ -1,11 +1,11 @@ import { Box } from "@mui/material"; -// interface Props { -// color: string; -// } +interface Props { + color: string; +} -export default function CopyIcon() { +export default function CopyIcon({color}: Props) { return ( - - + + ); diff --git a/src/assets/icons/questionsPage/deleteIcon.tsx b/src/assets/icons/questionsPage/deleteIcon.tsx index b30baaf4..cd742032 100755 --- a/src/assets/icons/questionsPage/deleteIcon.tsx +++ b/src/assets/icons/questionsPage/deleteIcon.tsx @@ -1,11 +1,11 @@ import { Box } from "@mui/material"; -// interface Props { -// color: string; -// } +interface Props { + color: string; +} -export default function DeleteIcon() { +export default function DeleteIcon({color}: Props) { return ( - - - - - + + + + + ); diff --git a/src/assets/icons/questionsPage/hideIcon.tsx b/src/assets/icons/questionsPage/hideIcon.tsx index 7d1fe189..1008a56d 100755 --- a/src/assets/icons/questionsPage/hideIcon.tsx +++ b/src/assets/icons/questionsPage/hideIcon.tsx @@ -1,11 +1,11 @@ import { Box } from "@mui/material"; -// interface Props { -// color: string; -// } +interface Props { + color: string; +} -export default function HideIcon() { +export default function HideIcon({color}: Props) { return ( - - - + + + ); diff --git a/src/pages/Questions/ButtonsOptions.tsx b/src/pages/Questions/ButtonsOptions.tsx index 7bd3fcd9..bf02d151 100644 --- a/src/pages/Questions/ButtonsOptions.tsx +++ b/src/pages/Questions/ButtonsOptions.tsx @@ -76,13 +76,13 @@ export default function ButtonsOptions({ SSHC, switchState, totalIndex }: Props) }} > - + - + removeQuestion(params, totalIndex)}> - + diff --git a/src/pages/Questions/ButtonsOptionsAndPict.tsx b/src/pages/Questions/ButtonsOptionsAndPict.tsx index 8c19ec6c..b192ac9b 100644 --- a/src/pages/Questions/ButtonsOptionsAndPict.tsx +++ b/src/pages/Questions/ButtonsOptionsAndPict.tsx @@ -92,13 +92,13 @@ export default function ButtonsOptionsAndPict({ SSHC, switchState, totalIndex }: }} > - + - + removeQuestion(params, totalIndex)}> - + diff --git a/src/pages/Questions/QuestionPageCard.tsx b/src/pages/Questions/QuestionPageCard.tsx index 240c55fa..014a2023 100644 --- a/src/pages/Questions/QuestionPageCard.tsx +++ b/src/pages/Questions/QuestionPageCard.tsx @@ -166,7 +166,7 @@ export default function QuestionsPageCard({totalIndex, DeleteClick}: Props) { } + icon={} checkedIcon={} />} label={""} @@ -178,9 +178,9 @@ export default function QuestionsPageCard({totalIndex, DeleteClick}: Props) { }} /> - + - + diff --git a/src/pages/Questions/answerOptions/AnswerOptions.tsx b/src/pages/Questions/answerOptions/AnswerOptions.tsx index 868a816e..3436ac64 100755 --- a/src/pages/Questions/answerOptions/AnswerOptions.tsx +++ b/src/pages/Questions/answerOptions/AnswerOptions.tsx @@ -60,17 +60,15 @@ export default function AnswerOptions({totalIndex}: Props) { >или нажмите Enter - {/*{listAnswer.length === 0 ?*/} - {/*<>*/} - {/* :*/} - {/* */} - {/* {Object.values(listAnswer[params][totalIndex]).map((e, index) => (*/} - {/* */} - {/* )*/} - {/* )}*/} - {/* */} + {listAnswer.length === 0 && listAnswer[params] !== undefined && + + {Object.values(listAnswer[params][totalIndex]).map((e, index) => ( + + ) + )} + - {/*}*/} + } diff --git a/src/pages/Questions/branchingQuestions.tsx b/src/pages/Questions/branchingQuestions.tsx index d623417e..7c1a29eb 100644 --- a/src/pages/Questions/branchingQuestions.tsx +++ b/src/pages/Questions/branchingQuestions.tsx @@ -168,7 +168,7 @@ export default function BranchingQuestions() { Условие 1 - + diff --git a/src/pages/Result/DescriptionForm/ButtinsOptionsForm.tsx b/src/pages/Result/DescriptionForm/ButtinsOptionsForm.tsx index 7dfab672..f72e2699 100644 --- a/src/pages/Result/DescriptionForm/ButtinsOptionsForm.tsx +++ b/src/pages/Result/DescriptionForm/ButtinsOptionsForm.tsx @@ -72,13 +72,13 @@ export default function ButtonsOptionsForm({ SSHC, switchState }: Props) { }} > - + - + - + diff --git a/src/pages/Result/DescriptionForm/DescriptionForm.tsx b/src/pages/Result/DescriptionForm/DescriptionForm.tsx index 04c465de..d938b50b 100644 --- a/src/pages/Result/DescriptionForm/DescriptionForm.tsx +++ b/src/pages/Result/DescriptionForm/DescriptionForm.tsx @@ -80,7 +80,7 @@ export const DescriptionForm = () => { Призыв к действию - + @@ -124,7 +124,7 @@ export const DescriptionForm = () => { Переадресация - + diff --git a/src/pages/Result/DescriptionForm/DiscountButtons.tsx b/src/pages/Result/DescriptionForm/DiscountButtons.tsx index 3595fbb9..6933c498 100644 --- a/src/pages/Result/DescriptionForm/DiscountButtons.tsx +++ b/src/pages/Result/DescriptionForm/DiscountButtons.tsx @@ -10,7 +10,7 @@ export default function DiscountButtons() { Скидка - + diff --git a/src/pages/Result/DescriptionForm/PriceButton.tsx b/src/pages/Result/DescriptionForm/PriceButton.tsx index 535f59ae..aa7496c6 100644 --- a/src/pages/Result/DescriptionForm/PriceButton.tsx +++ b/src/pages/Result/DescriptionForm/PriceButton.tsx @@ -67,7 +67,7 @@ export default function PriceButtons({ ButtonsActive, priceButtonsActive }: Prop Стоимость - +