Development branch

content/index.njk

@@ -24,41 +24,37 @@
                 </span>
             </h1>
         </header>
-        <main class="container grid">
+        <main
+            class="container grid">
             {# sort from newest to oldest #}
-            {%- for trip in collections.trip | reverse-%}
-                {% if trip.data.label %}
-                    {% set label = trip.data.label %}
-                {% else %}
-                    {% set label = 'glenfiddich' %}
-                {% endif %}
+            {%- for featured in collections.featured | reverse -%}
                 {# todo: proper sizes values for label images #}
-                <a data-label="{{ label }}" href="{{ trip.page.url }}">
+                <a data-label="{{ featured.data.label }}" href="{{ featured.page.url }}">
                     <article class="article">
-                        <h2 class="title">{{ trip.data.title }}</h2>
+                        <h2 class="title">{{ featured.data.title }}</h2>
                         <h3 class="subtitle">
-                            <span>{{ trip.data.subtitle }}</span>
+                            <span>{{ featured.data.subtitle }}</span>
                         </h3>
-                        {% image ["img/", trip.data.image_file, ".jpeg"] | join, trip.data.image_alt, "300px" %}
+                        {% image ["img/", featured.data.image_file, ".jpeg"] | join, featured.data.image_alt, "300px" %}
                         <p class="days">
-                            <strong>{{ trip.data.days }}</strong>
+                            <strong>{{ featured.data.days }}</strong>
                             <span>days</span>
                         </p>
                         <p class="kilometres">
-                            <strong>{{ trip.data.kilometres }}</strong>
+                            <strong>{{ featured.data.kilometres }}</strong>
                             <span>km</span>
                         </p>
                         <p class="location">
                             <span>From</span>
-                            <strong>{{ trip.data.start }}</strong>
+                            <strong>{{ featured.data.start }}</strong>
                             <span>to</span>
-                            <strong>{{ trip.data.end }}</strong>
+                            <strong>{{ featured.data.end }}</strong>
                         </p>
                         <p class="excerpt">
-                            {% if trip.data.label == 'glenlivet' %}
-                                {{ trip.page.excerpt | truncate(50) }}
+                            {% if featured.data.label == 'glenlivet' %}
+                                {{ featured.page.excerpt | truncate(50) }}
                             {% else %}
-                                {{ trip.page.excerpt }}
+                                {{ featured.page.excerpt }}
                             {% endif %}
                         </p>
                     </article>
@@ -67,10 +63,16 @@
         </main>
         <footer class="stack" data-theme="green">
             <div class="container">
-                <p><small>&copy; 2024 Maureen Holland and Jack Araz. Don't sip and cycle.</small>
+                <p>
+                    <small>&copy; 2024 Maureen Holland and Jack Araz. Don't sip and cycle.</small>
                 </p>
                 <nav aria-label="social">
                     <ul>
+                        <li><a aria-label="Whisky & Wheels YouTube Channel" href="https://youtube.com/@whisky-and-wheels?si=jc-GdtpyZXge2bwT" class="social__link"><svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 28.57 20" preserveaspectratio="xMidYMid meet"><g><path d="M27.9727 3.12324C27.6435 1.89323 26.6768 0.926623 25.4468 0.597366C23.2197 2.24288e-07 14.285 0 14.285 0C14.285 0
+                            5.35042 2.24288e-07 3.12323 0.597366C1.89323 0.926623 0.926623 1.89323 0.597366 3.12324C2.24288e-07 5.35042 0 10 0 10C0
+                            10 2.24288e-07 14.6496 0.597366 16.8768C0.926623 18.1068 1.89323 19.0734 3.12323 19.4026C5.35042 20 14.285 20 14.285
+                            20C14.285 20 23.2197 20 25.4468 19.4026C26.6768 19.0734 27.6435 18.1068 27.9727 16.8768C28.5701 14.6496 28.5701 10
+                            28.5701 10C28.5701 10 28.5677 5.35042 27.9727 3.12324Z" fill="white"/><path d="M11.4253 14.2854L18.8477 10.0004L11.4253 5.71533V14.2854Z" fill="black"/></g></svg></a></li>
                         <li><a aria-label="Jack's Instagram" href="https://www.instagram.com/jackaraz" class="social__link"><svg aria-hidden="true" focusable="false" id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 1000 1000"><defs><style>.cls-1 {
                             fill: #fff;
                         }</style></defs><path class="cls-1" d="M295.42,6c-53.2,2.51-89.53,11-121.29,23.48-32.87,12.81-60.73,30-88.45,57.82S40.89,143,28.17,175.92c-12.31,31.83-20.65,68.19-23,121.42S2.3,367.68,2.56,503.46,3.42,656.26,6,709.6c2.54,53.19,11,89.51,23.48,121.28,12.83,32.87,30,60.72,57.83,88.45S143,964.09,176,976.83c31.8,12.29,68.17,20.67,121.39,23s70.35,2.87,206.09,2.61,152.83-.86,206.16-3.39S799.1,988,830.88,975.58c32.87-12.86,60.74-30,88.45-57.84S964.1,862,976.81,829.06c12.32-31.8,20.69-68.17,23-121.35,2.33-53.37,2.88-70.41,2.62-206.17s-.87-152.78-3.4-206.1-11-89.53-23.47-121.32c-12.85-32.87-30-60.7-57.82-88.45S862,40.87,829.07,28.19c-31.82-12.31-68.17-20.7-121.39-23S637.33,2.3,501.54,2.56,348.75,3.4,295.42,6m5.84,903.88c-48.75-2.12-75.22-10.22-92.86-17-23.36-9-40-19.88-57.58-37.29s-28.38-34.11-37.5-57.42c-6.85-17.64-15.1-44.08-17.38-92.83-2.48-52.69-3-68.51-3.29-202s.22-149.29,2.53-202c2.08-48.71,10.23-75.21,17-92.84,9-23.39,19.84-40,37.29-57.57s34.1-28.39,57.43-37.51c17.62-6.88,44.06-15.06,92.79-17.38,52.73-2.5,68.53-3,202-3.29s149.31.21,202.06,2.53c48.71,2.12,75.22,10.19,92.83,17,23.37,9,40,19.81,57.57,37.29s28.4,34.07,37.52,57.45c6.89,17.57,15.07,44,17.37,92.76,2.51,52.73,3.08,68.54,3.32,202s-.23,149.31-2.54,202c-2.13,48.75-10.21,75.23-17,92.89-9,23.35-19.85,40-37.31,57.56s-34.09,28.38-57.43,37.5c-17.6,6.87-44.07,15.07-92.76,17.39-52.73,2.48-68.53,3-202.05,3.29s-149.27-.25-202-2.53m407.6-674.61a60,60,0,1,0,59.88-60.1,60,60,0,0,0-59.88,60.1M245.77,503c.28,141.8,115.44,256.49,257.21,256.22S759.52,643.8,759.25,502,643.79,245.48,502,245.76,245.5,361.22,245.77,503m90.06-.18a166.67,166.67,0,1,1,167,166.34,166.65,166.65,0,0,1-167-166.34" transform="translate(-2.5 -2.5)"/></svg></a></li>
@@ -101,14 +103,7 @@
                             12.214-1.63c4.125 0 8.33.571 12.213 1.63 9.302-6.356 13.427-5.052 13.427-5.052 2.67 6.763.97 11.816.485 13.038 3.155
                             3.422 5.015 7.822 5.015 13.2 0 18.905-11.404 23.06-22.324 24.283 1.78 1.548 3.316 4.481 3.316 9.126 0 6.6-.08 11.897-.08
                             13.526 0 1.304.89 2.853 3.316 2.364 19.412-6.52 33.405-24.935 33.405-46.691C97.707 22 75.788 0 48.854 0z" fill="#fff"/></svg></a></li>
-                        <li><a href="./feeds/trips.xml" aria-label="RSS feeds" class="social__link">
-                            <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8" width="256" height="256">
-  <rect xmlns="http://www.w3.org/2000/svg" width="8" height="8" rx="1.5" fill="none" />
-  <circle xmlns="http://www.w3.org/2000/svg" cx="2" cy="6" r="1" fill="currentColor" />
-  <path xmlns="http://www.w3.org/2000/svg" d="m 1,4 a 3,3 0 0 1 3,3 h 1 a 4,4 0 0 0 -4,-4 z" fill="currentColor"/>
-  <path xmlns="http://www.w3.org/2000/svg" d="m 1,2 a 5,5 0 0 1 5,5 h 1 a 6,6 0 0 0 -6,-6 z" fill="currentColor" />
-                            </svg>
-                        </a></li>
+                        <li><a href="./feeds/trips.xml" aria-label="RSS feeds" class="social__link"><svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 8 8" width="256" height="256"><rect xmlns="http://www.w3.org/2000/svg" width="8" height="8" rx="1.5" fill="none"/><circle xmlns="http://www.w3.org/2000/svg" cx="2" cy="6" r="1" fill="currentColor"/><path xmlns="http://www.w3.org/2000/svg" d="m 1,4 a 3,3 0 0 1 3,3 h 1 a 4,4 0 0 0 -4,-4 z" fill="currentColor"/><path xmlns="http://www.w3.org/2000/svg" d="m 1,2 a 5,5 0 0 1 5,5 h 1 a 6,6 0 0 0 -6,-6 z" fill="currentColor"/></svg></a></li>
                     </ul>
                 </nav>
                 <!-- .container -->

content/trips/cairngorms/index.md

@@ -16,7 +16,7 @@ sidetrip_km: 0
 social: cairngorms.jpg
 start: Pitlochry
 subtitle: Our first long bike trip
-tags: trip
+tags: ['trip', 'featured']
 title: Cairngorms
 total_duration: 1-09:00:00
 ---

content/trips/index.njk

@@ -128,6 +128,11 @@
                     </p>
                     <nav aria-label="social">
                         <ul>
+                            <li><a aria-label="Whisky & Wheels YouTube Channel" href="https://youtube.com/@whisky-and-wheels?si=jc-GdtpyZXge2bwT" class="social__link"><svg xmlns="http://www.w3.org/2000/svg" viewbox="0 0 28.57 20" preserveaspectratio="xMidYMid meet"><g><path d="M27.9727 3.12324C27.6435 1.89323 26.6768 0.926623 25.4468 0.597366C23.2197 2.24288e-07 14.285 0 14.285 0C14.285 0
+                                5.35042 2.24288e-07 3.12323 0.597366C1.89323 0.926623 0.926623 1.89323 0.597366 3.12324C2.24288e-07 5.35042 0 10 0 10C0
+                                10 2.24288e-07 14.6496 0.597366 16.8768C0.926623 18.1068 1.89323 19.0734 3.12323 19.4026C5.35042 20 14.285 20 14.285
+                                20C14.285 20 23.2197 20 25.4468 19.4026C26.6768 19.0734 27.6435 18.1068 27.9727 16.8768C28.5701 14.6496 28.5701 10
+                                28.5701 10C28.5701 10 28.5677 5.35042 27.9727 3.12324Z" fill="white"/><path d="M11.4253 14.2854L18.8477 10.0004L11.4253 5.71533V14.2854Z" fill="black"/></g></svg></a></li>
                             <li><a aria-label="Jack's Instagram" href="https://www.instagram.com/jackaraz" class="social__link"><svg aria-hidden="true" focusable="false" id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 1000 1000"><defs><style>.cls-1 {
                                 fill: #fff;
                             }</style></defs><path class="cls-1" d="M295.42,6c-53.2,2.51-89.53,11-121.29,23.48-32.87,12.81-60.73,30-88.45,57.82S40.89,143,28.17,175.92c-12.31,31.83-20.65,68.19-23,121.42S2.3,367.68,2.56,503.46,3.42,656.26,6,709.6c2.54,53.19,11,89.51,23.48,121.28,12.83,32.87,30,60.72,57.83,88.45S143,964.09,176,976.83c31.8,12.29,68.17,20.67,121.39,23s70.35,2.87,206.09,2.61,152.83-.86,206.16-3.39S799.1,988,830.88,975.58c32.87-12.86,60.74-30,88.45-57.84S964.1,862,976.81,829.06c12.32-31.8,20.69-68.17,23-121.35,2.33-53.37,2.88-70.41,2.62-206.17s-.87-152.78-3.4-206.1-11-89.53-23.47-121.32c-12.85-32.87-30-60.7-57.82-88.45S862,40.87,829.07,28.19c-31.82-12.31-68.17-20.7-121.39-23S637.33,2.3,501.54,2.56,348.75,3.4,295.42,6m5.84,903.88c-48.75-2.12-75.22-10.22-92.86-17-23.36-9-40-19.88-57.58-37.29s-28.38-34.11-37.5-57.42c-6.85-17.64-15.1-44.08-17.38-92.83-2.48-52.69-3-68.51-3.29-202s.22-149.29,2.53-202c2.08-48.71,10.23-75.21,17-92.84,9-23.39,19.84-40,37.29-57.57s34.1-28.39,57.43-37.51c17.62-6.88,44.06-15.06,92.79-17.38,52.73-2.5,68.53-3,202-3.29s149.31.21,202.06,2.53c48.71,2.12,75.22,10.19,92.83,17,23.37,9,40,19.81,57.57,37.29s28.4,34.07,37.52,57.45c6.89,17.57,15.07,44,17.37,92.76,2.51,52.73,3.08,68.54,3.32,202s-.23,149.31-2.54,202c-2.13,48.75-10.21,75.23-17,92.89-9,23.35-19.85,40-37.31,57.56s-34.09,28.38-57.43,37.5c-17.6,6.87-44.07,15.07-92.76,17.39-52.73,2.48-68.53,3-202.05,3.29s-149.27-.25-202-2.53m407.6-674.61a60,60,0,1,0,59.88-60.1,60,60,0,0,0-59.88,60.1M245.77,503c.28,141.8,115.44,256.49,257.21,256.22S759.52,643.8,759.25,502,643.79,245.48,502,245.76,245.5,361.22,245.77,503m90.06-.18a166.67,166.67,0,1,1,167,166.34,166.65,166.65,0,0,1-167-166.34" transform="translate(-2.5 -2.5)"/></svg></a></li>

