2022-09-13 merge test into main (#40)

* update two test blog posts * Post for 2022-09-05 (#29) * write first blog post, update feature image * remove test blog posts, remove focus-visible * add smart quotes in md files * second blog post, site folder cleanup * add RSS feed to blog (#31) * Post for 2022-09-05: merge test into main (#30) * update two test blog posts * Post for 2022-09-05 (#29) * write first blog post, update feature image * remove test blog posts, remove focus-visible * add smart quotes in md files * second blog post, site folder cleanup * add RSS feed to the blog * add meta information to site (#32) * Post for 2022-09-05: merge test into main (#30) * update two test blog posts * Post for 2022-09-05 (#29) * write first blog post, update feature image * remove test blog posts, remove focus-visible * add smart quotes in md files * second blog post, site folder cleanup * add meta information for site, opengraph, etc * add image to RSS feed (#38) * update working rss feed w/ test img url * update feature image file set to macro * move feature image in post to macro, add image test shortcode with macro * switch head metadata to use feature image macro * add proper image url to feed.xml * adjust feature image in posts (todo: macro) * remove test image shortcode
reedcodes · Sep 13, 2022 · 71ceb3d · 71ceb3d
1 parent fe9f6a2
commit 71ceb3d
Show file tree

Hide file tree

Showing 29 changed files with 125 additions and 112 deletions.
diff --git a/.eleventy.js b/.eleventy.js
@@ -47,7 +47,7 @@ module.exports = function( eleventyConfig ) {
   eleventyConfig.addShortcode( "year", require("./source/_config/shortcodes/year.js") );
 
   // Add the image shortcode, from the 11ty image plugin.
-  eleventyConfig.addNunjucksAsyncShortcode( "image", require("./source/_config/shortcodes/image.js") );
+  eleventyConfig.addAsyncShortcode( "image", require("./source/_config/shortcodes/image.js") );
 
   // Remove the console output of all generated files.
   eleventyConfig.setQuietMode(true);

diff --git a/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-1200.jpeg b/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-1200.jpeg
diff --git a/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-1200.webp b/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-1200.webp
diff --git a/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-300.jpeg b/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-300.jpeg
diff --git a/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-300.webp b/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-300.webp
diff --git a/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-600.jpeg b/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-600.jpeg
diff --git a/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-600.webp b/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-600.webp
diff --git a/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-900.jpeg b/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-900.jpeg
diff --git a/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-900.webp b/site/blog/post/2022-09-05-documenting-the-journey/cLqc3BK_Pz-900.webp
diff --git a/site/blog/post/2022-09-05-documenting-the-journey/index.html b/site/blog/post/2022-09-05-documenting-the-journey/index.html
@@ -27,6 +27,7 @@
 	<meta name="twitter:image:alt" content="tools for documentation include a Polaroid Now+ camera; a red notebook with a sticker of Alexis Rose from Schitt's Creek saying, I love this journey for you; a blue notebook with a sticker reading, you are here; a micron pen; and a blue gel-ink pen.">
 	<link rel="canonical" href="https://lincolnhighwayjournal.com/blog/post/2022-09-05-documenting-the-journey/">
 	<link rel="stylesheet" href="/dist/css/style.css"><link rel="icon" href="/dist/images/favicon.gif">
+
 </head>
 
 <body class="default">
@@ -68,8 +69,8 @@ <h1 class="post-title">Documenting the journey</h1><dl class="post-taxonomy">
         <dd class="post-term"><a class="post-term-tag btn btn-tertiary" href="/blog/tag/travelog/">travelog</a></dd><dd class="post-term"><a class="post-term-tag btn btn-tertiary" href="/blog/tag/documentation/">documentation</a></dd></dl></div>
 </section>
 <section class="container container-wide feature-image" aria-label="feature image">
-    <div class="container feature-image-inner">
-      <figure>
+      <div class="container feature-image-inner">
+        <figure>
 
 <picture>
   <source type="image/webp" srcset="/blog/post/2022-09-05-documenting-the-journey/documenting-300w.webp 300w, /blog/post/2022-09-05-documenting-the-journey/documenting-600w.webp 600w, /blog/post/2022-09-05-documenting-the-journey/documenting-900w.webp 900w, /blog/post/2022-09-05-documenting-the-journey/documenting-1200w.webp 1200w" sizes="100vw">
@@ -84,8 +85,8 @@ <h1 class="post-title">Documenting the journey</h1><dl class="post-taxonomy">
   </picture>
 
 </figure>
-    </div>
-  </section><main class="container container-narrow main"><section class="container">
+      </div>
+    </section><main class="container container-narrow main"><section class="container">
         <p>Part of the journey is not just experiencing adventures, but documenting them. Writing things down or taking photos will remind future-me of everything that happened, and will also provide updates for my friends and family.</p>
 <p>It's been years since I've journaled regularly, and I'm looking forward to the opportunity to write again. I love <a href="https://www.leuchtturm1917.us/">leuchtturm1917</a> notebooks and have used them the past few years for keeping track of to-dos, or organizing notes from grad school courses. It seemed an obvious choice for my travel journal.</p>
 <p>In addition, I bought a smaller notebook to act as an actual travelog, recording dates of travel, miles driven, times of breaks, gas prices, etc. Part of this is the fun of maintaining a register (we'll see how that changes along the way!) and part is reporting expenses; since I'll be traveling to a conference, work is sponsoring that part of the trip.</p>

diff --git a/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-1200.jpeg b/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-1200.jpeg
diff --git a/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-1200.webp b/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-1200.webp
diff --git a/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-300.jpeg b/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-300.jpeg
diff --git a/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-300.webp b/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-300.webp
diff --git a/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-600.jpeg b/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-600.jpeg
diff --git a/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-600.webp b/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-600.webp
diff --git a/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-900.jpeg b/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-900.jpeg
diff --git a/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-900.webp b/site/blog/post/2022-09-05-i-m-headed-for-adventure/VXoShM6AFG-900.webp
diff --git a/site/blog/post/2022-09-05-i-m-headed-for-adventure/index.html b/site/blog/post/2022-09-05-i-m-headed-for-adventure/index.html
@@ -27,6 +27,7 @@
 	<meta name="twitter:image:alt" content="A Lincoln Highway road marker at the western terminus, at the Legion of Honor in San Francisco.">
 	<link rel="canonical" href="https://lincolnhighwayjournal.com/blog/post/2022-09-05-i-m-headed-for-adventure/">
 	<link rel="stylesheet" href="/dist/css/style.css"><link rel="icon" href="/dist/images/favicon.gif">
+
 </head>
 
 <body class="default">
@@ -68,8 +69,8 @@ <h1 class="post-title">I&#39;m headed for adventure!</h1><dl class="post-taxonom
         <dd class="post-term"><a class="post-term-tag btn btn-tertiary" href="/blog/tag/dream-vacation/">dream vacation</a></dd><dd class="post-term"><a class="post-term-tag btn btn-tertiary" href="/blog/tag/organizing/">organizing</a></dd><dd class="post-term"><a class="post-term-tag btn btn-tertiary" href="/blog/tag/about-me/">about me</a></dd></dl></div>
 </section>
 <section class="container container-wide feature-image" aria-label="feature image">
-    <div class="container feature-image-inner">
-      <figure>
+      <div class="container feature-image-inner">
+        <figure>
 
 <picture>
   <source type="image/webp" srcset="/blog/post/2022-09-05-i-m-headed-for-adventure/9104193151_f9e22e4d4d_o-300w.webp 300w, /blog/post/2022-09-05-i-m-headed-for-adventure/9104193151_f9e22e4d4d_o-600w.webp 600w, /blog/post/2022-09-05-i-m-headed-for-adventure/9104193151_f9e22e4d4d_o-900w.webp 900w, /blog/post/2022-09-05-i-m-headed-for-adventure/9104193151_f9e22e4d4d_o-1200w.webp 1200w" sizes="100vw">
@@ -83,9 +84,9 @@ <h1 class="post-title">I&#39;m headed for adventure!</h1><dl class="post-taxonom
       decoding="async">
   </picture>
 
-<figcaption class="bg-foreground">Photo credit: <a href="https://www.flickr.com/photos/twylo/9104193151/">Seth Morabito</a></figure>
-    </div>
-  </section><main class="container container-narrow main"><section class="container">
+</figure>
+      </div>
+    </section><main class="container container-narrow main"><section class="container">
         <p>I've been planning this trip for over three years, and now it's nearly here. If you consider daydreaming about doing this, then I've really been &quot;planning&quot; for about 25 years.</p>
 <p>I grew up in Philadelphia and attended college on the Main Line, an area along Route 30 from Malvern stretching into Philadelphia, named for its association with the old Pennsylvania Railroad and the wealthy communities along it. Most of this section runs right along the Lincoln Highway, and some portions are still named that (while others are named after the old Lancaster Turnpike). When going to school, I often took the SEPTA train into the city, which shares the tracks with Amtrak today. I loved that ride and the road it parallels.</p>
 <p>I read <a href="https://www.barnesandnoble.com/w/lincoln-highway-brian-a-butko/1100000919?ean=9780811748261">Brian Butko's <em>The Lincoln Highway: Pennsylvania Traveler's Guide</em></a> back in the late '90s, and learned that what was Lincoln Highway or Lincoln Ave around my way was not only a route through Pennsylvania, but the whole United States, from Times Square in the east to the Legion of Honor in the west. Fascinated with its history, I dreamed of one day roadtripping the entire length.</p>

diff --git a/site/blog/tag/about-me/index.html b/site/blog/tag/about-me/index.html
@@ -25,6 +25,7 @@
 	<meta name="twitter:image" content="https://lincolnhighwayjournal.com/dist/images/photos/california-section.jpeg">
 	<link rel="canonical" href="https://lincolnhighwayjournal.com/blog/tag/about-me/">
 	<link rel="stylesheet" href="/dist/css/style.css"><link rel="icon" href="/dist/images/favicon.gif">
+
 </head>
 
 <body class="default">

diff --git a/site/blog/tag/documentation/index.html b/site/blog/tag/documentation/index.html
@@ -25,6 +25,7 @@
 	<meta name="twitter:image" content="https://lincolnhighwayjournal.com/dist/images/photos/california-section.jpeg">
 	<link rel="canonical" href="https://lincolnhighwayjournal.com/blog/tag/documentation/">
 	<link rel="stylesheet" href="/dist/css/style.css"><link rel="icon" href="/dist/images/favicon.gif">
+
 </head>
 
 <body class="default">

diff --git a/site/blog/tag/dream-vacation/index.html b/site/blog/tag/dream-vacation/index.html
@@ -25,6 +25,7 @@
 	<meta name="twitter:image" content="https://lincolnhighwayjournal.com/dist/images/photos/california-section.jpeg">
 	<link rel="canonical" href="https://lincolnhighwayjournal.com/blog/tag/dream-vacation/">
 	<link rel="stylesheet" href="/dist/css/style.css"><link rel="icon" href="/dist/images/favicon.gif">
+
 </head>
 
 <body class="default">

diff --git a/site/blog/tag/organizing/index.html b/site/blog/tag/organizing/index.html
@@ -25,6 +25,7 @@
 	<meta name="twitter:image" content="https://lincolnhighwayjournal.com/dist/images/photos/california-section.jpeg">
 	<link rel="canonical" href="https://lincolnhighwayjournal.com/blog/tag/organizing/">
 	<link rel="stylesheet" href="/dist/css/style.css"><link rel="icon" href="/dist/images/favicon.gif">
+
 </head>
 
 <body class="default">

diff --git a/site/blog/tag/travelog/index.html b/site/blog/tag/travelog/index.html
@@ -25,6 +25,7 @@
 	<meta name="twitter:image" content="https://lincolnhighwayjournal.com/dist/images/photos/california-section.jpeg">
 	<link rel="canonical" href="https://lincolnhighwayjournal.com/blog/tag/travelog/">
 	<link rel="stylesheet" href="/dist/css/style.css"><link rel="icon" href="/dist/images/favicon.gif">
+
 </head>
 
 <body class="default">

diff --git a/site/feed.xml b/site/feed.xml
@@ -1,41 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xml:base="en">
-  <title>Lincoln Highway Journal</title>
-  <subtitle>driving along the Main Street Across America</subtitle>
-  <link href="https://lincolnhighwayjournal.com/feed.xml" rel="self"/>
-  <link href="https://lincolnhighwayjournal.com/"/>
-  <updated>2022-09-05T18:00:00Z</updated>
-  <id>https://lincolnhighwayjournal.com/</id>
-  <author>
-    <name>Reed Piernock</name>
-    <email>postcard@lincolnhighwayjournal.com</email>
-  </author>
-
-  <entry>
-    <title>Documenting the journey</title>
-    <link href="https://lincolnhighwayjournal.com/blog/post/2022-09-05-documenting-the-journey/"/>
-    <updated>2022-09-05T18:00:00Z</updated>
-    <id>https://lincolnhighwayjournal.com/blog/post/2022-09-05-documenting-the-journey/</id>
-    <content type="html">&lt;p&gt;Part of the journey is not just experiencing adventures, but documenting them. Writing things down or taking photos will remind future-me of everything that happened, and will also provide updates for my friends and family.&lt;/p&gt;
+<rss version="2.0"
+  xmlns:content="http://purl.org/rss/1.0/modules/content/"
+  xmlns:media="http://search.yahoo.com/mrss/"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xml:base="https://lincolnhighwayjournal.com"
+  xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>Lincoln Highway Journal</title>
+    <link>https://lincolnhighwayjournal.com</link>
+    <atom:link href="https://lincolnhighwayjournal.com/feed.xml" rel="self" type="application/rss+xml" />
+    <description>driving along the Main Street Across America</description>
+    <language>en</language>
+      <item>
+        <title>Documenting the journey</title>
+        <link>https://lincolnhighwayjournal.com/blog/post/2022-09-05-documenting-the-journey/</link>
+        <description>It&#39;s only 30 days until I hit the road, and the packing is in full swing.</description>
+        <content:encoded><![CDATA[&lt;p&gt;Part of the journey is not just experiencing adventures, but documenting them. Writing things down or taking photos will remind future-me of everything that happened, and will also provide updates for my friends and family.&lt;/p&gt;
 &lt;p&gt;It&#39;s been years since I&#39;ve journaled regularly, and I&#39;m looking forward to the opportunity to write again. I love &lt;a href=&quot;https://www.leuchtturm1917.us/&quot;&gt;leuchtturm1917&lt;/a&gt; notebooks and have used them the past few years for keeping track of to-dos, or organizing notes from grad school courses. It seemed an obvious choice for my travel journal.&lt;/p&gt;
 &lt;p&gt;In addition, I bought a smaller notebook to act as an actual travelog, recording dates of travel, miles driven, times of breaks, gas prices, etc. Part of this is the fun of maintaining a register (we&#39;ll see how that changes along the way!) and part is reporting expenses; since I&#39;ll be traveling to a conference, work is sponsoring that part of the trip.&lt;/p&gt;
 &lt;p&gt;The minutiae of travel fascinates me, especially over time as roads have been improved and cars have advanced technology. I have a copy of &lt;a href=&quot;https://archive.org/details/acrosscontinentb00glad&quot;&gt;&lt;em&gt;Across the Continent by the Lincoln Highway&lt;/em&gt;&lt;/a&gt;, a 1914 account of the cross-country road by Effie Price Gladding. I&#39;m waiting until the trip starts to read it!&lt;/p&gt;
 &lt;p&gt;I further hope to document what it will be like to travel during a pandemic. Although the worst of it is over, covid-19 &lt;em&gt;is&lt;/em&gt; still a thing, and I&#39;m taking as many safety measures as I can. There is risk involved, for sure, and I&#39;ll do my best to mitigate that.&lt;/p&gt;
 &lt;p&gt;If there are things you&#39;d like to read on the blog, let me know! &lt;a href=&quot;https://twitter.com/LincHwyJournal&quot;&gt;Find me on Twitter&lt;/a&gt; or &lt;a href=&quot;https://lincolnhighwayjournal.com/blog/post/2022-09-05-documenting-the-journey/postcard@lincolnhighwayjournal.com&quot;&gt;send an email&lt;/a&gt;. I can&#39;t wait for October to come.&lt;/p&gt;
-</content>
-  </entry>
-
-  <entry>
-    <title>I&#39;m headed for adventure!</title>
-    <link href="https://lincolnhighwayjournal.com/blog/post/2022-09-05-i-m-headed-for-adventure/"/>
-    <updated>2022-09-05T12:00:00Z</updated>
-    <id>https://lincolnhighwayjournal.com/blog/post/2022-09-05-i-m-headed-for-adventure/</id>
-    <content type="html">&lt;p&gt;I&#39;ve been planning this trip for over three years, and now it&#39;s nearly here. If you consider daydreaming about doing this, then I&#39;ve really been &amp;quot;planning&amp;quot; for about 25 years.&lt;/p&gt;
+]]></content:encoded>
+        <media:content url="https://lincolnhighwayjournal.com/blog/post/2022-09-05-documenting-the-journey/documenting-300w.jpeg" type="image/jpeg" medium="image" />
+        <pubDate>Mon, 05 Sep 2022 14:00:00 +0000</pubDate>
+        <dc:creator>Reed Piernock</dc:creator>
+        <guid>https://lincolnhighwayjournal.com/blog/post/2022-09-05-documenting-the-journey/</guid>
+      </item>
+      <item>
+        <title>I&#39;m headed for adventure!</title>
+        <link>https://lincolnhighwayjournal.com/blog/post/2022-09-05-i-m-headed-for-adventure/</link>
+        <description>I&#39;ve been planning this trip for over three years, and now it&#39;s nearly here.</description>
+        <content:encoded><![CDATA[&lt;p&gt;I&#39;ve been planning this trip for over three years, and now it&#39;s nearly here. If you consider daydreaming about doing this, then I&#39;ve really been &amp;quot;planning&amp;quot; for about 25 years.&lt;/p&gt;
 &lt;p&gt;I grew up in Philadelphia and attended college on the Main Line, an area along Route 30 from Malvern stretching into Philadelphia, named for its association with the old Pennsylvania Railroad and the wealthy communities along it. Most of this section runs right along the Lincoln Highway, and some portions are still named that (while others are named after the old Lancaster Turnpike). When going to school, I often took the SEPTA train into the city, which shares the tracks with Amtrak today. I loved that ride and the road it parallels.&lt;/p&gt;
 &lt;p&gt;I read &lt;a href=&quot;https://www.barnesandnoble.com/w/lincoln-highway-brian-a-butko/1100000919?ean=9780811748261&quot;&gt;Brian Butko&#39;s &lt;em&gt;The Lincoln Highway: Pennsylvania Traveler&#39;s Guide&lt;/em&gt;&lt;/a&gt; back in the late &#39;90s, and learned that what was Lincoln Highway or Lincoln Ave around my way was not only a route through Pennsylvania, but the whole United States, from Times Square in the east to the Legion of Honor in the west. Fascinated with its history, I dreamed of one day roadtripping the entire length.&lt;/p&gt;
 &lt;p&gt;When I entered graduate school in 2019, my wife and I discussed what I wanted to do once I&#39;d completed my degree. After pondering it over, I settled on this adventure: finally driving the entirely of the Lincoln Highway! Many spreadsheets were created, including one with the average high and low temperatures in each state along the route. I choose October for its most appealing temps, and riding in fall meant gorgeous autumn leaves along some parts. I&#39;ve lived among a plethora of spreadsheets, documents, wish lists, to-dos, sticky notes, and maps over the past three years.&lt;/p&gt;
 &lt;p&gt;A session proposal for a tech conference was accepted, and I had to adjust my timing and my route. My journey begins in Arkansas at the conference, then takes me out west, stopping to visit friends along the way. The official Lincoln Highway section of my adventure starts mid-October at the western terminus at the Legion of Honor in San Francisco. I expect to make it to Times Square in New York City in time for my birthday!&lt;/p&gt;
 &lt;p&gt;I&#39;m excited about this trip, and also looking forward to documenting the travel, the food (so much food!), the weird little things roadside, sweet little local shops, and everything else. One month to go!&lt;/p&gt;
-</content>
-  </entry>
-</feed>
+]]></content:encoded>
+        <media:content url="https://lincolnhighwayjournal.com/blog/post/2022-09-05-i-m-headed-for-adventure/9104193151_f9e22e4d4d_o-300w.jpeg" type="image/jpeg" medium="image" />
+        <pubDate>Mon, 05 Sep 2022 08:00:00 +0000</pubDate>
+        <dc:creator>Reed Piernock</dc:creator>
+        <guid>https://lincolnhighwayjournal.com/blog/post/2022-09-05-i-m-headed-for-adventure/</guid>
+      </item>
+  </channel>
+</rss>
diff --git a/source/_includes/global/head.njk b/source/_includes/global/head.njk
@@ -1,26 +1,4 @@
-{%- if feature -%}
-  {#- Since feature images can be set from either the blog post directory -#}
-  {#- or from a Flickr url, some tweaking of the source needs to be done in -#}
-  {#- order for Twitter or OpenGraph to find the image for "cards". First, -#}
-  {#- the feature image file is split at `/` to get an array that can be -#}
-  {#- manipulated. -#}
-  {%- set feature_image_url = feature.file.split("/") -%}
-  {#- We only want the slug from that, which is the last item in the array. -#}
-  {%- set feature_image_slug = feature_image_url[feature_image_url.length - 1] -%}
-  {#- Onec we have the slug, we can split it at the `.` for the extension. -#}
-  {%- set feature_image_no_ext = feature_image_slug.split(".") -%}
-  {#- We only want the file _name_ so grab that from the array first item. -#}
-  {%- set feature_image_name = feature_image_no_ext[0] -%}
-  {#- Now, put together a URL that Twitter can OpenGraph can find! This -#}
-  {#- includes the site URL, path of the blog post, the image file _name_, -#}
-  {#- and the size and extension of the image we want. -#}
-  {%- set feature_image_file = site.url + page.url + feature_image_name + "-300w.jpeg" -%}
-{%- else -%}
-  {#- If there is no feature image, set the feature image file to a default -#}
-  {#- image. This will most likely be the home page, category archive, etc, -#}
-  {#- but is also handy if there _is_ a blog post with no feature image. -#}
-  {%- set feature_image_file = site.url + "/dist/images/photos/california-section.jpeg" -%}
-{%- endif -%}
+{%- from "post/feature-image.njk" import featureImageFile with context -%}
 
 {%-
   metagen
@@ -32,7 +10,7 @@
     generator = "eleventy",
     comments = false,
     css = ["/dist/css/style.css"],
-    img = feature_image_file,
+    img = featureImageFile(feature.file),
     img_alt = feature.alt,
     twitter_card_type = "summary_large_image",
     twitter_handle = "LincHwyJournal"

diff --git a/source/_includes/layouts/post.njk b/source/_includes/layouts/post.njk
@@ -3,7 +3,6 @@
 {%- set main_page_class = "narrow" -%}
 {%- set post_title_link = false -%}
 
-{%- set post_feature = feature -%}
 {%- set post_date = date -%}
 {%- set post_url = url -%}
 {%- set post_title = title -%}
@@ -16,7 +15,19 @@
 {%- endblock title_content -%}
 
 {%- block page_hero -%}
-  {%- include "post/feature-image.njk" -%}
+  {%- if feature -%}
+    <section class="container container-wide feature-image" aria-label="feature image">
+      <div class="container feature-image-inner">
+        <figure>
+          {%- if feature.flickr -%}
+            {%- image feature.file, feature.alt, feature.flickr -%}
+          {%- else -%}
+            {%- image feature.file, feature.alt -%}
+          {%- endif -%}
+        </figure>
+      </div>
+    </section>
+  {%- endif -%}
 {%- endblock page_hero -%}
 
 {%- block pagination -%}