From 5637e2e0c7f5a1aed179155e38224581efbfc6fb Mon Sep 17 00:00:00 2001 From: mortendk Date: Wed, 28 Jun 2023 23:32:20 +0200 Subject: [PATCH 1/5] added image --- package.json | 2 +- src/_system/_decapcms/contenttypes/tag.liquid | 13 ++++++++ src/content/tag/saga11.md | 4 +-- src/theme-grunn/layouts/tag/tag.liquid | 32 ++++++++++--------- 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index d31175c1..20182c06 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "scripts": { "start": "npx netlify-cms-proxy-server & npm run watch", "clean": "rm -rf _site", - "setup": "cp env-example .env", + "local-setup": "cp env-example .env", "watch": "npx @11ty/eleventy --serve --quiet & npm run tw:watch", "build": "npm run tw:build && npm run 11ty:build", "11ty:build": "ELEVENTY_ENV=prod eleventy", diff --git a/src/_system/_decapcms/contenttypes/tag.liquid b/src/_system/_decapcms/contenttypes/tag.liquid index 8f224b37..af0c3c9c 100644 --- a/src/_system/_decapcms/contenttypes/tag.liquid +++ b/src/_system/_decapcms/contenttypes/tag.liquid @@ -22,6 +22,17 @@ hint: "" %} +{% include "_system/_decapcms/widgets/image", + name: "image", + label: "Image", + default: "" + choose_url: true, + allow_multiple: false, + required: "false", + hint: "" +%} + + {% include "_system/_decapcms/widgets/markdown", name: "body", label: "Body", @@ -30,6 +41,8 @@ hint: "help text" %} +{% include "_system/_decapcms/fields/card.liquid" %} + {% include "_system/_decapcms/fields/opengraph.liquid" %} {% include "_system/_decapcms/fields/seo.liquid" %} diff --git a/src/content/tag/saga11.md b/src/content/tag/saga11.md index 5c11d226..dbf11361 100644 --- a/src/content/tag/saga11.md +++ b/src/content/tag/saga11.md @@ -3,11 +3,11 @@ title: Saga 11 icon: icons/arrow-down-left.svg eleventyExcludeFromCollections: false rssfeed: true +image: /content/upload/saga11icon.svg eleventyNavigation: title: "" parent: "" order: 20 layout: tag/tag.liquid --- - -This is a Tag page +Tο»Ώhe tag page for "Saga11" \ No newline at end of file diff --git a/src/theme-grunn/layouts/tag/tag.liquid b/src/theme-grunn/layouts/tag/tag.liquid index 3102a96b..32629e2c 100644 --- a/src/theme-grunn/layouts/tag/tag.liquid +++ b/src/theme-grunn/layouts/tag/tag.liquid @@ -12,10 +12,6 @@ tags: That then refers to the file tag/saga11.md that constainss all the data the we use on this page. {% endcomment %} -{% comment %} -this dosnt rewally work.. -{% endcomment %} -
@@ -24,25 +20,31 @@ this dosnt rewally work..

{{ title }}

-
+
{{ content }}
{% for item in collections[page.fileSlug] %} - {% render 'card', - title: item.data.card.title, - text: item.data.card.text, - image: item.data.card.image, - url: item.url, - date: item.date + + {% assign title = item.data.card.title | default: item.data.title %} + {% assign image = item.data.card.image | default: item.data.image %} + {% assign text = item.data.card.text | default: item.data.text | truncatewords: "20", " ..." %} + {% + render 'card.liquid', + title: title, + text: text, + image: image, + url: item.url, + date: item.date %} + {% endfor %}
- -
{% include "svg/rss.svg" %}
-
{{ title }} feed
- + +
{% include "svg/rss.svg" %}
+
{{ title }} feed
+ From 1d2d2c18d16b707e5daf7989d28dfc7612332f1c Mon Sep 17 00:00:00 2001 From: mortendk Date: Wed, 28 Jun 2023 23:36:00 +0200 Subject: [PATCH 2/5] Update tag.liquid --- src/_system/_decapcms/contenttypes/tag.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_system/_decapcms/contenttypes/tag.liquid b/src/_system/_decapcms/contenttypes/tag.liquid index af0c3c9c..c05bd490 100644 --- a/src/_system/_decapcms/contenttypes/tag.liquid +++ b/src/_system/_decapcms/contenttypes/tag.liquid @@ -25,7 +25,7 @@ {% include "_system/_decapcms/widgets/image", name: "image", label: "Image", - default: "" + default: "/content/upload/default.png" choose_url: true, allow_multiple: false, required: "false", From 241f0d04a5d8aa1e1ed170c5ce18b6359bd656fa Mon Sep 17 00:00:00 2001 From: mortendk Date: Wed, 28 Jun 2023 23:36:21 +0200 Subject: [PATCH 3/5] Update tag.liquid --- src/_system/_decapcms/contenttypes/tag.liquid | 1 - 1 file changed, 1 deletion(-) diff --git a/src/_system/_decapcms/contenttypes/tag.liquid b/src/_system/_decapcms/contenttypes/tag.liquid index c05bd490..57617329 100644 --- a/src/_system/_decapcms/contenttypes/tag.liquid +++ b/src/_system/_decapcms/contenttypes/tag.liquid @@ -32,7 +32,6 @@ hint: "" %} - {% include "_system/_decapcms/widgets/markdown", name: "body", label: "Body", From d74321e8fc6d5223a1a33a501a7b5ad965b21d15 Mon Sep 17 00:00:00 2001 From: mortendk Date: Wed, 28 Jun 2023 23:37:16 +0200 Subject: [PATCH 4/5] Update menuitem.liquid --- src/_system/_decapcms/contenttypes/menuitem.liquid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/_system/_decapcms/contenttypes/menuitem.liquid b/src/_system/_decapcms/contenttypes/menuitem.liquid index c7b53f9d..3b79d9aa 100644 --- a/src/_system/_decapcms/contenttypes/menuitem.liquid +++ b/src/_system/_decapcms/contenttypes/menuitem.liquid @@ -1,6 +1,6 @@ - # ----------------------------------------------------------------- + # --------------------------------------------------------------- # Menu Items - # ----------------------------------------------------------------- + # --------------------------------------------------------------- - name: menuitem label: πŸ” Menu Items label_singular: πŸ” Menu Item From 17a9a546648e2dfcea8ecb6572ec23ad5f0fd4a8 Mon Sep 17 00:00:00 2001 From: mortendk Date: Wed, 28 Jun 2023 23:37:20 +0200 Subject: [PATCH 5/5] Update tag.liquid --- src/_system/_decapcms/contenttypes/tag.liquid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/_system/_decapcms/contenttypes/tag.liquid b/src/_system/_decapcms/contenttypes/tag.liquid index 57617329..cef27645 100644 --- a/src/_system/_decapcms/contenttypes/tag.liquid +++ b/src/_system/_decapcms/contenttypes/tag.liquid @@ -1,6 +1,6 @@ - # ----------------------------------------------------------------- + # --------------------------------------------------------------- # Relations Tags - # ----------------------------------------------------------------- + # --------------------------------------------------------------- - name: tags label_singular: 🏷 Tag label: 🏷 Tags