Merge pull request #70 from fga-eps-mds/feature/55-dashboard

Feature/55 dashboard
fga-eps-mds · Sep 4, 2024 · f1f0d45 · f1f0d45
2 parents 2ed7d06 + 22df15d
commit f1f0d45
Show file tree

Hide file tree

Showing 12 changed files with 2,066 additions and 611 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
   "private": true,
   "dependencies": {
     "@emailjs/browser": "^3.11.0",
+    "@fortawesome/fontawesome-free": "^6.6.0",
     "@hookform/resolvers": "^3.3.2",
     "@radix-ui/react-icons": "^1.3.0",
     "@testing-library/jest-dom": "^5.17.0",
@@ -13,6 +14,9 @@
     "body-parser": "^1.20.2",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
+    "html2canvas": "^1.4.1",
+    "jspdf": "^2.5.1",
+    "jspdf-autotable": "^3.8.3",
     "papaparse": "^5.4.1",
     "pg": "^8.11.3",
     "react": "^18.2.0",
@@ -23,6 +27,7 @@
     "react-router-dom": "^6.17.0",
     "react-scripts": "5.0.1",
     "react-toastify": "^9.1.3",
+    "recharts": "^2.12.7",
     "shelljs": "^0.8.5",
     "web-vitals": "^2.1.4",
     "yup": "^1.3.2"

diff --git a/src/App.js b/src/App.js
@@ -25,7 +25,7 @@ import ViewContract from "./pages/ViewContract";
 import UpdateRoutine from "./components/forms/CounterRoutineForm";
 import AuditPrinter from "./pages/AuditPrinter";
 import AddContador from "./pages/AddContador";
-
+import Dashboard from "./pages/Dashboard";
 function App() {
   return (
     <>
@@ -47,6 +47,7 @@ function App() {
             <Route path="/editarContrato" element={<EditContractForm />} />
             <Route path="/listagemContrato" element={<ContractList />} />
             <Route path="/definirRotina" element={<UpdateRoutine />} />
+            <Route path="/dashboard" element={<Dashboard />} />
             <Route path="/verContrato/:id" element={<ViewContract />} />
             <Route path="/registrarContadores" element={<AddContador />} />
             <Route element={<AdminRoutes />}>

diff --git a/src/components/navbar/Navbar.js b/src/components/navbar/Navbar.js
@@ -94,6 +94,7 @@ const Navbar = () => {
                     <Link to="/padroescadastrados">Padrões de impressora cadastrados</Link>
                     <Link to="/definirRotina">Rotina de Registro Automático</Link>
                     <Link to="/registrarContadores">Registrar Contadores</Link>
+                    <Link to="/dashboard">Dashboard</Link>
 
                   </div>
                 )}