15 files changed, 37 insertions, 23 deletions
diff --git a/html/blog/First_Post.tmpl.html b/html/blog/First_Post.tmpl.html
index 674798f..810b2d0 100644
--- a/html/blog/First_Post.tmpl.html
+++ b/html/blog/First_Post.tmpl.html
@@ -1,11 +1,12 @@
-{{define "title"}}{{range .Contents}}{{ .Title }}{{end}}{{end}}
+{{define "title"}}{{.Post.Title}}{{end}}
 {{define "description"}}First post explaining site modifications{{end}}
 {{define "keywords"}}blog site{{end}}
+{{ define "canonical" }}/blog{{end}}
 
 {{define "main"}}
     <h1>Blog</h1>
     <article class="postContent">
-      <h2>{{range .Contents}}{{ .Title }}{{end}}</h2>
+      <h2>{{.Post.Title}}</h2>
       <p>This is my first post on the new site! I am very excited to have the new system set up and mostly functional. There is still plenty of work to be done, but this is a great start.</p>
       <p>I have moved to Golang for all server side scripting and web serving, and it's been a fun language to learn so far. I have had a lot of encouragement from my friend over at <a href="https://www.angel-castaneda.com" target="_blank" rel="noopener noreferrer">www.angel-castaneda.com</a> so go check out his page to see what he is working on.</p>
       <p>The new site structure should be as follows:</p>
diff --git a/html/blog/Jeep_CJ7_Turn_Signal_Repair.tmpl.html b/html/blog/Jeep_CJ7_Turn_Signal_Repair.tmpl.html
index 474b320..51dcc2a 100644
--- a/html/blog/Jeep_CJ7_Turn_Signal_Repair.tmpl.html
+++ b/html/blog/Jeep_CJ7_Turn_Signal_Repair.tmpl.html
@@ -1,11 +1,12 @@
-{{define "title"}}{{range .Contents}}{{ .Title }}{{end}}{{end}}
+{{define "title"}}{{.Post.Title}}{{end}}
 {{define "description"}}Fixing the turn signal on my 1985 Jeep CJ7.{{end}}
 {{define "keywords"}}blog repair cars CJ7{{end}}
+{{ define "canonical" }}/blog{{end}}
 
 {{define "main"}}
 <h1>Blog</h1>
 <article class="postContent">
-  <h2>{{range .Contents}}{{ .Title }}{{end}}</h2>
+  <h2>{{.Post.Title}}</h2>
   <p>A while back, I noticed that the passenger side turn signal on my 1985 Jeep CJ7 was out. The right turn signal indicator would stay solid when the headlights were turned on. I pulled the bulb assembly and found this:</p>
   <img src="/static/media/Jeep_CJ7_Turn_Signal_Repair/Before.webp" alt="Disassembled turn signal lamp assembly: housing, wire harness, contact that broke off wire, degraded rubber grommet, bulb, and lens cover." />
   <p>The wire responsible for turning the bulb “high” was broken from what I assume is fatigue. The rubber meant to support the wire and contact pin was severely degraded and falling apart, exposing the bare wire where it met the pin. This also means the wire could freely flex at the joint, and going over bumbs or just general road vibration could have eventually wore it down. I didn’t see much in the way of corrosion around the wire, so that’s why I assume it was stress related.</p>
diff --git a/html/blog/July_5th_Update.tmpl.html b/html/blog/July_5th_Update.tmpl.html
index a67f2aa..cd40fc4 100644
--- a/html/blog/July_5th_Update.tmpl.html
+++ b/html/blog/July_5th_Update.tmpl.html
@@ -1,11 +1,12 @@
-{{define "title"}}{{range .Contents}}{{ .Title }}{{end}}{{end}}
+{{define "title"}}{{.Post.Title}}{{end}}
 {{define "description"}}Update on site status, July 5th.{{end}}
 {{define "keywords"}}blog site{{end}}
+{{ define "canonical" }}/blog{{end}}
 
 {{define "main"}}
     <h1>Blog</h1>
     <article class="postContent">
-      <h2>{{range .Contents}}{{ .Title }}{{end}}</h2>
+      <h2>{{.Post.Title}}</h2>
       <p>Much progress has been made in the last week, and the site is now pretty usable with its new CSS. There are still some large things to take care of before it can be called "done," and they are the following in no particular order:</p>
       <ul>
         <li>Tile 'Projects' thumbnails so that they look consistent and take advantage of landscape displays.</li>
