-
);
+
};
export default AnswerOption;
\ No newline at end of file
diff --git a/SurveyFrontend/src/components/Header/Header.tsx b/SurveyFrontend/src/components/Header/Header.tsx
index 03be8fc..935bb34 100644
--- a/SurveyFrontend/src/components/Header/Header.tsx
+++ b/SurveyFrontend/src/components/Header/Header.tsx
@@ -2,19 +2,24 @@ import React from "react";
import Logo from "../Logo/Logo.tsx";
import Account from "../Account/Account.tsx";
import styles from './Header.module.css'
-import {Link, useLocation} from "react-router-dom";
+import {Link, useLocation, useNavigate} from "react-router-dom";
const Header: React.FC = () => {
const location = useLocation();
+ const navigate = useNavigate();
const isCreateSurveyActive = location.pathname.includes('/survey/create');
const isSurveyPage = location.pathname.includes('/survey/') && !location.pathname.includes('/survey/create');
const isMySurveysPage = location.pathname === '/my-surveys' || isSurveyPage;
+ const handleLogoClick = () => {
+ navigate(location.pathname, { replace: true });
+ };
+
return (
-
);
};
diff --git a/SurveyFrontend/src/components/LoginForm/LoginForm.module.css b/SurveyFrontend/src/components/LoginForm/LoginForm.module.css
new file mode 100644
index 0000000..fca2331
--- /dev/null
+++ b/SurveyFrontend/src/components/LoginForm/LoginForm.module.css
@@ -0,0 +1,85 @@
+.loginContainer{
+ width: 31%;
+ background-color: #FFFFFF;
+ padding: 42.5px 65px;
+ margin: auto;
+ border-radius: 43px;
+ margin-bottom: 0;
+}
+
+.title{
+ text-align: center;
+ font-weight: 600;
+ font-size: 40px;
+ line-height: 88%;
+ padding: 0;
+ margin-bottom: 80px;
+ margin-top: 0;
+}
+
+.form{
+ text-align: center;
+ display: flex;
+ flex-direction: column;
+ gap: 80px;
+ margin-bottom: 80px;
+}
+
+.input {
+ font-size: 24px;
+ font-weight: 600;
+ line-height: 88%;
+ color: #000000; /* Цвет текста по умолчанию */
+ outline: none;
+ border: none;
+ border-bottom: 1px solid rgba(0, 0, 0, 0.2); /* Нижняя граница с прозрачностью */
+ padding: 5px 0;
+ opacity: 1; /* Установите opacity в 1 для input, а для placeholder используйте opacity */
+}
+
+.input::placeholder {
+ font-size: 24px;
+ font-weight: 600;
+ line-height: 88%;
+ color: #000000;
+ opacity: 0.2; /* Прозрачность placeholder */
+}
+
+.input:focus::placeholder {
+ opacity: 0; /* Убираем placeholder при фокусе */
+}
+
+/* Отключаем стиль для input, когда в нём есть данные */
+.input:not(:placeholder-shown) {
+ color: black;
+ opacity: 1;
+}
+
+.input:focus {
+ border-bottom: 1px solid black; /* Чёрная граница при фокусе */
+}
+
+.signIn{
+ margin: auto;
+ padding: 26.5px 67px;
+ width: fit-content;
+ border-radius: 24px;
+ background-color: #3788D6;
+ color: #FFFFFF;
+ font-size: 24px;
+ font-weight: 600;
+ line-height: 120%;
+ border: none;
+ outline: none;
+}
+
+.recommendation{
+ text-align: center;
+ font-size: 18px;
+ font-weight: 500;
+}
+
+.recommendationLink{
+ color: #3788D6;
+ margin-left: 5px;
+}
\ No newline at end of file
diff --git a/SurveyFrontend/src/components/LoginForm/LoginForm.tsx b/SurveyFrontend/src/components/LoginForm/LoginForm.tsx
new file mode 100644
index 0000000..553cd37
--- /dev/null
+++ b/SurveyFrontend/src/components/LoginForm/LoginForm.tsx
@@ -0,0 +1,65 @@
+import {Link, useNavigate} from "react-router-dom";
+import styles from './LoginForm.module.css';
+import {useRef, useState} from 'react';
+import {authUser} from "../../api/AuthApi.ts";
+
+const LoginForm = () => {
+ const [focused, setFocused] = useState({
+ email: false,
+ password: false
+ });
+
+ const navigate = useNavigate();
+
+ const emailRef = useRef
+
+ );
+}
+
+export default LoginForm;
diff --git a/SurveyFrontend/src/components/Logo/Logo.tsx b/SurveyFrontend/src/components/Logo/Logo.tsx
index c2bb8cf..5af3dea 100644
--- a/SurveyFrontend/src/components/Logo/Logo.tsx
+++ b/SurveyFrontend/src/components/Logo/Logo.tsx
@@ -3,11 +3,12 @@ import styles from './Logo.module.css'
interface LogoProps {
href: string;
+ onClick: () => void
}
-const Logo: React.FCС возвращением!
+ +Еще не с нами? + Зарегистрируйтесь! +
+
);
diff --git a/SurveyFrontend/src/components/MySurveyList/MySurveyList.tsx b/SurveyFrontend/src/components/MySurveyList/MySurveyList.tsx
index 678d30d..210996e 100644
--- a/SurveyFrontend/src/components/MySurveyList/MySurveyList.tsx
+++ b/SurveyFrontend/src/components/MySurveyList/MySurveyList.tsx
@@ -1,35 +1,58 @@
import styles from './MySurveysList.module.css'
import {useNavigate} from "react-router-dom";
+import {useEffect, useState} from "react";
+import {getMySurveys, ISurvey} from "../../api/SurveyApi.ts";
-interface MySurveyItem{
- id: string,
- title: string,
- description: string,
- date: string
+
+interface MySurveyItem extends ISurvey{
status: 'active' | 'completed'
}
export const MySurveyList = () => {
const navigate = useNavigate();
+ const [surveys, setSurveys] = useState{survey.title}
{survey.description}
- Дата создания: {survey.date} + Дата создания: {survey.createdBy} = ({indexQuestion, initialTextQu
const handleTextareaQuestionChange = (event: React.ChangeEvent) => {
setTextQuestion(event.target.value);
+
+ if (textareaQuestionRef.current) {
+ textareaQuestionRef.current.style.height = 'auto';
+ textareaQuestionRef.current.style.height = `${textareaQuestionRef.current.scrollHeight}px`;
+ }
}
const handleSaveQuestion = () => {
@@ -59,6 +64,8 @@ const QuestionItem: React.FC = ({indexQuestion, initialTextQu
useEffect(() => {
if (isEditingQuestion && textareaQuestionRef.current) {
textareaQuestionRef.current.focus();
+ textareaQuestionRef.current.style.height = 'auto';
+ textareaQuestionRef.current.style.height = `${textareaQuestionRef.current.scrollHeight}px`;
}
}, [isEditingQuestion]);
@@ -109,6 +116,7 @@ const QuestionItem: React.FC = ({indexQuestion, initialTextQu
onKeyDown={handleQuestionKeyDown}
onBlur={handleQuestionBlur}
placeholder={initialTextQuestion}
+ rows={1}
/>
) : (