From d52acafa21714bc23a65680b9ced8c0c5eebbde8 Mon Sep 17 00:00:00 2001 From: Yanick Champoux Date: Wed, 6 Apr 2022 19:41:57 -0400 Subject: [PATCH 1/7] bug: only use redux plugin in dev [GT#21] fix #21 --- src/lib/store/ship.js | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/lib/store/ship.js b/src/lib/store/ship.js index 2e507f1..d86f1ed 100644 --- a/src/lib/store/ship.js +++ b/src/lib/store/ship.js @@ -1,4 +1,4 @@ -import { browser } from "$app/env"; +import { browser, dev } from "$app/env"; import { readable, get, derived } from "svelte/store"; import { compose, applyMiddleware } from "redux"; @@ -6,27 +6,27 @@ import shipDux from "../shipDux/index.js"; let composeEnhancers = compose; -if (browser) { - composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__; +if (dev && browser && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) { + composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__; } export default () => { - const duxStore = shipDux.createStore(undefined, (mw) => - composeEnhancers(applyMiddleware(mw)) - ); + const duxStore = shipDux.createStore(undefined, (mw) => + composeEnhancers(applyMiddleware(mw)) + ); - let previous; - const state = readable(duxStore.getState(), (set) => { - duxStore.subscribe(() => { - if (previous === duxStore.getState()) return; - previous = duxStore.getState(); - set(previous); + let previous; + const state = readable(duxStore.getState(), (set) => { + duxStore.subscribe(() => { + if (previous === duxStore.getState()) return; + previous = duxStore.getState(); + set(previous); + }); }); - }); - return { - dispatch: duxStore.dispatch, - state, - shipMass: derived( state, state => state.reqs.mass ) - }; + return { + dispatch: duxStore.dispatch, + state, + shipMass: derived(state, (state) => state.reqs.mass), + }; }; From 2fd047fa9d9f23e152c64aa582ff07e14379aabe Mon Sep 17 00:00:00 2001 From: Yanick Champoux Date: Wed, 6 Apr 2022 19:49:33 -0400 Subject: [PATCH 2/7] chore: add standard-version --- .versionrc.json | 12 ++++++++++++ CHANGELOG.md | 4 ---- package.json | 8 +++++--- 3 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 .versionrc.json delete mode 100644 CHANGELOG.md diff --git a/.versionrc.json b/.versionrc.json new file mode 100644 index 0000000..b4a1cf4 --- /dev/null +++ b/.versionrc.json @@ -0,0 +1,12 @@ +{ + "types": [ + { "type": "feat", "section": "Features" }, + { "type": "fix", "section": "Bug Fixes" }, + { "type": "chore" }, + { "type": "docs" }, + { "type": "style", "hidden": false }, + { "type": "refactor", "hidden": false }, + { "type": "perf", "hidden": false }, + { "type": "test", "hidden": false } + ] +} diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index c50aa46..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,4 +0,0 @@ -## Next - -* Add svench. -* Switch to Sveltekit. diff --git a/package.json b/package.json index bf57761..5602f4d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,8 @@ { - "name": "~TODO~", - "version": "0.0.1", + "name": "aotds-docks", + "version": "2.0.0", + "type": "module", + "private": true, "scripts": { "dev": "svelte-kit dev", "build": "svelte-kit build", @@ -24,11 +26,11 @@ "eslint-plugin-svelte3": "^3.4.1", "prettier": "~2.5.1", "prettier-plugin-svelte": "^2.6.0", + "standard-version": "^9.3.2", "storybook-builder-vite": "0.1.21", "svelte": "^3.46.4", "vite": "^2.7.0" }, - "type": "module", "dependencies": { "@storybook/addon-essentials": "^6.4.19", "@storybook/addon-svelte-csf": "^1.1.0", From 3a4ad998ada546341e693b26c8b30b49cdf38733 Mon Sep 17 00:00:00 2001 From: Yanick Champoux Date: Wed, 6 Apr 2022 20:08:08 -0400 Subject: [PATCH 3/7] heed the warning from sveltekit --- jsconfig.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/jsconfig.json b/jsconfig.json index 893781f..345083f 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -1,9 +1,10 @@ { - "compilerOptions": { - "baseUrl": ".", - "paths": { - "$lib/*": ["src/lib/*"] - } - }, - "include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"] + "extends": "./.svelte-kit/tsconfig.json", + "compilerOptions": { + "baseUrl": ".", + "paths": { + "$lib/*": ["src/lib/*"] + } + }, + "include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"] } From 243a4948643d1ca1c7a1b1fac7b08fb0047bf65d Mon Sep 17 00:00:00 2001 From: Yanick Champoux Date: Wed, 6 Apr 2022 20:09:22 -0400 Subject: [PATCH 4/7] sveltekit config tweaks for base url --- package.json | 1 + svelte.config.js | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 5602f4d..0f918dd 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "rollup-plugin-analyzer": "^4.0.0", "svelte-chota": "^1.8.6", "svelte-knobby": "^0.3.4", + "svelte-moveable": "^0.20.0", "ts-action": "^11.0.0", "updux": "link:/home/yanick/work/javascript/updux-js/", "webpack": "5" diff --git a/svelte.config.js b/svelte.config.js index 9205c1d..8940ae6 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,18 +1,19 @@ import adapter from "@sveltejs/adapter-static"; import analyze from "rollup-plugin-analyzer"; +const dev = process.env.NODE_ENV === "development"; /** @type {import('@sveltejs/kit').Config} */ export default { - kit: { - adapter: adapter(), - paths: { base: "/aotds-docks" }, - vite: { - build: { - rollupOptions: { - plugins: [analyze()], - // external: ['updux','@yanick/updeep'] - }, - }, + kit: { + adapter: adapter({ fallback: "index.html" }), + paths: { base: dev ? "" : "/aotds-docks" }, + vite: { + build: { + rollupOptions: { + plugins: [analyze()], + // external: ['updux','@yanick/updeep'] }, + }, }, + }, }; From b425f4add4a69082c3da4386d26740cb1c54a7d3 Mon Sep 17 00:00:00 2001 From: Yanick Champoux Date: Wed, 6 Apr 2022 20:34:55 -0400 Subject: [PATCH 5/7] feat: can move main system comps in the print output --- .../Output/Print/MainSystems/Movable.svelte | 42 ++++++ .../Output/Print/MainSystems/index.svelte | 37 +++++- src/lib/components/Output/Print/index.svelte | 122 +++++++++--------- 3 files changed, 136 insertions(+), 65 deletions(-) create mode 100644 src/lib/components/Output/Print/MainSystems/Movable.svelte diff --git a/src/lib/components/Output/Print/MainSystems/Movable.svelte b/src/lib/components/Output/Print/MainSystems/Movable.svelte new file mode 100644 index 0000000..e69ddcd --- /dev/null +++ b/src/lib/components/Output/Print/MainSystems/Movable.svelte @@ -0,0 +1,42 @@ + { + e.dragStart && e.dragStart.set(frame.translate); + }} + on:dragOrigin={({ detail: e }) => { + frame.translate = e.drag.beforeTranslate; + frame.transformOrigin = e.transformOrigin; + }} + on:dragStart={({ detail: e }) => { + e.set(frame.translate); + }} + on:drag={({ detail: e }) => { + frame.translate = e.beforeTranslate; + }} + on:render={({ detail: e }) => { + const { translate, rotate, transformOrigin } = frame; + e.target.style.transformOrigin = transformOrigin; + e.target.style.transform = + `translate(${translate[0]}px, ${translate[1]}px)` + + ` rotate(${rotate}deg)`; + }} +/> + + diff --git a/src/lib/components/Output/Print/MainSystems/index.svelte b/src/lib/components/Output/Print/MainSystems/index.svelte index 1595607..29d68a2 100644 --- a/src/lib/components/Output/Print/MainSystems/index.svelte +++ b/src/lib/components/Output/Print/MainSystems/index.svelte @@ -1,26 +1,53 @@
{#if ftl !== "none"} - ftl drive + ftl drive + + {#if movable} + + {/if} {/if} {#if engine > 0} -
{engine}
+
+ {engine} +
+ {#if movable} + + {/if} {/if} internal systems + {#if movable} + + {/if}
From bf7206a034ed98a1cd4f85f0793d0013c2ac246b Mon Sep 17 00:00:00 2001 From: Yanick Champoux Date: Wed, 6 Apr 2022 20:53:39 -0400 Subject: [PATCH 6/7] feat: add localStorage memory --- src/lib/store/ship.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/lib/store/ship.js b/src/lib/store/ship.js index d86f1ed..d4d2211 100644 --- a/src/lib/store/ship.js +++ b/src/lib/store/ship.js @@ -3,6 +3,7 @@ import { readable, get, derived } from "svelte/store"; import { compose, applyMiddleware } from "redux"; import shipDux from "../shipDux/index.js"; +import { initial } from "lodash"; let composeEnhancers = compose; @@ -11,7 +12,16 @@ if (dev && browser && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) { } export default () => { - const duxStore = shipDux.createStore(undefined, (mw) => + + let initialState = undefined; + + if( browser ) { + const i =localStorage.getItem('ship'); + + if(i) initialState = JSON.parse(localStorage.getItem('ship')); + } + + const duxStore = shipDux.createStore(initialState, (mw) => composeEnhancers(applyMiddleware(mw)) ); @@ -21,6 +31,7 @@ export default () => { if (previous === duxStore.getState()) return; previous = duxStore.getState(); set(previous); + if( browser ) localStorage.setItem('ship', JSON.stringify(previous)); }); }); From a84146b58073f8d35db41f35707ce2c823cf4a6f Mon Sep 17 00:00:00 2001 From: Yanick Champoux Date: Wed, 6 Apr 2022 20:55:11 -0400 Subject: [PATCH 7/7] chore(release): 2.1.0 --- CHANGELOG.md | 14 ++++++++++++++ package.json | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..de66627 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,14 @@ +# Changelog + +All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. + +## [2.1.0](///compare/v2.0.0...v2.1.0) (2022-04-07) + + +### Features + +* add localStorage memory bf7206a +* can move main system comps in the print output b425f4a + + +* add standard-version 2fd047f diff --git a/package.json b/package.json index 0f918dd..e46d46a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aotds-docks", - "version": "2.0.0", + "version": "2.1.0", "type": "module", "private": true, "scripts": {