From e8ef542cb6628e63824783a667b17387e2333c23 Mon Sep 17 00:00:00 2001
From: pedrofp4444 <pfpereira2004@gmail.com>
Date: Thu, 9 Mar 2023 20:03:53 +0000
Subject: [PATCH 1/7] Add listing response from bokken

---
 apps/app/pages/index.tsx | 156 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 151 insertions(+), 5 deletions(-)

diff --git a/apps/app/pages/index.tsx b/apps/app/pages/index.tsx
index 0847432b..fa8ffcc0 100644
--- a/apps/app/pages/index.tsx
+++ b/apps/app/pages/index.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import { Button, Col, Popconfirm, Row, Typography } from "antd";
+import { Button, Col, Modal, Popconfirm, Row, Typography } from "antd";
 import { useAuth } from "@coderdojobraga/ui";
 import { withAuth } from "~/components/Auth/withAuth";
 import AppLayout from "~/layouts/AppLayout";
@@ -21,6 +21,12 @@ function Dashboard() {
   const [ninjas, setNinjas] = useState([]);
   const { data: events, isLoading: isLoadingEvents } = useEvents();
   const { data: badges, isLoading: isLoadingBadges } = useBadges();
+  const [emails_sucess, setEmails_sucess] = useState([]);
+  const [emails_fail, setEmails_fail] = useState([]);
+  const [visible_signup, setVisible_signup] = useState(false);
+  const [visible_selected, setVisible_selected] = useState(false);
+  const [confirmed_signup, setConfirmed_signup] = useState(false);
+  const [confirmed_selected, setConfirmed_selected] = useState(false);
 
   const nextEvent = () => {
     const cur = moment();
@@ -34,9 +40,20 @@ function Dashboard() {
     return sorted_events[0] != undefined ? sorted_events[0] : false;
   };
 
+  const handleCloseModal_signup = () => {
+    setVisible_signup(false);
+  };
+
+  const handleCloseModal_selected = () => {
+    setVisible_selected(false);
+  };
+
   const notify_signup_ninjas = () => {
     notify_signup()
-      .then(() => {
+      .then((response) => {
+        setEmails_sucess(response.success);
+        setEmails_fail(response.fail);
+        setVisible_signup(true);
         notifyInfo("Enviado com sucesso!");
       })
       .catch((error) => {
@@ -46,7 +63,10 @@ function Dashboard() {
 
   const notify_selected_ninjas = () => {
     notify_selected()
-      .then(() => {
+      .then((response) => {
+        setEmails_sucess(response.success);
+        setEmails_fail(response.fail);
+        setVisible_selected(true);
         notifyInfo("Enviado com sucesso!");
       })
       .catch((error) => {
@@ -79,8 +99,71 @@ function Dashboard() {
                 title="Tens a certeza que queres notificar?"
                 cancelText="Não"
                 okText="Sim"
-                onConfirm={(_) => notify_signup_ninjas()}
+                onConfirm={(_) => {
+                  notify_signup_ninjas();
+                  setConfirmed_signup(true);
+                }}
+                disabled={confirmed_signup}
               >
+                <Modal
+                  visible={visible_signup}
+                  onCancel={handleCloseModal_signup}
+                  centered={true}
+                  closable={false}
+                  title="Lista de Emails"
+                  footer={[
+                    <Button
+                      key="close"
+                      type="primary"
+                      onClick={handleCloseModal_signup}
+                    >
+                      Close
+                    </Button>,
+                  ]}
+                >
+                  <div
+                    style={{ display: "flex", justifyContent: "space-between" }}
+                  >
+                    <div
+                      style={{
+                        width: "45%",
+                        height: "500px",
+                        overflowY: "scroll",
+                        overflowX: "scroll",
+                      }}
+                    >
+                      <div
+                        style={{ display: "flex", justifyContent: "center" }}
+                      >
+                        <Button type="primary">Entregues</Button>
+                      </div>
+                      <ul>
+                        {emails_sucess.map((email, index) => (
+                          <li key={index}>{email}</li>
+                        ))}
+                      </ul>
+                    </div>
+                    <div
+                      style={{
+                        width: "45%",
+                        height: "500px",
+                        overflowY: "scroll",
+                        overflowX: "scroll",
+                      }}
+                    >
+                      <div
+                        style={{ display: "flex", justifyContent: "center" }}
+                      >
+                        <Button type="primary">Entregues</Button>
+                      </div>
+                      <ul>
+                        {emails_fail.map((email, index) => (
+                          <li key={index}>{email}</li>
+                        ))}
+                      </ul>
+                    </div>
+                  </div>
+                </Modal>
                 <Button type="primary">Notificar abertura</Button>
               </Popconfirm>
             ) : (
@@ -93,8 +176,71 @@ function Dashboard() {
                 title="Tens a certeza que queres notificar?"
                 cancelText="Não"
                 okText="Sim"
-                onConfirm={(_) => notify_selected_ninjas()}
+                onConfirm={(_) => {
+                  notify_selected_ninjas();
+                  setConfirmed_selected(true);
+                }}
+                disabled={confirmed_selected}
               >
+                <Modal
+                  visible={visible_selected}
+                  onCancel={handleCloseModal_selected}
+                  centered={true}
+                  closable={false}
+                  title="Lista de Emails"
+                  footer={[
+                    <Button
+                      key="close"
+                      type="primary"
+                      onClick={handleCloseModal_selected}
+                    >
+                      Close
+                    </Button>,
+                  ]}
+                >
+                  <div
+                    style={{ display: "flex", justifyContent: "space-between" }}
+                  >
+                    <div
+                      style={{
+                        width: "45%",
+                        height: "500px",
+                        overflowY: "scroll",
+                        overflowX: "scroll",
+                      }}
+                    >
+                      <div
+                        style={{ display: "flex", justifyContent: "center" }}
+                      >
+                        <Button type="primary">Entregues</Button>
+                      </div>
+                      <ul>
+                        {emails_sucess.map((email, index) => (
+                          <li key={index}>{email}</li>
+                        ))}
+                      </ul>
+                    </div>
+                    <div
+                      style={{
+                        width: "45%",
+                        height: "500px",
+                        overflowY: "scroll",
+                        overflowX: "scroll",
+                      }}
+                    >
+                      <div
+                        style={{ display: "flex", justifyContent: "center" }}
+                      >
+                        <Button type="primary">Não entregues</Button>
+                      </div>
+                      <ul>
+                        {emails_fail.map((email, index) => (
+                          <li key={index}>{email}</li>
+                        ))}
+                      </ul>
+                    </div>
+                  </div>
+                </Modal>
                 <Button type="primary">Notificar selecionados</Button>
               </Popconfirm>
             ) : (

From 70c73c59313a36dd37331e65a2832d50b81da780 Mon Sep 17 00:00:00 2001
From: pedrofp4444 <pfpereira2004@gmail.com>
Date: Sat, 11 Mar 2023 12:53:36 +0000
Subject: [PATCH 2/7] Add ant.design buttons

---
 apps/app/pages/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/app/pages/index.tsx b/apps/app/pages/index.tsx
index fa8ffcc0..8eb75340 100644
--- a/apps/app/pages/index.tsx
+++ b/apps/app/pages/index.tsx
@@ -154,7 +154,7 @@ function Dashboard() {
                       <div
                         style={{ display: "flex", justifyContent: "center" }}
                       >
-                        <Button type="primary">Entregues</Button>
+                        <Button type="primary">Não entregues</Button>
                       </div>
                       <ul>
                         {emails_fail.map((email, index) => (

From 05c6be19c103c79f6853d13eac710c790250bd12 Mon Sep 17 00:00:00 2001
From: pedrofp4444 <pfpereira2004@gmail.com>
Date: Tue, 14 Mar 2023 22:13:05 +0000
Subject: [PATCH 3/7] Improve modal UI

---
 apps/app/pages/index.tsx | 304 ++++++++++++++++++++++++++++-----------
 1 file changed, 221 insertions(+), 83 deletions(-)

diff --git a/apps/app/pages/index.tsx b/apps/app/pages/index.tsx
index 8eb75340..027ab713 100644
--- a/apps/app/pages/index.tsx
+++ b/apps/app/pages/index.tsx
@@ -21,12 +21,13 @@ function Dashboard() {
   const [ninjas, setNinjas] = useState([]);
   const { data: events, isLoading: isLoadingEvents } = useEvents();
   const { data: badges, isLoading: isLoadingBadges } = useBadges();
-  const [emails_sucess, setEmails_sucess] = useState([]);
+  const [emails_success, setEmails_success] = useState([]);
   const [emails_fail, setEmails_fail] = useState([]);
   const [visible_signup, setVisible_signup] = useState(false);
   const [visible_selected, setVisible_selected] = useState(false);
   const [confirmed_signup, setConfirmed_signup] = useState(false);
   const [confirmed_selected, setConfirmed_selected] = useState(false);
+  const [showInfoA, setShowInfoA] = useState(true);
 
   const nextEvent = () => {
     const cur = moment();
@@ -51,10 +52,10 @@ function Dashboard() {
   const notify_signup_ninjas = () => {
     notify_signup()
       .then((response) => {
-        setEmails_sucess(response.success);
+        setEmails_success(response.success);
         setEmails_fail(response.fail);
         setVisible_signup(true);
-        notifyInfo("Enviado com sucesso!");
+        notifyInfo("Enviado com successo!");
       })
       .catch((error) => {
         notifyError("Não foi enviado!");
@@ -64,10 +65,10 @@ function Dashboard() {
   const notify_selected_ninjas = () => {
     notify_selected()
       .then((response) => {
-        setEmails_sucess(response.success);
+        setEmails_success(response.success);
         setEmails_fail(response.fail);
         setVisible_selected(true);
-        notifyInfo("Enviado com sucesso!");
+        notifyInfo("Enviado com successo!");
       })
       .catch((error) => {
         notifyError("Não foi enviado!");
@@ -110,7 +111,11 @@ function Dashboard() {
                   onCancel={handleCloseModal_signup}
                   centered={true}
                   closable={false}
-                  title="Lista de Emails"
+                  title={
+                    <div style={{ textAlign: "center" }}>
+                      Relatório de envio de emails
+                    </div>
+                  }
                   footer={[
                     <Button
                       key="close"
@@ -121,46 +126,110 @@ function Dashboard() {
                     </Button>,
                   ]}
                 >
-                  <div
-                    style={{ display: "flex", justifyContent: "space-between" }}
-                  >
-                    <div
-                      style={{
-                        width: "45%",
-                        height: "500px",
-                        overflowY: "scroll",
-                        overflowX: "scroll",
-                      }}
-                    >
-                      <div
-                        style={{ display: "flex", justifyContent: "center" }}
+                  <div className="h-96 p-4">
+                    <div className="flex justify-center">
+                      <button
+                        className={`mr-2 rounded-t-lg px-4 py-2 ${
+                          showInfoA
+                            ? "bg-primary text-white"
+                            : "bg-gray-200 text-gray-700"
+                        }`}
+                        onClick={() => setShowInfoA(true)}
                       >
-                        <Button type="primary">Entregues</Button>
-                      </div>
-                      <ul>
-                        {emails_sucess.map((email, index) => (
-                          <li key={index}>{email}</li>
-                        ))}
-                      </ul>
-                    </div>
-                    <div
-                      style={{
-                        width: "45%",
-                        height: "500px",
-                        overflowY: "scroll",
-                        overflowX: "scroll",
-                      }}
-                    >
-                      <div
-                        style={{ display: "flex", justifyContent: "center" }}
+                        &nbsp; Entregues &nbsp;
+                      </button>
+                      <button
+                        className={`rounded-t-lg px-4 py-2 ${
+                          !showInfoA
+                            ? "bg-primary text-white"
+                            : "bg-gray-200 text-gray-700"
+                        }`}
+                        onClick={() => setShowInfoA(false)}
                       >
-                        <Button type="primary">Não entregues</Button>
-                      </div>
-                      <ul>
-                        {emails_fail.map((email, index) => (
-                          <li key={index}>{email}</li>
-                        ))}
-                      </ul>
+                        Não entregues
+                      </button>
+                    </div>
+
+                    <div className="min-h-max rounded-lg border p-4">
+                      {showInfoA ? (
+                        <>
+                          {emails_success.length > 0 ? (
+                            <ul
+                              style={{
+                                height: "275px",
+                                overflowY: "scroll",
+                                overflowX: "scroll",
+                              }}
+                            >
+                              {emails_success.map((email, index) => (
+                                <li
+                                  key={index}
+                                  style={{
+                                    borderTop:
+                                      index !== 0
+                                        ? "1px solid #e0e0e0"
+                                        : "none",
+                                    padding: "8px 0",
+                                    color: "#555",
+                                  }}
+                                >
+                                  {email}
+                                </li>
+                              ))}
+                            </ul>
+                          ) : (
+                            <div
+                              style={{
+                                height: "275px",
+                                display: "flex",
+                                alignItems: "center",
+                                justifyContent: "center",
+                              }}
+                            >
+                              <p>Sem emails para mostrar</p>
+                            </div>
+                          )}
+                        </>
+                      ) : (
+                        <>
+                          {emails_fail.length > 0 ? (
+                            <ul
+                              style={{
+                                height: "275px",
+                                overflowY: "scroll",
+                                overflowX: "scroll",
+                              }}
+                            >
+                              {emails_fail.map((email, index) => (
+                                <li
+                                  key={index}
+                                  style={{
+                                    borderTop:
+                                      index !== 0
+                                        ? "1px solid #e0e0e0"
+                                        : "none",
+                                    padding: "8px 0",
+                                    color: "#555",
+                                  }}
+                                >
+                                  {email}
+                                </li>
+                              ))}
+                            </ul>
+                          ) : (
+                            <div
+                              style={{
+                                height: "275px",
+                                display: "flex",
+                                alignItems: "center",
+                                justifyContent: "center",
+                              }}
+                            >
+                              <p>Sem emails para mostrar</p>
+                            </div>
+                          )}
+                        </>
+                      )}
                     </div>
                   </div>
                 </Modal>
@@ -170,6 +239,7 @@ function Dashboard() {
               <></>
             )}
           </Col>
+
           <Col>
             {role === EUser.Organizer ? (
               <Popconfirm
@@ -187,7 +257,11 @@ function Dashboard() {
                   onCancel={handleCloseModal_selected}
                   centered={true}
                   closable={false}
-                  title="Lista de Emails"
+                  title={
+                    <div style={{ textAlign: "center" }}>
+                      Relatório de envio de emails
+                    </div>
+                  }
                   footer={[
                     <Button
                       key="close"
@@ -198,46 +272,110 @@ function Dashboard() {
                     </Button>,
                   ]}
                 >
-                  <div
-                    style={{ display: "flex", justifyContent: "space-between" }}
-                  >
-                    <div
-                      style={{
-                        width: "45%",
-                        height: "500px",
-                        overflowY: "scroll",
-                        overflowX: "scroll",
-                      }}
-                    >
-                      <div
-                        style={{ display: "flex", justifyContent: "center" }}
+                  <div className="h-96 p-4">
+                    <div className="flex justify-center">
+                      <button
+                        className={`mr-2 rounded-t-lg px-4 py-2 ${
+                          showInfoA
+                            ? "bg-primary text-white"
+                            : "bg-gray-200 text-gray-700"
+                        }`}
+                        onClick={() => setShowInfoA(true)}
                       >
-                        <Button type="primary">Entregues</Button>
-                      </div>
-                      <ul>
-                        {emails_sucess.map((email, index) => (
-                          <li key={index}>{email}</li>
-                        ))}
-                      </ul>
-                    </div>
-                    <div
-                      style={{
-                        width: "45%",
-                        height: "500px",
-                        overflowY: "scroll",
-                        overflowX: "scroll",
-                      }}
-                    >
-                      <div
-                        style={{ display: "flex", justifyContent: "center" }}
+                        &nbsp; Entregues &nbsp;
+                      </button>
+                      <button
+                        className={`rounded-t-lg px-4 py-2 ${
+                          !showInfoA
+                            ? "bg-primary text-white"
+                            : "bg-gray-200 text-gray-700"
+                        }`}
+                        onClick={() => setShowInfoA(false)}
                       >
-                        <Button type="primary">Não entregues</Button>
-                      </div>
-                      <ul>
-                        {emails_fail.map((email, index) => (
-                          <li key={index}>{email}</li>
-                        ))}
-                      </ul>
+                        Não entregues
+                      </button>
+                    </div>
+
+                    <div className="min-h-max rounded-lg border p-4">
+                      {showInfoA ? (
+                        <>
+                          {emails_success.length > 0 ? (
+                            <ul
+                              style={{
+                                height: "275px",
+                                overflowY: "scroll",
+                                overflowX: "scroll",
+                              }}
+                            >
+                              {emails_success.map((email, index) => (
+                                <li
+                                  key={index}
+                                  style={{
+                                    borderTop:
+                                      index !== 0
+                                        ? "1px solid #e0e0e0"
+                                        : "none",
+                                    padding: "8px 0",
+                                    color: "#555",
+                                  }}
+                                >
+                                  {email}
+                                </li>
+                              ))}
+                            </ul>
+                          ) : (
+                            <div
+                              style={{
+                                height: "275px",
+                                display: "flex",
+                                alignItems: "center",
+                                justifyContent: "center",
+                              }}
+                            >
+                              <p>Sem emails para mostrar</p>
+                            </div>
+                          )}
+                        </>
+                      ) : (
+                        <>
+                          {emails_fail.length > 0 ? (
+                            <ul
+                              style={{
+                                height: "275px",
+                                overflowY: "scroll",
+                                overflowX: "scroll",
+                              }}
+                            >
+                              {emails_fail.map((email, index) => (
+                                <li
+                                  key={index}
+                                  style={{
+                                    borderTop:
+                                      index !== 0
+                                        ? "1px solid #e0e0e0"
+                                        : "none",
+                                    padding: "8px 0",
+                                    color: "#555",
+                                  }}
+                                >
+                                  {email}
+                                </li>
+                              ))}
+                            </ul>
+                          ) : (
+                            <div
+                              style={{
+                                height: "275px",
+                                display: "flex",
+                                alignItems: "center",
+                                justifyContent: "center",
+                              }}
+                            >
+                              <p>Sem emails para mostrar</p>
+                            </div>
+                          )}
+                        </>
+                      )}
                     </div>
                   </div>
                 </Modal>

From 983d03464bfe2387e79d693926d3588c00f7bd6d Mon Sep 17 00:00:00 2001
From: pedrofp4444 <pfpereira2004@gmail.com>
Date: Mon, 18 Dec 2023 10:46:16 +0000
Subject: [PATCH 4/7] refactor: set FeedbackModal component and e-mail listing

---
 apps/app/components/FeedbackModal/index.tsx | 48 ++++++++++++++++++
 apps/app/pages/index.tsx                    | 56 ++++++++++++++++++---
 2 files changed, 98 insertions(+), 6 deletions(-)
 create mode 100644 apps/app/components/FeedbackModal/index.tsx

diff --git a/apps/app/components/FeedbackModal/index.tsx b/apps/app/components/FeedbackModal/index.tsx
new file mode 100644
index 00000000..0430b3a2
--- /dev/null
+++ b/apps/app/components/FeedbackModal/index.tsx
@@ -0,0 +1,48 @@
+import { Modal, Tabs, Input } from "antd";
+import React, { useState, useEffect } from "react";
+
+interface TabInfo {
+  tabTitle: string;
+  info: string;
+}
+
+interface DynamicTabsProps {
+  visible: boolean;
+  onClose: () => void;
+  tabsInfo: TabInfo[];
+  modalTitle: string;
+}
+
+const FeedbackModal: React.FC<DynamicTabsProps> = ({ visible, onClose, tabsInfo, modalTitle }) => {
+  const [activeTab, setActiveTab] = useState<string>("");
+  const [tabInfo, setTabInfo] = useState<string>("");
+
+  useEffect(() => {
+    if (tabsInfo.length > 0) {
+      setActiveTab(tabsInfo[0].tabTitle);
+      setTabInfo(tabsInfo[0].info);
+    }
+  }, [tabsInfo]);
+
+  const handleTabChange = (key: string) => {
+    const selectedTab = tabsInfo.find((tab) => tab.tabTitle === key);
+    if (selectedTab) {
+      setActiveTab(selectedTab.tabTitle);
+      setTabInfo(selectedTab.info);
+    }
+  };
+
+  return (
+    <Modal title={modalTitle} visible={visible} onCancel={onClose} footer={null}>
+      <Tabs activeKey={activeTab} onChange={handleTabChange}>
+        {tabsInfo.map((tab) => (
+          <Tabs.TabPane tab={tab.tabTitle} key={tab.tabTitle}>
+            <Input.TextArea value={tabInfo} disabled rows={25} style={{ resize: "none" }} />
+          </Tabs.TabPane>
+        ))}
+      </Tabs>
+    </Modal>
+  );
+};
+
+export default FeedbackModal;
diff --git a/apps/app/pages/index.tsx b/apps/app/pages/index.tsx
index 5c1cef7d..ac05bf88 100644
--- a/apps/app/pages/index.tsx
+++ b/apps/app/pages/index.tsx
@@ -9,6 +9,7 @@ import { EUser, getNinjas, notify_selected, notify_signup } from "bokkenjs";
 import Ninja from "~/components/Ninja";
 import { useEvents } from "~/hooks/events";
 import { notifyError, notifyInfo } from "~/components/Notification";
+import FeedbackModal from "~/components/FeedbackModal";
 import styles from "~/styles/Dashboard.module.css";
 import moment from "moment";
 
@@ -34,11 +35,36 @@ function Dashboard() {
     return sorted_events[0] != undefined ? sorted_events[0] : false;
   };
 
+  const [modalVisible, setModalVisible] = useState(false);
+
+  const openModal = () => {
+    setModalVisible(true);
+  };
+
+  const closeModal = () => {
+    setModalVisible(false);
+  };
+
+  const [tabsInfo, setTabsInfo] = useState([
+    { tabTitle: "None", info: "Sem informação" },
+  ]);
+
   const notify_signup_ninjas = () => {
     notify_signup()
       .then((response) => {
-        // setEmails_success(response.success);
-        // setEmails_fail(response.fail);
+        const successInfo = response.success || "Nenhuma informação a apresentar";
+        const failInfo = response.fail || "Nenhuma informação a apresentar";
+
+        setTabsInfo((prevTabsInfo) => [
+          {
+            tabTitle: "Enviados",
+            info: successInfo,
+          },
+          {
+            tabTitle: "Não enviados",
+            info: failInfo,
+          },
+        ]);
         notifyInfo("Enviado com successo!");
       })
       .catch((error) => {
@@ -49,8 +75,19 @@ function Dashboard() {
   const notify_selected_ninjas = () => {
     notify_selected()
       .then((response) => {
-        // setEmails_success(response.success);
-        // setEmails_fail(response.fail);
+        const successInfo = response.success || "Nenhuma informação a apresentar";
+        const failInfo = response.fail || "Nenhuma informação a apresentar";
+
+        setTabsInfo((prevTabsInfo) => [
+          {
+            tabTitle: "Enviados",
+            info:successInfo,
+          },
+          {
+            tabTitle: "Não enviados",
+            info: failInfo,
+          },
+        ]);
         notifyInfo("Enviado com successo!");
       })
       .catch((error) => {
@@ -84,7 +121,10 @@ function Dashboard() {
                   title="Tens a certeza que queres notificar?"
                   cancelText="Não"
                   okText="Sim"
-                  onConfirm={(_) => notify_signup_ninjas()}
+                  onConfirm={(_) => {
+                    notify_signup_ninjas(); 
+                    openModal();
+                  }}
                 >
                   <Button type="primary">Notificar abertura</Button>
                 </Popconfirm>
@@ -98,7 +138,10 @@ function Dashboard() {
                   title="Tens a certeza que queres notificar?"
                   cancelText="Não"
                   okText="Sim"
-                  onConfirm={(_) => notify_selected_ninjas()}
+                  onConfirm={(_) => {
+                    notify_selected_ninjas();
+                    openModal();
+                  }}
                 >
                   <Button type="primary">Notificar selecionados</Button>
                 </Popconfirm>
@@ -153,6 +196,7 @@ function Dashboard() {
           <></>
         )}
       </AppLayout>
+      <FeedbackModal visible={modalVisible} onClose={closeModal} tabsInfo={tabsInfo} modalTitle="Relatório de e-mails"/>
     </>
   );
 }

From 73d09b5aac3644e13de65544fe2f077d75461d2a Mon Sep 17 00:00:00 2001
From: pedrofp4444 <pfpereira2004@gmail.com>
Date: Mon, 18 Dec 2023 10:48:36 +0000
Subject: [PATCH 5/7] fix: lint and format code

---
 apps/app/components/FeedbackModal/index.tsx | 25 ++++++++++++++++-----
 apps/app/pages/index.tsx                    | 17 +++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/apps/app/components/FeedbackModal/index.tsx b/apps/app/components/FeedbackModal/index.tsx
index 0430b3a2..4dc76890 100644
--- a/apps/app/components/FeedbackModal/index.tsx
+++ b/apps/app/components/FeedbackModal/index.tsx
@@ -1,5 +1,5 @@
-import { Modal, Tabs, Input } from "antd";
-import React, { useState, useEffect } from "react";
+import { Input, Modal, Tabs } from "antd";
+import React, { useEffect, useState } from "react";
 
 interface TabInfo {
   tabTitle: string;
@@ -13,7 +13,12 @@ interface DynamicTabsProps {
   modalTitle: string;
 }
 
-const FeedbackModal: React.FC<DynamicTabsProps> = ({ visible, onClose, tabsInfo, modalTitle }) => {
+const FeedbackModal: React.FC<DynamicTabsProps> = ({
+  visible,
+  onClose,
+  tabsInfo,
+  modalTitle,
+}) => {
   const [activeTab, setActiveTab] = useState<string>("");
   const [tabInfo, setTabInfo] = useState<string>("");
 
@@ -33,11 +38,21 @@ const FeedbackModal: React.FC<DynamicTabsProps> = ({ visible, onClose, tabsInfo,
   };
 
   return (
-    <Modal title={modalTitle} visible={visible} onCancel={onClose} footer={null}>
+    <Modal
+      title={modalTitle}
+      visible={visible}
+      onCancel={onClose}
+      footer={null}
+    >
       <Tabs activeKey={activeTab} onChange={handleTabChange}>
         {tabsInfo.map((tab) => (
           <Tabs.TabPane tab={tab.tabTitle} key={tab.tabTitle}>
-            <Input.TextArea value={tabInfo} disabled rows={25} style={{ resize: "none" }} />
+            <Input.TextArea
+              value={tabInfo}
+              disabled
+              rows={25}
+              style={{ resize: "none" }}
+            />
           </Tabs.TabPane>
         ))}
       </Tabs>
diff --git a/apps/app/pages/index.tsx b/apps/app/pages/index.tsx
index ac05bf88..a085ab73 100644
--- a/apps/app/pages/index.tsx
+++ b/apps/app/pages/index.tsx
@@ -52,7 +52,8 @@ function Dashboard() {
   const notify_signup_ninjas = () => {
     notify_signup()
       .then((response) => {
-        const successInfo = response.success || "Nenhuma informação a apresentar";
+        const successInfo =
+          response.success || "Nenhuma informação a apresentar";
         const failInfo = response.fail || "Nenhuma informação a apresentar";
 
         setTabsInfo((prevTabsInfo) => [
@@ -75,13 +76,14 @@ function Dashboard() {
   const notify_selected_ninjas = () => {
     notify_selected()
       .then((response) => {
-        const successInfo = response.success || "Nenhuma informação a apresentar";
+        const successInfo =
+          response.success || "Nenhuma informação a apresentar";
         const failInfo = response.fail || "Nenhuma informação a apresentar";
 
         setTabsInfo((prevTabsInfo) => [
           {
             tabTitle: "Enviados",
-            info:successInfo,
+            info: successInfo,
           },
           {
             tabTitle: "Não enviados",
@@ -122,7 +124,7 @@ function Dashboard() {
                   cancelText="Não"
                   okText="Sim"
                   onConfirm={(_) => {
-                    notify_signup_ninjas(); 
+                    notify_signup_ninjas();
                     openModal();
                   }}
                 >
@@ -196,7 +198,12 @@ function Dashboard() {
           <></>
         )}
       </AppLayout>
-      <FeedbackModal visible={modalVisible} onClose={closeModal} tabsInfo={tabsInfo} modalTitle="Relatório de e-mails"/>
+      <FeedbackModal
+        visible={modalVisible}
+        onClose={closeModal}
+        tabsInfo={tabsInfo}
+        modalTitle="Relatório de e-mails"
+      />
     </>
   );
 }

From 7f0e17bb5e352edc16157357771293c128130b73 Mon Sep 17 00:00:00 2001
From: pedrofp4444 <pfpereira2004@gmail.com>
Date: Mon, 18 Dec 2023 12:38:19 +0000
Subject: [PATCH 6/7] fix: enhance modal

---
 apps/app/components/FeedbackModal/index.tsx |  3 ++-
 apps/app/pages/index.tsx                    | 16 ++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/apps/app/components/FeedbackModal/index.tsx b/apps/app/components/FeedbackModal/index.tsx
index 4dc76890..04f3e4e3 100644
--- a/apps/app/components/FeedbackModal/index.tsx
+++ b/apps/app/components/FeedbackModal/index.tsx
@@ -49,9 +49,10 @@ const FeedbackModal: React.FC<DynamicTabsProps> = ({
           <Tabs.TabPane tab={tab.tabTitle} key={tab.tabTitle}>
             <Input.TextArea
               value={tabInfo}
-              disabled
               rows={25}
               style={{ resize: "none" }}
+              placeholder="Nenhuma informação para apresentar"
+              readOnly={true}
             />
           </Tabs.TabPane>
         ))}
diff --git a/apps/app/pages/index.tsx b/apps/app/pages/index.tsx
index a085ab73..963b57ad 100644
--- a/apps/app/pages/index.tsx
+++ b/apps/app/pages/index.tsx
@@ -52,18 +52,14 @@ function Dashboard() {
   const notify_signup_ninjas = () => {
     notify_signup()
       .then((response) => {
-        const successInfo =
-          response.success || "Nenhuma informação a apresentar";
-        const failInfo = response.fail || "Nenhuma informação a apresentar";
-
         setTabsInfo((prevTabsInfo) => [
           {
             tabTitle: "Enviados",
-            info: successInfo,
+            info: response.success,
           },
           {
             tabTitle: "Não enviados",
-            info: failInfo,
+            info: response.fail,
           },
         ]);
         notifyInfo("Enviado com successo!");
@@ -76,18 +72,14 @@ function Dashboard() {
   const notify_selected_ninjas = () => {
     notify_selected()
       .then((response) => {
-        const successInfo =
-          response.success || "Nenhuma informação a apresentar";
-        const failInfo = response.fail || "Nenhuma informação a apresentar";
-
         setTabsInfo((prevTabsInfo) => [
           {
             tabTitle: "Enviados",
-            info: successInfo,
+            info: response.success,
           },
           {
             tabTitle: "Não enviados",
-            info: failInfo,
+            info: response.fail,
           },
         ]);
         notifyInfo("Enviado com successo!");

From 93fbcc33f5fcbf14b3c1889b18781965e06d769a Mon Sep 17 00:00:00 2001
From: pedrofp4444 <pfpereira2004@gmail.com>
Date: Wed, 20 Dec 2023 11:32:25 +0000
Subject: [PATCH 7/7] fix: modal appearance

---
 apps/app/pages/index.tsx | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/apps/app/pages/index.tsx b/apps/app/pages/index.tsx
index 963b57ad..00e7a81e 100644
--- a/apps/app/pages/index.tsx
+++ b/apps/app/pages/index.tsx
@@ -62,6 +62,7 @@ function Dashboard() {
             info: response.fail,
           },
         ]);
+        openModal();
         notifyInfo("Enviado com successo!");
       })
       .catch((error) => {
@@ -82,6 +83,7 @@ function Dashboard() {
             info: response.fail,
           },
         ]);
+        openModal();
         notifyInfo("Enviado com successo!");
       })
       .catch((error) => {
@@ -115,10 +117,7 @@ function Dashboard() {
                   title="Tens a certeza que queres notificar?"
                   cancelText="Não"
                   okText="Sim"
-                  onConfirm={(_) => {
-                    notify_signup_ninjas();
-                    openModal();
-                  }}
+                  onConfirm={(_) => notify_signup_ninjas()}
                 >
                   <Button type="primary">Notificar abertura</Button>
                 </Popconfirm>
@@ -132,10 +131,7 @@ function Dashboard() {
                   title="Tens a certeza que queres notificar?"
                   cancelText="Não"
                   okText="Sim"
-                  onConfirm={(_) => {
-                    notify_selected_ninjas();
-                    openModal();
-                  }}
+                  onConfirm={(_) => notify_selected_ninjas()}
                 >
                   <Button type="primary">Notificar selecionados</Button>
                 </Popconfirm>