From 67b694c6976243bdb0ac6cbca488530ca9500812 Mon Sep 17 00:00:00 2001
From: Kartik sharma <kartik.sharma@marcoaiot.com>
Date: Sat, 28 Jun 2025 15:06:54 +0530
Subject: [PATCH 1/5] =?UTF-8?q?"Search=20field=20height=20mismatch=20in=20?=
 =?UTF-8?q?Directory=20=E2=80=93=20should=20match=20Card=20and=20List=20vi?=
 =?UTF-8?q?ew=20height"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Directory/DirectoryPageHeader.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Directory/DirectoryPageHeader.jsx b/src/pages/Directory/DirectoryPageHeader.jsx
index 015b5d1b..6f4270a8 100644
--- a/src/pages/Directory/DirectoryPageHeader.jsx
+++ b/src/pages/Directory/DirectoryPageHeader.jsx
@@ -284,7 +284,7 @@ const DirectoryPageHeader = ({
             placeholder={viewType === "notes" ? "Search Notes..." : "Search Contact..."}
             value={searchText}
             onChange={(e) => setSearchText(e.target.value)}
-            style={{ width: "200px" }}
+            style={{ width: "200px",height: "30px" }}
           />
 
           {/* Filter by funnel icon for Notes view */}

From 48d1592b8ceb8a34e242146f4493043d938414f0 Mon Sep 17 00:00:00 2001
From: Kartik sharma <kartik.sharma@marcoaiot.com>
Date: Sat, 28 Jun 2025 16:44:26 +0530
Subject: [PATCH 2/5] =?UTF-8?q?"Directory=20filter=20popup=20closes=20on?=
 =?UTF-8?q?=20'Clear'=20button=20click=20=E2=80=93=20it=20should=20remain?=
 =?UTF-8?q?=20open"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Directory/DirectoryPageHeader.jsx | 36 +++++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/pages/Directory/DirectoryPageHeader.jsx b/src/pages/Directory/DirectoryPageHeader.jsx
index 6f4270a8..b23e8a34 100644
--- a/src/pages/Directory/DirectoryPageHeader.jsx
+++ b/src/pages/Directory/DirectoryPageHeader.jsx
@@ -289,14 +289,13 @@ const DirectoryPageHeader = ({
 
           {/* Filter by funnel icon for Notes view */}
           {viewType === "notes" && (
-            <div className="dropdown" style={{ width: "fit-content", minWidth: "400px" }}> {/* Added minWidth here */}
+            <div className="dropdown" style={{ width: "fit-content", minWidth: "400px" }}>
               <a
                 className="dropdown-toggle hide-arrow cursor-pointer d-flex align-items-center position-relative"
                 data-bs-toggle="dropdown"
                 aria-expanded="false"
               >
                 <i className={`fa-solid fa-filter ms-1 fs-5 ${selectedCreators.length > 0 || selectedOrgs.length > 0 ? "text-primary" : "text-muted"}`}></i>
-                {/* Removed the numerical badge for notes filter */}
               </a>
 
               <div
@@ -329,9 +328,6 @@ const DirectoryPageHeader = ({
                     ))}
                   </div>
 
-                  {/* Divider */}
-                  {/* <div style={{ width: "1px", backgroundColor: "#dee2e6", margin: "0 12px" }}></div> */}
-
                   {/* Organization */}
                   <div className="ps-3" style={{ flex: 1 }}>
                     <p className="text-muted mb-1">Organization</p>
@@ -356,7 +352,8 @@ const DirectoryPageHeader = ({
                 <div className="d-flex justify-content-between mt-3">
                   <button
                     className="btn btn-sm btn-outline-danger"
-                    onClick={() => {
+                    onClick={(e) => {
+                      e.stopPropagation();
                       setSelectedCreators([]);
                       setSelectedOrgs([]);
                       setFilteredOrganizations(allOrganizations);
@@ -365,7 +362,12 @@ const DirectoryPageHeader = ({
                   >
                     Clear
                   </button>
-                  <button className="btn btn-sm btn-primary" onClick={applyCombinedFilter}>
+                  <button
+                    className="btn btn-sm btn-primary"
+                    onClick={(e) => {
+                      applyCombinedFilter();
+                    }}
+                  >
                     Apply Filter
                   </button>
                 </div>
@@ -457,13 +459,27 @@ const DirectoryPageHeader = ({
                 </div>
 
                 <div className="d-flex justify-content-end gap-2 mt-1">
-                  <button className="btn btn-xs btn-secondary" onClick={clearFilter}>Clear</button>
-                  <button className="btn btn-xs btn-primary" onClick={applyFilter}>Apply Filter</button>
+                  <button
+                    className="btn btn-xs btn-secondary"
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      clearFilter();
+                    }}
+                  >
+                    Clear
+                  </button>
+                  <button
+                    className="btn btn-xs btn-primary"
+                    onClick={(e) => {
+                      applyFilter();
+                    }}
+                  >
+                    Apply Filter
+                  </button>
                 </div>
               </ul>
             </div>
           )}
-
         </div>
 
         <div className="col-12 col-md-6 mb-2 px-5 d-flex justify-content-end align-items-center gap-2">

From da69ae6fec4734ab623732d7782c2be7f8241bc2 Mon Sep 17 00:00:00 2001
From: Kartik sharma <kartik.sharma@marcoaiot.com>
Date: Mon, 30 Jun 2025 11:22:22 +0530
Subject: [PATCH 3/5] "In the Directory Notes, applying a filter changes the
 Clear button's state and color."

---
 src/pages/Directory/DirectoryPageHeader.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/Directory/DirectoryPageHeader.jsx b/src/pages/Directory/DirectoryPageHeader.jsx
index b23e8a34..48e28f28 100644
--- a/src/pages/Directory/DirectoryPageHeader.jsx
+++ b/src/pages/Directory/DirectoryPageHeader.jsx
@@ -349,11 +349,11 @@ const DirectoryPageHeader = ({
                 </div>
 
                 {/* Buttons */}
-                <div className="d-flex justify-content-between mt-3">
+                <div className="d-flex justify-content-end gap-2 mt-1">
                   <button
-                    className="btn btn-sm btn-outline-danger"
+                    className="btn btn-xs btn-secondary"
                     onClick={(e) => {
-                      e.stopPropagation();
+                      // e.stopPropagation();
                       setSelectedCreators([]);
                       setSelectedOrgs([]);
                       setFilteredOrganizations(allOrganizations);
@@ -363,7 +363,7 @@ const DirectoryPageHeader = ({
                     Clear
                   </button>
                   <button
-                    className="btn btn-sm btn-primary"
+                    className="btn btn-xs btn-primary"
                     onClick={(e) => {
                       applyCombinedFilter();
                     }}
@@ -462,7 +462,7 @@ const DirectoryPageHeader = ({
                   <button
                     className="btn btn-xs btn-secondary"
                     onClick={(e) => {
-                      e.stopPropagation();
+                      // e.stopPropagation();
                       clearFilter();
                     }}
                   >

From baf6a4cf54ea3c59823f881a0356da4e0e9911a4 Mon Sep 17 00:00:00 2001
From: Kartik sharma <kartik.sharma@marcoaiot.com>
Date: Sat, 28 Jun 2025 15:52:28 +0530
Subject: [PATCH 4/5] =?UTF-8?q?"Pagination=20overlaps=20on=20'+'=20(Add)?=
 =?UTF-8?q?=20button=20in=20Directory=20=E2=80=93=20bottom=20right=20corne?=
 =?UTF-8?q?r"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Directory/NotesCardViewDirectory.jsx      | 73 ++++++++++---------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/src/components/Directory/NotesCardViewDirectory.jsx b/src/components/Directory/NotesCardViewDirectory.jsx
index be207ffd..75a16b06 100644
--- a/src/components/Directory/NotesCardViewDirectory.jsx
+++ b/src/components/Directory/NotesCardViewDirectory.jsx
@@ -107,7 +107,7 @@ const NotesCardViewDirectory = ({ notes, setNotesForFilter, searchText, filterAp
   return (
     <div className="w-100 h-100 ">
       {/* Filter Dropdown */}
-      <div className="dropdown mb-3 ms-2">    
+      <div className="dropdown mb-3 ms-2">
       </div>
 
       {/* Notes List */}
@@ -129,41 +129,46 @@ const NotesCardViewDirectory = ({ notes, setNotesForFilter, searchText, filterAp
 
       {/* Pagination */}
       {totalPages > 1 && (
-        <div className="d-flex justify-content-end mt-3 me-3">
-          <div className="d-flex align-items-center gap-2">
-            <button
-              className="btn btn-sm rounded-circle border"
-              onClick={() => handlePageClick(Math.max(1, currentPage - 1))}
-              disabled={currentPage === 1}
-              title="Previous"
-            >
-              «
-            </button>
+        <div className="d-flex justify-content-end mt-2 align-items-center gap-2"
+          style={{ marginRight: '70px' }}>
+          {/* Previous Button */}
+          <button
+            className="btn btn-sm rounded-circle border text-secondary" // Added text-secondary for lighter color, kept btn-sm for smaller size like in image
+            onClick={() => handlePageClick(Math.max(1, currentPage - 1))}
+            disabled={currentPage === 1}
+            title="Previous"
+            style={{ width: "38px", height: "38px", padding: 0 }} // Ensure consistent size
+          >
+            «
+          </button>
 
-            {[...Array(totalPages)].map((_, i) => {
-              const page = i + 1;
-              return (
-                <button
-                  key={page}
-                  className={`btn btn-sm rounded-circle border ${page === currentPage ? "btn-primary text-white" : "btn-outline-primary"
-                    }`}
-                  style={{ width: "32px", height: "32px", padding: 0 }}
-                  onClick={() => handlePageClick(page)}
-                >
-                  {page}
-                </button>
-              );
-            })}
+          {/* Page Number Buttons */}
+          {[...Array(totalPages)].map((_, i) => {
+            const page = i + 1;
+            return (
+              <button
+                key={page}
+                // Changed btn-sm to just btn, adjusted class for active/inactive state backgrounds and text colors
+                className={`btn rounded-circle border ${page === currentPage ? "btn-primary text-white" : "btn-light text-secondary"
+                  }`}
+                style={{ width: "38px", height: "38px", padding: 0, fontSize: "1rem", lineHeight: "1" }} // Adjusted size and font for better fit
+                onClick={() => handlePageClick(page)}
+              >
+                {page}
+              </button>
+            );
+          })}
 
-            <button
-              className="btn btn-sm rounded-circle border"
-              onClick={() => handlePageClick(Math.min(totalPages, currentPage + 1))}
-              disabled={currentPage === totalPages}
-              title="Next"
-            >
-              »
-            </button>
-          </div>
+          {/* Next Button */}
+          <button
+            className="btn btn-sm rounded-circle border text-secondary" // Added text-secondary for lighter color, kept btn-sm
+            onClick={() => handlePageClick(Math.min(totalPages, currentPage + 1))}
+            disabled={currentPage === totalPages}
+            title="Next"
+            style={{ width: "38px", height: "38px", padding: 0 }} // Ensure consistent size
+          >
+            »
+          </button>
         </div>
       )}
     </div>

From 111325968dd7d75b99863c6f0b07abe4e0bd05dd Mon Sep 17 00:00:00 2001
From: Kartik sharma <kartik.sharma@marcoaiot.com>
Date: Mon, 30 Jun 2025 11:32:36 +0530
Subject: [PATCH 5/5] "Adding margin-bottom to the pagination section in
 Directory Notes."

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

diff --git a/src/components/Directory/NotesCardViewDirectory.jsx b/src/components/Directory/NotesCardViewDirectory.jsx
index 75a16b06..d29354d7 100644
--- a/src/components/Directory/NotesCardViewDirectory.jsx
+++ b/src/components/Directory/NotesCardViewDirectory.jsx
@@ -130,7 +130,7 @@ const NotesCardViewDirectory = ({ notes, setNotesForFilter, searchText, filterAp
       {/* Pagination */}
       {totalPages > 1 && (
         <div className="d-flex justify-content-end mt-2 align-items-center gap-2"
-          style={{ marginRight: '70px' }}>
+          style={{ marginBottom: '70px' }}>
           {/* Previous Button */}
           <button
             className="btn btn-sm rounded-circle border text-secondary" // Added text-secondary for lighter color, kept btn-sm for smaller size like in image