From e4a239bb2c90fba51754608e72b0a6b039c459d2 Mon Sep 17 00:00:00 2001 From: Eli Kogan-Wang Date: Fri, 19 Jul 2024 18:09:48 +0200 Subject: [PATCH] refactor --- frontend/src/lib/Config.svelte | 0 frontend/src/lib/EditStringModal.svelte | 28 ---- frontend/src/lib/History.svelte | 0 frontend/src/lib/Logo.svelte | 12 -- frontend/src/lib/ModuleCard.svelte | 30 ---- frontend/src/lib/Modules.svelte | 0 .../lib/{ => components}/DeployActions.svelte | 5 +- .../lib/{ => components}/DeployModal.svelte | 2 +- .../{ => components}/TableBodyEditCell.svelte | 0 frontend/src/lib/config/ModuleList.svelte | 87 ++++++----- frontend/src/lib/deviceSelectHelper.ts | 89 ----------- frontend/src/lib/modules.ts | 48 ------ .../lib/{ => navbar}/LanguageSelect.svelte | 0 .../src/{routes => lib/navbar}/Navbar.svelte | 7 +- frontend/src/lib/{ => navbar}/UserMenu.svelte | 0 frontend/src/lib/searchParamHelpers.ts | 51 +++++++ frontend/src/lib/{ => sever}/native.ts | 0 .../src/lib/{ => sidebar}/BuildStatus.svelte | 2 +- .../GlobalNavSelect.svelte} | 22 ++- .../{routes => lib/sidebar}/Sidebar.svelte | 24 +-- frontend/src/lib/state.ts | 63 ++++++-- frontend/src/routes/+layout.svelte | 29 +++- frontend/src/routes/+layout.ts | 2 +- .../src/routes/config-overview/+page.svelte | 100 ------------ frontend/src/routes/config/+page.svelte | 142 ++++++++++-------- frontend/src/routes/devices/+page.svelte | 19 ++- .../devices}/CreateDeviceModal.svelte | 8 +- .../devices}/EditTagModal.svelte | 0 .../devices}/InstallationStepper.svelte | 4 +- frontend/src/routes/overview/+page.svelte | 5 +- frontend/src/routes/settings/+page.svelte | 29 ++-- frontend/src/routes/vnc/+page.svelte | 6 +- 32 files changed, 330 insertions(+), 484 deletions(-) delete mode 100644 frontend/src/lib/Config.svelte delete mode 100644 frontend/src/lib/EditStringModal.svelte delete mode 100644 frontend/src/lib/History.svelte delete mode 100644 frontend/src/lib/Logo.svelte delete mode 100644 frontend/src/lib/ModuleCard.svelte delete mode 100644 frontend/src/lib/Modules.svelte rename frontend/src/lib/{ => components}/DeployActions.svelte (89%) rename frontend/src/lib/{ => components}/DeployModal.svelte (92%) rename frontend/src/lib/{ => components}/TableBodyEditCell.svelte (100%) delete mode 100644 frontend/src/lib/deviceSelectHelper.ts delete mode 100644 frontend/src/lib/modules.ts rename frontend/src/lib/{ => navbar}/LanguageSelect.svelte (100%) rename frontend/src/{routes => lib/navbar}/Navbar.svelte (84%) rename frontend/src/lib/{ => navbar}/UserMenu.svelte (100%) create mode 100644 frontend/src/lib/searchParamHelpers.ts rename frontend/src/lib/{ => sever}/native.ts (100%) rename frontend/src/lib/{ => sidebar}/BuildStatus.svelte (98%) rename frontend/src/lib/{DeviceSelect.svelte => sidebar/GlobalNavSelect.svelte} (70%) rename frontend/src/{routes => lib/sidebar}/Sidebar.svelte (90%) delete mode 100644 frontend/src/routes/config-overview/+page.svelte rename frontend/src/{lib => routes/devices}/CreateDeviceModal.svelte (65%) rename frontend/src/{lib => routes/devices}/EditTagModal.svelte (100%) rename frontend/src/{lib => routes/devices}/InstallationStepper.svelte (98%) diff --git a/frontend/src/lib/Config.svelte b/frontend/src/lib/Config.svelte deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/src/lib/EditStringModal.svelte b/frontend/src/lib/EditStringModal.svelte deleted file mode 100644 index 90d85e83..00000000 --- a/frontend/src/lib/EditStringModal.svelte +++ /dev/null @@ -1,28 +0,0 @@ - - - onClose?.()}> - - -
- - -
-
diff --git a/frontend/src/lib/History.svelte b/frontend/src/lib/History.svelte deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/src/lib/Logo.svelte b/frontend/src/lib/Logo.svelte deleted file mode 100644 index 3c485187..00000000 --- a/frontend/src/lib/Logo.svelte +++ /dev/null @@ -1,12 +0,0 @@ - - -Thymis Logo - - diff --git a/frontend/src/lib/ModuleCard.svelte b/frontend/src/lib/ModuleCard.svelte deleted file mode 100644 index 0778145d..00000000 --- a/frontend/src/lib/ModuleCard.svelte +++ /dev/null @@ -1,30 +0,0 @@ - - - -

{module.displayName}

- icon - {#if installed} - - {:else} - - {/if} -
diff --git a/frontend/src/lib/Modules.svelte b/frontend/src/lib/Modules.svelte deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/src/lib/DeployActions.svelte b/frontend/src/lib/components/DeployActions.svelte similarity index 89% rename from frontend/src/lib/DeployActions.svelte rename to frontend/src/lib/components/DeployActions.svelte index c87dc946..7d206085 100644 --- a/frontend/src/lib/DeployActions.svelte +++ b/frontend/src/lib/components/DeployActions.svelte @@ -4,9 +4,8 @@ import GearsSolid from 'svelte-awesome-icons/GearsSolid.svelte'; import ArrowsRotateSolid from 'svelte-awesome-icons/ArrowsRotateSolid.svelte'; import PlaySolid from 'svelte-awesome-icons/PlaySolid.svelte'; - import '../app.postcss'; - import { controllerHost, controllerProtocol } from './api'; - import DeployModal from '$lib/DeployModal.svelte'; + import { controllerHost, controllerProtocol } from '../api'; + import DeployModal from '$lib/components/DeployModal.svelte'; const build = async () => { await fetch(`${controllerProtocol}://${controllerHost}/action/build`, { method: 'POST' }); diff --git a/frontend/src/lib/DeployModal.svelte b/frontend/src/lib/components/DeployModal.svelte similarity index 92% rename from frontend/src/lib/DeployModal.svelte rename to frontend/src/lib/components/DeployModal.svelte index 18948f89..bc0e49fe 100644 --- a/frontend/src/lib/DeployModal.svelte +++ b/frontend/src/lib/components/DeployModal.svelte @@ -1,6 +1,6 @@
-

{target?.displayName}

+

{context?.displayName}

- {#if $selectedTarget?.identifier !== target?.identifier} + {#if $globalNavSelectedTarget?.identifier !== context?.identifier} @@ -60,25 +71,31 @@ {/if}
- {#if target && context} + {#if context && contextType} {#each selfModules as module}
{module.displayName}

{module.displayName}

@@ -86,7 +103,7 @@ {#if canChangeModules} @@ -106,7 +123,7 @@ {#each availableModules as module}