admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Change all filter icon to bx bx-slider-alt ms-2. In image Gallery, Directory and Project List. #283

Closed
kartik.sharma wants to merge 25 commits from Kartik_Bug#800 into Issues_July_4W
pull from: Kartik_Bug#800
merge into: admin:Issues_July_4W
Conversation 2 Commits 25 Files Changed 4 +13 -16
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Layout/Header.jsx
View File

@ -37,7 +37,7 @@ const Header = () => {
const allowedProjectStatusIds = [ const allowedProjectStatusIds = [
"603e994b-a27f-4e5d-a251-f3d69b0498ba", // On Hold "603e994b-a27f-4e5d-a251-f3d69b0498ba", // On Hold
"cdad86aa-8a56-4ff4-b633-9c629057dfef", // In Progress "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 "b74da4c2-d07e-46f2-9919-e75e49b12731", // Active
]; ];

17
src/pages/Directory/DirectoryPageHeader.jsx
View File

@ -280,7 +280,8 @@ const DirectoryPageHeader = ({
<hr className="my-0 mb-2" style={{ borderTop: "1px solid #dee2e6" }} /> <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="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 <input
type="search" type="search"
@ -299,7 +300,7 @@ const DirectoryPageHeader = ({
data-bs-toggle="dropdown" data-bs-toggle="dropdown"
aria-expanded="false" 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 && ( {notesFilterCount > 0 && (
<span className="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-warning" style={{ fontSize: "0.4rem" }}> <span className="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-warning" style={{ fontSize: "0.4rem" }}>
{notesFilterCount} {notesFilterCount}
@ -405,17 +406,17 @@ const DirectoryPageHeader = ({
<button <button
type="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")} onClick={() => setViewType("card")}
> >
<i className="bx bx-grid-alt"></i> <i className="bx bx-grid-alt"></i>
</button> </button>
<button <button
type="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")} onClick={() => setViewType("list")}
> >
<i className="bx bx-list-ul me-1"></i> <i className="bx bx-list-ul"></i>
</button> </button>
</div> </div>
@ -423,13 +424,13 @@ const DirectoryPageHeader = ({
{/* Filter by funnel icon for Contacts view (retains numerical badge) */} {/* Filter by funnel icon for Contacts view (retains numerical badge) */}
{viewType !== "notes" && ( {viewType !== "notes" && (
<div className="dropdown-center" style={{ width: "fit-content" }}> <div className="dropdown" style={{ width: "fit-content" }}>
<a <a
className="dropdown-toggle hide-arrow cursor-pointer d-flex align-items-center position-relative" className="dropdown-toggle hide-arrow cursor-pointer d-flex align-items-center position-relative"
data-bs-toggle="dropdown" data-bs-toggle="dropdown"
aria-expanded="false" 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 && ( {filtered > 0 && (
<span className="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-warning" style={{ fontSize: "0.4rem" }}> <span className="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-warning" style={{ fontSize: "0.4rem" }}>
{filtered} {filtered}
@ -487,7 +488,7 @@ const DirectoryPageHeader = ({
<button <button
className="btn btn-xs btn-secondary" className="btn btn-xs btn-secondary"
onClick={(e) => { onClick={(e) => {
// e.stopPropagation(); // e.stopPropagation(); // This might be needed if the dropdown closes unexpectedly
clearFilter(); clearFilter();
}} }}
> >

6
src/pages/Gallary/ImageGallary.jsx
View File

@ -317,11 +317,7 @@ useEffect(() => {
onClick={() => setIsFilterPanelOpen((p) => !p)} onClick={() => setIsFilterPanelOpen((p) => !p)}
ref={filterButtonRef} ref={filterButtonRef}
> >
{isFilterPanelOpen ? ( {isFilterPanelOpen ? <i className="fa-solid fa-times fs-5"></i> : <i className="bx bx-slider-alt ms-1"></i>}
<i className="fa-solid fa-times fs-5" />
) : (
<i className="fa-solid fa-filter ms-1 fs-5" />
)}
</button> </button>
<div className="activity-section"> <div className="activity-section">
{isLoading ? ( {isLoading ? (

4
src/pages/project/ProjectList.jsx
View File

@ -192,7 +192,7 @@ const ProjectList = () => {
</button> </button>
</div> </div>
<div className="dropdown ms-3 mt-1"> <div className="dropdown mt-1">
<a <a
className="dropdown-toggle hide-arrow cursor-pointer p-1 mt-3 " className="dropdown-toggle hide-arrow cursor-pointer p-1 mt-3 "
data-bs-toggle="dropdown" data-bs-toggle="dropdown"
@ -200,7 +200,7 @@ const ProjectList = () => {
data-bs-custom-class="tooltip" data-bs-custom-class="tooltip"
title="Filter" title="Filter"
> >
<i className="fa-solid fa-filter fs-4"></i> <i className="bx bx-slider-alt ms-1"></i>
</a> </a>
<ul className="dropdown-menu p-2 text-capitalize"> <ul className="dropdown-menu p-2 text-capitalize">
{[ {[