fixes #8

Merged
nik.polishuk merged 2 commits from fixes into main 2024-01-12 19:12:53 +03:00
4 changed files with 30 additions and 8 deletions
Showing only changes of commit d08b6e9be8 - Show all commits

View File

@ -44,7 +44,11 @@ const AllTaskTableItem = ({ task, projects }) => {
</div> </div>
</td> </td>
<td> <td>
{new Date(task.timers.reduce((acc, cur) => acc + cur.deltaSeconds, 0) * 1000).toISOString().slice(11, 19)} {new Date(
task.timers.reduce((acc, cur) => acc + cur.deltaSeconds, 0) * 1000
)
.toISOString()
.slice(11, 19)}
</td> </td>
<td>{new Date(task.created_at).toLocaleDateString()}</td> <td>{new Date(task.created_at).toLocaleDateString()}</td>
<td>{new Date(task.dead_line).toLocaleDateString()}</td> <td>{new Date(task.dead_line).toLocaleDateString()}</td>

View File

@ -18,7 +18,11 @@ const ArchiveTasksItem = ({ task, index }) => {
</td> </td>
<td className="archive__completeTask__time"> <td className="archive__completeTask__time">
<p> <p>
{new Date(task.timers.reduce((acc, cur) => acc + cur.deltaSeconds, 0) * 1000).toISOString().slice(11, 19)} {new Date(
task.timers.reduce((acc, cur) => acc + cur.deltaSeconds, 0) * 1000
)
.toISOString()
.slice(11, 19)}
</p> </p>
</td> </td>
<td className="archive__completeTask__info"> <td className="archive__completeTask__info">

View File

@ -16,7 +16,12 @@ export const ModalTrackerRegistration = ({ setModalReset, email }) => {
для активации вашего аккаунта на почту для активации вашего аккаунта на почту
<br /> <span>{email}</span> <br /> <span>{email}</span>
</p> </p>
<button onClick={() => setModalReset(false)} className="modalConfirmTracker__btn">Понятно</button> <button
onClick={() => setModalReset(false)}
className="modalConfirmTracker__btn"
>
Понятно
</button>
<img <img
onClick={() => setModalReset(false)} onClick={() => setModalReset(false)}
src={close} src={close}

View File

@ -15,8 +15,8 @@ import "./trackerRegistration.scss";
export const TrackerRegistration = () => { export const TrackerRegistration = () => {
const [modalConfirmOpen, setModalConfirm] = useState(false); const [modalConfirmOpen, setModalConfirm] = useState(false);
const [inputs, setInputs] = useState({ const [inputs, setInputs] = useState({
email: '' email: ""
}) });
return ( return (
<div className="trackerRegistration"> <div className="trackerRegistration">
@ -41,8 +41,14 @@ export const TrackerRegistration = () => {
<span>Ваш e-mail</span> <span>Ваш e-mail</span>
<input <input
placeholder="E-mail" placeholder="E-mail"
onChange={(e) => setInputs((prevState) => ({...prevState, email:e.target.value }))} onChange={(e) =>
type="email" /> setInputs((prevState) => ({
...prevState,
email: e.target.value
}))
}
type="email"
/>
</div> </div>
<div className="trackerRegistration__inputContainer"> <div className="trackerRegistration__inputContainer">
<span>Придумайте пароль</span> <span>Придумайте пароль</span>
@ -72,7 +78,10 @@ export const TrackerRegistration = () => {
</div> </div>
{modalConfirmOpen && ( {modalConfirmOpen && (
<ModalLayout active={modalConfirmOpen} setActive={setModalConfirm}> <ModalLayout active={modalConfirmOpen} setActive={setModalConfirm}>
<ModalTrackerRegistration setModalReset={setModalConfirm} email={inputs.email} /> <ModalTrackerRegistration
setModalReset={setModalConfirm}
email={inputs.email}
/>
</ModalLayout> </ModalLayout>
)} )}
<Footer /> <Footer />