From 2faba61581bd8a4808475cebc35bfa0a1bf2f6ea Mon Sep 17 00:00:00 2001
From: timurgordon <timurgordon@gmail.com>
Date: Wed, 27 Jul 2022 16:01:02 +0200
Subject: [PATCH] newsroom refactor to support people taxonomy

---
 templates/newsPage.html              | 26 +++++++++++++++-----------
 templates/partials/featuredNews.html | 12 +++++++-----
 templates/partials/newsCard.html     | 14 ++++++++------
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/templates/newsPage.html b/templates/newsPage.html
index 7a3afc0af..fb0bc567b 100644
--- a/templates/newsPage.html
+++ b/templates/newsPage.html
@@ -17,12 +17,14 @@
         <div class="flex items-center">
           <div class="flex justify-between items-center">
             <ul class="list-none flex author-list my-10 mr-2 px-0">
-              {% for author in page.extra.authors %}
-              {% set fullpath = "/people/" ~ author | replace(from='_', to='-' ) %}
-              {% if page.extra.authorImg %}
+            {% if page.taxonomies.people %}
+              {% for person in page.taxonomies.people %}
+              {% set author_path = 'people/' ~ person ~ '/index.md' %}
+              {% set author = get_page(path=author_path) %}
+              {% set author_img = get_url(path='/' ~ author.relative_path | replace(from='_', to='-') | replace(from='index.md', to=author.extra.imgPath)) %}
               <li class="author-list-item">
-                <a href="{{fullpath}}" tooltip="{{author}}">
-                  <img src="/{{ page.extra.authorImg }}" alt="{{ author }}" class="
+                <a href="{{author.permalink}}" tooltip="{{author.title}}">
+                  <img src="{{author_img}}" alt="{{ author.title }}" class="
                     w-10
                     h-10
                     rounded-full
@@ -31,20 +33,22 @@
                   " />
                 </a>
               </li>
-              {% endif %}
               {% endfor %}
+              {% endif %}
             </ul>
           </div>
 
           <div class="pl-3 flex flex-col text-xs leading-none uppercase">
             <p>
-              {% for author in page.extra.authors %}
-              {% set fullpath = "/people/" ~ author | replace(from='_', to='-' ) %}
+            {% if page.taxonomies.people %}
+                {% for person in page.taxonomies.people %}
+                {% set author_path = 'people/' ~ person ~ '/index.md' %}
+                {% set author = get_page(path=author_path) %}
               <span>
-                <a href="{{fullpath}}" tooltip="{{author}}" class="hover:underline text-gray-800">{{ author | replace(from='_', to=' '
-                  ) }}</a>
+                <a href="{{author.permalink}}" tooltip="{{author.title}}" class="hover:underline text-gray-800">{{ author.title }}</a>
               </span>
-              {% endfor %}
+                {% endfor %}
+            {% endif %}
             </p>
             <p class="text-gray-700">
               <time datetime="{{page.date}}">
diff --git a/templates/partials/featuredNews.html b/templates/partials/featuredNews.html
index eccc12265..d363e814b 100644
--- a/templates/partials/featuredNews.html
+++ b/templates/partials/featuredNews.html
@@ -12,17 +12,19 @@
 
       <h4 class="text-sm not-italic font-light leading-6 text-gray-600">
         {{ featured.date | date(format="%B %e, %Y", timezone="America/Chicago")}} -
-        {% for author in featured.extra.authors %}
-        {% set fullpath = "/people/" ~ author | replace(from='_', to='-' ) %}
-        <a href="{{fullpath}}" tooltip="{{author}}" class="capitalize	text-gray-800"> <img
-            src="{{ featured.extra.authorImg }}" alt="{{ author | replace(from='_', to=' ' ) }}" class="
+        {% for author in featured.taxonomies.people %}
+        {% set author_path = 'people/' ~ author ~ '/index.md' %}
+        {% set author = get_page(path=author_path) %}
+        {% set author_img = get_url(path='/' ~ author.relative_path | replace(from='_', to='-') | replace(from='index.md', to=author.extra.imgPath)) %}
+        <a href="{{author.permalink}}" tooltip="{{author.title}}" class="capitalize	text-gray-800"> <img
+            src="{{ author_img }}" alt="{{ author.title }}" class="
             inline-flex 
           w-8
           h-8
           rounded-full
           bg-gray-200
           border-2 border-white
-        " /> {{author | replace(from='_', to=' ' )}}</a>
+        " /> {{ author.title }}</a>
         {% endfor %}
       </h4>
 
diff --git a/templates/partials/newsCard.html b/templates/partials/newsCard.html
index 2efef3895..e519b01d5 100644
--- a/templates/partials/newsCard.html
+++ b/templates/partials/newsCard.html
@@ -18,12 +18,14 @@
     <div class="flex items-center">
       <div class="flex justify-between items-center">
         <ul class="list-none flex author-list my-10 mr-2 px-0">
-          {% for author in post.extra.authors %}
-          {% set fullpath = "/people/" ~ author | replace(from='_', to='-' ) %}
-          {% if post.extra.authorImg %}
+            {% if featured.taxonomies.people %}
+            {% for author in featured.taxonomies.people %}
+            {% set author_path = 'people/' ~ author ~ '/index.md' %}
+            {% set author = get_page(path=author_path) %}
+            {% set author_img = get_url(path='/' ~ author.relative_path | replace(from='_', to='-') | replace(from='index.md', to=author.extra.imgPath)) %}
           <li class="author-list-item">
-            <a href="{{fullpath}}" tooltip="{{author}}">
-              <img src="{{ post.extra.authorImg }}" alt="{{ author }}" class="
+            <a href="{{ author.permalink }}" tooltip="{{ author.title }}">
+              <img src="{{ author_img }}" alt="{{ author.title }}" class="
                   w-8
                   h-8
                   rounded-full
@@ -32,8 +34,8 @@
                 " />
             </a>
           </li>
-          {% endif %}
           {% endfor %}
+          {% endif %}
         </ul>
       </div>