Skip to content

fix: restore filter functionality #712

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

Merged
greatislander merged 1 commit into from
Jun 21, 2022
Merged

fix: restore filter functionality #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4,290 changes: 2,188 additions & 2,102 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"@11ty/eleventy-img": "2.0.0",
"@11ty/eleventy-navigation": "0.3.2",
"@zachleat/filter-container": "3.0.4",
"eleventy-plugin-fluid": "0.3.1",
"infusion": "4.0.0",
"modern-css-reset": "1.4.0",
"wicg-inert": "3.1.1"
Expand All @@ -45,13 +44,14 @@
"@commitlint/cli": "16.2.3",
"@commitlint/config-conventional": "16.2.1",
"cross-env": "7.0.3",
"eleventy-plugin-fluid": "0.3.1",
"fluid-lint-all": "1.1.5",
"html-minifier": "4.0.0",
"husky": "4.3.8",
"image-size": "1.0.1",
"laravel-mix": "6.0.34",
"laravel-mix-purgecss": "6.0.0",
"linkedom": "0.14.4",
"linkedom": "0.14.12",
"move-file": "2.1.0",
"netlify-cms-proxy-server": "1.3.23",
"npm-run-all": "4.1.5",
Expand Down
10 changes: 5 additions & 5 deletions src/_includes/layouts/activities.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<div class="[ wrapper ]">
<div id="activities">
<div class="[ flow-lg ]">
<filter-container class="[ filter ] [ flow ]" data-oninit>
<filter-container class="[ filter ] [ flow ]" oninit>
<h2 class="[ h3 ]">Filter Activities</h2>
<form class="[ filters ]">
<label class="[ label ]" for="type">
Type:
<select class="[ select ]" name="type" id="type" data-filter-bind="type">
<select class="[ select ]" name="type" id="type" data-filter-key="type">
<option value="">Any Type</option>
{% for type in activityTags.types %}
<option value="{{ type }}" data-slug="{{ type | slugify }}">{{ type }}</option>
Expand All @@ -21,7 +21,7 @@
</label>
<label class="[ label ]" for="experience">
Experience:
<select class="[ select ]" name="experience" id="experience" data-filter-bind="experience">
<select class="[ select ]" name="experience" id="experience" data-filter-key="experience">
<option value="">Any Level</option>
{% for level in activityTags.experience %}
<option value="{{ level }}">{{ level }}</option>
Expand All @@ -30,14 +30,14 @@
</label>
<label class="[ label ]" for="subject">
Subject:
<select class="[ select ]" name="subject" id="subject" data-filter-bind="subject">
<select class="[ select ]" name="subject" id="subject" data-filter-key="subject">
<option value="">Any Subject</option>
{% for subject in activityTags.subjects %}
<option value="{{ subject }}">{{ subject }}</option>
{% endfor %}
</select>
</label>
<button type="reset" class="[ button ] [ button--sm ]" id="reset">{% include "svg/reset.svg" %}Clear Filters</button>
{# <button type="reset" class="[ button ] [ button--sm ]" id="reset">{% include "svg/reset.svg" %}Clear Filters</button> #}
</form>
<div class="[ alert ]" role="alert" aria-live="polite">
<p>Showing <strong data-filter-results="activity/activities">{{ collections.activities.length }} activities</strong>.</p>
Expand Down
4 changes: 2 additions & 2 deletions src/_includes/layouts/projects.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<form class="[ filters ]">
<label class="[ label ]" for="category">
Category:
<select class="[ select ]" name="category" id="category" data-filter-bind="category">
<select class="[ select ]" name="category" id="category" data-filter-key="category">
<option value="">Any Category</option>
{% for category in projectTags.categories %}
<option value="{{ category }}">{{ category }}</option>
{% endfor %}
</select>
</label>
<button type="reset" class="[ button ] [ button--sm ]" id="reset">{% include "svg/reset.svg" %}Clear Filters</button>
{# <button type="reset" class="[ button ] [ button--sm ]" id="reset">{% include "svg/reset.svg" %}Clear Filters</button> #}
</form>
<div class="[ alert ]" role="alert" aria-live="polite">
<p>Showing <strong data-filter-results="project/projects">{{ collections.projects.length }} projects</strong>.</p>
Expand Down
8 changes: 4 additions & 4 deletions src/_includes/layouts/robot-activities.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<div class="[ wrapper ]">
<div id="robot-activities">
<div class="[ flow-lg ]">
<filter-container class="[ filter ] [ flow ]" data-oninit>
<filter-container class="[ filter ] [ flow ]" oninit>
<h2 class="[ h3 ]">Filter Activities</h2>
<form class="[ filters ]">
<label class="[ label ]" for="experience">
Experience:
<select class="[ select ]" bind:value={selectedExperience} name="experience" id="experience" data-filter-bind="experience">
<select class="[ select ]" name="experience" id="experience" data-filter-key="experience">
<option value="">Any Level</option>
{% for level in robotActivityTags.experience %}
<option value="{{ level }}">{{ level }}</option>
Expand All @@ -36,14 +36,14 @@
</label>
<label class="[ label ]" for="topic">
Topic:
<select class="[ select ]" bind:value={selectedTopic} name="topic" id="topic" data-filter-bind="topic">
<select class="[ select ]" name="topic" id="topic" data-filter-key="topic">
<option value="">Any Topic</option>
{% for topic in robotActivityTags.topics %}
<option value="{{ topic }}">{{ topic }}</option>
{% endfor %}
</select>
</label>
<button type="reset" class="[ button ] [ button--sm ]" id="reset">{% include "svg/reset.svg" %}Clear Filters</button>
{# <button type="reset" class="[ button ] [ button--sm ]" id="reset">{% include "svg/reset.svg" %}Clear Filters</button> #}
</form>
<div class="[ alert ]" role="alert" aria-live="polite">
<p>Showing <strong data-filter-results="activity/activities">{{ robotActivities.length }} activities</strong>.</p>
Expand Down
26 changes: 16 additions & 10 deletions src/assets/scripts/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,22 @@ import "wicg-inert";

import VideoOverlay from "./overlay.module.js";

document.addEventListener("click", event => {
if (event.target.id === "reset") {
const filters = [...event.target.parentNode.querySelectorAll("select")];

filters.forEach(filter => {
filter.value = "";
filter.dispatchEvent(new Event("change", {"bubbles": true}));
});
}
});
// document.addEventListener("click", event => {
// if (event.target.id === "reset") {
// const filters = [...event.target.parentNode.querySelectorAll("select")];

// filters.forEach(filter => {
// filter.addEventListener("change", function () {
// console.log("changed");
// });

// filter.value = "";
// filter.dispatchEvent(new Event("change", {"bubbles": true}));
// });


// }
// });

const linkedVideos = [...document.querySelectorAll(".linked-video")];

Expand Down