Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor filter menu functionality #330

Merged
merged 3 commits into from
Feb 25, 2025
Merged

Refactor filter menu functionality #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65de976
Add open/close logic to filter containers
DinneK Feb 17, 2025
79b1a28
Change filters widths dynamically
DinneK Feb 17, 2025
b10050a
Fix prod svg links
DinneK Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions app/site/projects.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ layout: base
{% comment %} filter by organization {% endcomment %}
<div class="usa-accordion">
<div class="usa-accordion__heading filter-heading">
<button class="usa-accordion__button filter-button" aria-expanded="true" aria-controls="organization-content" id="organization">Organization</button>
<button class="usa-accordion__button filter-button" aria-expanded="true" aria-controls="organization-content" id="organization">
Organization
<svg class="usa-icon--size-3" aria-hidden="true" focusable="false" role="img">
<use href="{{ site.baseurl }}/assets/img/sprite.svg#expand_less"></use>
</svg>
</button>
</div>
<div id="organization-content" class="usa-accordion__content filter-content usa-prose" hidden>
<form class="usa-form">
Expand All @@ -46,7 +51,12 @@ layout: base
{% comment %} filter by maturity model tier {% endcomment %}
<div class="usa-accordion">
<div class="usa-accordion__heading filter-heading">
<button class="usa-accordion__button filter-button" aria-expanded="false" aria-controls="tier-content" id="mauturity-model-tier">Maturity Model Tier</button>
<button class="usa-accordion__button filter-button" aria-expanded="true" aria-controls="tier-content" id="mauturity-model-tier">
Maturity Model Tier
<svg class="usa-icon--size-3" aria-hidden="true" focusable="false" role="img">
<use href="{{ site.baseurl }}/assets/img/sprite.svg#expand_less"></use>
</svg>
</button>
</div>
<div id="tier-content" class="usa-accordion__content filter-content usa-prose" hidden>
<form class="usa-form">
Expand All @@ -67,7 +77,12 @@ layout: base
{% comment %} filter by fisma compliance level {% endcomment %}
<div class="usa-accordion">
<div class="usa-accordion__heading filter-heading">
<button class="usa-accordion__button filter-button" aria-expanded="false" aria-controls="fisma-level-content" id="fisma-level">FISMA Compliance Level</button>
<button class="usa-accordion__button filter-button" aria-expanded="true" aria-controls="fisma-level-content" id="fisma-level">
FISMA Compliance Level
<svg class="usa-icon--size-3" aria-hidden="true" focusable="false" role="img">
<use href="{{ site.baseurl }}/assets/img/sprite.svg#expand_less"></use>
</svg>
</button>
</div>
<div id="fisma-level-content" class="usa-accordion__content filter-content usa-prose" hidden>
<form class="usa-form">
Expand All @@ -88,7 +103,12 @@ layout: base
{% comment %} filter by project type {% endcomment %}
<div class="usa-accordion">
<div class="usa-accordion__heading filter-heading">
<button class="usa-accordion__button filter-button" aria-expanded="false" aria-controls="project-type-content" id="project-type">Project Type</button>
<button class="usa-accordion__button filter-button" aria-expanded="true" aria-controls="project-type-content" id="project-type">
Project Type
<svg class="usa-icon--size-3" aria-hidden="true" focusable="false" role="img">
<use href="{{ site.baseurl }}/assets/img/sprite.svg#expand_less"></use>
</svg>
</button>
</div>
<div id="project-type-content" class="usa-accordion__content filter-content usa-prose" hidden>
<form class="usa-form">
Expand Down
21 changes: 19 additions & 2 deletions app/src/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,10 @@ section:active {
border-radius: 50px 50px 0 0;
border: none;
font-weight: 600;
justify-content: center;
justify-content: space-between;
min-width: 215px;
padding: 7% 0 7% 0;
padding: 10%;
align-items: center;
}

.filter-button:hover {
Expand Down Expand Up @@ -624,6 +625,22 @@ iframe:focus, [href]:focus, [tabindex]:focus, [contentEditable=true]:focus {
border: none;
cursor: pointer;
}

.filters-container {
margin-right: 0;
}

.filter-button {
min-width: 315px;
}

.filter-button[aria-expanded="false"] {
min-width: 315px;
}

.usa-accordion__heading {
font-size: 1.2rem;
}
}

@media (min-width: 768px) {
Expand Down
52 changes: 50 additions & 2 deletions app/src/js/projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
const sortDirection = document.getElementById('sort-direction');
const sortSelection = document.getElementById('sort-selection');


const baseurl = siteData.baseurl
let currentPage = 1;
const itemsPerPage = 10;
let filteredProjects = [...parsedProjectsData];
Expand All @@ -36,6 +38,52 @@
sortCards(isDescending);
})

// Controls filter menus open/closed state
document.addEventListener("DOMContentLoaded", () => {
function updateFilterMenuState() {
const filterButtons = document.querySelectorAll(".usa-accordion__button");
const isMobile = window.innerWidth < 768;

filterButtons.forEach((button) => {
const contentId = button.getAttribute("aria-controls");
const content = document.getElementById(contentId);
const icon = button.querySelector("svg use");

if(isMobile) {
button.setAttribute("aria-expanded", "false");
content.setAttribute("hidden", "true");
icon.setAttribute("href", `${baseurl}/assets/img/sprite.svg#expand_more`);
} else {
button.setAttribute("aria-expanded", "true");
content.removeAttribute("hidden");
icon.setAttribute("href", `${baseurl}/assets/img/sprite.svg#expand_less`);
}
});
}

updateFilterMenuState()

window.addEventListener("resize", updateFilterMenuState)

document.querySelectorAll(".usa-accordion__button").forEach((button) => {
button.addEventListener("click", () => {
const expanded = button.getAttribute("aria-expanded");
const content = document.getElementById(button.getAttribute("id"));
const icon = button.querySelector("svg use");
console.log("2", baseurl)

if(expanded === 'false') {
content.removeAttribute("hidden");
icon.setAttribute("href", `${baseurl}/assets/img/sprite.svg#expand_less`);
} else {
content.setAttribute("hidden", "true");
icon.setAttribute("href", `${baseurl}/assets/img/sprite.svg#expand_more`);
}
});
});
});


// Keep filters after navigating back
window.addEventListener('pageshow', (event) => {
updateFilters();
Expand Down Expand Up @@ -183,7 +231,7 @@
if (currentPage === 1) prevButton.classList.add('usa-pagination__disabled');
prevButton.innerHTML = `
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="/assets/img/sprite.svg#navigate_before"></use>
<use xlink:href="${baseurl}/assets/img/sprite.svg#navigate_before"></use>
</svg>
<span class="usa-pagination__link-text">Previous</span>
`;
Expand Down Expand Up @@ -231,7 +279,7 @@
nextButton.innerHTML = `
<span class="usa-pagination__link-text">Next</span>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="/assets/img/sprite.svg#navigate_next"></use>
<use xlink:href="${baseurl}/assets/img/sprite.svg#navigate_next"></use>
</svg>
`;
nextButton.addEventListener('click', () => {
Expand Down
Loading