From cf53bab1a8a8006a5ca8964183a1f9f47eeba938 Mon Sep 17 00:00:00 2001 From: madrilene Date: Tue, 15 Nov 2022 09:42:48 +0100 Subject: [PATCH] fixed meta url --- .prettierignore | 1 + src/_data/meta.js | 7 +++--- src/_includes/partials/meta-info.njk | 6 +++--- src/_includes/schemas/base-schema.njk | 26 +++++++++++------------ src/_includes/schemas/blogpost-schema.njk | 4 ++-- src/_includes/schemas/page-schema.njk | 4 ++-- src/_layouts/base.njk | 2 +- src/assets/helperfiles/humans.njk | 12 ++++++++--- src/assets/helperfiles/robots.njk | 3 +-- src/assets/helperfiles/sitemap.njk | 2 +- 10 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..100711c --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +src/assets/helperfiles/* \ No newline at end of file diff --git a/src/_data/meta.js b/src/_data/meta.js index a1ba7e2..9cbc6bc 100644 --- a/src/_data/meta.js +++ b/src/_data/meta.js @@ -1,11 +1,12 @@ const package = require('../../package.json'); module.exports = { + pkv: package.version || 'v1', + url: process.env.URL || 'http://localhost:8080', siteName: 'Eleventy Excellent', siteDescription: "Eleventy starter based on the workflow suggested by Andy Bell's https://buildexcellentwebsit.es/.", siteType: 'Person', // schema - siteURL: 'https://eleventy-excellent.netlify.app', locale: 'en_EN', lang: 'en', skipContent: 'Skip to content', @@ -33,7 +34,5 @@ module.exports = { }, menu: { closedText: 'Menu' - }, - env: process.env.ELEVENTY_ENV === 'production', - pkv: package.version || 'v1' + } }; diff --git a/src/_includes/partials/meta-info.njk b/src/_includes/partials/meta-info.njk index 1f52bb3..9ff9199 100644 --- a/src/_includes/partials/meta-info.njk +++ b/src/_includes/partials/meta-info.njk @@ -22,7 +22,7 @@ - + {% if seo.title %} {{ seo.title }} @@ -47,7 +47,7 @@ <meta name="generator" content="Eleventy" /> <!-- Facebook Open Graph meta --> -<meta property="og:url" content="{{ meta.siteURL }}{{ page.url }}" /> +<meta property="og:url" content="{{ meta.url }}{{ page.url }}" /> <meta property="og:type" content="website" /> <meta property="og:title" @@ -57,7 +57,7 @@ <meta property="og:image" content="{% if meta.env == 'production' %}{{ - meta.siteURL + meta.url }}{% endif %}{% if featured_image %}{{ featured_image | replace('./src', '') }}{% else %}{{ meta.meta_data.opengraph_default }}{% endif %}" diff --git a/src/_includes/schemas/base-schema.njk b/src/_includes/schemas/base-schema.njk index 095cacb..db69ab8 100644 --- a/src/_includes/schemas/base-schema.njk +++ b/src/_includes/schemas/base-schema.njk @@ -1,15 +1,15 @@ <script type="application/ld+json"> - { - "@context": "https://schema.org", - "@graph": [ - { - "@type": "WebSite", - "@id": "{{ meta.siteURL }}#website", - "url": "{{ meta.siteURL }}", - "name": "{{ meta.siteName }}", - "description": "{{ meta[locale].metaDescription }}", - "inLanguage": "{{ meta[locale].localeCode }}" - } - ] - } + { + "@context": "https://schema.org", + "@graph": [ + { + "@type": "WebSite", + "@id": "{{ meta.url }}#website", + "url": "{{ meta.url }}", + "name": "{{ meta.siteName }}", + "description": "{{ meta[locale].metaDescription }}", + "inLanguage": "{{ meta[locale].localeCode }}" + } + ] + } </script> diff --git a/src/_includes/schemas/blogpost-schema.njk b/src/_includes/schemas/blogpost-schema.njk index 928e9c6..4044e17 100644 --- a/src/_includes/schemas/blogpost-schema.njk +++ b/src/_includes/schemas/blogpost-schema.njk @@ -6,7 +6,7 @@ "@type": "WebPage" }, "isPartOf": { - "@id": "{{ meta.siteURL }}#website" + "@id": "{{ meta.url }}#website" }, "@id": "{{ url }}", "headline": "{{ title or meta.siteName }}", @@ -16,7 +16,7 @@ "publisher": { "@type": "{{ meta.siteType }}", "name": "{{ meta.authorName }}", - "url": "{{ meta.siteURL }}" + "url": "{{ meta.url }}" }, "author": { "@type": "Person", diff --git a/src/_includes/schemas/page-schema.njk b/src/_includes/schemas/page-schema.njk index 80f4116..a44a12a 100644 --- a/src/_includes/schemas/page-schema.njk +++ b/src/_includes/schemas/page-schema.njk @@ -5,7 +5,7 @@ "@type": "WebPage" }, "isPartOf": { - "@id": "{{ meta.siteURL }}#website" + "@id": "{{ meta.url }}#website" }, "headline": "{{ title or meta.siteName }}", "description": "{{ seo.description or meta.siteDescription }}", @@ -14,7 +14,7 @@ "publisher": { "@type": "{{ meta.siteType }}", "name": "{{ meta.authorName }}", - "url": "{{ meta.siteURL }}" + "url": "{{ meta.url }}" } } </script> diff --git a/src/_layouts/base.njk b/src/_layouts/base.njk index cf48f70..08d4d18 100644 --- a/src/_layouts/base.njk +++ b/src/_layouts/base.njk @@ -42,7 +42,7 @@ {% endfor %} {% endif %} <!-- include base schema --> - {%- include "schemas/base-schema.njk" %} + {% include "schemas/base-schema.njk" %} </head> <body> diff --git a/src/assets/helperfiles/humans.njk b/src/assets/helperfiles/humans.njk index 0206c94..a485e97 100644 --- a/src/assets/helperfiles/humans.njk +++ b/src/assets/helperfiles/humans.njk @@ -4,6 +4,12 @@ eleventyExcludeFromCollections: true excludeFromSitemap: true --- -/* TEAM */ Developer: {{ meta.author }} Contact: {{ meta.authorEmail }} Site: -{{ meta.siteURL }} {% if meta.meta_data.twitterCreator %}Twitter: -{{ meta.meta_data.twitterCreator }}{% endif %} /* SITE */ Doctype: HTML5 +/* TEAM */ +Developer: {{ meta.author }} +Contact: {{ meta.authorEmail }} +Site: {{ meta.authorWebsite }} +{% if meta.meta_data.twitterCreator %} +Twitter: {{ meta.meta_data.twitterCreator }}{% endif %} + +/* SITE */ +Doctype: HTML5 diff --git a/src/assets/helperfiles/robots.njk b/src/assets/helperfiles/robots.njk index c2d7b91..242a76a 100644 --- a/src/assets/helperfiles/robots.njk +++ b/src/assets/helperfiles/robots.njk @@ -5,5 +5,4 @@ excludeFromSitemap: true --- User-agent: * Disallow: /404.html -Disallow: /google35901daa0ceb7399.html -Sitemap: {{ meta.siteURL }}/sitemap.xml +Sitemap: {{ meta.url }}/sitemap.xml diff --git a/src/assets/helperfiles/sitemap.njk b/src/assets/helperfiles/sitemap.njk index 6292a3e..94d2acb 100644 --- a/src/assets/helperfiles/sitemap.njk +++ b/src/assets/helperfiles/sitemap.njk @@ -13,7 +13,7 @@ excludeFromSitemap: true {% endif %} <url> - <loc>{{ meta.siteURL }}{{ page.url }}</loc> + <loc>{{ meta.url }}{{ page.url }}</loc> <lastmod>{{ lastmod | toIsoString }}</lastmod> </url> {% endif %}