From 2cb78ff5854e2f8d4cbb767fddfbdca2df4aa035 Mon Sep 17 00:00:00 2001
From: KemoNine <mcrosson@kemonine.info>
Date: Sat, 3 Dec 2022 16:27:54 -0500
Subject: [PATCH] cleanup site layout, merge notes and recipes into main
 list/homepage

---
 config.toml                                   | 115 +++++++++---------
 themes/gochowdown/layouts/notes/single.html   |  83 +++++++------
 themes/gochowdown/layouts/partials/home.html  |   2 +-
 themes/gochowdown/layouts/recipes/single.html |  65 +++++-----
 4 files changed, 138 insertions(+), 127 deletions(-)

diff --git a/config.toml b/config.toml
index 4c512d9..8aa2586 100644
--- a/config.toml
+++ b/config.toml
@@ -1,60 +1,57 @@
-baseURL = "https://culinary.kemonine.info"
-disablePathToLower = false
-languageCode = "en-us"
-title = "KemoNine's Culinary Notebook"
-theme = "gochowdown"
-defaultcontentlanguage = "en"
-paginate = 20
-canonifyurls = true
-pygmentsstyle = "monokai"
-pygmentscodefences = true
-pygmentscodefencesguesssyntax = true
-pygmentsOptions = "linenos=table"
-
-[permalinks]
-posts = "/posts/:year/:month/:title"
-
-[outputs]
-    home = ["HTML", "RSS", "JSON"]
-
-[params]
-author = "KemoNine"
-description = "a confused culinary notebook"
-keywords = "recipes"
-favicon_32 = "/images/favicon-32x32.png"
-favicon_16 = "/images/favicon-16x16.png"
-hidecredits = false
-hidecopyright = false
-showNavTitle = true
-custom_css = [ "style.css" ]
-
-#[[menu.main]]
-#name = "Home"
-#weight = 1
-#url = "/"
-
-[[menu.main]]
-name = "By Category"
-weight = 20
-url = "/category/"
-
-[[menu.main]]
-name = "By Cuisine"
-weight = 30
-url = "/cuisine/"
-
-[[menu.main]]
-name = "By Tag"
-weight = 40
-url = "/tags/"
-
-[[menu.main]]
-name = "Notes"
-weight = 99
-url = "/notes/"
-
-[taxonomies]
-category = "category"
-cuisine = "cuisine"
-tag = "tags"
+baseURL = "https://culinary.kemonine.info"
+disablePathToLower = false
+languageCode = "en-us"
+title = "KemoNine's Culinary Notebook"
+theme = "gochowdown"
+defaultcontentlanguage = "en"
+paginate = 20
+canonifyurls = true
+pygmentsstyle = "monokai"
+pygmentscodefences = true
+pygmentscodefencesguesssyntax = true
+pygmentsOptions = "linenos=table"
+
+[permalinks]
+recipes = "/recipes/:title"
+notes = "/notes/:title"
+
+[outputs]
+    home = ["HTML", "RSS", "JSON"]
+
+[params]
+author = "KemoNine"
+description = "a confused culinary notebook"
+keywords = "recipes"
+favicon_32 = "/images/favicon-32x32.png"
+favicon_16 = "/images/favicon-16x16.png"
+hidecredits = false
+hidecopyright = false
+showNavTitle = true
+custom_css = [ "style.css" ]
+mainSections = ["recipe", "recipes", "note", "notes"]
+
+[[menu.main]]
+name = "By Category"
+weight = 20
+url = "/category/"
+
+[[menu.main]]
+name = "By Cuisine"
+weight = 30
+url = "/cuisine/"
+
+[[menu.main]]
+name = "By Tag"
+weight = 40
+url = "/tags/"
+
+[[menu.main]]
+name = "Notes"
+weight = 99
+url = "/notes/"
+
+[taxonomies]
+category = "category"
+cuisine = "cuisine"
+tag = "tags"
 note = "notes"
\ No newline at end of file
diff --git a/themes/gochowdown/layouts/notes/single.html b/themes/gochowdown/layouts/notes/single.html
index 89f4c5a..7b094d2 100644
--- a/themes/gochowdown/layouts/notes/single.html
+++ b/themes/gochowdown/layouts/notes/single.html
@@ -4,6 +4,51 @@
 {{ define "content" }}
 
 <div class="container" itemscope itemtype="http://schema.org/Recipe">
