Update pages for new author schema

Author: RSTZZZ

_includes/card-authors-with-role.html

@@ -1,27 +1,69 @@
-
+<!-- Control which set of authors to show for the people page -->
 {% for hash in include.authors -%}
 {% assign author = hash[1] -%}
 
-{% if author.alumni %}
-{% assign alumni = true %}
+{% assign show_author = false %}
+
+{% if include.render_current_role %}
+
+{% if author.current_role.type == include.role %}
+
+{% if include.title %}
+{% if author.current_role.title == include.title %}
+{% assign show_author = true %}
+{% assign role_to_render = author.current_role %}
+{% endif %}
+
 {% else %}
-{% assign alumni = false %}
+
+{% assign show_author = true %}
+{% assign role_to_render = author.current_role %}
+
 {% endif %}
 
-{% if alumni == include.alumni %}
-{% if author.role == include.role %}
+{% endif %}
 
-{% if alumni == false %}
-{% if author.role == "Faculty" or author.role == "Adjunct Faculty" or author.role == "Postdoc" %}
-{% assign loading = "eager" %}
 {% else %}
-{% assign loading = "lazy" %}
-{% endif %}
+
+{% for past_role in author.past_roles %}
+
+{% if past_role.type == include.role %}
+
+{% if include.title %}
+{% if past_role.title == include.title %}
+{% assign show_author = true %}
+{% assign role_to_render = past_role %}
+{% break %}
 {% endif %}
 
-{% include display-author.html author=author loading=loading %}
 
-{%endif %}
+{% else %}
+
+{% assign show_author = true %}
+{% assign role_to_render = past_role %}
+{% break %}
 {% endif %}
 
+
+
+{% endif %}
 {% endfor %}
+
+
+{% endif %}
+
+{% if show_author %}
+
+{% assign loading = "lazy" %}
+{% if include.render_current_role %}
+{% unless author.current_role.type == "Student" %}
+{% assign loading = "eager" %}
+{% endunless %}
+{% endif %}
+
+{% include display-author.html author=author loading=loading render_current_role=render_current_role
+role_to_render=role_to_render %}
+
+{% endif %}
+
+{% endfor %}

_includes/display-author.html

@@ -1,4 +1,4 @@
-<!-- show-author-with-roles.html -->
+<!-- Show author next to post, should show most up to date info -->
 <article class="author-card">
     <div class="author-avatar">
         {% if author.avatar %}
@@ -18,26 +18,33 @@
             {% endif %}
         </b>
 
-        {% if author.advisor %}
+        {% if include.role_to_render %}
+
         <div class="author-advisor">
+            {% if include.role_to_render.type == "Student" %}
             <b>
-                {% if author.role == "Postdoc" %}
-                Working with:
-                {% elsif author.role == "Intern" %}
+                {% if include.role_to_render.title == "Intern" %}
                 Hosted by:
                 {% else %}
                 Advised by:
                 {% endif %}
             </b>
-            {{ author.advisor }}
-            {% if author.date %}
+            {{ include.role_to_render.advisor }}
+            {% else %}
+            {{ include.role_to_render.title }}
+            {% endif %}
+        </div>
+        {% if include.role_to_render.start_date %}
+        <div class="author-advisor">
             <span>
-                ({{ author.date }})
+                ({{ include.role_to_render.start_date }}{% if include.role_to_render.end_date %}-{{
+                include.role_to_render.end_date }}{% endif %})
             </span>
-            {% endif %}
         </div>
         {% endif %}
 
+        {% endif %}
+
         {% if author.bio %}
         <div class="author-bio">
             {{ author.bio }}
@@ -50,11 +57,13 @@
         </div>
         {% endif %}
 
-        {% if author.new_role %}
+        {% unless include.render_current_role %}
+        {% if author.current_role == "Unaffiliated" %}
         <div class="author-note">
-            <b>➡️ </b> {{ author.new_role }}
+            <b>➡️ </b> {{ author.current_role.title }}
         </div>
         {% endif %}
+        {% endunless %}
 
         {% if author.links %}
         <div class="author-links">

_includes/project.html

@@ -20,12 +20,12 @@
           {% if r.logo_image_path %}
           <div class="research-directions-logo">
             {% if r.logo_dark_image_path %}
