KRBL/MinervaFrontend
9
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: KRBL:209c2e0a701637d62be02cfb19b91f0973e61b3c
Branches Tags
KRBL:main
..
compare: KRBL:695cc690d98e32092db532c38a818065c6212f1e
Branches Tags
KRBL:main

No commits in common. "209c2e0a701637d62be02cfb19b91f0973e61b3c" and "695cc690d98e32092db532c38a818065c6212f1e" have entirely different histories.
209c2e0a70 ... 695cc690d9

16 changed files with 280 additions and 285 deletions
Show Stats Expand all files Collapse all files

22
src/App.jsx
View File

@ -22,14 +22,14 @@ const App = () => {
const [user, setUser] = useState(false); const [user, setUser] = useState(false);
const [answersList, setAnswersList] = useState([]); const [answersList, setAnswersList] = useState([]);
const [listTypeAnswer, setListTypeAnswer] = useState([ const [listTypeAnswer, setListTypeAnswer] = useState([
{id: 1, text: 'Краткий ответ', typeTag: InputText}, { id: 1, text: "Краткий ответ", typeTag: InputText },
{id: 2, text: 'Расширенный ответ', typeTag: TextArea}, { id: 2, text: "Расширенный ответ", typeTag: TextArea },
{id: 3, text: 'Выбор из вариантов', typeTag: InputRadio}, { id: 3, text: "Выбор из вариантов", typeTag: InputRadio },
{id: 4, text: 'Множественный выбор', typeTag: InputMultipleRadio}, { id: 4, text: "Множественный выбор", typeTag: InputMultipleRadio },
{id: 5, text: 'Выпадающий список', typeTag: DropDownList}, { id: 5, text: "Выпадающий список", typeTag: DropDownList },
{id: 6, text: 'Да/Нет', typeTag: YesNo}, { id: 6, text: "Да/Нет", typeTag: YesNo },
// {id: 7, text: 'Файл', typeTag: InputFile}, { id: 7, text: "Файл", typeTag: InputFile },
{id: 8, text: 'Дата', typeTag: InputDate} { id: 8, text: "Дата", typeTag: InputDate },
]); ]);
// useEffect(() => globalRender(window.location.pathname, user, navigate)); // useEffect(() => globalRender(window.location.pathname, user, navigate));
@ -40,12 +40,12 @@ const App = () => {
const response = await verifyUserApi(cookies.token); const response = await verifyUserApi(cookies.token);
console.log("app", user); console.log("app", user);
if (response) {
if (response.status === 200) { if (response.status === 200) {
setUser(response.data); setUser(response.data);
globalRender(window.location.pathname, response.data, navigate); } else {
console.log(response);
} }
else {
globalRender(window.location.pathname, false, navigate);
} }
} }

72
src/assets/styles/answersForm.module.scss
View File

