From 0b28a1ec712445ada348d2d8ca2701c83725cd1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=CC=81scar=20M=2E=20Lage?= <info@oscarmlage.com>
Date: Tue, 1 Mar 2022 00:00:19 +0100
Subject: [PATCH] Fix: theme and layouts various updates

---
 src/content/sections/about.md                 | 15 +++++++++++++--
 src/content/sections/archive.md               |  5 +++--
 src/themes/oscar/layouts/index.html           | 17 ++++++++++++++---
 .../oscar/layouts/partials/pagination.html    |  3 +--
 .../layouts/partials/posts/pagination.html    |  4 ++--
 src/themes/oscar/layouts/posts/list.html      | 19 +++++++++----------
 src/themes/oscar/layouts/posts/single.html    |  1 -
 src/themes/oscar/layouts/sections/single.html |  6 +-----
 8 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/src/content/sections/about.md b/src/content/sections/about.md
index cd7dbe7..cfa39b5 100644
--- a/src/content/sections/about.md
+++ b/src/content/sections/about.md
@@ -4,7 +4,18 @@ date: 2021-10-22T10:44:54Z
 draft: false
 ---
 
-# About
-
 About
 
+## Colophon
+
+Lorem...
+
+## Social
+
+- 🔴 [Youtube Principal](https://www.youtube.com/c/oscarmlage)
+- 🔴 [Youtube VODs](https://www.youtube.com/channel/UCXOWqIc9Qh8nEBoxBVNnjyQ)
+- 🟣 [Twitch](https://twitch.tv/oscarmlag)
+- 🟡 [Github](https://github.com/oscarmlage)
+- 🔵 [Twitter](https://twitter.com/oscarmlage)
+- 🟠 [Instagram](https://instagram.com/oscarmlage)
+- 🟢 [Web](https://oscarmlage.com)
diff --git a/src/content/sections/archive.md b/src/content/sections/archive.md
index 8b0416a..bb060f0 100644
--- a/src/content/sections/archive.md
+++ b/src/content/sections/archive.md
@@ -1,7 +1,8 @@
 ---
 title: "Archive"
-date: 2021-10-22T10:44:54Z
+date: 2001-10-22T10:44:54Z
 draft: false
+layout: archive
 ---
 
-# Archive
+My custom archive
diff --git a/src/themes/oscar/layouts/index.html b/src/themes/oscar/layouts/index.html
index 94d0778..cc574f1 100644
--- a/src/themes/oscar/layouts/index.html
+++ b/src/themes/oscar/layouts/index.html
@@ -2,15 +2,26 @@
 
 <main class="main wrapper">
 
+    <div class="hero">
+        {{ range (where .Site.Pages "Type" "heros") }}
+        <div {{ if .Params.current }}class="active"{{ end }}>
+            {{ if .Params.link }}<a href="{{ .Params.link }}">{{ end }}
+            {{ if .Params.image }}
+            <img src="heros/{{ .Params.image }}"
+                 alt="{{ .Content | plainify | htmlUnescape | truncate 10 }}" />
+            {{ end }}
+            {{ .Content }}
+            {{ if .Params.link }}</a>{{ end }}
+        </div>
+        {{ end }}
+    </div>
+
 	<div class="posts-container">
 		{{ range (.Paginate (where .Site.RegularPages "Type" "posts")).Pages }}
 			{{ .Render "summary" }}
 		{{ end }}
 	</div>
 
-	<div class="pagination">
-        {{ partial "pagination.html" . }}
-	</div>
 </main>
 
 {{ end }}
diff --git a/src/themes/oscar/layouts/partials/pagination.html b/src/themes/oscar/layouts/partials/pagination.html
index 5f4cfe9..a22f5ce 100644
--- a/src/themes/oscar/layouts/partials/pagination.html
+++ b/src/themes/oscar/layouts/partials/pagination.html
@@ -1,8 +1,7 @@
 {{ if .Paginator.HasPrev }}
     <a href="{{ .Paginator.Prev.URL }}" class="left arrow" rel="prev">&#8592;</a>
 {{ end }}
+<span>{{ .Paginator.PageNumber }}</span>
 {{ if .Paginator.HasNext }}
     <a href="{{ .Paginator.Next.URL }}" class="right arrow" rel="next">&#8594;</a>
 {{ end }}
-
-<span>{{ .Paginator.PageNumber }}</span>
diff --git a/src/themes/oscar/layouts/partials/posts/pagination.html b/src/themes/oscar/layouts/partials/posts/pagination.html
index fdcd30c..7bdc3aa 100644
--- a/src/themes/oscar/layouts/partials/posts/pagination.html
+++ b/src/themes/oscar/layouts/partials/posts/pagination.html
@@ -1,7 +1,7 @@
 
 		{{- if .PrevPage }}
-		<a href="{{ .PrevPage.RelPermalink }}" class="left arrow">&#8592;</a>
+        <a href="{{ .PrevPage.RelPermalink }}" class="left arrow">&#8592; {{ .PrevPage.Title }}</a>
 		{{- end }}
 		{{- if .NextPage }}
-		<a href="{{ .NextPage.RelPermalink }}" class="right arrow">&#8594;</a>
+        | <a href="{{ .NextPage.RelPermalink }}" class="right arrow">{{ .NextPage.Title }} &#8594;</a>
 		{{- end }}
diff --git a/src/themes/oscar/layouts/posts/list.html b/src/themes/oscar/layouts/posts/list.html
index 51c7545..cbc8dd4 100644
--- a/src/themes/oscar/layouts/posts/list.html
+++ b/src/themes/oscar/layouts/posts/list.html
@@ -1,17 +1,16 @@
 {{ define "main" }}
 
-<main>
-    <h1>List: Posts</h1>
-	<div class="catalogue">
-		{{ range (.Paginate .Pages).Pages }}
-			{{ .Render "summary" }}
-		{{ end }}
-	</div>
+<main class="main wrapper">
 
-	<div class="pagination">
+    <div class="posts-container">
+        {{ range (.Paginate (where .Site.RegularPages "Type" "posts")).Pages }}
+            {{ .Render "summary" }}
+        {{ end }}
+    </div>
+
+    <div class="pagination">
         {{ partial "pagination.html" . }}
-	</div>
+    </div>
 </main>
 
 {{ end }}
-
diff --git a/src/themes/oscar/layouts/posts/single.html b/src/themes/oscar/layouts/posts/single.html
index 74ddc2e..b2879ce 100644
--- a/src/themes/oscar/layouts/posts/single.html
+++ b/src/themes/oscar/layouts/posts/single.html
@@ -14,7 +14,6 @@
 
     <div class="pagination">
         {{ partial "posts/pagination.html" . }}
-        <a href="#" class="top">Top</a>
     </div>
 </main>
 
diff --git a/src/themes/oscar/layouts/sections/single.html b/src/themes/oscar/layouts/sections/single.html
index 5cdf475..b8081d4 100644
--- a/src/themes/oscar/layouts/sections/single.html
+++ b/src/themes/oscar/layouts/sections/single.html
@@ -1,16 +1,12 @@
 {{ define "main" }}
 
 <main class="main wrapper">
-    <h1>Single: Sections</h1>
+    <h1>{{ .Title }}</h1>
 	<div class="post">
 
         {{ .Content }}
 
 	</div>
-
-	<div class="pagination">
-		<a href="#" class="top">Top</a>
-	</div>
 </main>
 
 {{ end }}