Merge pull request #42 from fga-eps-mds/191-ArrumarPaginasR1

(#191) - Arrumar paginas da R1

.env.dev

@@ -1 +1 @@
-PRINT_GO_API_GATEWAY_URL=http://localhost:4000
+REACT_APP_API_URL=http://localhost:4000

package.json

@@ -18,6 +18,7 @@
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.47.0",
     "react-icons": "^4.12.0",
+    "react-jwt": "^1.2.0",
     "react-router-dom": "^6.17.0",
     "react-scripts": "5.0.1",
     "react-toastify": "^9.1.3",

src/App.js

@@ -1,6 +1,6 @@
 import React from "react";
-import {BrowserRouter, Routes , Route} from "react-router-dom"
-import Home from "./pages/Home"
+import { BrowserRouter, Routes, Route } from "react-router-dom";
+import Home from "./pages/Home";
 import CreateUserPage from "./pages/CreateUser";
 import EditUserPage from "./pages/EditUser";
 import Login from "./pages/Login";
@@ -12,26 +12,39 @@ import EditPrinter from "./pages/EditPrinter";
 import PatternPrinter from "./pages/PatternPrinter";
 import EditPattern from "./pages/EditPattern";
 import PrintersList from "./pages/PrintersList";
-
+import PatternList from "./pages/PatternList";
+import ForgottenPasswordPage from "./pages/ForgottenPassword";
+import { ToastContainer } from 'react-toastify';
+import 'react-toastify/dist/ReactToastify.css';
+import RecoverPasswordPage from "./pages/RecoverPassword";
+import PrivateRoutes from "./components/utils/PrivateRoutes";
 
 function App() {
   return (
-    <BrowserRouter>
-      <Routes>
-        <Route path="/" element={<Home />} />
-        <Route path="/cadastro" element={<CreateUserPage />} />
-        <Route path="/editarusuario" element={<EditUserPage/>}/>
-        <Route path="/login" element={<Login />} />
-        <Route path="/contato" element={<Contact />} />
-        <Route path="/quemsomos" element={<AboutUs />} />
-        <Route path="/mudarsenha" element={<ChangePassword />} />
-        <Route path="/cadastroImpressora" element={<RegisterPrinter />} />
-        <Route path="/editarImpressora" element={<EditPrinter />} />
-        <Route path="/padraoImpressora" element={<PatternPrinter />} />
-        <Route path="/editarPadrao" element={<EditPattern />} />
-        <Route path="/impressorascadastradas" element={<PrintersList/>}/>
-      </Routes>
-    </BrowserRouter>
+    <>
+      <BrowserRouter>
+        <Routes>
+          <Route element={<PrivateRoutes />}>
+            <Route path="/cadastro" element={<CreateUserPage />} />
+            <Route path="/editarusuario" element={<EditUserPage/>}/>
+            <Route path="/mudarsenha" element={<ChangePassword />} />
+            <Route path="/cadastroimpressora" element={<RegisterPrinter />} />
+            <Route path="/editarimpressora" element={<EditPrinter />} />
+            <Route path="/padraoimpressora" element={<PatternPrinter />} />
+            <Route path="/editarpadrao" element={<EditPattern />} />
+            <Route path="/impressorascadastradas" element={<PrintersList />} />
+            <Route path="/listapadroes" element={<PatternList />} />
+          </Route>
+          <Route path="/login" element={<Login />} />
+          <Route path="/" element={<Home />} />
+          <Route path="/contato" element={<Contact />} />
+          <Route path="/quemsomos" element={<AboutUs />} />
+          <Route path="/recuperarSenha" element={<RecoverPasswordPage/>} />
+          <Route path="/esqueciMinhaSenha" element={<ForgottenPasswordPage />} />
+        </Routes>
+      </BrowserRouter>
+      <ToastContainer />
+    </>
   );
 }
 

src/api/api.js

@@ -15,23 +15,18 @@ export async function login(email, password) {
   }
 }
 
-export async function changePassword(newPassword, newPasswordConfirmation) {
+export async function changePassword(data) {
   const token = localStorage.getItem('jwt')
 
   const headers = {
     'Authorization': token
   }
 
-  const data = {
-    novaSenha: newPassword,
-    confirmacaoNovaSenha: newPasswordConfirmation,
-  }
-
   try {
       const response = await api.post('/user/change-password', data, {headers});
       return response;
   } catch(error) {
     console.log('Erro ao trocar de senha', error)
     return {type: 'error', error}; 
   }
-}
+}

src/components/forms/EditPrinterForm.js

@@ -4,6 +4,7 @@ import { yupResolver } from "@hookform/resolvers/yup";
 import "../../style/components/editPrinterForms.css";
 import elipse6 from '../../assets/elipse6.svg';
 import { getPrinterSchema } from "../utils/YupSchema";
+import { Link } from "react-router-dom";
 
 const fieldLabels = {
   padrao: 'Padrão',
@@ -56,9 +57,11 @@ export default function EditPrinterForm() {
 
   return (
     <div id="editPrinter-card">
-      <div id="buttons">
-        <button className="form-button" type="button" id="voltar-bnt">Voltar</button>
-      </div>
+
+      <Link id="link-back" to="/impressorascadastradas"> 
+
+      Voltar</Link>
+
       <header id="form-header">
         Editar impressora
       </header>