diff --git a/eleventy.config.js b/eleventy.config.js index ff9484a..73ed5bd 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -7,6 +7,7 @@ import footnotesPlugin from "eleventy-plugin-footnotes"; import parse from "./src/_transforms/parse.js"; export default function eleventy(eleventyConfig) { + eleventyConfig.addGlobalData("now", () => new Date()); eleventyConfig.addPlugin(eleventyNavigationPlugin); eleventyConfig.addPlugin(RenderPlugin); eleventyConfig.addPlugin(footnotesPlugin); diff --git a/src/_data/translations/en.json b/src/_data/translations/en.json index b44b173..5440f6c 100644 --- a/src/_data/translations/en.json +++ b/src/_data/translations/en.json @@ -18,5 +18,6 @@ "site-title": "Inclusive
Standards", "no-projects": "No projects found.", "filters": "Filters", - "applied-filters": "Applied Filters" + "applied-filters": "Applied Filters", + "upcoming": "Upcoming" } diff --git a/src/_data/translations/fr.json b/src/_data/translations/fr.json index 2eea615..9bd93c1 100644 --- a/src/_data/translations/fr.json +++ b/src/_data/translations/fr.json @@ -18,5 +18,6 @@ "site-title": "Normes
inclusives", "no-projects": "Aucun projet trouvé.", "filters": "Filtres", - "applied-filters": "Filtres appliqués" + "applied-filters": "Filtres appliqués", + "upcoming": "À venir" } diff --git a/src/_includes/layouts/home.njk b/src/_includes/layouts/home.njk index 6a780b2..60ebff7 100644 --- a/src/_includes/layouts/home.njk +++ b/src/_includes/layouts/home.njk @@ -14,9 +14,9 @@

{% __ 'projects' %}

- {% for project in collections['projects_' + lang] %} - {% include "partials/components/card--project.njk" %} - {% endfor %} + {% for project in collections['projects_' + lang] %} + {% include "partials/components/card--project.njk" %} + {% endfor %}
@@ -26,10 +26,9 @@

{% __ 'events' %}

- {% set cardType = "event" %} - {% for item in collections['events_' + lang] %} - {{ card({image: item.data.image, title: item.data.title, body: item.data.excerpt, url: item.data.permalink }) }} - {% endfor %} + {% for event in collections['events_' + lang] %} + {% include "partials/components/card--event.njk" %} + {% endfor %}
diff --git a/src/_includes/partials/components/card--event.njk b/src/_includes/partials/components/card--event.njk new file mode 100644 index 0000000..df99bd1 --- /dev/null +++ b/src/_includes/partials/components/card--event.njk @@ -0,0 +1,25 @@ +
+ {% if event.data.previewImage %} +
+ {{ event.data.previewImageAlt }} +
+ {% endif %} +
+

+ + {{ event.data.title | safe }} + +

+ {% if now < event.data.date %} +
+
{% __ 'upcoming' %}
+
+ {% endif %} +
+

{{ event.data.date | formatDate }}

+
+
+

{{ event.data.excerpt | safe }}

+
+
+
diff --git a/src/_includes/partials/components/card.macro.njk b/src/_includes/partials/components/card.macro.njk index c9b88b5..fcd0c2f 100644 --- a/src/_includes/partials/components/card.macro.njk +++ b/src/_includes/partials/components/card.macro.njk @@ -11,13 +11,7 @@ {{ params.title | safe }} - {% if cardType === "event" %} -
- {% include 'svg/eventTag.svg' %} -

{{ params.eventStatus | safe }}

-
- {% endif %} - {% if cardType === "event" or cardType === "news" %} + {% if cardType === "news" %}

{{ params.date }}