From 5d808c1659e4a2c8ba93ff5476bb0807f85c90a0 Mon Sep 17 00:00:00 2001
From: Ethan Davidson <31261035+EthanThatOneKid@users.noreply.github.com>
Date: Mon, 19 Sep 2022 16:32:54 -0800
Subject: [PATCH] Moved officer data directory

---
 .../public/board/{data.ts => data/index.ts}   |   4 +-
 src/lib/public/board/{ => data}/officers.json |   0
 src/lib/public/board/{ => data}/tiers.json    |   0
 src/lib/public/board/utils.ts                 |   3 +
 src/routes/about/+page.svelte                 |   6 +-
 src/routes/about/officer-profile-list.svelte  |   6 +-
 src/routes/about/officer-profile.svelte       |   8 +-
 src/routes/about/officers.json                | 704 ------------------
 src/routes/about/officers.ts                  |  41 -
 src/routes/about/term-index.ts                |   3 -
 src/routes/about/tiers.json                   |  21 -
 11 files changed, 17 insertions(+), 779 deletions(-)
 rename src/lib/public/board/{data.ts => data/index.ts} (72%)
 rename src/lib/public/board/{ => data}/officers.json (100%)
 rename src/lib/public/board/{ => data}/tiers.json (100%)
 delete mode 100644 src/routes/about/officers.json
 delete mode 100644 src/routes/about/officers.ts
 delete mode 100644 src/routes/about/term-index.ts
 delete mode 100644 src/routes/about/tiers.json

diff --git a/src/lib/public/board/data.ts b/src/lib/public/board/data/index.ts
similarity index 72%
rename from src/lib/public/board/data.ts
rename to src/lib/public/board/data/index.ts
index 645f84b58..77cca5cc6 100644
--- a/src/lib/public/board/data.ts
+++ b/src/lib/public/board/data/index.ts
@@ -1,7 +1,7 @@
+import type { Officer } from '$lib/public/board/types';
+import { Term } from '$lib/public/board/types';
 import OFFICERS_JSON from './officers.json';
 import TIERS_JSON from './tiers.json';
-import type { Officer } from './types';
-import { Term } from './types';
 
 export const VISIBLE_TERMS = [Term.Fall22, Term.Spring22, Term.Fall21, Term.Spring21];
 
diff --git a/src/lib/public/board/officers.json b/src/lib/public/board/data/officers.json
similarity index 100%
rename from src/lib/public/board/officers.json
rename to src/lib/public/board/data/officers.json
diff --git a/src/lib/public/board/tiers.json b/src/lib/public/board/data/tiers.json
similarity index 100%
rename from src/lib/public/board/tiers.json
rename to src/lib/public/board/data/tiers.json
diff --git a/src/lib/public/board/utils.ts b/src/lib/public/board/utils.ts
index 8449118d9..785e6e8d5 100644
--- a/src/lib/public/board/utils.ts
+++ b/src/lib/public/board/utils.ts
@@ -1,5 +1,8 @@
 import type { Officer, Term } from './types';
 import { TIERS, VISIBLE_TERMS } from './data';