content/trips/lindisfarne/index.md

@@ -16,7 +16,7 @@ name: lindisfarne
 social: lindisfarne.jpg
 start: Berwick-upon-Tweed
 subtitle: The causeway that floods twice a day
-tags: trip
+tags: ['trip', 'featured']
 title: Lindisfarne
 total_duration: 07:05:36
 total_elevation: 500m

content/trips/loch-lomond/index.md

@@ -14,7 +14,7 @@ name: loch-lomond
 social: loch_lomond.jpg
 start: Balloch
 subtitle: A beautiful but miserable ride
-tags: trip
+tags: ['trip', 'featured']
 title: Loch Lomond
 total_duration: 07:42:17
 total_elevation: 500m

content/trips/outer-hebrides-skye/armadale.md

@@ -0,0 +1,23 @@
+---
+ascent: 468
+average_speed: 14.0
+date: 2023-08-11
+descent: 595
+end: Armadale
+kilometres: 48
+permalink: false
+sidetrip_duration: 0:0:0
+sidetrip_km: 0
+start: Elgol
+tags: outer-hebrides-skye
+title: Armadale
+total_duration: '3:25:39'
+---
+
+Jack says it takes 15.5 days to kill him. He is dead.
+
+More accurately, he was dead about halfway through today’s ride but we managed to suffer through and catch the ferry anyway. I felt bad for him. I would have towed him if I could. I know things have gotten grim if he doesn’t even have the energy to complain. But we made it.
+
+On the plus side, this ride had a lovely bike path running parallel to the main road for a significant stretch along the Sleat peninsula. This was particularly appreciated because there were a good number of large vehicles speeding along the road to and from the ferry. Biking alongside transport trucks is never fun.
+
+If we come back to this part of Scotland (and we’d like to), I would want to find more routes that keep us off the main roads.