-            <img src="{{ r.logo_image_path | relative_url }}" class="theme-image light-image"
+            <img loading="lazy" src="{{ r.logo_image_path | relative_url }}" class="theme-image light-image"
               alt="{% if r.alt %}{{ r.alt }}{% endif %}">
-            <img src="{{ r.logo_dark_image_path | relative_url }}" class="theme-image dark-image"
+            <img loading="lazy" src="{{ r.logo_dark_image_path | relative_url }}" class="theme-image dark-image"
               alt="{% if r.alt %}{{ r.alt }}{% endif %}">
             {% else %}
-            <img src="{{ r.logo_image_path | relative_url }}" alt="{{ r.title }}">
+            <img loading="lazy" src="{{ r.logo_image_path | relative_url }}" alt="{{ r.title }}">
             {% endif %}
           </div>
           {% endif %}

_includes/research-directions.html

@@ -4,57 +4,57 @@ permalink: /people/
 layout: archive
 ---
 
+## Faculty & Staff & Postdoc
 
-## Faculty & Staff
-
-{% include card-authors-with-role.html authors=site.data.authors role="Faculty" alumni=false %}
-{% include card-authors-with-role.html authors=site.data.authors role="Postdoc" alumni=false %}
-{% include card-authors-with-role.html authors=site.data.authors role="Research Assistant" alumni=false %}
-
+{% include card-authors-with-role.html authors=site.data.authors role="Faculty" render_current_role=true %}
+{% include card-authors-with-role.html authors=site.data.authors role="Staff" render_current_role=true %}
+{% include card-authors-with-role.html authors=site.data.authors role="Postdoc" render_current_role=true %}
 
 ## Students
 
 ### PhD 
 
-{% include card-authors-with-role.html authors=site.data.authors role="PhD" alumni=false %}
+{% include card-authors-with-role.html authors=site.data.authors role="Student" title="PhD" render_current_role=true %}
 
-### Masters
+### Master
 
-{% include card-authors-with-role.html authors=site.data.authors role="Master" alumni=false %}
+{% include card-authors-with-role.html authors=site.data.authors role="Student" title="Master" render_current_role=true %}
 
-### Undergraduate
+<!-- ### Undergraduate
 
-{% include card-authors-with-role.html authors=site.data.authors role="Undergraduate" alumni=false %}
+{% include card-authors-with-role.html authors=site.data.authors role="Student" title="Undergraduate" render_current_role=true %}
 
-### Interns
+### Intern
 
-{% include card-authors-with-role.html authors=site.data.authors role="Intern" alumni=false %}
+{% include card-authors-with-role.html authors=site.data.authors role="Student" title="Intern" render_current_role=true %} -->
 
 ---
 
-# Alumni
+# Past Members
 
-## Faculty & Staff
+## Faculty & Staff & Postdoc
 
-{% include card-authors-with-role.html authors=site.data.authors role="Postdoc" alumni=true %}
+{% include card-authors-with-role.html authors=site.data.authors role="Faculty" render_current_role=false %}
+{% include card-authors-with-role.html authors=site.data.authors role="Staff" render_current_role=false %}
+{% include card-authors-with-role.html authors=site.data.authors role="Postdoc" render_current_role=false %}
 
-## Students
+## Alumni
 
 ### PhD
 
-{% include card-authors-with-role.html authors=site.data.authors role="PhD" alumni=true %}
+{% include card-authors-with-role.html authors=site.data.authors role="Student" title="PhD" render_current_role=false %}
 
 ### Masters
 
-{% include card-authors-with-role.html authors=site.data.authors role="Master" alumni=true %}
+{% include card-authors-with-role.html authors=site.data.authors role="Student" title="Master" render_current_role=false %}
 
 ### Undergraduate
 
-{% include card-authors-with-role.html authors=site.data.authors role="Undergraduate" alumni=true %}
+{% include card-authors-with-role.html authors=site.data.authors role="Student" title="Undergraduate" render_current_role=false %}
 
 ### Interns
 
-{% include card-authors-with-role.html authors=site.data.authors role="Intern" alumni=true %}
+{% include card-authors-with-role.html authors=site.data.authors role="Student" title="Intern" render_current_role=false %}
 
 <br/>