From 06bdc472945298a73ea0defcb403dd7fd2f2efd3 Mon Sep 17 00:00:00 2001
From: Christian Muise <christian.muise@gmail.com>
Date: Wed, 14 Oct 2020 21:24:16 -0400
Subject: [PATCH 1/5] Fixing member -vs- team

---
 layouts/partials/index/members.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/layouts/partials/index/members.html b/layouts/partials/index/members.html
index 7ef557b..f3781d4 100644
--- a/layouts/partials/index/members.html
+++ b/layouts/partials/index/members.html
@@ -1,13 +1,13 @@
 <section id="members" class="home-section">
     <div class="container">
-        
+
         <!-- Section heading -->
         <div class="row">
             <div class="col-xs-12 col-md-4 section-heading">
-                <h1 class="section-heading"><a href="{{.Site.BaseURL}}/team/{{if .Site.Params.uglyURLs}}index.html{{end}}"> Team </a></h1>
+                <h1 class="section-heading"><a href="{{.Site.BaseURL}}/member/{{if .Site.Params.uglyURLs}}index.html{{end}}"> Team </a></h1>
             </div>
         </div>
-       
+
         <!-- Members -->
         <div class="row">
             {{ range (sort (where .Site.RegularPages "Type" "member") ".Params.sort_position")}}
@@ -16,15 +16,15 @@ <h1 class="section-heading"><a href="{{.Site.BaseURL}}/team/{{if .Site.Params.ug
                 {{ end }}
             {{ end }}
         </div>
-        
+
         <!-- Link to all members -->
         <div>
             <p class="view-all">
-                <a href="{{ .Site.BaseURL }}/team/{{if .Site.Params.uglyURLs}}index.html{{end}}">
+                <a href="{{ .Site.BaseURL }}/member/{{if .Site.Params.uglyURLs}}index.html{{end}}">
                     Full team
                     <i class="fa fa-angle-double-right"></i>
                 </a>
             </p>
         </div>
     </div>
-</section>
\ No newline at end of file
+</section>

From 34db3d2b0f944486e75fc5b8b83161c8ed79b4a2 Mon Sep 17 00:00:00 2001
From: Christian Muise <christian.muise@gmail.com>
Date: Thu, 15 Oct 2020 23:27:23 -0400
Subject: [PATCH 2/5] Organize vacancies by type.

---
 archetypes/vacancy.md              | 1 +
 layouts/section/open-projects.html | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/archetypes/vacancy.md b/archetypes/vacancy.md
index a073c22..591d3fc 100644
--- a/archetypes/vacancy.md
+++ b/archetypes/vacancy.md
@@ -2,5 +2,6 @@
 description = ""
 external_link = ""
 vacancy_id = ""
+type = ""
 featured = false
 +++
diff --git a/layouts/section/open-projects.html b/layouts/section/open-projects.html
index 1016af2..5f4f3a5 100644
--- a/layouts/section/open-projects.html
+++ b/layouts/section/open-projects.html
@@ -6,7 +6,7 @@
         <div class="col-md-12">
             <h1>Open projects</h1>
 
-            {{ range .Data.Pages.GroupByDate "2006" }}
+            {{ range (.Data.Pages.GroupByParam "type").Reverse }}
             <div class="row" id="pub_list">
                 <div class="col-md-2">
                     <h3>{{ .Key }}</h3>
@@ -18,7 +18,7 @@ <h3>{{ .Key }}</h3>
                             {{ else if .Params.external_link }}
                                 {{ .Scratch.Set "link" .Params.external_link }}
                             {{ end }}
-                    
+
                             <h3><a href="{{ .Scratch.Get "link" }}" itemprop="url">{{ .Title }}</a></h3>
                             {{ with .Params.description }}
                                 {{ . }}

From 53a52e713643800eebb8c9d480ec472e2dee99ac Mon Sep 17 00:00:00 2001
From: Christian Muise <christian.muise@gmail.com>
Date: Thu, 15 Oct 2020 23:34:37 -0400
Subject: [PATCH 3/5] Avoiding overloaded term.

---
 archetypes/vacancy.md              | 2 +-
 layouts/section/open-projects.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/archetypes/vacancy.md b/archetypes/vacancy.md
index 591d3fc..a744638 100644
--- a/archetypes/vacancy.md
+++ b/archetypes/vacancy.md
@@ -2,6 +2,6 @@
 description = ""
 external_link = ""
 vacancy_id = ""
-type = ""
+vacancy_type = ""
 featured = false
 +++