+<!-- call up the image and image credit link -->
+  <article class="post-content px2">
+    <!-- call up the main recipe title and content -->
+    <header class="post-header">
+      <h1 class="post-title center m1 sm-mt3" itemprop="name">{{ .Title }}</h1>
+    </header>
+
+   <div class="recipe-source">
+    <div class="clearfix mt3">
+     Chef:
+     {{if .Params.authorurl }}
+       <a href="{{.Params.authorurl}}">{{.Params.AuthorName}}</a>
+       {{else}}
+       {{.Params.AuthorName}}
+     {{end}}
+    </div>
+    </div>
+
+    {{ with .Params.Category }}{{ partial "taxonomy/notes" . }}{{ end }}
+    {{ with .Params.Tags }}{{ partial "taxonomy/tags" . }}{{ end }}
+    </div>
+
+    <div class="px2 mt3 clearfix">
+      <div class="sm-col-8 mx-auto" itemprop="description">{{.Content}}</div>
+    </div>
+
+    <br />
+
+     {{ if .Params.inspiration }}
+     <div class="px2 mt3 clearfix"><div class="sm-col-8 mx-auto" itemprop="description">
+     <h3 class="blue mt0 mb2 xs-center">Inspiration & Resources</h3>
+     {{ range .Params.inspiration }}
+       <ul class="recipe-source">
+       {{ if .url }}
+         <li><a href="{{ .URL }}">{{ .title }}</a></li>
+       {{ else }}
+         <li>{{ .title }}</li>
+       {{ end }}
+       </ul>
+     {{ end }}
+     {{ end }}
+     </div></div>
+
+    </div>
+  
 <!-- call up the image and image credit link -->
   {{ if .Params.image }}
     <div class="xs-p2 center">
@@ -15,44 +60,6 @@
       </figure>
     </div>
   {{ end }}
-
-  <article class="post-content px2">
-    <!-- call up the main recipe title and content -->
-    <header class="post-header">
-      <h1 class="post-title center m1 sm-mt3" itemprop="name">{{ .Title }}</h1>
-    </header>
-
-    <div class="px2 mt3 clearfix">
-      <div class="sm-col-8 mx-auto" itemprop="description">{{.Content}}</div>
-    </div>
-
-    <br />
-
-    <div class="recipe-source">
-     <p>Chef:
-     {{if .Params.authorurl }}
-       <a href="{{.Params.authorurl}}">{{.Params.AuthorName}}</a>
-       {{else}}
-       {{.Params.AuthorName}}
-     {{end}}
-     {{ if .Params.inspiration }}
-     <p>Inspiration & Resources</p>
-     {{ range .Params.inspiration }}
-       <ul>
-       {{ if .url }}
-         <li><a href="{{ .URL }}">{{ .title }}</a></li>
-       {{ else }}
-         <li>{{ .title }}</li>
-       {{ end }}
-       </ul>
-     {{ end }}
-     {{ end }}
-
-    {{ with .Params.Category }}{{ partial "taxonomy/notes" . }}{{ end }}
-    {{ with .Params.Tags }}{{ partial "taxonomy/tags" . }}{{ end }}
-
-    </div>
-    
   </article>
 </div>
 {{ end }}
diff --git a/themes/gochowdown/layouts/partials/home.html b/themes/gochowdown/layouts/partials/home.html
index b4fbed4..6d7bd8c 100644
--- a/themes/gochowdown/layouts/partials/home.html
+++ b/themes/gochowdown/layouts/partials/home.html
@@ -1,7 +1,7 @@
 <div class="home">
   <div class="recipes xs-px1 xs-mt2">
     <div class="clearfix">
-    {{ range sort (where .Site.RegularPages "Section" "recipes") "Title" }}
+    {{ range sort (where site.RegularPages "Type" "in" site.Params.mainSections) "Title" }}
       <div class="sm-col sm-col-6 md-col-6 lg-col-4 xs-px1 xs-mb2">
           <a class="block relative bg-blue" href="{{ .RelPermalink }}">
             {{ if .Params.Image }}
