From 5381265dca1340b832d1ff381c8487a181e897af Mon Sep 17 00:00:00 2001
From: Yanick Champoux <yanick@babyl.dyndns.org>
Date: Tue, 28 Jul 2020 14:55:08 -0400
Subject: [PATCH] weaponry

---
 public/global.css                             |  4 ++-
 src/components/App.svelte                     |  2 +-
 src/components/Engine/index.svelte            |  1 +
 src/components/Firecons.svelte                |  4 +--
 .../{ => Hull}/Armour/Layer/index.svelte      |  8 +++++-
 src/components/{ => Hull}/Armour/index.svelte |  8 ++++--
 src/components/{ => Hull}/Armour/stories.js   |  0
 .../{ => Hull}/Screens/index.svelte           |  7 ++++-
 .../{Hull.svelte => Hull/index.svelte}        |  1 +
 src/components/Propulsion/index.svelte        |  4 +--
 src/components/Weapon/index.svelte            |  9 ++++++-
 src/components/Weaponry/ADFC/index.svelte     | 26 ++++++++-----------
 12 files changed, 48 insertions(+), 26 deletions(-)
 rename src/components/{ => Hull}/Armour/Layer/index.svelte (85%)
 rename src/components/{ => Hull}/Armour/index.svelte (96%)
 rename src/components/{ => Hull}/Armour/stories.js (100%)
 rename src/components/{ => Hull}/Screens/index.svelte (92%)
 rename src/components/{Hull.svelte => Hull/index.svelte} (97%)

diff --git a/public/global.css b/public/global.css
index 3cb60c3..92df750 100644
--- a/public/global.css
+++ b/public/global.css
@@ -104,4 +104,6 @@ input:focus, select:focus {
     border: 1px solid var(--indigo-dye);;
 }
 
-
+input.short {
+    width:5em;
+}
diff --git a/src/components/App.svelte b/src/components/App.svelte
index 46df1e5..f2159b6 100644
--- a/src/components/App.svelte
+++ b/src/components/App.svelte
@@ -52,7 +52,7 @@
   import ShipSpecs from './ShipSpecs/index.svelte';
   import ShipItem from "./ShipItem/index.svelte";
   import Field from "./Field/index.svelte";
-  import Hull from "./Hull.svelte";
+  import Hull from "./Hull";
   import Firecons from "./Firecons.svelte";
   import Propulsion from "./Propulsion/index.svelte";
   import Section from "~C/Section";
diff --git a/src/components/Engine/index.svelte b/src/components/Engine/index.svelte
index 6002086..993050a 100644
--- a/src/components/Engine/index.svelte
+++ b/src/components/Engine/index.svelte
@@ -35,4 +35,5 @@ div {
     align-items: end;
 }
 label { margin-left: 2em; }
+  input[type="number"] { width: 5em; }
 </style>
diff --git a/src/components/Firecons.svelte b/src/components/Firecons.svelte
index bbe1ac1..c80715c 100644
--- a/src/components/Firecons.svelte
+++ b/src/components/Firecons.svelte
@@ -1,6 +1,6 @@
 <ShipItem {cost} {mass}>
     <Field label="firecons">
-    <input type="number" bind:value={nbr} />
+    <input type="number" class="short" bind:value={nbr} />
     </Field>
 </ShipItem>
 
@@ -12,7 +12,7 @@ import Field from '~C/Field';
     export let nbr, cost, mass = (0,0,0);
 
     const dispatch = createEventDispatcher();
-    $: dispatch( 'change_firecons', nbr); 
+    $: dispatch( 'change_firecons', nbr);
 
 </script>
 
diff --git a/src/components/Armour/Layer/index.svelte b/src/components/Hull/Armour/Layer/index.svelte
similarity index 85%
rename from src/components/Armour/Layer/index.svelte
rename to src/components/Hull/Armour/Layer/index.svelte
index 3ffdc62..ef8fca8 100644
--- a/src/components/Armour/Layer/index.svelte
+++ b/src/components/Hull/Armour/Layer/index.svelte
@@ -16,8 +16,14 @@
 
     const dispatch = createEventDispatcher();
 
