From b4963660f44ad0bd7102a1ad0317a5c7aa5ca6ac Mon Sep 17 00:00:00 2001 From: thekidisalright Date: Tue, 7 May 2024 17:38:00 -0300 Subject: [PATCH 01/55] Revert "Merge branch 'develop' into mongo" This reverts commit d68eb7a61b87e5e6e4ad053e607bd8a5696d45d9, reversing changes made to e4108048427bb0a9630beb88981c21c7bc710c99. --- .gitignore | 4 + app/package-lock.json | 65 +- app/package.json | 4 +- app/src/components/LoginPage.jsx | 5 +- .../app/{cards => }/PageCard.module.css | 0 .../components/app/{cards => }/PageCards.jsx | 4 +- app/src/components/app/PageNotes.jsx | 0 app/src/components/app/PageTasks.jsx | 180 ++ .../app/{tasks => }/PageTasks.module.css | 0 app/src/components/app/markdown/Markdown.jsx | 74 +- app/src/components/app/markdown/MdEditor.jsx | 7 +- app/src/components/app/pomo/BackButton.jsx | 13 - app/src/components/app/pomo/PagePomo.jsx | 35 - .../components/app/pomo/PagePomo.module.css | 32 - app/src/components/app/pomo/PauseButton.jsx | 20 - app/src/components/app/pomo/PlayButton.jsx | 20 - app/src/components/app/pomo/Settings.jsx | 41 - .../components/app/pomo/SettingsButton.jsx | 20 - .../components/app/pomo/SettingsContext.jsx | 5 - app/src/components/app/pomo/Slider.module.css | 22 - app/src/components/app/pomo/Timer.jsx | 90 - app/src/components/app/tasks/PageTasks.jsx | 0 app/src/index.css | 12 +- app/src/main.jsx | 9 +- app/yarn.lock | 2427 ----------------- backend/controllers/loginController.js | 20 + backend/package-lock.json | 1334 +++++++++ backend/package.json | 25 + backend/routes/login.js | 8 + package-lock.json | 126 - package.json | 8 - 31 files changed, 1654 insertions(+), 2956 deletions(-) rename app/src/components/app/{cards => }/PageCard.module.css (100%) rename app/src/components/app/{cards => }/PageCards.jsx (97%) delete mode 100644 app/src/components/app/PageNotes.jsx create mode 100644 app/src/components/app/PageTasks.jsx rename app/src/components/app/{tasks => }/PageTasks.module.css (100%) delete mode 100644 app/src/components/app/pomo/BackButton.jsx delete mode 100644 app/src/components/app/pomo/PagePomo.jsx delete mode 100644 app/src/components/app/pomo/PagePomo.module.css delete mode 100644 app/src/components/app/pomo/PauseButton.jsx delete mode 100644 app/src/components/app/pomo/PlayButton.jsx delete mode 100644 app/src/components/app/pomo/Settings.jsx delete mode 100644 app/src/components/app/pomo/SettingsButton.jsx delete mode 100644 app/src/components/app/pomo/SettingsContext.jsx delete mode 100644 app/src/components/app/pomo/Slider.module.css delete mode 100644 app/src/components/app/pomo/Timer.jsx delete mode 100644 app/src/components/app/tasks/PageTasks.jsx delete mode 100644 app/yarn.lock create mode 100644 backend/controllers/loginController.js create mode 100644 backend/package-lock.json create mode 100644 backend/package.json create mode 100644 backend/routes/login.js delete mode 100644 package-lock.json delete mode 100644 package.json diff --git a/.gitignore b/.gitignore index 45b9b19..c7f34ac 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,11 @@ pnpm-debug.log* lerna-debug.log* node_modules +package.json +package-lock.json app/node_modules +backend/node_modules +backend/.env dist dist-ssr *.local diff --git a/app/package-lock.json b/app/package-lock.json index 0ec29d2..85e7364 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -28,11 +28,9 @@ "marked": "^12.0.1", "react": "^18.2.0", "react-bootstrap": "^2.10.2", - "react-circular-progressbar": "^2.1.0", "react-dom": "^18.2.0", "react-router-dom": "^6.22.3", - "react-select": "^5.8.0", - "react-slider": "^2.0.6" + "react-select": "^5.8.0" }, "devDependencies": { "@types/react": "^18.2.64", @@ -2083,6 +2081,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "node_modules/available-typed-arrays": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", @@ -2288,8 +2291,7 @@ "node_modules/color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" }, "node_modules/combined-stream": { "version": "1.0.8", @@ -2461,6 +2463,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/dequal": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", @@ -3111,6 +3121,25 @@ "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, + "node_modules/follow-redirects": { + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/for-each": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", @@ -3120,6 +3149,19 @@ "is-callable": "^1.1.3" } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -4370,6 +4412,11 @@ "react": ">=0.14.0" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -4439,14 +4486,6 @@ } } }, - "node_modules/react-circular-progressbar": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/react-circular-progressbar/-/react-circular-progressbar-2.1.0.tgz", - "integrity": "sha512-xp4THTrod4aLpGy68FX/k1Q3nzrfHUjUe5v6FsdwXBl3YVMwgeXYQKDrku7n/D6qsJA9CuunarAboC2xCiKs1g==", - "peerDependencies": { - "react": "^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0" - } - }, "node_modules/react-dom": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", diff --git a/app/package.json b/app/package.json index da98bd2..8d0edb9 100644 --- a/app/package.json +++ b/app/package.json @@ -30,11 +30,9 @@ "marked": "^12.0.1", "react": "^18.2.0", "react-bootstrap": "^2.10.2", - "react-circular-progressbar": "^2.1.0", "react-dom": "^18.2.0", "react-router-dom": "^6.22.3", - "react-select": "^5.8.0", - "react-slider": "^2.0.6" + "react-select": "^5.8.0" }, "devDependencies": { "@types/react": "^18.2.64", diff --git a/app/src/components/LoginPage.jsx b/app/src/components/LoginPage.jsx index a2f3da4..c0dcb13 100644 --- a/app/src/components/LoginPage.jsx +++ b/app/src/components/LoginPage.jsx @@ -1,4 +1,4 @@ -import React from "react"; +import { useState } from "react"; import style from "./LoginPage.module.css"; import astronauta from "../assets/astronauta.svg"; import PropTypes from "prop-types"; @@ -168,7 +168,8 @@ const LoginPage = ({ acao }) => { Entrar

- Ainda não possui uma conta? Cadastre-se + Ainda não possui uma conta?{" "} + Cadastre-se

diff --git a/app/src/components/app/cards/PageCard.module.css b/app/src/components/app/PageCard.module.css similarity index 100% rename from app/src/components/app/cards/PageCard.module.css rename to app/src/components/app/PageCard.module.css diff --git a/app/src/components/app/cards/PageCards.jsx b/app/src/components/app/PageCards.jsx similarity index 97% rename from app/src/components/app/cards/PageCards.jsx rename to app/src/components/app/PageCards.jsx index 90feb2b..7da9b8f 100644 --- a/app/src/components/app/cards/PageCards.jsx +++ b/app/src/components/app/PageCards.jsx @@ -1,7 +1,7 @@ -import { useState } from "react"; +import React, { useState } from "react"; import style from "./PageCard.module.css"; import { UilBox, UilEdit } from "@iconscout/react-unicons"; -import logo from "../../../assets/logo-cinza.png"; +import logo from "../../assets/logo-cinza.png"; function PageCard() { const [selectedCard, setSelectedCard] = useState(1); diff --git a/app/src/components/app/PageNotes.jsx b/app/src/components/app/PageNotes.jsx deleted file mode 100644 index e69de29..0000000 diff --git a/app/src/components/app/PageTasks.jsx b/app/src/components/app/PageTasks.jsx new file mode 100644 index 0000000..1de7fe5 --- /dev/null +++ b/app/src/components/app/PageTasks.jsx @@ -0,0 +1,180 @@ +import { useState, useEffect } from "react"; +import SecSidebar from "./SecSidebar"; +import style from "./PageTasks.module.css"; +import { + UilArrowToRight, + UilLeftArrowToLeft, + UilSlidersV, + UilGrid, + UilAngleDown, + UilCircle, + UilInbox, +} from "@iconscout/react-unicons"; +import { useListaContext } from "../../hooks/useListaContext"; +import { useTaskContext } from "../../hooks/useTaskContext"; +import Tarefa from "./tarefas/Tarefa"; +import ContainerTask from "./tarefas/ContainerTask"; +import { useParams } from "react-router-dom"; + +const PageTasks = ({ tipo }) => { + const [sidebar, setSidebar] = useState(true); + const [tarefaSelecionada, setTarefaSelecionada] = useState(null); + const { listas, dispatch: dispatchListas } = useListaContext(); + const { dispatch: dispatchTasks } = useTaskContext(); + const { idLista } = useParams(); + const [lista, setLista] = useState(null); + const [tipoNome, setTipoNome] = useState(null); + + const concluirTarefa = async (id) => { + const response = await fetch(`http://localhost:4000/api/tasks/${id}`, { + method: "PUT", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify({ + status: "Concluída", + }), + }); + if (response.ok) { + const data = await response.json(); + dispatchTasks({ type: "REMOVE_TASK", payload: data }); + } else { + console.log("Erro ao concluir tarefa"); + } + } + + useEffect(() => { + const user = JSON.parse(localStorage.getItem("user")); + + const fetchTasks = async () => { + const response = await fetch( + `http://localhost:4000/api/tasks/${user._id}?list=${tipo}&idLista=${idLista} `, + { + method: "GET", + headers: { + "Content-Type": "application/json", + }, + } + ); + const data = await response.json(); + if (response.ok) { + if (listas) { + const tasksNomeLista = data.map((task) => { + const lista = listas.find((lista) => lista._id === task.lista); + return { + ...task, + nomeLista: lista.nome, + corLista: lista.cor, + emojiLista: lista.emoji, + }; + }); + dispatchTasks({ type: "SET_TASKS", payload: tasksNomeLista }); + } else { + console.log("Erro ao buscar listas no fetchTasks de PageTasks"); + } + } else { + console.log("Erro ao buscar tarefas"); + } + }; + + const fetchLista = async () => { + const response = await fetch( + `http://localhost:4000/api/listas/unica/${idLista}`, + { + method: "GET", + headers: { + "Content-Type": "application/json", + }, + } + ); + const data = await response.json(); + if (response.ok) { + setLista(data); + } else { + console.log("Erro ao buscar listas"); + } + }; + + fetchTasks(); + if (idLista) { + fetchLista(); + } + + switch (tipo) { + case "hoje": + setTipoNome("Hoje"); + break; + case "entrada": + setTipoNome("Entrada"); + break; + case "concluidas": + setTipoNome("Concluídas"); + break; + case "atrasadas": + setTipoNome("Atrasadas"); + break; + case "excluidas": + setTipoNome("Excluídas"); + break; + default: + setTipoNome(null); + break; + } + }, [tipo, dispatchTasks, listas, idLista, setLista]); + + const { tasks } = useTaskContext(); + + return ( + <> + +
+
+
+ {sidebar ? ( + setSidebar(false)} + /> + ) : ( + setSidebar(true)} + /> + )} +

+ {tipoNome ? tipoNome : lista ? lista.nome : "Tarefas"} +

+
+
+ + +
+
+
+ {tasks && + tasks.map((task) => ( + + ))} +
+
+ {tarefaSelecionada && ( + + )} + + ); +}; + +export default PageTasks; diff --git a/app/src/components/app/tasks/PageTasks.module.css b/app/src/components/app/PageTasks.module.css similarity index 100% rename from app/src/components/app/tasks/PageTasks.module.css rename to app/src/components/app/PageTasks.module.css diff --git a/app/src/components/app/markdown/Markdown.jsx b/app/src/components/app/markdown/Markdown.jsx index 70f39b8..b187f80 100644 --- a/app/src/components/app/markdown/Markdown.jsx +++ b/app/src/components/app/markdown/Markdown.jsx @@ -1,4 +1,4 @@ -import { useState, useRef } from "react"; +import { useState } from "react"; import style from "./Markdown.module.css"; import { UilBold, @@ -9,7 +9,6 @@ import { UilCheckSquare, UilCommentAlt, UilArrow, - UilFileDownload, } from "@iconscout/react-unicons"; import MdEditor from "./MdEditor"; import MdPreview from "./MdPreview"; @@ -18,80 +17,27 @@ const Markdown = () => { const storedMarkdown = localStorage.getItem("MARKDOWN"); const [markdown, setMarkdown] = useState(storedMarkdown ? storedMarkdown : "# Olá, mundo!"); - const textAreaRef = useRef(null); const callback = (markdown) => { setMarkdown(markdown); localStorage.setItem("MARKDOWN", markdown); } - const insertTag = (start, end) => { - const textArea = textAreaRef.current; - const startPos = textArea.selectionStart; - const endPos = textArea.selectionEnd; - const text = textArea.value; - - const newText = text.substring(0, startPos) + start + text.substring(startPos, endPos) + end + text.substring(endPos); - - setMarkdown(newText); - - textArea.selectionStart = startPos + start.length; - textArea.selectionEnd = endPos + start.length; - } - - const bold = () => { - insertTag("**", "**"); - } - const italic = () => { - insertTag("_", "_"); - } - const size = () => { - insertTag("# ", ""); - } - const listUl = () => { - insertTag("- ", ""); - } - const listOl = () => { - insertTag("1. ", ""); - } - const checkSquare = () => { - insertTag("- [ ] ", ""); - } - const quoteBlock = () => { - insertTag("\n> ", ""); - } - const codeBlock = () => { - insertTag('\n```\n', '\n```\n'); - } - - const gerarArquivo = () => { - const blob = new Blob([markdown], { type: "text/markdown" }); - const url = URL.createObjectURL(blob); - const link = document.createElement("a"); - link.href = url; - link.download = "arquivo.md"; - document.body.appendChild(link); - link.click(); - document.body.removeChild(link); - URL.revokeObjectURL(url); - } - return (
- - - - - - - - - + + + + + + + +
- +
); diff --git a/app/src/components/app/markdown/MdEditor.jsx b/app/src/components/app/markdown/MdEditor.jsx index 22b11dd..2d67544 100644 --- a/app/src/components/app/markdown/MdEditor.jsx +++ b/app/src/components/app/markdown/MdEditor.jsx @@ -1,10 +1,10 @@ -import { useRef } from 'react' +import React from 'react' import PropTypes from 'prop-types' -const MdEditor = ({style, markdown, setMarkdown, textAreaRef}) => { +const MdEditor = ({style, markdown, setMarkdown}) => { return (
-