From beeb298c35e70b884b6d4a1731607f35c8ce3060 Mon Sep 17 00:00:00 2001 From: Samuel Andert Date: Mon, 7 Aug 2023 18:34:23 +0200 Subject: [PATCH] Further Cleanup removing old Compositor --- src/lib/components/AppBar.svelte | 9 - src/lib/components/Apps.svelte | 4 +- src/lib/components/Messages.svelte | 45 ++-- src/lib/components/Terminal.svelte | 1 - .../{examples => cleanup}/Flows.svelte | 0 .../{examples => cleanup}/Recipies.svelte | 8 +- .../machines => cleanup}/recipeMachine.ts | 0 .../machines => cleanup}/toggleMachine.ts | 0 .../{examples => cleanup}/userService.ts | 0 .../refactor/ComposerOverview.svelte | 24 ++ .../refactor/ComposerQueries.svelte | 20 +- src/lib/core/Composite.svelte | 250 ------------------ src/lib/core/FallBack.svelte | 4 - src/lib/core/componentLoader.ts | 10 - src/lib/core/compositeStores.ts | 16 -- src/lib/core/coreServices.ts | 23 -- src/lib/core/dataLoader.ts | 16 -- src/lib/core/refactor/Composer.svelte | 9 +- src/lib/core/servicesLoader.ts | 15 -- src/lib/stores/contextStore.ts | 12 - src/routes/+layout.svelte | 5 +- src/routes/+page.svelte | 10 +- src/routes/composer/+page.svelte | 65 +---- src/routes/composer/form/+page.svelte | 59 +++++ src/routes/composer/queries/+page.svelte | 55 ++++ src/routes/composer/recipies/+page.svelte | 5 + src/routes/composer/stateToState/+page.svelte | 2 +- .../{messages => terminal}/+page.svelte | 14 +- src/routes/wallet/+page.svelte | 6 +- 29 files changed, 208 insertions(+), 479 deletions(-) delete mode 100644 src/lib/components/AppBar.svelte rename src/lib/components/{examples => cleanup}/Flows.svelte (100%) rename src/lib/components/{examples => cleanup}/Recipies.svelte (97%) rename src/lib/components/{Recipies/machines => cleanup}/recipeMachine.ts (100%) rename src/lib/components/{Recipies/machines => cleanup}/toggleMachine.ts (100%) rename src/lib/components/{examples => cleanup}/userService.ts (100%) create mode 100644 src/lib/components/refactor/ComposerOverview.svelte delete mode 100644 src/lib/core/Composite.svelte delete mode 100644 src/lib/core/FallBack.svelte delete mode 100644 src/lib/core/componentLoader.ts delete mode 100644 src/lib/core/compositeStores.ts delete mode 100644 src/lib/core/coreServices.ts delete mode 100644 src/lib/core/dataLoader.ts delete mode 100644 src/lib/core/servicesLoader.ts delete mode 100644 src/lib/stores/contextStore.ts create mode 100644 src/routes/composer/form/+page.svelte create mode 100644 src/routes/composer/queries/+page.svelte create mode 100644 src/routes/composer/recipies/+page.svelte rename src/routes/{messages => terminal}/+page.svelte (58%) diff --git a/src/lib/components/AppBar.svelte b/src/lib/components/AppBar.svelte deleted file mode 100644 index 33781c5..0000000 --- a/src/lib/components/AppBar.svelte +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/src/lib/components/Apps.svelte b/src/lib/components/Apps.svelte index 27e53c1..8b3766c 100644 --- a/src/lib/components/Apps.svelte +++ b/src/lib/components/Apps.svelte @@ -4,9 +4,9 @@ const routes = [ { path: '/', name: 'Home', icon: 'iconoir:home-simple-door' }, - { path: '/messages', name: 'Messages', icon: 'iconoir:message-text' }, + { path: '/terminal', name: 'Terminal', icon: 'iconoir:message-text' }, { path: '/wallet', name: 'Wallet', icon: 'iconoir:wallet' }, - { path: '/helloearth', name: 'Hello Earth', icon: 'iconoir:planet-sat' } + { path: '/composer', name: 'Composer', icon: 'iconoir:planet-sat' } ]; function closeDrawer() { drawerStore.close(); diff --git a/src/lib/components/Messages.svelte b/src/lib/components/Messages.svelte index 81d3485..3cfb6a5 100644 --- a/src/lib/components/Messages.svelte +++ b/src/lib/components/Messages.svelte @@ -1,10 +1,8 @@ -{#if isStoreLoaded} - {#if $store.messages} -
-
- {#each $store.messages as message} -
-
-

{message.type} | {message.sender}

- {message.timestamp} -
-

{message.text}

+{#if $me.store.messages} +
+
+ {#each $me.store.messages as message} +
+
+

{message.type} | {message.sender}

+ {message.timestamp} +
+

{message.text}

+
+ {#if message.composite} +
+
- {#if message.composite} -
- -
- {/if} - {/each} -
-
- {/if} + {/if} + {/each} +
+
{:else}
Loading...
{/if} diff --git a/src/lib/components/Terminal.svelte b/src/lib/components/Terminal.svelte index 8334d19..fc7b077 100644 --- a/src/lib/components/Terminal.svelte +++ b/src/lib/components/Terminal.svelte @@ -27,7 +27,6 @@ } } - // Sending message logic function sendMessage(text) { if (text && text.trim() !== '') { const message = { diff --git a/src/lib/components/examples/Flows.svelte b/src/lib/components/cleanup/Flows.svelte similarity index 100% rename from src/lib/components/examples/Flows.svelte rename to src/lib/components/cleanup/Flows.svelte diff --git a/src/lib/components/examples/Recipies.svelte b/src/lib/components/cleanup/Recipies.svelte similarity index 97% rename from src/lib/components/examples/Recipies.svelte rename to src/lib/components/cleanup/Recipies.svelte index 38db8b8..1ee4978 100644 --- a/src/lib/components/examples/Recipies.svelte +++ b/src/lib/components/cleanup/Recipies.svelte @@ -1,4 +1,4 @@ - + +
+ {#each routes as route} + + + {route.name} + + {/each} +
diff --git a/src/lib/components/refactor/ComposerQueries.svelte b/src/lib/components/refactor/ComposerQueries.svelte index b6ca4ab..17889e1 100644 --- a/src/lib/components/refactor/ComposerQueries.svelte +++ b/src/lib/components/refactor/ComposerQueries.svelte @@ -1,16 +1,5 @@
@@ -18,19 +7,16 @@

My ID is: {$me.id}

My state is: {$me.state} + Todo Query:
{#if $me.store.todos} {#each $me.store.todos as todo}

{todo.text}

{/each} {/if} - +
+ Messages Query:
{#if $me.store.messages} {#each $me.store.messages as message}

{message.text}

diff --git a/src/lib/core/Composite.svelte b/src/lib/core/Composite.svelte deleted file mode 100644 index a657845..0000000 --- a/src/lib/core/Composite.svelte +++ /dev/null @@ -1,250 +0,0 @@ - - -
- {#if composite?.servicesLoaded} - {#await loadComponentAndService(composite) then Component} - - {/await} - {/if} - {#if composite?.children} - {#each composite.children as child (child.id)} -
- {#if child.servicesLoaded} - {#await loadComponentAndService(child) then ChildComponent} - - {#if child.children && child.children.length} - - {/if} - {/await} - {/if} -
- {/each} - {/if} -
diff --git a/src/lib/core/FallBack.svelte b/src/lib/core/FallBack.svelte deleted file mode 100644 index c4fb85e..0000000 --- a/src/lib/core/FallBack.svelte +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/src/lib/core/componentLoader.ts b/src/lib/core/componentLoader.ts deleted file mode 100644 index bf61f76..0000000 --- a/src/lib/core/componentLoader.ts +++ /dev/null @@ -1,10 +0,0 @@ -import componentNames from 'virtual:components-list'; - -const components = {}; - -componentNames.forEach(path => { - const name = path.split('/').pop(); // Extract just the file name from the path - components[name] = () => import( /* @vite-ignore */ `/src/lib/components/${path}.svelte`); -}); - -export default components; \ No newline at end of file diff --git a/src/lib/core/compositeStores.ts b/src/lib/core/compositeStores.ts deleted file mode 100644 index 7e586c0..0000000 --- a/src/lib/core/compositeStores.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { writable } from 'svelte/store'; - -const compositeStores = new Map(); - -// Create or retrieve a composite store -export function createCompositeStore(compositeId: string, initialState = {}) { - if (!compositeStores.has(compositeId)) { - compositeStores.set(compositeId, writable(initialState)); - } - return compositeStores.get(compositeId); -} - -// Get composite store or create a default empty one if not exists -export function getCompositeStore(compositeId: string) { - return compositeStores.get(compositeId) || createCompositeStore(compositeId); -} diff --git a/src/lib/core/coreServices.ts b/src/lib/core/coreServices.ts deleted file mode 100644 index ea5334d..0000000 --- a/src/lib/core/coreServices.ts +++ /dev/null @@ -1,23 +0,0 @@ -// coreServices.ts -import { getCompositeStore } from './compositeStores'; - -export const coreServices = { - updateComposite: (mappings: Record) => { - for (const [mappingString, value] of Object.entries(mappings)) { - const [storeID, key] = mappingString.replace('@', '').split(':'); - const store = getCompositeStore(storeID); - store.update(storeData => { - storeData[key] = value; - return storeData; - }); - } - }, - subscribeComposite: (mappingString: string) => { - const [storeID] = mappingString.replace('@', '').split(':'); - const store = getCompositeStore(storeID); - return store; - }, - testAlert: () => { - alert("core service alert") - } -}; diff --git a/src/lib/core/dataLoader.ts b/src/lib/core/dataLoader.ts deleted file mode 100644 index d537c26..0000000 --- a/src/lib/core/dataLoader.ts +++ /dev/null @@ -1,16 +0,0 @@ -// dataLoader.ts -import { writable } from 'svelte/store'; -import dataSources from 'virtual:data-sources-list'; - -// The store that holds the data sets -export const dataStore = writable({}); - -// Dynamically import the data modules and assign them to the store -dataSources.forEach(src => { - import(`/src/lib/data/${src}.ts`).then(module => { - // Here, explicitly extract the required data or function from the module - const moduleData = module[src] || module.default; - - dataStore.update(store => ({ ...store, [src]: moduleData })); - }); -}); \ No newline at end of file diff --git a/src/lib/core/refactor/Composer.svelte b/src/lib/core/refactor/Composer.svelte index f45ee75..f9e2c3c 100644 --- a/src/lib/core/refactor/Composer.svelte +++ b/src/lib/core/refactor/Composer.svelte @@ -1,7 +1,7 @@ - + +
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 6ebb823..de67d85 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,11 +1,11 @@ - + diff --git a/src/routes/composer/+page.svelte b/src/routes/composer/+page.svelte index 5f398bb..b735bf4 100644 --- a/src/routes/composer/+page.svelte +++ b/src/routes/composer/+page.svelte @@ -6,75 +6,28 @@ let composer = { id: 'ComposerParent', layout: { - columns: '1fr 1fr', + rows: '1fr auto', areas: ` - "left right" + "main" + "bottom" ` }, children: [ { - id: 'ComposerQueries', - component: 'ComposerQueries', - slot: 'right', + id: 'ComposerOverview', + component: 'ComposerOverview', + slot: 'main', data: { map: { todos: queryTodos, messages: queryMessages } - }, - machine: { - initial: 'LOADING', - states: { - LOADING: { - on: { - TOGGLE: { - target: 'READY' - } - } - }, - READY: { - on: { - TOGGLE: { - target: 'LOADING' - } - } - } - } } }, { - id: 'ComposerForm', - component: 'ComposerForm', - slot: 'left', - machine: { - id: 'validation', - initial: 'notValidated', - context: { - isValidated: false - }, - states: { - notValidated: { - on: { - VALIDATE: { - target: 'isValidated', - actions: 'setValidated' - } - } - }, - isValidated: { - on: { - INVALIDATE: { - target: 'notValidated', - actions: 'setNotValidated' - } - } - } - }, - services: { - setValidated: (context) => (context.isValidated = true), - setNotValidated: (context) => (context.isValidated = false) - } - } + id: 'terminal', + component: 'Terminal', + slot: 'bottom' } ] }; diff --git a/src/routes/composer/form/+page.svelte b/src/routes/composer/form/+page.svelte new file mode 100644 index 0000000..5194479 --- /dev/null +++ b/src/routes/composer/form/+page.svelte @@ -0,0 +1,59 @@ + + + diff --git a/src/routes/composer/queries/+page.svelte b/src/routes/composer/queries/+page.svelte new file mode 100644 index 0000000..7adfdc8 --- /dev/null +++ b/src/routes/composer/queries/+page.svelte @@ -0,0 +1,55 @@ + + + diff --git a/src/routes/composer/recipies/+page.svelte b/src/routes/composer/recipies/+page.svelte new file mode 100644 index 0000000..9852609 --- /dev/null +++ b/src/routes/composer/recipies/+page.svelte @@ -0,0 +1,5 @@ + + + diff --git a/src/routes/composer/stateToState/+page.svelte b/src/routes/composer/stateToState/+page.svelte index ee1d48c..6e410fc 100644 --- a/src/routes/composer/stateToState/+page.svelte +++ b/src/routes/composer/stateToState/+page.svelte @@ -2,7 +2,7 @@ import Composer from '$lib/core/refactor/Composer.svelte'; let composer = { - id: 'ComposerParent', + id: 'StateToStateContainer', layout: { rows: '1fr 1fr', areas: ` diff --git a/src/routes/messages/+page.svelte b/src/routes/terminal/+page.svelte similarity index 58% rename from src/routes/messages/+page.svelte rename to src/routes/terminal/+page.svelte index bc35031..4f611fd 100644 --- a/src/routes/messages/+page.svelte +++ b/src/routes/terminal/+page.svelte @@ -1,7 +1,8 @@ - + diff --git a/src/routes/wallet/+page.svelte b/src/routes/wallet/+page.svelte index f6bd1a7..7ab317e 100644 --- a/src/routes/wallet/+page.svelte +++ b/src/routes/wallet/+page.svelte @@ -1,7 +1,7 @@ - +