-    $: dispatch( 'ship_change', 
+    $: dispatch( 'ship_change',
         dux.actions.set_armour_layer({layer,rating})
     );
 
 </script>
+
+<style>
+  input {
+    width: 5em;
+  }
+  </style>
diff --git a/src/components/Armour/index.svelte b/src/components/Hull/Armour/index.svelte
similarity index 96%
rename from src/components/Armour/index.svelte
rename to src/components/Hull/Armour/index.svelte
index 9338cc7..95a5b7f 100644
--- a/src/components/Armour/index.svelte
+++ b/src/components/Hull/Armour/index.svelte
@@ -46,7 +46,11 @@
 <style>
     .layers {
         display: flex;
-        
+
     }
-    
+
+    input {
+      width: 5em;
+    }
+
 </style>
diff --git a/src/components/Armour/stories.js b/src/components/Hull/Armour/stories.js
similarity index 100%
rename from src/components/Armour/stories.js
rename to src/components/Hull/Armour/stories.js
diff --git a/src/components/Screens/index.svelte b/src/components/Hull/Screens/index.svelte
similarity index 92%
rename from src/components/Screens/index.svelte
rename to src/components/Hull/Screens/index.svelte
index 9ad509d..00c69fe 100644
--- a/src/components/Screens/index.svelte
+++ b/src/components/Hull/Screens/index.svelte
@@ -1,5 +1,5 @@
-
 <ShipItem { cost } { mass }>
+  <div>
 
   <Field label="screens">
     <input type="number" bind:value={standard} min="0" />
@@ -8,6 +8,7 @@
   <Field label="advanced screens">
     <input type="number" bind:value={advanced} min="0" />
   </Field>
+</div>
 
 </ShipItem>
 
@@ -34,4 +35,8 @@
   input {
     width: 3em;
   }
+  div {
+    display: flex;
+    gap: 2em;
+  }
   </style>
diff --git a/src/components/Hull.svelte b/src/components/Hull/index.svelte
similarity index 97%
rename from src/components/Hull.svelte
rename to src/components/Hull/index.svelte
index 07c6366..4d34136 100644
--- a/src/components/Hull.svelte
+++ b/src/components/Hull/index.svelte
@@ -39,4 +39,5 @@ const dispatch = createEventDispatcher();
 </script>
 
 <style>
+  input { width: 5em; }
 </style>
diff --git a/src/components/Propulsion/index.svelte b/src/components/Propulsion/index.svelte
index ee84b36..20a2a08 100644
--- a/src/components/Propulsion/index.svelte
+++ b/src/components/Propulsion/index.svelte
@@ -1,10 +1,10 @@
 
 <Section label="propulsion">
 
-    <Ftl {...ftl} on:change_ftl />
-
     <Engine {...engine} on:change_engine />
 
+    <Ftl {...ftl} on:change_ftl />
+
 </Section>
 
 <script>
diff --git a/src/components/Weapon/index.svelte b/src/components/Weapon/index.svelte
index ed76f48..6e6b431 100644
--- a/src/components/Weapon/index.svelte
+++ b/src/components/Weapon/index.svelte
@@ -1,10 +1,12 @@
 <ShipItem {cost} {mass}>
 
+  <div class="weapon_row">
 <div class="remove" on:click={remove}>X</div>
 
 
-<svelte:component this={weapon_component[weapon_type]} {...weapon} 
+<svelte:component this={weapon_component[weapon_type]} {...weapon}
     on:change={update}/>
+</div>
 </ShipItem>
 
 <script>
@@ -118,5 +120,10 @@
     border-radius: 0.5em;
     height: 1em;
 }
+  .weapon_row {
+    display: flex;
+    gap: 2em;
+    align-items: center;
+  }
 
 </style>
diff --git a/src/components/Weaponry/ADFC/index.svelte b/src/components/Weaponry/ADFC/index.svelte
index 1045c9b..8a50a9f 100644
--- a/src/components/Weaponry/ADFC/index.svelte
+++ b/src/components/Weaponry/ADFC/index.svelte
@@ -1,26 +1,22 @@
 <ShipItem {cost} {mass}>
   <Field label="ADFC">
-    <input type="number" bind:value={rating} />
+    <input type="number" class="short" bind:value={rating} />
   </Field>
 </ShipItem>
 
-  <script>
-  import get from 'lodash/get';
-  import ShipItem from '~C/ShipItem/index.svelte';
-  import Field from '~C/Field/index.svelte';
-  import dux from '~/dux';
 
-  import {getContext } from 'svelte';
+<script>
+  import get from "lodash/get";
+  import ShipItem from "~C/ShipItem/index.svelte";
+  import Field from "~C/Field/index.svelte";
+  import dux from "~/dux";
+
+  import { getContext } from "svelte";
 
   export let rating = 0;
   export let cost = 0;
   export let mass = 0;
-  export let ship_change = getContext('ship_change') || ( () => {} );
+  export let ship_change = getContext("ship_change") || (() => {});
 
-  $: ship_change( dux.actions.set_adfc(rating));
-
-  </script>
-
-  <style>
-  div { display: flex }
-  </style>
+  $: ship_change(dux.actions.set_adfc(rating));
+</script>