fix(#160): Differentiate prefix and separator…

This is more logical as the data is in the same Website object.

Author: arkhi

_src/_data/participants/tom-hazledine.toml

@@ -6,11 +6,11 @@ display = "Tom Hazledine"
 [[websites]]
 url   = "https://tomhazledine.com/"
 years = [2020,2024,2025]
-suffix = ''
 
 [[websites]]
-url   = "https://tomhazledine.com/css-naked-day/"
-title = "always naked"
-years = [2024,2025]
-prefix = " (some of which is "
-suffix = ")"
+url       = "https://tomhazledine.com/css-naked-day/"
+title     = "always naked"
+years     = [2024,2025]
+prefix    = " (some of which is "
+suffix    = ")"
+separator = ''

_src/year.njk

@@ -58,9 +58,9 @@
                 {%- else -%}
                   {{ participant | getParticipantDisplayName }}:
 
-                  {% for website in websites %}
-                    {% linkNoSpam 'getSiteTitle', website, participant, year, loop.revindex0 %}
-                  {% endfor %}
+                  {% for website in websites -%}
+                    {% linkNoSpam 'getSiteTitle', website, participant, year, loop.index0 %}
+                  {%- endfor %}
                 {% endif %}
               </li>
             {% endfor %}

eleventy.config.js

@@ -50,6 +50,7 @@ export default function (eleventyConfig) {
     };
 
     let title;
+    let separator = website.separator;
     let prefix = website.prefix;
     let suffix = website.suffix;
 
@@ -62,19 +63,19 @@ export default function (eleventyConfig) {
         break;
     }
 
-    if (suffix === undefined && loopRevIndex0) {
-      suffix = loopRevIndex0 > 1 ? ', ' : ' & ';
+    if (separator === undefined && loopRevIndex0) {
+      separator = loopRevIndex0 > 1 ? ' & ' : ', ';
     }
 
-    if (!website?.url) {
+    if (!website.url) {
       return title;
     }
 
     if (website.spam) {
       return website.url;
     }
 
-    return `${prefix || ''}<a href="${website.url}">${title}</a>${suffix || ''}`
+    return `${separator ?? ''}${prefix ?? ''}<a href="${website.url}">${title}</a>${suffix ?? ''}`
   });
 
   // TODO: Add a tool to target duplicated domains.