diff --git a/html/blog/MKE_Air_&_Water_Show_-_2023-07-23.tmpl.html b/html/blog/MKE_Air_&_Water_Show_-_2023-07-23.tmpl.html
index d2c0292..f3bf96a 100644
--- a/html/blog/MKE_Air_&_Water_Show_-_2023-07-23.tmpl.html
+++ b/html/blog/MKE_Air_&_Water_Show_-_2023-07-23.tmpl.html
@@ -1,11 +1,12 @@
-{{define "title"}}{{range .Contents}}{{ .Title }}{{end}}{{end}}
+{{define "title"}}{{.Post.Title}}{{end}}
 {{define "description"}}My short experience of the MKE Air &amp; Water show this year.{{end}}
 {{define "keywords"}}blog mke air-show{{end}}
+{{ define "canonical" }}/blog{{end}}
 
 {{define "main"}}
 <h1>Blog</h1>
 <article class="postContent">
-  <h2>{{range .Contents}}{{ .Title }}{{end}}</h2>
+  <h2>{{.Post.Title}}</h2>
   <p>While figuring out how to pass the time, a friend linked to the /r/milwaukee subreddit. Out of boredom, I opened up the link. To my surprise (I’m not that in the loop), people were posting about an air show going on. It was 1:30 PM when I found the event page and saw that the Blue Angels were on for 3:00 PM. Since I needed to be in Milwaukee by 5:00 PM anyways and I haven’t seen an air show, I packed up the Sportster and hit the road. As I came off I-794 by the art museum, I was surprised to see not that much traffic at first. That fallacy was soon broken. I found a spot a few minutes after the show start time, though, and right as I got off the bike to find a spot to sit the Blue Angels flew just overhead in formation. It was loud… but awesome. Sure, I’ve been on an airliner, heard loud engines, and ride a relatively loud motorcycle, but the sound and feeling of several jet fighters flying some eighty feet above is something I haven’t experienced. Here are a few of the videos I captured:</p>
   <p><a href="https://imgur.com/a/Lajrpbl" target="_blank" rel="noopener noreferrer">imgur album</a></p>
   <p>Overall it was a great experience. My only regret is having to hurry to get there, otherwise I would have parked somewhere else and walked down. The streets were packed… everywhere near the lake and the surrounding area. So if you want to go in the future, definitely show up early and walk/bike/skate/scooter down. You’ll be much happier regardless of the weather. Sitting in locked traffic for an hour trying to get away from the lake was a bit insane. Having some plans that let you hang around for a while is even better.</p>
diff --git a/html/blog/Markdown_To_HTML_Update.tmpl.html b/html/blog/Markdown_To_HTML_Update.tmpl.html
index b8b0841..2f301ba 100644
--- a/html/blog/Markdown_To_HTML_Update.tmpl.html
+++ b/html/blog/Markdown_To_HTML_Update.tmpl.html
@@ -1,11 +1,12 @@
-{{define "title"}}{{range .Contents}}{{ .Title }}{{end}}{{end}}
+{{define "title"}}{{.Post.Title}}{{end}}
 {{define "description"}}Update on the new site underlying code.{{end}}
 {{define "keywords"}}blog site{{end}}
+{{ define "canonical" }}/blog{{end}}
 
 {{define "main"}}
 <h1>Blog</h1>
 <article class="postContent">
-  <h2>{{range .Contents}}{{ .Title }}{{end}}</h2>
+  <h2>{{.Post.Title}}</h2>
   <p>So, I got the site to use real, authentic, true to the standard, “text/template” format for my pages and posts. No more strange, non-conforming elements. More readable source code?? We have it. The best?? Probably not… but that’s okay because progress is progress. The last few things to do are program in the tagging system, set up <a href="https://imagemagick.org/" target="_blank" rel="noopener noreferrer">ImageMagick</a> for automatically sizing images, and writing the automation scripts to move everything where it sholud go.</p>
   <p>Getting this all to work has been a great adventure. Going back to programming has been pretty refreshing compared to working on art. A program is either right or wrong. It does what you expect, or it doesn’t. There’s not much interpretation to be had and I miss it.</p>
   <p>Uploaded: <time datetime="2023-07-13">2023-07-13</time></p>
