From 5b2803e67a7b390e2360d40510b65958b187f48d Mon Sep 17 00:00:00 2001
From: Tatiana Nikolaeva <tnik0402@gmail.com>
Date: Sat, 5 Apr 2025 23:43:40 +0500
Subject: [PATCH 1/2] Correcting account styles

---
 SurveyFrontend/src/components/Account/Account.module.css | 2 +-
 SurveyFrontend/src/components/Survey/Survey.module.css   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SurveyFrontend/src/components/Account/Account.module.css b/SurveyFrontend/src/components/Account/Account.module.css
index 8619ffd..cbbfd5e 100644
--- a/SurveyFrontend/src/components/Account/Account.module.css
+++ b/SurveyFrontend/src/components/Account/Account.module.css
@@ -1,12 +1,12 @@
 /*Account.module.css*/
 
 .account {
-    width: 15%;
     background-color: #F3F3F3;
     border-radius: 40px;
     align-items: center;
     padding: 4.58px 13px 4.58px 4.58px;
     margin: 26px 33px 27px 0;
+    margin-left: auto;
 }
 
 .accountText{
diff --git a/SurveyFrontend/src/components/Survey/Survey.module.css b/SurveyFrontend/src/components/Survey/Survey.module.css
index cbc28c7..1b26be4 100644
--- a/SurveyFrontend/src/components/Survey/Survey.module.css
+++ b/SurveyFrontend/src/components/Survey/Survey.module.css
@@ -1,6 +1,6 @@
 /*Survey.module.css*/
 
 .survey{
-    width: 63%;
+    width: 65%;
     margin-left: 8.9%;
 }
\ No newline at end of file

From 8c1bd2e3b8caa32e6d883c4fb8e52f684f336386 Mon Sep 17 00:00:00 2001
From: Tatiana Nikolaeva <tnik0402@gmail.com>
Date: Tue, 8 Apr 2025 00:33:20 +0500
Subject: [PATCH 2/2] deleting questions and answers, selecting answers

---
 SurveyFrontend/public/delete.svg              |  3 +
 SurveyFrontend/public/deleteQuestion.svg      |  3 +
 SurveyFrontend/public/emptyCheckbox.svg       | 10 +++
 .../AnswerOption/AnswerOption.module.css      | 17 ++++
 .../components/AnswerOption/AnswerOption.tsx  | 32 +++++---
 .../MainComponent/MainComponent.module.css    |  1 +
 .../QuestionItem/QuestionItem.module.css      | 34 ++++++++
 .../components/QuestionItem/QuestionItem.tsx  | 81 ++++++++++++++-----
 .../QuestionsList/QuestionsList.tsx           | 28 ++++---
 .../TypeDropdown/TypeDropdown.module.css      | 12 +--
 10 files changed, 174 insertions(+), 47 deletions(-)
 create mode 100644 SurveyFrontend/public/delete.svg
 create mode 100644 SurveyFrontend/public/deleteQuestion.svg
 create mode 100644 SurveyFrontend/public/emptyCheckbox.svg

diff --git a/SurveyFrontend/public/delete.svg b/SurveyFrontend/public/delete.svg
new file mode 100644
index 0000000..47f0621
--- /dev/null
+++ b/SurveyFrontend/public/delete.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 21C6.45 21 5.97917 20.8042 5.5875 20.4125C5.19583 20.0208 5 19.55 5 19V6H4V4H9V3H15V4H20V6H19V19C19 19.55 18.8042 20.0208 18.4125 20.4125C18.0208 20.8042 17.55 21 17 21H7ZM17 6H7V19H17V6ZM9 17H11V8H9V17ZM13 17H15V8H13V17Z" fill="#1D1B20"/>
+</svg>
diff --git a/SurveyFrontend/public/deleteQuestion.svg b/SurveyFrontend/public/deleteQuestion.svg
new file mode 100644
index 0000000..8766ff1
--- /dev/null
+++ b/SurveyFrontend/public/deleteQuestion.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 21C6.45 21 5.97917 20.8042 5.5875 20.4125C5.19583 20.0208 5 19.55 5 19V6H4V4H9V3H15V4H20V6H19V19C19 19.55 18.8042 20.0208 18.4125 20.4125C18.0208 20.8042 17.55 21 17 21H7ZM17 6H7V19H17V6ZM9 17H11V8H9V17ZM13 17H15V8H13V17Z" fill="#EC221F"/>
+</svg>
diff --git a/SurveyFrontend/public/emptyCheckbox.svg b/SurveyFrontend/public/emptyCheckbox.svg
new file mode 100644
index 0000000..f61b1f8
--- /dev/null
+++ b/SurveyFrontend/public/emptyCheckbox.svg
@@ -0,0 +1,10 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_9_43)">
+<path d="M21.8986 6.46666V21.9681H6.39711V6.46666H21.8986ZM21.8986 4.25217H6.39711C5.17914 4.25217 4.18262 5.24869 4.18262 6.46666V21.9681C4.18262 23.1861 5.17914 24.1826 6.39711 24.1826H21.8986C23.1165 24.1826 24.1131 23.1861 24.1131 21.9681V6.46666C24.1131 5.24869 23.1165 4.25217 21.8986 4.25217Z" fill="#5C5C5C"/>
+</g>
+<defs>
+<clipPath id="clip0_9_43">
+<rect width="26.5739" height="26.5739" fill="white" transform="translate(0.86087 0.930435)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/SurveyFrontend/src/components/AnswerOption/AnswerOption.module.css b/SurveyFrontend/src/components/AnswerOption/AnswerOption.module.css
index 265d390..6a0ec90 100644
--- a/SurveyFrontend/src/components/AnswerOption/AnswerOption.module.css
+++ b/SurveyFrontend/src/components/AnswerOption/AnswerOption.module.css
@@ -1,16 +1,26 @@
 /*AnswerOption.module.css*/
 
 .answer{
+    width: 100%;
     display: flex;
     gap: 10px;
     margin-bottom: 17px;
 }
 
 .textAnswer{
+    text-align: left;
     border: none;
     background-color: #ffffff;
     font-size: 18px;
     font-weight: 500;
+    word-break: break-word;
+    width: 70%;
+}
+
+.buttonMarker{
+    padding: 0;
+    border: none;
+    background-color: transparent;
 }
 
 .answerIcon{
@@ -28,4 +38,11 @@
     display: flex;
     align-items: center;
     box-sizing: border-box;
+}
+
+.deleteButton{
+    margin-left: auto;
+    border: none;
+    background-color: transparent;
+    padding: 0;
 }
