apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #151 from apuc/registration

Browse Source 
Registration
This commit is contained in:
NikoM1k
2023-11-19 20:02:23 +03:00
committed by GitHub
parent ecfb59e4e7 e61cb35f8e
commit 67f3f3b437
14 changed files with 237 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
src/components/Modal/ModalRegistration/ModalRegistration.jsx
View File

@ -20,6 +20,12 @@ export const ModalRegistration = ({ active, setActive }) => {
password: "",
});
const [inputsError, setInputsError] = useState({
name: false,
email: false,
password: false,
});
const validateEmail = (email) => {
// регулярное выражение для проверки email
const re = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
@ -37,20 +43,29 @@ export const ModalRegistration = ({ active, setActive }) => {
};
const { showNotification } = useNotification();
const submitHandler = () => {
if (!inputsValue.password || !inputsValue.userName || !inputsValue.email) {
return showNotification({
show: true,
text: "Введите коректные данные",
type: "error",
});
const validateForm = () => {
if (inputsValue.password.length < 6) {
setInputsError((prevValue) => ({ ...prevValue, password: true }));
}
if (inputsValue.userName.length < 6) {
setInputsError((prevValue) => ({ ...prevValue, name: true }));
}
if (!validateEmail(inputsValue.email)) {
return showNotification({
show: true,
text: "Введите коректный email",
type: "error",
});
setInputsError((prevValue) => ({ ...prevValue, email: true }));
}
if (
inputsValue.password.length < 6 ||
inputsValue.userName.length < 6 ||
!validateEmail(inputsValue.email)
) {
return true;
}
};
const submitHandler = () => {
if (validateForm()) {
return;
}
apiRequest("/register/sign-up", {
method: "POST",
@ -90,43 +105,70 @@ export const ModalRegistration = ({ active, setActive }) => {
<div className="input-body">
<div className="input-body__box">
<h5>Ваше имя</h5>
<input
onChange={(e) =>
setInputsValue((prevValue) => ({
...prevValue,
userName: e.target.value,
}))
}
placeholder="Name"
/>
<h5>E-mail</h5>
<input
type="email"
onChange={(e) =>
setInputsValue((prevValue) => ({
...prevValue,
email: e.target.value,
}))
}
placeholder="Email"
/>
<div className="inputContainer">
<h5>Ваше имя</h5>
<input
className={inputsError.name ? "error" : ""}
onChange={(e) => {
setInputsError({
name: false,
email: false,
password: false,
});
setInputsValue((prevValue) => ({
...prevValue,
userName: e.target.value,
}));
}}
placeholder="Name"
/>
{inputsError.name && <span>Минимум 6 символов</span>}
</div>
<div className="inputContainer">
<h5>E-mail</h5>
<input
type="email"
className={inputsError.email ? "error" : ""}
onChange={(e) => {
setInputsError({
name: false,
email: false,
password: false,
});
setInputsValue((prevValue) => ({
...prevValue,
email: e.target.value,
}));
}}
placeholder="Email"
/>
{inputsError.email && <span>Введите коректный email</span>}
</div>
</div>
<div className="input-body__box">
{/*<h5>Название компании</h5>*/}
{/*<input></input>*/}
<h5>Пароль</h5>
<input
type="password"
onChange={(e) =>
setInputsValue((prevValue) => ({
...prevValue,
password: e.target.value,
}))
}
placeholder="Password"
/>
<div className="inputContainer">
<h5>Пароль</h5>
<input
className={inputsError.password ? "error" : ""}
type="password"
onChange={(e) => {
setInputsError({
name: false,
email: false,
password: false,
});
setInputsValue((prevValue) => ({
...prevValue,
password: e.target.value,
}));
}}
placeholder="Password"
/>
{inputsError.password && <span>Минимум 6 символов</span>}
</div>
</div>
</div>
<div className="button-box">

17
src/components/Modal/ModalRegistration/modalRegistration.scss
View File

@ -59,9 +59,24 @@
background: #eff2f7;
border-radius: 8px;
border: none;
margin-bottom: 35px;
margin-bottom: 5px;
padding-left: 20px;
}
.inputContainer {
height: 81px;
margin-bottom: 10px;
max-width: 294px;
}
span {
color: red;
font-size: 12px;
}
.error {
border: 1px solid red;
}
}
}

2
src/components/Modal/ModalSelect/modalSelect.scss
View File

@ -5,7 +5,7 @@
background: #e1fccf;
border-radius: 12px;
transform: scale(0);
bottom: -90px;
bottom: -40px;
right: -120px;
@media (max-width: 1050px) {

53
src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
View File

@ -80,7 +80,7 @@ export const ModalTiсket = ({
const [users, setUsers] = useState([]);
const [timerStart, setTimerStart] = useState(false);
const [timerInfo, setTimerInfo] = useState({});
const [uploadedFile, setUploadedFile] = useState(null);
// const [uploadedFile, setUploadedFile] = useState(null);
const [currentTimerCount, setCurrentTimerCount] = useState({
hours: 0,
minute: 0,
@ -379,25 +379,26 @@ export const ModalTiсket = ({
const data = await res.json();
setUploadedFile(data);
// setUploadedFile(data);
attachFile(data[0].id);
}
function deleteLoadedFile() {
setUploadedFile(null);
}
// function deleteLoadedFile() {
// setUploadedFile(null);
// }
function attachFile() {
function attachFile(id) {
apiRequest("/file/attach", {
method: "POST",
data: {
file_id: uploadedFile[0].id,
file_id: id,
entity_type: 2,
entity_id: task.id,
status: 1,
},
}).then((res) => {
setTaskFiles((prevValue) => [...prevValue, res]);
setUploadedFile(null);
// setUploadedFile(null);
});
}
@ -636,24 +637,24 @@ export const ModalTiсket = ({
})}
</div>
)}
{uploadedFile && (
<div className="fileLoaded">
{uploadedFile.map((file) => {
return (
<div className="loadedFile" key={file.id}>
<img src={backendImg(file.url)} alt="img" key={file.id} />
<div
className="deleteFile"
onClick={() => deleteLoadedFile(file)}
>
<img src={close} alt="delete" />
</div>
</div>
);
})}
<button onClick={attachFile}>Загрузить</button>
</div>
)}
{/*{uploadedFile && (*/}
{/* <div className="fileLoaded">*/}
{/* {uploadedFile.map((file) => {*/}
{/* return (*/}
{/* <div className="loadedFile" key={file.id}>*/}
{/* <img src={backendImg(file.url)} alt="img" key={file.id} />*/}
{/* <div*/}
{/* className="deleteFile"*/}
{/* onClick={() => deleteLoadedFile(file)}*/}
{/* >*/}
{/* <img src={close} alt="delete" />*/}
{/* </div>*/}
{/* </div>*/}
{/* );*/}
{/* })}*/}
{/* <button onClick={attachFile}>Загрузить</button>*/}
{/* </div>*/}
{/*)}*/}
<div className="content__communication">
{/*<p className="tasks">*/}
{/* <button*/}

16
src/components/Modal/Tracker/ModalTicket/modalTicket.scss
View File

@ -360,24 +360,8 @@
column-gap: 25px;
row-gap: 20px;
margin-top: 33px;
max-height: 170px;
overflow-y: auto;
&::-webkit-scrollbar {
width: 5px;
border-radius: 10px;
}
&::-webkit-scrollbar-thumb {
background: #cbd9f9;
border-radius: 20px;
}
&::-webkit-scrollbar-track {
background: #c5c0c6;
border-radius: 20px;
}
.taskFile {
cursor: pointer;
position: relative;

52
src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
View File

@ -29,6 +29,7 @@ import { useNotification } from "@hooks/useNotification";
import { getCorrectDate } from "@components/Calendar/calendarHelper";
import { Footer } from "@components/Common/Footer/Footer";
import { Loader } from "@components/Common/Loader/Loader";
import FileTracker from "@components/FileTracker/FileTracker";
import AcceptModal from "@components/Modal/AcceptModal/AcceptModal";
import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal";
import { Navigation } from "@components/Navigation/Navigation";
@ -483,20 +484,26 @@ export const TicketFullScreen = () => {
setUploadedFile(null);
}
// function deleteFile(file) {
// apiRequest("/file/detach", {
// method: "DELETE",
// data: {
// file_id: file.id,
// entity_type: 2,
// entity_id: taskInfo.id,
// status: 0,
// },
// }).then(() => {
// setTaskFiles((prevValue) =>
// prevValue.filter((item) => item.id !== file.id)
// );
// });
// }
function deleteFile(file) {
apiRequest("/file/detach", {
method: "DELETE",
data: {
file_id: file.id,
entity_type: 2,
entity_id: taskInfo.id,
status: 0,
},
}).then(() => {
setTaskFiles((prevValue) =>
prevValue.filter((item) => item.id !== file.id)
);
});
setTaskFiles((prevValue) =>
prevValue.filter((item) => item.id !== file.id)
);
}
function closeAcceptModal() {
@ -800,19 +807,12 @@ export const TicketFullScreen = () => {
<div className="task__files filesFullScreen">
{taskFiles.map((file) => {
return (
<div className="taskFile" key={file.id}>
<img
className="imgFile"
src={backendImg(file.file?.url)}
alt="img"
/>
<div
className="deleteFile"
onClick={() => deleteFile(file)}
>
<img src={fileDelete} alt="delete" />
</div>
</div>
<FileTracker
key={file.id}
file={file}
setDeletedTask={deleteFile}
taskId={taskInfo.id}
/>
);
})}
</div>

33
src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
View File

@ -322,6 +322,7 @@ export const TrackerModal = ({
} else {
setCorrectProjectUsers(projectUsers);
}
initListeners();
}, [active]);
useEffect(() => {
@ -336,6 +337,38 @@ export const TrackerModal = ({
}
}, [taskTags, projectMarks]);
const initListeners = () => {
document.addEventListener("click", closeByClickingOut);
};
const closeByClickingOut = (event) => {
const path = event.path || (event.composedPath && event.composedPath());
if (
event &&
!path.find(
(div) =>
div.classList &&
(div.classList.contains("tags__selected__name") ||
div.classList.contains("tags__dropDown"))
)
) {
setSelectTagsOpen(false);
}
if (
event &&
!path.find(
(div) =>
div.classList &&
(div.classList.contains("select__executor") ||
div.classList.contains("select__executor__dropDown"))
)
) {
setSelectExecutorTaskOpen(false);
}
};
return (
<ModalLayout
active={active}