cleaned up conditions

EthanThatOneKid · Dec 3, 2023 · 2e88798 · 2e88798
1 parent 1fae3f3
commit 2e88798
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/src/lib/public/board/data/teams.json b/src/lib/public/board/data/teams.json
@@ -13,7 +13,6 @@
     "title": "AI",
     "description": "AI team member.",
     "logoSrc": "/assets/badges/logo/ai-logo.svg",
-    "oldLogoSrc": "/assets/badges/logo/ai-logo.svg",
     "color": "var(--acm-emerald)",
     "tiers": [20, 21]
   },
@@ -49,7 +48,6 @@
     "title": "Game Dev",
     "description": "Game Dev team member.",
     "logoSrc": "/assets/badges/gamedev-badge.svg",
-    "oldLogoSrc": "/assets/badges/gamedev-badge.svg",
     "color": "var(--acm-red)",
     "tiers": [22, 23]
   },
@@ -58,7 +56,6 @@
     "title": "Marketing",
     "description": "Marketing team member.",
     "logoSrc": "/assets/badges/logo/marketing-logo.svg",
-    "oldLogoSrc": "/assets/badges/logo/marketing-logo.svg",
     "color": "var(--acm-blush)",
     "tiers": [8, 9, 10]
   },
@@ -67,7 +64,6 @@
     "title": "ICPC",
     "description": "ICPC team member.",
     "logoSrc": "/assets/badges/icpc-badge.svg",
-    "oldLogoSrc": "/assets/badges/icpc-badge.svg",
     "color": "var(--acm-orange)",
     "tiers": []
   },
@@ -76,7 +72,6 @@
     "title": "Open Source Software",
     "description": "Open Source Software team member. We create and maintain open source projects pertaining to ACM at CSUF.",
     "logoSrc": "/assets/badges/logo/oss-logo.svg",
-    "oldLogoSrc": "/assets/badges/logo/oss-logo.svg",
     "color": "var(--acm-turquoise)",
     "tiers": []
   },
@@ -85,7 +80,6 @@
     "title": "Special Events",
     "description": "Special Events team member.",
     "logoSrc": "/assets/badges/special-events-badge.svg",
-    "oldLogoSrc": "/assets/badges/special-events-badge.svg",
     "color": "var(--acm-lemon)",
     "tiers": [24, 25]
   },
@@ -94,7 +88,6 @@
     "title": "Nodebuds",
     "description": "Nodebuds team member.",
     "logoSrc": "/assets/badges/old-badges/nodebuds-badge-old.svg",
-    "oldLogoSrc": "/assets/badges/old-badges/nodebuds-badge-old.svg",
     "color": "var(--acm-red)",
     "tiers": [26]
   }

diff --git a/src/lib/public/board/types.ts b/src/lib/public/board/types.ts
@@ -82,6 +82,6 @@ export interface Team {
   description?: string;
   color: string;
   logoSrc: string;
-  oldLogoSrc: string;
+  oldLogoSrc?: string;
   tiers?: number[];
 }
diff --git a/src/routes/(site)/6/teams/team-section.svelte b/src/routes/(site)/6/teams/team-section.svelte
@@ -30,10 +30,11 @@
           reducedMotionSrc={info.logoSrc}
           altSrc="General Picture"
         />
-      {:else if oldTerms.includes(term)}
-        <img src={info.oldLogoSrc} alt={`${info.title} Team Logo`} />
       {:else}
-        <img src={info.logoSrc} alt={`${info.title} Team Logo`} />
+        <img
+          src={oldTerms.includes(term) ? info.oldLogoSrc ?? info.logoSrc : info.logoSrc}
+          alt={`${info.title} Team Logo`}
+        />
       {/if}
 
       <div class="team-description">