From 38c07bf5718f2fed49f21df9703e0c30e0165ef2 Mon Sep 17 00:00:00 2001
From: Carifio24 <carifio24@gmail.com>
Date: Tue, 28 May 2024 17:19:13 -0400
Subject: [PATCH 1/4] Allow adding new logos to credits, and specifying which
 default ones to use.

---
 src/components/CreditLogos.vue | 58 ++++++++++++++++++++++++++--------
 src/types.ts                   | 16 ++++++++++
 2 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/src/components/CreditLogos.vue b/src/components/CreditLogos.vue
index 291cc98c..2ed0dd4a 100644
--- a/src/components/CreditLogos.vue
+++ b/src/components/CreditLogos.vue
@@ -1,18 +1,18 @@
 <template>
   <div id="logo-credits" :style="cssVars">
     <div id="icons-container">
-      <a href="https://www.cosmicds.cfa.harvard.edu/" target="_blank" rel="noopener noreferrer"
-        ><img alt="CosmicDS Logo" src="https://raw.githubusercontent.com/cosmicds/minids/main/assets/cosmicds_logo_for_dark_backgrounds.png"
-      /></a>
-      <a href="https://worldwidetelescope.org/home/" target="_blank" rel="noopener noreferrer"
-        ><img alt="WWT Logo" src="https://raw.githubusercontent.com/cosmicds/minids/main/assets/logo_wwt.png"
-      /></a>
-      <a href="https://science.nasa.gov/learners" target="_blank" rel="noopener noreferrer" class="pl-1"
-        ><img alt="SciAct Logo" src="https://raw.githubusercontent.com/cosmicds/minids/main/assets/logo_sciact.png"
-      /></a>
-      <a href="https://nasa.gov/" target="_blank" rel="noopener noreferrer" class="pl-1"
-        ><img alt="SciAct Logo" src="https://raw.githubusercontent.com/cosmicds/minids/main/assets/NASA_Partner_color_300_no_outline.png"
-      /></a>
+      <a
+        v-for="logo in logos"
+        v-bind:key="logo.href"
+        :href="logo.href"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        <img
+          :alt="logo.alt"
+          :src="logo.src"
+        />
+      </a>
     </div>
   </div>
 </template>
@@ -20,10 +20,40 @@
 <script setup lang="ts">
 import { computed } from "vue";
 
-import { CreditLogosProps } from "../types";
+import { CreditLogo, CreditLogosProps, DefaultCreditLogo } from "../types";
+
+const DEFAULT_LOGOS: Map<DefaultCreditLogo, CreditLogo> = new Map([
+  ["cosmicds", {
+    src: "https://raw.githubusercontent.com/cosmicds/minids/main/assets/cosmicds_logo_for_dark_backgrounds.png",
+    href: "https://www.cosmicds.cfa.harvard.edu/",
+    alt: "CosmicDS Logo",
+  }],
+  ["wwt", {
+    src: "https://raw.githubusercontent.com/cosmicds/minids/main/assets/logo_wwt.png",
+    href: "https://worldwidetelescope.org/home/",
+    alt: "WWT Logo",
+  }],
+  ["sciact", {
+    src: "https://raw.githubusercontent.com/cosmicds/minids/main/assets/logo_sciact.png",
+    href: "https://science.nasa.gov/learners",
+    alt: "SciAct Logo",
+  }],
+  ["nasa", {
+    src: "https://raw.githubusercontent.com/cosmicds/minids/main/assets/NASA_Partner_color_300_no_outline.png",
+    href: "https://nasa.gov/",
+    alt: "NASA Partner Logo"
+  }]
+]);
 
 const props = withDefaults(defineProps<CreditLogosProps>(), {
-  logoSize: "5vmin"
+  logoSize: "5vmin",
+  extraLogos: () => [],
+  defaultLogos: () => [...DEFAULT_LOGOS.keys()],
+});
+
+const logos = computed<CreditLogo[]>(() => {
+  const defaultLogos = props.defaultLogos.map(logo => DEFAULT_LOGOS.get(logo)).filter(x => x != undefined) as CreditLogo[];
+  return defaultLogos.concat(props.extraLogos);
 });
 
 const cssVars = computed(() => {
diff --git a/src/types.ts b/src/types.ts
index 658364f5..04a88832 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -18,10 +18,26 @@ export interface FundingAcknowledgementProps {
 
 /* Credit logos */
 
+/** Interface describing a logo */
+export interface CreditLogo {
+  /** The URL for the logo image */
+  src: string;
+  /** The URL to open when the logo is clicked */
+  href: string;
+  /** Alt text to use for the logo. If none is given, the logo will have no alt text */
+  alt?: string;
+}
+
+export type DefaultCreditLogo = "cosmicds" | "wwt" | "sciact" | "nasa";
+
 /** Interface describing props for the credit logos component */
 export interface CreditLogosProps {
   /** What size to use for the logos. Should be a valid CSS size. */
   logoSize?: string;
+  /** Any extra logos that we want to use */
+  extraLogos?: CreditLogo[];
+  /** Which default logos to use. If not specified, use them all */
+  defaultLogos: DefaultCreditLogo[];
 }
 
 /* Gallery */

From 27112a10a927c7cc9718affcb04f59dd3d7b40b5 Mon Sep 17 00:00:00 2001
From: Carifio24 <carifio24@gmail.com>
Date: Tue, 28 May 2024 17:38:00 -0400
Subject: [PATCH 2/4] Make default logos list not depend on map.

---
 src/components/CreditLogos.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CreditLogos.vue b/src/components/CreditLogos.vue
index 2ed0dd4a..1248aaf4 100644
--- a/src/components/CreditLogos.vue
+++ b/src/components/CreditLogos.vue
@@ -48,7 +48,7 @@ const DEFAULT_LOGOS: Map<DefaultCreditLogo, CreditLogo> = new Map([
 const props = withDefaults(defineProps<CreditLogosProps>(), {
   logoSize: "5vmin",
   extraLogos: () => [],
-  defaultLogos: () => [...DEFAULT_LOGOS.keys()],
+  defaultLogos: () => ["cosmicds", "wwt", "sciact", "nasa"],
 });
 
 const logos = computed<CreditLogo[]>(() => {

From 43d0e5304a35107122b163ab4e09995a2334b6f9 Mon Sep 17 00:00:00 2001
From: Carifio24 <carifio24@gmail.com>
Date: Tue, 28 May 2024 17:41:49 -0400
Subject: [PATCH 3/4] Add type annotations to make build process happy.

---
 src/components/CreditLogos.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CreditLogos.vue b/src/components/CreditLogos.vue
index 1248aaf4..6b68bde1 100644
--- a/src/components/CreditLogos.vue
+++ b/src/components/CreditLogos.vue
@@ -52,7 +52,7 @@ const props = withDefaults(defineProps<CreditLogosProps>(), {
 });
 
 const logos = computed<CreditLogo[]>(() => {
-  const defaultLogos = props.defaultLogos.map(logo => DEFAULT_LOGOS.get(logo)).filter(x => x != undefined) as CreditLogo[];
+  const defaultLogos = props.defaultLogos.map((logo: DefaultCreditLogo) => DEFAULT_LOGOS.get(logo)).filter((logo: CreditLogo | undefined) => logo != undefined) as CreditLogo[];
   return defaultLogos.concat(props.extraLogos);
 });
 

From d40fd7944056f24f082e3bc9728cb75d15f563de Mon Sep 17 00:00:00 2001
From: Jon Carifio <carifio24@gmail.com>
Date: Wed, 29 May 2024 09:58:54 -0400
Subject: [PATCH 4/4] Add comment describing default credit logo type

---
 src/types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/types.ts b/src/types.ts
index 04a88832..efef3d53 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -28,6 +28,7 @@ export interface CreditLogo {
   alt?: string;
 }
 
+/** A union type enumerating the default credit logos */
 export type DefaultCreditLogo = "cosmicds" | "wwt" | "sciact" | "nasa";
 
 /** Interface describing props for the credit logos component */