diff --git a/html/main/about.tmpl.html b/html/main/about.tmpl.html
index af0f04a..69caeb1 100644
--- a/html/main/about.tmpl.html
+++ b/html/main/about.tmpl.html
@@ -1,6 +1,7 @@
 {{ define "title" }}About{{end}}
 {{ define "description" }}About me and my site.{{end}}
 {{ define "keywords" }}about{{end}}
+{{ define "canonical" }}/about{{end}}
 
 {{ define "main" }}
     <h1>alexscerba.com<wbr>/about</h1>
diff --git a/html/main/blog.tmpl.html b/html/main/blog.tmpl.html
index 9017066..055d2ec 100644
--- a/html/main/blog.tmpl.html
+++ b/html/main/blog.tmpl.html
@@ -1,13 +1,14 @@
 {{ define "title" }}Blog{{end}}
 {{ define "description" }}Site blog featuring personal and project updates as well as anything random I want to share.{{end}}
 {{ define "keywords" }}blog{{end}}
+{{ define "canonical" }}/blog{{end}}
 
 {{ define "main" }}
     <h1>alexscerba.com<wbr>/blog</h1>
 
     <section class="postContent">
       <h2>Entries</h2>
-{{ range .Contents }}
+{{ range .Posts.Contents}}
         <p>- <a href="/blog/{{ .FileName }}">{{ .Title }}</a></p>
 {{ end }}
     </section>
diff --git a/html/main/index.tmpl.html b/html/main/index.tmpl.html
index 5c60a6c..e30fefb 100644
--- a/html/main/index.tmpl.html
+++ b/html/main/index.tmpl.html
@@ -11,7 +11,7 @@
     <section class="bottom">
       <h2>Latest Design Projects</h2>
       <div class="posts">
-{{ range .Contents }}
+{{ range .Posts.Contents }}
         <figure class="thumbnail">
           <a href="/projects/{{ .FileName }}">
             {{ .Image }}
diff --git a/html/main/projects.tmpl.html b/html/main/projects.tmpl.html
index 9baae9f..9afc81d 100644
--- a/html/main/projects.tmpl.html
+++ b/html/main/projects.tmpl.html
@@ -1,13 +1,14 @@
 {{ define "title" }}Projects{{end}}
 {{ define "description" }}Porfolio projects.{{end}}
 {{ define "keywords" }}projects{{end}}
+{{ define "canonical" }}/projects{{end}}
 
 {{ define "main" }}
     <h1>alexscerba.com<wbr>/projects</h1>
 
     <section class="projectList">
       <h2>Completed</h2>
-{{ range .Contents }}
+{{ range .Posts.Contents }}
         <figure class="thumbnail">
           <a href="/projects/{{ .FileName }}">
             {{ .Image }}
diff --git a/html/master.tmpl.html b/html/master.tmpl.html
index 49b3060..145d299 100644
--- a/html/master.tmpl.html
+++ b/html/master.tmpl.html
@@ -8,6 +8,7 @@
     <title>{{block "title" .}}Page{{end}} - Alex Scerba</title>
     <meta name="description" content="{{block "description" .}}Alex's personal site{{end}}" />
     <meta name="keywords" content="{{block "keywords" .}}personal site{{end}}">
+    <link rel="canonical" href="https://www.alexscerba.com{{block "canonical" .}}{{end}}">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="stylesheet" href="/static/style.css" />
     <link rel="shortcut icon" href="/static/favicon.ico" type="image/x-icon" />
diff --git a/html/projects/CCS_Entry_Portfolio.tmpl.html b/html/projects/CCS_Entry_Portfolio.tmpl.html
index 839818c..2723ce1 100644
--- a/html/projects/CCS_Entry_Portfolio.tmpl.html
+++ b/html/projects/CCS_Entry_Portfolio.tmpl.html
@@ -1,11 +1,12 @@
-{{define "title"}}{{range .Contents}}{{ .Title }}{{end}}{{end}}
+{{define "title"}}{{.Post.Title}}{{end}}
 {{define "description"}}My entry portfolio for the College for Creative Studies.{{end}}
 {{define "keywords"}}project CCS{{end}}
