Compare commits
25 Commits
main
...
Kartik_Bug
| Author | SHA1 | Date | |
|---|---|---|---|
| 33fd4de3c3 | |||
| 773f91b836 | |||
| b89037e395 | |||
| 12d8184b70 | |||
| a9078bea77 | |||
| c90e874081 | |||
| 0555e01b2c | |||
| 189c70cc78 | |||
| ebce31e441 | |||
| 9e0e0753d9 | |||
| 67a2b95d24 | |||
| 513783883b | |||
| c9eacc6bb0 | |||
| 149abf721c | |||
| d5e06d389a | |||
| 69dbc5944b | |||
| 24fa55ad1b | |||
| fc6ab934c9 | |||
| e9d207964a | |||
| 89a810242f | |||
| 44581cbce0 | |||
| 6702fab007 | |||
| 266c843509 | |||
| 74936afdf2 | |||
| f91a518a72 |
@ -37,7 +37,7 @@ const Header = () => {
|
||||
const allowedProjectStatusIds = [
|
||||
"603e994b-a27f-4e5d-a251-f3d69b0498ba", // On Hold
|
||||
"cdad86aa-8a56-4ff4-b633-9c629057dfef", // In Progress
|
||||
"ef1c356e-0fe0-42df-a5d3-8daee355492d", // Inactive - Removed as per requirement
|
||||
// "ef1c356e-0fe0-42df-a5d3-8daee355492d", // Inactive - Removed as per requirement
|
||||
"b74da4c2-d07e-46f2-9919-e75e49b12731", // Active
|
||||
];
|
||||
|
||||
|
||||
@ -280,7 +280,8 @@ const DirectoryPageHeader = ({
|
||||
<hr className="my-0 mb-2" style={{ borderTop: "1px solid #dee2e6" }} />
|
||||
|
||||
<div className="row mx-0 px-0 align-items-center mt-2">
|
||||
<div className="col-12 col-md-6 mb-2 px-5 d-flex align-items-center gap-4">
|
||||
{/* REMOVED DUPLICATE LINE HERE */}
|
||||
<div className="col-12 col-md-6 mb-2 px-1 d-flex align-items-center gap-2">
|
||||
|
||||
<input
|
||||
type="search"
|
||||
@ -299,7 +300,7 @@ const DirectoryPageHeader = ({
|
||||
data-bs-toggle="dropdown"
|
||||
aria-expanded="false"
|
||||
>
|
||||
<i className={`fa-solid fa-filter ms-1 fs-5 ${notesFilterCount > 0 ? "text-primary" : "text-muted"}`}></i>
|
||||
<i className={`bx bx-slider-alt ${notesFilterCount > 0 ? "text-primary" : "text-muted"}`}></i>
|
||||
{notesFilterCount > 0 && (
|
||||
<span className="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-warning" style={{ fontSize: "0.4rem" }}>
|
||||
{notesFilterCount}
|
||||
@ -405,17 +406,17 @@ const DirectoryPageHeader = ({
|
||||
|
||||
<button
|
||||
type="button"
|
||||
className={`btn btn-xs ${viewType === "card" ? "btn-primary" : "btn-outline-primary"}`}
|
||||
className={`btn btn-sm p-1 ${viewType === "card" ? "btn-primary" : "btn-outline-primary"}`}
|
||||
onClick={() => setViewType("card")}
|
||||
>
|
||||
<i className="bx bx-grid-alt"></i>
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
className={`btn btn-xs ${viewType === "list" ? "btn-primary" : "btn-outline-primary"}`}
|
||||
className={`btn btn-sm p-1 ${viewType === "list" ? "btn-primary" : "btn-outline-primary"}`}
|
||||
onClick={() => setViewType("list")}
|
||||
>
|
||||
<i className="bx bx-list-ul me-1"></i>
|
||||
<i className="bx bx-list-ul"></i>
|
||||
|
||||
</button>
|
||||
</div>
|
||||
@ -423,13 +424,13 @@ const DirectoryPageHeader = ({
|
||||
|
||||
{/* Filter by funnel icon for Contacts view (retains numerical badge) */}
|
||||
{viewType !== "notes" && (
|
||||
<div className="dropdown-center" style={{ width: "fit-content" }}>
|
||||
<div className="dropdown" style={{ width: "fit-content" }}>
|
||||
<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 ${filtered > 0 ? "text-primary" : "text-muted"}`}></i>
|
||||
<i className={`bx bx-slider-alt ${filtered > 0 ? "text-primary" : "text-muted"}`}></i>
|
||||
{filtered > 0 && (
|
||||
<span className="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-warning" style={{ fontSize: "0.4rem" }}>
|
||||
{filtered}
|
||||
@ -487,7 +488,7 @@ const DirectoryPageHeader = ({
|
||||
<button
|
||||
className="btn btn-xs btn-secondary"
|
||||
onClick={(e) => {
|
||||
// e.stopPropagation();
|
||||
// e.stopPropagation(); // This might be needed if the dropdown closes unexpectedly
|
||||
clearFilter();
|
||||
}}
|
||||
>
|
||||
|
||||
@ -317,11 +317,7 @@ useEffect(() => {
|
||||
onClick={() => setIsFilterPanelOpen((p) => !p)}
|
||||
ref={filterButtonRef}
|
||||
>
|
||||
{isFilterPanelOpen ? (
|
||||
<i className="fa-solid fa-times fs-5" />
|
||||
) : (
|
||||
<i className="fa-solid fa-filter ms-1 fs-5" />
|
||||
)}
|
||||
{isFilterPanelOpen ? <i className="fa-solid fa-times fs-5"></i> : <i className="bx bx-slider-alt ms-1"></i>}
|
||||
</button>
|
||||
<div className="activity-section">
|
||||
{isLoading ? (
|
||||
|
||||
@ -192,7 +192,7 @@ const ProjectList = () => {
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="dropdown ms-3 mt-1">
|
||||
<div className="dropdown mt-1">
|
||||
<a
|
||||
className="dropdown-toggle hide-arrow cursor-pointer p-1 mt-3 "
|
||||
data-bs-toggle="dropdown"
|
||||
@ -200,7 +200,7 @@ const ProjectList = () => {
|
||||
data-bs-custom-class="tooltip"
|
||||
title="Filter"
|
||||
>
|
||||
<i className="fa-solid fa-filter fs-4"></i>
|
||||
<i className="bx bx-slider-alt ms-1"></i>
|
||||
</a>
|
||||
<ul className="dropdown-menu p-2 text-capitalize">
|
||||
{[
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user