From 96a0393fef65a961f3fb062ec6c9ac5c46c9ff97 Mon Sep 17 00:00:00 2001 From: Nastya Date: Sat, 30 Dec 2023 02:11:37 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BE=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20=D0=BD=D0=B5=D0=B8=D1=81=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=B7=D1=83=D0=B5=D0=BC=D1=8B=D1=85=20=D0=BA=D0=BD=D0=BE?= =?UTF-8?q?=D0=BF=D0=BE=D0=BA,=20=D1=84=D0=B8=D0=BA=D1=81=20=D1=83=D0=B1?= =?UTF-8?q?=D0=B8=D1=80=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B1?= =?UTF-8?q?=D0=B5=D0=BB=D0=BE=D0=B2,=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B5=D1=80=D1=81=D1=82=D0=BA?= =?UTF-8?q?=D0=B8=20=D1=84=D0=BA=20+=20=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=B8=D1=81=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D0=BC=D1=8B=D1=85=20=D0=B8=D0=BD?= =?UTF-8?q?=D0=BF=D1=83=D1=82=D0=BE=D0=B2,=20=D1=84=D0=B8=D0=BA=D1=81=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BB=D0=B8=D0=B0=D0=BF=D0=BD=D0=B8=D1=8F=20=D0=BA?= =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20=D0=BF=D1=83=D0=B1=D0=BB=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BF=D1=80=D0=B8=20=D0=B0?= =?UTF-8?q?=D0=B2=D1=82=D0=BE=D0=BE=D1=82=D0=B7=D1=8B=D0=B2=D0=B5=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/question.ts | 10 +++++++++- src/pages/Questions/ButtonsOptions.tsx | 4 ++-- src/pages/Questions/ButtonsOptionsAndPict.tsx | 4 ++-- .../Questions/DraggableList/QuestionPageCard.tsx | 4 ++-- .../Form/FormDraggableList/QuestionPageCard.tsx | 4 ++-- .../DescriptionForm/ButtinsOptionsForm.tsx | 4 ++-- src/pages/ViewPublicationPage/ContactForm.tsx | 12 ++++++------ src/pages/createQuize/QuizCard.tsx | 8 ++++---- src/pages/startPage/EditPage.tsx | 5 ++++- src/utils/replaceSpacesToEmptyLines.ts | 2 +- 10 files changed, 34 insertions(+), 23 deletions(-) diff --git a/src/api/question.ts b/src/api/question.ts index 74a46745..b59db063 100644 --- a/src/api/question.ts +++ b/src/api/question.ts @@ -26,8 +26,16 @@ async function getQuestionList(body?: Partial) { body: { ...defaultGetQuestionListBody, ...body }, method: "POST", }); + console.log(response.items) + const clearArrayFromEmptySpaceBlaBlaValue = response.items?.map(question => { + let data = question + for (let key in question) { + if (question[key] === " ") data[key] = "" + } + return data + }) - return replaceSpacesToEmptyLines(response.items); + return replaceSpacesToEmptyLines(clearArrayFromEmptySpaceBlaBlaValue); } function editQuestion(body: EditQuestionRequest, signal?: AbortSignal) { diff --git a/src/pages/Questions/ButtonsOptions.tsx b/src/pages/Questions/ButtonsOptions.tsx index 7ab1b537..c1f03b3d 100644 --- a/src/pages/Questions/ButtonsOptions.tsx +++ b/src/pages/Questions/ButtonsOptions.tsx @@ -270,9 +270,9 @@ export default function ButtonsOptions({ gap: "6px", }} > - + {/* - + */} copyQuestion(question.id, question.quizId)} diff --git a/src/pages/Questions/ButtonsOptionsAndPict.tsx b/src/pages/Questions/ButtonsOptionsAndPict.tsx index 01a4da9e..949170e7 100644 --- a/src/pages/Questions/ButtonsOptionsAndPict.tsx +++ b/src/pages/Questions/ButtonsOptionsAndPict.tsx @@ -303,9 +303,9 @@ export default function ButtonsOptionsAndPict({ padding: "20px", }} > - + {/* - + */} copyQuestion(question.id, question.quizId)} diff --git a/src/pages/Questions/DraggableList/QuestionPageCard.tsx b/src/pages/Questions/DraggableList/QuestionPageCard.tsx index bdcaf1c4..4b898890 100644 --- a/src/pages/Questions/DraggableList/QuestionPageCard.tsx +++ b/src/pages/Questions/DraggableList/QuestionPageCard.tsx @@ -239,7 +239,7 @@ export default function QuestionsPageCard({ question, draggableProps, isDragging borderRight: "solid 1px #4D4D4D", }} > - + /> */} copyQuestion(question.id, question.quizId)}> diff --git a/src/pages/Questions/Form/FormDraggableList/QuestionPageCard.tsx b/src/pages/Questions/Form/FormDraggableList/QuestionPageCard.tsx index 6def0204..30af848f 100644 --- a/src/pages/Questions/Form/FormDraggableList/QuestionPageCard.tsx +++ b/src/pages/Questions/Form/FormDraggableList/QuestionPageCard.tsx @@ -209,7 +209,7 @@ export default function QuestionsPageCard({ question, questionIndex, draggablePr borderRight: "solid 1px #4D4D4D", }} > - + /> */} copyQuestion(question.id, question.quizId)}> diff --git a/src/pages/ResultPage/DescriptionForm/ButtinsOptionsForm.tsx b/src/pages/ResultPage/DescriptionForm/ButtinsOptionsForm.tsx index b332bafd..f530b912 100644 --- a/src/pages/ResultPage/DescriptionForm/ButtinsOptionsForm.tsx +++ b/src/pages/ResultPage/DescriptionForm/ButtinsOptionsForm.tsx @@ -96,9 +96,9 @@ export default function ButtonsOptionsForm({ SSHC, switchState }: Props) { display: "flex", }} > - + {/* - + */} diff --git a/src/pages/ViewPublicationPage/ContactForm.tsx b/src/pages/ViewPublicationPage/ContactForm.tsx index 4066d9ee..ad83f238 100644 --- a/src/pages/ViewPublicationPage/ContactForm.tsx +++ b/src/pages/ViewPublicationPage/ContactForm.tsx @@ -76,7 +76,9 @@ export const ContactForm = ({ > @@ -107,7 +109,7 @@ export const ContactForm = ({ - - + ); @@ -206,10 +208,8 @@ const Inputs = (currentQuestion: any) => { //@ts-ignore const Adress = setAdress(target.value)} id={adress} title={FC["address"].innerText || "Введите адрес"} desc={FC["address"].text || "адрес"} Icon={AddressIcon} /> - - //@ts-ignore - if (Object.values(questions).some((data) => data.used)) { + if (Object.values(FC).some((data) => data.used)) { return <> {FC["name"].used ? Name : <>} {FC["email"].used ? Email : <>} diff --git a/src/pages/createQuize/QuizCard.tsx b/src/pages/createQuize/QuizCard.tsx index 40dba8a8..02e8d0e8 100755 --- a/src/pages/createQuize/QuizCard.tsx +++ b/src/pages/createQuize/QuizCard.tsx @@ -90,14 +90,14 @@ export default function QuizCard({ quiz, openCount = 0, applicationCount = 0, co gap: isMobile ? "10px" : "20px", }} > - + */} -