From c4cdb622882d01e347de8bdd80925d44d5d62bcd Mon Sep 17 00:00:00 2001 From: RodrigoAmaral Date: Sun, 8 Dec 2024 00:45:31 -0300 Subject: [PATCH 1/5] =?UTF-8?q?Cria=C3=A7=C3=A3o=20da=20pagina=20de=20valo?= =?UTF-8?q?res=20dos=20benef=C3=ADcios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Protected/Benefit/BenefitsValue/index.css | 0 .../Protected/Benefit/BenefitsValue/index.jsx | 53 +++++++++++++++++++ src/Routes/protectedRoutes.jsx | 13 ++++- 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 src/Pages/Protected/Benefit/BenefitsValue/index.css create mode 100644 src/Pages/Protected/Benefit/BenefitsValue/index.jsx diff --git a/src/Pages/Protected/Benefit/BenefitsValue/index.css b/src/Pages/Protected/Benefit/BenefitsValue/index.css new file mode 100644 index 00000000..e69de29b diff --git a/src/Pages/Protected/Benefit/BenefitsValue/index.jsx b/src/Pages/Protected/Benefit/BenefitsValue/index.jsx new file mode 100644 index 00000000..7f395768 --- /dev/null +++ b/src/Pages/Protected/Benefit/BenefitsValue/index.jsx @@ -0,0 +1,53 @@ +import { useState, useEffect } from "react"; +import { getBenefitsForm } from "../../../../Services/benefitsService"; + +import List from "@mui/material/List"; +import ListItem from "@mui/material/ListItem"; +import ListItemText from "@mui/material/ListItemText"; +import Divider from "@mui/material/Divider"; + +import "./index.css"; + +export default function BenefitsValue() { + const [benefits, setBenefits] = useState([]); + + useEffect(() => { + const getBenefits = async () => { + const response = await getBenefitsForm(); + setBenefits(response); + }; + + getBenefits(); + }, []); + + return ( +
+
+
+

Valores dos benefícios

+

Benefícios disponíveis

+
+
+ + {benefits?.map((benefit) => ( +
+ + + +
+ +
+ + + +
+ ))} + +
+
+
+ ); +} diff --git a/src/Routes/protectedRoutes.jsx b/src/Routes/protectedRoutes.jsx index 7bde377e..f2add097 100644 --- a/src/Routes/protectedRoutes.jsx +++ b/src/Routes/protectedRoutes.jsx @@ -14,6 +14,7 @@ import RolesListPage from "../Pages/Protected/Roles/RolesListPage"; import RolesUpdatePage from "../Pages/Protected/Roles/RolesUpdatePage"; import MembershipRequest from "../Pages/Protected/MembershipRequests"; import Benefits from "../Pages/Protected/Benefit/Benefits"; +import BenefitsValue from "../Pages/Protected/Benefit/BenefitsValue"; import BenefitsList from "../Pages/Protected/Benefit/BenefitsList"; import BenefitsCreate from "../Pages/Protected/Benefit/BenefitsCreate"; import BenefitsUpdate from "../Pages/Protected/Benefit/BenefitsUpdate"; @@ -151,6 +152,16 @@ const ProtectedRoutes = () => { /> } /> + } + moduleName="benefits" + actions={["read"]} + /> + } + /> { ); }; -export default ProtectedRoutes; +export default ProtectedRoutes; \ No newline at end of file From 2024b6bd443dcdf7c0b561afd6f1b537f8ba8c97 Mon Sep 17 00:00:00 2001 From: RodrigoAmaral Date: Sun, 8 Dec 2024 20:04:43 -0300 Subject: [PATCH 2/5] =?UTF-8?q?Estiliza=C3=A7=C3=A3o=20e=20conex=C3=A3o=20?= =?UTF-8?q?com=20back=20de=20benef=C3=ADcios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Protected/Benefit/BenefitsValue/index.css | 89 +++++++++++++++++++ .../Protected/Benefit/BenefitsValue/index.jsx | 76 ++++++++++++---- src/Pages/Public/Advantages/index.css | 13 --- 3 files changed, 146 insertions(+), 32 deletions(-) diff --git a/src/Pages/Protected/Benefit/BenefitsValue/index.css b/src/Pages/Protected/Benefit/BenefitsValue/index.css index e69de29b..7734b5a2 100644 --- a/src/Pages/Protected/Benefit/BenefitsValue/index.css +++ b/src/Pages/Protected/Benefit/BenefitsValue/index.css @@ -0,0 +1,89 @@ +.benefits-container { + max-width: 1200px; + margin: 0 auto; + padding: 4rem 2rem; + font-family: "Noto Sans"; + color: #332117; + height: 100%; +} + +.benefits-header h1 { + font-size: 2.125rem; +} + +.benefits-header p { + font-size: 1.5rem; + color: #341f14; + margin-bottom: 1.25rem; +} + +.benefits-list { + width: 100%; +} + +.box-benefits { + margin-top: 1.25rem; +} + +.benefit-item { + display: flex; + align-items: center; + padding: 1rem 0; +} + +.benefit-datails { + position: absolute; + justify-items: center; + left: 50%; + transform: translateX(-50%); +} + +.benefit-details-expanded { + display: flex; + justify-content: space-between; + align-items: center; + overflow-wrap: break-word; + gap: 7rem; + padding: 0.25rem 3rem; +} + +.benefit-item > .MuiListItemText-primary { + font-weight: bold; + font-size: 1.25rem; +} + +.benefit-item .MuiListItemText-secondary { + font-weight: 300; + font-size: 0.875rem; + color: #8c7765; +} + +@media (max-width: 890px) { + .benefits-container { + padding-top: 4rem; + } + .benefit-datails { + position: relative; + left: auto; + transform: none; + } + .benefit-item { + flex-direction: column; + } + .benefit-value { + display: flex; + text-align: center; + align-items: center; + padding: 0.25rem 2rem; + border-radius: 10px; + background: #eae3d7; + } + .benefit-details-expanded { + flex-direction: column-reverse; + overflow-wrap: anywhere; + gap: 1rem; + } + .benefit-details-expanded .MuiListItemText-primary { + font-size: 0.85rem; + } +} diff --git a/src/Pages/Protected/Benefit/BenefitsValue/index.jsx b/src/Pages/Protected/Benefit/BenefitsValue/index.jsx index 7f395768..510bc503 100644 --- a/src/Pages/Protected/Benefit/BenefitsValue/index.jsx +++ b/src/Pages/Protected/Benefit/BenefitsValue/index.jsx @@ -1,6 +1,7 @@ import { useState, useEffect } from "react"; import { getBenefitsForm } from "../../../../Services/benefitsService"; +import { FaWhatsapp } from "react-icons/fa"; import List from "@mui/material/List"; import ListItem from "@mui/material/ListItem"; import ListItemText from "@mui/material/ListItemText"; @@ -10,6 +11,12 @@ import "./index.css"; export default function BenefitsValue() { const [benefits, setBenefits] = useState([]); + const [expandedBenefit, setExpandedBenefit] = useState(null); + + const handleExpand = (id) => { + // Alterna entre expandir e recolher o benefício clicado + setExpandedBenefit((prev) => (prev === id ? null : id)); + }; useEffect(() => { const getBenefits = async () => { @@ -21,30 +28,61 @@ export default function BenefitsValue() { }, []); return ( -
-
-
+
+
+

Valores dos benefícios

Benefícios disponíveis

-
+
- {benefits?.map((benefit) => ( -
- - - -
- -
- + {benefits?.map( + (benefit, index) => ( + console.log(benefit), + ( +
+ + + handleExpand(benefit._id)} + /> +
+ +
+ - -
- ))} + {expandedBenefit === benefit._id && ( +
+ + + + +
+ )} + + +
+ ) + ) + )}
diff --git a/src/Pages/Public/Advantages/index.css b/src/Pages/Public/Advantages/index.css index 7c8d2424..6539772c 100644 --- a/src/Pages/Public/Advantages/index.css +++ b/src/Pages/Public/Advantages/index.css @@ -10,17 +10,4 @@ margin: 20px auto; } - h1, h2{ - padding-left: 65px; - color: #3D160D; - } - h1{ - font-size: 50px; - padding-top: 67px; - } - - h2{ - font-size: 30px; - padding-top: 19px; - } \ No newline at end of file From 654607df10df1b000c2f5d87c419f1937a9d2ab6 Mon Sep 17 00:00:00 2001 From: RodrigoAmaral Date: Sun, 8 Dec 2024 20:38:42 -0300 Subject: [PATCH 3/5] =?UTF-8?q?Corre=C3=A7=C3=A3o=20problema=20responsivid?= =?UTF-8?q?ade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Pages/Protected/Benefit/BenefitsValue/index.css | 12 ++++++++++++ src/Pages/Protected/Benefit/BenefitsValue/index.jsx | 10 ++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/Pages/Protected/Benefit/BenefitsValue/index.css b/src/Pages/Protected/Benefit/BenefitsValue/index.css index 7734b5a2..a726c6ee 100644 --- a/src/Pages/Protected/Benefit/BenefitsValue/index.css +++ b/src/Pages/Protected/Benefit/BenefitsValue/index.css @@ -38,6 +38,13 @@ transform: translateX(-50%); } +.benefit-value { + position: absolute; + justify-items: center; + left: 85%; +} + + .benefit-details-expanded { display: flex; justify-content: space-between; @@ -86,4 +93,9 @@ .benefit-details-expanded .MuiListItemText-primary { font-size: 0.85rem; } + .benefit-value { + position: relative; + left: auto; + transform: none; + } } diff --git a/src/Pages/Protected/Benefit/BenefitsValue/index.jsx b/src/Pages/Protected/Benefit/BenefitsValue/index.jsx index 510bc503..0c99da01 100644 --- a/src/Pages/Protected/Benefit/BenefitsValue/index.jsx +++ b/src/Pages/Protected/Benefit/BenefitsValue/index.jsx @@ -56,7 +56,9 @@ export default function BenefitsValue() {
@@ -78,7 +80,11 @@ export default function BenefitsValue() {
)} - +
) ) From 0f84cb231459b8f23bc44c20022351aa01ecb81b Mon Sep 17 00:00:00 2001 From: RodrigoAmaral Date: Mon, 9 Dec 2024 02:48:02 -0300 Subject: [PATCH 4/5] =?UTF-8?q?Corre=C3=A7=C3=A3o=20erros=20format=20prett?= =?UTF-8?q?ier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Pages/Protected/Benefit/BenefitsValue/index.css | 1 - src/Pages/Protected/Benefit/BenefitsValue/index.jsx | 2 +- src/Routes/protectedRoutes.jsx | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Pages/Protected/Benefit/BenefitsValue/index.css b/src/Pages/Protected/Benefit/BenefitsValue/index.css index a726c6ee..bb1c9137 100644 --- a/src/Pages/Protected/Benefit/BenefitsValue/index.css +++ b/src/Pages/Protected/Benefit/BenefitsValue/index.css @@ -44,7 +44,6 @@ left: 85%; } - .benefit-details-expanded { display: flex; justify-content: space-between; diff --git a/src/Pages/Protected/Benefit/BenefitsValue/index.jsx b/src/Pages/Protected/Benefit/BenefitsValue/index.jsx index 0c99da01..ef9711b2 100644 --- a/src/Pages/Protected/Benefit/BenefitsValue/index.jsx +++ b/src/Pages/Protected/Benefit/BenefitsValue/index.jsx @@ -82,7 +82,7 @@ export default function BenefitsValue() { diff --git a/src/Routes/protectedRoutes.jsx b/src/Routes/protectedRoutes.jsx index 4150429b..fa87e138 100644 --- a/src/Routes/protectedRoutes.jsx +++ b/src/Routes/protectedRoutes.jsx @@ -321,4 +321,4 @@ const ProtectedRoutes = () => { ); }; -export default ProtectedRoutes; \ No newline at end of file +export default ProtectedRoutes; From 9eca33d7059221ab8ac782b943bcc280ba2ee445 Mon Sep 17 00:00:00 2001 From: RodrigoAmaral Date: Mon, 9 Dec 2024 02:58:33 -0300 Subject: [PATCH 5/5] teste sonarcloud