From 8fb2b000a089bdd28b94093eda26a99344d0aa1f Mon Sep 17 00:00:00 2001
From: christian medders <christian.medders@bixal.com>
Date: Tue, 21 Nov 2023 11:46:07 -0500
Subject: [PATCH 1/5] added new theme suggestion into file

---
 web/themes/custom/votegov/votegov.theme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/themes/custom/votegov/votegov.theme b/web/themes/custom/votegov/votegov.theme
index 448e4d20f..80c1a8c57 100644
--- a/web/themes/custom/votegov/votegov.theme
+++ b/web/themes/custom/votegov/votegov.theme
@@ -8,3 +8,4 @@
 require_once dirname(__FILE__) . '/php-includes/block.inc';
 require_once dirname(__FILE__) . '/php-includes/navigation.inc';
 require_once dirname(__FILE__) . '/php-includes/preprocess.inc';
+require_once dirname(__FILE__) . '/php-includes/page.inc';

From 6533dca1058e2b84ca04394c4d49d5000391825f Mon Sep 17 00:00:00 2001
From: christian medders <christian.medders@bixal.com>
Date: Tue, 21 Nov 2023 11:47:08 -0500
Subject: [PATCH 2/5] Vote-418: new theme suggestion

---
 web/themes/custom/votegov/php-includes/page.inc | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 web/themes/custom/votegov/php-includes/page.inc

diff --git a/web/themes/custom/votegov/php-includes/page.inc b/web/themes/custom/votegov/php-includes/page.inc
new file mode 100644
index 000000000..4014652dc
--- /dev/null
+++ b/web/themes/custom/votegov/php-includes/page.inc
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @file
+ * Preprocess function for page.
+ */
+
+/*
+ * Implements hook_theme_suggestion_HOOK_alter().
+ */
+function votegov_theme_suggestions_page_alter(array &$suggestions, array $variables) {
+  if ($node = \Drupal::routeMatch()->getParameter('node')) {
+    $suggestions[] = "page__node__" . $node->bundle();
+  }
+}
\ No newline at end of file

From c8d1f05d69a4f96f800bd175bc863d5e4e99029c Mon Sep 17 00:00:00 2001
From: christian medders <christian.medders@bixal.com>
Date: Tue, 21 Nov 2023 11:47:22 -0500
Subject: [PATCH 3/5] Vote-418: New layout for landing page

---
 .../templates/layout/page--node--landing.html.twig       | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 web/themes/custom/votegov/templates/layout/page--node--landing.html.twig

diff --git a/web/themes/custom/votegov/templates/layout/page--node--landing.html.twig b/web/themes/custom/votegov/templates/layout/page--node--landing.html.twig
new file mode 100644
index 000000000..0f93b1922
--- /dev/null
+++ b/web/themes/custom/votegov/templates/layout/page--node--landing.html.twig
@@ -0,0 +1,9 @@
+{% extends "page.html.twig" %}
+
+{% block main %}
+  {# admin region. #}
+  {{ page.admin }}
+
+  {# Main content region. #}
+  {{ page.content }}
+{% endblock %}
\ No newline at end of file

From d9a8172664ee50fe1c2f44e93bb8bce730fd1609 Mon Sep 17 00:00:00 2001
From: christian medders <christian.medders@bixal.com>
Date: Tue, 21 Nov 2023 11:47:33 -0500
Subject: [PATCH 4/5] Vote-418:  added block to base layout

---
 web/themes/custom/votegov/templates/layout/page.html.twig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/themes/custom/votegov/templates/layout/page.html.twig b/web/themes/custom/votegov/templates/layout/page.html.twig
index 513cc39dc..051a6e75c 100644
--- a/web/themes/custom/votegov/templates/layout/page.html.twig
+++ b/web/themes/custom/votegov/templates/layout/page.html.twig
@@ -62,16 +62,18 @@
     </div>
   </header>
 
-  <main role="main" class="main-content clearfix grid-container">
+  <main role="main" class="main-content">
     {# link is in html.html.twig #}
     <a id="main-content" tabindex="-1"></a>
 
+    {% block main %}
     <div class="layout-content grid-container-widescreen">
       {# admin region. #}
       {{ page.admin }}
     </div>
 
     <div class="layout-content grid-container-widescreen">
+
       {# Main content region. #}
       <div class="grid-row grid-gap-lg">
         <div class="desktop:grid-col-9 order-last">
@@ -88,6 +90,7 @@
         {% endif %}
       </div>
     </div>{# /.layout-content #}
+    {% endblock %}
   </main>
 
   <footer class="usa-footer usa-footer--big">

From 216aff43ef7704019b7b49732ac550f5f1f87930 Mon Sep 17 00:00:00 2001
From: christian medders <christian.medders@bixal.com>
Date: Tue, 21 Nov 2023 11:55:37 -0500
Subject: [PATCH 5/5] updates from php lint errors

---
 web/themes/custom/votegov/php-includes/page.inc               | 4 ++--
 .../templates/block/block-content--email-signup.html.twig     | 1 -
 .../votegov/templates/layout/page--node--landing.html.twig    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/web/themes/custom/votegov/php-includes/page.inc b/web/themes/custom/votegov/php-includes/page.inc
index 4014652dc..453ff384b 100644
--- a/web/themes/custom/votegov/php-includes/page.inc
+++ b/web/themes/custom/votegov/php-includes/page.inc
@@ -5,11 +5,11 @@
  * Preprocess function for page.
  */
 
-/*
+/**
  * Implements hook_theme_suggestion_HOOK_alter().
  */
 function votegov_theme_suggestions_page_alter(array &$suggestions, array $variables) {
   if ($node = \Drupal::routeMatch()->getParameter('node')) {
     $suggestions[] = "page__node__" . $node->bundle();
   }
-}
\ No newline at end of file
+}
diff --git a/web/themes/custom/votegov/templates/block/block-content--email-signup.html.twig b/web/themes/custom/votegov/templates/block/block-content--email-signup.html.twig
index c659ff3e6..40b04c171 100644
--- a/web/themes/custom/votegov/templates/block/block-content--email-signup.html.twig
+++ b/web/themes/custom/votegov/templates/block/block-content--email-signup.html.twig
@@ -18,4 +18,3 @@
   </div>
 </section>
 {% endblock %}
-
diff --git a/web/themes/custom/votegov/templates/layout/page--node--landing.html.twig b/web/themes/custom/votegov/templates/layout/page--node--landing.html.twig
index 0f93b1922..daa3dc518 100644
--- a/web/themes/custom/votegov/templates/layout/page--node--landing.html.twig
+++ b/web/themes/custom/votegov/templates/layout/page--node--landing.html.twig
@@ -6,4 +6,4 @@
 
   {# Main content region. #}
   {{ page.content }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}