From 782f466ee6b64ce036db28094540e7b0980c5900 Mon Sep 17 00:00:00 2001 From: Nicolas Doby Date: Wed, 9 Nov 2022 09:45:19 +0100 Subject: [PATCH] refactor: migrate to /blog subdirectory --- .../{postslist.njk => articlesList.njk} | 12 ++++++------ src/_data/metadata.json | 2 +- src/_layouts/{post.njk => article.njk} | 14 +++++++------- src/_layouts/{base.njk => blog.njk} | 6 +++--- src/_layouts/home.njk | 2 +- src/_pages/{ => blog}/all_articles.njk | 4 ++-- .../blog/{blog.json => article/article.json} | 2 +- src/_pages/blog/{ => article}/exemple.md | 4 ++-- src/_pages/blog/{ => article}/exemple_2.md | 4 ++-- src/_pages/blog/{ => article}/exemple_3.md | 2 +- src/_pages/{ => blog}/feed/feed.11tydata.js | 0 src/_pages/{ => blog}/feed/feed.njk | 14 +++++++------- src/_pages/{ => blog}/feed/json.njk | 16 ++++++++-------- src/_pages/{ => blog}/index.njk | 6 ++---- src/_pages/{ => blog}/tags.njk | 4 ++-- src/images/{blog => articles}/kitty_1.jpeg | Bin src/images/{blog => articles}/kitty_2.jpeg | Bin 17 files changed, 45 insertions(+), 47 deletions(-) rename src/_components/{postslist.njk => articlesList.njk} (50%) rename src/_layouts/{post.njk => article.njk} (61%) rename src/_layouts/{base.njk => blog.njk} (93%) rename src/_pages/{ => blog}/all_articles.njk (76%) rename src/_pages/blog/{blog.json => article/article.json} (57%) rename src/_pages/blog/{ => article}/exemple.md (98%) rename src/_pages/blog/{ => article}/exemple_2.md (98%) rename src/_pages/blog/{ => article}/exemple_3.md (99%) rename src/_pages/{ => blog}/feed/feed.11tydata.js (100%) rename src/_pages/{ => blog}/feed/feed.njk (57%) rename src/_pages/{ => blog}/feed/json.njk (50%) rename src/_pages/{ => blog}/index.njk (62%) rename src/_pages/{ => blog}/tags.njk (83%) rename src/images/{blog => articles}/kitty_1.jpeg (100%) rename src/images/{blog => articles}/kitty_2.jpeg (100%) diff --git a/src/_components/postslist.njk b/src/_components/articlesList.njk similarity index 50% rename from src/_components/postslist.njk rename to src/_components/articlesList.njk index ee5c622..f4d098f 100644 --- a/src/_components/postslist.njk +++ b/src/_components/articlesList.njk @@ -1,25 +1,25 @@
-{% for post in postslist | reverse %} +{% for article in articlesList | reverse %}

- {% if post.data.title %}{{ post.data.title }}{% else %}{{ post.url }}{% endif %} + {% if article.data.title %}{{ article.data.title }}{% else %}{{ article.url }}{% endif %}

- Le {{ post.data.authors | readableAuthors }} + Le {{ article.data.authors | readableAuthors }}
    - {%- for tag in post.data.tags | filterTagList %} + {%- for tag in article.data.tags | filterTagList %} {%- set tagUrl %}/tags/{{ tag | slugify }}/{% endset %}
  • #{{ tag }}{%- if not loop.last %} {% endif %}
    • {%- endfor %}
-

{{ post.data.description }}

+

{{ article.data.description }}

{% endfor %} diff --git a/src/_data/metadata.json b/src/_data/metadata.json index 05c4774..026474c 100644 --- a/src/_data/metadata.json +++ b/src/_data/metadata.json @@ -1,6 +1,6 @@ { "title": "Blog IT's on us", - "url": "https://blog.itsonus.fr/", + "url": "https://www.itsonus.fr/blog", "language": "fr", "description": "Blog traitant de numérique responsable" } diff --git a/src/_layouts/post.njk b/src/_layouts/article.njk similarity index 61% rename from src/_layouts/post.njk rename to src/_layouts/article.njk index bc378bb..c9ff9cf 100644 --- a/src/_layouts/post.njk +++ b/src/_layouts/article.njk @@ -1,5 +1,5 @@ --- -layout: base.njk +layout: blog.njk templateClass: tmpl-post ---
@@ -21,15 +21,15 @@ templateClass: tmpl-post
- {%- if collections.posts %} + {%- if collections.articles %} {# these filters are locale-aware in 2.0.0-canary.14 #} - {%- set previousPost = collections.posts | getPreviousCollectionItem %} - {%- set nextPost = collections.posts | getNextCollectionItem %} - {%- if nextPost or previousPost %} + {%- set previousArticle = collections.articles | getPreviousCollectionItem %} + {%- set nextArticle = collections.articles | getNextCollectionItem %} + {%- if nextArticle or previousArticle %} {%- endif %} diff --git a/src/_layouts/base.njk b/src/_layouts/blog.njk similarity index 93% rename from src/_layouts/base.njk rename to src/_layouts/blog.njk index 5cedef2..c89c262 100644 --- a/src/_layouts/base.njk +++ b/src/_layouts/blog.njk @@ -8,8 +8,8 @@ - - + + @@ -40,7 +40,7 @@
  • - + Accéder au flux RSS du blog diff --git a/src/_layouts/home.njk b/src/_layouts/home.njk index e8f1f01..9e08e36 100644 --- a/src/_layouts/home.njk +++ b/src/_layouts/home.njk @@ -1,5 +1,5 @@ --- -layout: base.njk +layout: blog.njk templateClass: tmpl-home --- {{ content | safe }} diff --git a/src/_pages/all_articles.njk b/src/_pages/blog/all_articles.njk similarity index 76% rename from src/_pages/all_articles.njk rename to src/_pages/blog/all_articles.njk index ac7359f..504c13f 100644 --- a/src/_pages/all_articles.njk +++ b/src/_pages/blog/all_articles.njk @@ -9,8 +9,8 @@ eleventyNavigation: - {% set postslist = collections.posts %} - {% include "postslist.njk" %} + {% set articlesList = collections.articles %} + {% include "articlesList.njk" %}