diff --git a/histoire.config.js b/histoire.config.js
index 565928e..918b0dc 100644
--- a/histoire.config.js
+++ b/histoire.config.js
@@ -9,5 +9,5 @@ export default defineConfig({
// Options here
}),
],
- // setupFile: "./src/histoire.setup.js",
+ setupFile: "./src/histoire.setup.js",
});
diff --git a/package.json b/package.json
index 6def57e..7c8c6b4 100644
--- a/package.json
+++ b/package.json
@@ -26,31 +26,31 @@
"globby": "^13.1.3",
"jest-image-snapshot": "^4.5.1",
"pixelmatch": "^5.3.0",
- "prettier": "~2.5.1",
- "prettier-plugin-svelte": "^2.6.0",
+ "prettier": "~2.8.6",
+ "prettier-plugin-svelte": "^2.10.0",
"showdown": "^2.0.3",
- "svelte": "^3.55.1",
- "typescript": "^4.9.5",
- "vitest": "^0.29.7",
- "vitest-svelte-kit": "^0.0.6"
+ "svelte": "^3.57.0",
+ "typescript": "^5.0.2",
+ "vitest": "^0.29.7"
},
"dependencies": {
"@picocss/pico": "^1.5.7",
"@reduxjs/toolkit": "^1.9.3",
"@sveltejs/adapter-node": "^1.0.0-next.0",
- "@yanick/updeep-remeda": "^2.1.0",
+ "@yanick/updeep-remeda": "^2.1.1",
"chota": "^0.8.0",
"effector": "^22.5.2",
"histoire": "^0.15.9",
+ "jsdom": "^21.1.1",
"lodash": "^4.17.21",
"redux": "^4.1.2",
- "remeda": "^1.1.0",
+ "remeda": "^1.9.1",
"reselect": "^4.1.5",
"svelte-chota": "^1.8.6",
"svelte-knobby": "^0.3.4",
"svelte-moveable": "^0.20.0",
"ts-action": "^11.0.0",
- "vite": "^4.1.4"
+ "vite": "^4.2.1"
},
"prettier": {
"svelteSortOrder": "options-markup-scripts-styles",
diff --git a/src/histoire.setup.js b/src/histoire.setup.js
index 617951d..51426a1 100644
--- a/src/histoire.setup.js
+++ b/src/histoire.setup.js
@@ -1 +1,3 @@
-import "./lib/style/index.js";
+//import "./lib/style/index.js";
+import "@picocss/pico";
+import "../static/global.css";
diff --git a/src/lib/components/GlobalStyle.svelte b/src/lib/components/GlobalStyle.svelte
deleted file mode 100644
index 4959dac..0000000
--- a/src/lib/components/GlobalStyle.svelte
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
diff --git a/src/lib/components/ShipEdit.story.svelte b/src/lib/components/ShipEdit.story.svelte
new file mode 100644
index 0000000..ad09f02
--- /dev/null
+++ b/src/lib/components/ShipEdit.story.svelte
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/lib/components/ShipEdit.svelte b/src/lib/components/ShipEdit.svelte
new file mode 100644
index 0000000..98abf9d
--- /dev/null
+++ b/src/lib/components/ShipEdit.svelte
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/lib/components/ShipEdit/Carrier/Squadron.svelte b/src/lib/components/ShipEdit/Carrier/Squadron.svelte
index eae0a30..9db78ea 100644
--- a/src/lib/components/ShipEdit/Carrier/Squadron.svelte
+++ b/src/lib/components/ShipEdit/Carrier/Squadron.svelte
@@ -1,5 +1,4 @@
-
diff --git a/src/lib/components/ShipEdit/Identification.svelte b/src/lib/components/ShipEdit/Identification.svelte
new file mode 100644
index 0000000..e15da04
--- /dev/null
+++ b/src/lib/components/ShipEdit/Identification.svelte
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
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..a07151c 100644
--- a/src/lib/components/ShipEdit/ShipCost.svelte
+++ b/src/lib/components/ShipEdit/Identification/ShipCost.svelte
@@ -22,18 +22,20 @@
-
-
diff --git a/src/lib/components/ShipEdit/Propulsion.svelte b/src/lib/components/ShipEdit/Propulsion.svelte
index 8a432bf..e361da1 100644
--- a/src/lib/components/ShipEdit/Propulsion.svelte
+++ b/src/lib/components/ShipEdit/Propulsion.svelte
@@ -1,6 +1,6 @@
diff --git a/src/lib/components/ShipEdit/Propulsion/Engine.story.svelte b/src/lib/components/ShipEdit/Propulsion/Engine.story.svelte
index 65b3f32..95954c2 100644
--- a/src/lib/components/ShipEdit/Propulsion/Engine.story.svelte
+++ b/src/lib/components/ShipEdit/Propulsion/Engine.story.svelte
@@ -13,5 +13,4 @@
};
import Engine from "./Engine.svelte";
- import "$lib/components/GlobalStyle.svelte";
diff --git a/src/lib/components/ShipEdit/Propulsion/Engine.svelte b/src/lib/components/ShipEdit/Propulsion/Engine.svelte
index c1a6df8..2925a6f 100644
--- a/src/lib/components/ShipEdit/Propulsion/Engine.svelte
+++ b/src/lib/components/ShipEdit/Propulsion/Engine.svelte
@@ -25,7 +25,8 @@
export let rating = 0;
export let api = getContext("api");
- $: api?.dispatch?.setEngine({ rating, advanced });
+ console.log(api?.dispatch?.setDrive);
+ $: api?.dispatch?.setDrive?.({ rating, advanced });