From 42b81e2128fef184cb030ab69735102c72d3d511 Mon Sep 17 00:00:00 2001
From: Yanick Champoux <yanick@babyl.ca>
Date: Tue, 21 Mar 2023 14:29:44 -0400
Subject: [PATCH] Identification

---
 src/lib/components/GlobalStyle.svelte         | 11 ++++
 .../ShipEdit/Identification.story.svelte      | 17 ++++++
 .../components/ShipEdit/Identification.svelte | 54 +++++++++++++++++++
 .../Identification.stories.svelte.todo        | 22 --------
 .../{ => Identification}/ShipCost.svelte      |  8 +--
 .../ShipEdit/Identification/index.svelte      | 40 --------------
 6 files changed, 86 insertions(+), 66 deletions(-)
 create mode 100644 src/lib/components/ShipEdit/Identification.story.svelte
 create mode 100644 src/lib/components/ShipEdit/Identification.svelte
 delete mode 100644 src/lib/components/ShipEdit/Identification/Identification.stories.svelte.todo
 rename src/lib/components/ShipEdit/{ => Identification}/ShipCost.svelte (89%)
 delete mode 100644 src/lib/components/ShipEdit/Identification/index.svelte

diff --git a/src/lib/components/GlobalStyle.svelte b/src/lib/components/GlobalStyle.svelte
index 4959dac..58095da 100644
--- a/src/lib/components/GlobalStyle.svelte
+++ b/src/lib/components/GlobalStyle.svelte
@@ -115,4 +115,15 @@
   select:focus {
     border: 1px solid var(--indigo-dye);
   }
+
+  input:not([type="checkbox"]) {
+    border: 0px;
+    border-bottom: 1px solid var(--indigo-dye);
+    border-radius: 0px;
+    height: calc(
+      1rem * var(--line-height) + var(--form-element-spacing-vertical) * 1
+    );
+    padding: 0 0.5rem;
+    text-align: center;
+  }
 </style>
