From c2ff13327cc432ed5493ba9b875fd875b1082652 Mon Sep 17 00:00:00 2001 From: Lee Cattarin Date: Wed, 6 May 2026 08:28:07 -0700 Subject: [PATCH] start to work in requests by cleaning up listing code --- _config/filters.js | 1 + .../{daily-listings.njk => listings.njk} | 7 +++++-- css/main.css | 4 ++++ src/about.njk | 6 ++++++ src/daily/2026-04-29.njk | 4 ++-- src/daily/2026-05-01.njk | 4 ++-- src/daily/2026-05-02.njk | 4 ++-- src/daily/2026-05-03.njk | 4 ++-- src/daily/2026-05-04.njk | 4 ++-- src/daily/2026-05-05.njk | 4 ++-- src/daily/2026-05-06.njk | 4 ++-- src/index.njk | 19 ++----------------- src/submit.njk | 11 +++++++++++ 13 files changed, 43 insertions(+), 33 deletions(-) rename _includes/{daily-listings.njk => listings.njk} (63%) diff --git a/_config/filters.js b/_config/filters.js index a22b969..849c6db 100644 --- a/_config/filters.js +++ b/_config/filters.js @@ -3,6 +3,7 @@ import { DateTime } from "luxon"; export default function(eleventyConfig) { /* Filter by date */ eleventyConfig.addFilter("filterByDate", (listings, date) => { + if (date === null) return listings; date = DateTime.fromISO(date, { zone: "utc" }); return listings.filter((listing) => { let postDate = DateTime.fromJSDate(listing.data.date, { zone: "utc" }); diff --git a/_includes/daily-listings.njk b/_includes/listings.njk similarity index 63% rename from _includes/daily-listings.njk rename to _includes/listings.njk index 608634a..96b6df4 100644 --- a/_includes/daily-listings.njk +++ b/_includes/listings.njk @@ -1,3 +1,5 @@ +{% set tag = "offers" %} +
{% for tag in collections | getKeys | removeCoreTags | sortAlphabetically %}
@@ -5,10 +7,11 @@

{{ tag }}

{{ tag | getTagline }}

- {% if collections[tag] | filterByDate(today) | length == 0 %} + {% set listings = collections[tag] | filterByDate(day) | filterByTag(tag) %} + {% if listings | length == 0 %}

No listings.

{% endif %} - {% for listing in collections[tag] | filterByDate(today) | sortAlphabeticallyByTitle %} + {% for listing in listings | sortAlphabeticallyByTitle %} {% include "listing.njk" %} {% endfor %}
diff --git a/css/main.css b/css/main.css index ff2e38c..e02e7ce 100644 --- a/css/main.css +++ b/css/main.css @@ -67,6 +67,10 @@ h1 { } } +h2 { + margin-bottom: .5rem; +} + h3 { text-transform: capitalize; margin-bottom: .5rem; diff --git a/src/about.njk b/src/about.njk index 73426ec..b4c06df 100644 --- a/src/about.njk +++ b/src/about.njk @@ -33,6 +33,12 @@ title: About the Classifieds you reach out to about compensation!

+

How do I take down my listing?

+ +

+ Message me and I'll remove it. +

+

Who made this?

diff --git a/src/daily/2026-04-29.njk b/src/daily/2026-04-29.njk index 09c5e56..a84397f 100644 --- a/src/daily/2026-04-29.njk +++ b/src/daily/2026-04-29.njk @@ -3,5 +3,5 @@ title: April 29th, 2026 --- {% css %}{% include "css/listings.css" %}{% endcss %} -{% set today = "2026-04-29" %} -{% include "daily-listings.njk" %} +{% set day = "2026-04-29" %} +{% include "listings.njk" %} diff --git a/src/daily/2026-05-01.njk b/src/daily/2026-05-01.njk index f752cea..5497a87 100644 --- a/src/daily/2026-05-01.njk +++ b/src/daily/2026-05-01.njk @@ -3,5 +3,5 @@ title: May 1st, 2026 --- {% css %}{% include "css/listings.css" %}{% endcss %} -{% set today = "2026-05-01" %} -{% include "daily-listings.njk" %} +{% set day = "2026-05-01" %} +{% include "listings.njk" %} diff --git a/src/daily/2026-05-02.njk b/src/daily/2026-05-02.njk index c5b6f72..cc8a28f 100644 --- a/src/daily/2026-05-02.njk +++ b/src/daily/2026-05-02.njk @@ -3,5 +3,5 @@ title: May 2nd, 2026 --- {% css %}{% include "css/listings.css" %}{% endcss %} -{% set today = "2026-05-02" %} -{% include "daily-listings.njk" %} +{% set day = "2026-05-02" %} +{% include "listings.njk" %} diff --git a/src/daily/2026-05-03.njk b/src/daily/2026-05-03.njk index 63b324b..53dbebb 100644 --- a/src/daily/2026-05-03.njk +++ b/src/daily/2026-05-03.njk @@ -3,5 +3,5 @@ title: May 3rd, 2026 --- {% css %}{% include "css/listings.css" %}{% endcss %} -{% set today = "2026-05-03" %} -{% include "daily-listings.njk" %} +{% set day = "2026-05-03" %} +{% include "listings.njk" %} diff --git a/src/daily/2026-05-04.njk b/src/daily/2026-05-04.njk index 837ee01..307e7a1 100644 --- a/src/daily/2026-05-04.njk +++ b/src/daily/2026-05-04.njk @@ -3,5 +3,5 @@ title: May 4th, 2026 --- {% css %}{% include "css/listings.css" %}{% endcss %} -{% set today = "2026-05-04" %} -{% include "daily-listings.njk" %} +{% set day = "2026-05-04" %} +{% include "listings.njk" %} diff --git a/src/daily/2026-05-05.njk b/src/daily/2026-05-05.njk index fce5af5..22495f8 100644 --- a/src/daily/2026-05-05.njk +++ b/src/daily/2026-05-05.njk @@ -3,5 +3,5 @@ title: May 5th, 2026 --- {% css %}{% include "css/listings.css" %}{% endcss %} -{% set today = "2026-05-05" %} -{% include "daily-listings.njk" %} +{% set day = "2026-05-05" %} +{% include "listings.njk" %} diff --git a/src/daily/2026-05-06.njk b/src/daily/2026-05-06.njk index e793648..ffcf550 100644 --- a/src/daily/2026-05-06.njk +++ b/src/daily/2026-05-06.njk @@ -3,5 +3,5 @@ title: May 6th, 2026 --- {% css %}{% include "css/listings.css" %}{% endcss %} -{% set today = "2026-05-06" %} -{% include "daily-listings.njk" %} +{% set day = "2026-05-06" %} +{% include "listings.njk" %} diff --git a/src/index.njk b/src/index.njk index 5fbae5d..9b05034 100644 --- a/src/index.njk +++ b/src/index.njk @@ -14,20 +14,5 @@ title: FediLearns Classifieds -

- {% for tag in collections | getKeys | removeCoreTags | sortAlphabetically %} -
-
-

{{ tag }}

-

{{ tag | getTagline }}

-
- {% set listings = collections[tag] | filterByTag("offers") %} - {% if listings | length == 0 %} -

No listings.

- {% endif %} - {% for listing in listings | sortAlphabeticallyByTitle %} - {% include "listing.njk" %} - {% endfor %} -
- {% endfor %} -
+{% set day = null %} +{% include "listings.njk" %} diff --git a/src/submit.njk b/src/submit.njk index 9b048de..274fae8 100644 --- a/src/submit.njk +++ b/src/submit.njk @@ -9,12 +9,23 @@ title: Submit a Listing background-color: var(--color-gray); padding: .25rem; } + +.requests-update { + padding: 1rem; + border: solid var(--color-cyan); +} {% endcss %} +

+ Hey! Listen! I'm working on supporting requests as well as offers, + so don't be surprised to see that on the submission form. Coming soon to the site! +

+

To submit to the FediLearns Classifieds, you'll need: