Merge branch 'master' of github.com:Pitabread8/artemis

Author: Pitabread8

src/components/InlineFalconDiagram.astro

@@ -1,19 +1,10 @@
 ---
-import path from 'node:path';
-import { falconParts, renderRocketSvg } from '../lib/rocket';
-
-const falconRocket = {
-  slug: 'falcon',
-  label: 'Falcon 9',
-  title: 'Falcon 9 vertical integration diagram',
-  desc: 'Interactive Falcon 9 diagram colored to show SpaceX vertical integration.',
-  svgPath: path.join(process.cwd(), 'public', 'rockets', 'falcon', 'falcon-9-diagram-01.svg'),
-  hiddenPartIds: new Set<string>(),
-  hiddenPartGroups: new Set<string>(),
-  parts: falconParts,
-};
+import { rockets, renderRocketSvg } from '../lib/rocket';
 
+const falconRocket = rockets.find((r) => r.slug === 'falcon')!;
 const slide = { label: falconRocket.label, svg: renderRocketSvg(falconRocket) };
+const basePath = import.meta.env.BASE_URL.replace(/\/$/, '');
+const spacexLogoSrc = `${basePath}/rockets/falcon/spacex-logo-black.svg`;
 ---
 
 <style is:global>
@@ -64,8 +55,10 @@ const slide = { label: falconRocket.label, svg: renderRocketSvg(falconRocket) };
           <span class="key-copy">
             <img
               class="spacex-logo"
-              src={`${import.meta.env.BASE_URL}rockets/falcon/spacex-logo-black.svg`}
+              src={spacexLogoSrc}
               alt="SpaceX"
+              loading="eager"
+              decoding="async"
             />
           </span>
         </div>

src/components/RocketPlayground.astro

@@ -1,11 +1,13 @@
 ---
-import { rockets, renderRocketSvg, contractorKey, getRocketPriceTotal, formatPriceTotal, minPriceLabel, maxPriceLabel } from '../lib/rocket';
+import { rockets, renderRocketSvg, contractorKey, getRocketPriceTotal, hasRocketPrices, formatPriceTotal, minPriceLabel, maxPriceLabel } from '../lib/rocket';
 
 const rocketSlides = rockets.map((rocket) => ({
   ...rocket,
   svg: renderRocketSvg(rocket),
+  hasPrices: hasRocketPrices(rocket.parts),
   total: formatPriceTotal(getRocketPriceTotal(rocket.parts)),
 }));
+const pricedRocketSlides = rocketSlides.filter((rocket) => rocket.hasPrices);
 ---
 
 <section class="page diagram-panel full-bleed" data-diagram-panel data-initial-mode="contractors" data-slide-count={rocketSlides.length}>
@@ -58,7 +60,7 @@ const rocketSlides = rockets.map((rocket) => ({
       </div>
       <div class="price-total-list" aria-label="Total shown by rocket">
         {
-          rocketSlides.map((rocket) => (
+          pricedRocketSlides.map((rocket) => (
             <p class="price-total">
               {rocket.label}
               <strong>{rocket.total}</strong>

src/lib/rocket.ts

@@ -18,7 +18,7 @@ export const contractorStyles: Record<string, { color: string; mergedInto?: stri
 const contractorKeyOrder = [
   'Northrop Grumman', 'Boeing', 'North American Aviation', 'Douglas Aircraft',
   'Lockheed Martin', 'Lockheed Propulsion Co.', 'Aerojet Rocketdyne', 'Rocketdyne',
-  'Teledyne Brown Engineering', 'IBM',
+  'Teledyne Brown Engineering', 'IBM', 'SpaceX',
 ];
 
 export const contractorKey: {
@@ -248,6 +248,10 @@ export function getRocketPriceTotal(parts: Record<string, { priceGroup?: string
   return Array.from(uniquePriceGroups).reduce((total, group) => total + priceGroups[group].amount, 0);
 }
 
+export function hasRocketPrices(parts: Record<string, { priceGroup?: string }>): boolean {
+  return Object.values(parts).some((part) => Boolean(part.priceGroup) && Boolean(priceGroups[part.priceGroup]));
+}
+
 export function escapeAttr(value: unknown): string {
   return String(value).replace(/&/g, '&amp;').replace(/"/g, '&quot;');
 }
@@ -363,4 +367,14 @@ export const rockets = [
     hiddenPartGroups: apolloHiddenPartGroups,
     parts: apolloParts,
   },
+  {
+    slug: 'falcon',
+    label: 'Falcon 9',
+    title: 'Falcon 9 vertical integration diagram',
+    desc: 'Interactive Falcon 9 diagram colored to show SpaceX vertical integration.',
+    svgPath: path.join(process.cwd(), 'public', 'rockets', 'falcon', 'falcon-9-diagram-01.svg'),
+    hiddenPartIds: new Set<string>(),
+    hiddenPartGroups: new Set<string>(),
+    parts: falconParts,
+  },
 ];