Merge pull request #114 from kasundie30/main

Updated - Add New buttons
cepdnaclk · Sep 25, 2024 · aa9345c · aa9345c
2 parents 7bee52d + c4e6396
commit aa9345c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/front-end/src/Pages/Deliverables.jsx b/front-end/src/Pages/Deliverables.jsx
@@ -191,6 +191,9 @@ const onViewClick = (deliverable) => {
         </nav>
     </div>
     <div className={style["container"]}>
+      {!addRow && loggedInUser.isLoggedIn && <div>
+        <button className={style["addNewButton"]} onClick={onAddNewClicked}>Add New</button>
+      </div>}
       <div className={style["tableContainer"]}>
           <table className={style["table"]}>
             <thead>
@@ -236,9 +239,6 @@ const onViewClick = (deliverable) => {
             </tfoot> */}
           </table>
       </div>
-      {!addRow && loggedInUser.isLoggedIn && <div>
-        <button className={style["addNewButton"]} onClick={onAddNewClicked}>Add New</button>
-      </div>}
     </div>
     { (addRow || editRow) &&  <Dialog
           open={showDiologBox}

diff --git a/front-end/src/Pages/Workplan.jsx b/front-end/src/Pages/Workplan.jsx
@@ -178,6 +178,9 @@ function Workplan() {
           <h3>Workplan</h3>
       </div>
     <div className={style["container"]}>
+      {!addRow && loggedInUser.isLoggedIn && <div>
+        <button className={style["addNewButton"]} onClick={onAddNewClicked}>Add New</button>
+      </div>}
       <div className={style["tableContainer"]}>
           <table className={style["table"]}>
             <thead>
@@ -248,9 +251,6 @@ function Workplan() {
             </tfoot> */}
           </table>
       </div>
-      {!addRow && loggedInUser.isLoggedIn && <div>
-        <button className={style["addNewButton"]} onClick={onAddNewClicked}>Add New</button>
-      </div>}
       </div>
       {/* Dialog- Add New Row/Edit Row */}
       { (addRow || editRow) &&  <Dialog

diff --git a/front-end/src/components/Deliverables.module.css b/front-end/src/components/Deliverables.module.css
@@ -102,14 +102,14 @@
 
 /* Add New Button */
 .addNewButton{
-  width: 100px;
+  width: 150px;
   height: 50px;
   margin: 20px 0px;
   padding: 10px 20px;
-  font-size: 14px;
   background-color: hsl(226, 64%, 35%);
   text-decoration: none;
-  font-family: Arial, sans-serif;
+  font-size: 16px;
+  font-family: 'Caudex';
   border: none;
   border-radius: 5px;
   cursor: pointer;

diff --git a/front-end/src/components/Workplan.module.css b/front-end/src/components/Workplan.module.css
@@ -103,14 +103,14 @@
 
 /* Add New Button */
 .addNewButton{
-  width: 100px;
+  width: 150px;
   height: 50px;
   margin: 20px 0px;
   padding: 10px 20px;
-  font-size: 14px;
   background-color: hsl(226, 64%, 35%);
   text-decoration: none;
-  font-family: Arial, sans-serif;
+  font-size: 16px;
+  font-family: 'Caudex';
   border: none;
   border-radius: 5px;
   cursor: pointer;