diff --git a/src/lib/components/ShipEdit/Identification.story.svelte b/src/lib/components/ShipEdit/Identification.story.svelte
new file mode 100644
index 0000000..d0bbadc
--- /dev/null
+++ b/src/lib/components/ShipEdit/Identification.story.svelte
@@ -0,0 +1,17 @@
+<Hst.Story title="ShipEdit/Identification">
+  <Identification
+    shipClass="Demeter"
+    shipType="Destroyer"
+    isCarrier={false}
+    reqs={{
+      cost: 12,
+      mass: 13,
+      usedMass: 9,
+    }}
+  />
+</Hst.Story>
+
+<script lang="ts">
+  export let Hst;
+  import Identification from "./Identification.svelte";
+</script>
diff --git a/src/lib/components/ShipEdit/Identification.svelte b/src/lib/components/ShipEdit/Identification.svelte
new file mode 100644
index 0000000..9ed04ef
--- /dev/null
+++ b/src/lib/components/ShipEdit/Identification.svelte
@@ -0,0 +1,54 @@
+<div class="identification-row">
+  <div>
+    <Field label="ship class" bind:value={shipClass} />
+    <Field label="ship type">
+      <select bind:value={shipType}>
+        {#each shipTypes as name (name)}
+          <option>{name}</option>
+        {/each}
+      </select>
+    </Field>
+  </div>
+  <ShipCost {...reqs} />
+</div>
+
+<script>
+  import { getContext } from "svelte";
+
+  import Field from "$lib/components/Field.svelte";
+  import { candidateShipTypes } from "./Identification/shipTypes.js";
+  import ShipCost from "./Identification/ShipCost.svelte";
+
+  export let shipClass = "";
+  export let shipType = "";
+  export let isCarrier = false;
+  export let reqs = {};
+
+  export let api = getContext("api");
+
+  $: shipTypes = candidateShipTypes(reqs.mass, isCarrier).map(
+    ({ name }) => name
+  );
+
+  $: if (shipTypes.length > 0 && !shipTypes.includes(shipType))
+    shipType = shipTypes[0];
+
+  $: api?.dispatch?.setShipType?.(shipType);
+  $: api?.dispatch?.setShipClass?.(shipClass);
+</script>
+
+<style>
+  div {
+    display: flex;
+    align-items: end;
+    gap: 2em;
+  }
+  .identification-row {
+    display: flex;
+    align-items: start;
+  }
+
+  .identification-row :global(> *:first-child) {
+    flex: 1;
+  }
+</style>
diff --git a/src/lib/components/ShipEdit/Identification/Identification.stories.svelte.todo b/src/lib/components/ShipEdit/Identification/Identification.stories.svelte.todo
deleted file mode 100644
index a3d01ab..0000000
--- a/src/lib/components/ShipEdit/Identification/Identification.stories.svelte.todo
+++ /dev/null
@@ -1,22 +0,0 @@
-<Meta title="ShipEdit/Identification" component={Identification} argTypes={{}} />
-
-<Story name="Primary" args={{}} />
-
-<Template let:args>
-  <div style="width: 50em">
-    <Identification {...args} />
-  </div>
-</Template>
-
-<script>
-  import { Meta, Template, Story } from "@storybook/addon-svelte-csf";
-  import { action } from "@storybook/addon-actions";
-
-  import { setContext } from "svelte";
-
-  import Identification from "./index.svelte";
-
-  setContext("ship", {
-    dispatch: (type, detail) => action(type)(detail),
-  });
-</script>
diff --git a/src/lib/components/ShipEdit/ShipCost.svelte b/src/lib/components/ShipEdit/Identification/ShipCost.svelte
similarity index 89%
rename from src/lib/components/ShipEdit/ShipCost.svelte
rename to src/lib/components/ShipEdit/Identification/ShipCost.svelte
index c06dcd1..0fd0a15 100644
--- a/src/lib/components/ShipEdit/ShipCost.svelte
+++ b/src/lib/components/ShipEdit/Identification/ShipCost.svelte
@@ -22,18 +22,18 @@
 <script>
   import { base } from "$app/paths";
   import { getContext } from "svelte";
-  import Field from "$lib/components/Field/index.svelte";
+  import Field from "$lib/components/Field.svelte";
 
-  export let ship = getContext("ship");
+  export let api = getContext("api");
 
   export let mass = 10;
   export let cost = 10;
-  export let usedMass = 5;
+  export let usedMass = 10;
 
   $: massUnused = mass - usedMass;
   $: withinBudget = massUnused >= 0;
 
-  $: ship.dispatch(ship.actions.setShipMass(mass));
+  $: api?.dispatch?.setShipMass?.(mass);
 
   /*   const change_tonnage = ({ target: { value } }) => */
   /*     ship.dispatch(ship.actions.set_ship_mass(parseInt(value))); */
diff --git a/src/lib/components/ShipEdit/Identification/index.svelte b/src/lib/components/ShipEdit/Identification/index.svelte
deleted file mode 100644
index d9abc10..0000000
--- a/src/lib/components/ShipEdit/Identification/index.svelte
+++ /dev/null
@@ -1,40 +0,0 @@
-<div>
-  <Field label="ship class" bind:value={shipClass} />
-  <Field label="ship type">
-    <select bind:value={shipType}>
-      {#each shipTypes as name (name)}
-        <option>{name}</option>
-      {/each}
-    </select>
-  </Field>
-</div>
-
-<script>
-  import { getContext } from "svelte";
-
-  import Field from "$lib/components/Field/index.svelte";
-  import { candidateShipTypes } from "./shipTypes.js";
-
-  export let shipClass = "";
-  export let shipType = "";
-  export let mass = 10;
-  export let isCarrier = false;
-
-  const ship = getContext("ship");
-
-  $: shipTypes = candidateShipTypes(mass, isCarrier).map(({ name }) => name);
-
-  $: if (shipTypes.length > 0 && !shipTypes.includes(shipType))
-    shipType = shipTypes[0];
-
-  $: ship.dispatch(ship.actions.setShipType(shipType));
-  $: ship.dispatch(ship.actions.setShipClass(shipClass));
-</script>
-
-<style>
-  div {
-    display: flex;
-    align-items: end;
-    gap: 2em;
-  }
-</style>