-    
+{{ define "canonical" }}/projects{{end}}
+
 {{define "main"}}
     <h1>Project</h1>
     <article class="postContent">
-      <h2>{{range .Contents}}{{ .Title }}{{end}}</h2>
+      <h2>{{.Post.Title}}</h2>
       <div class="imgGrid">
         <img src="/static/media/Sketch Portfolio early 2021/Arai_Helmet_720p.jpg" alt="Arai helmet sketch." />
         <img src="/static/media/Sketch Portfolio early 2021/Bernie_720p.jpg" alt="Cat, Bernie, sketch." />
diff --git a/html/projects/CCS_Sophomore_Interior.tmpl.html b/html/projects/CCS_Sophomore_Interior.tmpl.html
index f2ce68e..6e99cfa 100644
--- a/html/projects/CCS_Sophomore_Interior.tmpl.html
+++ b/html/projects/CCS_Sophomore_Interior.tmpl.html
@@ -1,11 +1,12 @@
-{{define "title"}}{{range .Contents}}{{ .Title }}{{end}}{{end}}
+{{define "title"}}{{.Post.Title}}{{end}}
 {{define "description"}}My entry portfolio for the College for Creative Studies.{{end}}
 {{define "keywords"}}project CCS{{end}}
-    
+{{ define "canonical" }}/projects{{end}}
+
 {{define "main"}}
     <h1>Project</h1>
     <article class="postContent">
-      <h2>CCS Sophomore Interior</h2>
+      <h2>{{.Post.Title}}</h2>
       <p>Honda S-30 project at CCS</p>
       <img src="/static/media/DTR-232-D-Final_Board-Scerba.jpg" class="mainImage" alt="Sophomore interior studio project HONDA S-30." />
       <p>Uploaded: <time datetime="2022-06-17">2022-06-17</time></p>
diff --git a/html/projects/MCTS_Personal_Transit_Concept.tmpl.html b/html/projects/MCTS_Personal_Transit_Concept.tmpl.html
index 6945451..f5082a3 100644
--- a/html/projects/MCTS_Personal_Transit_Concept.tmpl.html
+++ b/html/projects/MCTS_Personal_Transit_Concept.tmpl.html
@@ -1,11 +1,12 @@
-{{define "title"}}{{range .Contents}}{{ .Title }}{{end}}{{end}}
+{{define "title"}}{{.Post.Title}}{{end}}
 {{define "description"}}Mobility project centered around Milwaukee, WI.{{end}}
 {{define "keywords"}}project CCS mobility{{end}}
+{{ define "canonical" }}/projects{{end}}
 
 {{define "main"}}
     <h1>Project</h1>
     <article class="postContent">
-      <h2>{{range .Contents}}{{ .Title }}{{end}}</h2>
+      <h2>{{.Post.Title}}</h2>
       <p>This is a project completed at CCS for Design Theory II: Mobility</p>
       <img src="/static/media/DT2Mobility/Intro.jpg" />
       <img src="/static/media/DT2Mobility/City Stats.jpg" />
diff --git a/md/POST_TEMPLATE.tmpl.html b/md/POST_TEMPLATE.tmpl.html
index 3383456..405f327 100644
--- a/md/POST_TEMPLATE.tmpl.html
+++ b/md/POST_TEMPLATE.tmpl.html
@@ -1,11 +1,12 @@
-{{define "title"}}{{range .Contents}}{{ .Title }}{{end}}{{end}}
+{{define "title"}}{{.Post.Title}}{{end}}
 {{define "description"}}$description${{end}}
 {{define "keywords"}}$tags${{end}}
+{{ define "canonical" }}$canonical${{end}}
 
 {{define "main"}}
 <h1>$page$</h1>
 <article class="postContent">
-  <h2>{{range .Contents}}{{ .Title }}{{end}}</h2>
+  <h2>{{.Post.Title}}</h2>
   $body$
   <p>Uploaded: <time datetime="$date$">$date$</time></p>
 </article>
diff --git a/md/staged/NewPost.md b/md/staged/NewPost.md
index 2d7aa82..8570300 100644
--- a/md/staged/NewPost.md
+++ b/md/staged/NewPost.md
@@ -4,6 +4,7 @@ title: Title
 date: 2021-04-27
 description: Description
 tags: tmp
+canonical: /projects
 ---
 
 text