From 11ebbc1cb1e8c4ed4bfa3beeed58facd07bf2ee5 Mon Sep 17 00:00:00 2001
From: Matthew Grove <matthew@grove.gq>
Date: Wed, 6 Mar 2019 06:39:16 +0000
Subject: [PATCH] Update carousel to show all appropriate articles Ensure that
 if articles are written by more than one author, both authors are compared to
 each article individually

---
 _includes/article-carousel.html | 78 ++++++++++++++++++---------------
 _site/sitemap.xml               |  4 +-
 2 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/_includes/article-carousel.html b/_includes/article-carousel.html
index 331b99b..744a3fc 100644
--- a/_includes/article-carousel.html
+++ b/_includes/article-carousel.html
@@ -2,49 +2,55 @@
     {% assign article_list_displayed = false %}
     {% for article in site.categories.articles %}
         {% if article.url != page.url %}
-        {% for author in article.authors %}
-                {% for current_author in page.authors %}
-                    {% if author == current_author %}
-                        {% if article_list_displayed == false %}
-                        <h2 class="mdc-typography--headline5">
-                            {% if page.authors.first %}
-                            Other Articles By These Authors
-                            {% else %}
-                            Other Articles By This Author
-                            {% endif %}
-                        </h2>
-                        <!-- define carousel -->
-                        <div class="carousel">
-                        {% assign article_list_displayed = true %}
+        {% assign authors = article.authors | split: ", " %}
+        {% for author in authors %}
+            {% if article.date | date: "%Y" == page.date | date: "%Y" %}
+            {% assign current_authors = page.authors | split: ", " %}
+            {% for current_author in current_authors %}
+                {% if author == current_author %}
+                    {% if article_list_displayed == false %}
+                    <h2 class="mdc-typography--headline5">
+                        {% if current_authors.first %}
+                        Other Articles By These Authors
+                        {% else %}
+                        Other Articles By This Author
                         {% endif %}
-                        <!-- display article -->
-                        <div class="mdc-card carousel-item">
-                            <div class="mdc-card__media mdc-card__media--16-9 {{ article.url | relative_url | replace: '/', '-' | replace: '.', '-' }}"></div>
-                            <div class="mdc-card-content">
-                                <h2 class="mdc-typography--headline6">{{ article.title }}</h2>
-                                <h3 class="mdc-typography--subtitle2">
-                                    <time class="timeago" datetime="{{ article.date | date: '%Y-%m-%d' }}T{{ article.date | date: '%H:%M:%S' }}">{{ article.date | date: '%A %e %B %Y' }}</time>
-                                     | by {{ article.authors }}
-                                </h3>
+                    </h2>
+                    <!-- define carousel -->
+                    <div class="carousel">
+                    {% assign article_list_displayed = true %}
+                    {% endif %}
+                    <!-- display article -->
+                    <div class="mdc-card carousel-item">
+                        <div class="mdc-card__media mdc-card__media--16-9 {{ article.url | relative_url | replace: '/', '-' | replace: '.', '-' }}"></div>
+                        <div class="mdc-card-content">
+                            <h2 class="mdc-typography--headline6">{{ article.title }}</h2>
+                            <h3 class="mdc-typography--subtitle2">
+                                <time class="timeago" datetime="{{ article.date | date: '%Y-%m-%d' }}T{{ article.date | date: '%H:%M:%S' }}">{{ article.date | date: '%A %e %B %Y' }}</time>
+                                 | by {{ article.authors }}
+                            </h3>
+                        </div>
+                        <div class="mdc-card__actions">
+                            <div class="mdc-card__action-buttons">
+                                <button class="mdc-button mdc-card__action mdc-card__action--button" data-mdc-auto-init="MDCRipple" onclick="window.location='{{ article.url | relative_url }}';">Read</button>
                             </div>
-                            <div class="mdc-card__actions">
-                                <div class="mdc-card__action-buttons">
-                                    <button class="mdc-button mdc-card__action mdc-card__action--button" data-mdc-auto-init="MDCRipple" onclick="window.location='{{ article.url | relative_url }}';">Read</button>
-                                </div>
-                            </div>
+                        </div>
 
-                            <style>
-                                .{{ article.url | relative_url | replace: '/', '-' | replace: '.', '-' }} {
-                                    background-image: url("/images/{{ article.url | relative_url | remove: '.html' | replace: '/', '-' | remove: '-articles-' }}--cover.jpg");
-                                }
-                            </style>
-                        </div>
-                        {% break %}
+                        <style>
+                            .{{ article.url | relative_url | replace: '/', '-' | replace: '.', '-' }} {
+                                background-image: url("/images/{{ article.url | relative_url | remove: '.html' | replace: '/', '-' | remove: '-articles-' }}--cover.jpg");
+                            }
+                        </style>
+                    </div>
+                    {% break %}
                     {% endif %}
-                {% endfor %}
             {% endfor %}
+            {% endif %}
+        {% endfor %}
         {% endif %}
     {% endfor %}
+    {% if article_list_displayed == true %}
     <!-- close carousel -->
     </div>
+    {% endif %}
 {% endif %}
diff --git a/_site/sitemap.xml b/_site/sitemap.xml
index 479e555..ac6e176 100644
--- a/_site/sitemap.xml
+++ b/_site/sitemap.xml
@@ -5,7 +5,7 @@
     
     <url>
         <loc>/404.html</loc>
-        <lastmod>2019-03-05</lastmod>
+        <lastmod>2019-03-06</lastmod>
         <changefreq>hourly</changefreq>
         <priority>0.5</priority>
     </url>
@@ -16,7 +16,7 @@
     
     <url>
         <loc>/</loc>
-        <lastmod>2019-03-05</lastmod>
+        <lastmod>2019-03-06</lastmod>
         <changefreq>hourly</changefreq>
         <priority>0.5</priority>
     </url>