fixed sort order on our team page, reorganised into 3 distinct groups…

…(academics, phd students, alumni) to make it easier to edit later

content/our-team.njk

@@ -6,19 +6,27 @@ eleventyNavigation:
   order: 2
 ---
 
-{% for group, items in collections.current_people | groupby("data.group") %}
-    <section>
-    <h2>{{ group }}</h2>
-    <div class="grid-2">
-    {% for item in items %}
-      {% include 'partials/person.njk' %}
-    {% endfor %}
+
+<section>
+<h2>Academics</h2>
+<div class="grid-2">
+{% for item in collections.people_academics | sortByOrder  %}
+  {% include 'partials/person.njk' %}
 {% endfor %}
 
+<section>
+<h2>PhD Students</h2>
+<div class="grid-2">
+{% for item in collections.people_phd_students | sortByOrder %}
+  {% include 'partials/person.njk' %}
+{% endfor %}
+
+
+
 <section>
 <h2>Alumni</h2>
 <div class="grid-2">
-{% for item in collections.alumni_people %}
+{% for item in collections.people_alumni | sortByOrder %}
   {% include 'partials/person.njk' %}
 {% endfor %}
 </div>

content/our-team/current/current.11tydata.js → content/our-team/academics/academics.11tydata.js

@@ -1,4 +1,4 @@
 module.exports = {
-	tags: ["current_people"],
+	tags: ["people_academics"],
 	permalink: false, // Don't generate pages for each person
 };

content/our-team/current/eun-jung-holden.md → content/our-team/academics/eun-jung-holden.md

@@ -5,4 +5,5 @@ uwa_profile: https://research-repository.uwa.edu.au/en/persons/eun-jung-holden
 linkedin_profile: https://www.linkedin.com/in/eun-jung-holden-8233075a/?originalSubdomain=au
 image_filename: eun-jung-holden.jpg
 group: Academics
+order: 5
 ---

content/our-team/current/melinda-hodkiewicz.md → content/our-team/academics/melinda-hodkiewicz.md

@@ -5,4 +5,5 @@ uwa_profile: https://research-repository.uwa.edu.au/en/persons/melinda-hodkiewic
 linkedin_profile: https://www.linkedin.com/in/melinda-hodkiewicz-b6bbba7
 image_filename: melinda-hodkiewicz.jpg
 group: Academics
+order: 3
 ---

content/our-team/current/tim-french.md → content/our-team/academics/tim-french.md

@@ -5,4 +5,5 @@ uwa_profile: https://research-repository.uwa.edu.au/en/persons/tim-french
 linkedin_profile: https://www.linkedin.com/in/tim-french-3881208
 image_filename: tim-french.jpg
 group: Academics
+order: 2
 ---

content/our-team/current/wei-liu.md → content/our-team/academics/wei-liu.md

@@ -5,4 +5,5 @@ uwa_profile: https://research-repository.uwa.edu.au/en/persons/wei-liu
 linkedin_profile: https://www.linkedin.com/in/wei-liu-b0b4521ab
 image_filename: wei-liu.jpg
 group: Academics
+order: 1
 ---

content/our-team/alumni/alumni.11tydata.js

@@ -1,4 +1,4 @@
 module.exports = {
-	tags: ["alumni_people"],
+	tags: ["people_alumni"],
 	permalink: false, // Don't generate pages for each person
 };

content/our-team/current/michael-stewart.md → content/our-team/alumni/michael-stewart.md

@@ -5,4 +5,5 @@ uwa_profile: https://research-repository.uwa.edu.au/en/persons/michael-stewart
 linkedin_profile: https://www.linkedin.com/in/michael-stewart-80211a1a0
 image_filename: michael-stewart.jpg
 group: Academics
+order: 1
 ---

content/our-team/alumni/sirui-li.md

@@ -5,4 +5,5 @@ uwa_profile: https://research-repository.uwa.edu.au/en/persons/sirui-li
 linkedin_profile: https://www.linkedin.com/in/sirui-li-563715163
 image_filename: sirui-li.jpg
 group: Academics
+order: 3
 ---

content/our-team/alumni/tom-smoker.md

@@ -5,4 +5,5 @@ project_title: Rectifying knowledge graph link prediction using embedding-enhanc
 linkedin_profile: https://www.linkedin.com/in/thomassmoker
 image_filename: tom-smoker.jpg
 group: PhD Students
+order: 4
 ---

content/our-team/alumni/ziyu-zhao.md

@@ -5,4 +5,5 @@ project_title: An Efficient Neural Probabilistic Logical Resolution for Multi-cl
 linkedin_profile: https://www.linkedin.com/in/ziyu-zhao-142b8916a/
 image_filename: ziyu-zhao.jpg
 group: PhD Students
+order: 2
 ---

content/our-team/current/caitlin-woods.md → content/our-team/phd_students/caitlin-woods.md

@@ -6,4 +6,5 @@ website: https://caitlin2694.github.io/
 linkedin_profile: https://www.linkedin.com/in/caitlin-woods
 image_filename: caitlin-woods.jpg
 group: PhD Students
+order: 4
 ---

content/our-team/current/chau-nguyen.md → content/our-team/phd_students/chau-nguyen.md

@@ -4,4 +4,5 @@ title: PhD Student
 project_title: Query Embedding for Long Reasoning over Natural-Technical Domains
 image_filename: chau-nguyen.jpg
 group: PhD Students
+order: 2
 ---

content/our-team/current/pascal-sun.md → content/our-team/phd_students/pascal-sun.md

@@ -5,4 +5,5 @@ project_title: Representation Learning and Query Embeddings for Spatio-Temporal
 linkedin_profile: https://www.linkedin.com/in/pascalsun23/
 image_filename: pascal-sun.jpg
 group: PhD Students
+order: 1
 ---

content/our-team/phd_students/phd_students.11tydata.js

@@ -0,0 +1,4 @@
+module.exports = {
+	tags: ["people_phd_students"],
+	permalink: false, // Don't generate pages for each person
+};

content/our-team/current/tyler-bikaun.md → content/our-team/phd_students/tyler-bikaun.md

@@ -5,4 +5,5 @@ project_title: Technical Language Processing for Industrial Maintenance Records
 linkedin_profile: https://www.linkedin.com/in/tyler-bikaun/
 image_filename: tyler-bikaun.jpg
 group: PhD Students
+order: 3
 ---

eleventy.config.js

@@ -44,6 +44,18 @@ module.exports = function (eleventyConfig) {
 		return "/" + value.split("/")[1] + "/";
 	});
 
+	eleventyConfig.addFilter("sortByOrder", (values) => {
+		return values.sort(function (a, b) {
+			let order_a = a.data.order || 999;
+			let order_b = b.data.order || 999;
+			return order_a - order_b;
+		});
+	});
+
+	// eleventyConfig.addCollection("people_academics", function (collectionApi) {
+	// 	return sortByOrder(collection.people_academics);
+	// });
+
 	// Parse a youtube link in the form e.g.
 	// https://www.youtube.com/watch?v=ZEKAzNNfeSc and return the embed link
 	eleventyConfig.addFilter("getYoutubeEmbedLink", (youtubeLink) => {