Merge pull request #48 from dwm-2023-2/release/1.0.0

Release/1.0.0
dwm-2023-2 · Dec 8, 2023 · f5c546b · f5c546b
2 parents f9e4168 + e61c4be
commit f5c546b
Show file tree

Hide file tree

Showing 17 changed files with 813 additions and 212 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,17 +17,20 @@
     "@mui/material": "^5.14.15",
     "axios": "^1.5.1",
     "date-fns": "^2.30.0",
+    "dompurify": "^3.0.6",
     "dotenv": "^16.3.1",
     "localforage": "^1.10.0",
     "match-sorter": "^6.3.1",
     "quill": "^1.3.7",
+    "quill-image-uploader": "^1.3.0",
     "react": "^18.2.0",
     "react-burger-menu": "^3.0.9",
     "react-dom": "^18.2.0",
     "react-quill": "^2.0.0",
     "react-quill-image-uploader": "^0.1.1",
     "react-router-dom": "^6.16.0",
     "sort-by": "^1.2.0",
+    "sweetalert2": "^11.10.1",
     "zustand": "^4.4.4"
   },
   "devDependencies": {

diff --git a/src/layout/MenuButtons.jsx b/src/layout/MenuButtons.jsx
@@ -11,9 +11,11 @@ export const MenuButtons = () => {
   const navigate = useNavigate();
 
   const submitLogOut = () => {
+    console.log("essa porra funciona?");
     api
       .get(`/users/logout/`)
       .then((response) => {
+        console.log("essa porra funciona?");
         navigate("/");
         setuserStore(false);
         localStorage.clear();

diff --git a/src/main.jsx b/src/main.jsx
@@ -7,6 +7,9 @@ import { CreateDiary } from "./pages/CreateDiary";
 import { CreateANote } from "./pages/CreateANote";
 import { Profile } from "./pages/Profile";
 import { DiaryPage } from "./pages/DiaryPage";
+import { RegDiaryPage } from "./pages/RegDiaryPage";
+import { EditDiary } from "./pages/EditDiary";
+import { EditRegDiary } from "./pages/EditRegDiary";
 import "./index.css";
 
 const container = document.getElementById("root");
@@ -22,6 +25,9 @@ root.render(
       <Route exact path="/create-diary" element={<CreateDiary />} />
       <Route exact path="/diary/:param1" element={<DiaryPage />} />
       <Route exact path="/create-note" element={<CreateANote />} />
+      <Route exact path="/reg_diary/:param1" element={<RegDiaryPage />} />
+      <Route exact path="/edit_diary/:param1" element={<EditDiary />} />
+      <Route exact path="/edit_reg_diary/:param1" element={<EditRegDiary />} />
     </Routes>
   </Router>
 );
diff --git a/src/pages/CreateANote.jsx b/src/pages/CreateANote.jsx
@@ -1,9 +1,7 @@
-import React, { Component } from "react";
 import { Header } from "../layout/Header";
 import { Section } from "../layout/Section";
 import { Footer } from "../layout/Footer";
-import { Link, useNavigate } from "react-router-dom";
-import { userInfoStore } from "../stores/userInfo";
+import { useNavigate } from "react-router-dom";
 import ReactQuill from "react-quill";
 import "react-quill/dist/quill.snow.css";
 import api from "../services/api";
@@ -23,11 +21,9 @@ import { diarioStore } from "../stores/diarioStore";
 
 export const CreateANote = () => {
   const title = useRef({});
-  const content = useRef({});
   const [status, setStatus] = useState("Privado");
   const [value, setValue] = useState("");
   const [isValidFields, setIsValidFields] = useState(false);
-  const userInfoState = userInfoStore((state) => state.userInfo);
   const diarioId = diarioStore((state) => state.diarioId);
 
   const theme = useTheme();
@@ -64,21 +60,24 @@ export const CreateANote = () => {
     };
 
     api
-      .post("/diarios/diario", {
+      .post("/registrosdiario/registroDiario", {
         tituloRegistro: title.current.value,
-        conteudoRegistro: content.current.value,
+        conteudoRegistro: value,
         privacidade: status,
-        userId: userInfoState.id,
-        diarioAssociadoID: diarioId,
+        diarioId: diarioId,
+      })
+      .then((response) => {
+        console.log(response);
+        navigate(`/diary/${diarioId}`);
       })
-      .then((response) => {})
       .catch((err) => {
         console.error("ops! ocorreu um erro" + err);
       });
-    navigate(`/diary/${diarioId}`);
-    // console.log(payload);
+    console.log(payload);
   };
 
+  console.log("diarioId: ", diarioId);
+
   return (
     <div>
       <Header></Header>
@@ -97,34 +96,38 @@ export const CreateANote = () => {
             Create a Note
           </Typography>
           <div className={styles.forms_box}>
-            <TextField
-              id="title"
-              label="Title"
-              variant="outlined"
-              size="medium"
-              fullWidth
-              onChange={handleTitleChange}
-            />
+            <div className={styles.forms_box__row}>
+              <TextField
+                id="title"
+                label="Title"
+                variant="outlined"
+                size="medium"
+                fullWidth
+                onChange={handleTitleChange}
+              />
+              <FormControl fullWidth>
+                <InputLabel id="demo-simple-select-label">Status</InputLabel>
+                <Select
+                  labelId="demo-simple-select-label"
+                  id="demo-simple-select"
+                  value={status}
+                  label="Status"
+                  fullWidth
+                  onChange={handleChange}
+                >
+                  <MenuItem value={"Público"}>Public</MenuItem>
+                  <MenuItem value={"Privado"}>Private</MenuItem>
+                  <MenuItem value={"Compartilhado"}>Shared</MenuItem>
+                </Select>
+              </FormControl>
+            </div>
             <ReactQuill
+              image={true}
+              className={styles.react_quill}
               theme="snow"
               value={value}
               onChange={handleContentChange}
             />
-            <FormControl fullWidth>
-              <InputLabel id="demo-simple-select-label">Status</InputLabel>
-              <Select
-                labelId="demo-simple-select-label"
-                id="demo-simple-select"
-                value={status}
-                label="Status"
-                fullWidth
-                onChange={handleChange}
-              >
-                <MenuItem value={"Público"}>Public</MenuItem>
-                <MenuItem value={"Privado"}>Private</MenuItem>
-                <MenuItem value={"Compartilhado"}>Shared</MenuItem>
-              </Select>
-            </FormControl>
             <Button
               onClick={submit}
               variant="contained"

diff --git a/src/pages/CreateDiary.jsx b/src/pages/CreateDiary.jsx
@@ -1,7 +1,7 @@
 import { Header } from "../layout/Header";
 import { Section } from "../layout/Section";
 import { Footer } from "../layout/Footer";
-import { Link, useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import api from "../services/api";
 import { userInfoStore } from "../stores/userInfo";
 import {
@@ -35,7 +35,6 @@ export const CreateDiary = () => {
   const theme = useTheme();
 
   const navigate = useNavigate();
-  const handleClick = () => navigate("/");
 
   const handleTitleChange = (event) => {
     title.current.value = event.target.value;
@@ -61,32 +60,19 @@ export const CreateDiary = () => {
 
   const submit = (ev) => {
     ev.preventDefault();
-    const payload = {
-      title: title.current.value,
-      description: description.current.value,
-      status: status,
-    };
     api
       .post("/diarios/diario", {
         diarioNome: title.current.value,
         diarioDescricao: description.current.value,
         privacidade: status,
         userId: userId,
       })
-      .then((response) => navigate("/"))
+      .then(() => navigate("/"))
       .catch((err) => {
         console.error("ops! ocorreu um erro" + err);
       });
-    // console.log(payload);
   };
 
-  const payload = {
-    title: title.current.value,
-    description: description.current.value,
-    status: status,
-  };
-  // console.log(payload);
-
   return (
     <div>
       <Header></Header>