diff --git a/public/assets/vendor/css/core.css b/public/assets/vendor/css/core.css index d95f46c2..718f0934 100644 --- a/public/assets/vendor/css/core.css +++ b/public/assets/vendor/css/core.css @@ -836,7 +836,7 @@ progress { } .row { - --bs-gutter-x: 1.625rem; + --bs-gutter-x: 3.625rem; --bs-gutter-y: 0; display: flex; flex-wrap: wrap; diff --git a/src/pages/Directory/Directory.jsx b/src/pages/Directory/Directory.jsx index ca95181f..3b3f4671 100644 --- a/src/pages/Directory/Directory.jsx +++ b/src/pages/Directory/Directory.jsx @@ -38,7 +38,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => { const [IsDeleting, setDeleting] = useState(false); const [openBucketModal, setOpenBucketModal] = useState(false); const [notes, setNotes] = useState([]); - const [filterAppliedNotes, setFilterAppliedNotes] = useState([]); + const [filterAppliedNotes, setFilterAppliedNotes] = useState([]); // const [selectedOrgs, setSelectedOrgs] = useState([]); // ✅ Changed to an array for multiple selections @@ -353,7 +353,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => { setOpenBucketModal={setOpenBucketModal} contactsToExport={contacts} notesToExport={notes} - selectedNoteNames={selectedNoteNames} + selectedNoteNames={selectedNoteNames} setSelectedNoteNames={setSelectedNoteNames} notesForFilter={notes} setFilterAppliedNotes={setFilterAppliedNotes} @@ -361,25 +361,35 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
- {(viewType === "card" || viewType === "list" || viewType === "notes") && ( -
- {!loading && (viewType === "card" || viewType === "list") && contacts?.length === 0 && ( -

No contact found

- )} - {!loading && - (viewType === "card" || viewType === "list") && - contacts?.length > 0 && - currentItems.length === 0 && ( -

No matching contact found

- )} -
- )} - + {/* LIST VIEW */} {viewType === "list" && ( -
-
+
+
- {!loading && + {!loading && contacts?.length === 0 ? ( + + +
+

No contact found

+
+ + + ) : !loading && contacts?.length > 0 && currentItems.length === 0 ? ( + + +
+

No matching contact found

+
+ + + ) : ( + !loading && currentItems.map((contact) => ( { IsDeleted={setDeleteContact} restore={handleDeleteContact} /> - ))} + )) + )}
)} + {/* CARD VIEW */} {viewType === "card" && ( -
- {!loading && - currentItems.map((contact) => ( -
- -
- ))} -
+ <> + {contacts?.length === 0 && !loading ? ( +
+

No contact found

+
+ ) : currentItems.length === 0 && !loading ? ( +
+

No matching contact found

+
+ ) : ( +
+ {currentItems.map((contact) => ( +
+ +
+ ))} +
+ )} + )} + {/* NOTES VIEW */} {viewType === "notes" && (
{ setNotesForFilter={setNotes} searchText={searchText} setIsOpenModalNote={setIsOpenModalNote} - filterAppliedNotes={filterAppliedNotes} + filterAppliedNotes={filterAppliedNotes} />
)} - {/* Pagination */} + {/* PAGINATION */} {!loading && viewType !== "notes" && contacts?.length > 0 && @@ -464,7 +494,10 @@ const Directory = ({ IsPage = true, prefernceContacts }) => { ))} -
  • +
  • +
    ); }; diff --git a/src/pages/project/ProjectDetails.jsx b/src/pages/project/ProjectDetails.jsx index b52f6836..3d6b28d5 100644 --- a/src/pages/project/ProjectDetails.jsx +++ b/src/pages/project/ProjectDetails.jsx @@ -81,7 +81,7 @@ const ProjectDetails = () => { case "profile": { return ( <> -
    +
    {/* About User */} @@ -139,7 +139,7 @@ const ProjectDetails = () => { } case "directory": { return ( -
    +
    ); @@ -193,7 +193,7 @@ const ProjectDetails = () => { ]} > -
    +
    {projectLoading &&

    Loading....

    } {/* {!projectLoading && project && (