From 41e8203c0804b0d7a0cc92f26ac4c6f95e622e01 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 8 Sep 2023 12:24:11 -0400
Subject: [PATCH 01/93] initial commit

---
 .../BMDashboard/ProjectDetails/LogBar.jsx     |  8 +++++
 .../ProjectDetails/Materials/MaterialCard.jsx |  8 +++++
 .../ProjectDetails/Materials/Materials.jsx    | 14 +++++++++
 .../ProjectDetails/ProjectDetails.jsx         | 30 +++++++++++++++++++
 .../BMDashboard/ProjectDetails/ProjectLog.jsx |  8 +++++
 .../RentedTools/RentedTools.jsx               | 14 +++++++++
 .../ProjectDetails/RentedTools/ToolCard.jsx   |  8 +++++
 src/routes.js                                 |  2 ++
 8 files changed, 92 insertions(+)
 create mode 100644 src/components/BMDashboard/ProjectDetails/LogBar.jsx
 create mode 100644 src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
 create mode 100644 src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
 create mode 100644 src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
 create mode 100644 src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
 create mode 100644 src/components/BMDashboard/ProjectDetails/RentedTools/RentedTools.jsx
 create mode 100644 src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx

diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
new file mode 100644
index 0000000000..65f0f0bbea
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import { Card } from 'reactstrap';
+
+function LogBar() {
+  return <Card style={{ backgroundColor: '#f6f6f3', margin: 20 }}>Add buttons here</Card>;
+}
+
+export default LogBar;
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
new file mode 100644
index 0000000000..1233c32e50
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import { Card } from 'reactstrap';
+
+function MaterialCard() {
+  return <Card style={{ margin: '20px', width: '30%' }}>MaterialCard</Card>;
+}
+
+export default MaterialCard;
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx b/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
new file mode 100644
index 0000000000..39b1e04ed6
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { Card } from 'reactstrap';
+import MaterialCard from './MaterialCard';
+
+function Materials() {
+  return (
+    <Card style={{ margin: 20 }}>
+      <h5>Materials with quantity less than 20% left</h5>
+      <MaterialCard />
+    </Card>
+  );
+}
+
+export default Materials;
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
new file mode 100644
index 0000000000..9305d261d5
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { Container, Row, Col } from 'reactstrap';
+import LogBar from './LogBar';
+import RentedTools from './RentedTools/RentedTools';
+import Materials from './Materials/Materials';
+import ProjectLog from './ProjectLog';
+
+function ProjectDetails() {
+  return (
+    <Container>
+      <h2>Project A Dashboard</h2>
+      <Row>
+        <LogBar />
+      </Row>
+      <Row>
+        <Col>
+          <RentedTools />
+        </Col>
+        <Col>
+          <Materials />
+        </Col>
+      </Row>
+      <Row>
+        <ProjectLog />
+      </Row>
+    </Container>
+  );
+}
+
+export default ProjectDetails;
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
new file mode 100644
index 0000000000..0a8519f087
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import { Card } from 'reactstrap';
+
+function ProjectLog() {
+  return <Card>Project Log</Card>;
+}
+
+export default ProjectLog;
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedTools.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedTools.jsx
new file mode 100644
index 0000000000..2cca86e996
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedTools.jsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { Card } from 'reactstrap';
+import ToolCard from './ToolCard';
+
+function RentedTools() {
+  return (
+    <Card style={{ margin: 20 }}>
+      <h5>Rented Tools or equipment to be returned in 3 days.</h5>
+      <ToolCard />
+    </Card>
+  );
+}
+
+export default RentedTools;
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
new file mode 100644
index 0000000000..c53567e4dc
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import { Card } from 'reactstrap';
+
+function ToolCard() {
+  return <Card style={{ margin: '20px', width: '30%' }}>ToolCard</Card>;
+}
+
+export default ToolCard;
diff --git a/src/routes.js b/src/routes.js
index 40d2ed78e4..3eec81d2da 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -37,6 +37,7 @@ import { TeamReport } from './components/Reports/TeamReport';
 import Inventory from './components/Inventory';
 import BadgeManagement from './components/Badge/BadgeManagement';
 import RoleInfoCollections from 'components/UserProfile/EditableModal/roleInfoModal';
+import ProjectDetails from 'components/BMDashboard/ProjectDetails/ProjectDetails';
 
 export default (
   <>
@@ -151,6 +152,7 @@ export default (
       <Route path="/Logout" component={Logout} />
       <Route path="/forcePasswordUpdate/:userId" component={ForcePasswordUpdate} />
       <ProtectedRoute path="/" exact component={Dashboard} />
+      <Route path="/BMDashboard/:projectId" component={ProjectDetails} />
     </Switch>
   </>
 );

From eb39df9d256a43122989a025c8415dea341a64e1 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 8 Sep 2023 16:22:03 -0400
Subject: [PATCH 02/93] logbar design

---
 .../BMDashboard/ProjectDetails/LogBar.css     | 34 +++++++++++++
 .../BMDashboard/ProjectDetails/LogBar.jsx     | 50 ++++++++++++++++++-
 .../ProjectDetails/Materials/Materials.jsx    |  2 +-
 .../ProjectDetails/ProjectDetails.css         |  9 ++++
 .../ProjectDetails/ProjectDetails.jsx         |  6 ++-
 .../BMDashboard/ProjectDetails/ProjectLog.css |  8 +++
 .../BMDashboard/ProjectDetails/ProjectLog.jsx |  7 ++-
 .../RentedTools/RentedTools.jsx               |  2 +-
 8 files changed, 111 insertions(+), 7 deletions(-)
 create mode 100644 src/components/BMDashboard/ProjectDetails/LogBar.css
 create mode 100644 src/components/BMDashboard/ProjectDetails/ProjectDetails.css
 create mode 100644 src/components/BMDashboard/ProjectDetails/ProjectLog.css

diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.css b/src/components/BMDashboard/ProjectDetails/LogBar.css
new file mode 100644
index 0000000000..6d89ec29a1
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.css
@@ -0,0 +1,34 @@
+.logBar-container{
+  display: grid;
+  grid-template-columns: auto auto;
+  text-align: left;
+  justify-content:space-around;
+  padding: 1em;
+  margin-top: 2em;
+  margin-bottom: 2em;
+  padding-left: 2em;
+  padding-right: 2em;
+  width: 100%;
+  background-color: #eaeeef;
+}
+
+.logBar-section{
+  margin-top: 1em;
+}
+
+.logBar-container > *:last-child{
+ 
+}
+
+.logBar-btnGroup{
+ margin-top: -0.5em;
+}
+
+.btn-red Button{
+  background-color: '#015d4a'; 
+  border: 0; 
+  border-radius: '10px'
+}
+
+
+
diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
index 65f0f0bbea..b9f0b0c75b 100644
--- a/src/components/BMDashboard/ProjectDetails/LogBar.jsx
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
@@ -1,8 +1,54 @@
 import React from 'react';
-import { Card } from 'reactstrap';
+import { Button } from 'reactstrap';
+import './LogBar.css';
 
 function LogBar() {
-  return <Card style={{ backgroundColor: '#f6f6f3', margin: 20 }}>Add buttons here</Card>;
+  return (
+    <div className="logBar-container">
+      <div className="logBar-section">
+        <p>Daily Logging:</p>
+        <div className="logBar-btnGroup">
+          <Button style={{ backgroundColor: '#015d4a', border: 0, borderRadius: '10px' }}>
+            Time
+          </Button>{' '}
+          <Button style={{ backgroundColor: '#015d4a', border: 0, borderRadius: '10px' }}>
+            Material
+          </Button>{' '}
+          <Button style={{ backgroundColor: '#015d4a', border: 0, borderRadius: '10px' }}>
+            Tool/Equipment
+          </Button>
+        </div>
+      </div>
+      <div className="logBar-section">
+        <p>Add a new item:</p>
+        <div className="logBar-btnGroup">
+          <Button style={{ backgroundColor: '#0d5675', border: 0, borderRadius: '10px' }}>
+            Team
+          </Button>{' '}
+          <Button style={{ backgroundColor: '#0d5675', border: 0, borderRadius: '10px' }}>
+            Material
+          </Button>{' '}
+          <Button style={{ backgroundColor: '#0d5675', border: 0, borderRadius: '10px' }}>
+            Tool/Equipment
+          </Button>
+        </div>
+      </div>
+      <div className="logBar-section">
+        <p>Team:</p>
+        <div className="logBar-btnGroup">
+          <Button style={{ backgroundColor: '#203844', border: 0, borderRadius: '10px' }}>
+            Create New Team
+          </Button>{' '}
+          <Button style={{ backgroundColor: '#203844', border: 0, borderRadius: '10px' }}>
+            Edit Existing Team
+          </Button>{' '}
+          <Button style={{ backgroundColor: '#980101', border: 0, borderRadius: '10px' }}>
+            Log Issue
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
 }
 
 export default LogBar;
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx b/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
index 39b1e04ed6..9a1c4c9858 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
@@ -5,7 +5,7 @@ import MaterialCard from './MaterialCard';
 function Materials() {
   return (
     <Card style={{ margin: 20 }}>
-      <h5>Materials with quantity less than 20% left</h5>
+      <h6>Materials with quantity less than 20% left</h6>
       <MaterialCard />
     </Card>
   );
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
new file mode 100644
index 0000000000..a853ca5e44
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
@@ -0,0 +1,9 @@
+.project-details{
+  text-align: center;
+  padding-top: 20px;
+  padding-left: 3%;
+  padding-right: 3%;
+  margin-top: 40px;
+  margin-bottom: 20px;
+  font-weight: bold;
+}
\ No newline at end of file
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
index 9305d261d5..a063ff9fb8 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
@@ -4,11 +4,13 @@ import LogBar from './LogBar';
 import RentedTools from './RentedTools/RentedTools';
 import Materials from './Materials/Materials';
 import ProjectLog from './ProjectLog';
+import './ProjectDetails.css';
+//import { boxStyle } from 'styles';
 
 function ProjectDetails() {
   return (
-    <Container>
-      <h2>Project A Dashboard</h2>
+    <Container className='project-details'>
+      <h3>Project A Dashboard</h3>
       <Row>
         <LogBar />
       </Row>
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.css b/src/components/BMDashboard/ProjectDetails/ProjectLog.css
new file mode 100644
index 0000000000..081b109709
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/ProjectLog.css
@@ -0,0 +1,8 @@
+.projectLog-container{
+  padding: 1em;
+  margin-top: 2em;
+  margin-bottom: 2em;
+  padding-left: 2em;
+  padding-right: 2em;
+  width: 100%;
+}
\ No newline at end of file
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
index 0a8519f087..bae7057cc5 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
@@ -1,8 +1,13 @@
 import React from 'react';
 import { Card } from 'reactstrap';
+import './ProjectLog.css';
 
 function ProjectLog() {
-  return <Card>Project Log</Card>;
+  return (
+    <Card className="projectLog-container">
+      <h6>Members working on site today</h6>
+    </Card>
+  );
 }
 
 export default ProjectLog;
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedTools.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedTools.jsx
index 2cca86e996..d136eaf009 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedTools.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedTools.jsx
@@ -5,7 +5,7 @@ import ToolCard from './ToolCard';
 function RentedTools() {
   return (
     <Card style={{ margin: 20 }}>
-      <h5>Rented Tools or equipment to be returned in 3 days.</h5>
+      <h6>Rented Tools or equipment to be returned in 3 days.</h6>
       <ToolCard />
     </Card>
   );

From e03c4fb612d5beafeb4c3edadad7f274d7d72f01 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Tue, 12 Sep 2023 11:03:27 -0400
Subject: [PATCH 03/93] rented tools and materials display design

---
 .../BMDashboard/ProjectDetails/LogBar.css     | 50 +++++++++++++------
 .../BMDashboard/ProjectDetails/LogBar.jsx     | 39 +++++++++++----
 .../ProjectDetails/Materials/MaterialCard.jsx | 13 +++--
 .../ProjectDetails/Materials/Materials.jsx    | 12 ++---
 .../Materials/MaterialsDisplay.css            |  5 ++
 .../Materials/MaterialsDisplay.jsx            | 15 ++++++
 .../ProjectDetails/ProjectDetails.jsx         | 15 +++---
 .../BMDashboard/ProjectDetails/ProjectLog.css |  7 +--
 .../RentedTools/RentedTools.jsx               | 14 ------
 .../RentedTools/RentedToolsDisplay.css        |  5 ++
 .../RentedTools/RentedToolsDisplay.jsx        | 15 ++++++
 .../ProjectDetails/RentedTools/ToolCard.css   |  7 +++
 .../ProjectDetails/RentedTools/ToolCard.jsx   | 17 ++++++-
 .../ProjectDetails/RentedTools/ToolCards.css  | 11 ++++
 .../ProjectDetails/RentedTools/ToolCards.jsx  | 16 ++++++
 15 files changed, 178 insertions(+), 63 deletions(-)
 create mode 100644 src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.css
 create mode 100644 src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
 delete mode 100644 src/components/BMDashboard/ProjectDetails/RentedTools/RentedTools.jsx
 create mode 100644 src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.css
 create mode 100644 src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
 create mode 100644 src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.css
 create mode 100644 src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.css
 create mode 100644 src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx

diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.css b/src/components/BMDashboard/ProjectDetails/LogBar.css
index 6d89ec29a1..ea3f750b0e 100644
--- a/src/components/BMDashboard/ProjectDetails/LogBar.css
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.css
@@ -1,34 +1,52 @@
 .logBar-container{
-  display: grid;
-  grid-template-columns: auto auto;
-  text-align: left;
-  justify-content:space-around;
-  padding: 1em;
-  margin-top: 2em;
-  margin-bottom: 2em;
-  padding-left: 2em;
-  padding-right: 2em;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  margin: 2em;
+  padding: 1em 2em;
   width: 100%;
   background-color: #eaeeef;
 }
 
 .logBar-section{
+  width: 100%;
   margin-top: 1em;
 }
 
-.logBar-container > *:last-child{
- 
+.logBar-btnGroup{
+ margin-top: -0.5em;
+}
+
+
+@media (min-width:600px){
+.logBar-container{
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  margin: 2em;
+  padding: 1em 2em 2em 2em;  
+}
+
+
+.logBar-section{
+  width: 50%;
+  margin-top: 1em;
 }
 
+
+/* .logBar-container > *:last-child{
+ align-self: baseline;
+ background-color: red;
+} */
+
 .logBar-btnGroup{
  margin-top: -0.5em;
 }
-
-.btn-red Button{
-  background-color: '#015d4a'; 
-  border: 0; 
-  border-radius: '10px'
 }
 
 
 
+
+
+
diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
index b9f0b0c75b..2d122551bc 100644
--- a/src/components/BMDashboard/ProjectDetails/LogBar.jsx
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
@@ -8,13 +8,19 @@ function LogBar() {
       <div className="logBar-section">
         <p>Daily Logging:</p>
         <div className="logBar-btnGroup">
-          <Button style={{ backgroundColor: '#015d4a', border: 0, borderRadius: '10px' }}>
+          <Button
+            style={{ backgroundColor: '#015d4a', border: 0, borderRadius: '10px', margin: '0.1em' }}
+          >
             Time
           </Button>{' '}
-          <Button style={{ backgroundColor: '#015d4a', border: 0, borderRadius: '10px' }}>
+          <Button
+            style={{ backgroundColor: '#015d4a', border: 0, borderRadius: '10px', margin: '0.1em' }}
+          >
             Material
           </Button>{' '}
-          <Button style={{ backgroundColor: '#015d4a', border: 0, borderRadius: '10px' }}>
+          <Button
+            style={{ backgroundColor: '#015d4a', border: 0, borderRadius: '10px', margin: '0.1em' }}
+          >
             Tool/Equipment
           </Button>
         </div>
@@ -22,13 +28,19 @@ function LogBar() {
       <div className="logBar-section">
         <p>Add a new item:</p>
         <div className="logBar-btnGroup">
-          <Button style={{ backgroundColor: '#0d5675', border: 0, borderRadius: '10px' }}>
+          <Button
+            style={{ backgroundColor: '#0d5675', border: 0, borderRadius: '10px', margin: '0.1em' }}
+          >
             Team
           </Button>{' '}
-          <Button style={{ backgroundColor: '#0d5675', border: 0, borderRadius: '10px' }}>
+          <Button
+            style={{ backgroundColor: '#0d5675', border: 0, borderRadius: '10px', margin: '0.1em' }}
+          >
             Material
           </Button>{' '}
-          <Button style={{ backgroundColor: '#0d5675', border: 0, borderRadius: '10px' }}>
+          <Button
+            style={{ backgroundColor: '#0d5675', border: 0, borderRadius: '10px', margin: '0.1em' }}
+          >
             Tool/Equipment
           </Button>
         </div>
@@ -36,13 +48,22 @@ function LogBar() {
       <div className="logBar-section">
         <p>Team:</p>
         <div className="logBar-btnGroup">
-          <Button style={{ backgroundColor: '#203844', border: 0, borderRadius: '10px' }}>
+          <Button
+            style={{ backgroundColor: '#203844', border: 0, borderRadius: '10px', margin: '0.1em' }}
+          >
             Create New Team
           </Button>{' '}
-          <Button style={{ backgroundColor: '#203844', border: 0, borderRadius: '10px' }}>
+          <Button
+            style={{ backgroundColor: '#203844', border: 0, borderRadius: '10px', margin: '0.1em' }}
+          >
             Edit Existing Team
           </Button>{' '}
-          <Button style={{ backgroundColor: '#980101', border: 0, borderRadius: '10px' }}>
+        </div>
+      </div>
+      <div className="logBar-section">
+        <p style={{ visibility: 'hidden' }}>Invisible</p>
+        <div className="logBar-btnGroup">
+          <Button style={{ backgroundColor: '#980101', border: 0, borderRadius: '10px', margin: '0.1em' }}>
             Log Issue
           </Button>
         </div>
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
index 1233c32e50..482211ba85 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
@@ -1,8 +1,15 @@
-import React from 'react';
-import { Card } from 'reactstrap';
+import { Card, CardImg, CardBody, CardTitle } from 'reactstrap';
 
 function MaterialCard() {
-  return <Card style={{ margin: '20px', width: '30%' }}>MaterialCard</Card>;
+  return (
+    <Card className="materialCard">
+      <CardImg alt="" src="https://www.theforkliftcenter.com/images/forklift-hero-left.png" top />
+      <CardBody>
+        <CardTitle tag="h6">Card title</CardTitle>
+        <div className="infoDiv">Term ends in __ hours.</div>
+      </CardBody>
+    </Card>
+  );
 }
 
 export default MaterialCard;
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx b/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
index 9a1c4c9858..9b8e46659e 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
@@ -1,14 +1,14 @@
-import React from 'react';
-import { Card } from 'reactstrap';
+import { CardGroup } from 'reactstrap';
 import MaterialCard from './MaterialCard';
 
 function Materials() {
   return (
-    <Card style={{ margin: 20 }}>
-      <h6>Materials with quantity less than 20% left</h6>
+    <CardGroup>
       <MaterialCard />
-    </Card>
+      <MaterialCard />
+      <MaterialCard />
+    </CardGroup>
   );
 }
 
-export default Materials;
+export default Materials;
\ No newline at end of file
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.css b/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.css
new file mode 100644
index 0000000000..50079b5557
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.css
@@ -0,0 +1,5 @@
+.materials-container{
+  align-items: center;
+  margin: 2em;
+  padding: 1em 2em;
+}
\ No newline at end of file
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx b/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
new file mode 100644
index 0000000000..24e0346e3c
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { Card } from 'reactstrap';
+import Materials from './Materials';
+import './MaterialsDisplay.css';
+
+function MaterialsDisplay() {
+  return (
+    <Card className="materials-container">
+      <h6>Materials with quantity less than 20% left</h6>
+      <Materials />
+    </Card>
+  );
+}
+
+export default MaterialsDisplay;
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
index a063ff9fb8..6957e78847 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
@@ -1,25 +1,24 @@
 import React from 'react';
 import { Container, Row, Col } from 'reactstrap';
 import LogBar from './LogBar';
-import RentedTools from './RentedTools/RentedTools';
-import Materials from './Materials/Materials';
+import RentedToolsDisplay from './RentedTools/RentedToolsDisplay';
+import MaterialsDisplay from './Materials/MaterialsDisplay';
 import ProjectLog from './ProjectLog';
 import './ProjectDetails.css';
-//import { boxStyle } from 'styles';
 
 function ProjectDetails() {
   return (
-    <Container className='project-details'>
+    <Container fluid className="project-details">
       <h3>Project A Dashboard</h3>
       <Row>
         <LogBar />
       </Row>
       <Row>
-        <Col>
-          <RentedTools />
+        <Col md="6" sm="12">
+          <RentedToolsDisplay />
         </Col>
-        <Col>
-          <Materials />
+        <Col md="6" sm="12">
+          <MaterialsDisplay />
         </Col>
       </Row>
       <Row>
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.css b/src/components/BMDashboard/ProjectDetails/ProjectLog.css
index 081b109709..7ac3c5ef4c 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectLog.css
+++ b/src/components/BMDashboard/ProjectDetails/ProjectLog.css
@@ -1,8 +1,5 @@
 .projectLog-container{
-  padding: 1em;
-  margin-top: 2em;
-  margin-bottom: 2em;
-  padding-left: 2em;
-  padding-right: 2em;
+  margin: 2em;
+  padding: 1em 2em;
   width: 100%;
 }
\ No newline at end of file
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedTools.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedTools.jsx
deleted file mode 100644
index d136eaf009..0000000000
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedTools.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-import { Card } from 'reactstrap';
-import ToolCard from './ToolCard';
-
-function RentedTools() {
-  return (
-    <Card style={{ margin: 20 }}>
-      <h6>Rented Tools or equipment to be returned in 3 days.</h6>
-      <ToolCard />
-    </Card>
-  );
-}
-
-export default RentedTools;
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.css b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.css
new file mode 100644
index 0000000000..ce1aa3a345
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.css
@@ -0,0 +1,5 @@
+.rentedTools-container{
+  align-items: center;
+  margin: 2em;
+  padding: 1em 2em;
+}
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
new file mode 100644
index 0000000000..092227f729
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import { Card } from 'reactstrap';
+import './RentedToolsDisplay.css';
+import ToolCards from './ToolCards';
+
+function RentedToolsDisplay() {
+  return (
+    <Card className="rentedTools-container">
+      <h6>Rented Tools or equipment to be returned in 3 days.</h6>
+      <ToolCards />  
+    </Card>
+  );
+}
+
+export default RentedToolsDisplay;
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.css b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.css
new file mode 100644
index 0000000000..0bff782ebb
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.css
@@ -0,0 +1,7 @@
+
+.infoDiv{
+  font-size: 0.3rem;
+}
+
+
+
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
index c53567e4dc..b45bbf36f9 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
@@ -1,8 +1,21 @@
 import React from 'react';
-import { Card } from 'reactstrap';
+import './ToolCard.css';
+import { Card, CardImg, CardBody, CardTitle } from 'reactstrap';
 
 function ToolCard() {
-  return <Card style={{ margin: '20px', width: '30%' }}>ToolCard</Card>;
+  return (
+    <Card className="toolCard">
+      <CardImg
+        alt=""
+        src="https://www.theforkliftcenter.com/images/forklift-hero-left.png"
+        top
+      />
+      <CardBody>
+        <CardTitle tag="h6">Card title</CardTitle>
+        <div className='infoDiv'>Term ends in __ hours.</div>
+      </CardBody>
+    </Card>
+  );
 }
 
 export default ToolCard;
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.css b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.css
new file mode 100644
index 0000000000..813ca95789
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.css
@@ -0,0 +1,11 @@
+/* .cardGroup{
+  display: flex;
+  flex-direction: column;
+  gap: 1em;
+}
+
+@media (min-width:600px){
+  .cardGroup{
+     flex-direction: row;
+  }
+} */
\ No newline at end of file
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx
new file mode 100644
index 0000000000..f534fa19dd
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx
@@ -0,0 +1,16 @@
+import './ToolCards.css';
+import { CardGroup } from 'reactstrap';
+import ToolCard from './ToolCard';
+
+
+const ToolCards = () => {
+  return (
+    <CardGroup>
+      <ToolCard />
+      <ToolCard />
+      <ToolCard />
+    </CardGroup>
+  );
+}
+
+export default ToolCards
\ No newline at end of file

From 93a45a136abb49378a842251d8c0c2b09e8fd16c Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Tue, 12 Sep 2023 14:53:44 -0400
Subject: [PATCH 04/93] projectLog component done

---
 .../ProjectDetails/Materials/MaterialCard.css |  2 +
 .../ProjectDetails/Materials/MaterialCard.jsx |  2 +
 .../ProjectDetails/ProjectDetails.jsx         |  4 +-
 .../BMDashboard/ProjectDetails/ProjectLog.css |  1 +
 .../BMDashboard/ProjectDetails/ProjectLog.jsx | 65 ++++++++++++++++++-
 .../ProjectDetails/RentedTools/ToolCard.css   | 13 +++-
 .../ProjectDetails/RentedTools/ToolCard.jsx   |  3 +-
 7 files changed, 85 insertions(+), 5 deletions(-)
 create mode 100644 src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.css

diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.css b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.css
new file mode 100644
index 0000000000..139597f9cb
--- /dev/null
+++ b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.css
@@ -0,0 +1,2 @@
+
+
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
index 482211ba85..2eedbfd2ec 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
@@ -1,4 +1,6 @@
 import { Card, CardImg, CardBody, CardTitle } from 'reactstrap';
+import './MaterialCard.css';
+
 
 function MaterialCard() {
   return (
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
index 6957e78847..617638964e 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
@@ -14,10 +14,10 @@ function ProjectDetails() {
         <LogBar />
       </Row>
       <Row>
-        <Col md="6" sm="12">
+        <Col lg="5" md="12">
           <RentedToolsDisplay />
         </Col>
-        <Col md="6" sm="12">
+        <Col lg="5" md="12">
           <MaterialsDisplay />
         </Col>
       </Row>
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.css b/src/components/BMDashboard/ProjectDetails/ProjectLog.css
index 7ac3c5ef4c..d749f7b127 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectLog.css
+++ b/src/components/BMDashboard/ProjectDetails/ProjectLog.css
@@ -2,4 +2,5 @@
   margin: 2em;
   padding: 1em 2em;
   width: 100%;
+  font-weight: lighter;
 }
\ No newline at end of file
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
index bae7057cc5..ddc5d5b372 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
@@ -1,11 +1,74 @@
 import React from 'react';
-import { Card } from 'reactstrap';
+import { Card, Table } from 'reactstrap';
 import './ProjectLog.css';
 
+
+const DummyData = [
+  {
+    id: '12',
+    firstName: 'Dora',
+    lastName: 'Kimberly',
+    role: 'Carpenter',
+    team: 'XYZ',
+    currentTask: 'Stud wall construction',
+    totalHrs: 169,
+    todaysHrs: 5.5,
+  },
+  {
+    id: '35',
+    firstName: 'Cailin',
+    lastName: 'Colby',
+    role: 'Volunteer',
+    team: 'Team A',
+    currentTask: 'Foundation concreting',
+    totalHrs: 15,
+    todaysHrs: 2.18,
+  },
+  {
+    id: '35',
+    firstName: 'Member A',
+    lastName: 'Member A',
+    role: 'Role A',
+    team: 'Team A',
+    currentTask: 'Task 1',
+    totalHrs: 169,
+    todaysHrs: 5.5,
+  },
+];
+
 function ProjectLog() {
+
+  const tableRows = DummyData.map((person, index) => (
+    <tr key={index}>
+      <th scope="row">{person.id}</th>
+      <td>{person.firstName}</td>
+      <td>{person.lastName}</td>
+      <td>{person.role}</td>
+      <td>{person.team}</td>
+      <td>{person.currentTask}</td>
+      <td>{person.totalHrs}</td>
+      <td>{person.todaysHrs}</td>
+    </tr>
+  ));
+
   return (
     <Card className="projectLog-container">
       <h6>Members working on site today</h6>
+      <Table hover responsive>
+        <thead>
+          <tr>
+            <th>ID</th>
+            <th>First Name</th>
+            <th>Last Name</th>
+            <th>Role</th>
+            <th>Team</th>
+            <th>Current Task</th>
+            <th>Total Hrs</th>
+            <th>Today's Hrs</th>
+          </tr>
+        </thead>
+        <tbody>{tableRows}</tbody>
+      </Table>
     </Card>
   );
 }
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.css b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.css
index 0bff782ebb..b9bdd22c0a 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.css
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.css
@@ -1,6 +1,17 @@
+/* .toolCard{
+ max-width: 30%;
+} */
 
 .infoDiv{
-  font-size: 0.3rem;
+  font-size: 0.5rem;
+  margin: -1em 0.5em;
+  border-radius: 10px; 
+  background-color: #f2c897 ;
+}
+
+.infoDiv .warning{
+  color: white;
+  background-color: #980101; 
 }
 
 
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
index b45bbf36f9..88e01ba0f6 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
@@ -9,10 +9,11 @@ function ToolCard() {
         alt=""
         src="https://www.theforkliftcenter.com/images/forklift-hero-left.png"
         top
+        width="100%"
       />
       <CardBody>
         <CardTitle tag="h6">Card title</CardTitle>
-        <div className='infoDiv'>Term ends in __ hours.</div>
+        <div className="infoDiv">Term ends in __ hours.</div>
       </CardBody>
     </Card>
   );

From 54eddd234ab0a8fde47da63b935b4d07dba33d02 Mon Sep 17 00:00:00 2001
From: Nathan Hoffman <nathanahoffman@gmail.com>
Date: Tue, 12 Sep 2023 14:23:22 -0700
Subject: [PATCH 05/93] Reset User permissions

---
 .../UserPermissionsPopUp.jsx                  | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/components/PermissionsManagement/UserPermissionsPopUp.jsx b/src/components/PermissionsManagement/UserPermissionsPopUp.jsx
index ff382d227a..a226056eeb 100644
--- a/src/components/PermissionsManagement/UserPermissionsPopUp.jsx
+++ b/src/components/PermissionsManagement/UserPermissionsPopUp.jsx
@@ -18,6 +18,12 @@ const UserPermissionsPopUp = ({ allUserProfiles, toggle, getAllUsers, roles }) =
   const [isInputFocus, setIsInputFocus] = useState(false);
   const [actualUserRolePermission, setActualUserRolePermission] = useState();
 
+  const setToDefault = () => {
+    setActualUserProfile(previous => {
+      return { ...previous, permissions: {frontPermissions: [],} };
+    });
+  }
+
   //no onchange, always change this state;
   const onChangeCheck = data => {
     const actualValue = data;
@@ -102,7 +108,21 @@ const UserPermissionsPopUp = ({ allUserProfiles, toggle, getAllUsers, roles }) =
         updateProfileOnSubmit(e);
       }}
     >
-      <h4 className="user-permissions-pop-up__title">User name:</h4>
+      <div style={{display: 'flex', justifyContent: 'space-between', paddingBottom: '5px'}}>
+        <h4 className="user-permissions-pop-up__title">User name:</h4>
+        <Button
+          type="button"
+          color="success"
+          onClick={e => {
+            setToDefault();
+            updateProfileOnSubmit(e);
+          }}
+          disabled={actualUserProfile ? false : true}
+          style={boxStyle}
+        >
+          Reset to Default
+        </Button>
+      </div>
       <Dropdown
         isOpen={isOpen}
         toggle={() => {

From 64d27abaf98d19984282c22028da10fe4c73dde9 Mon Sep 17 00:00:00 2001
From: Nathan Hoffman <nathanahoffman@gmail.com>
Date: Tue, 12 Sep 2023 14:24:20 -0700
Subject: [PATCH 06/93] Formatting

---
 .../PermissionsManagement/PermissionsManagement.jsx       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/PermissionsManagement/PermissionsManagement.jsx b/src/components/PermissionsManagement/PermissionsManagement.jsx
index 4bb5c5bf9e..4dc258ef88 100644
--- a/src/components/PermissionsManagement/PermissionsManagement.jsx
+++ b/src/components/PermissionsManagement/PermissionsManagement.jsx
@@ -51,17 +51,17 @@ const PermissionsManagement = ({ getAllRoles, roles, auth, getUserRole, userProf
                   className="role-btn"
                 >
                   {roleName}
-                 </button> 
+                 </button>
                   <div className='infos'>
                     <EditableInfoModal
                     role={role}
                     areaName={`${roleName}`+'Info'}
                     fontSize={18}
                     isPermissionPage={true}
-                    /> 
+                    />
                   </div>
-              </div>           
-            )})};
+              </div>
+            )})}
         </div>
         {userProfile?.role === 'Owner' && (
           <div className="buttons-container">

From ea4686821d45882432df29cca5a2de079a640bf7 Mon Sep 17 00:00:00 2001
From: Bailey Mejia <baileymejia28@gmail.com>
Date: Mon, 18 Sep 2023 17:50:57 -0700
Subject: [PATCH 07/93] saving local changes to logo

---
 src/assets/images/logo.png | Bin 52558 -> 52555 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
index 80c152655938727811809651aef9f132f1f7fee2..ac4d741d97a7776c5bc723d4e13263ed8b6e352f 100644
GIT binary patch
delta 25
hcmX>%i}~~{W|qzXKlhESOGG!X5;arU{LnOaIsk<B3Q7O~

delta 30
lcmX>-i}~CvX4cLCKX=}ZEK5Wgc{i^RHB$gm_e^uA0|2Fe3T^-Z


From f4b7f44f0567543ab792bd6c6cc979d650e9353b Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Tue, 19 Sep 2023 10:44:35 -0400
Subject: [PATCH 08/93] updates

---
 .../BMDashboard/ProjectDetails/LogBar.css     |  52 --------
 .../BMDashboard/ProjectDetails/LogBar.jsx     |  16 +--
 .../ProjectDetails/Materials/MaterialCard.css |   2 -
 .../ProjectDetails/Materials/MaterialCard.jsx |  23 ++--
 .../ProjectDetails/Materials/Materials.jsx    |   5 +-
 .../Materials/MaterialsDisplay.css            |   5 -
 .../Materials/MaterialsDisplay.jsx            |   3 +-
 .../ProjectDetails/ProjectDetails.css         | 126 ++++++++++++++++++
 .../ProjectDetails/ProjectDetails.jsx         |   6 +-
 .../BMDashboard/ProjectDetails/ProjectLog.css |   6 -
 .../BMDashboard/ProjectDetails/ProjectLog.jsx |   2 -
 .../RentedTools/RentedToolsDisplay.css        |   5 -
 .../RentedTools/RentedToolsDisplay.jsx        |   3 +-
 .../ProjectDetails/RentedTools/ToolCard.css   |  18 ---
 .../ProjectDetails/RentedTools/ToolCard.jsx   |  26 ++--
 .../ProjectDetails/RentedTools/ToolCards.css  |  11 --
 .../ProjectDetails/RentedTools/ToolCards.jsx  |   6 +-
 17 files changed, 167 insertions(+), 148 deletions(-)
 delete mode 100644 src/components/BMDashboard/ProjectDetails/LogBar.css
 delete mode 100644 src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.css
 delete mode 100644 src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.css
 delete mode 100644 src/components/BMDashboard/ProjectDetails/ProjectLog.css
 delete mode 100644 src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.css
 delete mode 100644 src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.css
 delete mode 100644 src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.css

diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.css b/src/components/BMDashboard/ProjectDetails/LogBar.css
deleted file mode 100644
index ea3f750b0e..0000000000
--- a/src/components/BMDashboard/ProjectDetails/LogBar.css
+++ /dev/null
@@ -1,52 +0,0 @@
-.logBar-container{
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  margin: 2em;
-  padding: 1em 2em;
-  width: 100%;
-  background-color: #eaeeef;
-}
-
-.logBar-section{
-  width: 100%;
-  margin-top: 1em;
-}
-
-.logBar-btnGroup{
- margin-top: -0.5em;
-}
-
-
-@media (min-width:600px){
-.logBar-container{
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  justify-content: space-around;
-  margin: 2em;
-  padding: 1em 2em 2em 2em;  
-}
-
-
-.logBar-section{
-  width: 50%;
-  margin-top: 1em;
-}
-
-
-/* .logBar-container > *:last-child{
- align-self: baseline;
- background-color: red;
-} */
-
-.logBar-btnGroup{
- margin-top: -0.5em;
-}
-}
-
-
-
-
-
-
diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
index 2d122551bc..25f3dc2ef5 100644
--- a/src/components/BMDashboard/ProjectDetails/LogBar.jsx
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { Button } from 'reactstrap';
-import './LogBar.css';
 
 function LogBar() {
   return (
@@ -29,17 +28,17 @@ function LogBar() {
         <p>Add a new item:</p>
         <div className="logBar-btnGroup">
           <Button
-            style={{ backgroundColor: '#0d5675', border: 0, borderRadius: '10px', margin: '0.1em' }}
+            style={{ backgroundColor: '#0f6386', border: 0, borderRadius: '10px', margin: '0.1em' }}
           >
             Team
           </Button>{' '}
           <Button
-            style={{ backgroundColor: '#0d5675', border: 0, borderRadius: '10px', margin: '0.1em' }}
+            style={{ backgroundColor: '#0f6386', border: 0, borderRadius: '10px', margin: '0.1em' }}
           >
             Material
           </Button>{' '}
           <Button
-            style={{ backgroundColor: '#0d5675', border: 0, borderRadius: '10px', margin: '0.1em' }}
+            style={{ backgroundColor: '#0f6386', border: 0, borderRadius: '10px', margin: '0.1em' }}
           >
             Tool/Equipment
           </Button>
@@ -58,12 +57,9 @@ function LogBar() {
           >
             Edit Existing Team
           </Button>{' '}
-        </div>
-      </div>
-      <div className="logBar-section">
-        <p style={{ visibility: 'hidden' }}>Invisible</p>
-        <div className="logBar-btnGroup">
-          <Button style={{ backgroundColor: '#980101', border: 0, borderRadius: '10px', margin: '0.1em' }}>
+          <Button
+            style={{ backgroundColor: '#980101', border: 0, borderRadius: '10px', margin: '0.1em' }}
+          >
             Log Issue
           </Button>
         </div>
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.css b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.css
deleted file mode 100644
index 139597f9cb..0000000000
--- a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.css
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
index 2eedbfd2ec..171ee0b8a8 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
@@ -1,16 +1,19 @@
-import { Card, CardImg, CardBody, CardTitle } from 'reactstrap';
-import './MaterialCard.css';
-
-
 function MaterialCard() {
   return (
-    <Card className="materialCard">
-      <CardImg alt="" src="https://www.theforkliftcenter.com/images/forklift-hero-left.png" top />
-      <CardBody>
-        <CardTitle tag="h6">Card title</CardTitle>
+    <div className="singleCard">
+      <div className="cardImg">
+        <img
+          alt=""
+          src="https://www.theforkliftcenter.com/images/forklift-hero-left.png"
+          top
+          width="100%"
+        />
+      </div>
+      <div className="cardBody">
+        <h6>Card title</h6>
         <div className="infoDiv">Term ends in __ hours.</div>
-      </CardBody>
-    </Card>
+      </div>
+    </div>
   );
 }
 
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx b/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
index 9b8e46659e..80632a70af 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
@@ -1,13 +1,12 @@
-import { CardGroup } from 'reactstrap';
 import MaterialCard from './MaterialCard';
 
 function Materials() {
   return (
-    <CardGroup>
+    <div className="cards-container_content">
       <MaterialCard />
       <MaterialCard />
       <MaterialCard />
-    </CardGroup>
+    </div>
   );
 }
 
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.css b/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.css
deleted file mode 100644
index 50079b5557..0000000000
--- a/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.materials-container{
-  align-items: center;
-  margin: 2em;
-  padding: 1em 2em;
-}
\ No newline at end of file
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx b/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
index 24e0346e3c..707ce7d434 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
@@ -1,11 +1,10 @@
 import React from 'react';
 import { Card } from 'reactstrap';
 import Materials from './Materials';
-import './MaterialsDisplay.css';
 
 function MaterialsDisplay() {
   return (
-    <Card className="materials-container">
+    <Card className="cards-container">
       <h6>Materials with quantity less than 20% left</h6>
       <Materials />
     </Card>
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
index a853ca5e44..4793d3bbca 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
@@ -6,4 +6,130 @@
   margin-top: 40px;
   margin-bottom: 20px;
   font-weight: bold;
+}
+
+/* styling for the logBar component - i.e. dashboard with buttons */
+
+.logBar-container{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  margin: 2em;
+  padding: 1em 2em;
+  width: 100%;
+  background-color: #eaeeef;
+}
+
+.logBar-section{
+  width: 100%;
+  margin-top: 1em;
+}
+
+
+.logBar-btnGroup{
+ margin-top: -0.5em;
+}
+
+
+@media (min-width:600px){
+.logBar-container{
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  margin: 2em;  
+}
+
+/* .logBar-container .logBar-section:first-of-type{
+  background-color: red;
+  
+  
+} */
+
+.logBar-section{
+  width: 40%;
+
+}
+
+.logBar-btnGroup{
+ margin-top: -0.5em;
+ width: 100%;
+}
+}
+
+/* styling for containers with cards */
+.cards-container{
+  align-items: center;
+  margin: 1em 2em;
+  padding: 1em 2em;
+}
+
+.cards-container_content{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+}
+
+/* styling for single card element */
+.singleCard{
+  border: 1px solid #eaeeef;
+  border-radius: 5px;
+  text-align: center;
+  margin-bottom: 0.5em; 
+  cursor: pointer; 
+}
+
+.singleCard:hover{
+  box-shadow: 0 20px 20px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2);
+  transform: translate3d(0.5px,0.5px,0.5px);
+}
+
+.cardBody{
+margin-top: 0.5em;
+}
+
+.cardBody h6{
+margin-bottom: -0.2em;
+}
+
+@media (min-width:600px){
+.cards-container_content{
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+}
+
+/* styling for single card element */
+.singleCard{
+  margin-right: 0.5em;
+}
+}
+
+/* button on a card */
+.infoDiv{
+  font-size: 0.5rem;
+  padding: 1em;
+  margin: 0.5em;
+  border-radius: 10px; 
+  background-color: #f2c897 ;
+}
+
+/* TO DO: dynamic value to be added */
+.infoDiv .warning{
+  color: white;
+  background-color: #980101; 
+}
+
+/* styling for project log - i.e.table at the bottom */
+.projectLog-container{
+  margin: 2em;
+  padding: 1em 2em;
+  width: 100%;
+  font-weight: lighter;
+}
+
+.projectLog-container h6{
+  font-weight: bold;
 }
\ No newline at end of file
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
index 617638964e..2c65378a7c 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
@@ -8,16 +8,16 @@ import './ProjectDetails.css';
 
 function ProjectDetails() {
   return (
-    <Container fluid className="project-details">
+    <Container className="project-details" fluid>
       <h3>Project A Dashboard</h3>
       <Row>
         <LogBar />
       </Row>
       <Row>
-        <Col lg="5" md="12">
+        <Col lg="6" md="12">
           <RentedToolsDisplay />
         </Col>
-        <Col lg="5" md="12">
+        <Col lg="6" md="12">
           <MaterialsDisplay />
         </Col>
       </Row>
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.css b/src/components/BMDashboard/ProjectDetails/ProjectLog.css
deleted file mode 100644
index d749f7b127..0000000000
--- a/src/components/BMDashboard/ProjectDetails/ProjectLog.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.projectLog-container{
-  margin: 2em;
-  padding: 1em 2em;
-  width: 100%;
-  font-weight: lighter;
-}
\ No newline at end of file
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
index ddc5d5b372..4c4f9bed6d 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
@@ -1,7 +1,5 @@
 import React from 'react';
 import { Card, Table } from 'reactstrap';
-import './ProjectLog.css';
-
 
 const DummyData = [
   {
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.css b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.css
deleted file mode 100644
index ce1aa3a345..0000000000
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.rentedTools-container{
-  align-items: center;
-  margin: 2em;
-  padding: 1em 2em;
-}
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
index 092227f729..5d1981ec44 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
@@ -1,11 +1,10 @@
 import React from 'react';
 import { Card } from 'reactstrap';
-import './RentedToolsDisplay.css';
 import ToolCards from './ToolCards';
 
 function RentedToolsDisplay() {
   return (
-    <Card className="rentedTools-container">
+    <Card className="cards-container">
       <h6>Rented Tools or equipment to be returned in 3 days.</h6>
       <ToolCards />  
     </Card>
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.css b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.css
deleted file mode 100644
index b9bdd22c0a..0000000000
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/* .toolCard{
- max-width: 30%;
-} */
-
-.infoDiv{
-  font-size: 0.5rem;
-  margin: -1em 0.5em;
-  border-radius: 10px; 
-  background-color: #f2c897 ;
-}
-
-.infoDiv .warning{
-  color: white;
-  background-color: #980101; 
-}
-
-
-
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
index 88e01ba0f6..9071232cee 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
@@ -1,21 +1,21 @@
 import React from 'react';
-import './ToolCard.css';
-import { Card, CardImg, CardBody, CardTitle } from 'reactstrap';
 
 function ToolCard() {
   return (
-    <Card className="toolCard">
-      <CardImg
-        alt=""
-        src="https://www.theforkliftcenter.com/images/forklift-hero-left.png"
-        top
-        width="100%"
-      />
-      <CardBody>
-        <CardTitle tag="h6">Card title</CardTitle>
+    <div className="singleCard">
+      <div className="cardImg">
+        <img
+          alt=""
+          src="https://www.theforkliftcenter.com/images/forklift-hero-left.png"
+          top
+          width="100%"
+        />
+      </div>
+      <div className="cardBody">
+        <h6>Card title</h6>
         <div className="infoDiv">Term ends in __ hours.</div>
-      </CardBody>
-    </Card>
+      </div>
+    </div>
   );
 }
 
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.css b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.css
deleted file mode 100644
index 813ca95789..0000000000
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/* .cardGroup{
-  display: flex;
-  flex-direction: column;
-  gap: 1em;
-}
-
-@media (min-width:600px){
-  .cardGroup{
-     flex-direction: row;
-  }
-} */
\ No newline at end of file
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx
index f534fa19dd..e85df41ba5 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx
@@ -1,15 +1,13 @@
-import './ToolCards.css';
-import { CardGroup } from 'reactstrap';
 import ToolCard from './ToolCard';
 
 
 const ToolCards = () => {
   return (
-    <CardGroup>
+    <div className="cards-container_content">
       <ToolCard />
       <ToolCard />
       <ToolCard />
-    </CardGroup>
+    </div>
   );
 }
 

From 98438044476c93573d0d6879ec5cd66dee04b2d5 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Tue, 19 Sep 2023 12:31:28 -0400
Subject: [PATCH 09/93] added custom button styles to css file

---
 .../BMDashboard/ProjectDetails/LogBar.jsx     | 46 ++++---------------
 .../ProjectDetails/ProjectDetails.css         | 29 ++++++++++--
 2 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
index 25f3dc2ef5..c5ad5676b2 100644
--- a/src/components/BMDashboard/ProjectDetails/LogBar.jsx
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
@@ -7,58 +7,30 @@ function LogBar() {
       <div className="logBar-section">
         <p>Daily Logging:</p>
         <div className="logBar-btnGroup">
-          <Button
-            style={{ backgroundColor: '#015d4a', border: 0, borderRadius: '10px', margin: '0.1em' }}
-          >
-            Time
-          </Button>{' '}
-          <Button
-            style={{ backgroundColor: '#015d4a', border: 0, borderRadius: '10px', margin: '0.1em' }}
-          >
-            Material
-          </Button>{' '}
-          <Button
-            style={{ backgroundColor: '#015d4a', border: 0, borderRadius: '10px', margin: '0.1em' }}
-          >
-            Tool/Equipment
-          </Button>
+          <Button className="greenBtn">Time</Button> <Button className="greenBtn">Material</Button>{' '}
+          <Button className="greenBtn">Tool/Equipment</Button>
         </div>
       </div>
       <div className="logBar-section">
         <p>Add a new item:</p>
         <div className="logBar-btnGroup">
           <Button
-            style={{ backgroundColor: '#0f6386', border: 0, borderRadius: '10px', margin: '0.1em' }}
+            className="lightBlueBtn"
+            // style={{ backgroundColor: '#0f6386', border: 0, borderRadius: '10px', margin: '0.1em' }}
           >
             Team
           </Button>{' '}
-          <Button
-            style={{ backgroundColor: '#0f6386', border: 0, borderRadius: '10px', margin: '0.1em' }}
-          >
-            Material
-          </Button>{' '}
-          <Button
-            style={{ backgroundColor: '#0f6386', border: 0, borderRadius: '10px', margin: '0.1em' }}
-          >
-            Tool/Equipment
-          </Button>
+          <Button className="lightBlueBtn">Material</Button>{' '}
+          <Button className="lightBlueBtn">Tool/Equipment</Button>
         </div>
       </div>
       <div className="logBar-section">
         <p>Team:</p>
         <div className="logBar-btnGroup">
+          <Button className="darkBlueBtn">Create New Team</Button>{' '}
+          <Button className="darkBlueBtn">Edit Existing Team</Button>{' '}
           <Button
-            style={{ backgroundColor: '#203844', border: 0, borderRadius: '10px', margin: '0.1em' }}
-          >
-            Create New Team
-          </Button>{' '}
-          <Button
-            style={{ backgroundColor: '#203844', border: 0, borderRadius: '10px', margin: '0.1em' }}
-          >
-            Edit Existing Team
-          </Button>{' '}
-          <Button
-            style={{ backgroundColor: '#980101', border: 0, borderRadius: '10px', margin: '0.1em' }}
+            className="redBtn"
           >
             Log Issue
           </Button>
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
index 4793d3bbca..1a23db977c 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
@@ -30,14 +30,37 @@
  margin-top: -0.5em;
 }
 
+button.btn.btn-secondary{
+  border: 0;
+  border-radius: 10px;
+  margin: 0.1em
+}
+
+/* buttons custom colors */
+button.btn.btn-secondary.greenBtn{
+  background-color: #015d4a;
+}
+
+button.btn.btn-secondary.lightBlueBtn{
+  background-color: #0f6386;
+}
+
+button.btn.btn-secondary.darkBlueBtn{
+  background-color: #203844;
+}
+
+button.btn.btn-secondary.redBtn{
+  background-color: #980101;
+}
 
 @media (min-width:600px){
 .logBar-container{
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  justify-content: space-around;
-  margin: 2em;  
+  justify-content: center;
+  margin: 2em; 
+  text-align: left; 
 }
 
 /* .logBar-container .logBar-section:first-of-type{
@@ -53,7 +76,7 @@
 
 .logBar-btnGroup{
  margin-top: -0.5em;
- width: 100%;
+ 
 }
 }
 

From 833c5c3a319db295fecedf1a3d28400ec4182499 Mon Sep 17 00:00:00 2001
From: robertoooc <robertooo.c48@gmail.com>
Date: Sat, 16 Sep 2023 17:01:35 -0700
Subject: [PATCH 10/93]  .

---
 Dockerfile | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8e2770b994..bd987a421f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,16 @@
-# Define a imagem base
-FROM node:14-alpine
-# Set the working directory to /app
-WORKDIR /app
-# Copy the package.json and yarn.lock files to the container
-COPY package.json yarn.lock ./
-# Install dependencies
-RUN yarn install
-# Copy the rest of the app files to the container
-COPY . ./
-# Build the app
-RUN yarn build
-# Expose port 3000
-EXPOSE 3000
-# Set the startup command to run the app using Node.js
+# Define a imagem base
+FROM node:14-alpine
+# Set the working directory to /app
+WORKDIR /app
+# Copy the package.json and yarn.lock files to the container
+COPY package.json yarn.lock ./
+# Install dependencies
+RUN yarn install
+# Copy the rest of the app files to the container
+COPY . ./
+# Build the app
+RUN yarn build
+# Expose port 3000
+EXPOSE 3000
+# Set the startup command to run the app using Node.js
 CMD ["yarn", "start:local"]
\ No newline at end of file

From 4a8f72f78ede089f1c5f24d7d7ebe0227361cc31 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Tue, 19 Sep 2023 14:14:17 -0400
Subject: [PATCH 11/93] fixed button styling

---
 .../BMDashboard/ProjectDetails/LogBar.jsx     |  2 +-
 .../ProjectDetails/ProjectDetails.css         | 34 +++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
index c5ad5676b2..f64d45b492 100644
--- a/src/components/BMDashboard/ProjectDetails/LogBar.jsx
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
@@ -24,7 +24,7 @@ function LogBar() {
           <Button className="lightBlueBtn">Tool/Equipment</Button>
         </div>
       </div>
-      <div className="logBar-section">
+      <div className="logBar-section thirdSection">
         <p>Team:</p>
         <div className="logBar-btnGroup">
           <Button className="darkBlueBtn">Create New Team</Button>{' '}
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
index 1a23db977c..dcc467f48e 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
@@ -26,14 +26,11 @@
 }
 
 
-.logBar-btnGroup{
- margin-top: -0.5em;
-}
-
 button.btn.btn-secondary{
   border: 0;
   border-radius: 10px;
-  margin: 0.1em
+  margin: 0.1em;
+  width: 100%;
 }
 
 /* buttons custom colors */
@@ -51,6 +48,7 @@ button.btn.btn-secondary.darkBlueBtn{
 
 button.btn.btn-secondary.redBtn{
   background-color: #980101;
+  margin-top: 2em;
 }
 
 @media (min-width:600px){
@@ -59,24 +57,30 @@ button.btn.btn-secondary.redBtn{
   flex-direction: row;
   flex-wrap: wrap;
   justify-content: center;
-  margin: 2em; 
-  text-align: left; 
+  margin: 2em;  
 }
 
-/* .logBar-container .logBar-section:first-of-type{
-  background-color: red;
-  
-  
-} */
 
 .logBar-section{
-  width: 40%;
+  width: 50%;
+}
 
+ .thirdSection{
+  width:fit-content; 
 }
 
 .logBar-btnGroup{
- margin-top: -0.5em;
- 
+ margin-top: -0.5em; 
+ display: flex;
+ justify-content: center;
+}
+
+button.btn.btn-secondary{
+  width: auto;
+}
+
+button.btn.btn-secondary.redBtn{
+  margin-top: auto;
 }
 }
 

From db4ced82f4ce804fcfcd5fd4886d1f68ff78667e Mon Sep 17 00:00:00 2001
From: robertoooc <robertooo.c48@gmail.com>
Date: Wed, 20 Sep 2023 11:17:38 -0700
Subject: [PATCH 12/93] Added function adding newly created user to team
 following the user creation action

---
 .../UserProfile/AddNewUserProfile/UserProfileAdd.jsx  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/UserProfile/AddNewUserProfile/UserProfileAdd.jsx b/src/components/UserProfile/AddNewUserProfile/UserProfileAdd.jsx
index 8c519c03d3..d4bba89387 100644
--- a/src/components/UserProfile/AddNewUserProfile/UserProfileAdd.jsx
+++ b/src/components/UserProfile/AddNewUserProfile/UserProfileAdd.jsx
@@ -24,7 +24,7 @@ import { toast } from 'react-toastify';
 import TeamsTab from '../TeamsAndProjects/TeamsTab';
 import ProjectsTab from '../TeamsAndProjects/ProjectsTab';
 import { connect } from 'react-redux';
-import { get } from 'lodash';
+import { assign, get } from 'lodash';
 import { getUserProfile, updateUserProfile, clearUserProfile } from '../../../actions/userProfile';
 import {
   getAllUserTeams,
@@ -107,13 +107,13 @@ class AddUserProfile extends Component {
     this.state.showphone = true;
     this.onCreateNewUser();
   }
-
+  
+  
   render() {
     const { firstName, email, lastName, phoneNumber, role, jobTitle } = this.state.userProfile;
     const phoneNumberEntered =
       this.state.userProfile.phoneNumber === null ||
       this.state.userProfile.phoneNumber.length === 0;
-
     return (
       <StickyContainer>
         <DuplicateNamePopup
@@ -469,6 +469,10 @@ class AddUserProfile extends Component {
     });
   };
 
+  onAddTeamMember = (teamId, userId, firstName, lastName) => {
+    this.props.addTeamMember(teamId, userId, firstName, lastName);
+  }
+
   onAssignProject = assignedProject => {
     const projects = [...this.state.projects];
     projects.push(assignedProject);
@@ -650,6 +654,7 @@ class AddUserProfile extends Component {
               return;
             } else {
               toast.success('User profile created.');
+              this.onAddTeamMember(this.state.teams[0]._id, res.data._id, this.state.userProfile.firstName, this.state.userProfile.lastName);
             }
             this.props.userCreated();
           })

From e121e61b3c23baad7a63b1f623a7809508e496a4 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Wed, 20 Sep 2023 15:51:59 -0400
Subject: [PATCH 13/93] logbar finished

---
 .../BMDashboard/ProjectDetails/LogBar.jsx     | 10 +++----
 .../ProjectDetails/ProjectDetails.css         | 27 ++++++++++++++-----
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
index f64d45b492..4adf13fb0e 100644
--- a/src/components/BMDashboard/ProjectDetails/LogBar.jsx
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
@@ -24,16 +24,12 @@ function LogBar() {
           <Button className="lightBlueBtn">Tool/Equipment</Button>
         </div>
       </div>
-      <div className="logBar-section thirdSection">
+      <div className="logBar-section">
         <p>Team:</p>
-        <div className="logBar-btnGroup">
+        <div className="logBar-btnGroup thirdSection">
           <Button className="darkBlueBtn">Create New Team</Button>{' '}
           <Button className="darkBlueBtn">Edit Existing Team</Button>{' '}
-          <Button
-            className="redBtn"
-          >
-            Log Issue
-          </Button>
+          <Button className="redBtn">Log Issue</Button>
         </div>
       </div>
     </div>
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
index dcc467f48e..c2abb252d7 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
@@ -51,23 +51,37 @@ button.btn.btn-secondary.redBtn{
   margin-top: 2em;
 }
 
-@media (min-width:600px){
+@media (min-width:550px){
+ .logBar-container{
+  display: flex;
+  flex-direction: column;  
+}
+
+button.btn.btn-secondary{
+  width: auto;
+}
+
+button.btn.btn-secondary.redBtn{
+  margin-top: auto;
+}
+
+}
+
+@media (min-width:750px){
 .logBar-container{
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
   justify-content: center;
-  margin: 2em;  
+  margin: 2em; 
 }
 
 
 .logBar-section{
   width: 50%;
+  flex: auto;
 }
 
- .thirdSection{
-  width:fit-content; 
-}
 
 .logBar-btnGroup{
  margin-top: -0.5em; 
@@ -81,6 +95,7 @@ button.btn.btn-secondary{
 
 button.btn.btn-secondary.redBtn{
   margin-top: auto;
+  margin-left: 2em;
 }
 }
 
@@ -120,7 +135,7 @@ margin-top: 0.5em;
 margin-bottom: -0.2em;
 }
 
-@media (min-width:600px){
+@media (min-width:650px){
 .cards-container_content{
   display: flex;
   flex-direction: row;

From 2c4a75bc13478187c8492701d0673049e78ccf64 Mon Sep 17 00:00:00 2001
From: robertoooc <robertooo.c48@gmail.com>
Date: Wed, 20 Sep 2023 18:22:03 -0700
Subject: [PATCH 14/93] updated TeamsTab component allowing users to actually
 be added to teams from user profile >> assign team

---
 .../AddNewUserProfile/UserProfileAdd.jsx            | 13 +++++++------
 .../UserProfile/TeamsAndProjects/TeamsTab.jsx       |  5 +++++
 src/components/UserProfile/UserProfile.jsx          |  2 ++
 .../UserProfile/UserProfileEdit/UserProfileEdit.jsx |  1 +
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/components/UserProfile/AddNewUserProfile/UserProfileAdd.jsx b/src/components/UserProfile/AddNewUserProfile/UserProfileAdd.jsx
index d4bba89387..69d4af9924 100644
--- a/src/components/UserProfile/AddNewUserProfile/UserProfileAdd.jsx
+++ b/src/components/UserProfile/AddNewUserProfile/UserProfileAdd.jsx
@@ -417,6 +417,7 @@ class AddUserProfile extends Component {
                     isUserAdmin={true}
                     role={this.props.auth.user.role}
                     edit
+                    userProfile={this.state.userProfile}
                   />
                 </TabPane>
               </TabContent>
@@ -463,16 +464,11 @@ class AddUserProfile extends Component {
   onAssignTeam = assignedTeam => {
     const teams = [...this.state.teams];
     teams.push(assignedTeam);
-
     this.setState({
       teams: teams,
     });
   };
 
-  onAddTeamMember = (teamId, userId, firstName, lastName) => {
-    this.props.addTeamMember(teamId, userId, firstName, lastName);
-  }
-
   onAssignProject = assignedProject => {
     const projects = [...this.state.projects];
     projects.push(assignedProject);
@@ -654,7 +650,12 @@ class AddUserProfile extends Component {
               return;
             } else {
               toast.success('User profile created.');
-              this.onAddTeamMember(this.state.teams[0]._id, res.data._id, this.state.userProfile.firstName, this.state.userProfile.lastName);
+              this.state.userProfile._id = res.data._id;
+              if(this.state.teams.length > 0){
+                this.state.teams.forEach((team) => {
+                  this.props.addTeamMember(team._id, res.data._id, res.data.firstName, res.data.lastName)
+                })
+              }
             }
             this.props.userCreated();
           })
diff --git a/src/components/UserProfile/TeamsAndProjects/TeamsTab.jsx b/src/components/UserProfile/TeamsAndProjects/TeamsTab.jsx
index d04113f058..f78950f71b 100644
--- a/src/components/UserProfile/TeamsAndProjects/TeamsTab.jsx
+++ b/src/components/UserProfile/TeamsAndProjects/TeamsTab.jsx
@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import AddTeamPopup from './AddTeamPopup';
 import UserTeamsTable from './UserTeamsTable';
+import { addTeamMember } from 'actions/allTeamsAction';
 
 const TeamsTab = props => {
   const {
@@ -15,6 +16,7 @@ const TeamsTab = props => {
     canEditVisibility,
     handleSubmit,
     disabled,
+    userProfile,
   } = props;
   const [addTeamPopupOpen, setaddTeamPopupOpen] = useState(false);
   const [renderedOn, setRenderedOn] = useState(0);
@@ -31,6 +33,9 @@ const TeamsTab = props => {
   };
 
   const onSelectAssignTeam = team => {
+    if(userProfile._id){
+      addTeamMember(team._id, userProfile._id, userProfile.firstName, userProfile.lastName)
+    }
     onAssignTeam(team);
     setRenderedOn(Date.now());
   };
diff --git a/src/components/UserProfile/UserProfile.jsx b/src/components/UserProfile/UserProfile.jsx
index d008bd37c0..c563636083 100644
--- a/src/components/UserProfile/UserProfile.jsx
+++ b/src/components/UserProfile/UserProfile.jsx
@@ -870,6 +870,7 @@ function UserProfile(props) {
                     !formValid.email ||
                     !(isProfileEqual && isTasksEqual && isTeamsEqual && isProjectsEqual)
                   }
+                  userProfile={userProfile}
                 />
               </TabPane>
               <TabPane tabId="4">
@@ -1064,6 +1065,7 @@ function UserProfile(props) {
                       !formValid.email ||
                       !(isProfileEqual && isTasksEqual && isTeamsEqual && isProjectsEqual)
                     }
+                    userProfile={userProfile}
                   />
                 </ModalBody>
                 <ModalFooter>
diff --git a/src/components/UserProfile/UserProfileEdit/UserProfileEdit.jsx b/src/components/UserProfile/UserProfileEdit/UserProfileEdit.jsx
index 28ca737be0..53ffd7c331 100644
--- a/src/components/UserProfile/UserProfileEdit/UserProfileEdit.jsx
+++ b/src/components/UserProfile/UserProfileEdit/UserProfileEdit.jsx
@@ -934,6 +934,7 @@ class UserProfileEdit extends Component {
                       onDeleteTeam={this.onDeleteTeam}
                       role={requestorRole}
                       edit
+                      userProfile={this.state ? this.state.userProfile : []}
                     />
                   </TabPane>
                   <TabPane tabId="4">

From 8c85d9e0ecf0f9e370fe5d9b4e1e892f8bfe1d26 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Thu, 21 Sep 2023 10:05:50 -0400
Subject: [PATCH 15/93] fixed cards responsiveness

---
 .../Materials/MaterialsDisplay.jsx            |   2 +-
 .../ProjectDetails/ProjectDetails.css         | 159 +++++++++---------
 .../RentedTools/RentedToolsDisplay.jsx        |   2 +-
 3 files changed, 82 insertions(+), 81 deletions(-)

diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx b/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
index 707ce7d434..05537c85e7 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
@@ -5,7 +5,7 @@ import Materials from './Materials';
 function MaterialsDisplay() {
   return (
     <Card className="cards-container">
-      <h6>Materials with quantity less than 20% left</h6>
+      <h6 className="cards-container_header">Materials with quantity less than 20% left</h6>
       <Materials />
     </Card>
   );
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
index c2abb252d7..30628a0c52 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
@@ -1,4 +1,4 @@
-.project-details{
+.project-details {
   text-align: center;
   padding-top: 20px;
   padding-left: 3%;
@@ -10,7 +10,7 @@
 
 /* styling for the logBar component - i.e. dashboard with buttons */
 
-.logBar-container{
+.logBar-container {
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -20,13 +20,12 @@
   background-color: #eaeeef;
 }
 
-.logBar-section{
+.logBar-section {
   width: 100%;
   margin-top: 1em;
 }
 
-
-button.btn.btn-secondary{
+button.btn.btn-secondary {
   border: 0;
   border-radius: 10px;
   margin: 0.1em;
@@ -34,79 +33,76 @@ button.btn.btn-secondary{
 }
 
 /* buttons custom colors */
-button.btn.btn-secondary.greenBtn{
+button.btn.btn-secondary.greenBtn {
   background-color: #015d4a;
 }
 
-button.btn.btn-secondary.lightBlueBtn{
+button.btn.btn-secondary.lightBlueBtn {
   background-color: #0f6386;
 }
 
-button.btn.btn-secondary.darkBlueBtn{
+button.btn.btn-secondary.darkBlueBtn {
   background-color: #203844;
 }
 
-button.btn.btn-secondary.redBtn{
+button.btn.btn-secondary.redBtn {
   background-color: #980101;
   margin-top: 2em;
 }
 
-@media (min-width:550px){
- .logBar-container{
-  display: flex;
-  flex-direction: column;  
-}
-
-button.btn.btn-secondary{
-  width: auto;
-}
-
-button.btn.btn-secondary.redBtn{
-  margin-top: auto;
-}
+@media (min-width: 550px) {
+  .logBar-container {
+    display: flex;
+    flex-direction: column;
+  }
 
-}
+  button.btn.btn-secondary {
+    width: auto;
+  }
 
-@media (min-width:750px){
-.logBar-container{
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  justify-content: center;
-  margin: 2em; 
+  button.btn.btn-secondary.redBtn {
+    margin-top: auto;
+  }
 }
 
+@media (min-width: 750px) {
+  .logBar-container {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: center;
+    margin: 2em;
+  }
 
-.logBar-section{
-  width: 50%;
-  flex: auto;
-}
+  .logBar-section {
+    width: 50%;
+    flex: auto;
+  }
 
+  .logBar-btnGroup {
+    margin-top: -0.5em;
+    display: flex;
+    justify-content: center;
+  }
 
-.logBar-btnGroup{
- margin-top: -0.5em; 
- display: flex;
- justify-content: center;
-}
+  button.btn.btn-secondary {
+    width: auto;
+  }
 
-button.btn.btn-secondary{
-  width: auto;
-}
-
-button.btn.btn-secondary.redBtn{
-  margin-top: auto;
-  margin-left: 2em;
-}
+  button.btn.btn-secondary.redBtn {
+    margin-top: auto;
+    margin-left: 2em;
+  }
 }
 
 /* styling for containers with cards */
-.cards-container{
+.card.cards-container {
   align-items: center;
   margin: 1em 2em;
   padding: 1em 2em;
 }
 
-.cards-container_content{
+.cards-container_content {
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -114,64 +110,69 @@ button.btn.btn-secondary.redBtn{
 }
 
 /* styling for single card element */
-.singleCard{
+.singleCard {
   border: 1px solid #eaeeef;
   border-radius: 5px;
   text-align: center;
-  margin-bottom: 0.5em; 
-  cursor: pointer; 
+  margin-bottom: 0.5em;
+  cursor: pointer;
 }
 
-.singleCard:hover{
+.singleCard:hover {
   box-shadow: 0 20px 20px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2);
-  transform: translate3d(0.5px,0.5px,0.5px);
-}
-
-.cardBody{
-margin-top: 0.5em;
+  transform: translate3d(0.5px, 0.5px, 0.5px);
 }
 
-.cardBody h6{
-margin-bottom: -0.2em;
+.cardBody {
+  margin-top: 0.5em;
 }
 
-@media (min-width:650px){
-.cards-container_content{
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  justify-content: flex-start;
-}
-
-/* styling for single card element */
-.singleCard{
-  margin-right: 0.5em;
-}
+.cardBody h6 {
+  margin-bottom: -0.2em;
 }
 
 /* button on a card */
-.infoDiv{
+.infoDiv {
   font-size: 0.5rem;
   padding: 1em;
   margin: 0.5em;
-  border-radius: 10px; 
-  background-color: #f2c897 ;
+  border-radius: 10px;
+  background-color: #f2c897;
 }
 
 /* TO DO: dynamic value to be added */
-.infoDiv .warning{
+/* .infoDiv .warning{
   color: white;
   background-color: #980101; 
+} */
+
+@media (min-width: 600px) {
+  .cards-container_header {
+    height: 38px;
+  }
+
+  .cards-container_content {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: space-around;
+  }
+
+  /* styling for single card element */
+  .singleCard {
+    margin: auto 0.2em;
+    flex: none;
+  }
 }
 
 /* styling for project log - i.e.table at the bottom */
-.projectLog-container{
+.projectLog-container {
   margin: 2em;
   padding: 1em 2em;
   width: 100%;
   font-weight: lighter;
 }
 
-.projectLog-container h6{
+.projectLog-container h6 {
   font-weight: bold;
-}
\ No newline at end of file
+}
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
index 5d1981ec44..8eda6ec1dc 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
@@ -5,7 +5,7 @@ import ToolCards from './ToolCards';
 function RentedToolsDisplay() {
   return (
     <Card className="cards-container">
-      <h6>Rented Tools or equipment to be returned in 3 days.</h6>
+      <h6 className="cards-container_header">Rented Tools or equipment to be returned in 3 days.</h6>
       <ToolCards />  
     </Card>
   );

From 54d971f852a5703d7928e63da415786d69c5a7f4 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 22 Sep 2023 15:38:30 -0400
Subject: [PATCH 16/93] updated semantic tags throughout

---
 .../BMDashboard/ProjectDetails/LogBar.jsx     | 58 ++++++++++++-------
 .../ProjectDetails/Materials/MaterialCard.jsx |  3 +-
 .../Materials/MaterialsDisplay.jsx            |  2 +-
 .../ProjectDetails/ProjectDetails.css         | 50 ++++++++++------
 .../ProjectDetails/ProjectDetails.jsx         |  2 +-
 .../BMDashboard/ProjectDetails/ProjectLog.jsx |  2 +-
 .../RentedTools/RentedToolsDisplay.jsx        |  2 +-
 .../ProjectDetails/RentedTools/ToolCard.jsx   |  4 +-
 8 files changed, 74 insertions(+), 49 deletions(-)

diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
index 4adf13fb0e..94509b6ef7 100644
--- a/src/components/BMDashboard/ProjectDetails/LogBar.jsx
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
@@ -5,32 +5,46 @@ function LogBar() {
   return (
     <div className="logBar-container">
       <div className="logBar-section">
-        <p>Daily Logging:</p>
-        <div className="logBar-btnGroup">
-          <Button className="greenBtn">Time</Button> <Button className="greenBtn">Material</Button>{' '}
-          <Button className="greenBtn">Tool/Equipment</Button>
-        </div>
+        <h2>Daily Logging:</h2>
+        <ul className="logBar-btnGroup">
+          <li>
+            <Button className="button greenBtn">Time</Button>
+          </li>{' '}
+          <li>
+            <Button className="button greenBtn">Material</Button>
+          </li>{' '}
+          <li>
+            <Button className=" button greenBtn">Tool/Equipment</Button>
+          </li>
+        </ul>
       </div>
       <div className="logBar-section">
-        <p>Add a new item:</p>
-        <div className="logBar-btnGroup">
-          <Button
-            className="lightBlueBtn"
-            // style={{ backgroundColor: '#0f6386', border: 0, borderRadius: '10px', margin: '0.1em' }}
-          >
-            Team
-          </Button>{' '}
-          <Button className="lightBlueBtn">Material</Button>{' '}
-          <Button className="lightBlueBtn">Tool/Equipment</Button>
-        </div>
+        <h2>Add a new item:</h2>
+        <ul className="logBar-btnGroup">
+          <li>
+            <Button className="button lightBlueBtn">Team</Button>
+          </li>{' '}
+          <li>
+            <Button className="button lightBlueBtn">Material</Button>
+          </li>{' '}
+          <li>
+            <Button className="button lightBlueBtn">Tool/Equipment</Button>
+          </li>
+        </ul>
       </div>
       <div className="logBar-section">
-        <p>Team:</p>
-        <div className="logBar-btnGroup thirdSection">
-          <Button className="darkBlueBtn">Create New Team</Button>{' '}
-          <Button className="darkBlueBtn">Edit Existing Team</Button>{' '}
-          <Button className="redBtn">Log Issue</Button>
-        </div>
+        <h2>Team:</h2>
+        <ul className="logBar-btnGroup">
+          <li>
+            <Button className="button darkBlueBtn">Create New Team</Button>
+          </li>{' '}
+          <li>
+            <Button className="button darkBlueBtn">Edit Existing Team</Button>
+          </li>{' '}
+          <li>
+            <Button className="button redBtn">Log Issue</Button>
+          </li>
+        </ul>
       </div>
     </div>
   );
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
index 171ee0b8a8..af09e3c962 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
@@ -5,12 +5,11 @@ function MaterialCard() {
         <img
           alt=""
           src="https://www.theforkliftcenter.com/images/forklift-hero-left.png"
-          top
           width="100%"
         />
       </div>
       <div className="cardBody">
-        <h6>Card title</h6>
+        <h3>Card title</h3>
         <div className="infoDiv">Term ends in __ hours.</div>
       </div>
     </div>
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx b/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
index 05537c85e7..b52b03d9f0 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
@@ -5,7 +5,7 @@ import Materials from './Materials';
 function MaterialsDisplay() {
   return (
     <Card className="cards-container">
-      <h6 className="cards-container_header">Materials with quantity less than 20% left</h6>
+      <h2 className="cards-container_header">Materials with quantity less than 20% left</h2>
       <Materials />
     </Card>
   );
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
index 30628a0c52..9fd4596970 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
@@ -8,6 +8,10 @@
   font-weight: bold;
 }
 
+.project-details h1{
+  font-size: 1.5rem;
+}
+
 /* styling for the logBar component - i.e. dashboard with buttons */
 
 .logBar-container {
@@ -20,12 +24,22 @@
   background-color: #eaeeef;
 }
 
+
 .logBar-section {
   width: 100%;
   margin-top: 1em;
 }
 
-button.btn.btn-secondary {
+.logBar-section h2, .card.cards-container h2, .projectLog-container h2{
+  font-size: 1em;
+  font-weight: bold;
+}
+
+.logBar-section ul{
+    list-style-type: none;
+  }
+
+.button.btn.btn-secondary {
   border: 0;
   border-radius: 10px;
   margin: 0.1em;
@@ -33,19 +47,19 @@ button.btn.btn-secondary {
 }
 
 /* buttons custom colors */
-button.btn.btn-secondary.greenBtn {
+.button.btn.greenBtn {
   background-color: #015d4a;
 }
 
-button.btn.btn-secondary.lightBlueBtn {
+.button.btn.lightBlueBtn {
   background-color: #0f6386;
 }
 
-button.btn.btn-secondary.darkBlueBtn {
+.button.btn.darkBlueBtn {
   background-color: #203844;
 }
 
-button.btn.btn-secondary.redBtn {
+.button.btn.redBtn {
   background-color: #980101;
   margin-top: 2em;
 }
@@ -56,11 +70,17 @@ button.btn.btn-secondary.redBtn {
     flex-direction: column;
   }
 
-  button.btn.btn-secondary {
+   .logBar-btnGroup {
+    margin-top: -0.5em;
+    display: flex;
+    justify-content: center;
+  }
+
+  .button.btn.btn-secondary {
     width: auto;
   }
 
-  button.btn.btn-secondary.redBtn {
+  .button.btn.btn-secondary.redBtn {
     margin-top: auto;
   }
 }
@@ -79,17 +99,11 @@ button.btn.btn-secondary.redBtn {
     flex: auto;
   }
 
-  .logBar-btnGroup {
-    margin-top: -0.5em;
-    display: flex;
-    justify-content: center;
-  }
-
-  button.btn.btn-secondary {
+  .button.btn.btn-secondary {
     width: auto;
   }
 
-  button.btn.btn-secondary.redBtn {
+  .button.btn.btn-secondary.redBtn {
     margin-top: auto;
     margin-left: 2em;
   }
@@ -127,7 +141,8 @@ button.btn.btn-secondary.redBtn {
   margin-top: 0.5em;
 }
 
-.cardBody h6 {
+.cardBody h3 {
+  font-size: 1em;
   margin-bottom: -0.2em;
 }
 
@@ -173,6 +188,3 @@ button.btn.btn-secondary.redBtn {
   font-weight: lighter;
 }
 
-.projectLog-container h6 {
-  font-weight: bold;
-}
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
index 2c65378a7c..5992a20c11 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
@@ -9,7 +9,7 @@ import './ProjectDetails.css';
 function ProjectDetails() {
   return (
     <Container className="project-details" fluid>
-      <h3>Project A Dashboard</h3>
+      <h1>Project A Dashboard</h1>
       <Row>
         <LogBar />
       </Row>
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
index 4c4f9bed6d..f56a7b530a 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
@@ -51,7 +51,7 @@ function ProjectLog() {
 
   return (
     <Card className="projectLog-container">
-      <h6>Members working on site today</h6>
+      <h2>Members working on site today</h2>
       <Table hover responsive>
         <thead>
           <tr>
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
index 8eda6ec1dc..a3272e3e33 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
@@ -5,7 +5,7 @@ import ToolCards from './ToolCards';
 function RentedToolsDisplay() {
   return (
     <Card className="cards-container">
-      <h6 className="cards-container_header">Rented Tools or equipment to be returned in 3 days.</h6>
+      <h2 className="cards-container_header">Rented Tools or equipment to be returned in 3 days.</h2>
       <ToolCards />  
     </Card>
   );
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
index 9071232cee..fb2be88585 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
@@ -7,12 +7,12 @@ function ToolCard() {
         <img
           alt=""
           src="https://www.theforkliftcenter.com/images/forklift-hero-left.png"
-          top
+
           width="100%"
         />
       </div>
       <div className="cardBody">
-        <h6>Card title</h6>
+        <h3>Card title</h3>
         <div className="infoDiv">Term ends in __ hours.</div>
       </div>
     </div>

From 662776824bfa9c0dc5ce17d605b32737c30bf962 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 22 Sep 2023 16:19:34 -0400
Subject: [PATCH 17/93] updated classnames to follow BEM convention

---
 .../BMDashboard/ProjectDetails/LogBar.jsx     | 32 +++++------
 .../ProjectDetails/Materials/MaterialCard.jsx |  8 +--
 .../ProjectDetails/Materials/Materials.jsx    |  2 +-
 .../Materials/MaterialsDisplay.jsx            |  2 +-
 .../ProjectDetails/ProjectDetails.css         | 53 +++++++++----------
 .../BMDashboard/ProjectDetails/ProjectLog.jsx |  2 +-
 .../RentedTools/RentedToolsDisplay.jsx        |  2 +-
 .../ProjectDetails/RentedTools/ToolCard.jsx   |  9 ++--
 .../ProjectDetails/RentedTools/ToolCards.jsx  |  2 +-
 9 files changed, 55 insertions(+), 57 deletions(-)

diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
index 94509b6ef7..075b5e66e2 100644
--- a/src/components/BMDashboard/ProjectDetails/LogBar.jsx
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
@@ -3,46 +3,46 @@ import { Button } from 'reactstrap';
 
 function LogBar() {
   return (
-    <div className="logBar-container">
-      <div className="logBar-section">
+    <div className="log-bar">
+      <div className="log-bar__section">
         <h2>Daily Logging:</h2>
-        <ul className="logBar-btnGroup">
+        <ul className="log-bar__btn-group">
           <li>
-            <Button className="button greenBtn">Time</Button>
+            <Button className="button button--green">Time</Button>
           </li>{' '}
           <li>
-            <Button className="button greenBtn">Material</Button>
+            <Button className="button button--green">Material</Button>
           </li>{' '}
           <li>
-            <Button className=" button greenBtn">Tool/Equipment</Button>
+            <Button className="button button--green">Tool/Equipment</Button>
           </li>
         </ul>
       </div>
-      <div className="logBar-section">
+      <div className="log-bar__section">
         <h2>Add a new item:</h2>
-        <ul className="logBar-btnGroup">
+        <ul className="log-bar__btn-group">
           <li>
-            <Button className="button lightBlueBtn">Team</Button>
+            <Button className="button button--blue">Team</Button>
           </li>{' '}
           <li>
-            <Button className="button lightBlueBtn">Material</Button>
+            <Button className="button button--blue">Material</Button>
           </li>{' '}
           <li>
-            <Button className="button lightBlueBtn">Tool/Equipment</Button>
+            <Button className="button button--blue">Tool/Equipment</Button>
           </li>
         </ul>
       </div>
-      <div className="logBar-section">
+      <div className="log-bar__section">
         <h2>Team:</h2>
-        <ul className="logBar-btnGroup">
+        <ul className="log-bar__btn-group">
           <li>
-            <Button className="button darkBlueBtn">Create New Team</Button>
+            <Button className="button button--indigo">Create New Team</Button>
           </li>{' '}
           <li>
-            <Button className="button darkBlueBtn">Edit Existing Team</Button>
+            <Button className="button button--indigo">Edit Existing Team</Button>
           </li>{' '}
           <li>
-            <Button className="button redBtn">Log Issue</Button>
+            <Button className="button button--maroon">Log Issue</Button>
           </li>
         </ul>
       </div>
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
index af09e3c962..f0abe0f96f 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
@@ -1,16 +1,16 @@
 function MaterialCard() {
   return (
-    <div className="singleCard">
-      <div className="cardImg">
+    <div className="single-card">
+      <div className="single-card__img">
         <img
           alt=""
           src="https://www.theforkliftcenter.com/images/forklift-hero-left.png"
           width="100%"
         />
       </div>
-      <div className="cardBody">
+      <div className="single-card__body">
         <h3>Card title</h3>
-        <div className="infoDiv">Term ends in __ hours.</div>
+        <div className="single-card__info">Term ends in __ hours.</div>
       </div>
     </div>
   );
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx b/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
index 80632a70af..2f7229d711 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
@@ -2,7 +2,7 @@ import MaterialCard from './MaterialCard';
 
 function Materials() {
   return (
-    <div className="cards-container_content">
+    <div className="cards-container__content">
       <MaterialCard />
       <MaterialCard />
       <MaterialCard />
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx b/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
index b52b03d9f0..cc4b85530a 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
@@ -5,7 +5,7 @@ import Materials from './Materials';
 function MaterialsDisplay() {
   return (
     <Card className="cards-container">
-      <h2 className="cards-container_header">Materials with quantity less than 20% left</h2>
+      <h2 className="cards-container__header">Materials with quantity less than 20% left</h2>
       <Materials />
     </Card>
   );
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
index 9fd4596970..a7bc5fb2ae 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
@@ -14,7 +14,7 @@
 
 /* styling for the logBar component - i.e. dashboard with buttons */
 
-.logBar-container {
+.log-bar {
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -25,21 +25,21 @@
 }
 
 
-.logBar-section {
+.log-bar__section {
   width: 100%;
   margin-top: 1em;
 }
 
-.logBar-section h2, .card.cards-container h2, .projectLog-container h2{
+.log-bar__section h2, .card.cards-container h2, .project-log h2{
   font-size: 1em;
   font-weight: bold;
 }
 
-.logBar-section ul{
+.log-bar__section ul{
     list-style-type: none;
   }
 
-.button.btn.btn-secondary {
+.button.btn {
   border: 0;
   border-radius: 10px;
   margin: 0.1em;
@@ -47,30 +47,30 @@
 }
 
 /* buttons custom colors */
-.button.btn.greenBtn {
+.button.btn.button--green {
   background-color: #015d4a;
 }
 
-.button.btn.lightBlueBtn {
+.button.btn.button--blue {
   background-color: #0f6386;
 }
 
-.button.btn.darkBlueBtn {
+.button.btn.button--indigo {
   background-color: #203844;
 }
 
-.button.btn.redBtn {
+.button.btn.button--maroon {
   background-color: #980101;
   margin-top: 2em;
 }
 
 @media (min-width: 550px) {
-  .logBar-container {
+  .log-bar {
     display: flex;
     flex-direction: column;
   }
 
-   .logBar-btnGroup {
+   .log-bar__btn-group {
     margin-top: -0.5em;
     display: flex;
     justify-content: center;
@@ -80,13 +80,13 @@
     width: auto;
   }
 
-  .button.btn.btn-secondary.redBtn {
+  .button.btn.btn-secondary.button--maroon {
     margin-top: auto;
   }
 }
 
 @media (min-width: 750px) {
-  .logBar-container {
+  .log-bar {
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
@@ -94,7 +94,7 @@
     margin: 2em;
   }
 
-  .logBar-section {
+  .log-bar__section {
     width: 50%;
     flex: auto;
   }
@@ -103,8 +103,7 @@
     width: auto;
   }
 
-  .button.btn.btn-secondary.redBtn {
-    margin-top: auto;
+  .button.btn.btn-secondary.button--maroon {
     margin-left: 2em;
   }
 }
@@ -116,7 +115,7 @@
   padding: 1em 2em;
 }
 
-.cards-container_content {
+.cards-container__content {
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -124,7 +123,7 @@
 }
 
 /* styling for single card element */
-.singleCard {
+.single-card {
   border: 1px solid #eaeeef;
   border-radius: 5px;
   text-align: center;
@@ -132,22 +131,22 @@
   cursor: pointer;
 }
 
-.singleCard:hover {
+.single-card:hover {
   box-shadow: 0 20px 20px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.2);
   transform: translate3d(0.5px, 0.5px, 0.5px);
 }
 
-.cardBody {
+.single-card__body {
   margin-top: 0.5em;
 }
 
-.cardBody h3 {
+.single-card__body h3 {
   font-size: 1em;
   margin-bottom: -0.2em;
 }
 
 /* button on a card */
-.infoDiv {
+.single-card__info {
   font-size: 0.5rem;
   padding: 1em;
   margin: 0.5em;
@@ -156,17 +155,17 @@
 }
 
 /* TO DO: dynamic value to be added */
-/* .infoDiv .warning{
+/* .single-card__info .warning{
   color: white;
   background-color: #980101; 
 } */
 
 @media (min-width: 600px) {
-  .cards-container_header {
+  .cards-container__header {
     height: 38px;
   }
 
-  .cards-container_content {
+  .cards-container__content {
     display: flex;
     flex-direction: row;
     flex-wrap: nowrap;
@@ -174,14 +173,14 @@
   }
 
   /* styling for single card element */
-  .singleCard {
+  .single-card {
     margin: auto 0.2em;
     flex: none;
   }
 }
 
 /* styling for project log - i.e.table at the bottom */
-.projectLog-container {
+.project-log {
   margin: 2em;
   padding: 1em 2em;
   width: 100%;
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
index f56a7b530a..72fe4b80e7 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
@@ -50,7 +50,7 @@ function ProjectLog() {
   ));
 
   return (
-    <Card className="projectLog-container">
+    <Card className="project-log">
       <h2>Members working on site today</h2>
       <Table hover responsive>
         <thead>
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
index a3272e3e33..0406de5ba1 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
@@ -5,7 +5,7 @@ import ToolCards from './ToolCards';
 function RentedToolsDisplay() {
   return (
     <Card className="cards-container">
-      <h2 className="cards-container_header">Rented Tools or equipment to be returned in 3 days.</h2>
+      <h2 className="cards-container__header">Rented Tools or equipment to be returned in 3 days.</h2>
       <ToolCards />  
     </Card>
   );
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
index fb2be88585..71936da59d 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
@@ -2,18 +2,17 @@ import React from 'react';
 
 function ToolCard() {
   return (
-    <div className="singleCard">
-      <div className="cardImg">
+    <div className="single-card">
+      <div className="single-card__img">
         <img
           alt=""
           src="https://www.theforkliftcenter.com/images/forklift-hero-left.png"
-
           width="100%"
         />
       </div>
-      <div className="cardBody">
+      <div className="single-card__body">
         <h3>Card title</h3>
-        <div className="infoDiv">Term ends in __ hours.</div>
+        <div className="single-card__info">Term ends in __ hours.</div>
       </div>
     </div>
   );
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx
index e85df41ba5..814679a9ee 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx
@@ -3,7 +3,7 @@ import ToolCard from './ToolCard';
 
 const ToolCards = () => {
   return (
-    <div className="cards-container_content">
+    <div className="cards-container__content">
       <ToolCard />
       <ToolCard />
       <ToolCard />

From d1b83d849645e2fb316f2831c97c62c8c8ea06c4 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 22 Sep 2023 16:43:30 -0400
Subject: [PATCH 18/93] added media query for smaller fontsize in tablet and
 mobile view

---
 .../BMDashboard/ProjectDetails/ProjectDetails.css           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
index a7bc5fb2ae..e483fcfb6d 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
@@ -187,3 +187,9 @@
   font-weight: lighter;
 }
 
+@media (max-width: 768px){
+  .project-log td, .project-log th {
+    font-size: 0.5em;
+  }
+}
+

From db30b246d22dad668f89d5cf6f1d8ee550dbc68b Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 22 Sep 2023 16:46:43 -0400
Subject: [PATCH 19/93] updated fontsize on media query

---
 src/components/BMDashboard/ProjectDetails/ProjectDetails.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
index e483fcfb6d..f54473920c 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
@@ -189,7 +189,7 @@
 
 @media (max-width: 768px){
   .project-log td, .project-log th {
-    font-size: 0.5em;
+    font-size: 0.6em;
   }
 }
 

From f65968b7986370b0744571e82b749d13a9a0c362 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 22 Sep 2023 20:13:53 -0400
Subject: [PATCH 20/93] updated logbar component

---
 .../BMDashboard/ProjectDetails/LogBar.jsx     | 74 ++++++++-----------
 1 file changed, 32 insertions(+), 42 deletions(-)

diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
index 075b5e66e2..12afaf84a2 100644
--- a/src/components/BMDashboard/ProjectDetails/LogBar.jsx
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
@@ -1,51 +1,41 @@
 import React from 'react';
 import { Button } from 'reactstrap';
 
+// button styles for each section
+const buttonStyles = {
+  dailyLogging: 'green',
+  newItem: 'blue',
+  team: 'indigo',
+};
+
+//  button labels for each section
+const buttonLabels = {
+  dailyLogging: ['Time', 'Material', 'Tool/Equipment'],
+  newItem: ['Team', 'Material', 'Tool/Equipment'],
+  team: ['Create New Team', 'Edit Existing Team', 'Log Issue'],
+};
+
 function LogBar() {
   return (
     <div className="log-bar">
-      <div className="log-bar__section">
-        <h2>Daily Logging:</h2>
-        <ul className="log-bar__btn-group">
-          <li>
-            <Button className="button button--green">Time</Button>
-          </li>{' '}
-          <li>
-            <Button className="button button--green">Material</Button>
-          </li>{' '}
-          <li>
-            <Button className="button button--green">Tool/Equipment</Button>
-          </li>
-        </ul>
-      </div>
-      <div className="log-bar__section">
-        <h2>Add a new item:</h2>
-        <ul className="log-bar__btn-group">
-          <li>
-            <Button className="button button--blue">Team</Button>
-          </li>{' '}
-          <li>
-            <Button className="button button--blue">Material</Button>
-          </li>{' '}
-          <li>
-            <Button className="button button--blue">Tool/Equipment</Button>
-          </li>
-        </ul>
-      </div>
-      <div className="log-bar__section">
-        <h2>Team:</h2>
-        <ul className="log-bar__btn-group">
-          <li>
-            <Button className="button button--indigo">Create New Team</Button>
-          </li>{' '}
-          <li>
-            <Button className="button button--indigo">Edit Existing Team</Button>
-          </li>{' '}
-          <li>
-            <Button className="button button--maroon">Log Issue</Button>
-          </li>
-        </ul>
-      </div>
+      {Object.keys(buttonStyles).map((section, index) => (
+        <div key={index} className={`log-bar__section`}>
+          <h2>
+            {section === 'dailyLogging'
+              ? 'Daily Logging:'
+              : section === 'newItem'
+              ? 'Add a New Item:'
+              : 'Team:'}
+          </h2>
+          <ul className="log-bar__btn-group">
+            {buttonLabels[section].map((label, i) => (
+              <li key={i}>
+                <Button className={label === 'Log Issue' ? `button button--maroon` : `button button--${buttonStyles[section]}`}>{label}</Button>
+              </li>
+            ))}
+          </ul>
+        </div>
+      ))}
     </div>
   );
 }

From 8c60fb6c5a1ac99a46a393b989b4071daac720f1 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 22 Sep 2023 20:44:26 -0400
Subject: [PATCH 21/93] updated button attribute

---
 src/components/BMDashboard/ProjectDetails/LogBar.jsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
index 12afaf84a2..faec077723 100644
--- a/src/components/BMDashboard/ProjectDetails/LogBar.jsx
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
@@ -30,7 +30,16 @@ function LogBar() {
           <ul className="log-bar__btn-group">
             {buttonLabels[section].map((label, i) => (
               <li key={i}>
-                <Button className={label === 'Log Issue' ? `button button--maroon` : `button button--${buttonStyles[section]}`}>{label}</Button>
+                <Button
+                  type="button"
+                  className={
+                    label === 'Log Issue'
+                      ? `button button--maroon`
+                      : `button button--${buttonStyles[section]}`
+                  }
+                >
+                  {label}
+                </Button>
               </li>
             ))}
           </ul>

From dfa356f96e708084ae5993991a347659b5765f54 Mon Sep 17 00:00:00 2001
From: robertoooc <robertooo.c48@gmail.com>
Date: Tue, 26 Sep 2023 13:59:32 -0700
Subject: [PATCH 22/93] adding untouched file to eslint ignore causing github
 actions to fail

---
 .eslintignore   | 1 +
 .prettierignore | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.eslintignore b/.eslintignore
index 237ba8ebac..eae556b638 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -54,4 +54,5 @@ src/components/UpdatePassword/**
 src/components/UserManagement/**
 src/components/UserProfile/**
 src/components/WeeklySummary/**
+src/components/WeeklySummariesReport/**
 src/components/MouseoverText/**
diff --git a/.prettierignore b/.prettierignore
index bac3b76edb..28365c8af2 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -51,4 +51,5 @@ src/components/UpdatePassword/**
 src/components/UserManagement/**
 src/components/UserProfile/**
 src/components/WeeklySummary/**
+src/components/WeeklySummariesReport/**
 src/components/MouseoverText/**

From c99ba8ae5f51918003274b8fe564f40e9a80bc26 Mon Sep 17 00:00:00 2001
From: robertoooc <robertooo.c48@gmail.com>
Date: Wed, 27 Sep 2023 16:50:06 -0700
Subject: [PATCH 23/93] Found solution to removing user from team from user
 profile

---
 .../UserProfile/TeamsAndProjects/TeamsTab.jsx     | 15 ++++++++++++++-
 src/components/UserProfile/UserProfile.jsx        | 15 +++++++++++++++
 .../UserProfile/UserProfileEdit/SaveButton.jsx    |  3 ++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/components/UserProfile/TeamsAndProjects/TeamsTab.jsx b/src/components/UserProfile/TeamsAndProjects/TeamsTab.jsx
index 090ea0fea7..7d45c4d0dc 100644
--- a/src/components/UserProfile/TeamsAndProjects/TeamsTab.jsx
+++ b/src/components/UserProfile/TeamsAndProjects/TeamsTab.jsx
@@ -1,6 +1,7 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import AddTeamPopup from './AddTeamPopup';
 import UserTeamsTable from './UserTeamsTable';
+import { deleteTeamMember } from 'actions/allTeamsAction';
 
 const TeamsTab = props => {
   const {
@@ -21,9 +22,20 @@ const TeamsTab = props => {
     userProfile,
     codeValid,
     setCodeValid,
+    saved,
   } = props;
   const [addTeamPopupOpen, setaddTeamPopupOpen] = useState(false);
   const [renderedOn, setRenderedOn] = useState(0);
+  const [removedTeams, setRemovedTeams] = useState([]);
+
+  useEffect(() => {
+    if(saved && removedTeams.length > 0){
+      removedTeams.forEach(teamId => {
+        deleteTeamMember(teamId, userProfile._id);
+        setRemovedTeams([]);
+      })
+    }
+  }, [saved]);
 
   const onAddTeamPopupShow = () => {
     setaddTeamPopupOpen(true);
@@ -33,6 +45,7 @@ const TeamsTab = props => {
     setaddTeamPopupOpen(false);
   };
   const onSelectDeleteTeam = teamId => {
+    setRemovedTeams([...removedTeams, teamId]);
     onDeleteTeam(teamId);
   };
 
diff --git a/src/components/UserProfile/UserProfile.jsx b/src/components/UserProfile/UserProfile.jsx
index 21c99df34e..ecc8ed8351 100644
--- a/src/components/UserProfile/UserProfile.jsx
+++ b/src/components/UserProfile/UserProfile.jsx
@@ -92,6 +92,7 @@ function UserProfile(props) {
   const [summarySelected, setSummarySelected] = useState(null);
   const [summaryName, setSummaryName] = useState('');
   const [showSummary, setShowSummary] = useState(false);
+  const [saved, setSaved] = useState(false);
 
   const userProfileRef = useRef();
 
@@ -413,6 +414,10 @@ function UserProfile(props) {
     setBlueSquareChanged(true);
   };
 
+  // const handleSave = ()=>{
+  //   setSaved(true);
+  // }
+
   const handleSubmit = async () => {
     for (let i = 0; i < updatedTasks.length; i += 1) {
       const updatedTask = updatedTasks[i];
@@ -427,6 +432,7 @@ function UserProfile(props) {
       }
       await loadUserProfile();
       await loadUserTasks();
+      setSaved(false)
     } catch (err) {
       alert('An error occurred while attempting to save this profile.');
     }
@@ -861,6 +867,7 @@ function UserProfile(props) {
               <TabPane tabId="3">
                 <TeamsTab
                   userTeams={teams || []}
+                  originalTeams={originalTeams}
                   teamsData={props?.allTeams?.allTeamsData || []}
                   onAssignTeam={onAssignTeam}
                   onDeleteTeam={onDeleteTeam}
@@ -881,6 +888,7 @@ function UserProfile(props) {
                   userProfile={userProfile}
                   codeValid={codeValid}
                   setCodeValid={setCodeValid}
+                  saved={saved}
                 />
               </TabPane>
               <TabPane tabId="4">
@@ -980,6 +988,7 @@ function UserProfile(props) {
                               (isProfileEqual && isTasksEqual && isTeamsEqual && isProjectsEqual)
                             }
                             userProfile={userProfile}
+                            setSaved={()=>setSaved(true)}
                           />
                           <span
                             onClick={() => {
@@ -1035,6 +1044,7 @@ function UserProfile(props) {
                               (isProfileEqual && isTasksEqual && isTeamsEqual && isProjectsEqual)
                             }
                             userProfile={userProfile}
+                            setSaved={()=>setSaved(true)}
                           />
                           <span
                             onClick={() => {
@@ -1062,6 +1072,7 @@ function UserProfile(props) {
                 <ModalBody>
                   <TeamsTab
                     userTeams={userProfile?.teams || []}
+                    originalTeams={originalTeams}
                     teamsData={props?.allTeams?.allTeamsData || []}
                     onAssignTeam={onAssignTeam}
                     onDeleteTeam={onDeleteTeam}
@@ -1100,6 +1111,7 @@ function UserProfile(props) {
                               (isProfileEqual && isTasksEqual && isTeamsEqual && isProjectsEqual)
                             }
                             userProfile={userProfile}
+                            setSaved={()=>setSaved(true)}
                           />
                           <span
                             onClick={() => {
@@ -1160,6 +1172,7 @@ function UserProfile(props) {
                               (isProfileEqual && isTasksEqual && isTeamsEqual && isProjectsEqual)
                             }
                             userProfile={userProfile}
+                            setSaved={()=>setSaved(true)}
                           />
                           <span
                             onClick={() => {
@@ -1207,6 +1220,7 @@ function UserProfile(props) {
                               (isProfileEqual && isTasksEqual && isTeamsEqual && isProjectsEqual)
                             }
                             userProfile={userProfile}
+                            setSaved={()=>setSaved(true)}
                           />
                           <span
                             onClick={() => {
@@ -1274,6 +1288,7 @@ function UserProfile(props) {
                       (isProfileEqual && isTasksEqual && isTeamsEqual && isProjectsEqual)
                     }
                     userProfile={userProfile}
+                    setSaved={()=>setSaved(true)}
                   />
                   {activeTab !== '3' && (
                     <span
diff --git a/src/components/UserProfile/UserProfileEdit/SaveButton.jsx b/src/components/UserProfile/UserProfileEdit/SaveButton.jsx
index 8f5fb97ae5..825c8109a5 100644
--- a/src/components/UserProfile/UserProfileEdit/SaveButton.jsx
+++ b/src/components/UserProfile/UserProfileEdit/SaveButton.jsx
@@ -26,12 +26,13 @@ const getRandomMessage = () => {
  * @returns
  */
 const SaveButton = props => {
-  const { handleSubmit, disabled, userProfile } = props;
+  const { handleSubmit, disabled, userProfile, setSaved } = props;
   const [modal, setModal] = useState(false);
   const [randomMessage, setRandomMessage] = useState(getRandomMessage());
 
   const handleSave = () => {
     handleSubmit();
+    setSaved();
     setModal(true);
   };
 

From d214f8b3e23e883dd37d72d3e3e372fe1b3313c5 Mon Sep 17 00:00:00 2001
From: robertoooc <robertooo.c48@gmail.com>
Date: Thu, 28 Sep 2023 16:31:56 -0700
Subject: [PATCH 24/93] removed unused line of code from previous commit

---
 src/components/UserProfile/UserProfile.jsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/UserProfile/UserProfile.jsx b/src/components/UserProfile/UserProfile.jsx
index ecc8ed8351..5b4e432fa6 100644
--- a/src/components/UserProfile/UserProfile.jsx
+++ b/src/components/UserProfile/UserProfile.jsx
@@ -414,10 +414,6 @@ function UserProfile(props) {
     setBlueSquareChanged(true);
   };
 
-  // const handleSave = ()=>{
-  //   setSaved(true);
-  // }
-
   const handleSubmit = async () => {
     for (let i = 0; i < updatedTasks.length; i += 1) {
       const updatedTask = updatedTasks[i];
@@ -867,7 +863,6 @@ function UserProfile(props) {
               <TabPane tabId="3">
                 <TeamsTab
                   userTeams={teams || []}
-                  originalTeams={originalTeams}
                   teamsData={props?.allTeams?.allTeamsData || []}
                   onAssignTeam={onAssignTeam}
                   onDeleteTeam={onDeleteTeam}
@@ -1072,7 +1067,7 @@ function UserProfile(props) {
                 <ModalBody>
                   <TeamsTab
                     userTeams={userProfile?.teams || []}
-                    originalTeams={originalTeams}
+
                     teamsData={props?.allTeams?.allTeamsData || []}
                     onAssignTeam={onAssignTeam}
                     onDeleteTeam={onDeleteTeam}

From 4e79187a178afcc43b472e3fb6504287d61ee401 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 12:04:13 -0700
Subject: [PATCH 25/93] delete ignore  file

---
 .eslintignore   | 58 -------------------------------------------------
 .prettierignore | 54 ---------------------------------------------
 2 files changed, 112 deletions(-)
 delete mode 100644 .eslintignore
 delete mode 100644 .prettierignore

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index 58b85ab980..0000000000
--- a/.eslintignore
+++ /dev/null
@@ -1,58 +0,0 @@
-*.png
-*.svg
-*.test.js
-*.test.jsx
-src/actions/**
-src/App.css
-src/config.json
-src/constants/**
-src/index.js
-src/languages/**
-src/reducers/**
-src/registerServiceWorker.js
-src/routes.js
-src/services/**
-src/setupTests.js
-src/store.js
-src/styles.js
-src/utils/**
-src/__tests__/**
-
-
-
-src/components/App.jsx
-src/components/AutoReload/**
-src/components/AutoUpdate/**
-src/components/Badge/**
-src/components/BMDashboard/**
-src/components/common/**
-src/components/ForcePasswordUpdate/**
-src/components/Header/**
-src/components/Inventory/**
-src/components/LeaderBoard/**
-src/components/Login/**
-src/components/ManageMemberships/**
-src/components/Memberships/**
-src/components/MonthlyEffort/**
-src/components/NewProfileLink/**
-src/components/OwnerMessage/**
-src/components/PermissionsManagement/**
-src/components/PopUpBar/**
-src/components/ProfileLinks/**
-src/components/Projects/**
-src/components/RenderInfringement/**
-src/components/Reports/**
-src/components/SetupProfile/**
-src/components/SummaryBar/**
-src/components/SummaryManagement/**
-src/components/TaskEditSuggestions/**
-src/components/TeamMemberTasks/**
-src/components/Teams/**
-src/components/Timelog/**
-src/components/Timer/**
-src/components/UpdatePassword/**
-src/components/UserManagement/**
-src/components/UserProfile/**
-src/components/WeeklySummary/**
-src/components/MouseoverText/**
-src/components/WeeklySummariesReport/**
diff --git a/.prettierignore b/.prettierignore
deleted file mode 100644
index 12c9181f07..0000000000
--- a/.prettierignore
+++ /dev/null
@@ -1,54 +0,0 @@
-*.png
-*.svg
-src/actions/**
-src/App.css
-src/config.json
-src/constants/**
-src/index.js
-src/languages/**
-src/reducers/**
-src/registerServiceWorker.js
-src/routes.js
-src/services/**
-src/setupTests.js
-src/store.js
-src/styles.js
-src/utils/**
-src/__tests__/**
-
-
-src/components/App.jsx
-src/components/AutoReload/**
-src/components/AutoUpdate/**
-src/components/Badge/**
-src/components/common/**
-src/components/ForcePasswordUpdate/**
-src/components/Header/**
-src/components/Inventory/**
-src/components/LeaderBoard/**
-src/components/Login/**
-src/components/ManageMemberships/**
-src/components/Memberships/**
-src/components/MonthlyEffort/**
-src/components/NewProfileLink/**
-src/components/OwnerMessage/**
-src/components/PermissionsManagement/**
-src/components/PopUpBar/**
-src/components/ProfileLinks/**
-src/components/Projects/**
-src/components/RenderInfringement/**
-src/components/Reports/**
-src/components/SetupProfile/**
-src/components/SummaryBar/**
-src/components/SummaryManagement/**
-src/components/TaskEditSuggestions/**
-src/components/TeamMemberTasks/**
-src/components/Teams/**
-src/components/Timelog/**
-src/components/Timer/**
-src/components/UpdatePassword/**
-src/components/UserManagement/**
-src/components/UserProfile/**
-src/components/WeeklySummary/**
-src/components/MouseoverText/**
-src/components/WeeklySummariesReport/**
\ No newline at end of file

From a2910da90ed5dd6fb28380edfcc3e309958da1b5 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 12:08:06 -0700
Subject: [PATCH 26/93] fixed index.js

---
 src/components/Reports/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Reports/index.js b/src/components/Reports/index.js
index 7b5807188a..3464662d14 100644
--- a/src/components/Reports/index.js
+++ b/src/components/Reports/index.js
@@ -1 +1,3 @@
-export { default } from './Reports';
+import Reports from './Reports';
+
+export default Reports;

From 26c88db88da18261be3e93acab9c0ca23799092a Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 12:21:10 -0700
Subject: [PATCH 27/93] PeopleTableDetails.jsx

---
 src/components/Reports/PeopleTableDetails.jsx | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/components/Reports/PeopleTableDetails.jsx b/src/components/Reports/PeopleTableDetails.jsx
index d57476ff3c..c46ee8789d 100644
--- a/src/components/Reports/PeopleTableDetails.jsx
+++ b/src/components/Reports/PeopleTableDetails.jsx
@@ -5,7 +5,7 @@ import './PeopleTableDetails.css';
 import { NewModal } from '../common/NewModal';
 import TableFilter from './TableFilter/TableFilter';
 
-const PeopleTableDetails = props => {
+function PeopleTableDetails(props) {
   const [name, setName] = useState('');
   const [priority, setPriority] = useState('');
   const [status, setStatus] = useState('');
@@ -14,12 +14,8 @@ const PeopleTableDetails = props => {
   const [assign, setAssign] = useState('');
   const [estimatedHours, setEstimatedHours] = useState('');
   const [order, setOrder] = useState('');
-  const [deleteId, setDeleteId] = useState('');
-  const [deleteName, setDeleteName] = useState('');
-  const [deletePopup, setDeletePopup] = useState(false);
-  const [editPopup, setEditPopup] = useState(false);
-  const [startDate, setStartDate] = useState('');
-  const [endDate, setEndDate] = useState('');
+  const [startDate] = useState('');
+  const [endDate] = useState('');
 
   const onTaskNameSearch = text => {
     setName(text);
@@ -61,7 +57,9 @@ const PeopleTableDetails = props => {
   };
 
   const filterTasks = tasks => {
-    let simple = [];
+    // eslint-disable-next-line no-unused-vars
+    const simple = [];
+    // eslint-disable-next-line array-callback-return,consistent-return
     let filteredList = tasks.filter(task => {
       if (
         task.taskName.toLowerCase().includes(name.toLowerCase()) &&
@@ -76,7 +74,7 @@ const PeopleTableDetails = props => {
     });
     filteredList = filteredList.filter(task => {
       let flag = false;
-      for (let i = 0; i < task.resources[0].length; i++) {
+      for (let i = 0; i < task.resources[0].length; i += 1) {
         if (task.resources[0][i].name.toLowerCase().includes(resources.toLowerCase())) {
           flag = true;
           break;
@@ -88,7 +86,7 @@ const PeopleTableDetails = props => {
   };
   let toggleMoreResourcesStatus = true;
   const toggleMoreResources = id => {
-    let x = document.getElementById(id);
+    const x = document.getElementById(id);
     if (toggleMoreResourcesStatus) {
       x.style.display = 'table-cell';
     } else {
@@ -96,7 +94,8 @@ const PeopleTableDetails = props => {
     }
     toggleMoreResourcesStatus = !toggleMoreResourcesStatus;
   };
-  let filteredTasks = filterTasks(props.taskData);
+  const { taskData } = props;
+  const filteredTasks = filterTasks(taskData);
 
   const renderFilteredTask = value => (
     <div key={value._id} className="people-table-row people-table-body-row">
@@ -117,18 +116,24 @@ const PeopleTableDetails = props => {
                 />
               );
             }
+            return null;
           }),
         )}
         {value.resources?.map(res =>
           res.length > 2 ? (
-            <a className="name resourceMoreToggle" onClick={() => toggleMoreResources(value._id)}>
+            <button
+              type="button"
+              className="name resourceMoreToggle"
+              onClick={() => toggleMoreResources(value._id)}
+            >
               <span className="dot">{res.length - 2}+</span>
-            </a>
+            </button>
           ) : null,
         )}
         <div id={value._id} className="extra">
           <div className="extra1">
             {value.resources?.map(res =>
+              // eslint-disable-next-line array-callback-return,consistent-return
               res.map((resource, index) => {
                 if (index >= 2) {
                   return (
@@ -193,7 +198,7 @@ const PeopleTableDetails = props => {
       </div>
       <div className="people-table">
         {filteredTasks.map(value => (
-          <NewModal header={'Task info'} trigger={() => renderFilteredTask(value)}>
+          <NewModal header="Task info" trigger={() => renderFilteredTask(value)}>
             <div>Why This Task is important</div>
             <textarea className="rectangle" type="text" value={value.whyInfo} />
             <div>Design Intent</div>
@@ -205,6 +210,6 @@ const PeopleTableDetails = props => {
       </div>
     </Container>
   );
-};
+}
 
 export default PeopleTableDetails;

From e0f10e5049164969d5b570ac1584c9eedcf7f9e6 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 12:24:22 -0700
Subject: [PATCH 28/93] ProiectTable.jsx

---
 src/components/Reports/ProjectTable.jsx | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/components/Reports/ProjectTable.jsx b/src/components/Reports/ProjectTable.jsx
index 577c94d1f1..274a79defe 100644
--- a/src/components/Reports/ProjectTable.jsx
+++ b/src/components/Reports/ProjectTable.jsx
@@ -1,29 +1,28 @@
+// eslint-disable-next-line no-unused-vars
 import React from 'react';
 import './reports.css';
 import { Link } from 'react-router-dom';
 
-const ProjectTable = props => {
+function ProjectTable({ projects }) {
   // Display project lists
   let ProjectsList = [];
-  if (props.projects.length > 0) {
-    ProjectsList = props.projects.map((project, index) => (
-      <tr id={'tr_' + project._id} key={project._id}>
+  if (projects.length > 0) {
+    ProjectsList = projects.map((project, index) => (
+      <tr id={`tr_${project._id}`} key={project._id}>
         <th scope="row">
           <div>{index + 1}</div>
         </th>
         <td>
-          <Link to={`/projectreport/${project._id}`}>
-            {project.projectName}
-          </Link>
+          <Link to={`/projectreport/${project._id}`}>{project.projectName}</Link>
         </td>
         <td>
           {project.isActive ? (
             <div className="isActive">
-              <i className="fa fa-circle" aria-hidden="true"></i>
+              <i className="fa fa-circle" aria-hidden="true" />
             </div>
           ) : (
             <div className="isNotActive">
-              <i className="fa fa-circle-o" aria-hidden="true"></i>
+              <i className="fa fa-circle-o" aria-hidden="true" />
             </div>
           )}
         </td>
@@ -47,5 +46,5 @@ const ProjectTable = props => {
       <tbody>{ProjectsList}</tbody>
     </table>
   );
-};
+}
 export default ProjectTable;

From 0852603bbb5bf45be517639be260daabad154a9e Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 12:53:30 -0700
Subject: [PATCH 29/93] half fixed reports.jsx

---
 src/components/Reports/Reports.jsx | 231 ++++++++++++++---------------
 1 file changed, 108 insertions(+), 123 deletions(-)

diff --git a/src/components/Reports/Reports.jsx b/src/components/Reports/Reports.jsx
index 34f6e16024..4138706f22 100644
--- a/src/components/Reports/Reports.jsx
+++ b/src/components/Reports/Reports.jsx
@@ -1,8 +1,9 @@
+// eslint-disable-next-line no-unused-vars
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import moment from 'moment';
 import { Container, Button } from 'reactstrap';
 import DatePicker from 'react-datepicker';
+import ReactTooltip from 'react-tooltip';
 import { fetchAllProjects } from '../../actions/projects';
 import { getAllUserTeams } from '../../actions/allTeamsAction';
 import TeamTable from './TeamTable';
@@ -16,7 +17,6 @@ import './reportsPage.css';
 import projectsImage from './images/Projects.svg';
 import peopleImage from './images/People.svg';
 import teamsImage from './images/Teams.svg';
-import ReactTooltip from 'react-tooltip';
 import TotalPeopleReport from './TotalReport/TotalPeopleReport';
 import TotalTeamReport from './TotalReport/TotalTeamReport';
 import TotalProjectReport from './TotalReport/TotalProjectReport';
@@ -34,44 +34,8 @@ class ReportsPage extends Component {
       showTotalTeam: false,
       showTotalProject: false,
       teamNameSearchText: '',
-      teamMembersPopupOpen: false,
-      deleteTeamPopupOpen: false,
-      createNewTeamPopupOpen: false,
-      teamStatusPopupOpen: false,
       wildCardSearchText: '',
-      selectedTeamId: 0,
-      selectedTeam: '',
       checkActive: '',
-      formElements: {
-        summary: '',
-        summaryLastWeek: '',
-        summaryBeforeLast: '',
-        mediaUrl: '',
-        weeklySummariesCount: 0,
-        mediaConfirm: false,
-      },
-      dueDate: moment()
-        .tz('America/Los_Angeles')
-        .endOf('week')
-        .toISOString(),
-      dueDateLastWeek: moment()
-        .tz('America/Los_Angeles')
-        .endOf('week')
-        .subtract(1, 'week')
-        .toISOString(),
-      dueDateBeforeLast: moment()
-        .tz('America/Los_Angeles')
-        .endOf('week')
-        .subtract(2, 'week')
-        .toISOString(),
-      activeTab: '1',
-      errors: {},
-      fetchError: null,
-      loading: true,
-      teamSearchData: {},
-      peopleSearchData: [],
-      projectSearchData: {},
-      users: {},
       startDate: new Date(DATE_PICKER_MIN_DATE),
       endDate: new Date(),
       teamMemberList: {},
@@ -89,15 +53,21 @@ class ReportsPage extends Component {
   }
 
   async componentDidMount() {
-    this.props.fetchAllProjects(); // Fetch to get all projects
-    this.props.getAllUserTeams();
+    const {
+      fetchAllProjects: fetchAllProjectsProp,
+      getAllUserTeams: getAllUserTeamsProp,
+      getAllUserProfile: getAllUserProfileProp,
+    } = this.props;
+
+    fetchAllProjectsProp(); // Fetch to get all projects
+    getAllUserTeamsProp();
     this.setState({
       showProjects: false,
       showPeople: false,
       showTeams: false,
       checkActive: '',
     });
-    this.props.getAllUserProfile();
+    getAllUserProfileProp();
   }
 
   /**
@@ -109,20 +79,51 @@ class ReportsPage extends Component {
     });
   };
 
-  filteredProjectList = projects => {
-    const filteredList = projects.filter(project => {
-      // Applying the search filters before creating each team table data element
+  setActive() {
+    this.setState(() => ({
+      checkActive: 'true',
+    }));
+  }
+
+  setAll() {
+    this.setState(() => ({
+      checkActive: '',
+    }));
+  }
+
+  setInActive() {
+    this.setState(() => ({
+      checkActive: 'false',
+    }));
+  }
+
+  setTeamMemberList(list) {
+    this.setState(() => ({
+      teamMemberList: list,
+    }));
+  }
+
+  filteredPeopleList = userProfiles => {
+    const { teamNameSearchText, wildCardSearchText, startDate, endDate } = this.state;
+
+    const filteredList = userProfiles.filter(userProfile => {
+      const firstNameLower = userProfile.firstName ? userProfile.firstName.toLowerCase() : '';
+      const lastNameLower = userProfile.lastName ? userProfile.lastName.toLowerCase() : '';
+      const teamNameSearchTextLower = teamNameSearchText.toLowerCase();
+      const wildCardSearchTextLower = wildCardSearchText.toLowerCase();
+
+      const createdDate = new Date(Date.parse(userProfile.createdDate));
+      const endProfileDate = userProfile.endDate ? new Date(Date.parse(userProfile.endDate)) : null;
+
       if (
-        (project.projectName &&
-          project.projectName.toLowerCase().indexOf(this.state.teamNameSearchText.toLowerCase()) >
-            -1 &&
-          this.state.wildCardSearchText === '') ||
-        // the wild card search, the search text can be match with any item
-        (this.state.wildCardSearchText !== '' &&
-          project.projectName.toLowerCase().indexOf(this.state.wildCardSearchText.toLowerCase()) >
-            -1)
+        (firstNameLower.indexOf(teamNameSearchTextLower) > -1 && wildCardSearchText === '') ||
+        (wildCardSearchText !== '' && firstNameLower.indexOf(wildCardSearchTextLower) > -1) ||
+        (wildCardSearchText !== '' && lastNameLower.indexOf(wildCardSearchTextLower) > -1)
       ) {
-        return project;
+        return (
+          createdDate >= startDate &&
+          (!endProfileDate || (startDate <= endProfileDate && endProfileDate <= endDate))
+        );
       }
       return false;
     });
@@ -130,18 +131,19 @@ class ReportsPage extends Component {
     return filteredList;
   };
 
-  filteredTeamList = allTeams => {
-    const filteredList = allTeams?.filter(team => {
-      // Applying the search filters before creating each team table data element
+  filteredProjectList = projects => {
+    const { teamNameSearchText, wildCardSearchText } = this.state;
+
+    const filteredList = projects.filter(project => {
+      const projectNameLower = project.projectName ? project.projectName.toLowerCase() : '';
+      const teamNameSearchTextLower = teamNameSearchText.toLowerCase();
+      const wildCardSearchTextLower = wildCardSearchText.toLowerCase();
+
       if (
-        (team.teamName &&
-          team.teamName.toLowerCase().indexOf(this.state.teamNameSearchText.toLowerCase()) > -1 &&
-          this.state.wildCardSearchText === '') ||
-        // the wild card search, the search text can be match with any item
-        (this.state.wildCardSearchText !== '' &&
-          team.teamName.toLowerCase().indexOf(this.state.wildCardSearchText.toLowerCase()) > -1)
+        (projectNameLower.indexOf(teamNameSearchTextLower) > -1 && wildCardSearchText === '') ||
+        (wildCardSearchText !== '' && projectNameLower.indexOf(wildCardSearchTextLower) > -1)
       ) {
-        return team;
+        return project;
       }
       return false;
     });
@@ -149,27 +151,19 @@ class ReportsPage extends Component {
     return filteredList;
   };
 
-  filteredPeopleList = userProfiles => {
-    const filteredList = userProfiles.filter(userProfile => {
-      // Applying the search filters before creating each team table data element
+  filteredTeamList = allTeams => {
+    const { teamNameSearchText, wildCardSearchText } = this.state;
+
+    const filteredList = allTeams?.filter(team => {
+      const teamNameLower = team.teamName ? team.teamName.toLowerCase() : '';
+      const teamNameSearchTextLower = teamNameSearchText.toLowerCase();
+      const wildCardSearchTextLower = wildCardSearchText.toLowerCase();
+
       if (
-        (userProfile.firstName &&
-          userProfile.firstName.toLowerCase().indexOf(this.state.teamNameSearchText.toLowerCase()) >
-            -1 &&
-          this.state.wildCardSearchText === '') ||
-        // the wild card search, the search text can be match with any item
-        (this.state.wildCardSearchText !== '' &&
-          userProfile.firstName.toLowerCase().indexOf(this.state.wildCardSearchText.toLowerCase()) >
-            -1) ||
-        (this.state.wildCardSearchText !== '' &&
-          userProfile.lastName &&
-          userProfile.lastName.toLowerCase().indexOf(this.state.wildCardSearchText.toLowerCase()) >
-            -1)
+        (teamNameLower.indexOf(teamNameSearchTextLower) > -1 && wildCardSearchText === '') ||
+        (wildCardSearchText !== '' && teamNameLower.indexOf(wildCardSearchTextLower) > -1)
       ) {
-        return (
-          new Date(Date.parse(userProfile.createdDate)) >= this.state.startDate &&
-          this.state.startDate <= new Date(Date.parse(userProfile?.endDate)) <= this.state.endDate
-        );
+        return team;
       }
       return false;
     });
@@ -177,30 +171,6 @@ class ReportsPage extends Component {
     return filteredList;
   };
 
-  setActive() {
-    this.setState(state => ({
-      checkActive: 'true',
-    }));
-  }
-
-  setAll() {
-    this.setState(state => ({
-      checkActive: '',
-    }));
-  }
-
-  setInActive() {
-    this.setState(() => ({
-      checkActive: 'false',
-    }));
-  }
-
-  setTeamMemberList(list) {
-    this.setState(() => ({
-      teamMemberList: list,
-    }));
-  }
-
   showProjectTable() {
     this.setState(prevState => ({
       showProjects: !prevState.showProjects,
@@ -255,6 +225,7 @@ class ReportsPage extends Component {
       showTotalPeople: false,
     }));
   }
+
   showTotalProject() {
     this.setState(prevState => ({
       showProjects: false,
@@ -267,27 +238,41 @@ class ReportsPage extends Component {
   }
 
   render() {
-    const { projects } = this.props.state.allProjects;
-    const { allTeams } = this.props.state.allTeamsData;
-    const { userProfiles } = this.props.state.allUserProfiles;
+    const {
+      state: {
+        allProjects: { projects },
+        allTeamsData: { allTeams },
+        allUserProfiles: { userProfiles },
+      },
+    } = this.props;
+
     this.state.teamSearchData = this.filteredTeamList(allTeams);
     this.state.peopleSearchData = this.filteredPeopleList(userProfiles);
     this.state.projectSearchData = this.filteredProjectList(projects);
-    if (this.state.checkActive === 'true') {
-      this.state.teamSearchData = allTeams.filter(team => team.isActive === true);
-      this.state.projectSearchData = projects.filter(project => project.isActive === true);
-      this.state.peopleSearchData = userProfiles.filter(user => user.isActive === true);
-      this.state.teamSearchData = this.filteredTeamList(this.state.teamSearchData);
-      this.state.peopleSearchData = this.filteredPeopleList(this.state.peopleSearchData);
-      this.state.projectSearchData = this.filteredProjectList(this.state.projectSearchData);
-    } else if (this.state.checkActive === 'false') {
-      this.state.teamSearchData = allTeams.filter(team => team.isActive === false);
-      this.state.projectSearchData = projects.filter(project => project.isActive === false);
-      this.state.peopleSearchData = userProfiles.filter(user => user.isActive === false);
-      this.state.teamSearchData = this.filteredTeamList(this.state.teamSearchData);
-      this.state.peopleSearchData = this.filteredPeopleList(this.state.peopleSearchData);
-      this.state.projectSearchData = this.filteredProjectList(this.state.projectSearchData);
+
+    // eslint-disable-next-line no-unused-vars
+    const { checkActive, teamSearchData, projectSearchData, peopleSearchData } = this.state;
+
+    if (checkActive === 'true') {
+      const activeTeams = allTeams.filter(team => team.isActive === true);
+      const activeProjects = projects.filter(project => project.isActive === true);
+      const activePeople = userProfiles.filter(user => user.isActive === true);
+      this.setState({
+        teamSearchData: this.filteredTeamList(activeTeams),
+        projectSearchData: this.filteredProjectList(activeProjects),
+        peopleSearchData: this.filteredPeopleList(activePeople),
+      });
+    } else if (checkActive === 'false') {
+      const inactiveTeams = allTeams.filter(team => team.isActive === false);
+      const inactiveProjects = projects.filter(project => project.isActive === false);
+      const inactivePeople = userProfiles.filter(user => user.isActive === false);
+      this.setState({
+        teamSearchData: this.filteredTeamList(inactiveTeams),
+        projectSearchData: this.filteredProjectList(inactiveProjects),
+        peopleSearchData: this.filteredPeopleList(inactivePeople),
+      });
     }
+
     if (this.state.startDate != null && this.state.endDate != null) {
       this.state.peopleSearchData = this.filteredPeopleList(this.state.peopleSearchData);
     }

From c65095b2421d073c92fa9b1d4e4f8ff466ca8c83 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 12:57:44 -0700
Subject: [PATCH 30/93] fixed half

---
 src/components/Reports/Reports.jsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/Reports/Reports.jsx b/src/components/Reports/Reports.jsx
index 4138706f22..9129f02dc7 100644
--- a/src/components/Reports/Reports.jsx
+++ b/src/components/Reports/Reports.jsx
@@ -273,9 +273,14 @@ class ReportsPage extends Component {
       });
     }
 
-    if (this.state.startDate != null && this.state.endDate != null) {
-      this.state.peopleSearchData = this.filteredPeopleList(this.state.peopleSearchData);
+    const { startDate, endDate } = this.state;
+
+    if (startDate != null && endDate != null) {
+      this.setState({
+        peopleSearchData: this.filteredPeopleList(peopleSearchData),
+      });
     }
+
     return (
       <Container fluid className="mb-5 container-component-wrapper">
         <div className="container-component-category">

From 4523d7a5f704fa454e09effd886274f6f86471bf Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 14:06:33 -0700
Subject: [PATCH 31/93] fixed reports.jsx

---
 src/components/Reports/Reports.jsx | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/components/Reports/Reports.jsx b/src/components/Reports/Reports.jsx
index 9129f02dc7..1af5856b4e 100644
--- a/src/components/Reports/Reports.jsx
+++ b/src/components/Reports/Reports.jsx
@@ -290,28 +290,31 @@ class ReportsPage extends Component {
           </div>
           <div className="category-container">
             <button
+              type="button"
               className={`card-category-item ${this.state.showProjects ? 'selected' : ''}`}
               onClick={this.showProjectTable}
             >
               <h3 className="card-category-item-title"> Projects</h3>
               <h3 className="card-category-item-number">{this.state.projectSearchData.length} </h3>
-              <img src={projectsImage} alt="Image that representes the projects" />
+              <img src={projectsImage} alt="Represents the projects" />
             </button>
             <button
+              type="button"
               className={`card-category-item ${this.state.showPeople ? 'selected' : ''}`}
               onClick={this.showPeopleTable}
             >
               <h3 className="card-category-item-title"> People </h3>
               <h3 className="card-category-item-number">{this.state.peopleSearchData.length}</h3>
-              <img src={peopleImage} alt="Image that representes the people" />
+              <img src={peopleImage} alt="Representes the people" />
             </button>
             <button
+              type="button"
               className={`card-category-item ${this.state.showTeams ? 'selected' : ''}`}
               onClick={this.showTeamsTable}
             >
               <h3 className="card-category-item-title"> Teams </h3>
               <h3 className="card-category-item-number">{this.state.teamSearchData?.length}</h3>
-              <img src={teamsImage} alt="Image that representes the teams" />
+              <img src={teamsImage} alt="Represents the teams" />
             </button>
             {/* <button style={{ margin: '5px' }} exact className="btn btn-info btn-bg mt-3" onClick={this.showProjectTable}>
               <i className="fa fa-folder" aria-hidden="true" />
@@ -337,6 +340,7 @@ class ReportsPage extends Component {
           </div>
           <div className="mt-4 bg-white p-3 rounded-5">
             <div>
+              {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
               <a>Select a Filter</a>
             </div>
             <div>
@@ -432,8 +436,8 @@ class ReportsPage extends Component {
                   <br />
                   Projects must have had at least 1 hour logged to them to be included.
                   <br />
-                  A 'Total Hours' section will show the total tangible time logged to all projects
-                  during the selected period.
+                  A &apos;Total Hours&apos; section will show the total tangible time logged to all
+                  projects during the selected period.
                   <br />A detail report will list all the projects and hours contributed by each
                   during that time period.
                 </ReactTooltip>
@@ -456,10 +460,10 @@ class ReportsPage extends Component {
                   Click this button to see exactly how many total people have contributed time to
                   the projects for a designated time period.
                   <br />
-                  Peole must have had at least 10 hours logged for them to be included.
+                  People must have had at least 10 hours logged for them to be included.
                   <br />
-                  A 'Total Hours' section will show the total tangible time logged by all people
-                  during the selected period.
+                  A &apos;Total Hours&apos; section will show the total tangible time logged by all
+                  people during the selected period.
                   <br />A detail report will list all the people and hours contributed by each
                   during that time period.
                 </ReactTooltip>
@@ -483,8 +487,8 @@ class ReportsPage extends Component {
                   <br />
                   The team must have had at least 10 hours logged for them to be included.
                   <br />
-                  A 'Total Hours' section will show the total tangible time logged by all the teams
-                  during the selected period.
+                  A &apos;Total Hours&apos; section will show the total tangible time logged by all
+                  the teams during the selected period.
                   <br />A detail report will list all the teams and hours contributed by each during
                   that time period.
                 </ReactTooltip>

From aa9e2b2518d802c9b9c0b3997c21ad4ade2bb6b3 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 14:12:17 -0700
Subject: [PATCH 32/93] fixed ReportTable SearchPanel.jsx

---
 src/components/Reports/ReportTableSearchPanel.jsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/Reports/ReportTableSearchPanel.jsx b/src/components/Reports/ReportTableSearchPanel.jsx
index d6c2452b7a..c2953eebd2 100644
--- a/src/components/Reports/ReportTableSearchPanel.jsx
+++ b/src/components/Reports/ReportTableSearchPanel.jsx
@@ -1,11 +1,13 @@
+// eslint-disable-next-line no-unused-vars
 import React from 'react';
 import { SEARCH } from '../../languages/en/ui';
 import './reportsPage.css';
 
 /**
- * The search panel stateless component for  Rreport grid
+ * The search panel stateless component for Report grid
  */
-function ReportTableSearchPanel(props) {
+function ReportTableSearchPanel({ onSearch }) {
+  // Destructure onSearch here
   return (
     <div className="input-group" id="new_team">
       <div className="input-group-prepend">
@@ -13,6 +15,7 @@ function ReportTableSearchPanel(props) {
       </div>
 
       <input
+        /* eslint-disable-next-line jsx-a11y/no-autofocus */
         autoFocus
         type="text"
         className="form-control search-field-container"
@@ -20,7 +23,7 @@ function ReportTableSearchPanel(props) {
         placeholder="Search Text"
         id="team-profiles-wild-card-search"
         onChange={e => {
-          props.onSearch(e.target.value);
+          onSearch(e.target.value); // Use destructured onSearch directly
         }}
       />
     </div>

From 2e0ddb90f1dafb1b1f2f2fcf8e88ba4028c2eba5 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 15:06:45 -0700
Subject: [PATCH 33/93] fixed TeamTable.jsx

---
 src/components/Reports/TeamTable.jsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/Reports/TeamTable.jsx b/src/components/Reports/TeamTable.jsx
index de467c11a2..1957314b11 100644
--- a/src/components/Reports/TeamTable.jsx
+++ b/src/components/Reports/TeamTable.jsx
@@ -1,20 +1,19 @@
+// eslint-disable-next-line no-unused-vars
 import React from 'react';
 import { Link } from 'react-router-dom';
 import './TeamTable.css';
 
-function TeamTable(props) {
+function TeamTable({ allTeams }) {
   // Display project lists
   let TeamsList = [];
-  if (props.allTeams.length > 0) {
-    TeamsList = props.allTeams.map((team, index) => (
+  if (allTeams.length > 0) {
+    TeamsList = allTeams.map((team, index) => (
       <tr id={`tr_${team._id}`} key={team._id}>
         <th scope="row">
           <div>{index + 1}</div>
         </th>
         <td>
-          <Link to={`/teamreport/${team._id}`}>
-            {team.teamName}
-          </Link>
+          <Link to={`/teamreport/${team._id}`}>{team.teamName}</Link>
         </td>
         <td className="projects__active--input">
           {team.isActive ? (

From 6d44e5869978cee32cccca346d3574ba6badacef Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 15:26:21 -0700
Subject: [PATCH 34/93] half fix TimeEntriesViz.jsx

---
 src/components/Reports/TimeEntriesViz.jsx | 106 ++++++++++------------
 1 file changed, 50 insertions(+), 56 deletions(-)

diff --git a/src/components/Reports/TimeEntriesViz.jsx b/src/components/Reports/TimeEntriesViz.jsx
index 6b27a465c2..505e6477ef 100644
--- a/src/components/Reports/TimeEntriesViz.jsx
+++ b/src/components/Reports/TimeEntriesViz.jsx
@@ -3,7 +3,7 @@ import * as d3 from 'd3/dist/d3.min';
 import { Button } from 'react-bootstrap';
 import { boxStyle } from 'styles';
 
-const TimeEntriesViz = ({ timeEntries, fromDate, toDate }) => {
+function TimeEntriesViz({ timeEntries, fromDate, toDate }) {
   const [show, setShow] = React.useState(false);
 
   React.useEffect(() => {
@@ -15,44 +15,38 @@ const TimeEntriesViz = ({ timeEntries, fromDate, toDate }) => {
       d3.selectAll('#tlplot > *').remove();
     } else {
       d3.selectAll('#tlplot > *').remove();
-      const margin = { top: 10, right: 30, bottom: 30, left: 60 },
-        width = 1000 - margin.left - margin.right,
-        height = 400 - margin.top - margin.bottom;
+      const margin = { top: 10, right: 30, bottom: 30, left: 60 };
+      const width = 1000 - margin.left - margin.right;
+      const height = 400 - margin.top - margin.bottom;
 
-      var tooltipEl = function(d) {
+      const tooltipEl = function(d) {
         return (
-          '<div class="tip__container">' +
-          '<div class="close">' +
-          '<button>&times</button>' +
-          '</div>' +
-          '<div>' +
-          'Exact date: ' +
-          d3.timeFormat('%A, %B %e, %Y')(d.date) +
-          '<br>' +
-          'Hours logged on this day: ' +
-          d.count.toFixed(2) +
-          '</div>' +
-          '</div>'
+          `${'<div class="tip__container">' +
+            '<div class="close">' +
+            '<button>&times</button>' +
+            '</div>' +
+            '<div>' +
+            'Exact date: '}${d3.timeFormat('%A, %B %e, %Y')(d.date)}<br>` +
+          `Hours logged on this day: ${d.count.toFixed(2)}</div>` +
+          `</div>`
         );
       };
 
-      var legendEl = function(totalHours) {
+      const legendEl = function(totalHours) {
         return (
-          '<div class="lengendSubContainer">' +
-          '<div class="totalCount">' +
-          'Total Hours: ' +
-          totalHours.toFixed(2) +
-          '</div>' +
-          '<div class="entLabelsOff">' +
-          '<button>Labels Off</button>' +
-          '</div>' +
-          '<div class="entCountLabelsOn">' +
-          '<button>Show Daily Hours</button>' +
-          '</div>' +
-          '<div class="entDateLabelsOn">' +
-          '<button>Show Dates</button>' +
-          '</div>' +
-          '</div>'
+          `${'<div class="lengendSubContainer">' +
+            '<div class="totalCount">' +
+            'Total Hours: '}${totalHours.toFixed(2)}</div>` +
+          `<div class="entLabelsOff">` +
+          `<button>Labels Off</button>` +
+          `</div>` +
+          `<div class="entCountLabelsOn">` +
+          `<button>Show Daily Hours</button>` +
+          `</div>` +
+          `<div class="entDateLabelsOn">` +
+          `<button>Show Dates</button>` +
+          `</div>` +
+          `</div>`
         );
       };
 
@@ -106,10 +100,10 @@ const TimeEntriesViz = ({ timeEntries, fromDate, toDate }) => {
         .attr('stroke-width', 3)
         .attr('fill', 'white')
         .on('click', function(event, d) {
-          let prevTooltip = d3.select(`.ent${d.id}`);
+          const prevTooltip = d3.select(`.ent${d.id}`);
 
           if (prevTooltip.empty()) {
-            let Tooltip = d3
+            const Tooltip = d3
               .select('#tlplot')
               .append('div')
               .style('opacity', 0)
@@ -160,7 +154,7 @@ const TimeEntriesViz = ({ timeEntries, fromDate, toDate }) => {
         .style('display', 'none')
         .text(d => d3.timeFormat('%m/%d/%Y')(d.date));
 
-      let legend = d3
+      const legend = d3
         .select('#tlplot')
         .append('div')
         .attr('class', 'legendContainer')
@@ -188,15 +182,15 @@ const TimeEntriesViz = ({ timeEntries, fromDate, toDate }) => {
   }
 
   const generateGraph = () => {
-    let timeEntriesDict = {};
-    let timeEntryvalues = [];
+    const timeEntriesDict = {};
+    const timeEntryvalues = [];
     let maxHoursCount = 0;
     let totalHours = 0;
 
-    //aggregate entries
+    // aggregate entries
     if (timeEntries.period) {
       for (let i = 0; i < timeEntries.period.length; i++) {
-        let convertedHours =
+        const convertedHours =
           parseInt(timeEntries.period[i].hours) +
           (timeEntries.period[i].minutes === '0'
             ? 0
@@ -215,10 +209,10 @@ const TimeEntriesViz = ({ timeEntries, fromDate, toDate }) => {
       }
     }
 
-    //filter time entries by date
-    if (fromDate == '' || toDate == '') {
-      //if cond not needed
-      for (var key in timeEntriesDict) {
+    // filter time entries by date
+    if (fromDate === '' || toDate === '') {
+      // if cond not needed
+      for (const key in timeEntriesDict) {
         timeEntryvalues.push({
           date: d3.timeParse('%Y-%m-%d')(key.toString()),
           count: timeEntriesDict[key].time,
@@ -232,25 +226,25 @@ const TimeEntriesViz = ({ timeEntries, fromDate, toDate }) => {
       }
     } else {
       let counter = 0;
-      for (var key in timeEntriesDict) {
+      Object.keys(timeEntriesDict).forEach(currentKey => {
         if (
-          (Date.parse(fromDate) <= Date.parse(key.toString())) &
-          (Date.parse(key.toString()) <= Date.parse(toDate))
+          (Date.parse(fromDate) <= Date.parse(currentKey.toString())) &
+          (Date.parse(currentKey.toString()) <= Date.parse(toDate))
         ) {
           timeEntryvalues.push({
             id: counter,
-            date: d3.timeParse('%Y-%m-%d')(key.toString()),
-            count: timeEntriesDict[key].time,
-            des: timeEntriesDict[key].des,
-            isTangible: timeEntriesDict[key].isTangible,
+            date: d3.timeParse('%Y-%m-%d')(currentKey.toString()),
+            count: timeEntriesDict[currentKey].time,
+            des: timeEntriesDict[currentKey].des,
+            isTangible: timeEntriesDict[currentKey].isTangible,
             type: 'Entry',
           });
-          if (timeEntriesDict[key].time > maxHoursCount) {
-            maxHoursCount = timeEntriesDict[key].time;
+          if (timeEntriesDict[currentKey].time > maxHoursCount) {
+            maxHoursCount = timeEntriesDict[currentKey].time;
           }
           counter += 1;
         }
-      }
+      });
     }
 
     timeEntryvalues.sort(function(a, b) {
@@ -265,9 +259,9 @@ const TimeEntriesViz = ({ timeEntries, fromDate, toDate }) => {
       <Button onClick={() => setShow(!show)} aria-expanded={show} style={boxStyle}>
         Show Time Entries Graph
       </Button>
-      <div id="tlplot"></div>
+      <div id="tlplot" />
     </div>
   );
-};
+}
 
 export default TimeEntriesViz;

From a262ea145510f826f2e9c540e0d2f55742a6421f Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 15:32:36 -0700
Subject: [PATCH 35/93] half fix TimeEntriesViz.jsx

---
 .idea/inspectionProfiles/Project_Default.xml |  1 +
 src/components/Reports/TimeEntriesViz.jsx    | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index bd024de74c..6de138e6ce 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="myValues">
         <value>
diff --git a/src/components/Reports/TimeEntriesViz.jsx b/src/components/Reports/TimeEntriesViz.jsx
index 505e6477ef..3d396c1306 100644
--- a/src/components/Reports/TimeEntriesViz.jsx
+++ b/src/components/Reports/TimeEntriesViz.jsx
@@ -7,6 +7,7 @@ function TimeEntriesViz({ timeEntries, fromDate, toDate }) {
   const [show, setShow] = React.useState(false);
 
   React.useEffect(() => {
+    // eslint-disable-next-line no-use-before-define
     generateGraph();
   }, [show, fromDate, toDate]);
 
@@ -19,7 +20,7 @@ function TimeEntriesViz({ timeEntries, fromDate, toDate }) {
       const width = 1000 - margin.left - margin.right;
       const height = 400 - margin.top - margin.bottom;
 
-      const tooltipEl = function(d) {
+      const tooltipEl = function generateTooltipElement(d) {
         return (
           `${'<div class="tip__container">' +
             '<div class="close">' +
@@ -32,11 +33,11 @@ function TimeEntriesViz({ timeEntries, fromDate, toDate }) {
         );
       };
 
-      const legendEl = function(totalHours) {
+      const legendEl = function generateLegendElement(innerTotalHours) {
         return (
           `${'<div class="lengendSubContainer">' +
             '<div class="totalCount">' +
-            'Total Hours: '}${totalHours.toFixed(2)}</div>` +
+            'Total Hours: '}${innerTotalHours.toFixed(2)}</div>` +
           `<div class="entLabelsOff">` +
           `<button>Labels Off</button>` +
           `</div>` +
@@ -99,7 +100,7 @@ function TimeEntriesViz({ timeEntries, fromDate, toDate }) {
         .attr('stroke', '#69b3a2')
         .attr('stroke-width', 3)
         .attr('fill', 'white')
-        .on('click', function(event, d) {
+        .on('click', function handleEvent(event, d) {
           const prevTooltip = d3.select(`.ent${d.id}`);
 
           if (prevTooltip.empty()) {
@@ -120,7 +121,7 @@ function TimeEntriesViz({ timeEntries, fromDate, toDate }) {
               .style('top', `${event.pageY}px`)
               .style('opacity', 1);
 
-            Tooltip.select('.close').on('click', function() {
+            Tooltip.select('.close').on('click', function closeTooltip() {
               Tooltip.remove();
             });
           }
@@ -189,7 +190,7 @@ function TimeEntriesViz({ timeEntries, fromDate, toDate }) {
 
     // aggregate entries
     if (timeEntries.period) {
-      for (let i = 0; i < timeEntries.period.length; i++) {
+      for (let i = 0; i < timeEntries.period.length; i += 1) {
         const convertedHours =
           parseInt(timeEntries.period[i].hours) +
           (timeEntries.period[i].minutes === '0'

From 606fc1023196d05d690f13502f88a6d62edd1000 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 29 Sep 2023 18:48:55 -0400
Subject: [PATCH 36/93] fixed lint errors

---
 .../BMDashboard/ProjectDetails/LogBar.jsx       | 17 +++++++++++------
 .../ProjectDetails/Materials/Materials.jsx      |  2 +-
 .../BMDashboard/ProjectDetails/ProjectLog.jsx   |  3 +--
 .../RentedTools/RentedToolsDisplay.jsx          |  6 ++++--
 .../ProjectDetails/RentedTools/ToolCards.jsx    |  5 ++---
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
index faec077723..c36bbd35a8 100644
--- a/src/components/BMDashboard/ProjectDetails/LogBar.jsx
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
@@ -19,13 +19,18 @@ function LogBar() {
   return (
     <div className="log-bar">
       {Object.keys(buttonStyles).map((section, index) => (
-        <div key={index} className={`log-bar__section`}>
+        <div key={index} className="log-bar__section">
           <h2>
-            {section === 'dailyLogging'
-              ? 'Daily Logging:'
-              : section === 'newItem'
-              ? 'Add a New Item:'
-              : 'Team:'}
+            {(() => {
+              switch (section) {
+                case 'dailyLogging':
+                  return 'Daily Logging:';
+                case 'newItem':
+                  return 'Add a New Item:';
+                default:
+                  return 'Team';
+              }
+            })()}
           </h2>
           <ul className="log-bar__btn-group">
             {buttonLabels[section].map((label, i) => (
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx b/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
index 2f7229d711..8a21a36aac 100644
--- a/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
+++ b/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
@@ -10,4 +10,4 @@ function Materials() {
   );
 }
 
-export default Materials;
\ No newline at end of file
+export default Materials;
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
index 72fe4b80e7..39d886200c 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
@@ -23,7 +23,7 @@ const DummyData = [
     todaysHrs: 2.18,
   },
   {
-    id: '35',
+    id: '36',
     firstName: 'Member A',
     lastName: 'Member A',
     role: 'Role A',
@@ -35,7 +35,6 @@ const DummyData = [
 ];
 
 function ProjectLog() {
-
   const tableRows = DummyData.map((person, index) => (
     <tr key={index}>
       <th scope="row">{person.id}</th>
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
index 0406de5ba1..d3cf707d86 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
@@ -5,8 +5,10 @@ import ToolCards from './ToolCards';
 function RentedToolsDisplay() {
   return (
     <Card className="cards-container">
-      <h2 className="cards-container__header">Rented Tools or equipment to be returned in 3 days.</h2>
-      <ToolCards />  
+      <h2 className="cards-container__header">
+        Rented Tools or equipment to be returned in 3 days.
+      </h2>
+      <ToolCards />
     </Card>
   );
 }
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx
index 814679a9ee..39268a4af7 100644
--- a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx
+++ b/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx
@@ -1,7 +1,6 @@
 import ToolCard from './ToolCard';
 
-
-const ToolCards = () => {
+function ToolCards() {
   return (
     <div className="cards-container__content">
       <ToolCard />
@@ -11,4 +10,4 @@ const ToolCards = () => {
   );
 }
 
-export default ToolCards
\ No newline at end of file
+export default ToolCards;

From e06b4104c84f4de94489a8229c3fc9a976e7c858 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 16:52:10 -0700
Subject: [PATCH 37/93] fixed Time EntriesViz.jsx

---
 src/components/Reports/TimeEntriesViz.jsx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/Reports/TimeEntriesViz.jsx b/src/components/Reports/TimeEntriesViz.jsx
index 3d396c1306..904efd648e 100644
--- a/src/components/Reports/TimeEntriesViz.jsx
+++ b/src/components/Reports/TimeEntriesViz.jsx
@@ -165,17 +165,17 @@ function TimeEntriesViz({ timeEntries, fromDate, toDate }) {
 
       legend.html(legendEl(totalHours));
 
-      legend.select('.entLabelsOff').on('click', function() {
+      legend.select('.entLabelsOff').on('click', function handleEntLabelsOffClick() {
         d3.selectAll('.entCountLabel').style('display', 'none');
         d3.selectAll('.entDateLabel').style('display', 'none');
       });
 
-      legend.select('.entCountLabelsOn').on('click', function() {
+      legend.select('.entCountLabelsOn').on('click', function handleEntCountLabelsOnClick() {
         d3.selectAll('.entCountLabel').style('display', 'block');
         d3.selectAll('.entDateLabel').style('display', 'none');
       });
 
-      legend.select('.entDateLabelsOn').on('click', function() {
+      legend.select('.entDateLabelsOn').on('click', function handleEntDateLabelsOnClick() {
         d3.selectAll('.entDateLabel').style('display', 'block');
         d3.selectAll('.entCountLabel').style('display', 'none');
       });
@@ -192,10 +192,10 @@ function TimeEntriesViz({ timeEntries, fromDate, toDate }) {
     if (timeEntries.period) {
       for (let i = 0; i < timeEntries.period.length; i += 1) {
         const convertedHours =
-          parseInt(timeEntries.period[i].hours) +
+          parseInt(timeEntries.period[i].hours, 10) +
           (timeEntries.period[i].minutes === '0'
             ? 0
-            : parseInt(timeEntries.period[i].minutes) / 60);
+            : parseInt(timeEntries.period[i].minutes, 10) / 60);
         totalHours += convertedHours;
         if (timeEntries.period[i].dateOfWork in timeEntriesDict) {
           timeEntriesDict[timeEntries.period[i].dateOfWork].time += convertedHours;
@@ -213,9 +213,9 @@ function TimeEntriesViz({ timeEntries, fromDate, toDate }) {
     // filter time entries by date
     if (fromDate === '' || toDate === '') {
       // if cond not needed
-      for (const key in timeEntriesDict) {
+      Object.keys(timeEntriesDict).forEach(key => {
         timeEntryvalues.push({
-          date: d3.timeParse('%Y-%m-%d')(key.toString()),
+          date: d3.timeParse('%Y-%m-%d')(key),
           count: timeEntriesDict[key].time,
           des: timeEntriesDict[key].des,
           isTangible: timeEntriesDict[key].isTangible,
@@ -224,13 +224,13 @@ function TimeEntriesViz({ timeEntries, fromDate, toDate }) {
         if (timeEntriesDict[key].time > maxHoursCount) {
           maxHoursCount = timeEntriesDict[key].time;
         }
-      }
+      });
     } else {
       let counter = 0;
       Object.keys(timeEntriesDict).forEach(currentKey => {
         if (
-          (Date.parse(fromDate) <= Date.parse(currentKey.toString())) &
-          (Date.parse(currentKey.toString()) <= Date.parse(toDate))
+          Date.parse(fromDate) <= Date.parse(currentKey.toString()) &&
+          Date.parse(currentKey.toString()) <= Date.parse(toDate)
         ) {
           timeEntryvalues.push({
             id: counter,
@@ -248,7 +248,7 @@ function TimeEntriesViz({ timeEntries, fromDate, toDate }) {
       });
     }
 
-    timeEntryvalues.sort(function(a, b) {
+    timeEntryvalues.sort(function sortDates(a, b) {
       return new Date(b.date) - new Date(a.date);
     });
 

From 74124cb24ab0b73e338c36c6643277018ba3e195 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 16:57:02 -0700
Subject: [PATCH 38/93] add ignore file back

---
 .eslintignore   | 58 +++++++++++++++++++++++++++++++++++++++++++++++++
 .prettierignore | 54 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+)
 create mode 100644 .eslintignore
 create mode 100644 .prettierignore

diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000000..58b85ab980
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,58 @@
+*.png
+*.svg
+*.test.js
+*.test.jsx
+src/actions/**
+src/App.css
+src/config.json
+src/constants/**
+src/index.js
+src/languages/**
+src/reducers/**
+src/registerServiceWorker.js
+src/routes.js
+src/services/**
+src/setupTests.js
+src/store.js
+src/styles.js
+src/utils/**
+src/__tests__/**
+
+
+
+src/components/App.jsx
+src/components/AutoReload/**
+src/components/AutoUpdate/**
+src/components/Badge/**
+src/components/BMDashboard/**
+src/components/common/**
+src/components/ForcePasswordUpdate/**
+src/components/Header/**
+src/components/Inventory/**
+src/components/LeaderBoard/**
+src/components/Login/**
+src/components/ManageMemberships/**
+src/components/Memberships/**
+src/components/MonthlyEffort/**
+src/components/NewProfileLink/**
+src/components/OwnerMessage/**
+src/components/PermissionsManagement/**
+src/components/PopUpBar/**
+src/components/ProfileLinks/**
+src/components/Projects/**
+src/components/RenderInfringement/**
+src/components/Reports/**
+src/components/SetupProfile/**
+src/components/SummaryBar/**
+src/components/SummaryManagement/**
+src/components/TaskEditSuggestions/**
+src/components/TeamMemberTasks/**
+src/components/Teams/**
+src/components/Timelog/**
+src/components/Timer/**
+src/components/UpdatePassword/**
+src/components/UserManagement/**
+src/components/UserProfile/**
+src/components/WeeklySummary/**
+src/components/MouseoverText/**
+src/components/WeeklySummariesReport/**
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000000..12c9181f07
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,54 @@
+*.png
+*.svg
+src/actions/**
+src/App.css
+src/config.json
+src/constants/**
+src/index.js
+src/languages/**
+src/reducers/**
+src/registerServiceWorker.js
+src/routes.js
+src/services/**
+src/setupTests.js
+src/store.js
+src/styles.js
+src/utils/**
+src/__tests__/**
+
+
+src/components/App.jsx
+src/components/AutoReload/**
+src/components/AutoUpdate/**
+src/components/Badge/**
+src/components/common/**
+src/components/ForcePasswordUpdate/**
+src/components/Header/**
+src/components/Inventory/**
+src/components/LeaderBoard/**
+src/components/Login/**
+src/components/ManageMemberships/**
+src/components/Memberships/**
+src/components/MonthlyEffort/**
+src/components/NewProfileLink/**
+src/components/OwnerMessage/**
+src/components/PermissionsManagement/**
+src/components/PopUpBar/**
+src/components/ProfileLinks/**
+src/components/Projects/**
+src/components/RenderInfringement/**
+src/components/Reports/**
+src/components/SetupProfile/**
+src/components/SummaryBar/**
+src/components/SummaryManagement/**
+src/components/TaskEditSuggestions/**
+src/components/TeamMemberTasks/**
+src/components/Teams/**
+src/components/Timelog/**
+src/components/Timer/**
+src/components/UpdatePassword/**
+src/components/UserManagement/**
+src/components/UserProfile/**
+src/components/WeeklySummary/**
+src/components/MouseoverText/**
+src/components/WeeklySummariesReport/**
\ No newline at end of file

From 3e805f7d682b2eee97e30edbc58fae42589dc516 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 17:08:34 -0700
Subject: [PATCH 39/93] final fixed

---
 src/components/Reports/TimeEntriesViz.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Reports/TimeEntriesViz.jsx b/src/components/Reports/TimeEntriesViz.jsx
index 904efd648e..3fb943e5ce 100644
--- a/src/components/Reports/TimeEntriesViz.jsx
+++ b/src/components/Reports/TimeEntriesViz.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import * as d3 from 'd3/dist/d3.min';
 import { Button } from 'react-bootstrap';
-import { boxStyle } from 'styles';
+import { boxStyle } from '../../styles';
 
 function TimeEntriesViz({ timeEntries, fromDate, toDate }) {
   const [show, setShow] = React.useState(false);

From 0473343fd30aaad8a911108ebe319148cff86bc9 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Fri, 29 Sep 2023 17:31:54 -0700
Subject: [PATCH 40/93] rever reprot.jsx

---
 src/components/Reports/Reports.jsx | 264 +++++++++++++++--------------
 1 file changed, 135 insertions(+), 129 deletions(-)

diff --git a/src/components/Reports/Reports.jsx b/src/components/Reports/Reports.jsx
index 1af5856b4e..34f6e16024 100644
--- a/src/components/Reports/Reports.jsx
+++ b/src/components/Reports/Reports.jsx
@@ -1,9 +1,8 @@
-// eslint-disable-next-line no-unused-vars
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
+import moment from 'moment';
 import { Container, Button } from 'reactstrap';
 import DatePicker from 'react-datepicker';
-import ReactTooltip from 'react-tooltip';
 import { fetchAllProjects } from '../../actions/projects';
 import { getAllUserTeams } from '../../actions/allTeamsAction';
 import TeamTable from './TeamTable';
@@ -17,6 +16,7 @@ import './reportsPage.css';
 import projectsImage from './images/Projects.svg';
 import peopleImage from './images/People.svg';
 import teamsImage from './images/Teams.svg';
+import ReactTooltip from 'react-tooltip';
 import TotalPeopleReport from './TotalReport/TotalPeopleReport';
 import TotalTeamReport from './TotalReport/TotalTeamReport';
 import TotalProjectReport from './TotalReport/TotalProjectReport';
@@ -34,8 +34,44 @@ class ReportsPage extends Component {
       showTotalTeam: false,
       showTotalProject: false,
       teamNameSearchText: '',
+      teamMembersPopupOpen: false,
+      deleteTeamPopupOpen: false,
+      createNewTeamPopupOpen: false,
+      teamStatusPopupOpen: false,
       wildCardSearchText: '',
+      selectedTeamId: 0,
+      selectedTeam: '',
       checkActive: '',
+      formElements: {
+        summary: '',
+        summaryLastWeek: '',
+        summaryBeforeLast: '',
+        mediaUrl: '',
+        weeklySummariesCount: 0,
+        mediaConfirm: false,
+      },
+      dueDate: moment()
+        .tz('America/Los_Angeles')
+        .endOf('week')
+        .toISOString(),
+      dueDateLastWeek: moment()
+        .tz('America/Los_Angeles')
+        .endOf('week')
+        .subtract(1, 'week')
+        .toISOString(),
+      dueDateBeforeLast: moment()
+        .tz('America/Los_Angeles')
+        .endOf('week')
+        .subtract(2, 'week')
+        .toISOString(),
+      activeTab: '1',
+      errors: {},
+      fetchError: null,
+      loading: true,
+      teamSearchData: {},
+      peopleSearchData: [],
+      projectSearchData: {},
+      users: {},
       startDate: new Date(DATE_PICKER_MIN_DATE),
       endDate: new Date(),
       teamMemberList: {},
@@ -53,21 +89,15 @@ class ReportsPage extends Component {
   }
 
   async componentDidMount() {
-    const {
-      fetchAllProjects: fetchAllProjectsProp,
-      getAllUserTeams: getAllUserTeamsProp,
-      getAllUserProfile: getAllUserProfileProp,
-    } = this.props;
-
-    fetchAllProjectsProp(); // Fetch to get all projects
-    getAllUserTeamsProp();
+    this.props.fetchAllProjects(); // Fetch to get all projects
+    this.props.getAllUserTeams();
     this.setState({
       showProjects: false,
       showPeople: false,
       showTeams: false,
       checkActive: '',
     });
-    getAllUserProfileProp();
+    this.props.getAllUserProfile();
   }
 
   /**
@@ -79,51 +109,20 @@ class ReportsPage extends Component {
     });
   };
 
-  setActive() {
-    this.setState(() => ({
-      checkActive: 'true',
-    }));
-  }
-
-  setAll() {
-    this.setState(() => ({
-      checkActive: '',
-    }));
-  }
-
-  setInActive() {
-    this.setState(() => ({
-      checkActive: 'false',
-    }));
-  }
-
-  setTeamMemberList(list) {
-    this.setState(() => ({
-      teamMemberList: list,
-    }));
-  }
-
-  filteredPeopleList = userProfiles => {
-    const { teamNameSearchText, wildCardSearchText, startDate, endDate } = this.state;
-
-    const filteredList = userProfiles.filter(userProfile => {
-      const firstNameLower = userProfile.firstName ? userProfile.firstName.toLowerCase() : '';
-      const lastNameLower = userProfile.lastName ? userProfile.lastName.toLowerCase() : '';
-      const teamNameSearchTextLower = teamNameSearchText.toLowerCase();
-      const wildCardSearchTextLower = wildCardSearchText.toLowerCase();
-
-      const createdDate = new Date(Date.parse(userProfile.createdDate));
-      const endProfileDate = userProfile.endDate ? new Date(Date.parse(userProfile.endDate)) : null;
-
+  filteredProjectList = projects => {
+    const filteredList = projects.filter(project => {
+      // Applying the search filters before creating each team table data element
       if (
-        (firstNameLower.indexOf(teamNameSearchTextLower) > -1 && wildCardSearchText === '') ||
-        (wildCardSearchText !== '' && firstNameLower.indexOf(wildCardSearchTextLower) > -1) ||
-        (wildCardSearchText !== '' && lastNameLower.indexOf(wildCardSearchTextLower) > -1)
+        (project.projectName &&
+          project.projectName.toLowerCase().indexOf(this.state.teamNameSearchText.toLowerCase()) >
+            -1 &&
+          this.state.wildCardSearchText === '') ||
+        // the wild card search, the search text can be match with any item
+        (this.state.wildCardSearchText !== '' &&
+          project.projectName.toLowerCase().indexOf(this.state.wildCardSearchText.toLowerCase()) >
+            -1)
       ) {
-        return (
-          createdDate >= startDate &&
-          (!endProfileDate || (startDate <= endProfileDate && endProfileDate <= endDate))
-        );
+        return project;
       }
       return false;
     });
@@ -131,19 +130,18 @@ class ReportsPage extends Component {
     return filteredList;
   };
 
-  filteredProjectList = projects => {
-    const { teamNameSearchText, wildCardSearchText } = this.state;
-
-    const filteredList = projects.filter(project => {
-      const projectNameLower = project.projectName ? project.projectName.toLowerCase() : '';
-      const teamNameSearchTextLower = teamNameSearchText.toLowerCase();
-      const wildCardSearchTextLower = wildCardSearchText.toLowerCase();
-
+  filteredTeamList = allTeams => {
+    const filteredList = allTeams?.filter(team => {
+      // Applying the search filters before creating each team table data element
       if (
-        (projectNameLower.indexOf(teamNameSearchTextLower) > -1 && wildCardSearchText === '') ||
-        (wildCardSearchText !== '' && projectNameLower.indexOf(wildCardSearchTextLower) > -1)
+        (team.teamName &&
+          team.teamName.toLowerCase().indexOf(this.state.teamNameSearchText.toLowerCase()) > -1 &&
+          this.state.wildCardSearchText === '') ||
+        // the wild card search, the search text can be match with any item
+        (this.state.wildCardSearchText !== '' &&
+          team.teamName.toLowerCase().indexOf(this.state.wildCardSearchText.toLowerCase()) > -1)
       ) {
-        return project;
+        return team;
       }
       return false;
     });
@@ -151,19 +149,27 @@ class ReportsPage extends Component {
     return filteredList;
   };
 
-  filteredTeamList = allTeams => {
-    const { teamNameSearchText, wildCardSearchText } = this.state;
-
-    const filteredList = allTeams?.filter(team => {
-      const teamNameLower = team.teamName ? team.teamName.toLowerCase() : '';
-      const teamNameSearchTextLower = teamNameSearchText.toLowerCase();
-      const wildCardSearchTextLower = wildCardSearchText.toLowerCase();
-
+  filteredPeopleList = userProfiles => {
+    const filteredList = userProfiles.filter(userProfile => {
+      // Applying the search filters before creating each team table data element
       if (
-        (teamNameLower.indexOf(teamNameSearchTextLower) > -1 && wildCardSearchText === '') ||
-        (wildCardSearchText !== '' && teamNameLower.indexOf(wildCardSearchTextLower) > -1)
+        (userProfile.firstName &&
+          userProfile.firstName.toLowerCase().indexOf(this.state.teamNameSearchText.toLowerCase()) >
+            -1 &&
+          this.state.wildCardSearchText === '') ||
+        // the wild card search, the search text can be match with any item
+        (this.state.wildCardSearchText !== '' &&
+          userProfile.firstName.toLowerCase().indexOf(this.state.wildCardSearchText.toLowerCase()) >
+            -1) ||
+        (this.state.wildCardSearchText !== '' &&
+          userProfile.lastName &&
+          userProfile.lastName.toLowerCase().indexOf(this.state.wildCardSearchText.toLowerCase()) >
+            -1)
       ) {
-        return team;
+        return (
+          new Date(Date.parse(userProfile.createdDate)) >= this.state.startDate &&
+          this.state.startDate <= new Date(Date.parse(userProfile?.endDate)) <= this.state.endDate
+        );
       }
       return false;
     });
@@ -171,6 +177,30 @@ class ReportsPage extends Component {
     return filteredList;
   };
 
+  setActive() {
+    this.setState(state => ({
+      checkActive: 'true',
+    }));
+  }
+
+  setAll() {
+    this.setState(state => ({
+      checkActive: '',
+    }));
+  }
+
+  setInActive() {
+    this.setState(() => ({
+      checkActive: 'false',
+    }));
+  }
+
+  setTeamMemberList(list) {
+    this.setState(() => ({
+      teamMemberList: list,
+    }));
+  }
+
   showProjectTable() {
     this.setState(prevState => ({
       showProjects: !prevState.showProjects,
@@ -225,7 +255,6 @@ class ReportsPage extends Component {
       showTotalPeople: false,
     }));
   }
-
   showTotalProject() {
     this.setState(prevState => ({
       showProjects: false,
@@ -238,49 +267,30 @@ class ReportsPage extends Component {
   }
 
   render() {
-    const {
-      state: {
-        allProjects: { projects },
-        allTeamsData: { allTeams },
-        allUserProfiles: { userProfiles },
-      },
-    } = this.props;
-
+    const { projects } = this.props.state.allProjects;
+    const { allTeams } = this.props.state.allTeamsData;
+    const { userProfiles } = this.props.state.allUserProfiles;
     this.state.teamSearchData = this.filteredTeamList(allTeams);
     this.state.peopleSearchData = this.filteredPeopleList(userProfiles);
     this.state.projectSearchData = this.filteredProjectList(projects);
-
-    // eslint-disable-next-line no-unused-vars
-    const { checkActive, teamSearchData, projectSearchData, peopleSearchData } = this.state;
-
-    if (checkActive === 'true') {
-      const activeTeams = allTeams.filter(team => team.isActive === true);
-      const activeProjects = projects.filter(project => project.isActive === true);
-      const activePeople = userProfiles.filter(user => user.isActive === true);
-      this.setState({
-        teamSearchData: this.filteredTeamList(activeTeams),
-        projectSearchData: this.filteredProjectList(activeProjects),
-        peopleSearchData: this.filteredPeopleList(activePeople),
-      });
-    } else if (checkActive === 'false') {
-      const inactiveTeams = allTeams.filter(team => team.isActive === false);
-      const inactiveProjects = projects.filter(project => project.isActive === false);
-      const inactivePeople = userProfiles.filter(user => user.isActive === false);
-      this.setState({
-        teamSearchData: this.filteredTeamList(inactiveTeams),
-        projectSearchData: this.filteredProjectList(inactiveProjects),
-        peopleSearchData: this.filteredPeopleList(inactivePeople),
-      });
+    if (this.state.checkActive === 'true') {
+      this.state.teamSearchData = allTeams.filter(team => team.isActive === true);
+      this.state.projectSearchData = projects.filter(project => project.isActive === true);
+      this.state.peopleSearchData = userProfiles.filter(user => user.isActive === true);
+      this.state.teamSearchData = this.filteredTeamList(this.state.teamSearchData);
+      this.state.peopleSearchData = this.filteredPeopleList(this.state.peopleSearchData);
+      this.state.projectSearchData = this.filteredProjectList(this.state.projectSearchData);
+    } else if (this.state.checkActive === 'false') {
+      this.state.teamSearchData = allTeams.filter(team => team.isActive === false);
+      this.state.projectSearchData = projects.filter(project => project.isActive === false);
+      this.state.peopleSearchData = userProfiles.filter(user => user.isActive === false);
+      this.state.teamSearchData = this.filteredTeamList(this.state.teamSearchData);
+      this.state.peopleSearchData = this.filteredPeopleList(this.state.peopleSearchData);
+      this.state.projectSearchData = this.filteredProjectList(this.state.projectSearchData);
     }
-
-    const { startDate, endDate } = this.state;
-
-    if (startDate != null && endDate != null) {
-      this.setState({
-        peopleSearchData: this.filteredPeopleList(peopleSearchData),
-      });
+    if (this.state.startDate != null && this.state.endDate != null) {
+      this.state.peopleSearchData = this.filteredPeopleList(this.state.peopleSearchData);
     }
-
     return (
       <Container fluid className="mb-5 container-component-wrapper">
         <div className="container-component-category">
@@ -290,31 +300,28 @@ class ReportsPage extends Component {
           </div>
           <div className="category-container">
             <button
-              type="button"
               className={`card-category-item ${this.state.showProjects ? 'selected' : ''}`}
               onClick={this.showProjectTable}
             >
               <h3 className="card-category-item-title"> Projects</h3>
               <h3 className="card-category-item-number">{this.state.projectSearchData.length} </h3>
-              <img src={projectsImage} alt="Represents the projects" />
+              <img src={projectsImage} alt="Image that representes the projects" />
             </button>
             <button
-              type="button"
               className={`card-category-item ${this.state.showPeople ? 'selected' : ''}`}
               onClick={this.showPeopleTable}
             >
               <h3 className="card-category-item-title"> People </h3>
               <h3 className="card-category-item-number">{this.state.peopleSearchData.length}</h3>
-              <img src={peopleImage} alt="Representes the people" />
+              <img src={peopleImage} alt="Image that representes the people" />
             </button>
             <button
-              type="button"
               className={`card-category-item ${this.state.showTeams ? 'selected' : ''}`}
               onClick={this.showTeamsTable}
             >
               <h3 className="card-category-item-title"> Teams </h3>
               <h3 className="card-category-item-number">{this.state.teamSearchData?.length}</h3>
-              <img src={teamsImage} alt="Represents the teams" />
+              <img src={teamsImage} alt="Image that representes the teams" />
             </button>
             {/* <button style={{ margin: '5px' }} exact className="btn btn-info btn-bg mt-3" onClick={this.showProjectTable}>
               <i className="fa fa-folder" aria-hidden="true" />
@@ -340,7 +347,6 @@ class ReportsPage extends Component {
           </div>
           <div className="mt-4 bg-white p-3 rounded-5">
             <div>
-              {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}
               <a>Select a Filter</a>
             </div>
             <div>
@@ -436,8 +442,8 @@ class ReportsPage extends Component {
                   <br />
                   Projects must have had at least 1 hour logged to them to be included.
                   <br />
-                  A &apos;Total Hours&apos; section will show the total tangible time logged to all
-                  projects during the selected period.
+                  A 'Total Hours' section will show the total tangible time logged to all projects
+                  during the selected period.
                   <br />A detail report will list all the projects and hours contributed by each
                   during that time period.
                 </ReactTooltip>
@@ -460,10 +466,10 @@ class ReportsPage extends Component {
                   Click this button to see exactly how many total people have contributed time to
                   the projects for a designated time period.
                   <br />
-                  People must have had at least 10 hours logged for them to be included.
+                  Peole must have had at least 10 hours logged for them to be included.
                   <br />
-                  A &apos;Total Hours&apos; section will show the total tangible time logged by all
-                  people during the selected period.
+                  A 'Total Hours' section will show the total tangible time logged by all people
+                  during the selected period.
                   <br />A detail report will list all the people and hours contributed by each
                   during that time period.
                 </ReactTooltip>
@@ -487,8 +493,8 @@ class ReportsPage extends Component {
                   <br />
                   The team must have had at least 10 hours logged for them to be included.
                   <br />
-                  A &apos;Total Hours&apos; section will show the total tangible time logged by all
-                  the teams during the selected period.
+                  A 'Total Hours' section will show the total tangible time logged by all the teams
+                  during the selected period.
                   <br />A detail report will list all the teams and hours contributed by each during
                   that time period.
                 </ReactTooltip>

From fdf8cda0a86492c887e846c1f03a2b5f527bbd4c Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Sat, 30 Sep 2023 18:48:51 -0400
Subject: [PATCH 41/93] added uuid for generating unique ids

---
 package-lock.json                             | 19 ++++++++++++++++---
 package.json                                  |  1 +
 .../BMDashboard/ProjectDetails/LogBar.jsx     |  9 +++++----
 .../BMDashboard/ProjectDetails/ProjectLog.jsx |  4 ++--
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e603a331d8..a06458b907 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14378,6 +14378,12 @@
             "lru-cache": "^6.0.0"
           }
         },
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "optional": true
+        },
         "which": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -19068,6 +19074,13 @@
         "faye-websocket": "^0.11.3",
         "uuid": "^8.3.2",
         "websocket-driver": "^0.7.4"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+        }
       }
     },
     "sockjs-client": {
@@ -20795,9 +20808,9 @@
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
     },
     "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
     },
     "v8-compile-cache": {
       "version": "2.3.0",
diff --git a/package.json b/package.json
index cdd18e9724..b86bbd6066 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
     "redux-persist": "^5.10.0",
     "redux-thunk": "^2.3.0",
     "tinymce": "^5.10.7",
+    "uuid": "^9.0.1",
     "websocket-extensions": ">=0.1.4"
   },
   "scripts": {
diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
index c36bbd35a8..886e6ea7d1 100644
--- a/src/components/BMDashboard/ProjectDetails/LogBar.jsx
+++ b/src/components/BMDashboard/ProjectDetails/LogBar.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { v4 as uuidv4 } from 'uuid';
 import { Button } from 'reactstrap';
 
 // button styles for each section
@@ -18,8 +19,8 @@ const buttonLabels = {
 function LogBar() {
   return (
     <div className="log-bar">
-      {Object.keys(buttonStyles).map((section, index) => (
-        <div key={index} className="log-bar__section">
+      {Object.keys(buttonStyles).map(section => (
+        <div key={uuidv4()} className="log-bar__section">
           <h2>
             {(() => {
               switch (section) {
@@ -33,8 +34,8 @@ function LogBar() {
             })()}
           </h2>
           <ul className="log-bar__btn-group">
-            {buttonLabels[section].map((label, i) => (
-              <li key={i}>
+            {buttonLabels[section].map(label => (
+              <li key={uuidv4()}>
                 <Button
                   type="button"
                   className={
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
index 39d886200c..26ad5b186e 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
@@ -35,8 +35,8 @@ const DummyData = [
 ];
 
 function ProjectLog() {
-  const tableRows = DummyData.map((person, index) => (
-    <tr key={index}>
+  const tableRows = DummyData.map(person => (
+    <tr key={person.id}>
       <th scope="row">{person.id}</th>
       <td>{person.firstName}</td>
       <td>{person.lastName}</td>

From 389d61005213de01ad0ed60e49f7369bf921a2e0 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Tue, 3 Oct 2023 10:38:15 -0400
Subject: [PATCH 42/93] buttons hover effect added

---
 src/components/BMDashboard/ProjectDetails/ProjectDetails.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
index f54473920c..6d8a7b6669 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
@@ -46,6 +46,11 @@
   width: 100%;
 }
 
+.button.btn:hover{
+  outline:auto;
+  filter: brightness(130%);
+}
+
 /* buttons custom colors */
 .button.btn.button--green {
   background-color: #015d4a;

From 21f7e116b967505ec09bc5203e65a65f684e65eb Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Tue, 3 Oct 2023 10:53:38 -0400
Subject: [PATCH 43/93] added striped to table and removed thead color

---
 src/components/BMDashboard/ProjectDetails/ProjectDetails.css | 4 ++++
 src/components/BMDashboard/ProjectDetails/ProjectLog.jsx     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
index 6d8a7b6669..524470d178 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.css
@@ -192,6 +192,10 @@
   font-weight: lighter;
 }
 
+.project-log thead{
+  background-color: transparent;
+}
+
 @media (max-width: 768px){
   .project-log td, .project-log th {
     font-size: 0.6em;
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
index 26ad5b186e..e9dccde72d 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
@@ -51,7 +51,7 @@ function ProjectLog() {
   return (
     <Card className="project-log">
       <h2>Members working on site today</h2>
-      <Table hover responsive>
+      <Table hover responsive striped>
         <thead>
           <tr>
             <th>ID</th>

From 665dbd972510ca4bb1a715dcbc6db64b5eb4037b Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Tue, 3 Oct 2023 15:04:19 -0400
Subject: [PATCH 44/93] input group design

---
 src/components/BMDashboard/BMDashboard.css  | 16 ++++++++
 src/components/BMDashboard/BMDashboard.jsx  | 42 +++++++++++++++++++--
 src/components/BMDashboard/ProjectsList.jsx |  7 ++++
 3 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 src/components/BMDashboard/BMDashboard.css
 create mode 100644 src/components/BMDashboard/ProjectsList.jsx

diff --git a/src/components/BMDashboard/BMDashboard.css b/src/components/BMDashboard/BMDashboard.css
new file mode 100644
index 0000000000..8f90323486
--- /dev/null
+++ b/src/components/BMDashboard/BMDashboard.css
@@ -0,0 +1,16 @@
+.bm-dashboard__header{
+  font-size: 1em;
+ 
+}
+
+@media (min-width: 650px){
+  .bm-dashboard__header{
+  font-size: 1.5em;  
+}
+
+.bm-dashboard__button.btn.btn-secondary{
+  padding-left: 0;
+  padding-right: 0;
+  max-height: 38px;
+}
+}
\ No newline at end of file
diff --git a/src/components/BMDashboard/BMDashboard.jsx b/src/components/BMDashboard/BMDashboard.jsx
index 2e1614b22f..9cece05394 100644
--- a/src/components/BMDashboard/BMDashboard.jsx
+++ b/src/components/BMDashboard/BMDashboard.jsx
@@ -1,7 +1,41 @@
+import { Row, Col, Container, Form, Button, FormGroup, Label, Input } from 'reactstrap';
+//import { ProjectsList } from './ProjectsList';
+import './BMDashboard.css';
+
 export const BMDashboard = () => {
-  return <div style={{ textAlign: 'center', marginTop: '5rem' }}>
-    <h2>Building and Inventory Management Dashboard</h2>
-  </div>
-}
+  return (
+    // <div style={{ textAlign: 'center', marginTop: '5rem' }}>
+    //   <h2>Building and Inventory Management Dashboard</h2>
+    // </div>
+    <Container className="d-flex justify-content-center align-items-center mw-80 px-4">
+      <Form className="w-75 p-3">
+        <Row className="ml-0">
+          <Col className="text-center">
+            <h1 className="bm-dashboard__header">Building and Inventory Management Dashboard</h1>
+          </Col>
+        </Row>
+        <Row className="ml-0 gx-5" md="2" sm="1" xs="1">
+          <Col className="p-3">
+            <Label for="exampleSelect" hidden>
+              Select
+            </Label>
+            <Input id="exampleSelect" name="select" type="select">
+              <option default>Select a project</option>
+              <option>1</option>
+              <option>2</option>
+              <option>3</option>
+              <option>4</option>
+            </Input>
+          </Col>
+          <Col className="p-3">
+            <Button className="w-100 bm-dashboard__button">
+              Go to Project Dashboard
+            </Button>
+          </Col>
+        </Row>
+      </Form>
+    </Container>
+  );
+};
 
 export default BMDashboard;
diff --git a/src/components/BMDashboard/ProjectsList.jsx b/src/components/BMDashboard/ProjectsList.jsx
new file mode 100644
index 0000000000..e1c8f51fd1
--- /dev/null
+++ b/src/components/BMDashboard/ProjectsList.jsx
@@ -0,0 +1,7 @@
+import React from 'react'
+
+export const ProjectsList = () => {
+  return (
+    <div>Hello from ProjectsList</div>
+  )
+}

From 21f6b68d9067fa3cb1a8f11e81412f3e6c6ee2c8 Mon Sep 17 00:00:00 2001
From: Nathan Hoffman <nathanahoffman@gmail.com>
Date: Tue, 3 Oct 2023 14:35:30 -0700
Subject: [PATCH 45/93] Added preset modal and redux logic

---
 src/actions/rolePermissionPresets.js          |  77 +++++++++++
 .../PermissionsPresetsModal.jsx               |  32 +++++
 .../PermissionsManagement/Preset.jsx          | 130 ++++++++++++++++++
 .../PermissionsManagement/RolePermissions.jsx |  77 +++++++++--
 .../PermissionsManagement/UserRoleTab.css     |   6 +
 src/constants/rolePermissionPresets.js        |  11 ++
 src/reducers/index.js                         |   2 +
 src/reducers/rolePresetReducer.js             |  33 +++++
 src/utils/URL.js                              |   3 +
 9 files changed, 360 insertions(+), 11 deletions(-)
 create mode 100644 src/actions/rolePermissionPresets.js
 create mode 100644 src/components/PermissionsManagement/PermissionsPresetsModal.jsx
 create mode 100644 src/components/PermissionsManagement/Preset.jsx
 create mode 100644 src/constants/rolePermissionPresets.js
 create mode 100644 src/reducers/rolePresetReducer.js

diff --git a/src/actions/rolePermissionPresets.js b/src/actions/rolePermissionPresets.js
new file mode 100644
index 0000000000..ac40694659
--- /dev/null
+++ b/src/actions/rolePermissionPresets.js
@@ -0,0 +1,77 @@
+import axios from 'axios';
+import { ENDPOINTS } from '../utils/URL';
+import * as types from "../constants/rolePermissionPresets";
+
+export const fetchPresets = (presets) => {
+  return {
+    type: types.RECEIVE_PRESETS,
+    presets,
+  };
+};
+
+export const postNewPreset = payload => {
+  return {
+    type: types.ADD_NEW_PRESET,
+    payload,
+  };
+};
+
+export const deletePreset = presetId => {
+  return {
+    type: types.DELETE_PRESET,
+    presetId,
+  };
+};
+
+export const updatePreset = payload => {
+  return {
+    type: types.UPDATE_PRESET,
+    payload,
+  };
+};
+
+export const getPresetsByRole = (roleName) => async dispatch => {
+  const URL = ENDPOINTS.PRESETS_BY_ID(roleName);
+  const { data } = await axios.get(URL);
+  return dispatch(fetchPresets(data));
+};
+
+export const createNewPreset = newPreset => {
+  return async dispatch => {
+    try {
+      const res = await axios.post(ENDPOINTS.PRESETS(), newPreset);
+      if (res.status === 201){
+        dispatch(postNewPreset(res.data.newPreset));
+      }
+    } catch (error) {
+      console.log(error)
+    }
+    return status;
+  };
+};
+
+export const updatePresetById = (updatedPreset) => {
+  return async dispatch => {
+    try {
+      const res = await axios.put(ENDPOINTS.PRESETS_BY_ID(updatedPreset._id), updatedPreset);
+      if (res.status === 200){
+        dispatch(updatePreset(updatedPreset));
+      }
+    } catch (err) {
+      console.log(err);
+    }
+  };
+};
+
+export const deletePresetById = (presetId) => {
+  return async dispatch => {
+    try {
+      const res = await axios.delete(ENDPOINTS.PRESETS_BY_ID(presetId));
+      if (res.status === 200){
+        dispatch(deletePreset(presetId));
+      }
+    } catch (error) {
+      console.log(error);
+    }
+  };
+};
diff --git a/src/components/PermissionsManagement/PermissionsPresetsModal.jsx b/src/components/PermissionsManagement/PermissionsPresetsModal.jsx
new file mode 100644
index 0000000000..24154d831e
--- /dev/null
+++ b/src/components/PermissionsManagement/PermissionsPresetsModal.jsx
@@ -0,0 +1,32 @@
+import React, { useState } from 'react';
+import { FormCheck } from 'react-bootstrap';
+import { Alert, Button, Form, FormGroup, Input, Label } from 'reactstrap';
+import { toast } from 'react-toastify';
+import { connect } from 'react-redux';
+import Preset  from './Preset';
+import { boxStyle } from 'styles';
+
+
+const PermissionsPresetsModal = (props) => {
+  return (
+    <>
+      {props.presetsList?.length===0 ? 'There are no presets for this role.' : props.presetsList?.map((preset) => (
+        <div key={preset._id}>
+          <Preset
+            preset={preset}
+            roleId={props.roleId}
+            roleName={props.roleName}
+            onApply={props.onApply}
+          />
+        </div>
+      ))}
+    </>
+  );
+};
+
+const mapStateToProps = state => ({ presetsList: state.rolePreset.presets });
+
+// const mapDispatchToProps = dispatch => ({
+// });
+
+export default connect(mapStateToProps, null)(PermissionsPresetsModal);
diff --git a/src/components/PermissionsManagement/Preset.jsx b/src/components/PermissionsManagement/Preset.jsx
new file mode 100644
index 0000000000..9f5831b8f7
--- /dev/null
+++ b/src/components/PermissionsManagement/Preset.jsx
@@ -0,0 +1,130 @@
+import React, { useState, useRef } from 'react';
+import { FormCheck } from 'react-bootstrap';
+import { Alert, Button, Form, FormGroup, Input, Label, Row } from 'reactstrap';
+import { permissionLabel } from './UserRoleTab';
+import { mainPermissions } from './RolePermissions';
+import { toast } from 'react-toastify';
+import { connect } from 'react-redux';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faEdit } from '@fortawesome/free-regular-svg-icons';
+import { updateRole } from '../../actions/role';
+import { updatePresetById, deletePresetById } from '../../actions/rolePermissionPresets';
+import { BsFillCaretDownFill, BsFillCaretUpFill } from 'react-icons/bs';
+import { boxStyle } from 'styles';
+import { update } from 'lodash';
+
+
+const Preset = (props) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const [editing, setEditing] = useState(false);
+  const ref = useRef(null);
+
+  const onNameClicked = (e) => {
+    if(editing){
+      e.stopPropagation();
+    }
+  }
+
+  const onEditIconClicked = (e) => {
+    e.stopPropagation();
+    setEditing(!editing);
+    setTimeout(()=>{ref.current.focus()}, 0);
+  };
+
+  const onSaveNameChangeClicked = (e) => {
+    e.stopPropagation();
+    var newName = ref.current.textContent;
+    props.updatePreset({...props.preset, presetName: newName});
+    setEditing(false);
+  };
+
+  const applyPreset = async (preset) => {
+    try {
+      const updatedRole = {
+        roleId: props.roleId,
+        roleName: props.roleName,
+        permissions: preset.permissions
+      };
+      props.updateRole(props.roleId, updatedRole);
+      props.onApply(preset.permissions);
+    } catch (error) {
+      console.log(error.message);
+    }
+  };
+
+  return (
+    <>
+      <div
+        style={{
+          display: 'flex',
+          flexDirection: Row,
+          cursor: 'pointer',
+          width: '100%',
+          borderBottom: 'solid',
+          borderColor: 'grey',
+          justifyContent: 'space-between'
+        }}
+        onClick={()=>setIsOpen(!isOpen)}
+      >
+        <div
+          style={{
+            display: 'flex',
+            alignItems: 'center',
+            gap: '10px'
+        }}>
+          <h3 ref={ref} contentEditable={editing} suppressContentEditableWarning={true} onClick={onNameClicked} >{props.preset.presetName}</h3>
+          <FontAwesomeIcon
+                  icon={faEdit}
+                  size="lg"
+                  className="user-role-tab__icon edit-icon"
+                  onClick={onEditIconClicked}
+                />
+          {editing &&
+            <Button
+              color='primary'
+              onClick={onSaveNameChangeClicked}>
+              Save Name
+            </Button>}
+          {isOpen ? <BsFillCaretUpFill/>:<BsFillCaretDownFill/> }
+        </div>
+        <div
+          style={{
+            display: 'flex',
+            gap: '10px'
+          }}>
+          <Button color='danger' onClick={(event)=>{event.stopPropagation(); props.deletePreset(props.preset._id);}}>
+            Delete
+          </Button>
+          <Button
+            color='primary'
+            onClick={(event)=>{event.stopPropagation(); applyPreset(props.preset);}}>
+            Apply
+          </Button>
+        </div>
+      </div>
+      {isOpen ? Object.keys(permissionLabel).map((permission) => (
+      <li className="user-role-tab__permissions" key={permission}>
+        <p style={{
+          color: props.preset.permissions.includes(permission) ? 'green' : 'red' ,
+          fontSize:  mainPermissions.includes(permissionLabel[permission]) ? '20px':'',
+          paddingLeft:  mainPermissions.includes(permissionLabel[permission]) ? '0': '50px'
+          }}>
+          {permissionLabel[permission]}
+        </p>
+      </li>
+      )):<></>}
+    </>
+  );
+};
+
+
+
+const mapStateToProps = state => ({ roles: state.role.roles });
+
+const mapDispatchToProps = dispatch => ({
+  updateRole: (roleId, updatedRole) => dispatch(updateRole(roleId, updatedRole)),
+  deletePreset: (presetId) => dispatch(deletePresetById(presetId)),
+  updatePreset: (newPreset) => dispatch(updatePresetById(newPreset))
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(Preset);
diff --git a/src/components/PermissionsManagement/RolePermissions.jsx b/src/components/PermissionsManagement/RolePermissions.jsx
index f2fa9047f4..240ec47b43 100644
--- a/src/components/PermissionsManagement/RolePermissions.jsx
+++ b/src/components/PermissionsManagement/RolePermissions.jsx
@@ -12,6 +12,8 @@ import axios from 'axios';
 import { useHistory } from 'react-router-dom';
 import { boxStyle } from 'styles';
 import EditableInfoModal from 'components/UserProfile/EditableModal/EditableInfoModal';
+import PermissionsPresetsModal from './PermissionsPresetsModal.jsx'
+import { getPresetsByRole, createNewPreset } from 'actions/rolePermissionPresets';
 
 function getKeyByValue(object, value) {
   return Object.keys(object).find(key => object[key] === value);
@@ -28,6 +30,7 @@ const mapPermissionToLabel = permissions => {
 
   return label;
 };
+export const mainPermissions = ['See All the Reports Tab (DNE)', 'See User Management Tab (Full Functionality) (DNE)', 'See Badge Management Tab (Full Functionality) (DNE)', 'See Project Management Tab (Full Functionality) (DNE)', 'Edit Task', 'See Teams Management Tab (Full Functionality) (DNE)', 'Edit Timelog Information (DNE)', 'Edit User Profile', 'See Popup Management Tab (create and update popups) (DNE - separate)', 'See Permissions Management Tab (DNE - postRole/putRole)', 'See Summary Indicator (DNE)', 'See Visibility Icon (DNE)'  ]
 
 function RolePermissions(props) {
   const modalInfo = {
@@ -117,8 +120,7 @@ function RolePermissions(props) {
       'Gives the user permission to see visibility icon on leaderboard.',
     
   };
-  const mainPermissions = ['See All the Reports Tab (DNE)', 'See User Management Tab (Full Functionality) (DNE)', 'See Badge Management Tab (Full Functionality) (DNE)', 'See Project Management Tab (Full Functionality) (DNE)', 'Edit Task', 'See Teams Management Tab (Full Functionality) (DNE)', 'Edit Timelog Information (DNE)', 'Edit User Profile', 'See Popup Management Tab (create and update popups) (DNE - separate)', 'See Permissions Management Tab (DNE - postRole/putRole)', 'See Summary Indicator (DNE)', 'See Visibility Icon (DNE)'  ]
-
+  
   const [permissions, setPermissions] = useState(mapPermissionToLabel(props.permissions));
   const [deleteRoleModal, setDeleteRoleModal] = useState(false);
   const [editRoleNameModal, setEditRoleNameModal] = useState(false);
@@ -128,11 +130,18 @@ function RolePermissions(props) {
   const history = useHistory();
   const [infoRoleModal, setinfoRoleModal] = useState(false);
   const [modalContent, setContent] = useState(null);
-  
+  const [showPresetModal, setShowPresetModal] = useState(false);
+
   useEffect(() => {
     setRoleName(props.role);
+    props.getPresets(props.role);
   }, []);
 
+  useEffect(() => {
+    setPermissions(mapPermissionToLabel(props.permissions));
+    console.log('updated');
+  }, [props.roles]);
+
   const toggleDeleteRoleModal = () => {
     setDeleteRoleModal(!deleteRoleModal);
   };
@@ -167,6 +176,21 @@ function RolePermissions(props) {
     setPermissions(previous => [...previous, permission]);
   };
 
+  const saveNewPreset = async () => {
+    let count = 1;
+    while(props.presets.some(preset => preset.presetName === 'New Preset '+count)){
+      count+=1;
+    }
+    const newPreset = {
+      presetName: 'New Preset '+count,
+      roleName: props.role,
+      permissions: permissions.map(perm => {
+        return getKeyByValue(permissionLabel, perm);
+      }),
+    }
+    props.createNewPreset(newPreset);
+  }
+
   const updateInfo = async () => {
     const permissionsObjectName = permissions.map(perm => {
       return getKeyByValue(permissionLabel, perm);
@@ -222,13 +246,23 @@ function RolePermissions(props) {
             )}
           </div>
           {props?.userRole === 'Owner' && (
-            <div className="name-container__btns">
-              <Button className="btn_save" color="success" onClick={() => updateInfo()}>
-                Save
-              </Button>
-              <Button color="danger" onClick={toggleDeleteRoleModal}>
-                Delete Role
-              </Button>
+            <div className="name-container__btn_columns">
+              <div className="name-container__btns">
+                <Button className="btn_save" color="success" onClick={()=>{ saveNewPreset()}}>
+                    Create New Preset
+                  </Button>
+                  <Button color="primary" onClick={()=>{setShowPresetModal(!showPresetModal);}}>
+                    Load Presets
+                  </Button>
+              </div>
+              <div className="name-container__btns">
+                <Button className="btn_save" color="success" onClick={() => updateInfo()}>
+                  Save
+                </Button>
+                <Button color="danger" onClick={toggleDeleteRoleModal}>
+                  Delete Role
+                </Button>
+              </div>
             </div>
           )}
           <Modal isOpen={editRoleNameModal} toggle={toggleEditRoleNameModal}>
@@ -350,15 +384,36 @@ function RolePermissions(props) {
           </Button>
         </ModalFooter>
       </Modal>
+      <Modal
+        isOpen={showPresetModal}
+        toggle={()=>{setShowPresetModal((previous)=>!previous)}}
+        id="modal-content__new-role"
+      >
+        <ModalHeader
+          toggle={()=>{setShowPresetModal((previous)=>!previous)}}
+          cssModule={{ 'modal-title': 'w-100 text-center my-auto' }}
+        >
+          Role Presets
+        </ModalHeader>
+        <ModalBody id="modal-body_new-role--padding">
+          <PermissionsPresetsModal
+            roleId={props.roleId}
+            roleName={props.role}
+            onApply={(perms)=>setPermissions(mapPermissionToLabel(perms))}
+          />
+        </ModalBody>
+      </Modal>
     </>
   );
 }
 
-const mapStateToProps = state => ({ roles: state.role.roles });
+const mapStateToProps = state => ({ roles: state.role.roles, presets: state.rolePreset.presets });
 
 const mapDispatchToProps = dispatch => ({
   getAllRoles: () => dispatch(getAllRoles()),
   updateRole: (roleId, updatedRole) => dispatch(updateRole(roleId, updatedRole)),
+  getPresets: (role) => dispatch(getPresetsByRole(role)),
+  createNewPreset: (newPreset) => dispatch(createNewPreset(newPreset)),
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(RolePermissions);
diff --git a/src/components/PermissionsManagement/UserRoleTab.css b/src/components/PermissionsManagement/UserRoleTab.css
index c5e2757c42..bea67b4f64 100644
--- a/src/components/PermissionsManagement/UserRoleTab.css
+++ b/src/components/PermissionsManagement/UserRoleTab.css
@@ -33,6 +33,12 @@
   align-items: center;
 }
 
+.name-container__btn_columns {
+  display: flex;
+  flex-direction: row;
+  column-gap: 1rem;
+}
+
 .name-container__btns {
   display: flex;
   flex-direction: column;
diff --git a/src/constants/rolePermissionPresets.js b/src/constants/rolePermissionPresets.js
new file mode 100644
index 0000000000..ca60037476
--- /dev/null
+++ b/src/constants/rolePermissionPresets.js
@@ -0,0 +1,11 @@
+// INIT PRESETS
+export const RECEIVE_PRESETS = 'RECEIVE_PRESETS';
+
+// ADD NEW PRESET
+export const ADD_NEW_PRESET = 'ADD_NEW_PRESET';
+
+// UPDATE PRESET
+export const UPDATE_PRESET = 'UPDATE_PRESET';
+
+// DELETE PRESET
+export const DELETE_PRESET = 'DELETE_PRESET';
diff --git a/src/reducers/index.js b/src/reducers/index.js
index c5a13f4ec0..229cf20d48 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -24,6 +24,7 @@ import { badgeReducer } from './badgeReducer';
 import { popupEditorReducer } from './popupEditorReducer';
 import { timeZoneAPIReducer } from './timezoneApiReducer';
 import { roleReducer } from './roleReducer';
+import { rolePresetReducer } from './rolePresetReducer';
 import { ownerMessageReducer } from './ownerMessageReducer';
 import { ownerStandardMessageReducer } from './ownerStandardMessageReducer';
 import { infoCollectionsReducer} from './informationReducer';
@@ -57,6 +58,7 @@ export default combineReducers({
   teamMemberTasks: teamMemberTasksReducer,
   taskEditSuggestions: taskEditSuggestionsReducer,
   role: roleReducer,
+  rolePreset: rolePresetReducer,
   ownerMessage: ownerMessageReducer,
   ownerStandardMessage: ownerStandardMessageReducer,
   infoCollections: infoCollectionsReducer,
diff --git a/src/reducers/rolePresetReducer.js b/src/reducers/rolePresetReducer.js
new file mode 100644
index 0000000000..5fd0952cd8
--- /dev/null
+++ b/src/reducers/rolePresetReducer.js
@@ -0,0 +1,33 @@
+import * as types from "../constants/rolePermissionPresets";
+
+const initialState = {
+  presets: [],
+};
+
+export const rolePresetReducer = (state = initialState, action) => {
+  switch (action.type) {
+    case types.RECEIVE_PRESETS:
+      return { ...state, presets: action.presets };
+
+    case types.ADD_NEW_PRESET:
+      const toAdd = state.presets;
+      toAdd.push(action.payload);
+      return { ...state, presets: toAdd };
+
+    case types.UPDATE_PRESET:
+      const presetUpdated = action.payload;
+      const indexPresetUpdated = state.presets.findIndex(preset => preset._id === presetUpdated._id);
+      const presetsCopy = state.presets;
+
+      presetsCopy[indexPresetUpdated].presetName = presetUpdated.presetName;
+
+      return { ...state, presets: presetsCopy };
+
+    case types.DELETE_PRESET:
+      const presetsFiltered = state.presets.filter(preset => preset._id != action.presetId);
+      return {...state, presets: presetsFiltered};
+
+    default:
+      return state;
+  }
+};
diff --git a/src/utils/URL.js b/src/utils/URL.js
index db7a03e788..2d184dff7d 100644
--- a/src/utils/URL.js
+++ b/src/utils/URL.js
@@ -82,6 +82,9 @@ export const ENDPOINTS = {
   ROLES: () => `${APIEndpoint}/roles`,
   ROLES_BY_ID: roleId => `${APIEndpoint}/roles/${roleId}`,
 
+  PRESETS: () => `${APIEndpoint}/rolePreset`,
+  PRESETS_BY_ID: (roleNameOrPresetId) => `${APIEndpoint}/rolePreset/${roleNameOrPresetId}`,
+
   OWNERMESSAGE: () => `${APIEndpoint}/ownerMessage`,
   OWNERMESSAGE_BY_ID: ownerMessageId => `${APIEndpoint}/ownerMessage/${ownerMessageId}`,
 

From 529b8cf5761d00408838fe0e0212233f01fa45bd Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:09:53 -0700
Subject: [PATCH 46/93] add ignore file

---
 .eslintignore                                | 54 --------------------
 .idea/inspectionProfiles/Project_Default.xml |  1 +
 .prettierignore                              | 50 ------------------
 3 files changed, 1 insertion(+), 104 deletions(-)
 delete mode 100644 .eslintignore
 delete mode 100644 .prettierignore

diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index 78d5b032d1..0000000000
--- a/.eslintignore
+++ /dev/null
@@ -1,54 +0,0 @@
-*.png
-*.svg
-*.test.js
-*.test.jsx
-src/actions/**
-src/App.css
-src/config.json
-src/constants/**
-src/index.js
-src/languages/**
-src/reducers/**
-src/registerServiceWorker.js
-src/routes.js
-src/services/**
-src/setupTests.js
-src/store.js
-src/styles.js
-src/utils/**
-src/__tests__/**
-
-
-
-src/components/App.jsx
-src/components/AutoReload/**
-src/components/AutoUpdate/**
-src/components/Badge/**
-src/components/BMDashboard/**
-src/components/common/**
-src/components/ForcePasswordUpdate/**
-src/components/Header/**
-src/components/Inventory/**
-src/components/Login/**
-src/components/ManageMemberships/**
-src/components/Memberships/**
-src/components/MonthlyEffort/**
-src/components/NewProfileLink/**
-src/components/OwnerMessage/**
-src/components/PermissionsManagement/**
-src/components/PopUpBar/**
-src/components/ProfileLinks/**
-src/components/Projects/**
-src/components/RenderInfringement/**
-src/components/Reports/**
-src/components/SetupProfile/**
-src/components/SummaryBar/**
-src/components/SummaryManagement/**
-src/components/TaskEditSuggestions/**
-src/components/TeamMemberTasks/**
-src/components/Teams/**
-src/components/Timelog/**
-src/components/UpdatePassword/**
-src/components/UserManagement/**
-src/components/UserProfile/**
-src/components/MouseoverText/**
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index bd024de74c..6de138e6ce 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="HtmlUnknownAttribute" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="myValues">
         <value>
diff --git a/.prettierignore b/.prettierignore
deleted file mode 100644
index aafd214ca1..0000000000
--- a/.prettierignore
+++ /dev/null
@@ -1,50 +0,0 @@
-*.png
-*.svg
-src/actions/**
-src/App.css
-src/config.json
-src/constants/**
-src/index.js
-src/languages/**
-src/reducers/**
-src/registerServiceWorker.js
-src/routes.js
-src/services/**
-src/setupTests.js
-src/store.js
-src/styles.js
-src/utils/**
-src/__tests__/**
-
-
-src/components/App.jsx
-src/components/AutoReload/**
-src/components/AutoUpdate/**
-src/components/Badge/**
-src/components/common/**
-src/components/ForcePasswordUpdate/**
-src/components/Header/**
-src/components/Inventory/**
-src/components/Login/**
-src/components/ManageMemberships/**
-src/components/Memberships/**
-src/components/MonthlyEffort/**
-src/components/NewProfileLink/**
-src/components/OwnerMessage/**
-src/components/PermissionsManagement/**
-src/components/PopUpBar/**
-src/components/ProfileLinks/**
-src/components/Projects/**
-src/components/RenderInfringement/**
-src/components/Reports/**
-src/components/SetupProfile/**
-src/components/SummaryBar/**
-src/components/SummaryManagement/**
-src/components/TaskEditSuggestions/**
-src/components/TeamMemberTasks/**
-src/components/Teams/**
-src/components/Timelog/**
-src/components/UpdatePassword/**
-src/components/UserManagement/**
-src/components/UserProfile/**
-src/components/MouseoverText/**

From bc25f52680908099f21eaf1fb6d3e8a8ba809c95 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:10:21 -0700
Subject: [PATCH 47/93] initial fix

---
 .../Reports/PeopleReport/PeopleReport.jsx     | 280 +++++++++---------
 1 file changed, 143 insertions(+), 137 deletions(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index 5d0830b28b..c4822023da 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -5,6 +5,9 @@ import { Button, Dropdown, DropdownButton } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { connect } from 'react-redux';
 import { FiUser } from 'react-icons/fi';
+import moment from 'moment';
+import Collapse from 'react-bootstrap/Collapse';
+import { toast } from 'react-toastify';
 import {
   updateUserProfileProperty,
   getUserProfile,
@@ -12,9 +15,7 @@ import {
 } from '../../../actions/userProfile';
 import { getUserProjects } from '../../../actions/userProjects';
 import { getWeeklySummaries, updateWeeklySummaries } from '../../../actions/weeklySummaries';
-import moment from 'moment';
 import 'react-input-range/lib/css/index.css';
-import Collapse from 'react-bootstrap/Collapse';
 import { getTimeEntriesForPeriod } from '../../../actions/timeEntries';
 import InfringementsViz from '../InfringementsViz';
 import TimeEntriesViz from '../TimeEntriesViz';
@@ -24,7 +25,6 @@ import PeopleTableDetails from '../PeopleTableDetails';
 import { ReportPage } from '../sharedComponents/ReportPage';
 import { getPeopleReportData } from './selectors';
 import { PeopleTasksPieChart } from './components';
-import { toast } from 'react-toastify';
 import ToggleSwitch from '../../UserProfile/UserProfileEdit/ToggleSwitch';
 import { Checkbox } from '../../common/Checkbox';
 import { formatDate } from 'utils/formatDate';
@@ -75,7 +75,7 @@ class PeopleReport extends Component {
 
   async componentDidMount() {
     if (this.props.match) {
-      const userId = this.props.match.params.userId;
+      const { userId } = this.props.match.params;
       await this.props.getUserProfile(userId);
       await this.props.getUserTask(userId);
       await this.props.getUserProjects(userId);
@@ -104,6 +104,7 @@ class PeopleReport extends Component {
       });
     }
   }
+
   setStartDate(date) {
     this.setState(state => {
       return {
@@ -111,6 +112,7 @@ class PeopleReport extends Component {
       };
     });
   }
+
   setEndDate(date) {
     this.setState(state => {
       return {
@@ -183,6 +185,7 @@ class PeopleReport extends Component {
       });
     }
   }
+
   setStatus(statusValue) {
     if (statusValue != 'Filter Off') {
       this.setState(state => {
@@ -200,6 +203,7 @@ class PeopleReport extends Component {
       });
     }
   }
+
   setAssign(assignValue) {
     this.setState(state => {
       return {
@@ -265,17 +269,18 @@ class PeopleReport extends Component {
       toDate,
       timeEntries,
     } = this.state;
-    const { firstName, lastName, weeklycommittedHours,hoursByCategory } = userProfile;
+    const { firstName, lastName, weeklycommittedHours, hoursByCategory } = userProfile;
 
-  
-    var totalTangibleHrsRound = 0;
+    let totalTangibleHrsRound = 0;
     if (hoursByCategory) {
-      const hours = hoursByCategory ? Object.values(hoursByCategory).reduce((prev, curr) => prev + curr, 0):0;
+      const hours = hoursByCategory
+        ? Object.values(hoursByCategory).reduce((prev, curr) => prev + curr, 0)
+        : 0;
       totalTangibleHrsRound = hours.toFixed(2);
     }
 
     const UserProject = props => {
-      let userProjectList = [];
+      const userProjectList = [];
       return <div>{userProjectList}</div>;
     };
 
@@ -295,7 +300,7 @@ class PeopleReport extends Component {
     };
 
     const StatusOptions = props => {
-      var allStatus = [...Array.from(new Set(props.get_tasks.map(item => item.status))).sort()];
+      const allStatus = [...Array.from(new Set(props.get_tasks.map(item => item.status))).sort()];
       allStatus.unshift('Filter Off');
       return (
         <DropdownButton style={{ margin: '3px' }} exact id="dropdown-basic-button" title="Status">
@@ -353,9 +358,9 @@ class PeopleReport extends Component {
 
     const Infringements = props => {
       let BlueSquare = [];
-      let dict = {};
+      const dict = {};
 
-      //aggregate infringements
+      // aggregate infringements
       for (let i = 0; i < props.infringements.length; i++) {
         if (props.infringements[i].date in dict) {
           dict[props.infringements[i].date].count += 1;
@@ -369,7 +374,7 @@ class PeopleReport extends Component {
       }
 
       const startdate = Object.keys(dict)[0];
-      var startdateStr = '';
+      let startdateStr = '';
       if (startdate) {
         startdateStr = startdate.toString();
       }
@@ -384,13 +389,13 @@ class PeopleReport extends Component {
       }
       return (
         <div>
-          <div></div>
+          <div />
         </div>
       );
     };
 
     const PeopleDataTable = props => {
-      let peopleData = {
+      const peopleData = {
         alertVisible: false,
         taskData: [],
         color: null,
@@ -398,7 +403,7 @@ class PeopleReport extends Component {
       };
 
       for (let i = 0; i < userTask.length; i++) {
-        let task = {
+        const task = {
           taskName: '',
           priority: '',
           status: '',
@@ -416,7 +421,7 @@ class PeopleReport extends Component {
           endstateInfo: '',
           intentInfo: '',
         };
-        let resourcesName = [];
+        const resourcesName = [];
 
         if (userTask[i].isActive) {
           task.active = 'Yes';
@@ -431,10 +436,10 @@ class PeopleReport extends Component {
         task.taskName = userTask[i].taskName;
         task.priority = userTask[i].priority;
         task.status = userTask[i].status;
-        let n = userTask[i].estimatedHours;
+        const n = userTask[i].estimatedHours;
         task.estimatedHours = n.toFixed(2);
         for (let j = 0; j < userTask[i].resources.length; j++) {
-          let tempResource = {
+          const tempResource = {
             name: '',
             profilePic: '',
           };
@@ -474,53 +479,51 @@ class PeopleReport extends Component {
         isActive={isActive}
       >
         <div className="report-stats">
-        <p>
-          <Link to={`/userProfile/${userProfile._id}`} title="View Profile">
-            {userProfile.firstName} {userProfile.lastName}
-          </Link>
-        </p>
-        <p>Role: {userProfile.role}</p>
-        <p>Title: {userProfile.jobTitle}</p>
-
-        {userProfile.endDate ? (
-          <div className="rehireable">
-            <Checkbox
-              value={this.state.isRehireable}
-              onChange={() => this.setRehireable(!this.state.isRehireable)}
-              label="Rehireable"
-            />
-          </div>
-        ) : (
-          ''
-        )}
-
-        <div className="stats">
-          <div>
-            <h4>{formatDate(userProfile.createdDate)}</h4>
-            <p>Start Date</p>
-          </div>
-          <div>
-            <h4>
-              {userProfile.endDate ? formatDate(userProfile.endDate) : 'N/A'}
-            </h4>
-            <p>End Date</p>
-          </div>
-          {this.state.bioStatus ? (
+          <p>
+            <Link to={`/userProfile/${userProfile._id}`} title="View Profile">
+              {userProfile.firstName} {userProfile.lastName}
+            </Link>
+          </p>
+          <p>Role: {userProfile.role}</p>
+          <p>Title: {userProfile.jobTitle}</p>
+
+          {userProfile.endDate ? (
+            <div className="rehireable">
+              <Checkbox
+                value={this.state.isRehireable}
+                onChange={() => this.setRehireable(!this.state.isRehireable)}
+                label="Rehireable"
+              />
+            </div>
+          ) : (
+            ''
+          )}
+
+          <div className="stats">
             <div>
-              <h5>
-                Bio {this.state.bioStatus === 'default' ? 'not requested' : this.state.bioStatus}
-              </h5>{' '}
-              {this.state.authRole === 'Administrator' || this.state.authRole === 'Owner' ? (
-                <ToggleSwitch
-                  fontSize={'13px'}
-                  switchType="bio"
-                  state={this.state.bioStatus}
-                  handleUserProfile={bio => onChangeBioPosted(bio)}
-                />
-              ) : null}
+              <h4>{formatDate(userProfile.createdDate)}</h4>
+              <p>Start Date</p>
             </div>
-          ) : null}
-        </div>
+            <div>
+              <h4>{userProfile.endDate ? formatDate(userProfile.endDate) : 'N/A'}</h4>
+              <p>End Date</p>
+            </div>
+            {this.state.bioStatus ? (
+              <div>
+                <h5>
+                  Bio {this.state.bioStatus === 'default' ? 'not requested' : this.state.bioStatus}
+                </h5>{' '}
+                {this.state.authRole === 'Administrator' || this.state.authRole === 'Owner' ? (
+                  <ToggleSwitch
+                    fontSize="13px"
+                    switchType="bio"
+                    state={this.state.bioStatus}
+                    handleUserProfile={bio => onChangeBioPosted(bio)}
+                  />
+                ) : null}
+              </div>
+            ) : null}
+          </div>
         </div>
       </ReportPage.ReportHeader>
     );
@@ -529,7 +532,7 @@ class PeopleReport extends Component {
       const bioStatus = bio;
       this.setState(state => {
         return {
-          bioStatus: bioStatus,
+          bioStatus,
         };
       });
 
@@ -543,88 +546,91 @@ class PeopleReport extends Component {
 
     return (
       <div className="container-people-wrapper">
-      <ReportPage renderProfile={renderProfileInfo}>
-        <div className="people-report-time-logs-wrapper">
-          <ReportPage.ReportBlock
-            firstColor="#ff5e82"
-            secondColor="#e25cb2"
-            className="people-report-time-log-block"
-          >
-            <h3>{weeklycommittedHours}</h3>
-            <p>Weekly Committed Hours</p>
-          </ReportPage.ReportBlock>
-
-          {userProfile.endDate ? (
-            ''
-          ) : (
+        <ReportPage renderProfile={renderProfileInfo}>
+          <div className="people-report-time-logs-wrapper">
             <ReportPage.ReportBlock
-              firstColor="#b368d2"
-              secondColor="#831ec4"
+              firstColor="#ff5e82"
+              secondColor="#e25cb2"
               className="people-report-time-log-block"
             >
-              <h3>{this.props.tangibleHoursReportedThisWeek}</h3>
-              <p>Hours Logged This Week</p>
+              <h3>{weeklycommittedHours}</h3>
+              <p>Weekly Committed Hours</p>
             </ReportPage.ReportBlock>
-          )}
 
-          <ReportPage.ReportBlock
-            firstColor="#64b7ff"
-            secondColor="#928aef"
-            className="people-report-time-log-block"
-          >
-            <h3>{infringements.length}</h3>
-            <p>Blue squares</p>
-          </ReportPage.ReportBlock>
-          <ReportPage.ReportBlock
-            firstColor="#ffdb56"
-            secondColor="#ff9145"
-            className="people-report-time-log-block"
-          >
-            <h3>{totalTangibleHrsRound}</h3>
-            <p>Total Hours Logged</p>
-          </ReportPage.ReportBlock>
-        </div>
+            {userProfile.endDate ? (
+              ''
+            ) : (
+              <ReportPage.ReportBlock
+                firstColor="#b368d2"
+                secondColor="#831ec4"
+                className="people-report-time-log-block"
+              >
+                <h3>{this.props.tangibleHoursReportedThisWeek}</h3>
+                <p>Hours Logged This Week</p>
+              </ReportPage.ReportBlock>
+            )}
 
-        <PeopleTasksPieChart />
-        <div className="mobile-people-table">
-        <ReportPage.ReportBlock>
-          <div className="intro_date">
-            <h4>Tasks contributed</h4>
+            <ReportPage.ReportBlock
+              firstColor="#64b7ff"
+              secondColor="#928aef"
+              className="people-report-time-log-block"
+            >
+              <h3>{infringements.length}</h3>
+              <p>Blue squares</p>
+            </ReportPage.ReportBlock>
+            <ReportPage.ReportBlock
+              firstColor="#ffdb56"
+              secondColor="#ff9145"
+              className="people-report-time-log-block"
+            >
+              <h3>{totalTangibleHrsRound}</h3>
+              <p>Total Hours Logged</p>
+            </ReportPage.ReportBlock>
           </div>
-            
-          <PeopleDataTable />
-          
-
-          <div className="container">
-            <table>
-              <UserProject userProjects={userProjects} />
-              <Infringements
-                infringements={infringements}
-                fromDate={fromDate}
-                toDate={toDate}
-                timeEntries={timeEntries}
-              />
-              <div className="visualizationDiv">
-                <InfringementsViz
-                  infringements={infringements}
-                  fromDate={fromDate}
-                  toDate={toDate}
-                />
-              </div>
-              <div className="visualizationDiv">
-                <TimeEntriesViz timeEntries={timeEntries} fromDate={fromDate} toDate={toDate} />
-              </div>
-              <div className='visualizationDiv'>
-                <BadgeSummaryViz authId={this.props.auth.user.userid} userId={this.props.match.params.userId} badges={userProfile.badgeCollection} />
+
+          <PeopleTasksPieChart />
+          <div className="mobile-people-table">
+            <ReportPage.ReportBlock>
+              <div className="intro_date">
+                <h4>Tasks contributed</h4>
               </div>
-              <div className='visualizationDiv'>
-                <BadgeSummaryPreview badges={userProfile.badgeCollection} />
+
+              <PeopleDataTable />
+
+              <div className="container">
+                <table>
+                  <UserProject userProjects={userProjects} />
+                  <Infringements
+                    infringements={infringements}
+                    fromDate={fromDate}
+                    toDate={toDate}
+                    timeEntries={timeEntries}
+                  />
+                  <div className="visualizationDiv">
+                    <InfringementsViz
+                      infringements={infringements}
+                      fromDate={fromDate}
+                      toDate={toDate}
+                    />
+                  </div>
+                  <div className="visualizationDiv">
+                    <TimeEntriesViz timeEntries={timeEntries} fromDate={fromDate} toDate={toDate} />
+                  </div>
+                  <div className="visualizationDiv">
+                    <BadgeSummaryViz
+                      authId={this.props.auth.user.userid}
+                      userId={this.props.match.params.userId}
+                      badges={userProfile.badgeCollection}
+                    />
+                  </div>
+                  <div className="visualizationDiv">
+                    <BadgeSummaryPreview badges={userProfile.badgeCollection} />
+                  </div>
+                </table>
               </div>
-            </table>
+            </ReportPage.ReportBlock>
           </div>
-        </ReportPage.ReportBlock>
-        </div>
-      </ReportPage>
+        </ReportPage>
       </div>
     );
   }

From db211bdc5c66c116cc886da96a0b65e6fa47df9f Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:12:24 -0700
Subject: [PATCH 48/93] phase 1

---
 .../Reports/PeopleReport/PeopleReport.jsx        | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index c4822023da..f07ccd2935 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -1,6 +1,8 @@
+// eslint-disable-next-line no-unused-vars
 import React, { Component, useState } from 'react';
 import '../../Teams/Team.css';
 import './PeopleReport.css';
+import { formatDate } from 'utils/formatDate';
 import { Button, Dropdown, DropdownButton } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { connect } from 'react-redux';
@@ -13,6 +15,7 @@ import {
   getUserProfile,
   getUserTask,
 } from '../../../actions/userProfile';
+
 import { getUserProjects } from '../../../actions/userProjects';
 import { getWeeklySummaries, updateWeeklySummaries } from '../../../actions/weeklySummaries';
 import 'react-input-range/lib/css/index.css';
@@ -27,7 +30,6 @@ import { getPeopleReportData } from './selectors';
 import { PeopleTasksPieChart } from './components';
 import ToggleSwitch from '../../UserProfile/UserProfileEdit/ToggleSwitch';
 import { Checkbox } from '../../common/Checkbox';
-import { formatDate } from 'utils/formatDate';
 
 class PeopleReport extends Component {
   constructor(props) {
@@ -36,19 +38,28 @@ class PeopleReport extends Component {
       userProfile: {},
       userTask: [],
       userProjects: {},
+      // eslint-disable-next-line react/no-unused-state
       userId: '',
+      // eslint-disable-next-line react/no-unused-state
       isLoading: true,
       bioStatus: '',
       authRole: '',
       infringements: {},
+      // eslint-disable-next-line react/no-unused-state
       isAssigned: '',
       isActive: '',
       isRehireable: false,
+      // eslint-disable-next-line react/no-unused-state
       priority: '',
+      // eslint-disable-next-line react/no-unused-state
       status: '',
+      // eslint-disable-next-line react/no-unused-state
       hasFilter: true,
+      // eslint-disable-next-line react/no-unused-state
       allClassification: [],
+      // eslint-disable-next-line react/no-unused-state
       classification: '',
+      // eslint-disable-next-line react/no-unused-state
       users: '',
       classificationList: [],
       priorityList: [],
@@ -56,8 +67,11 @@ class PeopleReport extends Component {
       fromDate: '2016-01-01',
       toDate: this.endOfWeek(0),
       timeEntries: {},
+      // eslint-disable-next-line react/no-unused-state
       startDate: '',
+      // eslint-disable-next-line react/no-unused-state
       endDate: '',
+      // eslint-disable-next-line react/no-unused-state
       fetched: false,
     };
     this.setStatus = this.setStatus.bind(this);

From c53a2be34228fade775b925fe97727e015fb31ba Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:16:32 -0700
Subject: [PATCH 49/93] phase 2

---
 .../Reports/PeopleReport/PeopleReport.jsx     | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index f07ccd2935..a0ca756155 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -88,32 +88,37 @@ class PeopleReport extends Component {
   }
 
   async componentDidMount() {
-    if (this.props.match) {
-      const { userId } = this.props.match.params;
-      await this.props.getUserProfile(userId);
-      await this.props.getUserTask(userId);
-      await this.props.getUserProjects(userId);
-      await this.props.getWeeklySummaries(userId);
-      await this.props.getTimeEntriesForPeriod(userId, this.state.fromDate, this.state.toDate);
+    const { match, userProfile, userTask, userProjects, timeEntries, auth } = this.props;
+    const { fromDate, toDate } = this.state;
+
+    if (match) {
+      const { userId } = match.params;
+      await getUserProfile(userId);
+      await getUserTask(userId);
+      await getUserProjects(userId);
+      await getWeeklySummaries(userId);
+      await getTimeEntriesForPeriod(userId, fromDate, toDate);
+
       this.setState({
+        // eslint-disable-next-line react/no-unused-state
         userId,
+        // eslint-disable-next-line react/no-unused-state
         isLoading: false,
-        bioStatus: this.props.userProfile.bioPosted,
-        authRole: this.props.auth.user.role,
+        bioStatus: userProfile.bioPosted,
+        authRole: auth.user.role,
         userProfile: {
-          ...this.props.userProfile,
+          ...userProfile,
         },
-        isRehireable: this.props.userProfile.isRehireable,
-        userTask: [...this.props.userTask],
+        isRehireable: userProfile.isRehireable,
+        userTask: [...userTask],
         userProjects: {
-          ...this.props.userProjects,
+          ...userProjects,
         },
-        allClassification: [
-          ...Array.from(new Set(this.props.userTask.map(item => item.classification))),
-        ],
-        infringements: this.props.userProfile.infringements,
+        // eslint-disable-next-line react/no-unused-state
+        allClassification: [...Array.from(new Set(userTask.map(item => item.classification)))],
+        infringements: userProfile.infringements,
         timeEntries: {
-          ...this.props.timeEntries,
+          ...timeEntries,
         },
       });
     }

From a15dc943b8cab10588e014a837909393252104c4 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:25:04 -0700
Subject: [PATCH 50/93] 3

---
 src/components/Reports/PeopleReport/PeopleReport.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index a0ca756155..ee26c01f71 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -125,7 +125,7 @@ class PeopleReport extends Component {
   }
 
   setStartDate(date) {
-    this.setState(state => {
+    this.setState(() => {
       return {
         startDate: date,
       };
@@ -133,7 +133,7 @@ class PeopleReport extends Component {
   }
 
   setEndDate(date) {
-    this.setState(state => {
+    this.setState(() => {
       return {
         endDate: date,
       };

From 9e27608c4bb78d5dcbb49cbcb1358da83e4db886 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:26:43 -0700
Subject: [PATCH 51/93] 1

---
 .../Reports/PeopleReport/PeopleReport.jsx     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index ee26c01f71..bb3b4d621e 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -161,7 +161,7 @@ class PeopleReport extends Component {
   }
 
   setActive(activeValue) {
-    this.setState(state => {
+    this.setState(() => {
       return {
         isActive: activeValue,
       };
@@ -169,7 +169,7 @@ class PeopleReport extends Component {
   }
 
   async setRehireable(rehireValue) {
-    this.setState(state => {
+    this.setState(() => {
       return {
         isRehireable: rehireValue,
       };
@@ -188,15 +188,15 @@ class PeopleReport extends Component {
   }
 
   setPriority(priorityValue) {
-    if (priorityValue != 'Filter Off') {
-      this.setState(state => {
+    if (priorityValue !== 'Filter Off') {
+      this.setState(() => {
         return {
           priority: priorityValue,
           priorityList: this.state.priorityList.concat(priorityValue),
         };
       });
     } else {
-      this.setState(state => {
+      this.setState(() => {
         return {
           priority: priorityValue,
           priorityList: [],
@@ -206,15 +206,15 @@ class PeopleReport extends Component {
   }
 
   setStatus(statusValue) {
-    if (statusValue != 'Filter Off') {
-      this.setState(state => {
+    if (statusValue !== 'Filter Off') {
+      this.setState(() => {
         return {
           status: statusValue,
           statusList: this.state.statusList.concat(statusValue),
         };
       });
     } else {
-      this.setState(state => {
+      this.setState(() => {
         return {
           status: statusValue,
           statusList: [],
@@ -224,7 +224,7 @@ class PeopleReport extends Component {
   }
 
   setAssign(assignValue) {
-    this.setState(state => {
+    this.setState(() => {
       return {
         isAssigned: assignValue,
       };
@@ -232,7 +232,7 @@ class PeopleReport extends Component {
   }
 
   setFilter(filterValue) {
-    this.setState(state => {
+    this.setState(() => {
       return {
         isAssigned: false,
         isActive: false,
@@ -252,15 +252,15 @@ class PeopleReport extends Component {
   }
 
   setClassfication(classificationValue) {
-    if (classificationValue != 'Filter Off') {
-      this.setState(state => {
+    if (classificationValue !== 'Filter Off') {
+      this.setState(() => {
         return {
           classification: classificationValue,
           classificationList: this.state.classificationList.concat(classificationValue),
         };
       });
     } else {
-      this.setState(state => {
+      this.setState(() => {
         return {
           classification: classificationValue,
           classificationList: [],
@@ -270,7 +270,7 @@ class PeopleReport extends Component {
   }
 
   setUsers(userValue) {
-    this.setState(state => {
+    this.setState(() => {
       return {
         users: userValue,
       };

From 967e3e31a8b922e9f0a2f730b1baf4641d97d7c1 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:29:09 -0700
Subject: [PATCH 52/93] 1

---
 .../Reports/PeopleReport/PeopleReport.jsx     | 39 +++----------------
 1 file changed, 5 insertions(+), 34 deletions(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index bb3b4d621e..1a3b3d8af9 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -346,37 +346,8 @@ class PeopleReport extends Component {
         </DropdownButton>
       );
     };
-    const ShowInfringementsCollapse = props => {
-      const [open, setOpen] = useState(false);
-      return (
-        <div>
-          <table className="center">
-            <table className="table table-bordered table-responsive-sm">
-              <thead>
-                <tr>
-                  <th scope="col" id="projects__order">
-                    <Button variant="light" onClick={() => setOpen(!open)} aria-expanded={open}>
-                      ⬇
-                    </Button>
-                  </th>
-
-                  <th scope="col" id="projects__order">
-                    Date
-                  </th>
-                  <th scope="col">Description</th>
-                </tr>
-              </thead>
-              <Collapse in={open}>
-                <tbody>{props.BlueSquare}</tbody>
-              </Collapse>
-            </table>
-          </table>
-        </div>
-      );
-    };
-
     const Infringements = props => {
-      let BlueSquare = [];
+      const BlueSquare = [];
       const dict = {};
 
       // aggregate infringements
@@ -393,12 +364,12 @@ class PeopleReport extends Component {
       }
 
       const startdate = Object.keys(dict)[0];
-      let startdateStr = '';
+      const startdateStr = '';
       if (startdate) {
-        startdateStr = startdate.toString();
+        startdate.toString();
       }
       if (props.infringements.length > 0) {
-        BlueSquare = props.infringements.map((current, index) => (
+        props.infringements.map((current, index) => (
           <tr className="teams__tr">
             <td>{index + 1}</td>
             <td>{current.date}</td>
@@ -549,7 +520,7 @@ class PeopleReport extends Component {
 
     const onChangeBioPosted = async bio => {
       const bioStatus = bio;
-      this.setState(state => {
+      this.setState(() => {
         return {
           bioStatus,
         };

From 7e737c7c70dcc81f24edc9bf2f21a6ef5e8467a4 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:30:10 -0700
Subject: [PATCH 53/93] 1

---
 src/components/Reports/PeopleReport/PeopleReport.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index 1a3b3d8af9..170bf801b3 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -3,12 +3,11 @@ import React, { Component, useState } from 'react';
 import '../../Teams/Team.css';
 import './PeopleReport.css';
 import { formatDate } from 'utils/formatDate';
-import { Button, Dropdown, DropdownButton } from 'react-bootstrap';
+import { Dropdown, DropdownButton } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { connect } from 'react-redux';
 import { FiUser } from 'react-icons/fi';
 import moment from 'moment';
-import Collapse from 'react-bootstrap/Collapse';
 import { toast } from 'react-toastify';
 import {
   updateUserProfileProperty,

From d5faedf992d43375c271b01e65dcc05bc6b17cae Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:32:57 -0700
Subject: [PATCH 54/93] 1

---
 .../Reports/PeopleReport/PeopleReport.jsx     | 25 +++++++------------
 src/components/Timelog/Timelog.jsx            |  3 +--
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index 170bf801b3..ea1012b43b 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -143,22 +143,6 @@ class PeopleReport extends Component {
     this.setState({ [e.target.name]: e.target.value });
   }
 
-  startOfWeek(offset) {
-    return moment()
-      .tz('America/Los_Angeles')
-      .startOf('week')
-      .subtract(offset, 'weeks')
-      .format('YYYY-MM-DD');
-  }
-
-  endOfWeek(offset) {
-    return moment()
-      .tz('America/Los_Angeles')
-      .endOf('week')
-      .subtract(offset, 'weeks')
-      .format('YYYY-MM-DD');
-  }
-
   setActive(activeValue) {
     this.setState(() => {
       return {
@@ -276,6 +260,14 @@ class PeopleReport extends Component {
     });
   }
 
+  endOfWeek(offset) {
+    return moment()
+      .tz('America/Los_Angeles')
+      .endOf('week')
+      .subtract(offset, 'weeks')
+      .format('YYYY-MM-DD');
+  }
+
   render() {
     const {
       userProfile,
@@ -287,6 +279,7 @@ class PeopleReport extends Component {
       toDate,
       timeEntries,
     } = this.state;
+    // eslint-disable-next-line no-unused-vars
     const { firstName, lastName, weeklycommittedHours, hoursByCategory } = userProfile;
 
     let totalTangibleHrsRound = 0;
diff --git a/src/components/Timelog/Timelog.jsx b/src/components/Timelog/Timelog.jsx
index 74fb5a8fd7..78e242ec28 100644
--- a/src/components/Timelog/Timelog.jsx
+++ b/src/components/Timelog/Timelog.jsx
@@ -204,8 +204,7 @@ const Timelog = props => {
     props.getTimeEntriesForPeriod(userId, state.fromDate, state.toDate);
   };
 
-  // startOfWeek returns the date of the start of the week based on offset. Offset is the number of weeks before.
-  // For example, if offset is 0, returns the start of this week. If offset is 1, returns the start of last week.
+
   const startOfWeek = offset => {
     return moment()
       .tz('America/Los_Angeles')

From 31c61a1e9e2d697d0bca85c949bec5256f824e45 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:33:57 -0700
Subject: [PATCH 55/93] 1

---
 .../Reports/PeopleReport/PeopleReport.jsx     | 45 -------------------
 1 file changed, 45 deletions(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index ea1012b43b..c3613e3068 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -294,50 +294,6 @@ class PeopleReport extends Component {
       const userProjectList = [];
       return <div>{userProjectList}</div>;
     };
-
-    const ClassificationOptions = props => {
-      return (
-        <DropdownButton
-          style={{ margin: '3px' }}
-          exact
-          id="dropdown-basic-button"
-          title="Classification"
-        >
-          {props.allClassification.map((c, index) => (
-            <Dropdown.Item onClick={() => this.setClassfication(c)}>{c}</Dropdown.Item>
-          ))}
-        </DropdownButton>
-      );
-    };
-
-    const StatusOptions = props => {
-      const allStatus = [...Array.from(new Set(props.get_tasks.map(item => item.status))).sort()];
-      allStatus.unshift('Filter Off');
-      return (
-        <DropdownButton style={{ margin: '3px' }} exact id="dropdown-basic-button" title="Status">
-          {allStatus.map((c, index) => (
-            <Dropdown.Item onClick={() => this.setStatus(c)}>{c}</Dropdown.Item>
-          ))}
-        </DropdownButton>
-      );
-    };
-
-    const UserOptions = props => {
-      let users = [];
-      props.userTask.map((task, index) =>
-        task.resources.map(resource => users.push(resource.name)),
-      );
-
-      users = Array.from(new Set(users)).sort();
-      users.unshift('Filter Off');
-      return (
-        <DropdownButton style={{ margin: '3px' }} exact id="dropdown-basic-button" title="Users">
-          {users.map((c, index) => (
-            <Dropdown.Item onClick={() => this.setUsers(c)}>{c}</Dropdown.Item>
-          ))}
-        </DropdownButton>
-      );
-    };
     const Infringements = props => {
       const BlueSquare = [];
       const dict = {};
@@ -356,7 +312,6 @@ class PeopleReport extends Component {
       }
 
       const startdate = Object.keys(dict)[0];
-      const startdateStr = '';
       if (startdate) {
         startdate.toString();
       }

From dd42d8394cdb80d7d7303f729a165af224544b26 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:36:14 -0700
Subject: [PATCH 56/93] 1

---
 src/components/Reports/PeopleReport/PeopleReport.jsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index c3613e3068..cc744c15db 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -3,7 +3,6 @@ import React, { Component, useState } from 'react';
 import '../../Teams/Team.css';
 import './PeopleReport.css';
 import { formatDate } from 'utils/formatDate';
-import { Dropdown, DropdownButton } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import { connect } from 'react-redux';
 import { FiUser } from 'react-icons/fi';
@@ -152,6 +151,8 @@ class PeopleReport extends Component {
   }
 
   async setRehireable(rehireValue) {
+    const { userProfile } = this.props;
+
     this.setState(() => {
       return {
         isRehireable: rehireValue,
@@ -159,13 +160,10 @@ class PeopleReport extends Component {
     });
 
     try {
-      await this.props.updateUserProfileProperty(
-        this.props.userProfile,
-        'isRehireable',
-        rehireValue,
-      );
+      await updateUserProfileProperty(userProfile, 'isRehireable', rehireValue);
       toast.success(`You have changed the rehireable status of this user to ${rehireValue}`);
     } catch (err) {
+      // eslint-disable-next-line no-alert
       alert('An error occurred while attempting to save the rehireable status of this user.');
     }
   }

From 9a304fcbd5f988e92c2cccecd7add0e24e781b00 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:37:34 -0700
Subject: [PATCH 57/93] 1

---
 src/components/Reports/PeopleReport/PeopleReport.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index cc744c15db..a4dd5e10e9 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -169,11 +169,13 @@ class PeopleReport extends Component {
   }
 
   setPriority(priorityValue) {
+    const { priorityList } = this.state;
+
     if (priorityValue !== 'Filter Off') {
       this.setState(() => {
         return {
           priority: priorityValue,
-          priorityList: this.state.priorityList.concat(priorityValue),
+          priorityList: priorityList.concat(priorityValue),
         };
       });
     } else {

From 3d592b0473bca6ebaea2f53066b82ac19601cf2c Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:38:38 -0700
Subject: [PATCH 58/93] 1

---
 src/components/Reports/PeopleReport/PeopleReport.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index a4dd5e10e9..d11b406cb3 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -189,11 +189,13 @@ class PeopleReport extends Component {
   }
 
   setStatus(statusValue) {
+    const { statusList } = this.state;
+
     if (statusValue !== 'Filter Off') {
       this.setState(() => {
         return {
           status: statusValue,
-          statusList: this.state.statusList.concat(statusValue),
+          statusList: statusList.concat(statusValue),
         };
       });
     } else {

From f2f3632aca8981fcb03300c209e8689ea94d15d2 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:41:13 -0700
Subject: [PATCH 59/93] 1

---
 src/components/Reports/PeopleReport/PeopleReport.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index d11b406cb3..275b18f90b 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -216,6 +216,7 @@ class PeopleReport extends Component {
     });
   }
 
+  // eslint-disable-next-line no-unused-vars
   setFilter(filterValue) {
     this.setState(() => {
       return {
@@ -237,11 +238,12 @@ class PeopleReport extends Component {
   }
 
   setClassfication(classificationValue) {
+    const { classificationList } = this.state;
     if (classificationValue !== 'Filter Off') {
       this.setState(() => {
         return {
           classification: classificationValue,
-          classificationList: this.state.classificationList.concat(classificationValue),
+          classificationList: classificationList.concat(classificationValue),
         };
       });
     } else {

From c584a1ae45524ae68c1bffda361c2ffe1c65258a Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:46:58 -0700
Subject: [PATCH 60/93] 1

---
 src/components/Reports/PeopleReport/PeopleReport.jsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index 275b18f90b..908b363924 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -285,6 +285,7 @@ class PeopleReport extends Component {
     } = this.state;
     // eslint-disable-next-line no-unused-vars
     const { firstName, lastName, weeklycommittedHours, hoursByCategory } = userProfile;
+    const { tangibleHoursReportedThisWeek, auth, match } = this.props;
 
     let totalTangibleHrsRound = 0;
     if (hoursByCategory) {
@@ -478,9 +479,10 @@ class PeopleReport extends Component {
       });
 
       try {
-        await this.props.updateUserProfileProperty(this.props.userProfile, 'bioPosted', bioStatus);
+        await updateUserProfileProperty(userProfile, 'bioPosted', bioStatus);
         toast.success('You have changed the bio announcement status of this user.');
       } catch (err) {
+        // eslint-disable-next-line no-alert
         alert('An error occurred while attempting to save the bioPosted change to the profile.');
       }
     };
@@ -506,7 +508,7 @@ class PeopleReport extends Component {
                 secondColor="#831ec4"
                 className="people-report-time-log-block"
               >
-                <h3>{this.props.tangibleHoursReportedThisWeek}</h3>
+                <h3>{tangibleHoursReportedThisWeek}</h3>
                 <p>Hours Logged This Week</p>
               </ReportPage.ReportBlock>
             )}
@@ -559,8 +561,8 @@ class PeopleReport extends Component {
                   </div>
                   <div className="visualizationDiv">
                     <BadgeSummaryViz
-                      authId={this.props.auth.user.userid}
-                      userId={this.props.match.params.userId}
+                      authId={auth.user.userid}
+                      userId={match.params.userId}
                       badges={userProfile.badgeCollection}
                     />
                   </div>

From f490e5040cc36ebb5bdd7fc9a8a99c4ce9a03e4f Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:50:16 -0700
Subject: [PATCH 61/93] 1

---
 src/components/Reports/PeopleReport/PeopleReport.jsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index 908b363924..449d8586d2 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -295,16 +295,17 @@ class PeopleReport extends Component {
       totalTangibleHrsRound = hours.toFixed(2);
     }
 
+    // eslint-disable-next-line react/no-unstable-nested-components,no-unused-vars
     const UserProject = props => {
       const userProjectList = [];
       return <div>{userProjectList}</div>;
     };
+    // eslint-disable-next-line react/no-unstable-nested-components
     const Infringements = props => {
-      const BlueSquare = [];
       const dict = {};
 
       // aggregate infringements
-      for (let i = 0; i < props.infringements.length; i++) {
+      for (let i = 0; i < props.infringements.length; i += 1) {
         if (props.infringements[i].date in dict) {
           dict[props.infringements[i].date].count += 1;
           dict[props.infringements[i].date].des.push(props.infringements[i].description);
@@ -336,6 +337,7 @@ class PeopleReport extends Component {
       );
     };
 
+    // eslint-disable-next-line react/no-unstable-nested-components,no-unused-vars
     const PeopleDataTable = props => {
       const peopleData = {
         alertVisible: false,
@@ -344,7 +346,7 @@ class PeopleReport extends Component {
         message: '',
       };
 
-      for (let i = 0; i < userTask.length; i++) {
+      for (let i = 0; i < userTask.length; i += 1) {
         const task = {
           taskName: '',
           priority: '',
@@ -380,7 +382,7 @@ class PeopleReport extends Component {
         task.status = userTask[i].status;
         const n = userTask[i].estimatedHours;
         task.estimatedHours = n.toFixed(2);
-        for (let j = 0; j < userTask[i].resources.length; j++) {
+        for (let j = 0; j < userTask[i].resources.length; j += 1) {
           const tempResource = {
             name: '',
             profilePic: '',

From e497a72b119465aae58486f16b0ba586d0dbb975 Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:53:07 -0700
Subject: [PATCH 62/93] 1

---
 .../Reports/PeopleReport/PeopleReport.jsx     | 107 +++++++++---------
 1 file changed, 55 insertions(+), 52 deletions(-)

diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index 449d8586d2..d512a00a5e 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -416,61 +416,64 @@ class PeopleReport extends Component {
       return <PeopleTableDetails taskData={peopleData.taskData} />;
     };
 
-    const renderProfileInfo = () => (
-      <ReportPage.ReportHeader
-        src={this.state.userProfile.profilePic}
-        avatar={this.state.userProfile.profilePic ? undefined : <FiUser />}
-        isActive={isActive}
-      >
-        <div className="report-stats">
-          <p>
-            <Link to={`/userProfile/${userProfile._id}`} title="View Profile">
-              {userProfile.firstName} {userProfile.lastName}
-            </Link>
-          </p>
-          <p>Role: {userProfile.role}</p>
-          <p>Title: {userProfile.jobTitle}</p>
-
-          {userProfile.endDate ? (
-            <div className="rehireable">
-              <Checkbox
-                value={this.state.isRehireable}
-                onChange={() => this.setRehireable(!this.state.isRehireable)}
-                label="Rehireable"
-              />
-            </div>
-          ) : (
-            ''
-          )}
-
-          <div className="stats">
-            <div>
-              <h4>{formatDate(userProfile.createdDate)}</h4>
-              <p>Start Date</p>
-            </div>
-            <div>
-              <h4>{userProfile.endDate ? formatDate(userProfile.endDate) : 'N/A'}</h4>
-              <p>End Date</p>
-            </div>
-            {this.state.bioStatus ? (
+    const renderProfileInfo = () => {
+      const { isRehireable, bioStatus, authRole } = this.state;
+      const { profilePic, role, jobTitle, endDate, _id, createdDate } = userProfile;
+
+      return (
+        <ReportPage.ReportHeader
+          src={profilePic}
+          avatar={profilePic ? undefined : <FiUser />}
+          isActive={isActive}
+        >
+          <div className="report-stats">
+            <p>
+              <Link to={`/userProfile/${_id}`} title="View Profile">
+                {firstName} {lastName}
+              </Link>
+            </p>
+            <p>Role: {role}</p>
+            <p>Title: {jobTitle}</p>
+
+            {endDate ? (
+              <div className="rehireable">
+                <Checkbox
+                  value={isRehireable}
+                  onChange={() => this.setRehireable(!isRehireable)}
+                  label="Rehireable"
+                />
+              </div>
+            ) : (
+              ''
+            )}
+
+            <div className="stats">
               <div>
-                <h5>
-                  Bio {this.state.bioStatus === 'default' ? 'not requested' : this.state.bioStatus}
-                </h5>{' '}
-                {this.state.authRole === 'Administrator' || this.state.authRole === 'Owner' ? (
-                  <ToggleSwitch
-                    fontSize="13px"
-                    switchType="bio"
-                    state={this.state.bioStatus}
-                    handleUserProfile={bio => onChangeBioPosted(bio)}
-                  />
-                ) : null}
+                <h4>{formatDate(createdDate)}</h4>
+                <p>Start Date</p>
+              </div>
+              <div>
+                <h4>{endDate ? formatDate(endDate) : 'N/A'}</h4>
+                <p>End Date</p>
               </div>
-            ) : null}
+              {bioStatus ? (
+                <div>
+                  <h5>Bio {bioStatus === 'default' ? 'not requested' : bioStatus}</h5>{' '}
+                  {authRole === 'Administrator' || authRole === 'Owner' ? (
+                    <ToggleSwitch
+                      fontSize="13px"
+                      switchType="bio"
+                      state={bioStatus}
+                      handleUserProfile={bio => onChangeBioPosted(bio)}
+                    />
+                  ) : null}
+                </div>
+              ) : null}
+            </div>
           </div>
-        </div>
-      </ReportPage.ReportHeader>
-    );
+        </ReportPage.ReportHeader>
+      );
+    };
 
     const onChangeBioPosted = async bio => {
       const bioStatus = bio;

From 6dbab88e13b4909c008f31ef0441acb4a43e14dd Mon Sep 17 00:00:00 2001
From: Zijie Yu <itvxyu@gmail.com>
Date: Thu, 5 Oct 2023 02:55:18 -0700
Subject: [PATCH 63/93] final fix

---
 .eslintignore                                 | 54 +++++++++++++++++++
 .prettierignore                               | 50 +++++++++++++++++
 .../Reports/PeopleReport/PeopleReport.jsx     |  2 +
 3 files changed, 106 insertions(+)
 create mode 100644 .eslintignore
 create mode 100644 .prettierignore

diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000000..78d5b032d1
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,54 @@
+*.png
+*.svg
+*.test.js
+*.test.jsx
+src/actions/**
+src/App.css
+src/config.json
+src/constants/**
+src/index.js
+src/languages/**
+src/reducers/**
+src/registerServiceWorker.js
+src/routes.js
+src/services/**
+src/setupTests.js
+src/store.js
+src/styles.js
+src/utils/**
+src/__tests__/**
+
+
+
+src/components/App.jsx
+src/components/AutoReload/**
+src/components/AutoUpdate/**
+src/components/Badge/**
+src/components/BMDashboard/**
+src/components/common/**
+src/components/ForcePasswordUpdate/**
+src/components/Header/**
+src/components/Inventory/**
+src/components/Login/**
+src/components/ManageMemberships/**
+src/components/Memberships/**
+src/components/MonthlyEffort/**
+src/components/NewProfileLink/**
+src/components/OwnerMessage/**
+src/components/PermissionsManagement/**
+src/components/PopUpBar/**
+src/components/ProfileLinks/**
+src/components/Projects/**
+src/components/RenderInfringement/**
+src/components/Reports/**
+src/components/SetupProfile/**
+src/components/SummaryBar/**
+src/components/SummaryManagement/**
+src/components/TaskEditSuggestions/**
+src/components/TeamMemberTasks/**
+src/components/Teams/**
+src/components/Timelog/**
+src/components/UpdatePassword/**
+src/components/UserManagement/**
+src/components/UserProfile/**
+src/components/MouseoverText/**
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000000..aafd214ca1
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,50 @@
+*.png
+*.svg
+src/actions/**
+src/App.css
+src/config.json
+src/constants/**
+src/index.js
+src/languages/**
+src/reducers/**
+src/registerServiceWorker.js
+src/routes.js
+src/services/**
+src/setupTests.js
+src/store.js
+src/styles.js
+src/utils/**
+src/__tests__/**
+
+
+src/components/App.jsx
+src/components/AutoReload/**
+src/components/AutoUpdate/**
+src/components/Badge/**
+src/components/common/**
+src/components/ForcePasswordUpdate/**
+src/components/Header/**
+src/components/Inventory/**
+src/components/Login/**
+src/components/ManageMemberships/**
+src/components/Memberships/**
+src/components/MonthlyEffort/**
+src/components/NewProfileLink/**
+src/components/OwnerMessage/**
+src/components/PermissionsManagement/**
+src/components/PopUpBar/**
+src/components/ProfileLinks/**
+src/components/Projects/**
+src/components/RenderInfringement/**
+src/components/Reports/**
+src/components/SetupProfile/**
+src/components/SummaryBar/**
+src/components/SummaryManagement/**
+src/components/TaskEditSuggestions/**
+src/components/TeamMemberTasks/**
+src/components/Teams/**
+src/components/Timelog/**
+src/components/UpdatePassword/**
+src/components/UserManagement/**
+src/components/UserProfile/**
+src/components/MouseoverText/**
diff --git a/src/components/Reports/PeopleReport/PeopleReport.jsx b/src/components/Reports/PeopleReport/PeopleReport.jsx
index d512a00a5e..83a157c017 100644
--- a/src/components/Reports/PeopleReport/PeopleReport.jsx
+++ b/src/components/Reports/PeopleReport/PeopleReport.jsx
@@ -264,6 +264,7 @@ class PeopleReport extends Component {
     });
   }
 
+  // eslint-disable-next-line class-methods-use-this
   endOfWeek(offset) {
     return moment()
       .tz('America/Los_Angeles')
@@ -464,6 +465,7 @@ class PeopleReport extends Component {
                       fontSize="13px"
                       switchType="bio"
                       state={bioStatus}
+                      /* eslint-disable-next-line no-use-before-define */
                       handleUserProfile={bio => onChangeBioPosted(bio)}
                     />
                   ) : null}

From c41cc300dc00e24b598da2ab35eee99555f3e8d8 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Thu, 5 Oct 2023 15:29:57 -0400
Subject: [PATCH 64/93] updates

---
 src/components/BMDashboard/BMDashboard.jsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/BMDashboard/BMDashboard.jsx b/src/components/BMDashboard/BMDashboard.jsx
index 9cece05394..e335099696 100644
--- a/src/components/BMDashboard/BMDashboard.jsx
+++ b/src/components/BMDashboard/BMDashboard.jsx
@@ -1,12 +1,9 @@
 import { Row, Col, Container, Form, Button, FormGroup, Label, Input } from 'reactstrap';
-//import { ProjectsList } from './ProjectsList';
+import { ProjectsList } from './ProjectsList';
 import './BMDashboard.css';
 
 export const BMDashboard = () => {
   return (
-    // <div style={{ textAlign: 'center', marginTop: '5rem' }}>
-    //   <h2>Building and Inventory Management Dashboard</h2>
-    // </div>
     <Container className="d-flex justify-content-center align-items-center mw-80 px-4">
       <Form className="w-75 p-3">
         <Row className="ml-0">
@@ -34,6 +31,7 @@ export const BMDashboard = () => {
           </Col>
         </Row>
       </Form>
+      <ProjectsList />
     </Container>
   );
 };

From 9696ddb8374d076d6baa18af34853945d82b5d0b Mon Sep 17 00:00:00 2001
From: Bailey Mejia <baileymejia28@gmail.com>
Date: Thu, 5 Oct 2023 17:23:03 -0700
Subject: [PATCH 65/93] Bailey remove badge cropping

---
 src/components/Badge/Badge.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/Badge/Badge.css b/src/components/Badge/Badge.css
index be0a271cf0..3a99674b96 100644
--- a/src/components/Badge/Badge.css
+++ b/src/components/Badge/Badge.css
@@ -9,24 +9,28 @@
   height: 50px;
   width: 50px;
   margin: 5px;
+  overflow: inherit;
 }
 
 .badge_image_md > img {
   border-radius: 50%;
   height: 100px;
   width: 100px;
+  overflow: inherit;
 }
 
 .badge_image_lg > img {
   border-radius: 50%;
   height: 200px;
   width: 200px;
+  overflow: inherit;
 }
 
 .badge_image_mini > img {
   border-radius: 50%;
   height: 25px;
   width: 25px;
+  overflow: inherit;
 }
 
 .badge_count {

From 10af2035868b6a4db4c69fd603f398144f812849 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 6 Oct 2023 09:36:52 -0400
Subject: [PATCH 66/93] projects folder created and bmdashboard updated

---
 src/components/BMDashboard/BMDashboard.jsx    | 26 +++++++++----------
 .../BMDashboard/Projects/Project.jsx          |  9 +++++++
 .../BMDashboard/Projects/ProjectsList.jsx     | 11 ++++++++
 3 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 src/components/BMDashboard/Projects/Project.jsx
 create mode 100644 src/components/BMDashboard/Projects/ProjectsList.jsx

diff --git a/src/components/BMDashboard/BMDashboard.jsx b/src/components/BMDashboard/BMDashboard.jsx
index e335099696..637ee1645b 100644
--- a/src/components/BMDashboard/BMDashboard.jsx
+++ b/src/components/BMDashboard/BMDashboard.jsx
@@ -1,17 +1,17 @@
 import { Row, Col, Container, Form, Button, FormGroup, Label, Input } from 'reactstrap';
-import { ProjectsList } from './ProjectsList';
+import { ProjectsList } from './Projects/ProjectsList';
 import './BMDashboard.css';
 
 export const BMDashboard = () => {
   return (
-    <Container className="d-flex justify-content-center align-items-center mw-80 px-4">
-      <Form className="w-75 p-3">
-        <Row className="ml-0">
-          <Col className="text-center">
-            <h1 className="bm-dashboard__header">Building and Inventory Management Dashboard</h1>
-          </Col>
-        </Row>
-        <Row className="ml-0 gx-5" md="2" sm="1" xs="1">
+    <Container className="justify-content-center align-items-center mw-80 px-4">
+      <Row className="ml-0 mt-5">
+        <Col className="text-center">
+          <h1 className="bm-dashboard__header">Building and Inventory Management Dashboard</h1>
+        </Col>
+      </Row>
+      <Form className="w-100 p-3  text-center">
+        <Row className="ml-0 gx-5 w-75" md="2" sm="1" xs="1">
           <Col className="p-3">
             <Label for="exampleSelect" hidden>
               Select
@@ -25,13 +25,13 @@ export const BMDashboard = () => {
             </Input>
           </Col>
           <Col className="p-3">
-            <Button className="w-100 bm-dashboard__button">
-              Go to Project Dashboard
-            </Button>
+            <Button className="w-100 bm-dashboard__button">Go to Project Dashboard</Button>
           </Col>
         </Row>
       </Form>
-      <ProjectsList />
+      <Row className="ml-0 mt-5 text-center" >
+        <ProjectsList />
+      </Row>
     </Container>
   );
 };
diff --git a/src/components/BMDashboard/Projects/Project.jsx b/src/components/BMDashboard/Projects/Project.jsx
new file mode 100644
index 0000000000..b463ab66db
--- /dev/null
+++ b/src/components/BMDashboard/Projects/Project.jsx
@@ -0,0 +1,9 @@
+import React from 'react'
+
+const Project = () => {
+  return (
+    <div>This is a Project</div>
+  )
+}
+
+export default Project
\ No newline at end of file
diff --git a/src/components/BMDashboard/Projects/ProjectsList.jsx b/src/components/BMDashboard/Projects/ProjectsList.jsx
new file mode 100644
index 0000000000..5eff249731
--- /dev/null
+++ b/src/components/BMDashboard/Projects/ProjectsList.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import Project from './Project';
+
+export const ProjectsList = () => {
+  return (
+    <div>
+      <Project />
+      <Project />
+    </div>
+  )
+}

From cefd2b5006944513949164fa85f78893a3d91407 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 6 Oct 2023 09:37:38 -0400
Subject: [PATCH 67/93] projectslist file moved to projects folder

---
 src/components/BMDashboard/ProjectsList.jsx | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 src/components/BMDashboard/ProjectsList.jsx

diff --git a/src/components/BMDashboard/ProjectsList.jsx b/src/components/BMDashboard/ProjectsList.jsx
deleted file mode 100644
index e1c8f51fd1..0000000000
--- a/src/components/BMDashboard/ProjectsList.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from 'react'
-
-export const ProjectsList = () => {
-  return (
-    <div>Hello from ProjectsList</div>
-  )
-}

From bcfd1eb1c26a4d88cccc6b9a33b58d2565d35ace Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 6 Oct 2023 10:01:30 -0400
Subject: [PATCH 68/93] updated routes.js

---
 src/routes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes.js b/src/routes.js
index 17f4840792..504e436ad2 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -37,7 +37,6 @@ import { TeamReport } from './components/Reports/TeamReport';
 import Inventory from './components/Inventory';
 import BadgeManagement from './components/Badge/BadgeManagement';
 import RoleInfoCollections from 'components/UserProfile/EditableModal/roleInfoModal';
-import ProjectDetails from 'components/BMDashboard/ProjectDetails/ProjectDetails';
 import SetupProfile from 'components/SetupProfile/SetupProfile';
 
 // BM Dashboard
@@ -45,6 +44,7 @@ import SetupProfile from 'components/SetupProfile/SetupProfile';
 import BMProtectedRoute from 'components/common/BMDashboard/BMProtectedRoute';
 import BMDashboard from 'components/BMDashboard';
 import BMLogin from 'components/BMDashboard/Login';
+import ProjectDetails from 'components/BMDashboard/ProjectDetails/ProjectDetails';
 
 export default (
   <>
@@ -158,7 +158,7 @@ export default (
       <BMProtectedRoute path="/bmdashboard" exact component={BMDashboard} />
       <Route path="/bmdashboard/login" component={BMLogin} />
       {/* Temporary route to redirect all subdirectories to login if unauthenticated */}
-      <BMProtectedRoute path="/bmdashboard/:path" component={BMDashboard} />
+      <BMProtectedRoute path="/bmdashboard/:path" component={ProjectDetails} />
       
       {/* ----- END BM Dashboard Routing ----- */}
 

From 9304bc3bc9207090424a0c5bfbdce7d9f5f85ecd Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 6 Oct 2023 11:08:45 -0400
Subject: [PATCH 69/93] basic design done

---
 .gitattributes                                |  2 +-
 src/components/BMDashboard/BMDashboard.css    | 25 +++++++++++++++++++
 src/components/BMDashboard/BMDashboard.jsx    |  6 +++--
 .../BMDashboard/Projects/Project.jsx          |  9 -------
 .../BMDashboard/Projects/ProjectSummary.jsx   | 11 ++++++++
 .../BMDashboard/Projects/ProjectsList.jsx     | 10 ++++----
 6 files changed, 46 insertions(+), 17 deletions(-)
 delete mode 100644 src/components/BMDashboard/Projects/Project.jsx
 create mode 100644 src/components/BMDashboard/Projects/ProjectSummary.jsx

diff --git a/.gitattributes b/.gitattributes
index fcadb2cf97..750f5b9e6e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-* text eol=lf
+# * text eol=lf
diff --git a/src/components/BMDashboard/BMDashboard.css b/src/components/BMDashboard/BMDashboard.css
index 8f90323486..10a9b0993a 100644
--- a/src/components/BMDashboard/BMDashboard.css
+++ b/src/components/BMDashboard/BMDashboard.css
@@ -12,5 +12,30 @@
   padding-left: 0;
   padding-right: 0;
   max-height: 38px;
+  background-color: #2e5061;
+}
+}
+
+/* project summaries */
+.projects-list{
+width: 80%;
+list-style-type: none;
+}
+
+.project-summary{
+  background-color: #e8f4f9;
+  height: 20vh;
+  margin-bottom: 2em;
+  padding: 1em;
+  border-radius: 5px;
+}
+
+.project-summary_header{
+  font-size: 0.9em;
+}
+
+@media (min-width: 650px){
+  .project-summary_header{
+  font-size: 1.3em;  
 }
 }
\ No newline at end of file
diff --git a/src/components/BMDashboard/BMDashboard.jsx b/src/components/BMDashboard/BMDashboard.jsx
index 637ee1645b..5a33af70c9 100644
--- a/src/components/BMDashboard/BMDashboard.jsx
+++ b/src/components/BMDashboard/BMDashboard.jsx
@@ -12,11 +12,12 @@ export const BMDashboard = () => {
       </Row>
       <Form className="w-100 p-3  text-center">
         <Row className="ml-0 gx-5 w-75" md="2" sm="1" xs="1">
+          <FormGroup>
           <Col className="p-3">
-            <Label for="exampleSelect" hidden>
+            <Label for="projectSelect" hidden>
               Select
             </Label>
-            <Input id="exampleSelect" name="select" type="select">
+            <Input id="projectSelect" name="select" type="select">
               <option default>Select a project</option>
               <option>1</option>
               <option>2</option>
@@ -24,6 +25,7 @@ export const BMDashboard = () => {
               <option>4</option>
             </Input>
           </Col>
+          </FormGroup>
           <Col className="p-3">
             <Button className="w-100 bm-dashboard__button">Go to Project Dashboard</Button>
           </Col>
diff --git a/src/components/BMDashboard/Projects/Project.jsx b/src/components/BMDashboard/Projects/Project.jsx
deleted file mode 100644
index b463ab66db..0000000000
--- a/src/components/BMDashboard/Projects/Project.jsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react'
-
-const Project = () => {
-  return (
-    <div>This is a Project</div>
-  )
-}
-
-export default Project
\ No newline at end of file
diff --git a/src/components/BMDashboard/Projects/ProjectSummary.jsx b/src/components/BMDashboard/Projects/ProjectSummary.jsx
new file mode 100644
index 0000000000..7b374273dd
--- /dev/null
+++ b/src/components/BMDashboard/Projects/ProjectSummary.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+const ProjectSummary = () => {
+  return (
+    <li className="project-summary">
+      <h2 className="project-summary_header">Project summary</h2>
+    </li>
+  );
+}
+
+export default ProjectSummary
\ No newline at end of file
diff --git a/src/components/BMDashboard/Projects/ProjectsList.jsx b/src/components/BMDashboard/Projects/ProjectsList.jsx
index 5eff249731..9decd03a3d 100644
--- a/src/components/BMDashboard/Projects/ProjectsList.jsx
+++ b/src/components/BMDashboard/Projects/ProjectsList.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import Project from './Project';
+import ProjectSummary from './ProjectSummary';
 
 export const ProjectsList = () => {
   return (
-    <div>
-      <Project />
-      <Project />
-    </div>
+    <ul className="projects-list">
+      <ProjectSummary />
+      <ProjectSummary />
+    </ul>
   )
 }

From 40e7ca29ca5565a30d112a0ab0a36bc9de3704e9 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 6 Oct 2023 11:52:54 -0400
Subject: [PATCH 70/93] added projectSelectForm component

---
 src/components/BMDashboard/BMDashboard.css    | 15 ++--
 src/components/BMDashboard/BMDashboard.jsx    | 68 +++++++++++--------
 .../Projects/ProjectSelectForm.jsx            | 25 +++++++
 .../BMDashboard/Projects/ProjectSummary.jsx   |  8 +--
 .../BMDashboard/Projects/ProjectsList.jsx     | 19 ++++--
 5 files changed, 89 insertions(+), 46 deletions(-)
 create mode 100644 src/components/BMDashboard/Projects/ProjectSelectForm.jsx

diff --git a/src/components/BMDashboard/BMDashboard.css b/src/components/BMDashboard/BMDashboard.css
index 10a9b0993a..63e31a8611 100644
--- a/src/components/BMDashboard/BMDashboard.css
+++ b/src/components/BMDashboard/BMDashboard.css
@@ -1,18 +1,19 @@
-.bm-dashboard__header{
-  font-size: 1em;
- 
+.bm-dashboard__header h1{
+  font-size: 1.5em;
+  text-align: center;
+  margin-top: 2em;
 }
 
-@media (min-width: 650px){
-  .bm-dashboard__header{
-  font-size: 1.5em;  
+.bm-dashboard__button.btn.btn-secondary{
+  background-color: #2e5061;
 }
 
+@media (min-width: 650px){
+
 .bm-dashboard__button.btn.btn-secondary{
   padding-left: 0;
   padding-right: 0;
   max-height: 38px;
-  background-color: #2e5061;
 }
 }
 
diff --git a/src/components/BMDashboard/BMDashboard.jsx b/src/components/BMDashboard/BMDashboard.jsx
index 5a33af70c9..a2e66c2ec5 100644
--- a/src/components/BMDashboard/BMDashboard.jsx
+++ b/src/components/BMDashboard/BMDashboard.jsx
@@ -1,39 +1,47 @@
-import { Row, Col, Container, Form, Button, FormGroup, Label, Input } from 'reactstrap';
-import { ProjectsList } from './Projects/ProjectsList';
+import { Row, Col, Container, Form, Button } from 'reactstrap';
+import  ProjectsList  from './Projects/ProjectsList';
+import ProjectSelectForm from './Projects/ProjectSelectForm';
 import './BMDashboard.css';
 
+const dummyProjects = [
+  {
+    projectId: 1,
+    projectName: 'Big project',
+  },
+  {
+    projectId: 2,
+    projectName: 'Bigger project',
+  },
+  {
+    projectId: 3,
+    projectName: 'Very important project',
+  },
+  {
+    projectId: 4,
+    projectName: 'Super important project',
+  },
+];
+
+
 export const BMDashboard = () => {
   return (
     <Container className="justify-content-center align-items-center mw-80 px-4">
-      <Row className="ml-0 mt-5">
-        <Col className="text-center">
-          <h1 className="bm-dashboard__header">Building and Inventory Management Dashboard</h1>
-        </Col>
-      </Row>
-      <Form className="w-100 p-3  text-center">
-        <Row className="ml-0 gx-5 w-75" md="2" sm="1" xs="1">
-          <FormGroup>
-          <Col className="p-3">
-            <Label for="projectSelect" hidden>
-              Select
-            </Label>
-            <Input id="projectSelect" name="select" type="select">
-              <option default>Select a project</option>
-              <option>1</option>
-              <option>2</option>
-              <option>3</option>
-              <option>4</option>
-            </Input>
-          </Col>
-          </FormGroup>
-          <Col className="p-3">
-            <Button className="w-100 bm-dashboard__button">Go to Project Dashboard</Button>
-          </Col>
+      <header className="bm-dashboard__header">
+        <h1>Building and Inventory Management Dashboard</h1>
+      </header>
+      <main>
+        <Form className="w-100 p-3  text-center">
+          <Row className="ml-0 gx-5 w-75" md="2" sm="1" xs="1">
+            <ProjectSelectForm projects={dummyProjects} />
+            <Col className="p-3">
+              <Button className="bm-dashboard__button w-100">Go to Project Dashboard</Button>
+            </Col>
+          </Row>
+        </Form>
+        <Row className="ml-0 mt-2 text-center">
+          <ProjectsList projects={dummyProjects} />
         </Row>
-      </Form>
-      <Row className="ml-0 mt-5 text-center" >
-        <ProjectsList />
-      </Row>
+      </main>
     </Container>
   );
 };
diff --git a/src/components/BMDashboard/Projects/ProjectSelectForm.jsx b/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
new file mode 100644
index 0000000000..ae1d214121
--- /dev/null
+++ b/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { FormGroup, Col, Label, Input } from 'reactstrap';
+
+const ProjectSelectForm = ({ projects }) => {
+  
+  const selectOptions = projects.map(project => {
+    return <option key={project.projectId}>{project.projectName}</option>;
+  });
+
+  return (
+    <FormGroup>
+      <Col className="p-3">
+        <Label for="projectSelect" hidden>
+          Select
+        </Label>
+        <Input id="projectSelect" name="select" type="select">
+          <option default>Select a project</option>
+          {selectOptions}
+        </Input>
+      </Col>
+    </FormGroup>
+  );
+}
+
+export default ProjectSelectForm
\ No newline at end of file
diff --git a/src/components/BMDashboard/Projects/ProjectSummary.jsx b/src/components/BMDashboard/Projects/ProjectSummary.jsx
index 7b374273dd..737221eb6b 100644
--- a/src/components/BMDashboard/Projects/ProjectSummary.jsx
+++ b/src/components/BMDashboard/Projects/ProjectSummary.jsx
@@ -1,10 +1,10 @@
 import React from 'react';
 
-const ProjectSummary = () => {
+const ProjectSummary = ({ project }) => {
   return (
-    <li className="project-summary">
-      <h2 className="project-summary_header">Project summary</h2>
-    </li>
+    <div>
+      <h2 className="project-summary_header">{project.projectName} summary</h2>
+    </div>
   );
 }
 
diff --git a/src/components/BMDashboard/Projects/ProjectsList.jsx b/src/components/BMDashboard/Projects/ProjectsList.jsx
index 9decd03a3d..bc702b741f 100644
--- a/src/components/BMDashboard/Projects/ProjectsList.jsx
+++ b/src/components/BMDashboard/Projects/ProjectsList.jsx
@@ -1,11 +1,20 @@
 import React from 'react';
 import ProjectSummary from './ProjectSummary';
 
-export const ProjectsList = () => {
+ const ProjectsList = ({ projects }) => {
+
+  const listItems = projects.map(project => {
+    return (
+      <li className="project-summary" key={project.projectId}>
+        <ProjectSummary project={project} />
+      </li>
+    );
+  })
   return (
     <ul className="projects-list">
-      <ProjectSummary />
-      <ProjectSummary />
+      {listItems}
     </ul>
-  )
-}
+  );
+ }
+
+export default ProjectsList;

From a817b317de0f8727b4fb302d2746e63f646c5d0c Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 6 Oct 2023 12:12:51 -0400
Subject: [PATCH 71/93] added select functionality and history.pushto
 projectselectform

---
 src/components/BMDashboard/BMDashboard.jsx    |  9 +--
 .../BMDashboard/Projects/ProjectDetails.jsx   |  9 +++
 .../Projects/ProjectSelectForm.jsx            | 64 ++++++++++++++-----
 3 files changed, 57 insertions(+), 25 deletions(-)
 create mode 100644 src/components/BMDashboard/Projects/ProjectDetails.jsx

diff --git a/src/components/BMDashboard/BMDashboard.jsx b/src/components/BMDashboard/BMDashboard.jsx
index a2e66c2ec5..e2437df94b 100644
--- a/src/components/BMDashboard/BMDashboard.jsx
+++ b/src/components/BMDashboard/BMDashboard.jsx
@@ -30,14 +30,7 @@ export const BMDashboard = () => {
         <h1>Building and Inventory Management Dashboard</h1>
       </header>
       <main>
-        <Form className="w-100 p-3  text-center">
-          <Row className="ml-0 gx-5 w-75" md="2" sm="1" xs="1">
-            <ProjectSelectForm projects={dummyProjects} />
-            <Col className="p-3">
-              <Button className="bm-dashboard__button w-100">Go to Project Dashboard</Button>
-            </Col>
-          </Row>
-        </Form>
+        <ProjectSelectForm projects={dummyProjects} />
         <Row className="ml-0 mt-2 text-center">
           <ProjectsList projects={dummyProjects} />
         </Row>
diff --git a/src/components/BMDashboard/Projects/ProjectDetails.jsx b/src/components/BMDashboard/Projects/ProjectDetails.jsx
new file mode 100644
index 0000000000..18f818ef0c
--- /dev/null
+++ b/src/components/BMDashboard/Projects/ProjectDetails.jsx
@@ -0,0 +1,9 @@
+import React from 'react'
+
+const ProjectDetails = ({project}) => {
+  return (
+    <div>Welcome to the {project.projectName} Details Page</div>
+  )
+}
+
+export default ProjectDetails
\ No newline at end of file
diff --git a/src/components/BMDashboard/Projects/ProjectSelectForm.jsx b/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
index ae1d214121..edfdf09e9b 100644
--- a/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
+++ b/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
@@ -1,25 +1,55 @@
-import React from 'react';
-import { FormGroup, Col, Label, Input } from 'reactstrap';
+import React, { useState } from 'react';
+import { useHistory } from 'react-router-dom';
+import { Form, FormGroup, Col, Row, Label, Input, Button } from 'reactstrap';
 
 const ProjectSelectForm = ({ projects }) => {
-  
+  const history = useHistory();
+  const [selectedProject, setSelectedProject] = useState('');
+
   const selectOptions = projects.map(project => {
-    return <option key={project.projectId}>{project.projectName}</option>;
+    return <option key={project.projectId} value={project}>{project.projectName}</option>;
   });
 
+  const handleOptionChange = (event) => {
+    setSelectedProject(event.target.value);
+  };
+
+
+  const handleButtonClick = () => {
+    if (selectedProject) {
+      //navigate to a new page with information about the selected project
+      history.push('/bmdashboard/${selectedProject.projectId}')
+    } else {
+      alert('Please select an option first');
+    }
+  };
+
+
   return (
-    <FormGroup>
-      <Col className="p-3">
-        <Label for="projectSelect" hidden>
-          Select
-        </Label>
-        <Input id="projectSelect" name="select" type="select">
-          <option default>Select a project</option>
-          {selectOptions}
-        </Input>
-      </Col>
-    </FormGroup>
+    <Form className="w-100 p-3  text-center">
+      <Row className="ml-0 gx-5 w-75" md="2" sm="1" xs="1">
+        <FormGroup>
+          <Col className="p-3">
+            <Label for="projectSelect" hidden>
+              Select
+            </Label>
+            <Input
+              id="projectSelect"
+              name="select"
+              type="select"
+              value={selectedProject}
+              onChange={handleOptionChange}>
+              <option default>Select a project</option>
+              {selectOptions}
+            </Input>
+          </Col>
+        </FormGroup>
+        <Col className="p-3">
+          <Button className="bm-dashboard__button w-100" onClick={handleButtonClick}>Go to Project Dashboard</Button>
+        </Col>
+      </Row>
+    </Form>
   );
-}
+};
 
-export default ProjectSelectForm
\ No newline at end of file
+export default ProjectSelectForm;

From cb451ffe3efc28fdf2a02518b8158c56880d5b81 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 6 Oct 2023 14:31:02 -0400
Subject: [PATCH 72/93] added route for porjectDetails

---
 .../BMDashboard/Projects/ProjectDetails.jsx   | 10 +++++--
 .../Projects/ProjectSelectForm.jsx            | 29 ++++++++++++-------
 src/routes.js                                 |  6 ++--
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/components/BMDashboard/Projects/ProjectDetails.jsx b/src/components/BMDashboard/Projects/ProjectDetails.jsx
index 18f818ef0c..bc9078525e 100644
--- a/src/components/BMDashboard/Projects/ProjectDetails.jsx
+++ b/src/components/BMDashboard/Projects/ProjectDetails.jsx
@@ -1,8 +1,12 @@
-import React from 'react'
+import React from 'react';
+import { useParams } from 'react-router-dom';
+
+const ProjectDetails = ({ project }) => {
+  
+  const { projectId } = useParams();
 
-const ProjectDetails = ({project}) => {
   return (
-    <div>Welcome to the {project.projectName} Details Page</div>
+    <div style={{textAlign:'center', marginTop:'5em'}}>Welcome to Project #{projectId} Details Page</div>
   )
 }
 
diff --git a/src/components/BMDashboard/Projects/ProjectSelectForm.jsx b/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
index edfdf09e9b..05f44a4fef 100644
--- a/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
+++ b/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
@@ -4,27 +4,31 @@ import { Form, FormGroup, Col, Row, Label, Input, Button } from 'reactstrap';
 
 const ProjectSelectForm = ({ projects }) => {
   const history = useHistory();
-  const [selectedProject, setSelectedProject] = useState('');
+  const [selectedProjectId, setSelectedProjectId] = useState(null);
 
   const selectOptions = projects.map(project => {
-    return <option key={project.projectId} value={project}>{project.projectName}</option>;
+    return (
+      <option key={project.projectId} value={project.projectId}>
+        {project.projectName}
+      </option>
+    );
   });
 
-  const handleOptionChange = (event) => {
-    setSelectedProject(event.target.value);
+  const handleOptionChange = event => {
+    console.log('option change', event.target.value);
+    setSelectedProjectId(event.target.value);
   };
 
-
   const handleButtonClick = () => {
-    if (selectedProject) {
+    if (selectedProjectId) {
       //navigate to a new page with information about the selected project
-      history.push('/bmdashboard/${selectedProject.projectId}')
+      console.log('selectedProjectId', selectedProjectId);
+      history.push(`/bmdashboard/projects/${selectedProjectId}`);
     } else {
       alert('Please select an option first');
     }
   };
 
-
   return (
     <Form className="w-100 p-3  text-center">
       <Row className="ml-0 gx-5 w-75" md="2" sm="1" xs="1">
@@ -37,15 +41,18 @@ const ProjectSelectForm = ({ projects }) => {
               id="projectSelect"
               name="select"
               type="select"
-              value={selectedProject}
-              onChange={handleOptionChange}>
+              value={selectedProjectId}
+              onChange={handleOptionChange}
+            >
               <option default>Select a project</option>
               {selectOptions}
             </Input>
           </Col>
         </FormGroup>
         <Col className="p-3">
-          <Button className="bm-dashboard__button w-100" onClick={handleButtonClick}>Go to Project Dashboard</Button>
+          <Button className="bm-dashboard__button w-100" onClick={handleButtonClick}>
+            Go to Project Dashboard
+          </Button>
         </Col>
       </Row>
     </Form>
diff --git a/src/routes.js b/src/routes.js
index a8b645b919..1483eb23cd 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -44,6 +44,7 @@ import SetupProfile from 'components/SetupProfile/SetupProfile';
 import BMProtectedRoute from 'components/common/BMDashboard/BMProtectedRoute';
 import BMDashboard from 'components/BMDashboard';
 import BMLogin from 'components/BMDashboard/Login';
+import ProjectDetails from 'components/BMDashboard/Projects/ProjectDetails';
 
 export default (
   <>
@@ -155,8 +156,9 @@ export default (
 
       <BMProtectedRoute path="/bmdashboard" exact component={BMDashboard} />
       <Route path="/bmdashboard/login" component={BMLogin} />
-      {/* Temporary route to redirect all subdirectories to login if unauthenticated */}
-      <BMProtectedRoute path="/bmdashboard/:path" component={BMDashboard} />
+          {/* Temporary route to redirect all subdirectories to login if unauthenticated */}
+          <BMProtectedRoute path="/bmdashboard/projects/:projectId" component={ProjectDetails} />
+      {/* <BMProtectedRoute path="/bmdashboard/:path" component={BMDashboard} /> */}
       
       {/* ----- END BM Dashboard Routing ----- */}
 

From d1ff6afc242f51570bfbe5a67476885b48cb01a8 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 6 Oct 2023 14:41:51 -0400
Subject: [PATCH 73/93] prettier fixes

---
 src/components/BMDashboard/BMDashboard.jsx         |  7 ++-----
 .../BMDashboard/Projects/ProjectDetails.jsx        | 13 +++++++------
 .../BMDashboard/Projects/ProjectSelectForm.jsx     |  6 ++++--
 .../BMDashboard/Projects/ProjectSummary.jsx        |  5 +++--
 .../BMDashboard/Projects/ProjectsList.jsx          | 14 +++++++-------
 src/routes.js                                      |  5 ++---
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/components/BMDashboard/BMDashboard.jsx b/src/components/BMDashboard/BMDashboard.jsx
index e2437df94b..a3aab99fe5 100644
--- a/src/components/BMDashboard/BMDashboard.jsx
+++ b/src/components/BMDashboard/BMDashboard.jsx
@@ -1,5 +1,5 @@
 import { Row, Col, Container, Form, Button } from 'reactstrap';
-import  ProjectsList  from './Projects/ProjectsList';
+import ProjectsList from './Projects/ProjectsList';
 import ProjectSelectForm from './Projects/ProjectSelectForm';
 import './BMDashboard.css';
 
@@ -22,7 +22,6 @@ const dummyProjects = [
   },
 ];
 
-
 export const BMDashboard = () => {
   return (
     <Container className="justify-content-center align-items-center mw-80 px-4">
@@ -31,9 +30,7 @@ export const BMDashboard = () => {
       </header>
       <main>
         <ProjectSelectForm projects={dummyProjects} />
-        <Row className="ml-0 mt-2 text-center">
-          <ProjectsList projects={dummyProjects} />
-        </Row>
+        <ProjectsList projects={dummyProjects} />
       </main>
     </Container>
   );
diff --git a/src/components/BMDashboard/Projects/ProjectDetails.jsx b/src/components/BMDashboard/Projects/ProjectDetails.jsx
index bc9078525e..0d9eb075c9 100644
--- a/src/components/BMDashboard/Projects/ProjectDetails.jsx
+++ b/src/components/BMDashboard/Projects/ProjectDetails.jsx
@@ -1,13 +1,14 @@
 import React from 'react';
 import { useParams } from 'react-router-dom';
 
-const ProjectDetails = ({ project }) => {
-  
+const ProjectDetails = () => {
   const { projectId } = useParams();
 
   return (
-    <div style={{textAlign:'center', marginTop:'5em'}}>Welcome to Project #{projectId} Details Page</div>
-  )
-}
+    <div style={{ textAlign: 'center', marginTop: '5em' }}>
+      Welcome to Project #{projectId} Details Page
+    </div>
+  );
+};
 
-export default ProjectDetails
\ No newline at end of file
+export default ProjectDetails;
diff --git a/src/components/BMDashboard/Projects/ProjectSelectForm.jsx b/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
index 05f44a4fef..11fe01a4ef 100644
--- a/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
+++ b/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
@@ -4,7 +4,7 @@ import { Form, FormGroup, Col, Row, Label, Input, Button } from 'reactstrap';
 
 const ProjectSelectForm = ({ projects }) => {
   const history = useHistory();
-  const [selectedProjectId, setSelectedProjectId] = useState(null);
+  const [selectedProjectId, setSelectedProjectId] = useState('');
 
   const selectOptions = projects.map(project => {
     return (
@@ -44,7 +44,9 @@ const ProjectSelectForm = ({ projects }) => {
               value={selectedProjectId}
               onChange={handleOptionChange}
             >
-              <option default>Select a project</option>
+              <option value="" default>
+                Select a project
+              </option>
               {selectOptions}
             </Input>
           </Col>
diff --git a/src/components/BMDashboard/Projects/ProjectSummary.jsx b/src/components/BMDashboard/Projects/ProjectSummary.jsx
index 737221eb6b..b8cc5cb398 100644
--- a/src/components/BMDashboard/Projects/ProjectSummary.jsx
+++ b/src/components/BMDashboard/Projects/ProjectSummary.jsx
@@ -4,8 +4,9 @@ const ProjectSummary = ({ project }) => {
   return (
     <div>
       <h2 className="project-summary_header">{project.projectName} summary</h2>
+      <p>Details of project summary TBD</p>
     </div>
   );
-}
+};
 
-export default ProjectSummary
\ No newline at end of file
+export default ProjectSummary;
diff --git a/src/components/BMDashboard/Projects/ProjectsList.jsx b/src/components/BMDashboard/Projects/ProjectsList.jsx
index bc702b741f..d563b5c4e6 100644
--- a/src/components/BMDashboard/Projects/ProjectsList.jsx
+++ b/src/components/BMDashboard/Projects/ProjectsList.jsx
@@ -1,20 +1,20 @@
 import React from 'react';
+import { Row } from 'reactstrap';
 import ProjectSummary from './ProjectSummary';
 
- const ProjectsList = ({ projects }) => {
-
+const ProjectsList = ({ projects }) => {
   const listItems = projects.map(project => {
     return (
       <li className="project-summary" key={project.projectId}>
         <ProjectSummary project={project} />
       </li>
     );
-  })
+  });
   return (
-    <ul className="projects-list">
-      {listItems}
-    </ul>
+    <Row className="ml-0 mt-2 text-center">
+      <ul className="projects-list">{listItems}</ul>
+    </Row>
   );
- }
+};
 
 export default ProjectsList;
diff --git a/src/routes.js b/src/routes.js
index 1483eb23cd..f127a89f81 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -156,9 +156,8 @@ export default (
 
       <BMProtectedRoute path="/bmdashboard" exact component={BMDashboard} />
       <Route path="/bmdashboard/login" component={BMLogin} />
-          {/* Temporary route to redirect all subdirectories to login if unauthenticated */}
-          <BMProtectedRoute path="/bmdashboard/projects/:projectId" component={ProjectDetails} />
-      {/* <BMProtectedRoute path="/bmdashboard/:path" component={BMDashboard} /> */}
+      <BMProtectedRoute path="/bmdashboard/projects/:projectId" component={ProjectDetails} />
+  
       
       {/* ----- END BM Dashboard Routing ----- */}
 

From b439f831451070fc53ac87bd43d24c1019dcbbe3 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Fri, 6 Oct 2023 14:48:29 -0400
Subject: [PATCH 74/93] added scrolling to projectslist

---
 src/components/BMDashboard/BMDashboard.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/BMDashboard/BMDashboard.css b/src/components/BMDashboard/BMDashboard.css
index 63e31a8611..13a17308e4 100644
--- a/src/components/BMDashboard/BMDashboard.css
+++ b/src/components/BMDashboard/BMDashboard.css
@@ -1,5 +1,6 @@
 .bm-dashboard__header h1{
   font-size: 1.5em;
+
   text-align: center;
   margin-top: 2em;
 }
@@ -21,6 +22,8 @@
 .projects-list{
 width: 80%;
 list-style-type: none;
+max-height: 80vh;
+overflow:scroll;
 }
 
 .project-summary{

From d1d45d53fd53b30583f966d923cd9cec1ed0ef3f Mon Sep 17 00:00:00 2001
From: eduvarjaor <eduardovarjaor@gmail.com>
Date: Fri, 6 Oct 2023 16:39:57 -0300
Subject: [PATCH 75/93] feat: export TeamMembersPopup component and created a
 new unit test for this one

---
 src/__tests__/Teams/TeamMembersPopup.test.js | 38 ++++++++++++++++++++
 src/components/Teams/TeamMembersPopup.jsx    |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 src/__tests__/Teams/TeamMembersPopup.test.js

diff --git a/src/__tests__/Teams/TeamMembersPopup.test.js b/src/__tests__/Teams/TeamMembersPopup.test.js
new file mode 100644
index 0000000000..9d7b5aa874
--- /dev/null
+++ b/src/__tests__/Teams/TeamMembersPopup.test.js
@@ -0,0 +1,38 @@
+import configureStore from 'redux-mock-store';
+import TeamMembersPopup from 'components/Teams/TeamMembersPopup';
+import thunk from 'redux-thunk';
+import { authMock, userProfileMock, rolesMock } from '../../__tests__/mockStates';
+import { render } from '@testing-library/react';
+import { Provider } from 'react-redux';
+
+const mockStore = configureStore([thunk]);
+
+const mockProps = {
+  members: {
+    teamMembers: [],
+  },
+  usersdata: {
+    userProfiles: [],
+  },
+};
+
+const renderComponent = props => {
+  const store = mockStore({
+    auth: authMock,
+    userProfile: userProfileMock,
+    role: rolesMock.role,
+    ...props,
+  });
+
+  render(
+    <Provider store={store}>
+      <TeamMembersPopup {...props} />
+    </Provider>,
+  );
+};
+
+describe('TeamMembersPopup', () => {
+  it('should render correctly', () => {
+    renderComponent(mockProps);
+  });
+});
diff --git a/src/components/Teams/TeamMembersPopup.jsx b/src/components/Teams/TeamMembersPopup.jsx
index 5ae9fcbf45..15ea1b95d1 100644
--- a/src/components/Teams/TeamMembersPopup.jsx
+++ b/src/components/Teams/TeamMembersPopup.jsx
@@ -8,7 +8,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faSort, faSortUp, faSortDown } from '@fortawesome/free-solid-svg-icons';
 import { connect } from 'react-redux';
 
-const TeamMembersPopup = React.memo(props => {
+export const TeamMembersPopup = React.memo(props => {
   const closePopup = () => {
     props.onClose();
     setSortOrder(0)

From 02150bc28fca9fa8afa8d7324f0fc442022b6e7c Mon Sep 17 00:00:00 2001
From: eduvarjaor <eduardovarjaor@gmail.com>
Date: Fri, 6 Oct 2023 17:07:29 -0300
Subject: [PATCH 76/93] test(TeamMembersPopup): should render Add button

---
 src/__tests__/Teams/TeamMembersPopup.test.js | 40 ++++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/__tests__/Teams/TeamMembersPopup.test.js b/src/__tests__/Teams/TeamMembersPopup.test.js
index 9d7b5aa874..4d79b58b6c 100644
--- a/src/__tests__/Teams/TeamMembersPopup.test.js
+++ b/src/__tests__/Teams/TeamMembersPopup.test.js
@@ -2,18 +2,14 @@ import configureStore from 'redux-mock-store';
 import TeamMembersPopup from 'components/Teams/TeamMembersPopup';
 import thunk from 'redux-thunk';
 import { authMock, userProfileMock, rolesMock } from '../../__tests__/mockStates';
-import { render } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import { Provider } from 'react-redux';
 
 const mockStore = configureStore([thunk]);
 
 const mockProps = {
-  members: {
-    teamMembers: [],
-  },
-  usersdata: {
-    userProfiles: [],
-  },
+  members: { teamMembers: [] },
+  usersdata: { userProfiles: [] },
 };
 
 const renderComponent = props => {
@@ -31,8 +27,38 @@ const renderComponent = props => {
   );
 };
 
+const initialState = {
+  open: true,
+  selectedTeamName: 'Test Team',
+  hasPermission: jest.fn(),
+  members: {
+    teamMembers: { toSorted: jest.fn(() => []) },
+  },
+  roles: [{}],
+  auth: {
+    user: {
+      role: 'Owner',
+      permissions: {
+        frontPermissions: ['assignTeamToUsers'],
+      },
+    },
+  },
+  userProfile: { userProfiles: [] },
+  requestorRole: '',
+  userPermissions: [],
+  onClose: jest.fn(),
+  onDeleteClick: jest.fn(),
+};
+
+const usersdata = { userProfiles: [] };
+
 describe('TeamMembersPopup', () => {
   it('should render correctly', () => {
     renderComponent(mockProps);
   });
+
+  it('should render "Add" button', () => {
+    renderComponent({ ...initialState, usersdata });
+    expect(screen.getByRole('button', { name: 'Add' })).toBeInTheDocument();
+  });
 });

From d4b104d05925b7ce94769c6fe0f1849e270f2932 Mon Sep 17 00:00:00 2001
From: eduvarjaor <eduardovarjaor@gmail.com>
Date: Fri, 6 Oct 2023 17:09:49 -0300
Subject: [PATCH 77/93] test(TeamMembersPopup): should render Close button

---
 src/__tests__/Teams/TeamMembersPopup.test.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/__tests__/Teams/TeamMembersPopup.test.js b/src/__tests__/Teams/TeamMembersPopup.test.js
index 4d79b58b6c..0e284495f8 100644
--- a/src/__tests__/Teams/TeamMembersPopup.test.js
+++ b/src/__tests__/Teams/TeamMembersPopup.test.js
@@ -61,4 +61,9 @@ describe('TeamMembersPopup', () => {
     renderComponent({ ...initialState, usersdata });
     expect(screen.getByRole('button', { name: 'Add' })).toBeInTheDocument();
   });
+
+  it('should render "Close" button', () => {
+    renderComponent({ ...initialState, usersdata });
+    expect(screen.getByText('Close')).toBeInTheDocument();
+  });
 });

From 477eac6abbba67404d131faee0ac506310151eb3 Mon Sep 17 00:00:00 2001
From: eduvarjaor <eduardovarjaor@gmail.com>
Date: Fri, 6 Oct 2023 17:14:16 -0300
Subject: [PATCH 78/93] test(TeamMembersPopup): should call closePopup function

---
 src/__tests__/Teams/TeamMembersPopup.test.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/__tests__/Teams/TeamMembersPopup.test.js b/src/__tests__/Teams/TeamMembersPopup.test.js
index 0e284495f8..07b2131791 100644
--- a/src/__tests__/Teams/TeamMembersPopup.test.js
+++ b/src/__tests__/Teams/TeamMembersPopup.test.js
@@ -2,7 +2,7 @@ import configureStore from 'redux-mock-store';
 import TeamMembersPopup from 'components/Teams/TeamMembersPopup';
 import thunk from 'redux-thunk';
 import { authMock, userProfileMock, rolesMock } from '../../__tests__/mockStates';
-import { render, screen } from '@testing-library/react';
+import { render, screen, fireEvent } from '@testing-library/react';
 import { Provider } from 'react-redux';
 
 const mockStore = configureStore([thunk]);
@@ -66,4 +66,10 @@ describe('TeamMembersPopup', () => {
     renderComponent({ ...initialState, usersdata });
     expect(screen.getByText('Close')).toBeInTheDocument();
   });
+
+  it('should call closePopup function', () => {
+    renderComponent({ ...initialState, usersdata });
+    fireEvent.click(screen.getByText('Close'));
+    expect(initialState.onClose).toHaveBeenCalledTimes(1);
+  });
 });

From 96ed5c7a263a36dec458e07ae0a6690b6f35fed5 Mon Sep 17 00:00:00 2001
From: eduvarjaor <eduardovarjaor@gmail.com>
Date: Fri, 6 Oct 2023 17:16:40 -0300
Subject: [PATCH 79/93] test(TeamMembersPopup): displays the team name in the
 modal header

---
 src/__tests__/Teams/TeamMembersPopup.test.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/__tests__/Teams/TeamMembersPopup.test.js b/src/__tests__/Teams/TeamMembersPopup.test.js
index 07b2131791..67361a8bcb 100644
--- a/src/__tests__/Teams/TeamMembersPopup.test.js
+++ b/src/__tests__/Teams/TeamMembersPopup.test.js
@@ -72,4 +72,9 @@ describe('TeamMembersPopup', () => {
     fireEvent.click(screen.getByText('Close'));
     expect(initialState.onClose).toHaveBeenCalledTimes(1);
   });
+
+  it('displays the team name in the modal header', () => {
+    renderComponent({ ...initialState, usersdata });
+    expect(screen.getByText(`Members of ${initialState.selectedTeamName}`)).toBeInTheDocument();
+  });
 });

From f921c1e31404d1df320ebff1e58091558b0956e9 Mon Sep 17 00:00:00 2001
From: Eduardo Horta <eduardohorta@Eduardos-MacBook-Pro.local>
Date: Mon, 9 Oct 2023 14:42:36 -0300
Subject: [PATCH 80/93] removed unused imports, destructured props and changed
 variables from let to const for not being reassigned

---
 .eslintignore                                            | 1 -
 .prettierignore                                          | 1 -
 .../ForcePasswordUpdate/ForcePasswordUpdate.jsx          | 9 ++++-----
 src/components/ForcePasswordUpdate/index.js              | 4 +++-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 78d5b032d1..43f15bf3b2 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -26,7 +26,6 @@ src/components/AutoUpdate/**
 src/components/Badge/**
 src/components/BMDashboard/**
 src/components/common/**
-src/components/ForcePasswordUpdate/**
 src/components/Header/**
 src/components/Inventory/**
 src/components/Login/**
diff --git a/.prettierignore b/.prettierignore
index aafd214ca1..b35cf82812 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -22,7 +22,6 @@ src/components/AutoReload/**
 src/components/AutoUpdate/**
 src/components/Badge/**
 src/components/common/**
-src/components/ForcePasswordUpdate/**
 src/components/Header/**
 src/components/Inventory/**
 src/components/Login/**
diff --git a/src/components/ForcePasswordUpdate/ForcePasswordUpdate.jsx b/src/components/ForcePasswordUpdate/ForcePasswordUpdate.jsx
index 881d1d9607..f26033f6ea 100644
--- a/src/components/ForcePasswordUpdate/ForcePasswordUpdate.jsx
+++ b/src/components/ForcePasswordUpdate/ForcePasswordUpdate.jsx
@@ -1,11 +1,10 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router-dom';
+import Joi from 'joi';
+import { toast } from 'react-toastify';
 import { forcePasswordUpdate } from '../../actions/updatePassword';
 import { clearErrors } from '../../actions/errorsActions';
 import Form from '../common/Form';
-import Joi from 'joi';
-import { toast } from 'react-toastify';
 
 export class ForcePasswordUpdate extends Form {
   state = {
@@ -59,8 +58,8 @@ export class ForcePasswordUpdate extends Form {
       return;
     }
 
-    let userId = this.props.match.params.userId;
-    let data = { userId, newpassword };
+    const { userId } = this.props.match.params;
+    const data = { userId, newpassword };
     const status = await this.props.forcePasswordUpdate(data);
     if (status === 200) {
       toast.success(
diff --git a/src/components/ForcePasswordUpdate/index.js b/src/components/ForcePasswordUpdate/index.js
index 86661e5541..e61ddb62ce 100644
--- a/src/components/ForcePasswordUpdate/index.js
+++ b/src/components/ForcePasswordUpdate/index.js
@@ -1 +1,3 @@
-export { default } from './ForcePasswordUpdate';
+import ForcePasswordUpdate from './ForcePasswordUpdate';
+
+export default ForcePasswordUpdate;

From a8c55f0e60171fdf74c3e7f88053bcb7b53d8950 Mon Sep 17 00:00:00 2001
From: Vishala Ramasamy <vishala.ramasamy@gmail.com>
Date: Tue, 10 Oct 2023 13:59:37 -0700
Subject: [PATCH 81/93] Timelog_React_warning_key_prop

---
 src/components/Timelog/Timelog.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Timelog/Timelog.jsx b/src/components/Timelog/Timelog.jsx
index 74fb5a8fd7..1be01d80fb 100644
--- a/src/components/Timelog/Timelog.jsx
+++ b/src/components/Timelog/Timelog.jsx
@@ -277,10 +277,11 @@ const Timelog = props => {
     }
   };
 
+
   const buildOptions = async () => {
     //build options for the project and task
     let projects = [];
-    if (!isEmpty(userProjects.projects)) {
+    if (!isEmpty(userProjects.projects) && !((userProjects?.projects?.length == 1 && userProjects?.projects[0]?.projectId == undefined))) {
       projects = userProjects.projects;
     }
     const options = projects.map(project => (

From 5dca72c34bfdcb2b1b3df685cf8b12c3ed410175 Mon Sep 17 00:00:00 2001
From: Vishala Ramasamy <vishala.ramasamy@gmail.com>
Date: Tue, 10 Oct 2023 14:14:47 -0700
Subject: [PATCH 82/93] Timelog_React_warning_key_prop_projectIDCheck

---
 src/components/Timelog/Timelog.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Timelog/Timelog.jsx b/src/components/Timelog/Timelog.jsx
index 1be01d80fb..0e0eadd8d0 100644
--- a/src/components/Timelog/Timelog.jsx
+++ b/src/components/Timelog/Timelog.jsx
@@ -281,10 +281,11 @@ const Timelog = props => {
   const buildOptions = async () => {
     //build options for the project and task
     let projects = [];
-    if (!isEmpty(userProjects.projects) && !((userProjects?.projects?.length == 1 && userProjects?.projects[0]?.projectId == undefined))) {
+    if (!isEmpty(userProjects.projects)) {
       projects = userProjects.projects;
     }
     const options = projects.map(project => (
+      (project?.projectId != undefined) &&
       <option value={project.projectId} key={project.projectId}>
         {' '}
         {project.projectName}{' '}

From 96654a9adc6b83fc572c0b98f5148ab935b92938 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Wed, 11 Oct 2023 14:17:43 -0400
Subject: [PATCH 83/93] removed consolelogs

---
 src/components/BMDashboard/Projects/ProjectSelectForm.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/BMDashboard/Projects/ProjectSelectForm.jsx b/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
index 11fe01a4ef..636c019642 100644
--- a/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
+++ b/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
@@ -15,14 +15,12 @@ const ProjectSelectForm = ({ projects }) => {
   });
 
   const handleOptionChange = event => {
-    console.log('option change', event.target.value);
     setSelectedProjectId(event.target.value);
   };
 
   const handleButtonClick = () => {
     if (selectedProjectId) {
       //navigate to a new page with information about the selected project
-      console.log('selectedProjectId', selectedProjectId);
       history.push(`/bmdashboard/projects/${selectedProjectId}`);
     } else {
       alert('Please select an option first');

From e87f0b19d8807a3c91a18377ff4cd846ac49c0ad Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Wed, 11 Oct 2023 14:42:15 -0400
Subject: [PATCH 84/93] fixed centering in rows

---
 .../BMDashboard/ProjectDetails/ProjectDetails.jsx      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
index 5992a20c11..909e097b74 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
+++ b/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
@@ -9,11 +9,13 @@ import './ProjectDetails.css';
 function ProjectDetails() {
   return (
     <Container className="project-details" fluid>
-      <h1>Project A Dashboard</h1>
-      <Row>
+      <Row className="mx-auto">
+        <h1>Project A Dashboard</h1>
+      </Row>
+      <Row className="mx-auto">
         <LogBar />
       </Row>
-      <Row>
+      <Row className="mx-auto">
         <Col lg="6" md="12">
           <RentedToolsDisplay />
         </Col>
@@ -21,7 +23,7 @@ function ProjectDetails() {
           <MaterialsDisplay />
         </Col>
       </Row>
-      <Row>
+      <Row className="mx-auto">
         <ProjectLog />
       </Row>
     </Container>

From 04c8b4a2c819ee8af4a07bfed4e13bebffb7301e Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Wed, 11 Oct 2023 14:51:25 -0400
Subject: [PATCH 85/93] fixed centering of select element

---
 src/components/BMDashboard/Projects/ProjectSelectForm.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/BMDashboard/Projects/ProjectSelectForm.jsx b/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
index 636c019642..a846e3eda4 100644
--- a/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
+++ b/src/components/BMDashboard/Projects/ProjectSelectForm.jsx
@@ -29,7 +29,7 @@ const ProjectSelectForm = ({ projects }) => {
 
   return (
     <Form className="w-100 p-3  text-center">
-      <Row className="ml-0 gx-5 w-75" md="2" sm="1" xs="1">
+      <Row className="ml-0 gx-5 w-75 mx-auto" md="2" sm="1" xs="1">
         <FormGroup>
           <Col className="p-3">
             <Label for="projectSelect" hidden>

From 596ca22a60f6d52798d863bb4c3a98ee6c606bc6 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Thu, 12 Oct 2023 11:29:40 -0400
Subject: [PATCH 86/93] fixed component structure and routes after latest merge
 with development

---
 .../BMDashboard/Projects/ProjectDetails.jsx        | 14 --------------
 .../{ => Projects}/ProjectDetails/LogBar.jsx       |  0
 .../ProjectDetails/Materials/MaterialCard.jsx      |  0
 .../ProjectDetails/Materials/Materials.jsx         |  0
 .../ProjectDetails/Materials/MaterialsDisplay.jsx  |  0
 .../ProjectDetails/ProjectDetails.css              |  0
 .../ProjectDetails/ProjectDetails.jsx              |  6 +++++-
 .../{ => Projects}/ProjectDetails/ProjectLog.jsx   |  0
 .../RentedTools/RentedToolsDisplay.jsx             |  0
 .../ProjectDetails/RentedTools/ToolCard.jsx        |  0
 .../ProjectDetails/RentedTools/ToolCards.jsx       |  0
 src/routes.js                                      |  2 +-
 12 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 src/components/BMDashboard/Projects/ProjectDetails.jsx
 rename src/components/BMDashboard/{ => Projects}/ProjectDetails/LogBar.jsx (100%)
 rename src/components/BMDashboard/{ => Projects}/ProjectDetails/Materials/MaterialCard.jsx (100%)
 rename src/components/BMDashboard/{ => Projects}/ProjectDetails/Materials/Materials.jsx (100%)
 rename src/components/BMDashboard/{ => Projects}/ProjectDetails/Materials/MaterialsDisplay.jsx (100%)
 rename src/components/BMDashboard/{ => Projects}/ProjectDetails/ProjectDetails.css (100%)
 rename src/components/BMDashboard/{ => Projects}/ProjectDetails/ProjectDetails.jsx (86%)
 rename src/components/BMDashboard/{ => Projects}/ProjectDetails/ProjectLog.jsx (100%)
 rename src/components/BMDashboard/{ => Projects}/ProjectDetails/RentedTools/RentedToolsDisplay.jsx (100%)
 rename src/components/BMDashboard/{ => Projects}/ProjectDetails/RentedTools/ToolCard.jsx (100%)
 rename src/components/BMDashboard/{ => Projects}/ProjectDetails/RentedTools/ToolCards.jsx (100%)

diff --git a/src/components/BMDashboard/Projects/ProjectDetails.jsx b/src/components/BMDashboard/Projects/ProjectDetails.jsx
deleted file mode 100644
index 0d9eb075c9..0000000000
--- a/src/components/BMDashboard/Projects/ProjectDetails.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-import { useParams } from 'react-router-dom';
-
-const ProjectDetails = () => {
-  const { projectId } = useParams();
-
-  return (
-    <div style={{ textAlign: 'center', marginTop: '5em' }}>
-      Welcome to Project #{projectId} Details Page
-    </div>
-  );
-};
-
-export default ProjectDetails;
diff --git a/src/components/BMDashboard/ProjectDetails/LogBar.jsx b/src/components/BMDashboard/Projects/ProjectDetails/LogBar.jsx
similarity index 100%
rename from src/components/BMDashboard/ProjectDetails/LogBar.jsx
rename to src/components/BMDashboard/Projects/ProjectDetails/LogBar.jsx
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx b/src/components/BMDashboard/Projects/ProjectDetails/Materials/MaterialCard.jsx
similarity index 100%
rename from src/components/BMDashboard/ProjectDetails/Materials/MaterialCard.jsx
rename to src/components/BMDashboard/Projects/ProjectDetails/Materials/MaterialCard.jsx
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx b/src/components/BMDashboard/Projects/ProjectDetails/Materials/Materials.jsx
similarity index 100%
rename from src/components/BMDashboard/ProjectDetails/Materials/Materials.jsx
rename to src/components/BMDashboard/Projects/ProjectDetails/Materials/Materials.jsx
diff --git a/src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx b/src/components/BMDashboard/Projects/ProjectDetails/Materials/MaterialsDisplay.jsx
similarity index 100%
rename from src/components/BMDashboard/ProjectDetails/Materials/MaterialsDisplay.jsx
rename to src/components/BMDashboard/Projects/ProjectDetails/Materials/MaterialsDisplay.jsx
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.css b/src/components/BMDashboard/Projects/ProjectDetails/ProjectDetails.css
similarity index 100%
rename from src/components/BMDashboard/ProjectDetails/ProjectDetails.css
rename to src/components/BMDashboard/Projects/ProjectDetails/ProjectDetails.css
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx b/src/components/BMDashboard/Projects/ProjectDetails/ProjectDetails.jsx
similarity index 86%
rename from src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
rename to src/components/BMDashboard/Projects/ProjectDetails/ProjectDetails.jsx
index 909e097b74..0874cb9578 100644
--- a/src/components/BMDashboard/ProjectDetails/ProjectDetails.jsx
+++ b/src/components/BMDashboard/Projects/ProjectDetails/ProjectDetails.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { useParams } from 'react-router-dom';
 import { Container, Row, Col } from 'reactstrap';
 import LogBar from './LogBar';
 import RentedToolsDisplay from './RentedTools/RentedToolsDisplay';
@@ -7,10 +8,13 @@ import ProjectLog from './ProjectLog';
 import './ProjectDetails.css';
 
 function ProjectDetails() {
+
+  const { projectId } = useParams();
+  
   return (
     <Container className="project-details" fluid>
       <Row className="mx-auto">
-        <h1>Project A Dashboard</h1>
+        <h1>Project {projectId} Dashboard</h1>
       </Row>
       <Row className="mx-auto">
         <LogBar />
diff --git a/src/components/BMDashboard/ProjectDetails/ProjectLog.jsx b/src/components/BMDashboard/Projects/ProjectDetails/ProjectLog.jsx
similarity index 100%
rename from src/components/BMDashboard/ProjectDetails/ProjectLog.jsx
rename to src/components/BMDashboard/Projects/ProjectDetails/ProjectLog.jsx
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx b/src/components/BMDashboard/Projects/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
similarity index 100%
rename from src/components/BMDashboard/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
rename to src/components/BMDashboard/Projects/ProjectDetails/RentedTools/RentedToolsDisplay.jsx
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx b/src/components/BMDashboard/Projects/ProjectDetails/RentedTools/ToolCard.jsx
similarity index 100%
rename from src/components/BMDashboard/ProjectDetails/RentedTools/ToolCard.jsx
rename to src/components/BMDashboard/Projects/ProjectDetails/RentedTools/ToolCard.jsx
diff --git a/src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx b/src/components/BMDashboard/Projects/ProjectDetails/RentedTools/ToolCards.jsx
similarity index 100%
rename from src/components/BMDashboard/ProjectDetails/RentedTools/ToolCards.jsx
rename to src/components/BMDashboard/Projects/ProjectDetails/RentedTools/ToolCards.jsx
diff --git a/src/routes.js b/src/routes.js
index 8a1b7bc021..2e09d2fa2e 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -44,7 +44,7 @@ import SetupProfile from 'components/SetupProfile/SetupProfile';
 import BMProtectedRoute from 'components/common/BMDashboard/BMProtectedRoute';
 import BMDashboard from 'components/BMDashboard';
 import BMLogin from 'components/BMDashboard/Login';
-import ProjectDetails from 'components/BMDashboard/Projects/ProjectDetails';
+import ProjectDetails from 'components/BMDashboard/Projects/ProjectDetails/ProjectDetails';
 
 export default (
   <>

From c7d2b381b3042701a2521efe2106683563df44b4 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Thu, 12 Oct 2023 11:51:21 -0400
Subject: [PATCH 87/93] fixed styling of projects-list and project-summary

---
 src/components/BMDashboard/BMDashboard.css            | 11 +++++++++--
 .../BMDashboard/Projects/ProjectSummary.jsx           |  8 +++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/BMDashboard/BMDashboard.css b/src/components/BMDashboard/BMDashboard.css
index 13a17308e4..b7c4f0e306 100644
--- a/src/components/BMDashboard/BMDashboard.css
+++ b/src/components/BMDashboard/BMDashboard.css
@@ -23,19 +23,26 @@
 width: 80%;
 list-style-type: none;
 max-height: 80vh;
-overflow:scroll;
+overflow-x: hidden;
+overflow-y: auto;
 }
 
 .project-summary{
   background-color: #e8f4f9;
-  height: 20vh;
+  min-height: 20vh;
+  height: auto;
   margin-bottom: 2em;
   padding: 1em;
   border-radius: 5px;
 }
 
+.project-summary p{
+  margin: 0;
+}
+
 .project-summary_header{
   font-size: 0.9em;
+  font-weight: bold;
 }
 
 @media (min-width: 650px){
diff --git a/src/components/BMDashboard/Projects/ProjectSummary.jsx b/src/components/BMDashboard/Projects/ProjectSummary.jsx
index b8cc5cb398..9ecdabd6a9 100644
--- a/src/components/BMDashboard/Projects/ProjectSummary.jsx
+++ b/src/components/BMDashboard/Projects/ProjectSummary.jsx
@@ -2,10 +2,12 @@ import React from 'react';
 
 const ProjectSummary = ({ project }) => {
   return (
-    <div>
+    <>
       <h2 className="project-summary_header">{project.projectName} summary</h2>
-      <p>Details of project summary TBD</p>
-    </div>
+      <p>
+        Details of project summary TBD. 
+      </p>
+    </>
   );
 };
 

From e1c4da978e2cc6e09498a2fad070a889e1fb5b4a Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Thu, 12 Oct 2023 13:48:45 -0400
Subject: [PATCH 88/93] adjusted fontsize in projectsummary to be responsive

---
 src/components/BMDashboard/BMDashboard.css | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/BMDashboard/BMDashboard.css b/src/components/BMDashboard/BMDashboard.css
index b7c4f0e306..a2d0829663 100644
--- a/src/components/BMDashboard/BMDashboard.css
+++ b/src/components/BMDashboard/BMDashboard.css
@@ -1,6 +1,5 @@
 .bm-dashboard__header h1{
   font-size: 1.5em;
-
   text-align: center;
   margin-top: 2em;
 }
@@ -38,10 +37,11 @@ overflow-y: auto;
 
 .project-summary p{
   margin: 0;
+  font-size: 0.9em;
 }
 
 .project-summary_header{
-  font-size: 0.9em;
+  font-size: 1em;
   font-weight: bold;
 }
 
@@ -49,4 +49,7 @@ overflow-y: auto;
   .project-summary_header{
   font-size: 1.3em;  
 }
+.project-summary p{ 
+  font-size: 1em;
+}
 }
\ No newline at end of file

From 8586573e208546b3ee54278a50369d2e85da4fc6 Mon Sep 17 00:00:00 2001
From: Olga Yudkin <cvtqx@protonmail.com>
Date: Thu, 12 Oct 2023 14:01:12 -0400
Subject: [PATCH 89/93] added clamp()

---
 src/components/BMDashboard/BMDashboard.css | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/components/BMDashboard/BMDashboard.css b/src/components/BMDashboard/BMDashboard.css
index a2d0829663..2e656b4125 100644
--- a/src/components/BMDashboard/BMDashboard.css
+++ b/src/components/BMDashboard/BMDashboard.css
@@ -35,21 +35,13 @@ overflow-y: auto;
   border-radius: 5px;
 }
 
-.project-summary p{
-  margin: 0;
-  font-size: 0.9em;
-}
-
 .project-summary_header{
-  font-size: 1em;
+  font-size: clamp(1em, 3vw, 1.3em);
   font-weight: bold;
 }
 
-@media (min-width: 650px){
-  .project-summary_header{
-  font-size: 1.3em;  
-}
-.project-summary p{ 
-  font-size: 1em;
+.project-summary p{
+  margin: 0;
+  font-size: clamp(0.9em, 2.5vw, 1em);
 }
-}
\ No newline at end of file
+

From 05b7786f6de20ba8145879ce18a7552d0a1f4160 Mon Sep 17 00:00:00 2001
From: Vishala Ramasamy <vishala.ramasamy@gmail.com>
Date: Thu, 12 Oct 2023 12:23:03 -0700
Subject: [PATCH 90/93] added fetch calls for teams and projects

---
 src/components/UserProfile/UserProfile.jsx | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/components/UserProfile/UserProfile.jsx b/src/components/UserProfile/UserProfile.jsx
index ae6cd4bc28..3a8dc1349c 100644
--- a/src/components/UserProfile/UserProfile.jsx
+++ b/src/components/UserProfile/UserProfile.jsx
@@ -50,8 +50,10 @@ import { UserStatus } from '../../utils/enums';
 import BlueSquareLayout from './BlueSquareLayout';
 import TeamWeeklySummaries from './TeamWeeklySummaries/TeamWeeklySummaries';
 import { boxStyle } from 'styles';
-import { connect } from 'react-redux';
+import { connect, useDispatch } from 'react-redux';
 import { formatDate } from 'utils/formatDate';
+import { fetchAllProjects } from '../../actions/projects';
+import { getAllUserTeams } from '../../actions/allTeamsAction';
 
 function UserProfile(props) {
   /* Constant values */
@@ -61,6 +63,7 @@ function UserProfile(props) {
     email: true,
   };
   const roles = props?.role.roles;
+  const dispatch = useDispatch();
 
   /* Hooks */
   const [showLoading, setShowLoading] = useState(true);
@@ -103,9 +106,10 @@ function UserProfile(props) {
   const [userEndDate, setUserEndDate] = useState('');
 
   /* useEffect functions */
-
   useEffect(() => {
     loadUserProfile();
+    dispatch(fetchAllProjects());
+    dispatch(getAllUserTeams());
   }, []);
 
   useEffect(() => {
@@ -446,7 +450,7 @@ function UserProfile(props) {
     setShowModal(false);
     setUserProfile({
       ...userProfile,
-      mediaUrl:mediaUrlUpdate !== undefined ? mediaUrlUpdate : userProfile.mediaUrl,
+      mediaUrl: mediaUrlUpdate !== undefined ? mediaUrlUpdate : userProfile.mediaUrl,
       personalLinks: personalLinksUpdate,
       adminLinks: adminLinksUpdate,
     });
@@ -556,8 +560,8 @@ function UserProfile(props) {
   const canEditUserProfile = targetIsDevAdminUneditable
     ? false
     : userProfile.role === 'Owner'
-    ? canAddDeleteEditOwners
-    : canPutUserProfile;
+      ? canAddDeleteEditOwners
+      : canPutUserProfile;
 
   const canEdit = canEditUserProfile || isUserSelf;
 
@@ -646,7 +650,7 @@ function UserProfile(props) {
                 Please click on &quot;Save changes&quot; to save the changes you have made.{' '}
               </Alert>
             ) : null}
-              {!codeValid ? (
+            {!codeValid ? (
               <Alert color="danger">
                 The code format should be A-AAA or AAAAA.
               </Alert>
@@ -954,8 +958,8 @@ function UserProfile(props) {
                             if (selfIsDevAdminUneditable) {
                               alert(
                                 'STOP! YOU SHOULDN’T BE TRYING TO CHANGE THIS PASSWORD. ' +
-                                  'You shouldn’t even be using this account except to create your own accounts to use. ' +
-                                  'Please re-read the Local Setup Doc to understand why and what you should be doing instead of what you are trying to do now.',
+                                'You shouldn’t even be using this account except to create your own accounts to use. ' +
+                                'Please re-read the Local Setup Doc to understand why and what you should be doing instead of what you are trying to do now.',
                               );
                               return `#`;
                             }
@@ -1247,8 +1251,8 @@ function UserProfile(props) {
                     if (selfIsDevAdminUneditable) {
                       alert(
                         'STOP! YOU SHOULDN’T BE TRYING TO CHANGE THIS PASSWORD. ' +
-                          'You shouldn’t even be using this account except to create your own accounts to use. ' +
-                          'Please re-read the Local Setup Doc to understand why and what you should be doing instead of what you are trying to do now.',
+                        'You shouldn’t even be using this account except to create your own accounts to use. ' +
+                        'Please re-read the Local Setup Doc to understand why and what you should be doing instead of what you are trying to do now.',
                       );
                       return `#`;
                     }

From 82566816e65977b472693f6ff17d06fa5e789b4e Mon Sep 17 00:00:00 2001
From: Aaron Persaud <aaronpersaud@hotmail.com>
Date: Fri, 13 Oct 2023 01:02:33 -0400
Subject: [PATCH 91/93] change console warns to errors and turn off warning for
 alert

---
 .eslintrc.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.eslintrc.js b/.eslintrc.js
index 66841826e1..2766afb89a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -50,6 +50,8 @@ module.exports = {
     'react/react-in-jsx-scope': 'off',
     'import/no-duplicates': 'off',
     'import/no-named-as-default': 'off',
+    'no-alert': 'off',
+    'no-console': 'error',
   },
   overrides: [
     {

From 9f4758af903e681fe72565630b5925ab5141c44f Mon Sep 17 00:00:00 2001
From: Nathan Hoffman <nathanahoffman@gmail.com>
Date: Fri, 13 Oct 2023 12:36:18 -0700
Subject: [PATCH 92/93] Removed stray print statement

---
 src/components/PermissionsManagement/RolePermissions.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/PermissionsManagement/RolePermissions.jsx b/src/components/PermissionsManagement/RolePermissions.jsx
index 1cacea3764..20caa1ea3d 100644
--- a/src/components/PermissionsManagement/RolePermissions.jsx
+++ b/src/components/PermissionsManagement/RolePermissions.jsx
@@ -147,7 +147,6 @@ function RolePermissions(props) {
 
   useEffect(() => {
     setPermissions(mapPermissionToLabel(props.permissions));
-    console.log('updated');
   }, [props.roles]);
 
   const toggleDeleteRoleModal = () => {

From dd0435dd1f8781b9d34deec00c5b05920c57497b Mon Sep 17 00:00:00 2001
From: Aaron Persaud <aaronpersaud@hotmail.com>
Date: Mon, 16 Oct 2023 02:01:17 -0400
Subject: [PATCH 93/93] change no-alert to error and remove unused alert

---
 .eslintrc.js                                               | 2 +-
 src/components/ForcePasswordUpdate/ForcePasswordUpdate.jsx | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 2766afb89a..e073d2f2bd 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -50,7 +50,7 @@ module.exports = {
     'react/react-in-jsx-scope': 'off',
     'import/no-duplicates': 'off',
     'import/no-named-as-default': 'off',
-    'no-alert': 'off',
+    'no-alert': 'error',
     'no-console': 'error',
   },
   overrides: [
diff --git a/src/components/ForcePasswordUpdate/ForcePasswordUpdate.jsx b/src/components/ForcePasswordUpdate/ForcePasswordUpdate.jsx
index f26033f6ea..f8895a91bf 100644
--- a/src/components/ForcePasswordUpdate/ForcePasswordUpdate.jsx
+++ b/src/components/ForcePasswordUpdate/ForcePasswordUpdate.jsx
@@ -49,15 +49,10 @@ export class ForcePasswordUpdate extends Form {
   };
 
   doSubmit = async () => {
-    const { newpassword, confirmnewpassword } = {
+    const { newpassword } = {
       ...this.state.data,
     };
 
-    if (newpassword !== confirmnewpassword) {
-      alert('Confirm Password must match New Password');
-      return;
-    }
-
     const { userId } = this.props.match.params;
     const data = { userId, newpassword };
     const status = await this.props.forcePasswordUpdate(data);