From 930fbe02ea597dafc78747ef24c37c93bcbaa718 Mon Sep 17 00:00:00 2001
From: ashleysyg <ashley.syg.lee@gmail.com>
Date: Thu, 24 Aug 2023 11:51:25 -0400
Subject: [PATCH 01/10] feat: sort people by team

---
 components/blocks/About.vue | 19 ++++++++++++++++++-
 content                     |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/components/blocks/About.vue b/components/blocks/About.vue
index 72866f4..62aba29 100644
--- a/components/blocks/About.vue
+++ b/components/blocks/About.vue
@@ -68,8 +68,9 @@
         </client-only>
         <!-- People -->
         <div v-if="item.title === 'People'" class="card-group">
+          {{ teamSort }}
           <DPersonCard
-            v-for="person in orderedPeople"
+            v-for="person in teamSort"
             :key="urlize(person.name)"
             variant="white"
             accent="warning"
@@ -170,6 +171,22 @@ export default {
       people.sort((a, b) => (a.name > b.name ? 1 : -1));
       return people;
     },
+    teams() {
+      const teams = [...new Set(this.orderedPeople.map((x) => x.team))];
+      const subteams = [...new Set(this.orderedPeople.map((x) => x.subteam))];
+      teams.sort((a, b) => (a > b ? 1 : -1));
+      subteams.sort((a, b) => (a > b ? 1 : -1));
+      return [teams, subteams];
+    },
+    teamSort() {
+      const d = this.orderedPeople;
+      d.sort((a, b) => {
+        return (
+          this.teams[1].indexOf(a.subteam) - this.teams[1].indexOf(b.subteam)
+        );
+      });
+      return d;
+    },
   },
   methods: {
     urlize,
diff --git a/content b/content
index e8744b7..6eddcd4 160000
--- a/content
+++ b/content
@@ -1 +1 @@
-Subproject commit e8744b7467cfd85675948fb334a855776fb9d896
+Subproject commit 6eddcd4d5baa3aca495cb52283b599b601529d53

From 765ec5b973123b3f00e2512d32bcb06449a1cc16 Mon Sep 17 00:00:00 2001
From: ashleysyg <ashley.syg.lee@gmail.com>
Date: Thu, 24 Aug 2023 16:00:12 -0400
Subject: [PATCH 02/10] feat: add accent colors by subteam

---
 components/blocks/About.vue        | 16 ++++--
 components/blocks/FilesToCards.vue | 89 ++++++++----------------------
 2 files changed, 35 insertions(+), 70 deletions(-)

diff --git a/components/blocks/About.vue b/components/blocks/About.vue
index 62aba29..a59e853 100644
--- a/components/blocks/About.vue
+++ b/components/blocks/About.vue
@@ -68,12 +68,11 @@
         </client-only>
         <!-- People -->
         <div v-if="item.title === 'People'" class="card-group">
-          {{ teamSort }}
           <DPersonCard
             v-for="person in teamSort"
             :key="urlize(person.name)"
             variant="white"
-            accent="warning"
+            :accent="teamColor()[person.subteam]"
             width="xsmall"
             class="mx-1 my-1"
             :name="person.name"
@@ -117,7 +116,7 @@
 <script>
 import DTOC from '@/components/base/DTableOfContents.vue';
 import DPersonCard from '@/components/base/DPersonCard.vue';
-import { urlize } from '@/utils';
+import { COLOR_VARIANTS, urlize } from '@/utils';
 
 export default {
   components: {
@@ -154,7 +153,6 @@ export default {
         return sortOrder.indexOf(a.slug) - sortOrder.indexOf(b.slug);
       });
     },
-
     tocData() {
       return this.sortedData.map((d, i) => {
         return {
@@ -164,7 +162,6 @@ export default {
         };
       });
     },
-
     orderedPeople() {
       const d = this.data;
       const people = [...d.find((d) => d.title === 'People').data];
@@ -190,6 +187,15 @@ export default {
   },
   methods: {
     urlize,
+    teamColor() {
+      const numTeams = this.teams[1].length;
+      const colors = COLOR_VARIANTS.slice(2, numTeams + 2);
+      const obj = {};
+      this.teams[1].forEach((k, i) => {
+        obj[k] = colors[i];
+      });
+      return obj;
+    },
   },
 };
 </script>
diff --git a/components/blocks/FilesToCards.vue b/components/blocks/FilesToCards.vue
index f10fcb2..5403b50 100644
--- a/components/blocks/FilesToCards.vue
+++ b/components/blocks/FilesToCards.vue
@@ -6,12 +6,7 @@
         $route.params.main === 'services' ||
         ($route.params.main === 'our-work' && !$route.params.category)
       "
-      class="
-        card-container
-        is-flex
-        mt-6
-        is-justify-content-space-evenly is-flex-wrap-wrap
-      "
+      class="÷ card-container is-flex mt-6 is-justify-content-space-evenly is-flex-wrap-wrap"
     >
       <DCard
         v-for="(item, i) in filteredData"
@@ -46,14 +41,7 @@
                 link.target.startsWith('mailto')
               "
               :href="link.target"
-              class="
-                m-1
-                link-item
-                d-button
-                has-background-link has-text-white has-text-weight-semibold
-                is-size-5
-                link-button
-              "
+              class="m-1 link-item d-button has-background-link has-text-white has-text-weight-semibold is-size-5 link-button"
             >
               {{ link.text.toUpperCase() }}
               <span class="icon ml-2">
@@ -63,14 +51,7 @@
             <nuxt-link
               v-else
               :to="link.target"
-              class="
-                m-1
-                link-item
-                d-button
-                has-background-link has-text-white has-text-weight-semibold
-                is-size-5
-                link-button
-              "
+              class="m-1 link-item d-button has-background-link has-text-white has-text-weight-semibold is-size-5 link-button"
             >
               {{ link.text.toUpperCase() }}
               <span class="icon ml-2">
@@ -83,22 +64,16 @@
     </div>
     <div v-else class="container">
       <div
-        class="
-          multiselect-header
-          mt-4
-          mb-1
-          is-flex is-flex-wrap-wrap is-justify-content-space-evenly
-        "
+        class="multiselect-header mt-4 mb-1 is-flex is-flex-wrap-wrap is-justify-content-space-evenly"
       >
         Filter cards by:
       </div>
       <div
-        class="
-          dropdown
-          is-flex is-flex-wrap-wrap is-justify-content-space-evenly
-        "
+        class="dropdown is-flex is-flex-wrap-wrap is-justify-content-space-evenly"
       >
-        <div class="mb-1 is-flex is-justify-content-space-evenly is-flex-wrap-wrap">
+        <div
+          class="mb-1 is-flex is-justify-content-space-evenly is-flex-wrap-wrap"
+        >
           <div
             v-for="(cat, index) in tagCategories"
             :key="cat"
@@ -127,22 +102,14 @@
         <button class="ml-1 button is-normal is-warning" @click="clearAll">
           Clear Filters
         </button>
-    </div>
+      </div>
       <div
-        class="
-          multiselect-header
-          mt-5
-          mb-1
-          is-flex is-flex-wrap-wrap is-justify-content-space-evenly
-        "
+        class="multiselect-header mt-5 mb-1 is-flex is-flex-wrap-wrap is-justify-content-space-evenly"
       >
         Sort cards by:
       </div>
       <div
-        class="
-          dropdown
-          is-flex is-flex-wrap-wrap is-justify-content-space-evenly
-        "
+        class="dropdown is-flex is-flex-wrap-wrap is-justify-content-space-evenly"
       >
         <div class="mb-1 is-flex">
           <multiselect
@@ -167,12 +134,7 @@
         </div>
       </div>
       <div
-        class="
-          card-container
-          is-flex
-          mt-6
-          is-justify-content-space-evenly is-flex-wrap-wrap
-        "
+        class="card-container is-flex mt-6 is-justify-content-space-evenly is-flex-wrap-wrap"
       >
         <DCard
           v-for="(item, i) in sortedArray"
@@ -231,14 +193,7 @@
               <a
                 v-for="link in item.links"
                 :key="link.url"
-                class="
-                  m-1
-                  link-item
-                  d-button
-                  has-background-link has-text-white has-text-weight-semibold
-                  is-size-5
-                  link-button
-                "
+                class="m-1 link-item d-button has-background-link has-text-white has-text-weight-semibold is-size-5 link-button"
                 :href="link.url"
               >
                 <span>{{ link.category.toUpperCase() }} </span>
@@ -336,10 +291,12 @@ export default {
       for (let i=0; i < this.searchGroup.length; i++) {
         if (this.searchGroup[i] && this.searchGroup[i].length > 0) {
           filtered = filtered.filter((card) => {
-            return this.searchGroup[i].map(name => name.tagCode).some((tag) =>
-              this.tags.some((tagType) => {
-                const tags = card[tagType] ?? [];
-                return tags.includes(tag);
+            return this.searchGroup[i]
+              .map((name) => name.tagCode)
+              .some((tag) =>
+                this.tags.some((tagType) => {
+                  const tags = card[tagType] ?? [];
+                  return tags.includes(tag);
                 })
               );
           });
@@ -394,12 +351,14 @@ export default {
         .map((tagType) => this.filteredData.map((card) => card[tagType]))
         .flat(2)
         .filter((e) => e);
-      const names = tags.filter((tag, index) => tags.indexOf(tag) === index).sort();
-      const tagCodes = names.map(item => humanizeHero(item))
+      const names = tags
+        .filter((tag, index) => tags.indexOf(tag) === index)
+        .sort();
+      const tagCodes = names.map((item) => humanizeHero(item));
       const res = []
       names.forEach((n, index) => {
         const code = tagCodes[index];
-        res.push({name: code, tagCode: n})
+        res.push({ name: code, tagCode: n });
       });
       return res;
     },

From 59331a8e588ecb1b92d3a9ee3a10181bf8adb7ea Mon Sep 17 00:00:00 2001
From: "Ashley S. Lee" <ashley.syg.lee@gmail.com>
Date: Mon, 28 Aug 2023 13:22:25 -0400
Subject: [PATCH 03/10] Apply suggestions from code review

Co-authored-by: Ellen Duong <shi.ellenduong@gmail.com>
---
 components/blocks/FilesToCards.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/blocks/FilesToCards.vue b/components/blocks/FilesToCards.vue
index 5403b50..b4bf3a8 100644
--- a/components/blocks/FilesToCards.vue
+++ b/components/blocks/FilesToCards.vue
@@ -6,7 +6,7 @@
         $route.params.main === 'services' ||
         ($route.params.main === 'our-work' && !$route.params.category)
       "
-      class="÷ card-container is-flex mt-6 is-justify-content-space-evenly is-flex-wrap-wrap"
+      class="card-container is-flex mt-6 is-justify-content-space-evenly is-flex-wrap-wrap"
     >
       <DCard
         v-for="(item, i) in filteredData"

From 658cbbf650d7ebe645f53da41bd2d71f84c0248e Mon Sep 17 00:00:00 2001
From: ashleysyg <ashley.syg.lee@gmail.com>
Date: Mon, 28 Aug 2023 14:10:33 -0400
Subject: [PATCH 04/10] feat: add subteam and scroll to our teams on click

---
 components/base/DPersonCard.vue | 7 ++++++-
 components/blocks/About.vue     | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/base/DPersonCard.vue b/components/base/DPersonCard.vue
index 657182a..6530f7b 100644
--- a/components/base/DPersonCard.vue
+++ b/components/base/DPersonCard.vue
@@ -30,7 +30,8 @@
       <footer class="content py-3 px-3">
         <h5>{{ name }}</h5>
         <p data-testid="title-team">
-          <small>{{ title }} | {{ team }}</small>
+          <small>{{ title }}</small>
+          <small v-scroll-to="'#our-teams'">{{ team }} | {{ subteam }}</small>
         </p>
         <slot name="icons" />
       </footer>
@@ -60,6 +61,10 @@ export default {
       type: String,
       required: true,
     },
+    subteam: {
+      type: String,
+      required: true,
+    },
     mainImage: {
       type: String,
       required: true,
diff --git a/components/blocks/About.vue b/components/blocks/About.vue
index 5e8e2bf..c5cca3c 100644
--- a/components/blocks/About.vue
+++ b/components/blocks/About.vue
@@ -78,6 +78,7 @@
             :name="person.name"
             :title="person.title"
             :team="person.team"
+            :subteam="person.subteam"
             :main-image="'/content/images/people/' + person.image"
             :hover-image="
               '/content/images/people/' + person.image.replace('main', 'hover')

From 2072f92d8c6179654c9acc091d2ad9a485ca00ed Mon Sep 17 00:00:00 2001
From: ashleysyg <ashley.syg.lee@gmail.com>
Date: Wed, 30 Aug 2023 13:58:42 -0400
Subject: [PATCH 05/10] fix: remove scroll to subteam

---
 components/base/DPersonCard.vue | 3 ++-
 content                         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/base/DPersonCard.vue b/components/base/DPersonCard.vue
index 6530f7b..f8c39bf 100644
--- a/components/base/DPersonCard.vue
+++ b/components/base/DPersonCard.vue
@@ -31,7 +31,8 @@
         <h5>{{ name }}</h5>
         <p data-testid="title-team">
           <small>{{ title }}</small>
-          <small v-scroll-to="'#our-teams'">{{ team }} | {{ subteam }}</small>
+          <small>{{ team }}</small>
+          <small>{{ subteam }}</small>
         </p>
         <slot name="icons" />
       </footer>
diff --git a/content b/content
index 6eddcd4..8a549ea 160000
--- a/content
+++ b/content
@@ -1 +1 @@
-Subproject commit 6eddcd4d5baa3aca495cb52283b599b601529d53
+Subproject commit 8a549eab776953dcf70739be526bcf1aa34c2570

From 350de5316757a90b90f9614ef500691848c38e9d Mon Sep 17 00:00:00 2001
From: ashleysyg <ashley.syg.lee@gmail.com>
Date: Mon, 11 Sep 2023 15:56:35 -0400
Subject: [PATCH 06/10] fix: minor fixes to text aesthetics and icons

---
 components/base/AuthorCard.vue  | 8 ++++++--
 components/base/DPersonCard.vue | 6 +++---
 components/blocks/About.vue     | 2 +-
 content                         | 2 +-
 pages/people/_people.vue        | 7 +++++--
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/components/base/AuthorCard.vue b/components/base/AuthorCard.vue
index 841c261..a10b892 100644
--- a/components/base/AuthorCard.vue
+++ b/components/base/AuthorCard.vue
@@ -18,7 +18,9 @@
               v-if="person.github_username"
               :href="'https://github.com/' + person.github_username"
               aria-label="information icon"
-              ><span class="icon"><i class="mdi mdi-github" /></span>
+              ><span class="icon is-large"
+                ><i class="mdi mdi-48px mdi-github"
+              /></span>
             </a>
             <a
               v-if="person.brown_directory_uuid"
@@ -27,7 +29,9 @@
                 person.brown_directory_uuid
               "
               aria-label="information icon"
-              ><span class="icon"><i class="mdi mdi-information" /></span>
+              ><span class="icon is-large"
+                ><i class="mdi mdi-48px mdi-email"
+              /></span>
             </a>
           </div>
         </template>
diff --git a/components/base/DPersonCard.vue b/components/base/DPersonCard.vue
index f8c39bf..c9f7bee 100644
--- a/components/base/DPersonCard.vue
+++ b/components/base/DPersonCard.vue
@@ -30,9 +30,9 @@
       <footer class="content py-3 px-3">
         <h5>{{ name }}</h5>
         <p data-testid="title-team">
-          <small>{{ title }}</small>
-          <small>{{ team }}</small>
-          <small>{{ subteam }}</small>
+          <div><small>{{ title }}</small></div>
+          <div><small>{{ team }}</small></div>
+          <div><small>{{ subteam }}</small></div>
         </p>
         <slot name="icons" />
       </footer>
diff --git a/components/blocks/About.vue b/components/blocks/About.vue
index c5cca3c..f9d784e 100644
--- a/components/blocks/About.vue
+++ b/components/blocks/About.vue
@@ -99,7 +99,7 @@
                   person.brown_directory_uuid
                 "
                 aria-label="information icon"
-                ><span class="icon"><i class="mdi mdi-information" /></span>
+                ><span class="icon"><i class="mdi mdi-email" /></span>
               </a>
             </template>
           </DPersonCard>
diff --git a/content b/content
index c2e06ad..6e45c80 160000
--- a/content
+++ b/content
@@ -1 +1 @@
-Subproject commit c2e06ad2a394c2fa8c1789bf8237989e14bc8101
+Subproject commit 6e45c80f9e17da06a7255a5af139b0a2c5582a57
diff --git a/pages/people/_people.vue b/pages/people/_people.vue
index 685f311..a55f02e 100644
--- a/pages/people/_people.vue
+++ b/pages/people/_people.vue
@@ -17,7 +17,10 @@
             <h2 class="title has-text-black pt-6">{{ person.name }}</h2>
             <h2 class="subtitle has-text-black">{{ person.title }}</h2>
             <h2 class="subtitle has-text-black">
-              {{ person.team }} | {{ person.subteam }}
+              {{ person.team }}
+            </h2>
+            <h2 class="subtitle has-text-black">
+              {{ person.subteam }}
             </h2>
             <a
               v-if="person.github_username"
@@ -35,7 +38,7 @@
               "
               aria-label="information icon"
               ><span class="icon is-large"
-                ><i class="mdi mdi-48px mdi-information"
+                ><i class="mdi mdi-48px mdi-email"
               /></span>
             </a>
           </div>

From 2d5981ca1d1a5b649676ab510d5279911553276d Mon Sep 17 00:00:00 2001
From: ashleysyg <ashley.syg.lee@gmail.com>
Date: Tue, 12 Sep 2023 13:22:12 -0400
Subject: [PATCH 07/10] feat: add subteam icon with color coding (need to
 update peoples subteams to match teams.yml)

---
 components/base/DPersonCard.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/components/base/DPersonCard.vue b/components/base/DPersonCard.vue
index c9f7bee..96d3c22 100644
--- a/components/base/DPersonCard.vue
+++ b/components/base/DPersonCard.vue
@@ -32,7 +32,9 @@
         <p data-testid="title-team">
           <div><small>{{ title }}</small></div>
           <div><small>{{ team }}</small></div>
-          <div><small>{{ subteam }}</small></div>
+          <div><small>{{ subteam }}</small></div><span class="icon" :class="[`has-text-${accent}`]">
+            <i :class="['icon mdi', `${teamIcon(subteam)}`]" />
+          </span>
         </p>
         <slot name="icons" />
       </footer>
@@ -83,8 +85,20 @@ export default {
     return {
       active: false,
       hover: false,
+      teamIconArray: {
+        'Computational Biology Core': 'mdi-dna',
+        'Graphics, Software and Data Core': 'mdi-graph',
+        'High-Performance Computing': 'mdi-server',
+        'High-Performance Computing Systems': 'mdi-server-network',
+        'Research Technical Services': 'mdi-earth'
+      },
     };
   },
+  methods: {
+    teamIcon(team) {
+      return this.teamIconArray[team];
+    },
+  },
 };
 </script>
 

From 48244746ba49c4c2d44a70f758454be11b0ae690 Mon Sep 17 00:00:00 2001
From: ashleysyg <ashley.syg.lee@gmail.com>
Date: Tue, 12 Sep 2023 16:07:29 -0400
Subject: [PATCH 08/10] fix: typo in teams.yml

---
 components/base/DPersonCard.vue | 2 +-
 content                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/base/DPersonCard.vue b/components/base/DPersonCard.vue
index 96d3c22..54f5a08 100644
--- a/components/base/DPersonCard.vue
+++ b/components/base/DPersonCard.vue
@@ -87,7 +87,7 @@ export default {
       hover: false,
       teamIconArray: {
         'Computational Biology Core': 'mdi-dna',
-        'Graphics, Software and Data Core': 'mdi-graph',
+        'Graphics, Software, and Data Core': 'mdi-graph',
         'High-Performance Computing': 'mdi-server',
         'High-Performance Computing Systems': 'mdi-server-network',
         'Research Technical Services': 'mdi-earth'
diff --git a/content b/content
index 6e45c80..39fed91 160000
--- a/content
+++ b/content
@@ -1 +1 @@
-Subproject commit 6e45c80f9e17da06a7255a5af139b0a2c5582a57
+Subproject commit 39fed91ce8a3b1b29eb234dd688f5b72e0c950ab

From 048ece532ef366b94590942ed7f0103c1a4cedf0 Mon Sep 17 00:00:00 2001
From: ashleysyg <ashley.syg.lee@gmail.com>
Date: Wed, 13 Sep 2023 13:27:43 -0400
Subject: [PATCH 09/10] feat: add scroll up to subteam

---
 components/base/DPersonCard.vue | 15 +++++++++++++--
 components/blocks/About.vue     |  1 -
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/components/base/DPersonCard.vue b/components/base/DPersonCard.vue
index 54f5a08..e74745a 100644
--- a/components/base/DPersonCard.vue
+++ b/components/base/DPersonCard.vue
@@ -17,6 +17,7 @@
         @blur="active = false"
         @mouseover="active = true"
         @mouseout="active = false"
+        @click="$router.push(`/people/${name}`)"
       >
         <img
           :alt="'Picture of' + name"
@@ -28,11 +29,11 @@
     </template>
     <template #footer>
       <footer class="content py-3 px-3">
-        <h5>{{ name }}</h5>
+        <h5 @click="$router.push(`/people/${name}`)">{{ name }}</h5>
         <p data-testid="title-team">
           <div><small>{{ title }}</small></div>
           <div><small>{{ team }}</small></div>
-          <div><small>{{ subteam }}</small></div><span class="icon" :class="[`has-text-${accent}`]">
+          <div><small>{{ subteam }}</small></div><span class="icon" :class="[`has-text-${accent}`]" @click="scrollToElement(subteam)">
             <i :class="['icon mdi', `${teamIcon(subteam)}`]" />
           </span>
         </p>
@@ -92,12 +93,22 @@ export default {
         'High-Performance Computing Systems': 'mdi-server-network',
         'Research Technical Services': 'mdi-earth'
       },
+      teamElementArray: {
+        'Computational Biology Core': 'computational-biology-core',
+        'Graphics, Software, and Data Core': 'graphics-software-and-data-core',
+        'High-Performance Computing': 'high-performance-computing',
+        'High-Performance Computing Systems': 'high-performance-computing-systems',
+        'Research Technical Services': 'research-technical-services'
+      },
     };
   },
   methods: {
     teamIcon(team) {
       return this.teamIconArray[team];
     },
+    scrollToElement(team) {
+      document.getElementById(this.teamElementArray[team]).scrollIntoView();
+    },
   },
 };
 </script>
diff --git a/components/blocks/About.vue b/components/blocks/About.vue
index f9d784e..962207f 100644
--- a/components/blocks/About.vue
+++ b/components/blocks/About.vue
@@ -83,7 +83,6 @@
             :hover-image="
               '/content/images/people/' + person.image.replace('main', 'hover')
             "
-            @click.native="$router.push(`/people/${person.name}`)"
           >
             <template #icons>
               <a

From 3e333c588b18fd4deec4815276d5b1e6d19cb8fd Mon Sep 17 00:00:00 2001
From: ashleysyg <ashley.syg.lee@gmail.com>
Date: Wed, 13 Sep 2023 13:29:10 -0400
Subject: [PATCH 10/10] fix: content conflict

---
 content | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content b/content
index 39fed91..6e45c80 160000
--- a/content
+++ b/content
@@ -1 +1 @@
-Subproject commit 39fed91ce8a3b1b29eb234dd688f5b72e0c950ab
+Subproject commit 6e45c80f9e17da06a7255a5af139b0a2c5582a57