Fix/40 contract list

.github/workflows/ci-cd.yml

@@ -0,0 +1,15 @@
+name: Deploy no Render
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - dev
+
+jobs:
+  render:
+    name: render
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger deploy
+        run: curl ${{secrets.RENDER_TRIGGER}}

.github/workflows/code-analysis.yml

@@ -36,11 +36,3 @@ jobs:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
 
-      - name: Envia cobertura para o Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: true
-          flags: jest
-          name: 2023.2-PrintGo-FrontEnd
-          verbose: true

.github/workflows/metrics.yml

@@ -1,10 +1,15 @@
 name: Metrics and Release
 
 on:
-  pull_request:
-    branches:
-      - main
-    types: [closed]
+    workflow_dispatch:
+    pull_request:
+        branches:
+            - main
+            - dev
+        types: [closed]
+    push:
+        branches:
+          - main
 
 jobs:
   release:

README.md

@@ -1,67 +1,41 @@
-# 2023.2-PrintGo-FrontEnd
+# 2024.1 - PrintGo-FrontEnd
 
 <div align="center">
     <img src="src/assets/logoPrintGo.svg" height="350px" width="350px">
 </div>
 
-# 1. Clone o projeto
-git clone [email protected]:fga-eps-mds/2023.2-PrintGo-FrontEnd.git
 
-# 2. Entre na pasta do projeto
-cd 2023.2-PrintGo-FrontEnd
+## Quality Control
 
-# Construa a imagem do docker 
-```bash 
-sudo docker build -t frontprintgo .
-```
-# Execute o container
-```bash 
-sudo docker run -p 3000:3000 frontprintgo 
-```
-# Caso os comando acima falhem, utilize:
-```bash 
-sudo docker-compose up --build
-```
-```bash 
-sudo docker-compose up
-```
-=======
-# Caso prefira usar yarn eh n tenha
-npm i -g yarn
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=fga-eps-mds_2024.1-PrintGo-FrontEnd&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=fga-eps-mds_2024.1-PrintGo-FrontEnd)
 
-# Instalar dependencias
-yarn
-    #ou
-npm i
+## Requisitos
 
-cp .env.dev .env
+- Node.js 18.18 (Latest em 10-05-2023)
+- Docker
+- Docker-compose
 
-# Rode o docker compose do projeto
-docker-compose up --build
-    # --build somente eh necessario na primeira vez que estiver rodando
-    # depois `docker-compose up` ja resolve
-    # em linux talvez seja necessario a execucao em modo root `sudo docker-compose up`
-    # voce pode também caso queria adicionar um -d ao final para liberar o o terminal `docker-compose up -d`
-    # Para finalizar o servico execute no root do projeto `docker-compose down`
+## Instalação
 
-# finalizado execução do docker faca o migrate da base de dados
-yarn db:migrate
-    #ou
-npm run db:migrate
+```bash 
+# 1. Clone o projeto
+git clone https://github.com/fga-eps-mds/2024.1-PrintGo-FrontEnd.git
+
+# 2. Entre na pasta do projeto
+cd 2024.1-PrintGo-FrontEnd
+# 3. Rodar o docker
+docker-compose up --build
 ```
 
 ## Contribuir
 
