From a9424415445a0b7b6b8fbf5dbef9a56181bc3c9d Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Fri, 16 Aug 2019 13:05:43 +0200
Subject: [PATCH] Implement mainSections for home page and replace .Data.Pages
 with alias .Pages.

---
 layouts/_default/list.html      | 2 +-
 layouts/_default/list.json.json | 2 +-
 layouts/_default/rss.xml        | 2 +-
 layouts/index.html              | 6 ++++++
 layouts/micro/list.html         | 2 +-
 layouts/micro/list.json.json    | 2 +-
 layouts/micro/rss.xml           | 2 +-
 layouts/podcast/rss.xml         | 2 +-
 8 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index d1221fa..5d560f6 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,7 +1,7 @@
 {{ define "main" -}}
 <main class="main layout__main">
 <h1 class="title">{{ .Title }}</h1>
-{{ $paginator := .Paginate (.Data.Pages) -}}
+{{ $paginator := .Paginate (.Pages) -}}
 {{ range $paginator.Pages -}}
 {{ .Render "summary"}}
 {{ end -}}
diff --git a/layouts/_default/list.json.json b/layouts/_default/list.json.json
index 72df28f..c6bc3e4 100644
--- a/layouts/_default/list.json.json
+++ b/layouts/_default/list.json.json
@@ -1,4 +1,4 @@
-{{ $list := .Data.Pages -}}
+{{ $list := .Pages -}}
 {{ $length := (len $list) -}}
 {
     "version" : "https://jsonfeed.org/version/1",
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index c04ee7e..e41afbf 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -22,7 +22,7 @@
     {{ with .OutputFormats.Get "RSS" -}}
       {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
     {{ end -}}
-    {{ range .Data.Pages }}
+    {{ range .Pages }}
     <item>
       <title>{{ .Title }}</title>
       <link>{{ .Permalink }}</link>
diff --git a/layouts/index.html b/layouts/index.html
index 6b34404..640e820 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -7,5 +7,11 @@
 {{ .Content }}
 </div>
 </article>
+
+{{ $pages := where .Site.RegularPages "Type" "in" .Site.Params.mainSections }}
+{{ range $pages -}}
+{{ .Render "summary"}}
+{{ end -}}
+
 </main>
 {{ end }}
diff --git a/layouts/micro/list.html b/layouts/micro/list.html
index 4dc41c8..df9e49a 100644
--- a/layouts/micro/list.html
+++ b/layouts/micro/list.html
@@ -3,7 +3,7 @@
 <h1 class="title">Micro posts</h1>
 <p class="micro__follow"><a href="https://micro.blog/{{ with $.Param "microusername" }}{{ . }}{{ end }}">{{ i18n "string_follow" }} @{{ with $.Param "microusername" }}{{ . }}{{ end }}</a></p>
 
-{{ $paginator := .Paginate (.Data.Pages) -}}
+{{ $paginator := .Paginate (.Pages) -}}
 {{ range $paginator.Pages -}}
 {{ .Render "summary"}}
 {{ end -}}
diff --git a/layouts/micro/list.json.json b/layouts/micro/list.json.json
index 5f0ee4f..5046229 100644
--- a/layouts/micro/list.json.json
+++ b/layouts/micro/list.json.json
@@ -1,4 +1,4 @@
-{{ $list := .Data.Pages -}}
+{{ $list := .Pages -}}
 {{ $length := (len $list) -}}
 {
     "version" : "https://jsonfeed.org/version/1",
diff --git a/layouts/micro/rss.xml b/layouts/micro/rss.xml
index c87b623..681e8d1 100644
--- a/layouts/micro/rss.xml
+++ b/layouts/micro/rss.xml
@@ -22,7 +22,7 @@
     {{ with .OutputFormats.Get "RSS" -}}
       {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
     {{ end -}}
-    {{ range .Data.Pages }}
+    {{ range .Pages }}
     <item>
       <link>{{ .Permalink }}</link>
       <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
diff --git a/layouts/podcast/rss.xml b/layouts/podcast/rss.xml
index c7014be..f87e92e 100644
--- a/layouts/podcast/rss.xml
+++ b/layouts/podcast/rss.xml
@@ -39,7 +39,7 @@
     {{ with .Site.Params.Podcast.Complete }}<itunes:complete>{{ . }}</itunes:complete>{{ end }}
     {{ with .Site.Params.Podcast.NewFeed }}<itunes:new-feed-url>{{ . }}</itunes:new-feed-url>{{ end }}
     <itunes:explicit>{{ if .Site.Params.Podcast.Explicit }}true{{ else }}false{{ end }}</itunes:explicit>
-    {{ range .Data.Pages }}
+    {{ range .Pages }}
     <item>
       <title>{{ .Title }}</title>
       <itunes:title>{{ .Title }}</itunes:title>