diff --git a/src/common/_redirects.njk b/src/common/_redirects.njk index c2ee16f..a2957b5 100644 --- a/src/common/_redirects.njk +++ b/src/common/_redirects.njk @@ -3,10 +3,12 @@ permalink: /_redirects eleventyExcludeFromCollections: true excludeFromSitemap: true --- + {% for page in collections.all %} {% if page.url and page.data.redirectFrom %} {% for oldUrl in page.data.redirectFrom %} -{{ oldUrl }} {{ page.url }} + {{ oldUrl }} + {{ page.url }} {% endfor %} {% endif %} -{% endfor %} \ No newline at end of file +{% endfor %} diff --git a/src/common/carbon.njk b/src/common/carbon.njk index 8f88c9e..09e647a 100644 --- a/src/common/carbon.njk +++ b/src/common/carbon.njk @@ -3,8 +3,7 @@ permalink: /carbon.txt eleventyExcludeFromCollections: true excludeFromSitemap: true --- -[upstream] -providers = [{ domain = '{{ meta.greenweb.providers.domain }}', service = '{{ meta.greenweb.providers.service }}' }] - -[org] -credentials = [{% if meta.greenweb.credentials.domain %}{ domain = '{{ meta.greenweb.credentials.domain }}', doctype = '{{meta.greenweb.credentials.doctype }}', url = '{{ meta.greenweb.credentials.url }}' }{% endif %}] \ No newline at end of file +[upstream] providers = [{ domain = '{{ meta.greenweb.providers.domain }}', service = +'{{ meta.greenweb.providers.service }}' }] [org] credentials = +[{% if meta.greenweb.credentials.domain %}{ domain = '{{ meta.greenweb.credentials.domain }}', doctype = +'{{ meta.greenweb.credentials.doctype }}', url = '{{ meta.greenweb.credentials.url }}' }{% endif %}] diff --git a/src/common/feed.njk b/src/common/feed.njk index 3504cd4..4336248 100644 --- a/src/common/feed.njk +++ b/src/common/feed.njk @@ -2,6 +2,8 @@ permalink: /feed.xml eleventyExcludeFromCollections: true excludeFromSitemap: true +eleventyComputed: + absoluteContent: "{{ content | htmlToAbsoluteUrls(url) }}" --- @@ -16,18 +18,16 @@ excludeFromSitemap: true {{ meta.author.name }} {{ meta.author.email }} - {%- for post in postslist %} {%- set absolutePostUrl = post.url | absoluteUrl(meta.url) - %} - - {{ post.data.title }} - - {{ post.date | dateToRfc3339 }} - {{ absolutePostUrl }} - {{ post.templateContent | htmlToAbsoluteUrls(absolutePostUrl) }} - - {%- endfor %} + {%- for post in postslist -%} + {%- set absolutePostUrl = post.url | absoluteUrl(meta.url) -%} + + {{ post.data.title }} + + {{ post.date | dateToRfc3339 }} + {{ absolutePostUrl }} + + {{ post.data.absoluteContent }} + + + {%- endfor -%} diff --git a/src/common/humans.njk b/src/common/humans.njk index f1ff80f..0945273 100644 --- a/src/common/humans.njk +++ b/src/common/humans.njk @@ -3,12 +3,10 @@ permalink: /humans.txt eleventyExcludeFromCollections: true excludeFromSitemap: true --- -/* TEAM */ -Developer: {{ meta.creator.name }} -Contact: {{ meta.creator.email }} -Site: {{ meta.creator.website }} -{% if meta.creator.social %} -Find me on: {{ meta.creator.social }}{% endif %} -/* SITE */ -Doctype: HTML5 +/* TEAM */ Developer: {{ meta.creator.name }} Contact: {{ meta.creator.email }} Site: +{{ meta.creator.website }} +{% if meta.creator.social %} + Find me on: {{ meta.creator.social }} +{% endif %} +/* SITE */ Doctype: HTML5 diff --git a/src/common/og-images.njk b/src/common/og-images.njk index 36cd676..602fd8f 100644 --- a/src/common/og-images.njk +++ b/src/common/og-images.njk @@ -11,78 +11,88 @@ pagination: permalink: '/assets/og-images/{{ post.data.title | slugify }}-preview.svg' eleventyExcludeFromCollections: true --- + + width="1200" + height="630" + viewBox="0 0 1200 630" + version="1.1" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" +> + {% set titleInLines = post.data.title | splitlines(22) %} + {% set numberOfLines = titleInLines.length %} + {% if numberOfLines == 1 %} + {% set verticalStartingPoint = 340 %} + {% elseif numberOfLines == 2 %} + {% set verticalStartingPoint = 290 %} + {% elseif numberOfLines == 3 %} + {% set verticalStartingPoint = 250 %} + {% elseif numberOfLines == 4 %} + {% set verticalStartingPoint = 210 %} + {% elseif numberOfLines == 5 %} + {% set verticalStartingPoint = 170 %} + {% endif %} - {% set titleInLines = post.data.title | splitlines(22) %} - {% set numberOfLines = titleInLines.length %} - {% if numberOfLines == 1 %} - {% set verticalStartingPoint = 340 %} - {% elseif numberOfLines == 2 %} - {% set verticalStartingPoint = 290 %} - {% elseif numberOfLines == 3 %} - {% set verticalStartingPoint = 250 %} - {% elseif numberOfLines == 4 %} - {% set verticalStartingPoint = 210 %} - {% elseif numberOfLines == 5 %} - {% set verticalStartingPoint = 170 %} - {% endif %} + + + + + + + - - - - - - - + + - - - + + + + {{ post.date | formatDate('DD / MM / YYYY') }} + + - - - - {{ post.date | formatDate('DD / MM / YYYY') }} - - + + + {% for line in titleInLines %} + {{ line }} + {% endfor %} + - - - {% for line in titleInLines %} - - {{ line }} - - {% endfor %} - - - - - - {{ meta.siteName }} — {{ siteUrl }} - - \ No newline at end of file + + + + {{ meta.siteName }} — {{ siteUrl }} + + diff --git a/src/common/robots.njk b/src/common/robots.njk index abb425f..f6b8338 100644 --- a/src/common/robots.njk +++ b/src/common/robots.njk @@ -3,19 +3,5 @@ permalink: /robots.txt eleventyExcludeFromCollections: true excludeFromSitemap: true --- -User-agent: * -Disallow: /404.html - -User-agent: GPTbot -Disallow: / - -User-agent: ChatGPT-User -Disallow: / - -User-agent: Google-Extended -Disallow: / - -User-agent: Omgilibot -Disallow: / - -Sitemap: {{ meta.url }}/sitemap.xml \ No newline at end of file +User-agent: * Disallow: /404.html User-agent: GPTbot Disallow: / User-agent: ChatGPT-User Disallow: / +User-agent: Google-Extended Disallow: / User-agent: Omgilibot Disallow: / Sitemap: {{ meta.url }}/sitemap.xml diff --git a/src/common/site-manifest.njk b/src/common/site-manifest.njk index d967dae..a27f2cd 100644 --- a/src/common/site-manifest.njk +++ b/src/common/site-manifest.njk @@ -9,17 +9,17 @@ excludeFromSitemap: true "start_url": "{{ meta.url }}", "icons": [ { - "src": "/android-chrome-192x192.png", + "src": "/icon-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/android-chrome-512x512.png", + "src": "/icon-512x512.png", "sizes": "512x512", "type": "image/png" }, { - "src": "/maskable.png", + "src": "/maskable-icon.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable" diff --git a/src/common/sitemap.njk b/src/common/sitemap.njk index b7eda5d..68ad43e 100644 --- a/src/common/sitemap.njk +++ b/src/common/sitemap.njk @@ -6,13 +6,15 @@ excludeFromSitemap: true {% for page in collections.onlyMarkdown %} - {% if page.url and page.data.excludeFromSitemap != true %} + {% if page.url and page.data.excludeFromSitemap != true %} - {% if page.data.lastUpdated %}{% set lastmod = page.data.lastUpdated %} - {% else %}{% set lastmod = page.date %} - {% endif %} + {% if page.data.lastUpdated %} + {% set lastmod = page.data.lastUpdated %} + {% else %} + {% set lastmod = page.date %} + {% endif %} - + {{ meta.url }}{{ page.url }} {{ lastmod | toIsoString }} {{ page.data.changeFreq if page.data.changeFreq else "monthly" }} diff --git a/src/common/tagList.njk b/src/common/tagList.njk index 019af45..2d13724 100644 --- a/src/common/tagList.njk +++ b/src/common/tagList.njk @@ -9,35 +9,36 @@ eleventyComputed: title: '{{ meta.blog.tagSingle }}: {{ tag }}' --- - -
    - - {% set itemList = collections[tag] | reverse %} {% for item in itemList %} - - {% set activateTags = true %} - - {% set headingContext = "h2" %} - - {% include 'components/card.njk' %} {% endfor %} -
+ + {% set itemList = collections[tag] | reverse %} + {% for item in itemList %} + +

+ {{ item.data.title }} +

+ {% include "partials/date.njk" %} +

{{ item.data.description }}

+ + {% endfor %} +

{{ meta.blog.tagMore }}

- - diff --git a/src/common/tags.njk b/src/common/tags.njk index f909b51..5530dd8 100644 --- a/src/common/tags.njk +++ b/src/common/tags.njk @@ -7,22 +7,19 @@ eleventyComputed:
{% for tag in collections.tagList %} - - {{ tag }} - + {{ tag }} {% endfor %}
- -
    - - {% set itemlist = collections.posts %} {% for item in itemlist %} - - {% set activateTags = true %} - - {% set headingContext = "h2" %} - - {% include 'components/card.njk' %} {% endfor %} -
- - + + {% set itemlist = collections.posts %} + {% for item in itemlist %} + +

+ {{ item.data.title }} +

+ {% include "partials/date.njk" %} +

{{ item.data.description }}

+ + {% endfor %} +