diff --git a/themes/gochowdown/layouts/recipes/single.html b/themes/gochowdown/layouts/recipes/single.html
index ec9e2a9..183ab18 100644
--- a/themes/gochowdown/layouts/recipes/single.html
+++ b/themes/gochowdown/layouts/recipes/single.html
@@ -4,26 +4,31 @@
 {{ define "content" }}
 
 <div class="container" itemscope itemtype="http://schema.org/Recipe">
-<!-- call up the image and image credit link -->
-  {{ if .Params.image }}
-    <div class="xs-p2 center">
-      <figure  itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
-        <img itemprop="image" src="{{ .Params.image }}" {{ if .Params.imagecaption }}alt="{{.Params.imagecaption}}"{{ end }} style="max-width:480px"/>
-        {{ if .Params.imagecaption }}
-        <figcaption><p><b>Pictured:</b> {{ .Params.imagecaption }}</p></figcaption>
-        {{ end }}
-      </figure>
-    </div>
-  {{ end }}
-
   <article class="post-content px2">
     <!-- call up the main recipe title and content -->
     <header class="post-header">
       <h1 class="post-title center m1 sm-mt3" itemprop="name">{{ .Title }}</h1>
     </header>
 
-    <div class="px2 mt3 clearfix">
-      <div class="sm-col-8 mx-auto" itemprop="description">{{.Content}}</div>
+    <div class="recipe-source">
+    <div class="clearfix mt3">
+     <div class="sm-col sm-col-3">
+     Chef:
+     {{if .Params.authorurl }}
+       <a href="{{.Params.authorurl}}">{{.Params.AuthorName}}</a>
+       {{else}}
+       {{.Params.AuthorName}}
+     {{end}}
+    </div>
+    <div class="sm-col sm-col-3">
+    {{ with .Params.Category }}{{ partial "taxonomy/category" . }}{{ end }} 
+    </div>
+    <div class="sm-col sm-col-3">
+    {{ with .Params.Cuisine }}{{ partial "taxonomy/cuisine" . }}{{ end }}
+    </div>
+    </div>
+
+    {{ with .Params.Tags }}{{ partial "taxonomy/tags" . }}{{ end }}
     </div>
 
     <div class="clearfix mt3">
@@ -85,6 +90,10 @@
     </div>
     <!-- end recipe and directions -->
 
+    <div class="px2 mt3 clearfix">
+      <div class="sm-col-8 mx-auto" itemprop="description">{{.Content}}</div>
+    </div>
+
     <!-- check if it's a component-based recipe, render it -->
     {{ with .Params.Components }}
     <div class="components bg-darken-2 p2 mt3 mb3 center">
@@ -138,17 +147,10 @@
     <!-- end components -->
     <br />
 
-    <div class="recipe-source">
-     <p>Chef:
-     {{if .Params.authorurl }}
-       <a href="{{.Params.authorurl}}">{{.Params.AuthorName}}</a>
-       {{else}}
-       {{.Params.AuthorName}}
-     {{end}}
-     {{ if .Params.inspiration }}
-     <p>Inspiration & Resources</p>
+    {{ if .Params.inspiration }}
+     <h3 class="blue mt0 mb2 xs-center center">Inspiration & Resources</h3>
      {{ range .Params.inspiration }}
-       <ul>
+       <ul class="center">
        {{ if .url }}
          <li><a href="{{ .URL }}">{{ .title }}</a></li>
        {{ else }}
@@ -158,12 +160,17 @@
      {{ end }}
      {{ end }}
 
-    {{ with .Params.Category }}{{ partial "taxonomy/category" . }}{{ end }}
-    {{ with .Params.Cuisine }}{{ partial "taxonomy/cuisine" . }}{{ end }}
-    {{ with .Params.Tags }}{{ partial "taxonomy/tags" . }}{{ end }}
-
+  <!-- call up the image and image credit link -->
+  {{ if .Params.image }}
+    <div class="xs-p2 center">
+      <figure  itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject">
+        <img itemprop="image" src="{{ .Params.image }}" {{ if .Params.imagecaption }}alt="{{.Params.imagecaption}}"{{ end }} style="max-width:480px"/>
+        {{ if .Params.imagecaption }}
+        <figcaption><p><b>Pictured:</b> {{ .Params.imagecaption }}</p></figcaption>
+        {{ end }}
+      </figure>
     </div>
-  
+  {{ end }}
   </article>
 </div>
 {{ end }}