+import { writable } from 'svelte/store';
+
+export const termIndex = writable<number>(0);
 
 export function getPositionByTermIndex(
   officer: Officer,
diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte
index 6fd419dba..69fa9d8f9 100644
--- a/src/routes/about/+page.svelte
+++ b/src/routes/about/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import Spacing from '$lib/legacy/spacing.svelte';
+  import Spacing from '$lib/public/legacy/spacing.svelte';
+  import type { Officer } from '$lib/public/board/types';
+  import { getPositionByTermIndex, termIndex } from '$lib/public/board/utils';
   import AboutUs from './about-us.svelte';
   import OfficerProfileList from './officer-profile-list.svelte';
-  import { getPositionByTermIndex, type Officer } from './officers';
-  import { termIndex } from './term-index';
 
   function filterOfficers(officer: Officer): boolean {
     const isCurrentTerm = getPositionByTermIndex(officer, $termIndex) !== undefined;
diff --git a/src/routes/about/officer-profile-list.svelte b/src/routes/about/officer-profile-list.svelte
index 5a73e5e5f..d8579b1fc 100644
--- a/src/routes/about/officer-profile-list.svelte
+++ b/src/routes/about/officer-profile-list.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import Select from '$lib/components/select/select.svelte';
+  import type { Officer, Term } from '$lib/public/board/types';
+  import { OFFICERS, VISIBLE_TERMS } from '$lib/public/board/data';
+  import { termIndex } from '$lib/public/board/utils';
   import OfficerProfile from './officer-profile.svelte';
-  import type { Officer, Term } from './officers';
-  import { OFFICERS, VISIBLE_TERMS } from './officers';
-  import { termIndex } from './term-index';
 
   export let placeholderPicture: string | undefined = undefined;
   export let filter: (officer: Officer) => boolean;
diff --git a/src/routes/about/officer-profile.svelte b/src/routes/about/officer-profile.svelte
index 60ebf6f72..a8311ac20 100644
--- a/src/routes/about/officer-profile.svelte
+++ b/src/routes/about/officer-profile.svelte
@@ -1,6 +1,10 @@
 <script lang="ts">
-  import { getOfficerTierByTermIndex, getPositionByTermIndex, type Officer } from './officers';
-  import { termIndex } from './term-index';
+  import type { Officer } from '$lib/public/board/types';
+  import {
+    termIndex,
+    getOfficerTierByTermIndex,
+    getPositionByTermIndex,
+  } from '$lib/public/board/utils';
 
   export let info: Officer;
   export let placeholderPicture = 'placeholder.webp';
diff --git a/src/routes/about/officers.json b/src/routes/about/officers.json
deleted file mode 100644
index 912311263..000000000
--- a/src/routes/about/officers.json
+++ /dev/null
@@ -1,704 +0,0 @@
-[
-  {
-    "fullName": "Armanul Ambia",
-    "positions": {
-      "S21": {
-        "title": "Dev Officer",
-        "tier": 21
-      },
-      "F21": {
-        "title": "Algo Director",
-        "tier": 14
-      },
-      "S22": {
-        "title": "Algo President",
-        "tier": 14
-      },
-      "F22": {
-        "title": "Algo Team Lead",
-        "tier": 14
-      }
-    },
-    "picture": "armanul-ambia.webp"
-  },
-  {
-    "fullName": "Jason Anthony",
-    "positions": {
-      "S21": {
-        "title": "Secretary",
-        "tier": 3
-      }
-    },
-    "picture": "jason-anthony.webp"
-  },
-  {
-    "fullName": "Angel Armendariz",
-    "positions": {
-      "S22": {
-        "title": "Dev Project Manager",
-        "tier": 22
-      }
-    },
-    "picture": "angel-armendariz.webp"
-  },
-  {
-    "fullName": "Sami Bajwa",
-    "positions": {
-      "F21": {
-        "title": "nodebuds Officer",
-        "tier": 23
-      },
-      "S22": {
-        "title": "Algo Officer, nodebuds Officer",
-        "tier": 15
-      },
-      "F22": {
-        "title": "Algo Officer",
-        "tier": 15
-      }
-    },
-    "picture": "sami-bajwa.webp"
-  },
-  {
-    "fullName": "Johnathan Carranza",
-    "positions": {
-      "F21": {
-        "title": "Dev Officer",
-        "tier": 21
-      }
-    },
-    "picture": "johnathan-carranza.webp"
-  },
-  {
-    "fullName": "Alan Cortez",
-    "positions": {
-      "S22": {
-        "title": "Create Officer",
-        "tier": 17
-      },
-      "F22": {
-        "title": "Design Team Lead",
-        "tier": 17
-      }
-    },
-    "picture": "alan-cortez.webp"
-  },
-  {
-    "fullName": "Wesley Chou",
-    "positions": {
-      "S21": {
-        "title": "Dev Officer",
-        "tier": 21
-      },
-      "F21": {
-        "title": "Dev Director",
-        "tier": 20
-      },
-      "S22": {
-        "title": "Dev President",
-        "tier": 20
-      },
-      "F22": {
-        "title": "Marketing Co-Lead",
-        "tier": 23
-      }
-    },
-    "picture": "wesley-chou.webp"
-  },
-  {
-    "fullName": "Ethan Davidson",
-    "positions": {
-      "S21": {
-        "title": "Webmaster",
-        "tier": 5
-      },
-      "F21": {
-        "title": "Webmaster",
-        "tier": 5
-      },
-      "S22": {
-        "title": "Webmaster",
-        "tier": 5
-      },
-      "F22": {
-        "title": "Vice President/Webmaster",
-        "tier": 2
-      }
-    },
-    "picture": "ethan-davidson.webp"
-  },
-  {
-    "fullName": "Kevin Dillon",
-    "positions": {
-      "S21": {
-        "title": "Algo Officer",
-        "tier": 15
-      }
-    },
-    "picture": "kevin-dillon.webp"
-  },
-  {
-    "fullName": "Duc Dinh",
-    "positions": {
-      "S22": {
-        "title": "Dev Project Manager",
-        "tier": 22
-      },
-      "F22": {
-        "title": "Special Events Officer",
-        "tier": 25
-      }
-    },
-    "picture": "duc-dinh.webp"
-  },
-  {
-    "fullName": "Eduardo Gomez",
-    "positions": {
-      "S21": {
-        "title": "nodebuds Officer",
-        "tier": 23
-      }
-    },
-    "picture": "eduardo-gomez.webp"
-  },
-  {
-    "fullName": "Nurhaliza Hassan",
-    "positions": {
-      "S22": {
-        "title": "Marketing Director",
-        "tier": 12
-      },
-      "F22": {
-        "title": "Marketing Co-Lead",
-        "tier": 23
-      }
-    },
-    "picture": "nurhaliza-hassan.webp"
-  },
-  {
-    "fullName": "Lisa Hong",
-    "positions": {
-      "S21": {
-        "title": "Create Officer",
-        "tier": 17
-      }
-    },
-    "picture": "lisa-hong.webp"
-  },
-  {
-    "fullName": "Joshua Hughes",
-    "positions": {
-      "S21": {
-        "title": "ICC Representative",
-        "tier": 8
-      }
-    },
-    "picture": "joshua-hughes.webp"
-  },
-  {
-    "fullName": "Iftekharul Islam",
-    "positions": {
-      "S22": {
-        "title": "Algo Officer",
-        "tier": 15
-      }
-    },
-    "picture": "iftekharul-islam.webp"
-  },
-  {
-    "fullName": "Ibrahim Israr",
-    "positions": {
-      "S22": {
-        "title": "Secretary",
-        "tier": 3
-      }
-    },
-    "picture": "ibrahim-israr.webp"
-  },
-  {
-    "fullName": "Joel Anil John",
-    "positions": {
-      "S22": {
-        "title": "Dev Officer",
-        "tier": 21
-      },
-      "F22": {
-        "title": "Algo Officer",
-        "tier": 15
-      }
-    },
-    "picture": "joel-anil-john.webp"
-  },
-  {
-    "fullName": "Andy Lasso",
-    "positions": {
-      "F21": {
-        "title": "Dev Officer",
-        "tier": 21
-      }
-    },
-    "picture": "andy-lasso.webp"
-  },
-  {
-    "fullName": "Andrew Lau",
-    "positions": {
-      "S21": {
-        "title": "Treasurer",
-        "tier": 4
-      }
-    },
-    "picture": "andrew-lau.webp"
-  },
-  {
-    "fullName": "Minh Le",
-    "positions": {
-      "S22": {
-        "title": "Dev Officer",
-        "tier": 21
-      }
-    },
-    "picture": "minh-le.webp"
-  },
-  {
-    "fullName": "Nguyen Le",
-    "positions": {
-      "S22": {
-        "title": "Data Analyst",
-        "tier": 7
-      }
-    },
-    "picture": "nguyen-le.webp"
-  },
-  {
-    "fullName": "Tommy Le",
-    "positions": {
-      "F21": {
-        "title": "Treasurer",
-        "tier": 4
-      },
-      "S22": {
-        "title": "Treasurer",
-        "tier": 4
-      }
-    },
-    "picture": "tommy-le.webp"
-  },
-  {
-    "fullName": "Eugene Lee",
-    "positions": {
-      "S21": {
-        "title": "nodebuds Officer",
-        "tier": 23
-      },
-      "F21": {
-        "title": "nodebuds Officer",
-        "tier": 23
-      },
-      "S22": {
-        "title": "nodebuds Officer",
-        "tier": 23
-      }
-    },
-    "picture": "eugene-lee.webp"
-  },
-  {
-    "fullName": "Nolan Lee",
-    "positions": {
-      "S22": {
-        "title": "Historian",
-        "tier": 12
-      }
-    },
-    "picture": "nolan-lee.webp"
-  },
-  {
-    "fullName": "Aaron Lieberman",
-    "positions": {
-      "S21": {
-        "title": "Internal Vice President, nodebuds Officer",
-        "tier": 2
-      },
-      "F21": {
-        "title": "President, nodebuds Officer",
-        "tier": 0
-      },
-      "S22": {
-        "title": "President, nodebuds Officer",
-        "tier": 0
-      },
-      "F22": {
-        "title": "Special Events Team Lead",
-        "tier": 24
-      }
-    },
-    "picture": "aaron-lieberman.webp"
-  },
-  {
-    "fullName": "Shaleen Mathur",
-    "positions": {
-      "S21": {
-        "title": "Workshop Manager",
-        "tier": 6
-      }
-    },
-    "picture": "shaleen-mathur.webp"
-  },
-  {
-    "fullName": "Ean McGilvery",
-    "positions": {
-      "S21": {
-        "title": "nodebuds Officer",
-        "tier": 23
-      }
-    },
-    "picture": "ean-mcgilvery.webp"
-  },
-  {
-    "fullName": "Jorge Mejia",
-    "positions": {
-      "F21": {
-        "title": "Dev Officer",
-        "tier": 21
-      },
-      "S22": {
-        "title": "Dev Officer",
-        "tier": 21
-      },
-      "F22": {
-        "title": "Design Officer",
-        "tier": 17
-      }
-    },
-    "picture": "jorge-mejia.webp"
-  },
-  {
-    "fullName": "Serena Naranjo",
-    "positions": {
-      "F21": {
-        "title": "Create Officer",
-        "tier": 17
-      },
-      "S22": {
-        "title": "Create Officer",
-        "tier": 17
-      }
-    },
-    "picture": "serena-naranjo.webp"
-  },
-  {
-    "fullName": "Dalisa Nguyen",
-    "positions": {
-      "S21": {
-        "title": "nodebuds Officer",
-        "tier": 23
-      }
-    },
-    "picture": "dalisa-nguyen.webp"
-  },
-  {
-    "fullName": "Kayla Nguyen",
-    "positions": {
-      "F21": {
-        "title": "Create Officer",
-        "tier": 17
-      }
-    },
-    "picture": "kayla-nguyen.webp"
-  },
-  {
-    "fullName": "Jacob Nguyen",
-    "positions": {
-      "S21": {
-        "title": "President, Create Director, nodebuds Officer",
-        "tier": 0
-      },
-      "F22": {
-        "title": "Treasurer",
-        "tier": 4
-      }
-    },
-    "picture": "jacob-nguyen.webp"
-  },
-  {
-    "fullName": "Taylor Noh",
-    "positions": {
-      "S21": {
-        "title": "nodebuds Officer",
-        "tier": 23
-      },
-      "F21": {
-        "title": "nodebuds Officer",
-        "tier": 23
-      },
-      "S22": {
-        "title": "nodebuds Officer",
-        "tier": 23
-      }
-    },
-    "picture": "taylor-noh.webp"
-  },
-  {
-    "fullName": "Kirsten Ochoa",
-    "positions": {
-      "S22": {
-        "title": "Create Project Developer",
-        "tier": 18
-      },
-      "F22": {
-        "title": "Design Officer",
-        "tier": 18
-      }
-    },
-    "picture": "kirsten-ochoa.webp"
-  },
-  {
-    "fullName": "Mike Ploythai",
-    "positions": {
-      "S21": {
-        "title": "Create Officer",
-        "tier": 17
-      },
-      "F21": {
-        "title": "Create Director, Marketing Chair",
-        "tier": 16
-      },
-      "S22": {
-        "title": "Create President",
-        "tier": 16
-      }
-    },
-    "picture": "mike-ploythai.webp"
-  },
-  {
-    "fullName": "Stephanie Pocci",
-    "positions": {
-      "S22": {
-        "title": "Event Coordinator",
-        "tier": 9
-      },
-      "F22": {
-        "title": "Event Coordinator",
-        "tier": 9
-      }
-    },
-    "picture": "stephanie-pocci.webp"
-  },
-  {
-    "fullName": "Nicolas Renteria",
-    "positions": {
-      "S21": {
-        "title": "Marketing Chair",
-        "tier": 12
-      }
-    },
-    "picture": "nicolas-renteria.webp"
-  },
-  {
-    "fullName": "Wilbert Rodriguez",
-    "positions": {
-      "S21": {
-        "title": "Intern Program Manager",
-        "tier": 11
-      }
-    },
-    "picture": "wilbert-rodriguez.webp"
-  },
-  {
-    "fullName": "Samuel Sandoval",
-    "positions": {
-      "S21": {
-        "title": "Vice President, Dev Director",
-        "tier": 1
-      }
-    },
-    "picture": "samuel-sandoval.webp"
-  },
-  {
-    "fullName": "Kavit Sanghavi",
-    "positions": {
-      "S21": {
-        "title": "Algo Director",
-        "tier": 11
-      }
-    },
-    "picture": "kavit-sanghavi.webp"
-  },
-  {
-    "fullName": "Parth Sharma",
-    "positions": {
-      "S21": {
-        "title": "Algo Officer",
-        "tier": 15
-      }
-    },
-    "picture": "parth-sharma.webp"
-  },
-  {
-    "fullName": "Justin Stitt",
-    "positions": {
-      "S22": {
-        "title": "Algo Officer",
-        "tier": 15
-      },
-      "F22": {
-        "title": "AI Team Lead",
-        "tier": 12
-      }
-    },
-    "picture": "justin-stitt.webp"
-  },
-  {
-    "fullName": "Johnson Tong",
-    "positions": {
-      "S21": {
-        "title": "Workshop Manager",
-        "tier": 6
-      }
-    },
-    "picture": "johnson-tong.webp"
-  },
-  {
-    "fullName": "Alex Truong",
-    "positions": {
-      "F21": {
-        "title": "Algo Officer",
-        "tier": 15
-      }
-    },
-    "picture": "alex-truong.webp"
-  },
-  {
-    "fullName": "Daniel Truong",
-    "positions": {
-      "S22": {
-        "title": "Dev Project Manager",
-        "tier": 22
-      },
-      "F22": {
-        "title": "Dev Project Manager",
-        "tier": 22
-      }
-    },
-    "picture": "daniel-truong.webp"
-  },
-  {
-    "fullName": "Samuel Valls",
-    "positions": {
-      "S21": {
-        "title": "Community Manager",
-        "tier": 10
-      },
-      "F21": {
-        "title": "Create Officer",
-        "tier": 17
-      },
-      "S22": {
-        "title": "Create Operations Manager",
-        "tier": 19
-      }
-    },
-    "picture": "samuel-valls.webp"
-  },
-  {
-    "fullName": "Karnikaa Velumani",
-    "positions": {
-      "F21": {
-        "title": "Vice President",
-        "tier": 1
-      },
-      "S22": {
-        "title": "Vice President",
-        "tier": 1
-      },
-      "F22": {
-        "title": "President",
-        "tier": 1
-      }
-    },
-    "picture": "karnikaa-velumani.webp"
-  },
-  {
-    "fullName": "Rina Watanabe",
-    "positions": {
-      "F21": {
-        "title": "Dev Project Manager",
-        "tier": 22
-      }
-    },
-    "picture": "rina-watanabe.webp"
-  },
-  {
-    "fullName": "Jason Wong",
-    "positions": {
-      "S22": {
-        "title": "Historian",
-        "tier": 13
-      },
-      "F22": {
-        "title": "Historian",
-        "tier": 11
-      }
-    },
-    "picture": "jason-wong.webp"
-  },
-  {
-    "fullName": "Alejandro Ramos",
-    "positions": {
-      "F22": {
-        "title": "Design Officer",
-        "tier": 17
-      }
-    },
-    "picture": "alejandro-ramos.webp"
-  },
-  {
-    "fullName": "Angel Santoyo",
-    "positions": {
-      "F22": {
-        "title": "Dev Officer",
-        "tier": 21
-      }
-    },
-    "picture": "angel-santoyo.webp"
-  },
-  {
-    "fullName": "Charlie Taylor",
-    "positions": {
-      "F22": {
-        "title": "Dev Team Lead",
-        "tier": 20
-      }
-    },
-    "picture": "charlie-taylor.webp"
-  },
-  {
-    "fullName": "Yao Lin",
-    "positions": {
-      "F22": {
-        "title": "AI Officer",
-        "tier": 13
-      }
-    },
-    "picture": "yao-lin.webp"
-  },
-  {
-    "fullName": "Sara Sadek",
-    "positions": {
-      "F22": {
-        "title": "AI Officer",
-        "tier": 13
-      }
-    },
-    "picture": "placeholder.webp"
-  },
-  {
-    "fullName": "Arish Imam",
-    "positions": {
-      "F22": {
-        "title": "AI Officer",
-        "tier": 13
-      }
-    },
-    "picture": "placeholder.webp"
-  }
-]
diff --git a/src/routes/about/officers.ts b/src/routes/about/officers.ts
deleted file mode 100644
index b2b54d78c..000000000
--- a/src/routes/about/officers.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import OFFICERS_JSON from './officers.json';
-import TIERS_JSON from './tiers.json';
-
-export enum Term {
-  Spring21 = 'S21',
-  Fall21 = 'F21',
-  Spring22 = 'S22',
-  Fall22 = 'F22',
-  Spring23 = 'S23',
-}
-
-export interface Officer {
-  fullName: string;
-  picture: string;
-  displayName?: string;
-
-  positions: {
-    [t in Term]?: {
-      title: string;
-      tier: number;
-    };
-  };
-}
-
-export function getPositionByTermIndex(
-  officer: Officer,
-  termIndex: number
-): Officer['positions'][Term] | undefined {
-  return officer.positions[VISIBLE_TERMS[termIndex]];
-}
-
-export function getOfficerTierByTermIndex(officer: Officer, termIndex: number): string | undefined {
-  const position = getPositionByTermIndex(officer, termIndex);
-  return position ? TIERS[position.tier] : undefined;
-}
-
-export const VISIBLE_TERMS = [Term.Fall22, Term.Spring22, Term.Fall21, Term.Spring21];
-
-export const OFFICERS: Officer[] = [...OFFICERS_JSON];
-
-export const TIERS: string[] = [...TIERS_JSON];
diff --git a/src/routes/about/term-index.ts b/src/routes/about/term-index.ts
deleted file mode 100644
index f5471a825..000000000
--- a/src/routes/about/term-index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { writable } from 'svelte/store';
-
-export const termIndex = writable<number>(0);
diff --git a/src/routes/about/tiers.json b/src/routes/about/tiers.json
deleted file mode 100644
index 0e7ef72a2..000000000
--- a/src/routes/about/tiers.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[
-  "President",
-  "Vice President",
-  "Secretary",
-  "Treasurer",
-  "Webmaster",
-  "Data Analyst",
-  "Event Coordinator",
-  "Marketing Director",
-  "Historian",
-  "Algo President",
-  "Algo Officer",
-  "Create President",
-  "Create Officer",
-  "Create Project Developer",
-  "Create Operations Manager",
-  "Dev President",
-  "Dev Officer",
-  "Dev Project Manager",
-  "Deprecated Position"
-]