From 47bbb3868392ab86422772375e8957753ad84014 Mon Sep 17 00:00:00 2001
From: Vaibhav Surve <vaibhav.surve@marcoaiot.com>
Date: Tue, 15 Apr 2025 18:07:47 +0530
Subject: [PATCH 1/2] refactor: clean up AboutProject component by removing
 unused contact fields

---
 src/components/Project/AboutProject.jsx | 29 +++++++++++++------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/components/Project/AboutProject.jsx b/src/components/Project/AboutProject.jsx
index 66290edf..afd54971 100644
--- a/src/components/Project/AboutProject.jsx
+++ b/src/components/Project/AboutProject.jsx
@@ -36,29 +36,30 @@ const AboutProject = ({ data }) => {
                 <span className="fw-medium mx-2">Status:</span>{" "}
                 <span>{ProjectStatus(data.projectStatusId)}</span>
               </li>
-            </ul>
-            <small className="card-text text-uppercase text-muted small">
-              Contacts
-            </small>
-            <ul className="list-unstyled my-3 py-1">
               <li className="d-flex align-items-center mb-4">
                 <i className="bx bx-user"></i>
                 <span className="fw-medium mx-2">Contact:</span>{" "}
                 <span>{data.contactPerson}</span>
               </li>
-              <li className="d-flex align-items-center mb-4">
-                <i className="bx bx-phone"></i>
-                <span className="fw-medium mx-2">Contact Number:</span>{" "}
-                <span>NA</span>
-              </li>
-              <li className="d-flex align-items-center mb-4">
-                <i className="bx bx-envelope"></i>
-                <span className="fw-medium mx-2">Email:</span> <span>NA</span>
-              </li>
               <li className="d-flex align-items-center mb-4">
                 <i className="bx bx-flag"></i>
                 <span className="fw-medium mx-2">Address:</span>{" "}
               </li>
+            </ul>
+            {/* <small className="card-text text-uppercase text-muted small">
+              Contacts
+            </small> */}
+            <ul className="list-unstyled my-3 py-1">
+             
+              {/* <li className="d-flex align-items-center mb-4">
+                <i className="bx bx-phone"></i>
+                <span className="fw-medium mx-2">Contact Number:</span>{" "}
+                <span>NA</span>
+              </li> */}
+              {/* <li className="d-flex align-items-center mb-4">
+                <i className="bx bx-envelope"></i>
+                <span className="fw-medium mx-2">Email:</span> <span>NA</span>
+              </li> */}          
               <li className="d-flex align-items-start test-start mb-4">
                 <span>{data.projectAddress}</span>
               </li>
-- 
2.43.0


From 8b8a518b12639d7ad3cb80ab1c69b02d75c749e1 Mon Sep 17 00:00:00 2001
From: Vaibhav Surve <vaibhav.surve@marcoaiot.com>
Date: Tue, 15 Apr 2025 18:10:17 +0530
Subject: [PATCH 2/2] replased nav naming and removed duplicate data

---
 src/components/Project/ProjectBanner.jsx | 56 +++++++-----------------
 src/components/Project/ProjectNav.jsx    | 10 ++---
 2 files changed, 20 insertions(+), 46 deletions(-)

diff --git a/src/components/Project/ProjectBanner.jsx b/src/components/Project/ProjectBanner.jsx
index e075b3a7..466c5854 100644
--- a/src/components/Project/ProjectBanner.jsx
+++ b/src/components/Project/ProjectBanner.jsx
@@ -76,59 +76,33 @@ const ProjectBanner = ( {project_data} ) =>
             onClose={handleClose}
           ></ManageProjectInfo>
       </div>
-      {/* -------------------- */}
+      {/* Project Banner */}
       <div className="col-12">
         <div className="card mb-6 pb-0">
-          <div className="user-profile-header d-flex flex-column flex-lg-row text-sm-start text-center mb-2 ">
-            <div className="flex-shrink-0 mt-1 mx-sm-0 px-2  mx-auto">
-            
+          <div className="d-flex align-items-center justify-content-between p-4 flex-wrap">
+            {/* Left: Icon + Name */}
+            <div className="d-flex align-items-center gap-3">
               <img
                 src="../../assets/icons/civil-engineering.svg"
                 alt="user image"
-                className="d-block h-auto ms-0 ms-sm-6 rounded-3 user-profile-img project-banner-icon"
-              ></img>
+                className="rounded-3"
+                style={{ width: "60px", height: "60px" }}
+              />
+              <h4 className="mb-0">
+                {CurrentProject.name ? CurrentProject.name : "N/A"}
+              </h4>
             </div>
-            <div className="flex-grow-1 mt-1 mt-lg-1">
-              <div className="d-flex align-items-md-end align-items-sm-start align-items-center justify-content-md-between justify-content-start mx-5 flex-md-row flex-column gap-4">
-                <div className="user-profile-info">
-                  <h4 className="mb-2 mt-lg-1">
-                    {CurrentProject.name ? CurrentProject.name : "N/A"}
-                  </h4>
-                  <h6 className="mb-1 mt-lg-1">
-                    Address:{" "}
-                    {CurrentProject.projectAddress ? CurrentProject.projectAddress : "N/A"}
-                  </h6>
-                  <h6 className="mb-1 mt-lg-1">
-                    Contact:{" "}
-                    {CurrentProject.contactPerson ? CurrentProject.contactPerson : "N/A"}
-                  </h6>
-                  <h6 className="mb-1 mt-lg-1">
-                    <span>
-                      {" "}
-                      Start Date:{" "}
-                      {CurrentProject.startDate
-                                         ? moment(CurrentProject.startDate).format("DD-MMM-YYYY")
-                                         : "N/A"}
-                    </span>
-                    <span className="ms-5">
-                      End Date:{" "}
-                      {CurrentProject.endDate
-                                         ? moment(CurrentProject.endDate).format("DD-MMM-YYYY")
-                                         : "N/A"}
-                    </span>
-                  </h6>
-                </div>
-                <button
+            {manageProject && (
+              <button
                   type="button"
                   className={`btn btn-sm btn-primary ${!manageProject && 'd-none'}`}
                   data-bs-toggle="modal"
                   data-bs-target="#edit-project-modal"
                   onClick={handleShow}
                 >
-                  Modify
-                </button>
-              </div>
-            </div>
+                Modify
+              </button>
+            )}
           </div>
         </div>
       </div>
diff --git a/src/components/Project/ProjectNav.jsx b/src/components/Project/ProjectNav.jsx
index 25b55a4b..5516c464 100644
--- a/src/components/Project/ProjectNav.jsx
+++ b/src/components/Project/ProjectNav.jsx
@@ -47,7 +47,7 @@ const ProjectNav = ( {onPillClick, activePill} ) =>
               <i className="bx bx-grid-alt bx-sm me-1_5"></i> Infrastructure
             </a>
           </li>
-          <li className="nav-item">
+          {/* <li className="nav-item">
             <a
               className={`nav-link ${
                 activePill === "workplan" ? "active" : ""
@@ -60,7 +60,7 @@ const ProjectNav = ( {onPillClick, activePill} ) =>
             >
               <i className="bx bx-link bx-sm me-1_5"></i> Work Plan
             </a>
-          </li>
+          </li> */}
           <li className="nav-item">
             <a
               className={`nav-link ${
@@ -78,15 +78,15 @@ const ProjectNav = ( {onPillClick, activePill} ) =>
           <li className="nav-item">
             <a
               className={`nav-link ${
-                activePill === "activities" ? "active" : ""
+                activePill === "directory" ? "active" : ""
               }`}
               href="#"
               onClick={(e) => {
                 e.preventDefault(); // Prevent page reload
-                onPillClick("activities");
+                onPillClick("directory");
               }}
             >
-              <i className="bx bx-link bx-sm me-1_5"></i> Activities
+              <i className="bx bx-link bx-sm me-1_5"></i> Directory
             </a>
           </li>
         </ul>
-- 
2.43.0