From be69bb78e8828f107bf5b859dc446d4c119c39ce Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Thu, 22 Jun 2023 11:38:57 -0300 Subject: [PATCH 1/4] feat: allow resources to be filtered by type --- src/_includes/layouts/resources.njk | 67 ++++++++++++++++++----------- src/resources.md | 11 +++-- 2 files changed, 48 insertions(+), 30 deletions(-) diff --git a/src/_includes/layouts/resources.njk b/src/_includes/layouts/resources.njk index 392dbc31..bd8d3664 100644 --- a/src/_includes/layouts/resources.njk +++ b/src/_includes/layouts/resources.njk @@ -3,31 +3,50 @@ {% set bodyClass = "resources" %} {% block content %} -{% if resources.length %} +{% if collections.resources.length %}
-
- {% for item in resources %} -
-
- {% if item.data.metaImage %} - {% image item.data.metaImage, item.data.metaImageAlt, "570", "380" %} - {% else %} - {% image "/assets/media/design-activity_hua7f35ba46080e3314a834735ed95f389_2828843_1000x0_resize_q75_box.jpg", "", "570", "380" %} - {% endif %} -
-
-

{{ item.data.title }}

-

{% if item.data.author %}By {{ item.data.author }} / {% endif %}Posted

- {% if item.data.description %} -

{{ item.data.description | safe }}

- {% endif %} -
-
- {% endfor %} -
- {% if pagination.pages.length > 1 %} - {% include "partials/components/pagination.njk" %} - {% endif %} +
+
+ +

Filter Resources