diff --git a/layouts/section/open-projects.html b/layouts/section/open-projects.html
index 5f4f3a5..446d7d0 100644
--- a/layouts/section/open-projects.html
+++ b/layouts/section/open-projects.html
@@ -6,7 +6,7 @@
         <div class="col-md-12">
             <h1>Open projects</h1>
 
-            {{ range (.Data.Pages.GroupByParam "type").Reverse }}
+            {{ range (.Data.Pages.GroupByParam "vacancy_type").Reverse }}
             <div class="row" id="pub_list">
                 <div class="col-md-2">
                     <h3>{{ .Key }}</h3>

From b7a34b68eada444334a04c58f0bee7ea34086e61 Mon Sep 17 00:00:00 2001
From: Christian Muise <christian.muise@gmail.com>
Date: Sun, 18 Oct 2020 20:43:57 -0400
Subject: [PATCH 4/5] Don't display interests and education if they aren't
 specified.

---
 layouts/member/single.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/layouts/member/single.html b/layouts/member/single.html
index 31b26d5..f8e399f 100644
--- a/layouts/member/single.html
+++ b/layouts/member/single.html
@@ -55,6 +55,7 @@ <h4>{{ .role }}, {{.name}}</h4>
     <div class="col-xs-12 col-md-8" itemprop="description">
         <div class="row">
 
+            {{ if isset .Params "interests" }}
             <div class="col-sm-5">
                 <h3>Interests</h3>
                 <ul>
@@ -63,9 +64,10 @@ <h3>Interests</h3>
                     {{ end }}
                 </ul>
             </div>
+            {{ end }}
 
 
-
+            {{ if isset .Params "education" }}
             <div class="col-sm-7">
                 <h3>Education</h3>
                 <ul class="ul-edu fa-ul">
@@ -80,6 +82,7 @@ <h3>Education</h3>
                     {{ end }}
                 </ul>
             </div>
+            {{ end }}
 
         </div>
 

From e445d62e4995b677f3c084b7eed59c7f1bd9395b Mon Sep 17 00:00:00 2001
From: Christian Muise <christian.muise@gmail.com>
Date: Sun, 18 Oct 2020 23:34:04 -0400
Subject: [PATCH 5/5] Only display the featured openings on the main page, and
 display type.

---
 layouts/partials/index/open_projects.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/layouts/partials/index/open_projects.html b/layouts/partials/index/open_projects.html
index d928d66..0308570 100644
--- a/layouts/partials/index/open_projects.html
+++ b/layouts/partials/index/open_projects.html
@@ -3,25 +3,25 @@
 <section id="open-projects" class="home-section">
     <div class="container">
        <div class="row">
-            
+
             <!-- Section heading -->
             <div class="col-xs-12 col-md-4 section-heading">
                 <h1><a href="{{.Site.BaseURL}}/open-projects/{{if .Site.Params.uglyURLs}}index.html{{end}}">{{ with .Site.Params.open_projects.title }}{{ . | markdownify }}{{ end }}</a></h1>
                 {{ with .Site.Params.open_projects.subtitle }}<p>{{ . | markdownify }}</p>{{ end }}
             </div>
-            
+
             <!-- Vacancies -->
             <div class="col-xs-12 col-md-8">
-                {{ range first .Site.Params.open_projects.count (where .Site.RegularPages "Type" "open-projects") }}
+                {{ range first .Site.Params.open_projects.count (where (where .Site.RegularPages "Type" "open-projects") ".Params.featured" "==" true) }}
                     <div class="article-list-item">
                         {{ if .Content }}
                             {{ .Scratch.Set "link" .Permalink}}
                         {{ else if .Params.external_link }}
                             {{ .Scratch.Set "link" .Params.external_link}}
                         {{ end }}
-                        
+
                         <h3 class="article-title" itemprop="name">
-                            <a href="{{ .Scratch.Get "link" }}" itemprop="url">{{ .Title }}</a>
+                            <a href="{{ .Scratch.Get "link" }}" itemprop="url">({{ .Params.vacancy_type }}) {{ .Title }}</a>
                         </h3>
 
                         {{ with .Params.description }}
@@ -36,7 +36,7 @@ <h3 class="article-title" itemprop="name">
                                 Go to external website
                             </a>
                             {{ end }}
-                            
+
                             {{ if .Content }}
                             <a href="{{ .Scratch.Get "link" }}" class="btn btn-primary btn-outline">
                                 {{ with .Site.Params.posts.str_read_more }}{{ . | markdownify }}{{ end }}
@@ -47,7 +47,7 @@ <h3 class="article-title" itemprop="name">
                 {{ end }}
             </div>
         </div>
-        
+
         <!-- Link to all vacancies -->
         <div>
             <p class="view-all">