-
diff --git a/src/routes/Control.spec.ts b/src/routes/Control.spec.ts
deleted file mode 100644
index 763e9a3..0000000
--- a/src/routes/Control.spec.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { writable } from 'svelte/store';
-import Control from './Control.svelte';
-import { render } from '@testing-library/svelte';
-import { describe, test, expect, beforeEach } from 'vitest';
-import { addMessages, init, locale } from 'svelte-i18n';
-
-import '$lib/i18n/index.ts';
-import en from '$lib/locales/en.json';
-addMessages('en', en);
-
-describe('Control Component', () => {
- beforeEach(() => {
- init({
- fallbackLocale: 'en',
- initialLocale: 'en'
- });
- locale.set('en');
- });
-
- test('should render the component', () => {
- const host = document.createElement('div');
- document.body.appendChild(host);
- const instance = render(Control, {
- target: host,
- props: { status: writable([]), settings: writable([]) }
- });
- expect(instance).toBeTruthy();
- expect(host.innerHTML).toContain('Control');
- });
-});
diff --git a/src/routes/Control.svelte b/src/routes/Control.svelte
index c4e96c1..23b13c3 100644
--- a/src/routes/Control.svelte
+++ b/src/routes/Control.svelte
@@ -1,254 +1,134 @@
-
- (toastIsOpen = false)}
- >
-
- {toastBody}
-
-
-
-- {#if !$settings.disableLeds} -
LEDs
- -- {/if} - {#if $settings.hasFrontlight && !$settings.flDisable} -
{$_('section.control.frontlight')}
-LEDs
+ - - --
{$_('section.control.firmwareUpdate')}
-+
{ $_('section.control.systemInfo') }
+-
+
- { $_('section.control.version') }: {$settings.gitRev} +
- { $_('section.control.buildTime') }: {new Date(($settings.lastBuildTime * 1000)).toLocaleString()} +
- IP: {$settings.ip} +
- { $_('section.control.hostname') }: {$settings.hostname} +
- {$_('section.firmwareUpdater.latestVersion')}: {latestVersion} - {$_(
- 'section.firmwareUpdater.releaseDate'
- )}: {releaseDate} -
- {$_('section.firmwareUpdater.viewRelease')}
- {#if isNewerVersionAvailable}
- {#if !$status.isOTAUpdating}
- {$_('section.firmwareUpdater.swUpdateAvailable')} -
- {$_('section.firmwareUpdater.autoUpdate')}.
- {:else}
-
Error loading version, try again later.
-{:else} -Loading...
-{/if} -{#if !$status.isOTAUpdating} -
-
- handleFileChange(e, (file) => (firmwareUploadFile = file))}
- name="update"
- class="form-control"
- accept=".bin"
- />
-
-
-
-
-
-
- handleFileChange(e, (file) => (firmwareWebUiFile = file))}
- accept=".bin"
- />
-
-
-
-
-
-
-
-
+
- {#each status.data as char}
- {#if isSplitText(char)}
-
- {:else}
-
-
-
- {:else if char.startsWith('mdi')}
-
- {#if char.split('/').length}
- {char.split('/')[0]}
- {char.split('/')[1]}
- {/if}
-
-
-
- {#if char.endsWith('rocket')}
- 
- {/if}
- {#if char.endsWith('miningpool')}
- Mining Pool Logo
- {/if}
-
- {:else if char === 'STS'}
-
- {/if}
- {#if char.endsWith('miningpool')}
- Mining Pool Logo
- {/if}
- S
- {:else if char.length >= 3}
- {char}
- {:else if char.length === 0 || char === ' '}
- {getCurrencySymbol(char)}
- {/if}
- {/each}
-
+
\ No newline at end of file
diff --git a/src/routes/Settings.spec.ts b/src/routes/Settings.spec.ts
deleted file mode 100644
index 4e1fb07..0000000
--- a/src/routes/Settings.spec.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { writable } from 'svelte/store';
-import Settings from './Settings.svelte';
-import { render } from '@testing-library/svelte';
-import { describe, test, expect, beforeEach } from 'vitest';
-import { addMessages, init, locale } from 'svelte-i18n';
-
-import '$lib/i18n/index.ts';
-import en from '$lib/locales/en.json';
-addMessages('en', en);
-
-describe('Settings Component', () => {
- beforeEach(() => {
- init({
- fallbackLocale: 'en',
- initialLocale: 'en'
- });
- locale.set('en');
- });
-
- test('should render the component', () => {
- locale.set('en');
-
- const host = document.createElement('div');
- document.body.appendChild(host);
- const instance = render(Settings, {
- target: host,
- props: { settings: writable([]) }
- });
- expect(instance).toBeTruthy();
- expect(host.innerHTML).toContain('Settings');
- });
-});
diff --git a/src/routes/Settings.svelte b/src/routes/Settings.svelte
index 16de960..994548a 100644
--- a/src/routes/Settings.svelte
+++ b/src/routes/Settings.svelte
@@ -1,162 +1,209 @@
-
+ {#each status.data as char}
+ {#if isSplitText(char)}
+
+ {:else}
+
+
+ {#each char.split("/") as part}
+
+ {:else if char.length === 0 || char === " "}
+ {part}
+ {/each}
+ {char}
+ {/if}
+ {/each}
+
-
-
- |
-
-
-
-
- Loading...
-
-
- {:else}
-
- {/if}
+ { $_('section.settings.screens') }
+ {#if $settings.screens} + {#each $settings.screens as s} +
- Loading...
-
-
- {:else}
- {#if $settings.screens}
-
- {#each buttonChunks as chunk}
-
- {#each chunk as s}
-
- {/each}
-
- {/each}
-
-
-
- {#each $settings.screens as s}
-
- {/each}
-
-
- {#if $settings.actCurrencies && ($settings.dataSource == DataSourceType.BTCLOCK_SOURCE || $settings.dataSource == DataSourceType.CUSTOM_SOURCE)}
-
-
- {#each $settings.actCurrencies as c}
-
- {/each}
-
-
- {/if}
- - {#if $status.data} -
- - {$_('section.status.doNotDisturb')}: - - {#if $status.dnd?.active}⏵ {$_('on')}{:else}⏸ {$_('off')}{/if} - - {#if $status.dnd?.timeBasedEnabled} - {$_('section.status.timeBasedDnd')} ( {$settings.dnd - .startHour}:{$settings.dnd.startMinute.toString().padStart(2, '0')} - {$settings - .dnd.endHour}:{$settings.dnd.endMinute.toString().padStart(2, '0')} ) - {/if} - - {/if} - {/if} -
- {#if !$settings.disableLeds} -
- {/if} - -
-
- {$_('section.status.memoryFree')}
-
- {Math.round($status.espFreeHeap / 1024)} / {Math.round($status.espHeapSize / 1024)} KiB
-
- - {#if $settings.hasLightLevel} - {$_('section.status.lightSensor')}: {Number(Math.round($status.lightLevel))} lux -
- {/if} - -
-
- {$_('section.status.wifiSignalStrength')}
-
- {$status.rssi} dBm
-
- - {$_('section.status.uptime')}: {toUptimestring($status.espUptime)} -
-
- {#if $settings.dataSource == DataSourceType.NOSTR_SOURCE || $settings.nostrZapNotify}
- {$_('section.status.nostrConnection')}:
-
- {#if $status.connectionStatus && $status.connectionStatus.nostr}
- ✅
- {:else}
- ❌
- {/if}
-
- {/if}
- {#if $settings.dataSource != DataSourceType.NOSTR_SOURCE}
- {#if $settings.dataSource == DataSourceType.THIRD_PARTY_SOURCE}
- {$_('section.status.wsPriceConnection')}:
-
- {#if $status.connectionStatus && $status.connectionStatus.price}
- ✅
- {:else}
- ❌
- {/if}
-
- -
- {$_('section.status.wsMempoolConnection', {
- values: { instance: $settings.mempoolInstance }
- })}:
-
- {#if $status.connectionStatus && $status.connectionStatus.blocks}
- ✅
- {:else}
- ❌
- {/if}
-
- {:else}
- {$_('section.status.wsDataConnection')}:
-
- {#if $status.connectionStatus && $status.connectionStatus.V2}
- ✅
- {:else}
- ❌
- {/if}
-
- {/if}
- {/if}
- {#if $settings.fetchEurPrice}
- {$_('section.status.fetchEuroNote')}
- {/if}
-
+
+ {#each $settings.screens as s}
+
+ {/each}
+
+
+ + {#if $status.data} +
+
+ +
+
+ { $_('section.status.memoryFree') }
+ { Math.round($status.espFreeHeap / 1024) } / { Math.round($status.espHeapSize / 1024) } KiB
+ + { $_('section.status.uptime') }: {toUptimeString($status.espUptime)} +
+
+ { $_('section.status.wsPriceConnection') }:
+
+ {#if $status.connectionStatus && $status.connectionStatus.price}
+ ✅
+ {:else}
+ ❌
+ {/if}
+
+ -
+ { $_('section.status.wsMempoolConnection') }:
+
+ {#if $status.connectionStatus && $status.connectionStatus.blocks}
+ ✅
+ {:else}
+ ❌
+ {/if}
+
+ {#if $settings.fetchEurPrice}
+ { $_('section.status.fetchEuroNote') }
+ {/if}
+