Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W

src/pages/Gallary/ImageGallary.jsx

@@ -175,7 +175,6 @@ const ImageGallery = () => {
       });
     });
     return Array.from(uniqueUsersMap.entries()).sort((a, b) => a[1].localeCompare(b[1]));
-    return Array.from(uniqueUsersMap.entries()).sort((a, b) => a[1].localeCompare(b[1]));
   }, [allImagesData]);
 
   const buildings = getUniqueValuesWithIds("buildingId", "buildingName");
@@ -322,7 +321,6 @@ const ImageGallery = () => {
               <DateRangePicker
                 onRangeChange={setDateRange}
                 endDateMode="today"
-                endDateMode="today"
                 startDate={selectedFilters.startDate}
                 endDate={selectedFilters.endDate}
               />

src/pages/project/ProjectDetails.jsx

@@ -81,22 +81,9 @@ const ProjectDetails = () => {
     switch (activePill) {
       case "profile": {
         return (
-          <>
+          <div className="row">
-            <div className="row ">
+            <div className="col-xl-4 col-lg-5 col-md-5 mt-5">
-              <div className="col-lg-4 col-md-5 mt-5">
+              <AboutProject ></AboutProject>
-                {/* About User */}
-                <AboutProject data={projectDetails}></AboutProject>
-                <ProjectOverview project={projectId} />
-                {/* About User */}
-              </div>
-              <div className="col-lg-8 col-md-5  mt-5">
-                {/* Profile Overview */}
-                <ProjectProgressChart
-                  ShowAllProject="false"
-                  DefaultRange="1M"
-                />
-                {/* Profile Overview */}
-              </div>
             </div>
             <div className="col-xl-4 col-lg-5 col-md-5  mt-5">
               <ProjectOverview project={projectId} />
@@ -136,8 +123,8 @@ const ProjectDetails = () => {
       }
       case "directory": {
         return (
-          <div className="row mt-2">
+          <div className="row">
-            <Directory IsPage={false} prefernceContacts={projectDetails.id} />
+            <Directory IsPage={false} prefernceContacts={projects_Details.id} />
           </div>
         );
       }
@@ -177,7 +164,7 @@ const ProjectDetails = () => {
           ]}
         ></Breadcrumb>
 
-        <div className="row ">
+        <div className="row">
           {projectLoading && <p>Loading....</p>}
           {/* {!projectLoading && project && (
             <ProjectBanner project_data={project}></ProjectBanner>