From 71de53574586ea9af61501dedc97819e77e24552 Mon Sep 17 00:00:00 2001
From: madrilene <hola@lenesaile.com>
Date: Wed, 14 Aug 2024 08:13:46 +0200
Subject: [PATCH] remove layouts for home and blog

---
 eleventy.config.js               |  4 +--
 src/_layouts/home.njk            | 41 ---------------------
 src/pages/blog.md                | 12 -------
 src/{_layouts => pages}/blog.njk | 23 ++++++++----
 src/pages/index.md               | 20 -----------
 src/pages/index.njk              | 61 ++++++++++++++++++++++++++++++++
 6 files changed, 78 insertions(+), 83 deletions(-)
 delete mode 100644 src/_layouts/home.njk
 delete mode 100644 src/pages/blog.md
 rename src/{_layouts => pages}/blog.njk (58%)
 delete mode 100644 src/pages/index.md
 create mode 100644 src/pages/index.njk

diff --git a/eleventy.config.js b/eleventy.config.js
index d780aec..6ca9490 100644
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -30,9 +30,7 @@ export default async function (eleventyConfig) {
 
   // --------------------- layout aliases
   eleventyConfig.addLayoutAlias('base', 'base.njk');
-  eleventyConfig.addLayoutAlias('home', 'home.njk');
   eleventyConfig.addLayoutAlias('page', 'page.njk');
-  eleventyConfig.addLayoutAlias('blog', 'blog.njk');
   eleventyConfig.addLayoutAlias('post', 'post.njk');
   eleventyConfig.addLayoutAlias('tags', 'tags.njk');
 
@@ -45,7 +43,7 @@ export default async function (eleventyConfig) {
   eleventyConfig.addPlugin(plugins.htmlConfig);
   eleventyConfig.addPlugin(plugins.cssConfig);
   eleventyConfig.addPlugin(plugins.jsConfig);
-	eleventyConfig.addPlugin(plugins.drafts);
+  eleventyConfig.addPlugin(plugins.drafts);
 
   eleventyConfig.addPlugin(plugins.EleventyRenderPlugin);
   eleventyConfig.addPlugin(plugins.rss);
diff --git a/src/_layouts/home.njk b/src/_layouts/home.njk
deleted file mode 100644
index 8f4b284..0000000
--- a/src/_layouts/home.njk
+++ /dev/null
@@ -1,41 +0,0 @@
----
-layout: base
----
-
-<div class="wrapper">
-  <header class="full | section" style="--spot-color: var(--color-primary)">
-    <div class="section__inner flow region">
-      <h1 class="text-center text-base-light">{{ title }}</h1>
-    </div>
-
-    {% svg "divider/waves", null, "seperator" %}
-  </header>
-
-  <article class="full | region">
-    <div class="wrapper flow prose">{{ content | safe }}</div>
-  </article>
-
-  <section class="full | region">
-    <div class="wrapper flow prose">
-      <h2>{{ blog.title }}</h2>
-      <!-- blog intro text is optional. -->
-
-      {% if blog.intro %}
-        <p>{{ blog.intro }}</p>
-      {% endif %}
-
-      <div class="feature |  region">
-        <custom-masonry layout="50-50">
-          <!-- loop posts -->
-          {% set itemList = collections.allPosts %}
-          {% asyncEach item in itemList.slice(0, 4) %}
-            {% set definedDate = item.date %}
-
-            {% include "partials/card-blog.njk" %}
-
-          {% endeach %}
-        </custom-masonry>
-      </div>
-    </div>
-  </section>
-</div>
diff --git a/src/pages/blog.md b/src/pages/blog.md
deleted file mode 100644
index f1b6d89..0000000
--- a/src/pages/blog.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Blog
-description: 'All blog posts can be found here'
-layout: blog
-pagination:
-  data: collections.allPosts
-  size: 6
-permalink: 'blog/{% if pagination.pageNumber >=1  %}page-{{ pagination.pageNumber + 1 }}/{% endif %}index.html'
----
-
-This blog has a pagination of **{{ pagination.size }}** posts per page.
-The pagination is only shown if there are more posts ({{ collections.posts.length }}) than items per page ({{ pagination.size }}).
diff --git a/src/_layouts/blog.njk b/src/pages/blog.njk
similarity index 58%
rename from src/_layouts/blog.njk
rename to src/pages/blog.njk
index c2110c7..0be46ac 100644
--- a/src/_layouts/blog.njk
+++ b/src/pages/blog.njk
@@ -1,5 +1,11 @@
 ---
 layout: base
+title: Blog
+description: 'All blog posts can be found here'
+pagination:
+  data: collections.allPosts
+  size: 6
+permalink: 'blog/{% if pagination.pageNumber >=1 %}page-{{ pagination.pageNumber + 1 }}/{% endif %}index.html'
 ---
 
 <article class="wrapper">
@@ -11,16 +17,19 @@ layout: base
     {% svg "divider/edgy", null, "seperator" %}
   </header>
 
-  <div class="region flow prose" style="--region-space-top: var(--space-xl-2xl)">{{ content | safe }}</div>
+  <div class="region flow prose" style="--region-space-top: var(--space-xl-2xl)">
+    <p>This blog has a pagination of <strong>{{ pagination.size }}</strong> posts per page.<br>
+      The pagination is only shown if there are more posts ({{ collections.posts.length }}) than items per
+      page ({{ pagination.size }}).
+    </p>
+  </div>
 
   <custom-masonry layout="50-50">
+		{% asyncEach item in pagination.items %}
+			{% set definedDate = item.date %}
 
-	{% asyncEach item in pagination.items %}
-		{% set definedDate = item.date %}
-
-		{% include "partials/card-blog.njk" %}
-	{% endeach %}
-
+			{% include "partials/card-blog.njk" %}
+		{% endeach %}
 	</custom-masonry>
 
   <!-- set collection to paginate -->
diff --git a/src/pages/index.md b/src/pages/index.md
deleted file mode 100644
index d6079e3..0000000
--- a/src/pages/index.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-permalink: /index.html
-title: 'Eleventy Excellent'
-description: 'Eleventy starter using modern CSS, fluid type, fluid spacing, flexible layout and progressive enhancement.'
-layout: 'home'
-blog:
-  title: 'Blog'
-  intro: "I'm showing the last 4 blog posts, but there might be more!"
----
-
-## An Eleventy starter
-
-Built around a CSS workflow that emphasizes guiding browser styling rather than micromanaging it. It incorporates progressive enhancement, fluid type and spacing, and utilizes modern CSS features for layout. The goal is to develop frontends that provide a great experience across all devices, connection speeds, and usage contexts.
-
-**This is version 3.**
-I keep a [branch of v1](https://github.com/madrilene/eleventy-excellent/tree/v1) and [v2](https://github.com/madrilene/eleventy-excellent/tree/v2) because I have changed a lot of things.
-I have tried to [document](/get-started/#docs-lol) most features and methodologies.
-
-**Have fun** and let me know if you find any issues or have ideas for improvements!
-
diff --git a/src/pages/index.njk b/src/pages/index.njk
new file mode 100644
index 0000000..02310c8
--- /dev/null
+++ b/src/pages/index.njk
@@ -0,0 +1,61 @@
+---
+layout: base
+permalink: /index.html
+title: 'Eleventy Excellent'
+description: 'Eleventy starter using modern CSS, fluid type, fluid spacing, flexible layout and progressive enhancement.'
+blog:
+  title: 'Blog'
+  intro: "I'm showing the last 4 blog posts, but there might be more!"
+---
+
+<div class="wrapper">
+  <header class="full | section" style="--spot-color: var(--color-primary)">
+    <div class="section__inner flow region">
+      <h1 class="text-center text-base-light">{{ title }}</h1>
+    </div>
+
+    {% svg "divider/waves", null, "seperator" %}
+  </header>
+
+  <article class="full | region">
+    <div class="wrapper flow prose">
+      <h2 id="an-eleventy-starter">An Eleventy starter</h2>
+      <p>
+        Built around a CSS workflow that emphasizes guiding browser styling rather than micromanaging it. It
+        incorporates progressive enhancement, fluid type and spacing, and utilizes modern CSS features for
+        layout. The goal is to develop frontends that provide a great experience across all devices,
+        connection speeds, and usage contexts.
+      </p>
+      <p>
+        <strong>This is version 3.</strong> I keep a
+        <a href="https://github.com/madrilene/eleventy-excellent/tree/v1">branch of v1</a> and
+        <a href="https://github.com/madrilene/eleventy-excellent/tree/v2">v2</a> because I have changed a lot
+        of things. I have tried to <a href="/get-started/#docs-lol">document</a> most features and
+        methodologies.
+      </p>
+      <p><strong>Have fun</strong> and let me know if you find any issues or have ideas for improvements!</p>
+    </div>
+  </article>
+
+  <section class="full | region">
+    <div class="wrapper flow prose">
+      <h2>{{ blog.title }}</h2>
+      <!-- blog intro text is optional. -->
+
+      {% if blog.intro %}
+        <p>{{ blog.intro }}</p>
+      {% endif %}
+
+      <div class="feature |  region">
+        <custom-masonry layout="50-50">
+          <!-- loop posts -->
+          {% set itemList = collections.allPosts %}
+					{% asyncEach item in itemList.slice(0, 4) %}
+						{% set definedDate = item.date %}
+						{% include "partials/card-blog.njk" %}
+					{% endeach %}
+        </custom-masonry>
+      </div>
+    </div>
+  </section>
+</div>