-Para contribuir com esse projeto é importante seguir nosso [Guia de Contribuição](https://fga-eps-mds.github.io/2023.2-PrintGo-Doc/guia_de_contribuicao/) do repositório e seguir nosso [Código de Conduta](https://fga-eps-mds.github.io/2023.2-PrintGo-Doc/codigo_conduta/).
-
-## Ambientes
-
-- [Documentação](https://github.com/fga-eps-mds/2023.2-PrintGo-Doc)
-
-- [Front-End](https://github.com/fga-eps-mds/2023.2-PrintGo-FrontEnd)
-
-- [Back-End: UserService](https://github.com/fga-eps-mds/2023.2-PrintGo-UserService)
+Para contribuir com esse projeto é importante seguir nosso [Guia de Contribuição](https://fga-eps-mds.github.io/2024.1-PrintGo-Doc/inicio/guia_contribuicao/).
 
-- [Back-End: OcurrenceService](https://github.com/fga-eps-mds/2023.2-PrintGo-OcurrenceService)
+## repositórios do projeto
 
-- [Back-End: PrinterService](https://github.com/fga-eps-mds/2023.2-PrintGo-PrinterService)
+[Api-Gateway](https://github.com/fga-eps-mds/2024.1-PrintGo-ApiGateway)  
+[ContractService](https://github.com/fga-eps-mds/2024.1-PrintGo-ContractService)  
+[Documentação](https://github.com/fga-eps-mds/2024.1-PrintGo-Doc)  
+[FrontEnd](https://github.com/fga-eps-mds/2024.1-PrintGo-FrontEnd)  
+[PrinterService](https://github.com/fga-eps-mds/2024.1-PrintGo-PrinterService)  
+[UserService](https://github.com/fga-eps-mds/2024.1-PrintGo-UserService)  

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services: 
   app:
     container_name: app-front

jest.config.js

@@ -1,27 +1,32 @@
+const isCoverageEnabled = process.argv.includes('--coverage');
+
 module.exports = {
+    setupFilesAfterEnv: ['./src/setupTests.js'],
     testMatch: ["**/__tests__/**/*.js", "**/?(*.)+(spec|test).js"],
     testPathIgnorePatterns: ["/node_modules/"],
     transform: {
-      "^.+\\.(js|jsx)$": "babel-jest",
-      "^.+\\.svg$": "<rootDir>/fileTransform.js", // Adicione esta linha
+        "^.+\\.(js|jsx)$": "babel-jest",
+        "^.+\\.svg$": "<rootDir>/fileTransform.js", // Adicione esta linha
     },
-    moduleFileExtensions: ["js", "json", "jsx", "node", "svg"], // Adicione "svg" aqui
+    moduleFileExtensions: ["js", "json", "jsx", "node"],
     moduleNameMapper: {
-      "^@/(.*)$": "<rootDir>/src/$1",
-      "\\.(css|less|scss)$": "identity-obj-proxy",
-      "axios": "axios/dist/node/axios.cjs"
+        "^@/(.*)$": "<rootDir>/src/$1",
+        "\\.(css|less|scss)$": "identity-obj-proxy",
+        '^axios$': require.resolve('axios'),
     },
     testEnvironment: "jsdom",
-
+    collectCoverage: isCoverageEnabled,
+    collectCoverageFrom: isCoverageEnabled ? ['src/**/*.{js,jsx}'] : [],
+
     reporters: [
-      'default',
-      [
-          'jest-sonar',
-          {
-              outputDirectory: 'reports',
-              outputName: 'sonar-report.xml'
-          }
-      ]
-  ]
-  };
-  
+        'default',
+        [
+            'jest-sonar',
+            {
+                outputDirectory: 'reports',
+                                outputName: 'sonar-report.xml'
+                                            }
+        ]
+    ]
+};
+

package.json

@@ -13,6 +13,7 @@
     "body-parser": "^1.20.2",
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
+    "papaparse": "^5.4.1",
     "pg": "^8.11.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -60,6 +61,7 @@
     "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-react": "^7.22.15",
+    "@testing-library/jest-dom": "^6.4.8",
     "babel-jest": "^29.7.0",
     "eslint": "^8.52.0",
     "eslint-plugin-import": "^2.28.1",
@@ -71,8 +73,8 @@
     "jest-sonar": "^0.2.16",
     "jest-sonar-reporter": "^2.0.0",
     "jsdom": "^22.1.0",
+    "nodemon": "^2.0.0",
     "react-router-dom": "^6.17.0",
-    "react-test-renderer": "^18.2.0",
-    "nodemon": "^2.0.0"
+    "react-test-renderer": "^18.2.0"
   }
 }

public/Modelo_Relatorio.csv

@@ -0,0 +1,2 @@
+[Customer description],[Brand],[Model],[SerialNumber],[Last update time],[End total counter],[Actual mono counter],[Actual color counter]
+Teste,Teste,Teste,123456,Teste,200,100,100

scripts/metrics.js

@@ -1,26 +1,24 @@
-const REPO = '2023.2-PrintGo-FrontEnd'
+const REPO = '2024.1-PrintGo-FrontEnd'
 const OWNER = 'fga-eps-mds'
-const SONAR_ID = 'fga-eps-mds_2023.2-PrintGo-FrontEnd'
+const SONAR_ID = 'fga-eps-mds_2024.1-PrintGo-FrontEnd'
 
-const METRIC_LIST = [
-    'files',
-    'functions',
-    'complexity',
-    'comment_lines_density',
-    'duplicated_lines_density',
-    'coverage',
-    'ncloc',
-    'tests',
-    'test_errors',
-    'test_failures',
-    'test_execution_time',
-    'security_rating'
-];
+const METRIC_LIST = ['files',
+               'functions',
+               'complexity',
+               'comment_lines_density',
+               'duplicated_lines_density',
+               'coverage',
+               'ncloc',
+               'tests',
+               'test_errors',
+               'test_failures',
+               'test_execution_time',
+               'security_rating'];
 
 const SONAR_URL = `https://sonarcloud.io/api/measures/component_tree?component=${SONAR_ID}&metricKeys=${METRIC_LIST.join(',')}&ps=500`;
 
 module.exports = {
     SONAR_URL,
     REPO,
     OWNER
-};
+};

sonar-project.properties

@@ -1,4 +1,4 @@
-sonar.projectKey=fga-eps-mds_2023.2-PrintGo-FrontEnd
+sonar.projectKey=fga-eps-mds_2024.1-PrintGo-FrontEnd
 sonar.organization=fga-eps-mds-1
 sonar.sources=src
 sonar.tests=src
@@ -7,4 +7,4 @@ sonar.exclusions=node_modules/**, test/**, assets/**, .github/**, scripts/**
 
 
 sonar.javascript.lcov.reportPaths=coverage/lcov.info
-sonar.testExecutionReportPaths=reports/sonar-report.xml
+sonar.testExecutionReportPaths=reports/sonar-report.xml

src/App.js

@@ -12,7 +12,6 @@ import RegisterPrinter from "./pages/RegisterPrinter";
 import EditPrinter from "./pages/EditPrinter";
 import PatternPrinter from "./pages/PatternPrinter";
 import EditPattern from "./pages/EditPattern";
-import PrintersList from "./pages/PrintersList";
 import ViewPrinter from "./pages/ViewPrinter";
 import { ToastContainer } from "react-toastify";
 import 'react-toastify/dist/ReactToastify.css';
@@ -22,24 +21,37 @@ import ForgottenPasswordPage from "./pages/ForgottenPassword";
 import RecoverPasswordPage from "./pages/RecoverPassword";
 import PrivateRoutes from "./components/utils/PrivateRoutes";
 import AdminRoutes from "./components/utils/AdminRoutes";
+import ListEquipment from "./components/forms/ListEquipment";
+import ContractForm from "./components/forms/ContractForm";
+import EditContractForm from "./components/forms/EditContractForm";
+import ContractList from "./pages/ContractList";
+import ViewContract from "./pages/ViewContract";
+import AuditPrinter from "./pages/AuditPrinter";
+import AddContador from "./pages/AddContador";
 
 function App() {
   return (
     <>
       <BrowserRouter>
         <Routes>
           <Route element={<PrivateRoutes />}>
-            <Route path="/editarusuario/:id" element={<EditUserPage/>}/>
+            <Route path="/editarusuario/:id" element={<EditUserPage />} />
+            <Route path="/editimpressora/:id" element={<EditPrinter />} />
+            <Route path="/visualizarimpressora/:id" element={<ViewPrinter />} />
             <Route path="/mudarsenha" element={<ChangePassword />} />
             <Route path="/cadastroimpressora" element={<RegisterPrinter />} />
-            <Route path="/editarimpressora/:printer" element={<EditPrinter />} />
+            <Route path="/auditoria" element={<AuditPrinter />} />
             <Route path="/padraoimpressora" element={<PatternPrinter />} />
-            <Route path="/editarpadrao/:padrao" element={<EditPattern />} />
-            <Route path="/impressorascadastradas" element={<PrintersList />} />
+            <Route path="/editarpadrao" element={<EditPattern />} />
+            <Route path="/impressorascadastradas" element={<ListEquipment />} />
             <Route path="/visualizarimpressora/:printerData" element={<ViewPrinter/>}/>
-            <Route path="/listapadroes" element={<PatternList />} />
             <Route path="/padroescadastrados" element={<PatternList />} />
-            <Route path="/visualizarpadrao/:padrao" element={<ViewPattern />} />
+            <Route path="/visualizarpadrao" element={<ViewPattern />} />
+            <Route path="/cadastrarContrato" element={<ContractForm />} />
+            <Route path="/editarContrato" element={<EditContractForm />} />
+            <Route path="/listagemContrato" element={<ContractList />} />
+            <Route path="/verContrato/:id" element={<ViewContract />} />
+            <Route path="/registrarContadores" element={<AddContador />} /> 
             <Route element={<AdminRoutes/>}>
               <Route path="/listausuarios" element={<UsersList />} />
               <Route path="/cadastro" element={<CreateUserPage />} />
@@ -49,7 +61,7 @@ function App() {
           <Route path="/" element={<Home />} />
           <Route path="/contato" element={<Contact />} />
           <Route path="/quemsomos" element={<AboutUs />} />
-          <Route path="/recuperarSenha" element={<RecoverPasswordPage/>} />
+          <Route path="/recuperarSenha" element={<RecoverPasswordPage />} />
           <Route path="/esqueciMinhaSenha" element={<ForgottenPasswordPage />} />
         </Routes>
       </BrowserRouter>

src/__mocks__/fileMock.js

@@ -0,0 +1,2 @@
+// src/__mocks__/fileMock.js
+module.exports = '';

src/api/api.js

@@ -7,8 +7,9 @@ export async function login(email, password) {
   };
 
   try {
-    const response = await api.post('/user/login', data);
-    return {type: 'success', token: response.data.token };
+    // const response = await api.post('/user/login', data);
+    let token_mock = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjEyMyIsImVtYWlsIjoidXNlckBleGFtcGxlLmNvbSIsIm5vbWUiOiJEYW5pZWwiLCJjYXJnb3MiOiJhZG1pbiJ9.tMm8nEv6qtGnL4XJIFRQJcgw6qafUUDpxgR8LUHXX08"
+    return {type: 'success', token: token_mock };
   } catch (error) {
     console.error('Erro ao fazer login:', error);
     return {type: 'error', error}; 
@@ -28,4 +29,4 @@ export async function changePassword(data) {
   } catch(error) {
     return {type: 'error', error}; 
   }
-}
+}