From b9213d854ef25da20d4c8b783cdda180d873df81 Mon Sep 17 00:00:00 2001
From: Sam Toohey <hello@samtoohey.xyz>
Date: Thu, 30 May 2024 16:50:30 +1000
Subject: [PATCH 1/2] Update Fix

Rebased from PR 145, to resolve issues for the 404 template as suggested my MC as well as resolving accidental push onto the existing #145 branch

this resolves both #144 and #145
---
 poetry/parts/secondary-header.html | 21 ++++++++++++++++++
 poetry/templates/404.html          | 34 +++++++++++++++++++++++++++++-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 poetry/parts/secondary-header.html

diff --git a/poetry/parts/secondary-header.html b/poetry/parts/secondary-header.html
new file mode 100644
index 00000000..d2ae1962
--- /dev/null
+++ b/poetry/parts/secondary-header.html
@@ -0,0 +1,21 @@
+<!-- wp:group {"tagName":"header","style":{"spacing":{"padding":{"top":"32px","bottom":"32px"}}},"layout":{"type":"constrained"}} -->
+    <div class="wp-block-group" style="padding-top:32px;padding-bottom:32px">
+        <!-- wp:group {"style":{"spacing":{"blockGap":"64px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+        <div class="wp-block-group">
+            <!-- wp:group {"style":{"spacing":{"blockGap":"88px"}},"layout":{"type":"flex","orientation":"vertical"}} -->
+            <div class="wp-block-group">
+                <!-- wp:site-title {"level":0,"isLink":false,"style":{"typography":{"fontSize":"24px","fontStyle":"normal","fontWeight":"600"}},"textColor":"custom-text"} /-->
+    
+                <!-- wp:group {"style":{"spacing":{"blockGap":"48px"}},"layout":{"type":"flex","orientation":"vertical"}} -->
+                <div class="wp-block-group">
+                    <!-- wp:heading {"level":1,"style":{"typography":{"fontSize":"58px"}}} -->
+                    <h1 class="wp-block-heading" style="font-size:58px">Alas, where words once wandered</h1>
+                    <!-- /wp:heading -->
+                </div>
+                <!-- /wp:group -->
+            </div>
+            <!-- /wp:group -->
+        </div>
+        <!-- /wp:group -->
+    </div>
+    <!-- /wp:group -->
\ No newline at end of file
diff --git a/poetry/templates/404.html b/poetry/templates/404.html
index 16c366f1..41b968ce 100644
--- a/poetry/templates/404.html
+++ b/poetry/templates/404.html
@@ -1,3 +1,34 @@
+<<<<<<< HEAD
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"32px","bottom":"32px"}}},"layout":{"type":"constrained"}} -->
+    <div class="wp-block-group" style="padding-top:32px;padding-bottom:32px">
+        <!-- wp:group {"style":{"spacing":{"blockGap":"64px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+        <div class="wp-block-group">
+            <!-- wp:group {"style":{"spacing":{"blockGap":"88px"}},"layout":{"type":"flex","orientation":"vertical"}} -->
+            <div class="wp-block-group">
+                <!-- wp:site-title {"level":0,"isLink":false,"style":{"typography":{"fontSize":"24px","fontStyle":"normal","fontWeight":"600"}},"textColor":"custom-text"} /-->
+    
+                <!-- wp:group {"style":{"spacing":{"blockGap":"48px"}},"layout":{"type":"flex","orientation":"vertical"}} -->
+                <div class="wp-block-group"><!-- wp:heading {"level":1} -->
+                    <h1 class="wp-block-heading">Alas, <br>where words once wandered</h1>
+                    <!-- /wp:heading -->
+                </div>
+                <!-- /wp:group -->
+            </div>
+            <!-- /wp:group -->
+        </div>
+        <!-- /wp:group -->
+    </div>
+    <!-- /wp:group -->
+    
+    <!-- wp:group {"style":{"spacing":{"padding":{"top":"32px","bottom":"64px"}}},"layout":{"type":"constrained"}} -->
+    <div class="wp-block-group" style="padding-top:32px;padding-bottom:64px"><!-- wp:heading {"level":5} -->
+        <h5 class="wp-block-heading">It looks like nothing was found at this location. Try a search.</h5>
+        <!-- /wp:heading -->
+    
+        <!-- wp:search {"label":"Search...","buttonText":"Search","buttonUseIcon":true} /-->
+    </div>
+    <!-- /wp:group -->
+=======
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|80","bottom":"var:preset|spacing|80"},"margin":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}}},"layout":{"type":"constrained"}} -->
@@ -10,4 +41,5 @@ <h2 class="wp-block-heading has-text-align-center">404<br>Not found</h2>
 <!-- /wp:paragraph --></div>
 <!-- /wp:group -->
 
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
+>>>>>>> dfce47d (Creates template files for Poetrye's search and 404 pages (#141))

From 01cf8760989845bdac04b2c857b5eb9c1867d360 Mon Sep 17 00:00:00 2001
From: Sam Toohey <hello@samtoohey.xyz>
Date: Wed, 26 Jun 2024 14:22:55 +1000
Subject: [PATCH 2/2] Update 404.html

Using the GH CLI I think I have resolved the conflicts here.
---
 poetry/templates/404.html | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/poetry/templates/404.html b/poetry/templates/404.html
index 41b968ce..a8645eea 100644
--- a/poetry/templates/404.html
+++ b/poetry/templates/404.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <!-- wp:group {"style":{"spacing":{"padding":{"top":"32px","bottom":"32px"}}},"layout":{"type":"constrained"}} -->
     <div class="wp-block-group" style="padding-top:32px;padding-bottom:32px">
         <!-- wp:group {"style":{"spacing":{"blockGap":"64px"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
@@ -28,18 +27,3 @@ <h5 class="wp-block-heading">It looks like nothing was found at this location. T
         <!-- wp:search {"label":"Search...","buttonText":"Search","buttonUseIcon":true} /-->
     </div>
     <!-- /wp:group -->
-=======
-<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
-
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|80","bottom":"var:preset|spacing|80"},"margin":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group" style="margin-top:var(--wp--preset--spacing--50);margin-bottom:var(--wp--preset--spacing--50);padding-top:var(--wp--preset--spacing--80);padding-bottom:var(--wp--preset--spacing--80)"><!-- wp:heading {"textAlign":"center"} -->
-<h2 class="wp-block-heading has-text-align-center">404<br>Not found</h2>
-<!-- /wp:heading -->
-
-<!-- wp:paragraph {"align":"center"} -->
-<p class="has-text-align-center">The server could not find the requested page.</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->
-
-<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
->>>>>>> dfce47d (Creates template files for Poetrye's search and 404 pages (#141))