From 04c039a6d119ba7c0369e0d4f34a6481ac1382b7 Mon Sep 17 00:00:00 2001 From: Yanick Champoux Date: Sun, 26 Jul 2020 17:55:51 -0400 Subject: [PATCH] armour --- .storybook/main.js | 10 ++++- src/App.svelte | 2 + src/components/Armour/Layer/index.svelte | 23 +++++++++++ src/components/Armour/index.svelte | 52 ++++++++++++++++++++++++ src/components/Armour/stories.js | 18 ++++++++ src/components/Hull.svelte | 7 +++- src/dux/structure/armour/index.js | 36 ++++++++++++++++ src/dux/structure/index.js | 4 +- 8 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 src/components/Armour/Layer/index.svelte create mode 100644 src/components/Armour/index.svelte create mode 100644 src/components/Armour/stories.js create mode 100644 src/dux/structure/armour/index.js diff --git a/.storybook/main.js b/.storybook/main.js index 458d05e..d8e5914 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -1,3 +1,11 @@ +const path = require('path'); + module.exports = { - stories: [ '../src/**/*stories.js' ] + stories: [ '../src/**/*stories.js' ], + webpackFinal: (config) => { + config.resolve.alias['~'] = path.resolve(__dirname, '../src/'); + config.resolve.alias['~C'] = path.resolve(__dirname, '../src/components/'); + + return config; + } }; diff --git a/src/App.svelte b/src/App.svelte index a3031f3..0028902 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -65,7 +65,9 @@ { ... $ship.structure.hull } on:change_hull={change_hull} screens={ $ship.structure.screens} + armour={$ship.structure.armour} on:set_screens={set_screens} + on:ship_change={ship_dispatch} /> diff --git a/src/components/Armour/Layer/index.svelte b/src/components/Armour/Layer/index.svelte new file mode 100644 index 0000000..3ffdc62 --- /dev/null +++ b/src/components/Armour/Layer/index.svelte @@ -0,0 +1,23 @@ + + + + + + diff --git a/src/components/Armour/index.svelte b/src/components/Armour/index.svelte new file mode 100644 index 0000000..9338cc7 --- /dev/null +++ b/src/components/Armour/index.svelte @@ -0,0 +1,52 @@ + + +
+ +
+ + + +
+ +
+ {#each armour as layer ( layer.layer )} + + {/each} +
+ + +
+ +
+ + + + diff --git a/src/components/Armour/stories.js b/src/components/Armour/stories.js new file mode 100644 index 0000000..e5f1a41 --- /dev/null +++ b/src/components/Armour/stories.js @@ -0,0 +1,18 @@ +import Armour from './index.svelte'; + +export default { + title: "Armour", +}; + +export const basic = () => ({ + Component: Armour, + props: { + armour: [ + { layer: 1, rating: 12, cost: 1, mass: 2 }, + { layer: 2, rating: 12, cost: 1, mass: 2 }, + ] + }, + on: { + ship_change: ({detail}) => console.log(detail) + } +}); diff --git a/src/components/Hull.svelte b/src/components/Hull.svelte index a24bc60..07c6366 100644 --- a/src/components/Hull.svelte +++ b/src/components/Hull.svelte @@ -11,6 +11,8 @@ + +