\ No newline at end of file
diff --git a/SurveyFrontend/src/components/AnswerOption/AnswerOption.tsx b/SurveyFrontend/src/components/AnswerOption/AnswerOption.tsx
index 03a1e6f..e0c78b1 100644
--- a/SurveyFrontend/src/components/AnswerOption/AnswerOption.tsx
+++ b/SurveyFrontend/src/components/AnswerOption/AnswerOption.tsx
@@ -3,17 +3,20 @@ import styles from'./AnswerOption.module.css';
 
 const single_selected_response = '../../../public/radio_button_checked.svg';
 const multiple_selected_response = '../../../public/check_box.svg';
-// const single_response =
-// const multiple_response =
+const single_response = '../../../public/radio_button_unchecked.svg';
+const multiple_response ='../../../public/emptyCheckbox.svg';
 
 interface AnswerOptionProps{
     index: number;
     value: string;
     onChange: (value: string) => void;
+    onDelete:(index: number) => void;
     selectedType: 'single' | 'multiply';
+    isSelected: boolean;
+    toggleSelect: () => void;
 }
 
-const AnswerOption: React.FC<AnswerOptionProps> = ({index, value, onChange, selectedType}) => {
+const AnswerOption: React.FC<AnswerOptionProps> = ({index, value, onChange, onDelete, selectedType, isSelected, toggleSelect}) => {
     const [currentValue, setCurrentValue] = useState(value);
     const [isEditing, setIsEditing] = useState(false);
 
@@ -33,12 +36,12 @@ const AnswerOption: React.FC<AnswerOptionProps> = ({index, value, onChange, sele
 
     const handleSave = () => {
         setIsEditing(false);
-        onChange(currentValue); // Отправляем измененное значение родителю
+        onChange(currentValue);
     };
 
     const handleKeyDown = (event: React.KeyboardEvent<HTMLTextAreaElement>) => {
         if (event.key === "Enter") {
-            event.preventDefault(); // Предотвращаем перенос строки в textarea
+            event.preventDefault();
             handleSave();
         }
     };
@@ -53,17 +56,23 @@ const AnswerOption: React.FC<AnswerOptionProps> = ({index, value, onChange, sele
         }
     }, [isEditing]);
 
-    const getImage = (typeValue: string): string => {
-        if (typeValue === 'multiply') {
-            return multiple_selected_response;
+    const getImage = () => {
+        if (selectedType === 'multiply') {
+            return isSelected ? multiple_selected_response : multiple_response;
         } else {
-            return single_selected_response;
+            return isSelected ? single_selected_response : single_response;
         }
     };
 
     return (
         <div className={styles.answer}>
-            <img className={styles.answerIcon} src={getImage(selectedType)} alt="" />
+            <button className={styles.buttonMarker} onClick={toggleSelect}>
+                <img
+                    className={styles.answerIcon}
+                    src={getImage()}
+                    alt=""
+                />
+            </button>
             {isEditing ? (
                 <textarea className={styles.answerInput}
                           ref={textAreaRef}
@@ -78,6 +87,9 @@ const AnswerOption: React.FC<AnswerOptionProps> = ({index, value, onChange, sele
                     {currentValue || `Ответ ${index}`}
                 </button>
             )}
+            <button className={styles.deleteButton} onClick={() => onDelete(index)}>
+                <img src='../../../public/delete.svg' alt="Удалить" />
+            </button>
         </div>
     );
 };
diff --git a/SurveyFrontend/src/components/MainComponent/MainComponent.module.css b/SurveyFrontend/src/components/MainComponent/MainComponent.module.css
index c3c71b0..cd44880 100644
--- a/SurveyFrontend/src/components/MainComponent/MainComponent.module.css
+++ b/SurveyFrontend/src/components/MainComponent/MainComponent.module.css
@@ -2,6 +2,7 @@
 
 .mainPage{
     width: 100%;
+    min-height: 85vh;
     display: flex;
     background-color: #F6F6F6;
 }
\ No newline at end of file
diff --git a/SurveyFrontend/src/components/QuestionItem/QuestionItem.module.css b/SurveyFrontend/src/components/QuestionItem/QuestionItem.module.css
index 0894eaa..7b4af09 100644
--- a/SurveyFrontend/src/components/QuestionItem/QuestionItem.module.css
+++ b/SurveyFrontend/src/components/QuestionItem/QuestionItem.module.css
@@ -10,11 +10,20 @@
 }
 
 .questionContainer{
+    width: 100%;
     display: flex;
     flex-direction: column;
 }
 
+.question{
+    display: flex;
+    justify-content: space-between;
+    gap: 40px;
+}
+
 .questionTextarea{
+    width: 70%;
+    align-items: center;
     border: none;
     outline: none;
     resize: none;
@@ -24,6 +33,7 @@
 }
 
 .buttonQuestion{
+    align-items: center;
     border: none;
     outline: none;
     background-color: #ffffff;
@@ -37,4 +47,28 @@
     font-weight: 600;
     margin-bottom: 35px;
     text-align: start;
+    word-break: break-word;
+}
+
+.questionActions{
+    display: flex;
+    justify-content: space-between;
+}
+
+.deleteQuestionButton{
+    font-size: 18px;
+    font-weight: 500;
+    color: #EC221F;
+    border: none;
+    padding: 0;
+    align-items: center;
+    background-color: transparent;
+    display: flex;
+    gap: 3px;
+}
+
+.basketImg{
+    vertical-align: middle;
+    width: 24px;
+    color: #EC221F;
 }
\ No newline at end of file
diff --git a/SurveyFrontend/src/components/QuestionItem/QuestionItem.tsx b/SurveyFrontend/src/components/QuestionItem/QuestionItem.tsx
index 8d6988c..8c4efb2 100644
--- a/SurveyFrontend/src/components/QuestionItem/QuestionItem.tsx
+++ b/SurveyFrontend/src/components/QuestionItem/QuestionItem.tsx
@@ -10,15 +10,18 @@ interface QuestionItemProps {
     initialTextQuestion?: string;
     valueQuestion: string;
     onChangeQuestion: (valueQuestion: string) => void;
+    onDeleteQuestion: (index: number) => void;
 }
 
 const QuestionItem: React.FC<QuestionItemProps> = ({indexQuestion, initialTextQuestion = `Вопрос ${indexQuestion}`,
-                                                       valueQuestion, onChangeQuestion}) => {
+                                                       valueQuestion, onChangeQuestion, onDeleteQuestion}) => {
     const [selectedType, setSelectedType] = useState<'single' | 'multiply'>('single');
     const [answerOption, setAnswerOption] = useState(['']);
     const [textQuestion, setTextQuestion] = useState(initialTextQuestion);
     const [isEditingQuestion, setIsEditingQuestion] = useState(false);
 
+    const [selectedAnswers, setSelectedAnswers] = useState<number[]>([]);
+
     const textareaQuestionRef = useRef<HTMLTextAreaElement>(null);
 
     const handleTypeChange = (type: 'single' | 'multiply') => {
@@ -65,43 +68,79 @@ const QuestionItem: React.FC<QuestionItemProps> = ({indexQuestion, initialTextQu
         setAnswerOption(newAnswerOption);
     }
 
+    const handleDeleteAnswer = (index: number) => {
+        const newAnswerOption = answerOption.filter((_, i) => i !== index);
+        setAnswerOption(newAnswerOption);
+        setSelectedAnswers(selectedAnswers.filter((i) => i !== index));
+    };
+
     useEffect(() => {
         setTextQuestion(valueQuestion);
     }, [valueQuestion]);
 
+    const handleDeleteQuestion = () => {
+        onDeleteQuestion(indexQuestion);
+    };
+
+    const toggleSelect = (index: number) => {
+        if (selectedType === 'single') {
+            setSelectedAnswers([index]);
+        } else {
+            setSelectedAnswers((prev) => {
+                if (prev.includes(index)) {
+                    return prev.filter((i) => i !== index);
+                } else {
+                    return [...prev, index];
+                }
+            });
+        }
+    };
+
     return (
         <div className={styles.questionCard}>
             <div className={styles.questionContainer}>
-                {isEditingQuestion ? (
-                    <textarea
-                        className={styles.questionTextarea}
-                        ref={textareaQuestionRef}
-                        value={textQuestion === initialTextQuestion ? '' : textQuestion}
-                        onChange={handleTextareaQuestionChange}
-                        onKeyDown={handleQuestionKeyDown}
-                        onBlur={handleQuestionBlur}
-                        placeholder={initialTextQuestion}
-                    />
-                ) : (
-                    <button className={styles.buttonQuestion} onClick={handleQuestionClick}>
-                        <h2 className={styles.textQuestion}>{textQuestion || initialTextQuestion}</h2>
-                    </button>
-                )}
+                <div className={styles.question}>
+                    {isEditingQuestion ? (
+                        <textarea
+                            className={styles.questionTextarea}
+                            ref={textareaQuestionRef}
+                            value={textQuestion === initialTextQuestion ? '' : textQuestion}
+                            onChange={handleTextareaQuestionChange}
+                            onKeyDown={handleQuestionKeyDown}
+                            onBlur={handleQuestionBlur}
+                            placeholder={initialTextQuestion}
+                        />
+                    ) : (
+                        <button className={styles.buttonQuestion} onClick={handleQuestionClick}>
+                            <h2 className={styles.textQuestion}>{textQuestion || initialTextQuestion}</h2>
+                        </button>
+                    )}
+                    <TypeDropdown selectedType={selectedType} onTypeChange={handleTypeChange}/>
+                </div>
+
                 {answerOption.map((answerText, index) => (
                     <AnswerOption
                         key={index}
                         selectedType={selectedType}
-                        index={index + 1} // Индекс ответа
+                        index={index + 1}
                         value={answerText}
                         onChange={(value) => handleAnswerChange(index, value)}
+                        onDelete={() => handleDeleteAnswer(index)}
+                        isSelected={selectedAnswers.includes(index)}
+                        toggleSelect={() => toggleSelect(index)}
                     />
                 ))}
 
-                <AddAnswerButton
-                    onClick={handleAddAnswer}
-                />
+                <div className={styles.questionActions}>
+                    <AddAnswerButton
+                        onClick={handleAddAnswer}
+                    />
+                    <button className={styles.deleteQuestionButton} onClick={handleDeleteQuestion}>
+                        Удалить{/**/}
+                        <img className={styles.basketImg} src='../../../public/deleteQuestion.svg' alt='deleteQuestion' />
+                    </button>
+                </div>
             </div>
-            <TypeDropdown selectedType={selectedType} onTypeChange={handleTypeChange}/>
         </div>
     );
 }
diff --git a/SurveyFrontend/src/components/QuestionsList/QuestionsList.tsx b/SurveyFrontend/src/components/QuestionsList/QuestionsList.tsx
index 64c4ecc..8c673dd 100644
--- a/SurveyFrontend/src/components/QuestionsList/QuestionsList.tsx
+++ b/SurveyFrontend/src/components/QuestionsList/QuestionsList.tsx
@@ -1,4 +1,4 @@
-import React, {useState} from "react";
+import React, { useState } from "react";
 import QuestionItem from "../QuestionItem/QuestionItem.tsx";
 import AddQuestionButton from "../AddQuestionButton/AddQuestionButton.tsx";
 
@@ -6,12 +6,12 @@ interface QuestionsListProps {}
 
 interface Question {
     id: number;
-    text: string
+    text: string;
 }
 
 const QuestionsList: React.FC<QuestionsListProps> = () => {
     const [questions, setQuestions] = useState<Question[]>([
-        {id: 1, text: ''},
+        { id: 1, text: '' },
     ]);
 
     const handleAddQuestion = () => {
@@ -23,21 +23,27 @@ const QuestionsList: React.FC<QuestionsListProps> = () => {
         setQuestions([...questions, newQuestion]);
     };
 
-    const handleQuestionChange = (index: number, value: string) => {
-        const newQuestions = [...questions];
-        newQuestions[index] = {...newQuestions[index], text: value};
+    const handleQuestionChange = (id: number, value: string) => {
+        const newQuestions = questions.map((question) =>
+            question.id === id ? { ...question, text: value } : question
+        );
+        setQuestions(newQuestions);
+    };
 
+    const handleDeleteQuestion = (id: number) => {
+        const newQuestions = questions.filter((question) => question.id !== id);
         setQuestions(newQuestions);
     };
 
     return (
         <>
-            {questions.map((question, index) => (
+            {questions.map((question) => (
                 <QuestionItem
                     key={question.id}
-                    indexQuestion={index + 1}
-                    valueQuestion={''}
-                    onChangeQuestion={(value) => handleQuestionChange(index, value)}
+                    indexQuestion={question.id}
+                    valueQuestion={question.text}
+                    onDeleteQuestion={() => handleDeleteQuestion(question.id)}
+                    onChangeQuestion={(value) => handleQuestionChange(question.id, value)}
                 />
             ))}
             <AddQuestionButton onClick={handleAddQuestion} />
@@ -45,4 +51,4 @@ const QuestionsList: React.FC<QuestionsListProps> = () => {
     );
 };
 
-export default QuestionsList;
\ No newline at end of file
+export default QuestionsList;
diff --git a/SurveyFrontend/src/components/TypeDropdown/TypeDropdown.module.css b/SurveyFrontend/src/components/TypeDropdown/TypeDropdown.module.css
index 681d004..33af9c7 100644
--- a/SurveyFrontend/src/components/TypeDropdown/TypeDropdown.module.css
+++ b/SurveyFrontend/src/components/TypeDropdown/TypeDropdown.module.css
@@ -4,7 +4,8 @@
     width: 23%;
     position: relative;
     display: inline-block;
-    margin-right: 29px;
+    /*margin-right: 29px;*/
+    margin-left: auto;
 }
 
 .dropdownButton {
@@ -17,9 +18,10 @@
     cursor: pointer;
     display: flex;
     align-items: center;
-    width: 118%;
+    width: 100%;
     text-align: left;
     white-space: nowrap;
+    margin-right: 29px;
 }
 
 .selectedTypeIcon {
@@ -31,6 +33,7 @@
 }
 
 .dropdownList {
+    width: 70%;
     margin-top: 11px;
     position: absolute;
     background-color: #fff;
@@ -39,8 +42,9 @@
     padding: 12px;
     list-style: none;
     z-index: 1;
-    width: 100%;
     box-shadow: 0 0 4.7px 0 #00000040;
+    left: 50%;
+    transform: translateX(-50%);
 }
 
 .dropdownItem {
@@ -50,8 +54,6 @@
     padding: 0;
     border: none;
     background-color: #ffffff;
-
-    /*cursor: pointer;*/
 }
 
 .dropdownItemIcon {