Moved officer data directory

EthanThatOneKid · Sep 20, 2022 · 5d808c1 · 5d808c1
1 parent 94e2573
commit 5d808c1
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 779 deletions.
diff --git a/src/lib/public/board/data.ts → src/lib/public/board/data/index.ts b/src/lib/public/board/data.ts → 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 → src/lib/public/board/data/officers.json b/src/lib/public/board/officers.json → src/lib/public/board/data/officers.json
diff --git a/src/lib/public/board/tiers.json → src/lib/public/board/data/tiers.json b/src/lib/public/board/tiers.json → src/lib/public/board/data/tiers.json
diff --git 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
@@ -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
@@ -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
@@ -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';