Merge branch 'master' of https://github.com/fga-eps-mds/2024.2-SENTIN…

…ELA-FRONT
fga-eps-mds · Dec 6, 2024 · 06ceb94 · 06ceb94
2 parents c4c1f38 + 8f4bda9
commit 06ceb94
Show file tree

Hide file tree

Showing 12 changed files with 595 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,10 +2,10 @@ name: front-ci
 
 on:
   push:
-    branches: [main, devel]
+    branches: [master, devel]
   pull_request:
     branches:
-      - main
+      - master
       - devel
     types: [opened, synchronize, reopened]
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "json2csv": "^6.0.0-alpha.2",
+    "jspdf": "^2.5.2",
     "prettier": "^3.3.3",
     "react": "^18.2.0",
     "react-chartjs-2": "^5.2.0",

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,7 +1,7 @@
-sonar.projectKey=fga-eps-mds_2024.1-SENTINELA-FRONT
+sonar.projectKey=fga-eps-mds_2024.2-SENTINELA-FRONT
 sonar.organization=fga-eps-mds-1
 
-sonar.projectName=2024.1-SENTINELA-FRONT
+sonar.projectName=2024.2-SENTINELA-FRONT
 
 sonar.host.url=https://sonarcloud.io
 sonar.language=js

diff --git a/src/Components/SideBar/index.jsx b/src/Components/SideBar/index.jsx
@@ -97,6 +97,15 @@ export default function SideBar({ fullHeight = true }) {
         setIsSideBarOpen(false);
       }}
     />,
+    <SideButton
+      hidden={checkModule(permissions, "users") ? "flex" : "none"}
+      key="carteirinha"
+      text="CARTEIRINHA"
+      onClick={() => {
+        navigate("/carteirinha");
+        setIsSideBarOpen(false);
+      }}
+    />
   ];
 
   return (