@ -11,26 +11,12 @@
align-items: center; align-items: center;
} }
.loading__wrapper {
width: 100%;
height: 80%;
display: flex;
justify-content: center;
align-items: center;
&__body {
// margin-top: 100px;
span {
}
}
}
.answers { .answers {
width: 70%; width: 70%;
height: 70%; height: 70%;
box-shadow: 0 0 5px 1px rgb(200, 200, 200); box-shadow: 0 0 5px 1px rgb(200, 200, 200);
padding: 1.5%; padding: 1.5%;
position: relative;
&__linkAdmin { &__linkAdmin {
position: absolute; position: absolute;
bottom: 103%; bottom: 103%;
@ -47,8 +33,6 @@
} }
} }
&__wrapper { &__wrapper {
width: 100%;
height: 100%;
&__header { &__header {
width: 100%; width: 100%;
height: 15%; height: 15%;
@ -56,7 +40,6 @@
justify-content: start; justify-content: start;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
// border-bottom: 1px solid rgb(200, 200, 200);
h3 { h3 {
font-size: 25px; font-size: 25px;
font-family: "Montserrat", sans-serif; font-family: "Montserrat", sans-serif;
@ -66,45 +49,30 @@
&__body { &__body {
width: 100%; width: 100%;
height: 85%; height: 85%;
overflow-y: auto; &__item {
border-bottom: 1px solid rgb(200, 200, 200);
&::-webkit-scrollbar {
width: 7px;
}
&::-webkit-scrollbar-thumb {
background-color: rgb(200, 200, 200);
}
&__column {
display: flex;
justify-content: space-between;
align-items: center;
font-size: 15px;
font-family: "Montserrat", sans-serif;
padding: 5px; padding: 5px;
border-bottom: 1px solid rgb(200, 200, 200); border-bottom: 1px solid rgb(200, 200, 200);
}
&__item {
padding: 0 5px;
// border-bottom: 1px solid rgb(200, 200, 200);
font-size: 15px; font-size: 15px;
font-family: "Montserrat", sans-serif; font-family: "Montserrat", sans-serif;
display: flex;
justify-content: space-between;
align-items: center;
height: 20%;
width: 100%;
&:hover {
background-color: rgba(230, 230, 230, 0.6);
}
&__user {
cursor: pointer; cursor: pointer;
&:hover { // &__question {
text-decoration: underline; // &__text {
} // font-size: 15px;
} // font-family: "Montserrat", sans-serif;
&__date { // }
// &__comment {
} // font-size: 11px;
// font-family: "Montserrat", sans-serif;
// font-style: italic;
// color: rgb(200, 200, 200);
// }
// }
// &__answer {
// &__text {
// font-size: 15px;
// font-family: "Montserrat", sans-serif;
// }
// }
} }
} }
} }

20
src/assets/styles/enterAccount.module.scss
View File

@ -28,6 +28,7 @@
.content { .content {
width: 100%; width: 100%;
height: 100%; height: 100%;
// box-shadow: 0 3px 5px 1px rgb(200, 200, 200);
border: 1px solid rgb(220, 220, 220); border: 1px solid rgb(220, 220, 220);
border-top: none; border-top: none;
&__wrapper { &__wrapper {
@ -57,15 +58,6 @@
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
flex-direction: column; flex-direction: column;
position: relative;
&__error {
position: absolute;
font-size: 13px;
font-family: "Montserrat", sans-serif;
top: 0;
left: 10px;
color: rgb(224, 75, 75);
}
} }
&__footer { &__footer {
width: 100%; width: 100%;
@ -95,15 +87,7 @@
justify-content: space-around; justify-content: space-around;
flex-direction: column; flex-direction: column;
padding-bottom: 5px; padding-bottom: 5px;
position: relative;
&__error {
position: absolute;
font-size: 13px;
font-family: "Montserrat", sans-serif;
top: 0;
left: 10px;
color: rgb(224, 75, 75);
}
&__fio { &__fio {
height: 15%; height: 15%;
display: flex; display: flex;

32
src/components/NavBar.jsx
View File

@ -4,25 +4,41 @@ import classes from "../assets/styles/components/navbar.module.scss";
import { verifyUserApi } from "../hooks/api/enterAccountApi"; import { verifyUserApi } from "../hooks/api/enterAccountApi";
const NavBar = ({ navigate, auth, setAuth }) => { const NavBar = ({ navigate, auth, setAuth }) => {
useEffect(() => {
console.log("nav", auth);
});
return ( return (
<div className={classes.main}> <div className={classes.main}>
<div className={classes.wrapper}> <div className={classes.wrapper}>
<div className={classes.menu}> <div className={classes.menu}>
<div className={classes.menu__authorized}> <div className={classes.menu__authorized}>
<span onClick={() => navigate("/")}>Главная</span> <span onClick={() => navigate("/")}>Главная</span>
{auth ? {auth ? (
auth.is_admin ? <span onClick={() => navigate("/forms")}>Мои формы</span> : <span></span> : auth.is_admin ? (
<span></span>} <span onClick={() => navigate("/forms")}>Мои формы</span>
) : (
<span></span>
)
) : (
<span></span>
)}
</div> </div>
</div> </div>
<div className={classes.profile}> <div className={classes.profile}>
{auth ? {auth ? (
<div className={classes.profile__authorized}> <div className={classes.profile__authorized}>
<span onClick={() => navigate("/profile")}>Профиль ({auth.login})</span> <span onClick={() => navigate("/profile")}>
</div> : Профиль ({auth.login})
</span>
</div>
) : (
<div className={classes.profile__nonAuthorized}> <div className={classes.profile__nonAuthorized}>
<span onClick={() => navigate("/enter")}>Вход <i class="fa-solid fa-arrow-right-to-bracket"></i></span> <span onClick={() => navigate("/enter")}>
</div>} Вход <i class="fa-solid fa-arrow-right-to-bracket"></i>
</span>
</div>
)}
</div> </div>
</div> </div>
</div> </div>

6
src/components/typeAnswer/DropDownList.jsx
View File

@ -7,11 +7,11 @@ const DropDownList = ({postfix, optionAnswer, answers, updateAnswersForm}) => {
<div className={classes.main}> <div className={classes.main}>
<select <select
value={answers ? answers[postfix].answer : ""} value={answers ? answers[postfix].answer : ""}
onChange={updateAnswersForm ? (e) => updateAnswersForm(e.target.value, postfix) : () => {}} onChange={updateAnswersForm ? (e) => updateAnswersForm(Number(e.target.value), postfix) : () => {}}
> >
<option selected disabled></option>
{optionAnswer.map((item, i) => {optionAnswer.map((item, i) =>
<option value={item.text} key={i}>{item.text}</option> // <option value={item.id ? item.id : item[0].Value} key={i}>{item.text ? item.text : item[1].Value}</option>
<option value={item.id} key={i}>{item.text}</option>
)} )}
</select> </select>
</div> </div>

18
src/components/typeAnswer/InputMultipleRadio.jsx
View File

@ -2,20 +2,20 @@ import React from "react";
import classes from "../../assets/styles/components/typeAnswer/inputMultiple.module.scss" import classes from "../../assets/styles/components/typeAnswer/inputMultiple.module.scss"
const InputMultipleRadio = ({postfix, optionAnswer, answers, updateAnswersForm}) => { const InputMultipleRadio = ({postfix, optionAnswer, answers, updateAnswersForm}) => {
function checkRadio(value) { function checkRadio(i) {
if (answers[postfix].answer) { if (answers[postfix].answer) {
return answers[postfix].answer.some(item => item === value) return answers[postfix].answer.some(item => item === Number(i))
} }
return false return false
} }
function updateStateCheckbox(value) { function updateStateCheckbox(i) {
if (updateAnswersForm) { if (updateAnswersForm) {
if (answers[postfix].answer.some((item) => item === value)) { if (answers[postfix].answer.some((item) => item === Number(i))) {
answers[postfix].answer.splice(answers[postfix].answer.indexOf(value), 1) answers[postfix].answer.splice(answers[postfix].answer.indexOf(i), 1)
} }
else { else {
answers[postfix].answer.push(value) answers[postfix].answer.push(i)
} }
updateAnswersForm(answers[postfix].answer, postfix) updateAnswersForm(answers[postfix].answer, postfix)
} }
@ -30,9 +30,9 @@ const InputMultipleRadio = ({postfix, optionAnswer, answers, updateAnswersForm})
type="checkbox" type="checkbox"
name={`inputMultiple_${postfix}`} name={`inputMultiple_${postfix}`}
id={`inputMultiple_${postfix}`} id={`inputMultiple_${postfix}`}
value={item.text} value={i}
checked={answers ? checkRadio(item.text) : false} checked={answers ? checkRadio(i) : false}
onChange={() => updateStateCheckbox(item.text)} onChange={() => updateStateCheckbox(i)}
/> />
{/* <label class="form-check-label" for={`inputMultiple_${postfix}`}>{item.text ? item.text : item[1].Value}</label> */} {/* <label class="form-check-label" for={`inputMultiple_${postfix}`}>{item.text ? item.text : item[1].Value}</label> */}
<label class="form-check-label" for={`inputMultiple_${postfix}`}>{item.text}</label> <label class="form-check-label" for={`inputMultiple_${postfix}`}>{item.text}</label>

6
src/components/typeAnswer/InputRadio.jsx
View File

@ -11,9 +11,9 @@ const InputRadio = ({postfix, optionAnswer, answers, updateAnswersForm}) => {
type="radio" type="radio"
name={`inputRadio_${postfix}`} name={`inputRadio_${postfix}`}
id={`choice_${item.id}`} id={`choice_${item.id}`}
value={item.text} value={i}
checked={answers ? answers[postfix].answer === item.text : false} checked={answers ? answers[postfix].answer === i : false}
onChange={updateAnswersForm ? (e) => updateAnswersForm(item.text, postfix) : () => {}} onChange={updateAnswersForm ? (e) => updateAnswersForm(Number(e.target.value), postfix) : () => {}}
/> />
{/* <label class="form-check-label" for={`inputRadio_${postfix}`}>{item.text ? item.text : item[1].Value}</label> */} {/* <label class="form-check-label" for={`inputRadio_${postfix}`}>{item.text ? item.text : item[1].Value}</label> */}
<label class="form-check-label" for={`inputRadio_${postfix}`}>{item.text}</label> <label class="form-check-label" for={`inputRadio_${postfix}`}>{item.text}</label>

8
src/components/typeAnswer/YesNo.jsx
View File

@ -11,8 +11,8 @@ const YesNo = ({postfix, optionAnswer, answers, updateAnswersForm}) => {
name={`YesOrNo_${postfix}`} name={`YesOrNo_${postfix}`}
id="choiceYes" id="choiceYes"
value="1" value="1"
checked={answers ? answers[postfix].answer === "Да" : false} checked={answers ? answers[postfix].answer === "1" : false}
onChange={updateAnswersForm ? () => updateAnswersForm("Да", postfix) : () => {}} onChange={updateAnswersForm ? () => updateAnswersForm("1", postfix) : () => {}}
/> />
<label class="form-check-label" for="choiceYes">Да</label> <label class="form-check-label" for="choiceYes">Да</label>
</div> </div>
@ -23,8 +23,8 @@ const YesNo = ({postfix, optionAnswer, answers, updateAnswersForm}) => {
name={`YesOrNo_${postfix}`} name={`YesOrNo_${postfix}`}
id="choiceNo" id="choiceNo"
value="2" value="2"
checked={answers ? answers[postfix].answer === "Нет" : false} checked={answers ? answers[postfix].answer === "2" : false}
onChange={updateAnswersForm ? () => updateAnswersForm("Нет", postfix) : () => {}} onChange={updateAnswersForm ? () => updateAnswersForm("2", postfix) : () => {}}
/> />
<label class="form-check-label" for="choiceNo">Нет</label> <label class="form-check-label" for="choiceNo">Нет</label>
</div> </div>

2
src/hooks/api/enterAccountApi.js
View File

@ -23,7 +23,7 @@ async function completeRegistration(data) {
return response return response
} }
catch (e) { catch (e) {
return "Ошибка. Проверте корректность введенных данных." return e
} }
} }
return validate.message return validate.message

20
src/hooks/sundry/parseListBlock.js
View File

@ -31,22 +31,4 @@ function responseDataToListBlock(data) {
return result.sort((itemOne, itemTwo) => itemOne.order - itemTwo.order) return result.sort((itemOne, itemTwo) => itemOne.order - itemTwo.order)
}; };
function dateTimeParse(date) { export { responseDataToListBlock }
let newDate = "";
for (let symbol of date) {
if (symbol === "T") {
newDate += " ";
}
else if (symbol === ".") {
break;
}
else {
newDate += symbol;
}
}
return newDate
}
export { responseDataToListBlock, dateTimeParse }

11
src/hooks/validation/enterAccountValidate.js
View File

@ -16,15 +16,16 @@ const constructorAnswerValidate = (
const totalRegisterValidate = (data) => { const totalRegisterValidate = (data) => {
const listValidation = [ const listValidation = [
constructorAnswerValidate(data.login.length, "Введите логин."), constructorAnswerValidate(data.login.length, "Обязательное поле."),
constructorAnswerValidate(data.password.length, "Введите пароль."),
constructorAnswerValidate(data.repiedPassword.length, "Введите повторно пароль."),
// constructorAnswerValidate(data.surname.length, "Обязательное поле."), // constructorAnswerValidate(data.surname.length, "Обязательное поле."),
// constructorAnswerValidate(data.email.length, "Обязательное поле."), // constructorAnswerValidate(data.email.length, "Обязательное поле."),
// constructorAnswerValidate(data.phone.length, "Обязательное поле."), // constructorAnswerValidate(data.phone.length, "Обязательное поле."),
constructorAnswerValidate(data.password === data.repiedPassword, "Введенные пароли не совпадают."), constructorAnswerValidate(
data.password === data.repiedPassword,
"Введенные пароли не совпадают."
),
// constructorAnswerValidate(data.password >= 8, "Пароль должен иметь более 8 символов.") // constructorAnswerValidate(data.password >= 8, "Пароль должен иметь более 8 символов.")
] ];
for (let value of listValidation) { for (let value of listValidation) {
if (!value.status) { if (!value.status) {

40
src/pages/AnswersForm.jsx
View File

@ -3,7 +3,7 @@ import { useCookies } from "react-cookie";
import { useNavigate, useParams } from 'react-router-dom'; import { useNavigate, useParams } from 'react-router-dom';
import { answersData } from "../context"; import { answersData } from "../context";
import classes from "../assets/styles/answersForm.module.scss"; import classes from "../assets/styles/answersForm.module.scss";
import { responseDataToListBlock, dateTimeParse } from "../hooks/sundry/parseListBlock"; import { responseDataToListBlock } from "../hooks/sundry/parseListBlock";
import { listFormBlockApi, getAnswersApi } from "../hooks/api/formApi"; import { listFormBlockApi, getAnswersApi } from "../hooks/api/formApi";
import { listUsersApi } from "../hooks/api/adminApi"; import { listUsersApi } from "../hooks/api/adminApi";
@ -29,7 +29,6 @@ const AnswersForm = () => {
for (let item of responseAnswers.data) { for (let item of responseAnswers.data) {
const blocks = { const blocks = {
user: listUsers.data.find(user => user.id === item.user_id).login, user: listUsers.data.find(user => user.id === item.user_id).login,
date: dateTimeParse(item.date),
block: [] block: []
} }
@ -68,20 +67,12 @@ const AnswersForm = () => {
<h3>Ответы</h3> <h3>Ответы</h3>
</div> </div>
<div className={classes.answers__wrapper__body}> <div className={classes.answers__wrapper__body}>
<div className={classes.answers__wrapper__body__column}>
<div>Логин</div>
<div>Дата</div>
</div>
{data ? {data ?
data.map((item, i) => data.map((item, i) =>
<div className={classes.answers__wrapper__body__item} key={i}> <div className={classes.answers__wrapper__body__item} key={i}>
<div className={classes.answers__wrapper__body__item__user} data-bs-toggle={"modal"} data-bs-target={`#answersModal${i}`}> <div className={classes.answers__wrapper__body__item__user} data-bs-toggle={"modal"} data-bs-target={`#answersModal${i}`}>
{item.user} {item.user}
</div> </div>
<div className={classes.answers__wrapper__body__item__date}>
{item.date}
</div>
<div class="modal fade myModal" className={classes.myModal} id={`answersModal${i}`} tabIndex="-1" aria-labelledby="exampleModalLabel" data-bs-backdrop="static" aria-hidden="true"> <div class="modal fade myModal" className={classes.myModal} id={`answersModal${i}`} tabIndex="-1" aria-labelledby="exampleModalLabel" data-bs-backdrop="static" aria-hidden="true">
<div class="modal-dialog myModal__dialog" className={classes.myModal__dialog}> <div class="modal-dialog myModal__dialog" className={classes.myModal__dialog}>
@ -96,11 +87,7 @@ const AnswersForm = () => {
<p className={classes.myModal__item__question__comment}>{block.question.comment}</p> <p className={classes.myModal__item__question__comment}>{block.question.comment}</p>
</div> </div>
<div className={classes.myModal__item__answer}> <div className={classes.myModal__item__answer}>
<p className={classes.myModal__item__question__text}>Ответ: { <p className={classes.myModal__item__question__text}>Ответ: {block.answers.answer}</p>
Array.isArray(block.answers.answer) ?
block.answers.answer.map(item => <span>{item}; </span>) :
block.answers.answer
}</p>
</div> </div>
</div>)} </div>)}
</div> </div>
@ -112,14 +99,27 @@ const AnswersForm = () => {
</div> </div>
</div> </div>
) )
: : <div>Ответов нет</div>}
<div className={classes.loading__wrapper}>
<div class="spinner-border text-dark" className={classes.loading__wrapper__body} role="status">
<span class="visually-hidden">Загрузка...</span> {/* <MyButton text={'Предпросмотр'} backgroundColor={'rgb(225, 225, 225)'} toggle={"modal"} target={"#previewModal"}/>
{data ? <div className={classes.answers__wrapper__body__item}></div> */}
{/* {data ?
data.map((item, i) =>
<div className={classes.answers__wrapper__body__item} key={i}>
<div className={classes.answers__wrapper__body__item__question}>
<p className={classes.answers__wrapper__body__item__question__text}>{i + 1}) {item.question.question}</p>
<p className={classes.item__question__comment}>{item.question.comment}</p>
</div> </div>
</div>} <div className={classes.answers__wrapper__body__item__answer}>
<p className={classes.answers__wrapper__body__item__question__text}>Ответ: {item.answers.answer}</p>
</div> </div>
</div> </div>
)
: <div>Ответов нет</div>} */}
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

102
src/pages/EnterAccount.jsx
View File

@ -26,9 +26,6 @@ const EnterAccount = () => {
const { user, setUser } = useContext(UserData); const { user, setUser } = useContext(UserData);
const [cookies, setCookie, removeCookie] = useCookies(["user"]); const [cookies, setCookie, removeCookie] = useCookies(["user"]);
const [loginError, setLoginError] = useState(false);
const [regsterError, setRegsterError] = useState(false);
function cleanState() { function cleanState() {
setEmail(""); setEmail("");
setPhone(""); setPhone("");
@ -52,30 +49,35 @@ const EnterAccount = () => {
}); });
if (response.status === 200) { if (response.status === 200) {
const responseMe = await verifyUserApi(response.data.token) // setUser({
// email: email,
// phone: phone,
// login: login,
// surname: surname,
// patronymic: patronymic,
// password: password,
// });
const responseMe = await verifyUserApi(response.data.token);
setUser(responseMe.data); setUser(responseMe.data);
setCookie("token", response.data.token); setCookie("token", response.data.token);
cleanState(); cleanState();
navigate("/"); navigate("/");
} else {
console.log("Error");
} }
else {
setRegsterError(response)
} }
};
async function logInToAccount() { async function logInToAccount() {
const response = await logIn(login, password); const response = await logIn(login, password);
if (response.status === 200) { if (response.status === 200) {
setCookie("token", response.data.token); setCookie("token", response.data.token);
const responseMe = await verifyUserApi(response.data.token) const responseMe = await verifyUserApi(response.data.token);
setUser(responseMe.data) setUser(responseMe.data);
cleanState(); cleanState();
navigate("/") navigate("/");
} } else {
else { console.log(response);
setLoginError(true);
} }
} }
@ -85,25 +87,47 @@ const EnterAccount = () => {
<div className={classes.tabs}> <div className={classes.tabs}>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="nav-item" onClick={() => selectTag("login")}> <li class="nav-item" onClick={() => selectTag("login")}>
<a className={enter === "login" ? "nav-link active" : "nav-link"} aria-current="page">Авторизация</a> <a
className={enter === "login" ? "nav-link active" : "nav-link"}
aria-current="page"
>
Авторизация
</a>
</li> </li>
<li class="nav-item" onClick={() => selectTag("register")}> <li class="nav-item" onClick={() => selectTag("register")}>
<a className={enter === "register" ? "nav-link active" : "nav-link"}>Регитрация</a> <a
className={
enter === "register" ? "nav-link active" : "nav-link"
}
>
Регистрация
</a>
</li> </li>
</ul> </ul>
</div> </div>
<div className={classes.content}> <div className={classes.content}>
<div className={classes.content__wrapper}> <div className={classes.content__wrapper}>
{enter === 'login' ? <div className={classes.content__wrapper__login}> {enter === "login" ? (
<div className={classes.content__wrapper__login}>
<div className={classes.content__wrapper__login__header}> <div className={classes.content__wrapper__login__header}>
<h3>Войти в аккаунт</h3> <h3>Войти в аккаунт</h3>
</div> </div>
<div className={classes.content__wrapper__login__body}> <div className={classes.content__wrapper__login__body}>
{loginError ? <span className={classes.content__wrapper__login__body__error}> <MyInput
Ошибка. Проверте корректность ввода логина и пароля. placeholder={"Логин"}
</span> : <span className={classes.content__wrapper__login__body__error}></span>} otherMainStyle={{ width: "100%", height: "20%" }}
<MyInput placeholder={"Логин"} otherMainStyle={{width: "100%", height: "20%"}} otherInputStyle={{width: "100%"}} value={login} change={setLogin}/> otherInputStyle={{ width: "100%" }}
<MyInput type={"password"} placeholder={"Пароль"} otherMainStyle={{width: "100%", height: "20%"}} otherInputStyle={{width: "100%"}} value={password} change={setPassword}/> value={login}
change={setLogin}
/>
<MyInput
type={"password"}
placeholder={"Пароль"}
otherMainStyle={{ width: "100%", height: "20%" }}
otherInputStyle={{ width: "100%" }}
value={password}
change={setPassword}
/>
</div> </div>
<div className={classes.content__wrapper__login__footer}> <div className={classes.content__wrapper__login__footer}>
<MyButton <MyButton
@ -112,18 +136,36 @@ const EnterAccount = () => {
click={logInToAccount} click={logInToAccount}
/> />
</div> </div>
</div> : </div>
) : (
<div className={classes.content__wrapper__register}> <div className={classes.content__wrapper__register}>
<div className={classes.content__wrapper__register__header}> <div className={classes.content__wrapper__register__header}>
<h3>Зарегистрировать учетную запись</h3> <h3>Зарегистрировать учетную запись</h3>
</div> </div>
<div className={classes.content__wrapper__register__body}> <div className={classes.content__wrapper__register__body}>
{regsterError ? <span className={classes.content__wrapper__register__body__error}> <MyInput
{regsterError} placeholder={"Логин"}
</span> : <span className={classes.content__wrapper__register__body__error}></span>} otherMainStyle={{ width: "100%", height: "15%" }}
<MyInput placeholder={"Логин"} otherMainStyle={{width: "100%", height: "15%"}} otherInputStyle={{width: "100%"}} value={login} change={setLogin}/> otherInputStyle={{ width: "100%" }}
<MyInput type={"password"} placeholder={"Пароль"} otherMainStyle={{width: "100%", height: "15%"}} otherInputStyle={{width: "100%"}} value={password} change={setPassword}/> value={login}
<MyInput type={'password'} placeholder={"Повторите пароль"} otherMainStyle={{width: "100%", height: "15%"}} otherInputStyle={{width: "100%"}} value={repiedPassword} change={setRepiedPassword}/> change={setLogin}
/>
<MyInput
type={"password"}
placeholder={"Пароль"}
otherMainStyle={{ width: "100%", height: "15%" }}
otherInputStyle={{ width: "100%" }}
value={password}
change={setPassword}
/>
<MyInput
type={"password"}
placeholder={"Повторите пароль"}
otherMainStyle={{ width: "100%", height: "15%" }}
otherInputStyle={{ width: "100%" }}
value={repiedPassword}
change={setRepiedPassword}
/>
</div> </div>
{/* <div className={classes.content__wrapper__register__body}> {/* <div className={classes.content__wrapper__register__body}>
<MyInput placeholder={"Email"} otherMainStyle={{width: "100%", height: "15%"}} otherInputStyle={{width: "100%"}} value={email} change={setEmail}/> <MyInput placeholder={"Email"} otherMainStyle={{width: "100%", height: "15%"}} otherInputStyle={{width: "100%"}} value={email} change={setEmail}/>
@ -144,7 +186,7 @@ const EnterAccount = () => {
/> />
</div> </div>
</div> </div>
} )}
</div> </div>
</div> </div>
</div> </div>

7
src/pages/NewForm.jsx
View File

@ -119,6 +119,13 @@ const NewForm = () => {
console.log(response) console.log(response)
} }
// setListBlock(listBlock.map(item => {
// if (item.id === stateModal) {
// item = data
// }
// return item
// }))
cleanStates(); cleanStates();
}; };

7
src/pages/ViewForm.jsx
View File

@ -19,9 +19,11 @@ const ViewForm = () => {
const [cookies, setCookies, __] = useCookies(["user"]); const [cookies, setCookies, __] = useCookies(["user"]);
const [questions, setQuestions] = useState([]); const [questions, setQuestions] = useState([]);
const [answers, setAnswers] = useState([]); const [answers, setAnswers] = useState([]);
// const [title, setTitle] = useState("");
useEffect(() => { useEffect(() => {
async function getForm() { async function getForm() {
// const responseForms = await listFormsApi(cookies.token);
const responseBlocks = await listFormBlockByTokenApi(cookies.token, formId); const responseBlocks = await listFormBlockByTokenApi(cookies.token, formId);
if (responseBlocks.status === 200 && responseBlocks.data) { if (responseBlocks.status === 200 && responseBlocks.data) {
@ -31,8 +33,10 @@ const ViewForm = () => {
setAnswers(listBlocks.map(item => ( setAnswers(listBlocks.map(item => (
{id: item.id, answer: []} {id: item.id, answer: []}
))) )))
// setTitle(responseForms.data.find(item => item.id === formId).title)
} }
else { else {
// console.log(responseForms)
console.log(responseBlocks) console.log(responseBlocks)
} }
}; };
@ -41,7 +45,6 @@ const ViewForm = () => {
}, []); }, []);
function updateAnswersForm(value, id) { function updateAnswersForm(value, id) {
console.log(value)
setAnswers( setAnswers(
answers.map((item, i) => { answers.map((item, i) => {
if (id === i) { if (id === i) {
@ -53,8 +56,8 @@ const ViewForm = () => {
}; };
async function saveAnswers() { async function saveAnswers() {
console.log(answers)
const response = await saveAnswersApi(cookies.token, formId, answers); const response = await saveAnswersApi(cookies.token, formId, answers);
console.log(response)
if (response.status === 200) { if (response.status === 200) {
setAnswersList([...answersList, { setAnswersList([...answersList, {

12
src/router/protectedRouting.js
View File

@ -5,10 +5,10 @@ const protectedUrl = {
"/profile" "/profile"
], ],
Authorized: [ Authorized: [
"/enter" "enter"
], ],
notRights: [ notRights: [
"/forms"
] ]
} }
@ -16,14 +16,6 @@ function globalRender(url, user, navigate) {
if (!user && protectedUrl.notAuthorized.some(item => item === url)) { if (!user && protectedUrl.notAuthorized.some(item => item === url)) {
navigate("/enter") navigate("/enter")
} }
else if (user && protectedUrl.Authorized.some(item => item === url)) {
navigate("/")
}
else if (user && protectedUrl.notRights.some(item => item === url)) {
if (!user.is_admin) {
navigate("/")
}
}
} }
export { globalRender } export { globalRender }