+
+ + {# #} +
+ +
+ {% for item in collections.resources %} +
+
+ {% if item.data.metaImage %} + {% image item.data.metaImage, item.data.metaImageAlt, "570", "380" %} + {% else %} + {% image "/assets/media/design-activity_hua7f35ba46080e3314a834735ed95f389_2828843_1000x0_resize_q75_box.jpg", "", "570", "380" %} + {% endif %} +
+
+

{{ item.data.title }}

+

{% if item.data.author %}By {{ item.data.author }} / {% endif %}Posted

+ {% if item.data.description %} +

{{ item.data.description | safe }}

+ {% endif %} +
+
+ {% endfor %} +
+ +
+
{% endif %} {% endblock %} diff --git a/src/resources.md b/src/resources.md index f36ac514..1d2574ae 100644 --- a/src/resources.md +++ b/src/resources.md @@ -7,10 +7,9 @@ eleventyNavigation: parent: Learn key: Accessible Coding Resources order: 1 -permalink: /learn/resources/{% if pagination.pageNumber > 0 %}page/{{ - pagination.pageNumber + 1 }}/{% endif %} -pagination: - data: collections.resources - size: 10 - alias: resources +permalink: /learn/resources/ +# pagination: +# data: collections.resources +# size: 10 +# alias: resources --- From 28948ff1c86b524e95e3da6fdc7648009a95db90 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Tue, 4 Jul 2023 11:26:37 -0300 Subject: [PATCH 2/4] feat: filter resources with pagination --- package-lock.json | 11 +++--- package.json | 2 +- src/_includes/layouts/resources.njk | 45 +++++++++++++++++++++++-- src/assets/styles/pages/_resources.scss | 6 +++- src/resources.md | 10 +++--- 5 files changed, 58 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2b6c1e0c..9140dc9c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@11ty/eleventy": "2.0.1", "@11ty/eleventy-img": "3.1.0", "@11ty/eleventy-navigation": "0.3.5", - "@zachleat/filter-container": "3.0.4", + "@zachleat/filter-container": "github:greatislander/filter-container#28feb18", "infusion": "4.6.0", "modern-css-reset": "1.4.0", "wicg-inert": "3.1.2" @@ -6099,8 +6099,8 @@ }, "node_modules/@zachleat/filter-container": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@zachleat/filter-container/-/filter-container-3.0.4.tgz", - "integrity": "sha512-a1Nr9Yq0KIWvvkpJG2ylNWRoMQ2XeF5zQB125/ipzeSLKj6ReeE062kYwppJHU2kNqtaMpcNzTRzfmjQcJ12Sg==" + "resolved": "git+ssh://git@github.com/greatislander/filter-container.git#28feb1860f51ae724cdc435b7763c70581037dcf", + "license": "MIT" }, "node_modules/a-sync-waterfall": { "version": "1.0.1", @@ -25249,9 +25249,8 @@ "dev": true }, "@zachleat/filter-container": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@zachleat/filter-container/-/filter-container-3.0.4.tgz", - "integrity": "sha512-a1Nr9Yq0KIWvvkpJG2ylNWRoMQ2XeF5zQB125/ipzeSLKj6ReeE062kYwppJHU2kNqtaMpcNzTRzfmjQcJ12Sg==" + "version": "git+ssh://git@github.com/greatislander/filter-container.git#28feb1860f51ae724cdc435b7763c70581037dcf", + "from": "@zachleat/filter-container@github:greatislander/filter-container#28feb18" }, "a-sync-waterfall": { "version": "1.0.1", diff --git a/package.json b/package.json index adf00649..fe17a7b7 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@11ty/eleventy": "2.0.1", "@11ty/eleventy-img": "3.1.0", "@11ty/eleventy-navigation": "0.3.5", - "@zachleat/filter-container": "3.0.4", + "@zachleat/filter-container": "github:greatislander/filter-container#28feb18", "infusion": "4.6.0", "modern-css-reset": "1.4.0", "wicg-inert": "3.1.2" diff --git a/src/_includes/layouts/resources.njk b/src/_includes/layouts/resources.njk index bd8d3664..e05c9da8 100644 --- a/src/_includes/layouts/resources.njk +++ b/src/_includes/layouts/resources.njk @@ -7,7 +7,7 @@
- +

Filter Resources

{# #}
-
+
{% endif %} {% endblock %} diff --git a/src/assets/styles/pages/_resources.scss b/src/assets/styles/pages/_resources.scss index 8917bfc8..ce8657f3 100644 --- a/src/assets/styles/pages/_resources.scss +++ b/src/assets/styles/pages/_resources.scss @@ -2,11 +2,15 @@ // This file contains styles that are specific to the resources page. // ----------------------------------------------------------------------------- +.no-js .resources #resources { + display: none; +} + .resources .resource picture img { border-inline-start: var(--space-lg) solid var(--color-orange-75); } -.resources .resource + .resource { +.resources .resource:not([class*="--hide"]) ~ .resource { border-block-start: var(--border-hairline) solid var(--color-black-05); margin-block-start: var(--space-lg); padding-block-start: var(--space-lg); diff --git a/src/resources.md b/src/resources.md index 1d2574ae..489d3aea 100644 --- a/src/resources.md +++ b/src/resources.md @@ -7,9 +7,9 @@ eleventyNavigation: parent: Learn key: Accessible Coding Resources order: 1 -permalink: /learn/resources/ -# pagination: -# data: collections.resources -# size: 10 -# alias: resources +permalink: /learn/resources/{% if pagination.pageNumber > 0 %}page/{{ pagination.pageNumber + 1 }}/{% endif %} +pagination: + data: collections.resources + size: 10 + alias: resources --- From e8bf37d271ef09f2d8ffd6d18ec0c7c0e13c869d Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Tue, 4 Jul 2023 11:42:46 -0300 Subject: [PATCH 3/4] fix: update version --- package-lock.json | 4 ++-- package.json | 2 +- src/_includes/layouts/resources.njk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9140dc9c..20f1abbd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@11ty/eleventy": "2.0.1", "@11ty/eleventy-img": "3.1.0", "@11ty/eleventy-navigation": "0.3.5", - "@zachleat/filter-container": "github:greatislander/filter-container#28feb18", + "@zachleat/filter-container": "github:greatislander/filter-container#71edd9e", "infusion": "4.6.0", "modern-css-reset": "1.4.0", "wicg-inert": "3.1.2" @@ -25250,7 +25250,7 @@ }, "@zachleat/filter-container": { "version": "git+ssh://git@github.com/greatislander/filter-container.git#28feb1860f51ae724cdc435b7763c70581037dcf", - "from": "@zachleat/filter-container@github:greatislander/filter-container#28feb18" + "from": "@zachleat/filter-container@github:greatislander/filter-container#71edd9e" }, "a-sync-waterfall": { "version": "1.0.1", diff --git a/package.json b/package.json index fe17a7b7..e593b309 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@11ty/eleventy": "2.0.1", "@11ty/eleventy-img": "3.1.0", "@11ty/eleventy-navigation": "0.3.5", - "@zachleat/filter-container": "github:greatislander/filter-container#28feb18", + "@zachleat/filter-container": "github:greatislander/filter-container#71edd9e", "infusion": "4.6.0", "modern-css-reset": "1.4.0", "wicg-inert": "3.1.2" diff --git a/src/_includes/layouts/resources.njk b/src/_includes/layouts/resources.njk index e05c9da8..be746c71 100644 --- a/src/_includes/layouts/resources.njk +++ b/src/_includes/layouts/resources.njk @@ -53,7 +53,7 @@
  • {{ loop.index }}
    • {%- endfor %}
    • -