From 30a318d78506959edd500f30f092e27cf4693899 Mon Sep 17 00:00:00 2001
From: Dannyeclisson
Date: Sat, 30 Nov 2024 22:49:21 -0300
Subject: [PATCH 01/12] =?UTF-8?q?Feature:US1=20-=20Cria=C3=A7=C3=A3o=20da?=
=?UTF-8?q?=20estrutura=20da=20carteirinha=20Co-authored-by:=20Mariana=20=
=?UTF-8?q?martins.mariana2013@gmail.com>"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Components/SideBar/index.jsx | 9 +++++
src/Pages/Protected/Carteirinha/index.css | 0
src/Pages/Protected/Carteirinha/index.jsx | 36 +++++++++++++++++++
.../Protected/Carteirinha/index.teste.jsx | 0
src/Routes/protectedRoutes.jsx | 11 ++++++
5 files changed, 56 insertions(+)
create mode 100644 src/Pages/Protected/Carteirinha/index.css
create mode 100644 src/Pages/Protected/Carteirinha/index.jsx
create mode 100644 src/Pages/Protected/Carteirinha/index.teste.jsx
diff --git a/src/Components/SideBar/index.jsx b/src/Components/SideBar/index.jsx
index 265e96bb..134a83a7 100644
--- a/src/Components/SideBar/index.jsx
+++ b/src/Components/SideBar/index.jsx
@@ -97,6 +97,15 @@ export default function SideBar({ fullHeight = true }) {
setIsSideBarOpen(false);
}}
/>,
+ {
+ navigate("/carteirinha");
+ setIsSideBarOpen(false);
+ }}
+ />
];
return (
diff --git a/src/Pages/Protected/Carteirinha/index.css b/src/Pages/Protected/Carteirinha/index.css
new file mode 100644
index 00000000..e69de29b
diff --git a/src/Pages/Protected/Carteirinha/index.jsx b/src/Pages/Protected/Carteirinha/index.jsx
new file mode 100644
index 00000000..9a69a1c0
--- /dev/null
+++ b/src/Pages/Protected/Carteirinha/index.jsx
@@ -0,0 +1,36 @@
+import { useAuth } from "../../../Context/auth";
+import { useNavigate } from "react-router-dom";
+import SecondaryButton from "../../../Components/SecondaryButton";
+import "./index.css";
+import sindpol_logo from "../../../assets/sindpol-logo.png";
+import sentinela_logo from "../../../assets/sentinela-logo.png";
+import { checkAction, usePermissions } from "../../../Utils/permission";
+import LabeledTextField from "../../../../src/Components/LabeledTextField";
+import DataSelect from "../../../Components/DataSelect/index.jsx";
+
+const Carteirinha = () => {
+ const { user } = useAuth();
+ const permissions = usePermissions();
+ const list = {titular:"Dannyeclisson", dataDeNascimento:"24/11/2001", dataExpedicao:"21/06/2019", CPF:"07488558154", validade:"teste"}
+ return (
+ user && (
+
+
+
+ TITULAR: {list.titular}
+ DATA DE NASCIMENTO: {list.dataDeNascimento}
+ DATA DE EXPEDIÇÃO: {list.dataExpedicao}
+ CPF: {list.CPF}
+ VALIDADE: {list.validade}
+
+
+
+
+
+
+
+ )
+ );
+};
+
+export default Carteirinha;
diff --git a/src/Pages/Protected/Carteirinha/index.teste.jsx b/src/Pages/Protected/Carteirinha/index.teste.jsx
new file mode 100644
index 00000000..e69de29b
diff --git a/src/Routes/protectedRoutes.jsx b/src/Routes/protectedRoutes.jsx
index 7bde377e..a188cdc0 100644
--- a/src/Routes/protectedRoutes.jsx
+++ b/src/Routes/protectedRoutes.jsx
@@ -17,6 +17,7 @@ import Benefits from "../Pages/Protected/Benefit/Benefits";
import BenefitsList from "../Pages/Protected/Benefit/BenefitsList";
import BenefitsCreate from "../Pages/Protected/Benefit/BenefitsCreate";
import BenefitsUpdate from "../Pages/Protected/Benefit/BenefitsUpdate";
+import CarteirinhaPage from "../Pages/Protected/Carteirinha/index.jsx";
import ViewMembershipPage from "../Pages/Protected/Users/ViewMembershipPage";
import FinanceHubPage from "../Pages/Protected/Finance/FinanceHubPage";
import FinanceBankAccount from "../Pages/Protected/Finance/BankAccountCreate";
@@ -171,6 +172,16 @@ const ProtectedRoutes = () => {
/>
}
/>
+ }
+ moduleName="users"
+ actions={["read", "create"]}
+ />
+ }
+ />
Date: Sat, 30 Nov 2024 23:36:45 -0300
Subject: [PATCH 02/12] =?UTF-8?q?Feature:US1=20-=20Cria=C3=A7=C3=A3o=20da?=
=?UTF-8?q?=20estrutura=20da=20carteirinha=20Co-authored-by:=20Mariana=20=
=?UTF-8?q?martins.mariana2013@gmail.com>"=20Co-authored-by:=20Igor=20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Pages/Protected/Carteirinha/index.css | 14 ++++++++++++++
src/Pages/Protected/Carteirinha/index.jsx | 8 ++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/Pages/Protected/Carteirinha/index.css b/src/Pages/Protected/Carteirinha/index.css
index e69de29b..86494742 100644
--- a/src/Pages/Protected/Carteirinha/index.css
+++ b/src/Pages/Protected/Carteirinha/index.css
@@ -0,0 +1,14 @@
+.carteirinha-header {
+ text-align: center;
+ margin-bottom: 20px;
+}
+
+.carteirinha-header h1{
+ font-size: 18px;
+ color: #AE883C;
+ margin: 0;
+}
+
+.carteirinha-info{
+
+}
\ No newline at end of file
diff --git a/src/Pages/Protected/Carteirinha/index.jsx b/src/Pages/Protected/Carteirinha/index.jsx
index 9a69a1c0..7b011d2d 100644
--- a/src/Pages/Protected/Carteirinha/index.jsx
+++ b/src/Pages/Protected/Carteirinha/index.jsx
@@ -17,13 +17,17 @@ const Carteirinha = () => {
+
+
TITULAR: {list.titular}
DATA DE NASCIMENTO: {list.dataDeNascimento}
DATA DE EXPEDIÇÃO: {list.dataExpedicao}
CPF: {list.CPF}
VALIDADE: {list.validade}
-
-
+
From 07b51c8b26d693d46df07ad07e5a95e863f41349 Mon Sep 17 00:00:00 2001
From: Dannyeclisson
Date: Sun, 1 Dec 2024 14:39:49 -0300
Subject: [PATCH 03/12] =?UTF-8?q?Feature:US1=20-=20estiliza=C3=A7=C3=A3o?=
=?UTF-8?q?=20da=20carteirinha=20Co-authored-by:=20Mariana=20"=20Co-authored-by:=20Igor=20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Pages/Protected/Carteirinha/index.css | 73 +++++++++++++++++++++--
src/Pages/Protected/Carteirinha/index.jsx | 41 ++++++++-----
2 files changed, 94 insertions(+), 20 deletions(-)
diff --git a/src/Pages/Protected/Carteirinha/index.css b/src/Pages/Protected/Carteirinha/index.css
index 86494742..8da7bb1b 100644
--- a/src/Pages/Protected/Carteirinha/index.css
+++ b/src/Pages/Protected/Carteirinha/index.css
@@ -1,14 +1,75 @@
.carteirinha-header {
- text-align: center;
+ align-self: start;
margin-bottom: 20px;
+ margin-left: 30px;
+}
+
+.carteirinha-header h1 {
+ font-weight: 900;
+ letter-spacing: -2.5px;
+ line-height: 123.5%;
+ font-size: 50px;
+ color: #AE883C !important;
+ margin: -12px;
+ margin-top: 30px;
+ margin-left: -12px;
+ text-shadow: 0px 4px 4px rgba(226, 183, 61, 0.25);
+}
+.carteirinha-header p {
+ color: #341F14;
+ font-size: 11px;
+ margin-left: -10px;
+ font-weight: bold;
+}
+.carteirinha-info {
+ margin-top: -14px;
+ margin-left: 20px;
+ align-self: flex-start;
+}
+.carteirinha-info div {
+ background-color: white;
+ border-radius: 5px;
+ font-size: 11px;
+}
+
+.titular div{
+ width: 63%;
+}
+
+.dataDeNascimento div{
+
+}
+
+.dataExpedicao div{
+
}
-.carteirinha-header h1{
- font-size: 18px;
- color: #AE883C;
- margin: 0;
+.CPF div{
+ width: 120px;
+}
+
+.validade div{
+ text-align: center;
+ margin-left: 0px;
+ width: 120px;
+}
+
+.titular{
+
+}
+
+.dataDeNascimento{
+ margin-top: 10px;
+}
+
+.dataExpedicao{
+
+}
+
+.CPF{
+
}
-.carteirinha-info{
+.validade{
}
\ No newline at end of file
diff --git a/src/Pages/Protected/Carteirinha/index.jsx b/src/Pages/Protected/Carteirinha/index.jsx
index 7b011d2d..0915f0e4 100644
--- a/src/Pages/Protected/Carteirinha/index.jsx
+++ b/src/Pages/Protected/Carteirinha/index.jsx
@@ -15,20 +15,33 @@ const Carteirinha = () => {
return (
user && (
-
-
-
-
-
TITULAR: {list.titular}
-
DATA DE NASCIMENTO: {list.dataDeNascimento}
-
DATA DE EXPEDIÇÃO: {list.dataExpedicao}
-
CPF: {list.CPF}
-
VALIDADE: {list.validade}
-
-
+
+
+
+
+
TITULAR:
+
{list.titular}
+
+
+
DATA DE NASCIMENTO:
+
{list.dataDeNascimento}
+
+
+
DATA DE EXPEDIÇÃO:
+
{list.dataExpedicao}
+
+
+
CPF:
+
{list.CPF}
+
+
+
VALIDADE:
+
{list.validade}
+
+
From 2fa753aaf165e69850d9817ce82337a742c9fed3 Mon Sep 17 00:00:00 2001
From: Igor
Date: Sun, 1 Dec 2024 16:01:25 -0300
Subject: [PATCH 04/12] Ajustes nos textos da carteirinha
Co-authored-by: Dannyeclisson
Co-authored-by: Mariana
---
src/Pages/Protected/Carteirinha/index.css | 24 ++++++++++++++++++++---
src/Pages/Protected/Carteirinha/index.jsx | 6 +++++-
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/Pages/Protected/Carteirinha/index.css b/src/Pages/Protected/Carteirinha/index.css
index 8da7bb1b..23e3522d 100644
--- a/src/Pages/Protected/Carteirinha/index.css
+++ b/src/Pages/Protected/Carteirinha/index.css
@@ -26,50 +26,68 @@
margin-left: 20px;
align-self: flex-start;
}
-.carteirinha-info div {
+.carteirinha-info div{
+ align-content: flex-start;
background-color: white;
border-radius: 5px;
font-size: 11px;
}
.titular div{
- width: 63%;
+ margin-top: 3px;
+ text-align: center;
+ width: 300px;
}
.dataDeNascimento div{
+ margin-top: 3px;
+ text-align: center;
+ width: 120px;
}
.dataExpedicao div{
+ margin-top: 3px;
+ text-align: center;
+ width: 120px;
+
}
.CPF div{
+ margin-top: 3px;
+ text-align: center;
width: 120px;
}
.validade div{
+ margin-top: 3px;
text-align: center;
margin-left: 0px;
width: 120px;
}
.titular{
+ font-size: 11px;
}
.dataDeNascimento{
- margin-top: 10px;
+ font-size: 11px;
+ margin-top: 30px;
}
.dataExpedicao{
+ font-size: 11px;
}
.CPF{
+ font-size: 11px;
}
.validade{
+ font-size: 11px;
}
\ No newline at end of file
diff --git a/src/Pages/Protected/Carteirinha/index.jsx b/src/Pages/Protected/Carteirinha/index.jsx
index 0915f0e4..cf763da0 100644
--- a/src/Pages/Protected/Carteirinha/index.jsx
+++ b/src/Pages/Protected/Carteirinha/index.jsx
@@ -7,11 +7,12 @@ import sentinela_logo from "../../../assets/sentinela-logo.png";
import { checkAction, usePermissions } from "../../../Utils/permission";
import LabeledTextField from "../../../../src/Components/LabeledTextField";
import DataSelect from "../../../Components/DataSelect/index.jsx";
+import LogoSentinela from "../../../assets/sindpol-logo.png";
const Carteirinha = () => {
const { user } = useAuth();
const permissions = usePermissions();
- const list = {titular:"Dannyeclisson", dataDeNascimento:"24/11/2001", dataExpedicao:"21/06/2019", CPF:"07488558154", validade:"teste"}
+ const list = {titular:"Dannyeclisson", dataDeNascimento:"24/11/2001", dataExpedicao:"21/06/2019", CPF:"074.885.581-54", validade:"teste"}
return (
user && (
@@ -41,6 +42,9 @@ const Carteirinha = () => {
VALIDADE:
{list.validade}
+
+