chore: remove unnecessary python action

Reviewed-on: #48

.forgejo/workflows/build.yaml

@@ -39,6 +39,7 @@ jobs:
           submodules: recursive
       - uses: actions/setup-node@v4
         with:
+          token: ${{ secrets.GH_TOKEN }}
           node-version: lts/*
           cache: yarn
           cache-dependency-path: '**/yarn.lock'
@@ -49,9 +50,6 @@ jobs:
             ~/node_modules
             ~/.cache/ms-playwright
           key: ${{ runner.os }}-pio-playwright-${{ hashFiles('**/yarn.lock') }}
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '>=3.10'
       - name: Get current date
         id: dateAndTime
         run: echo "dateAndTime=$(date +'%Y-%m-%d-%H:%M')" >> $GITHUB_OUTPUT
@@ -120,7 +118,7 @@ jobs:
             output/littlefs.bin
       - name: Create release
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        uses: https://code.forgejo.org/actions/forgejo-release@v2.5.1
+        uses: https://code.forgejo.org/actions/forgejo-release@v2.5.3
         with:
           url: 'https://git.btclock.dev/'
           repo: '${{ github.repository }}'

README.md

@@ -1,10 +1,11 @@
 # BTClock WebUI
 
-[![BTClock CI](https://github.com/btclock/webui/actions/workflows/workflow.yml/badge.svg)](https://github.com/btclock/webui2/actions/workflows/workflow.yml)
+[![Latest release](https://git.btclock.dev/btclock/webui/badges/release.svg)](https://git.btclock.dev/btclock/webui/releases/latest)
+[![BTClock CI](https://git.btclock.dev/btclock/webui/badges/workflows/build.yaml/badge.svg)](https://git.btclock.dev/btclock/webui/actions?workflow=build.yaml&actor=0&status=0)
 
 The web user-interface for the BTClock, based on Svelte-kit. It uses Bootstrap for the lay-out.
 
-![Screenshot](doc/screenshot.webp)
+![Screenshot](doc/screenshot-light.webp)
 ![Screenshot Dark](doc/screenshot-dark.webp)
 
 ## Developing

package.json

@@ -5,15 +5,17 @@
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
+		"build:test": "vite build --config vite.config.test.ts",
 		"preview": "vite preview",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
 		"lint": "prettier --check . && eslint .",
 		"format": "prettier --write .",
 		"postinstall": "patch-package",
-		"test": "npm run test:integration && npm run test:unit",
+		"test": "prettier --write . && eslint . && npm run test:integration && npm run test:unit",
 		"test:integration": "playwright test",
 		"test:screenshots": "playwright test -c playwright.screenshot.config.ts",
+		"doc:update-screenshots": "playwright test -c playwright.doc-screenshot.config.ts",
 		"test:unit": "vitest"
 	},
 	"devDependencies": {
@@ -35,6 +37,7 @@
 		"prettier-plugin-svelte": "^3.2.6",
 		"rollup-plugin-visualizer": "^5.12.0",
 		"sass": "^1.79.3",
+		"sharp": "^0.33.5",
 		"svelte": "^4.2.19",
 		"svelte-check": "^4.0.2",
 		"svelte-preprocess": "^6.0.2",
@@ -65,8 +68,6 @@
 	"resolutions": {
 		"es5-ext": ">=0.10.64",
 		"ws": ">=8.18.0",
-		"axios": ">=1.7.7",
 		"micromatch": ">=4.0.8"
-	},
-	"packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
+	}
 }

patches/@sveltejs+kit+2.16.0+001+initial.patch

@@ -1,30 +1,17 @@
 diff --git a/node_modules/@sveltejs/kit/src/exports/vite/index.js b/node_modules/@sveltejs/kit/src/exports/vite/index.js
-index 21bc3d4..eef2db3 100644
+index ddbe746..1d926a4 100644
 --- a/node_modules/@sveltejs/kit/src/exports/vite/index.js
 +++ b/node_modules/@sveltejs/kit/src/exports/vite/index.js
-@@ -648,9 +648,9 @@ async function kit({ svelte_config }) {
+@@ -658,9 +658,9 @@ async function kit({ svelte_config }) {
  							output: {
  								format: inline ? 'iife' : 'esm',
  								name: `__sveltekit_${version_hash}.app`,
 -								entryFileNames: ssr ? '[name].js' : `${prefix}/[name].[hash].${ext}`,
--								chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/chunks/[name].[hash].${ext}`,
+-								chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/chunks/[hash].${ext}`,
 -								assetFileNames: `${prefix}/assets/[name].[hash][extname]`,
 +								entryFileNames: ssr ? '[name].js' : `${prefix}/[hash].${ext}`,
-+								chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/chunks/[hash].${ext}`,
-+								assetFileNames: `${prefix}/assets/[hash][extname]`,
++								chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/c[hash].${ext}`,
++								assetFileNames: `${prefix}/a[hash][extname]`,
  								hoistTransitiveImports: false,
  								sourcemapIgnoreList,
  								manualChunks: split ? undefined : () => 'bundle',
-@@ -665,9 +665,9 @@ async function kit({ svelte_config }) {
- 					worker: {
- 						rollupOptions: {
- 							output: {
--								entryFileNames: `${prefix}/workers/[name]-[hash].js`,
--								chunkFileNames: `${prefix}/workers/chunks/[name]-[hash].js`,
--								assetFileNames: `${prefix}/workers/assets/[name]-[hash][extname]`,
-+								entryFileNames: `${prefix}/workers/[hash].js`,
-+								chunkFileNames: `${prefix}/workers/chunks/[hash].js`,
-+								assetFileNames: `${prefix}/workers/assets/[hash][extname]`,
- 								hoistTransitiveImports: false
- 							}
- 						}

playwright.config.ts

@@ -6,7 +6,7 @@ const config: PlaywrightTestConfig = {
 		timezoneId: 'Europe/Amsterdam'
 	},
 	webServer: {
-		command: 'npm run build && npm run preview',
+		command: 'npm run build:test && npm run preview',
 		port: 4173
 	},
 	reporter: process.env.CI ? 'github' : 'list',

playwright.doc-screenshot.config.ts

@@ -0,0 +1,27 @@
+import { defineConfig } from '@playwright/test';
+
+export default defineConfig({
+	use: {
+		locale: 'en-GB',
+		timezoneId: 'Europe/Amsterdam'
+	},
+	webServer: {
+		command: 'yarn build && yarn preview',
+		port: 4173
+	},
+	testDir: './tests/doc-screenshots',
+	outputDir: './test-results/screenshots',
+	projects: [
+		{
+			name: 'Light Mode',
+			use: {
+				viewport: { width: 1440, height: 900 },
+				colorScheme: 'light'
+			}
+		},
+		{
+			name: 'Dark Mode',
+			use: { viewport: { width: 1440, height: 900 }, colorScheme: 'dark' }
+		}
+	]
+});

playwright.screenshot.config.ts

@@ -54,6 +54,14 @@ export default defineConfig({
 		{
 			name: 'MacBook Pro 14 inch Safari',
 			use: { ...devices['Desktop Safari'], viewport: { width: 1512, height: 982 } }
+		},
+		{
+			name: 'MacBook Pro 14 inch Safari Dark Mode',
+			use: {
+				...devices['Desktop Safari'],
+				viewport: { width: 1512, height: 982 },
+				colorScheme: 'dark'
+			}
 		}
 	]
 });

src/lib/components/Placeholder.svelte

@@ -0,0 +1,11 @@
+<script lang="ts">
+	export let value: unknown;
+	export let checkValue: unknown = null;
+	export let width: number = 25;
+
+	$: valueToCheck = checkValue === null ? value : checkValue;
+</script>
+
+<span class:placeholder={!valueToCheck} class={!valueToCheck ? `w-${width}` : ''}>
+	{valueToCheck ? value : ''}
+</span>

src/lib/components/index.ts

@@ -3,3 +3,4 @@ export { default as SettingsInput } from './SettingsInput.svelte';
 export { default as SettingsSelect } from './SettingsSelect.svelte';
 export { default as ToggleHeader } from './ToggleHeader.svelte';
 export { default as ColorSchemeSwitcher } from './ColorSchemeSwitcher.svelte';
+export { default as Placeholder } from './Placeholder.svelte';

src/lib/components/settings/DataSourceSettings.svelte

@@ -0,0 +1,142 @@
+<script lang="ts">
+	import { SettingsInput, SettingsSwitch } from '$lib/components';
+	import { _ } from 'svelte-i18n';
+	import { Row, Col, FormGroup, Input, InputGroupText } from '@sveltestrap/sveltestrap';
+	import ToggleHeader from '../ToggleHeader.svelte';
+	import { uiSettings } from '$lib/uiSettings';
+	import { isValidHexPubKey, getPubKey, isValidNpub } from '$lib';
+	import { createEventDispatcher } from 'svelte';
+	import { DataSourceType } from '$lib/types/dataSource';
+
+	const dispatch = createEventDispatcher();
+	export let settings;
+	export let isOpen = false;
+
+	const checkValidNostrPubkey = (key: string) => {
+		$settings[key] = $settings[key].trim();
+		if (isValidNpub($settings[key])) {
+			dispatch('showToast', {
+				color: 'info',
+				text: $_('section.settings.convertingValidNpub')
+			});
+		}
+
+		let ret = getPubKey($settings[key]);
+		if (ret) $settings[key] = ret;
+	};
+</script>
+
+<Row>
+	<ToggleHeader header={$_('section.settings.section.dataSource')} bind:isOpen defaultOpen={false}>
+		<Row>
+			<Col>
+				<h5>Data Source</h5>
+				<FormGroup>
+					<Row>
+						<Col xs="12" xl="6" class="mb-2">
+							<Input
+								type="radio"
+								id="btclock_source"
+								name="dataSource"
+								bind:group={$settings.dataSource}
+								value={DataSourceType.BTCLOCK_SOURCE}
+								label={$_('section.settings.dataSource.btclock')}
+							/>
+						</Col>
+						<Col xs="12" xl="6" class="mb-2">
+							<Input
+								type="radio"
+								id="third_party_source"
+								name="dataSource"
+								bind:group={$settings.dataSource}
+								value={DataSourceType.THIRD_PARTY_SOURCE}
+								label={$_('section.settings.dataSource.thirdParty')}
+							/>
+						</Col>
+						{#if $settings.nostrRelay}
+							<Col xs="12" xl="6" class="mb-2">
+								<Input
+									type="radio"
+									id="nostr_source"
+									name="dataSource"
+									bind:group={$settings.dataSource}
+									value={DataSourceType.NOSTR_SOURCE}
+									label={$_('section.settings.dataSource.nostr')}
+								/>
+							</Col>
+						{/if}
+						<Col xs="12" xl="6" class="mb-2">
+							<Input
+								type="radio"
+								id="custom_source"
+								name="dataSource"
+								bind:group={$settings.dataSource}
+								value={DataSourceType.CUSTOM_SOURCE}
+								label={$_('section.settings.dataSource.custom')}
+							/>
+						</Col>
+					</Row>
+				</FormGroup>
+			</Col>
+		</Row>
+
+		{#if $settings.dataSource === DataSourceType.THIRD_PARTY_SOURCE}
+			<SettingsInput
+				id="mempoolInstance"
+				label={$_('section.settings.mempoolnstance')}
+				bind:value={$settings.mempoolInstance}
+				required={true}
+				size={$uiSettings.inputSize}
+			>
+				<InputGroupText>
+					<Input
+						type="checkbox"
+						bind:checked={$settings.mempoolSecure}
+						bsSize={$uiSettings.inputSize}
+					/>
+					HTTPS
+				</InputGroupText>
+			</SettingsInput>
+		{/if}
+
+		{#if $settings.dataSource === DataSourceType.NOSTR_SOURCE}
+			<SettingsInput
+				id="nostrRelay"
+				label={$_('section.settings.nostrRelay')}
+				bind:value={$settings.nostrRelay}
+				required={true}
+				size={$uiSettings.inputSize}
+			/>
+			<SettingsInput
+				id="nostrPubKey"
+				label={$_('section.settings.nostrPubKey')}
+				bind:value={$settings.nostrPubKey}
+				required={true}
+				minlength="64"
+				invalid={!isValidHexPubKey($settings.nostrPubKey)}
+				helpText={!isValidHexPubKey($settings.nostrPubKey)
+					? $_('section.settings.invalidNostrPubkey')
+					: undefined}
+				size={$uiSettings.inputSize}
+				onChange={() => checkValidNostrPubkey('nostrPubKey')}
+				onInput={() => checkValidNostrPubkey('nostrPubKey')}
+			/>
+		{/if}
+
+		{#if $settings.dataSource === DataSourceType.CUSTOM_SOURCE}
+			<SettingsInput
+				id="ceEndpoint"
+				label={$_('section.settings.ceEndpoint')}
+				bind:value={$settings.ceEndpoint}
+				required={true}
+				size={$uiSettings.inputSize}
+			/>
+			<SettingsSwitch
+				id="ceDisableSSL"
+				bind:checked={$settings.ceDisableSSL}
+				label={$_('section.settings.ceDisableSSL')}
+				size={$uiSettings.inputSize}
+			/>
+		{/if}
+	</ToggleHeader>
+</Row>

src/lib/components/settings/DisplaySettings.svelte

@@ -0,0 +1,204 @@
+<script lang="ts">
+	import { SettingsInput, SettingsSwitch, SettingsSelect } from '$lib/components';
+	import { _ } from 'svelte-i18n';
+	import { Row } from '@sveltestrap/sveltestrap';
+	import ToggleHeader from '../ToggleHeader.svelte';
+	import { uiSettings } from '$lib/uiSettings';
+	import { PUBLIC_BASE_URL } from '$lib/config';
+
+	export let settings;
+	export let isOpen = false;
+
+	const onFlBrightnessChange = async () => {
+		await fetch(`${PUBLIC_BASE_URL}/api/frontlight/brightness/${$settings.flMaxBrightness}`, {
+			method: 'GET',
+			headers: {
+				'Content-Type': 'application/json'
+			}
+		});
+	};
+
+	const setTextColor = () => {
+		$settings.invertedColor = !$settings.invertedColor;
+	};
+
+	const textColorOptions: [string, boolean][] = [
+		[$_('colors.black') + ' on ' + $_('colors.white'), false],
+		[$_('colors.white') + ' on ' + $_('colors.black'), true]
+	];
+
+	const fontPreferenceOptions: [string, string][] = $settings.availableFonts?.map((font) => [
+		$_(`fonts.${font}`) !== `fonts.${font}`
+			? $_(`fonts.${font}`)
+			: font.charAt(0).toUpperCase() + font.slice(1),
+		font
+	]);
+</script>
+
+<Row>
+	<ToggleHeader
+		header={$_('section.settings.section.displaysAndLed')}
+		bind:isOpen
+		defaultOpen={false}
+	>
+		<SettingsSelect
+			id="textColor"
+			label={$_('section.settings.textColor')}
+			bind:value={$settings.invertedColor}
+			options={textColorOptions}
+			size={$uiSettings.inputSize}
+			on:change={setTextColor}
+		/>
+
+		<SettingsSelect
+			id="fontName"
+			label={$_('section.settings.fontName')}
+			bind:value={$settings.fontName}
+			options={fontPreferenceOptions}
+			size={$uiSettings.inputSize}
+		/>
+
+		<SettingsInput
+			id="timePerScreen"
+			label={$_('section.settings.timePerScreen')}
+			bind:value={$settings.timePerScreen}
+			type="number"
+			min={1}
+			step={1}
+			required={true}
+			suffix={$_('time.minutes')}
+			size={$uiSettings.inputSize}
+		/>
+
+		<SettingsInput
+			id="fullRefreshMin"
+			label={$_('section.settings.fullRefreshEvery')}
+			bind:value={$settings.fullRefreshMin}
+			type="number"
+			min={1}
+			step={1}
+			required={true}
+			suffix={$_('time.minutes')}
+			size={$uiSettings.inputSize}
+		/>
+
+		<SettingsInput
+			id="minSecPriceUpd"
+			label={$_('section.settings.timeBetweenPriceUpdates')}
+			bind:value={$settings.minSecPriceUpd}
+			type="number"
+			min={1}
+			step={1}
+			suffix={$_('time.seconds')}
+			helpText={$_('section.settings.shortAmountsWarning')}
+			size={$uiSettings.inputSize}
+		/>
+
+		<SettingsInput
+			id="ledBrightness"
+			label={$_('section.settings.ledBrightness')}
+			bind:value={$settings.ledBrightness}
+			type="range"
+			min={0}
+			max={255}
+			step={1}
+			size={$uiSettings.inputSize}
+		/>
+
+		{#if $settings.hasFrontlight && !$settings.flDisable}
+			<SettingsInput
+				id="flMaxBrightness"
+				label={$_('section.settings.flMaxBrightness')}
+				bind:value={$settings.flMaxBrightness}
+				type="range"
+				min={0}
+				max={4095}
+				step={1}
+				size={$uiSettings.inputSize}
+				onChange={onFlBrightnessChange}
+			/>
+
+			<SettingsInput
+				id="flEffectDelay"
+				label={$_('section.settings.flEffectDelay')}
+				bind:value={$settings.flEffectDelay}
+				type="range"
+				min={5}
+				max={300}
+				step={1}
+				size={$uiSettings.inputSize}
+			/>
+		{/if}
+
+		{#if !$settings.flDisable && $settings.hasLightLevel}
+			<SettingsInput
+				id="luxLightToggle"
+				label={`${$_('section.settings.luxLightToggle')} (${$settings.luxLightToggle})`}
+				bind:value={$settings.luxLightToggle}
+				type="range"
+				min={0}
+				max={1000}
+				step={1}
+				helpText={$_('section.settings.luxLightToggleText')}
+				size={$uiSettings.inputSize}
+			/>
+		{/if}
+
+		<Row>
+			<SettingsSwitch
+				id="ledTestOnPower"
+				bind:checked={$settings.ledTestOnPower}
+				label={$_('section.settings.ledPowerOnTest')}
+				size={$uiSettings.inputSize}
+			/>
+
+			<SettingsSwitch
+				id="ledFlashOnUpd"
+				bind:checked={$settings.ledFlashOnUpd}
+				label={$_('section.settings.ledFlashOnBlock')}
+				size={$uiSettings.inputSize}
+			/>
+
+			<SettingsSwitch
+				id="disableLeds"
+				bind:checked={$settings.disableLeds}
+				label={$_('section.settings.disableLeds')}
+				size={$uiSettings.inputSize}
+			/>
+
+			{#if $settings.hasFrontlight}
+				<SettingsSwitch
+					id="flDisable"
+					bind:checked={$settings.flDisable}
+					label={$_('section.settings.flDisable')}
+					size={$uiSettings.inputSize}
+				/>
+			{/if}
+
+			{#if $settings.hasFrontlight && !$settings.flDisable}
+				<SettingsSwitch
+					id="flAlwaysOn"
+					bind:checked={$settings.flAlwaysOn}
+					label={$_('section.settings.flAlwaysOn')}
+					size={$uiSettings.inputSize}
+				/>
+
+				<SettingsSwitch
+					id="flFlashOnUpd"
+					bind:checked={$settings.flFlashOnUpd}
+					label={$_('section.settings.flFlashOnUpd')}
+					size={$uiSettings.inputSize}
+				/>
+
+				{#if $settings.hasLightLevel}
+					<SettingsSwitch
+						id="flOffWhenDark"
+						bind:checked={$settings.flOffWhenDark}
+						label={$_('section.settings.flOffWhenDark')}
+						size={$uiSettings.inputSize}
+					/>
+				{/if}
+			{/if}
+		</Row>
+	</ToggleHeader>
+</Row>

src/lib/components/settings/ExtraFeaturesSettings.svelte

@@ -0,0 +1,307 @@
+<script lang="ts">
+	import { SettingsInput, SettingsSwitch, SettingsSelect } from '$lib/components';
+	import { _ } from 'svelte-i18n';
+	import { Row, Button, Col } from '@sveltestrap/sveltestrap';
+	import ToggleHeader from '../ToggleHeader.svelte';
+	import { uiSettings } from '$lib/uiSettings';
+	import { isValidHexPubKey, getPubKey, isValidNpub } from '$lib';
+	import { createEventDispatcher } from 'svelte';
+
+	const dispatch = createEventDispatcher();
+	export let settings;
+	export let isOpen = false;
+	export let miningPoolMap: Map<string, string>;
+
+	let validBitaxe = false;
+	let validLocalPool = false;
+	const testBitaxe = async () => {
+		try {
+			const response = await fetch(`http://${$settings.bitaxeHostname}/api/system/info`);
+
+			if (!response.ok) {
+				dispatch('showToast', {
+					color: 'danger',
+					text: `Failed to connect to BitAxe HTTP error! status: ${response.status}`
+				});
+				validBitaxe = false;
+				throw new Error();
+			}
+
+			const systemInfo = await response.json();
+			dispatch('showToast', {
+				color: 'success',
+				text: `Connected to BitAxe ${systemInfo.ASICModel} (Board version ${systemInfo.boardVersion}) running firmware ${systemInfo.version}.\r\nCurrent hashrate ${Math.round(systemInfo.hashRate)} GH/s`
+			});
+			validBitaxe = true;
+		} catch (error) {
+			if (error instanceof TypeError && error.message.includes('Failed to fetch')) {
+				dispatch('showToast', {
+					color: 'danger',
+					text: `Failed to connect to BitAxe, make sure you are connected to the same network.`
+				});
+			}
+			console.error('Failed to fetch Bitaxe system info:', error);
+			validBitaxe = false;
+		}
+	};
+
+	const checkValidNostrPubkey = (key: string) => {
+		$settings[key] = $settings[key].trim();
+		if (isValidNpub($settings[key])) {
+			dispatch('showToast', {
+				color: 'info',
+				text: $_('section.settings.convertingValidNpub')
+			});
+		}
+
+		let ret = getPubKey($settings[key]);
+		if (ret) $settings[key] = ret;
+	};
+
+	$: poolOptions = ($settings.availablePools || []).map((pool: string): [string, string] => [
+		miningPoolMap.get(pool) || pool,
+		pool
+	]);
+
+	const testLocalPool = async () => {
+		try {
+			const controller = new AbortController();
+			const timeoutId = setTimeout(() => controller.abort(), 1000);
+
+			const response = await fetch(
+				`http://${$settings.localPoolEndpoint}/api/client/${$settings.miningPoolUser}`,
+				{ signal: controller.signal }
+			);
+			clearTimeout(timeoutId);
+
+			if (!response.ok) {
+				dispatch('showToast', {
+					color: 'danger',
+					text: `Failed to connect to local pool! status: ${response.status}`
+				});
+				validLocalPool = false;
+				throw new Error();
+			}
+
+			const poolInfo = await response.json();
+			dispatch('showToast', {
+				color: 'success',
+				text: `Can connect to local public pool, ${poolInfo.workersCount} workers`
+			});
+			validLocalPool = true;
+		} catch (error) {
+			if (error.name === 'AbortError') {
+				dispatch('showToast', {
+					color: 'danger',
+					text: `Connection to local pool timed out after 1 second`
+				});
+			} else {
+				dispatch('showToast', {
+					color: 'danger',
+					text: `Failed to connect to local pool, check the endpoint and make sure you are connected to the same network.`
+				});
+			}
+			console.error('Failed to fetch local pool info:', error);
+			validLocalPool = false;
+		}
+	};
+</script>
+
+<Row>
+	<ToggleHeader
+		header={$_('section.settings.section.extraFeatures')}
+		bind:isOpen
+		defaultOpen={false}
+	>
+		<!--- Time based do not disturb settings -->
+		<SettingsSwitch
+			id="timeBasedDnd"
+			label={$_('section.settings.timeBasedDnd')}
+			bind:checked={$settings.dnd.timeBasedEnabled}
+			size={$uiSettings.inputSize}
+		/>
+		{#if $settings.dnd.timeBasedEnabled}
+			<Row>
+				<Col>
+					<SettingsInput
+						id="dndStartHour"
+						type="number"
+						min="0"
+						max="23"
+						label={$_('section.settings.dndStartHour')}
+						bind:value={$settings.dnd.startHour}
+						size={$uiSettings.inputSize}
+					/>
+				</Col>
+				<Col>
+					<SettingsInput
+						id="dndStartMinute"
+						type="number"
+						min="0"
+						max="59"
+						label={$_('section.settings.dndStartMinute')}
+						bind:value={$settings.dnd.startMinute}
+						size={$uiSettings.inputSize}
+					/>
+				</Col>
+			</Row>
+			<Row>
+				<Col>
+					<SettingsInput
+						id="dndEndHour"
+						type="number"
+						min="0"
+						max="23"
+						label={$_('section.settings.dndEndHour')}
+						bind:value={$settings.dnd.endHour}
+						size={$uiSettings.inputSize}
+					/>
+				</Col>
+				<Col>
+					<SettingsInput
+						id="dndEndMinute"
+						type="number"
+						min="0"
+						max="59"
+						label={$_('section.settings.dndEndMinute')}
+						bind:value={$settings.dnd.endMinute}
+						size={$uiSettings.inputSize}
+					/>
+				</Col>
+			</Row>
+		{/if}
+
+		<!-- BitAxe Settings -->
+		{#if 'bitaxeEnabled' in $settings}
+			<Row class="mb-3">
+				<Col>
+					<h5>BitAxe</h5>
+					<SettingsSwitch
+						id="bitaxeEnabled"
+						bind:checked={$settings.bitaxeEnabled}
+						label="{$_('section.settings.bitaxeEnabled')} ({$_('restartRequired')})"
+						size={$uiSettings.inputSize}
+						col={{ md: '12', xl: '12', xxl: '12' }}
+					/>
+					{#if $settings.bitaxeEnabled}
+						<SettingsInput
+							id="bitaxeHostname"
+							label={$_('section.settings.bitaxeHostname')}
+							bind:value={$settings.bitaxeHostname}
+							required={true}
+							valid={validBitaxe}
+							size={$uiSettings.inputSize}
+						>
+							<Button type="button" color="success" on:click={testBitaxe}>
+								{$_('test', { default: 'Test' })}
+							</Button>
+						</SettingsInput>
+					{/if}
+				</Col>
+			</Row>
+		{/if}
+
+		<!-- Mining Pool Settings -->
+		{#if 'miningPoolStats' in $settings}
+			<Row class="mb-3">
+				<Col>
+					<h5>Mining Pool stats</h5>
+					<SettingsSwitch
+						id="miningPoolStats"
+						bind:checked={$settings.miningPoolStats}
+						label="{$_('section.settings.miningPoolStats')} ({$_('restartRequired')})"
+						size={$uiSettings.inputSize}
+						col={{ md: '12', xl: '12', xxl: '12' }}
+					/>
+					{#if $settings.miningPoolStats}
+						<SettingsSelect
+							id="miningPoolName"
+							label={$_('section.settings.miningPoolName')}
+							bind:value={$settings.miningPoolName}
+							options={poolOptions}
+							size={$uiSettings.inputSize}
+							selectClass={$uiSettings.selectClass}
+						/>
+						{#if $settings.miningPoolName === 'local_public_pool'}
+							<SettingsInput
+								id="localPoolEndpoint"
+								label={$_('section.settings.localPoolEndpoint', { default: 'Local Pool Endpoint' })}
+								bind:value={$settings.localPoolEndpoint}
+								placeholder="umbrel.local:2019"
+								required={true}
+								valid={validLocalPool}
+								size={$uiSettings.inputSize}
+							>
+								<Button type="button" color="success" on:click={testLocalPool}>
+									{$_('test', { default: 'Test' })}
+								</Button>
+							</SettingsInput>
+						{/if}
+						<SettingsInput
+							id="miningPoolUser"
+							label={$_('section.settings.miningPoolUser')}
+							bind:value={$settings.miningPoolUser}
+							required={true}
+							size={$uiSettings.inputSize}
+						/>
+					{/if}
+				</Col>
+			</Row>
+		{/if}
+
+		<!-- Nostr Settings -->
+		{#if 'nostrZapNotify' in $settings}
+			<Row class="mb-3">
+				<Col>
+					<h5>Nostr</h5>
+					<SettingsInput
+						id="nostrRelay"
+						label={$_('section.settings.nostrRelay')}
+						bind:value={$settings.nostrRelay}
+						required={true}
+						size={$uiSettings.inputSize}
+					/>
+					<SettingsSwitch
+						id="nostrZapNotify"
+						bind:checked={$settings.nostrZapNotify}
+						label="{$_('section.settings.nostrZapNotify')} ({$_('restartRequired')})"
+						size={$uiSettings.inputSize}
+						col={{ md: '12', xl: '12', xxl: '12' }}
+					/>
+					{#if $settings.nostrZapNotify}
+						<Row>
+							<SettingsSwitch
+								id="ledFlashOnZap"
+								bind:checked={$settings.ledFlashOnZap}
+								label={$_('section.settings.ledFlashOnZap')}
+								size={$uiSettings.inputSize}
+							/>
+							{#if $settings.hasFrontlight && !$settings.flDisable}
+								<SettingsSwitch
+									id="flFlashOnZap"
+									bind:checked={$settings.flFlashOnZap}
+									label={$_('section.settings.flFlashOnZap')}
+									size={$uiSettings.inputSize}
+								/>
+							{/if}
+						</Row>
+						<SettingsInput
+							id="nostrZapPubkey"
+							label={$_('section.settings.nostrZapPubkey')}
+							bind:value={$settings.nostrZapPubkey}
+							required={true}
+							minlength="64"
+							invalid={!isValidHexPubKey($settings.nostrZapPubkey)}
+							helpText={!isValidHexPubKey($settings.nostrZapPubkey)
+								? $_('section.settings.invalidNostrPubkey')
+								: undefined}
+							size={$uiSettings.inputSize}
+							onChange={() => checkValidNostrPubkey('nostrZapPubkey')}
+							onInput={() => checkValidNostrPubkey('nostrZapPubkey')}
+						/>
+					{/if}
+				</Col>
+			</Row>
+		{/if}
+	</ToggleHeader>
+</Row>

src/lib/components/settings/ScreenSpecificSettings.svelte

@@ -0,0 +1,126 @@
+<script lang="ts">
+	import { SettingsSwitch } from '$lib/components';
+	import { _ } from 'svelte-i18n';
+	import { Row, Col } from '@sveltestrap/sveltestrap';
+	import ToggleHeader from '../ToggleHeader.svelte';
+	import { uiSettings } from '$lib/uiSettings';
+	import { DataSourceType } from '$lib/types/dataSource';
+
+	export let settings;
+	export let isOpen = false;
+</script>
+
+<Row>
+	<ToggleHeader
+		header={$_('section.settings.section.screenSettings')}
+		bind:isOpen
+		defaultOpen={true}
+	>
+		<Row>
+			<SettingsSwitch
+				id="stealFocus"
+				bind:checked={$settings.stealFocus}
+				label={$_('section.settings.StealFocusOnNewBlock')}
+				size={$uiSettings.inputSize}
+				col={{ md: '6', xl: '12', xxl: '6' }}
+			/>
+			<SettingsSwitch
+				id="mcapBigChar"
+				bind:checked={$settings.mcapBigChar}
+				label={$_('section.settings.useBigCharsMcap')}
+				size={$uiSettings.inputSize}
+				col={{ md: '6', xl: '12', xxl: '6' }}
+			/>
+			<SettingsSwitch
+				id="useBlkCountdown"
+				bind:checked={$settings.useBlkCountdown}
+				label={$_('section.settings.useBlkCountdown')}
+				size={$uiSettings.inputSize}
+				col={{ md: '6', xl: '12', xxl: '6' }}
+			/>
+			<SettingsSwitch
+				id="useSatsSymbol"
+				bind:checked={$settings.useSatsSymbol}
+				label={$_('section.settings.useSatsSymbol')}
+				size={$uiSettings.inputSize}
+				col={{ md: '6', xl: '12', xxl: '6' }}
+			/>
+			<SettingsSwitch
+				id="suffixPrice"
+				bind:checked={$settings.suffixPrice}
+				label={$_('section.settings.suffixPrice')}
+				size={$uiSettings.inputSize}
+				col={{ md: '6', xl: '12', xxl: '6' }}
+			/>
+			<SettingsSwitch
+				id="mowMode"
+				bind:checked={$settings.mowMode}
+				label={$_('section.settings.mowMode')}
+				size={$uiSettings.inputSize}
+				col={{ md: '6', xl: '12', xxl: '6' }}
+				disabled={!$settings.suffixPrice}
+			/>
+			<SettingsSwitch
+				id="suffixShareDot"
+				bind:checked={$settings.suffixShareDot}
+				label={$_('section.settings.suffixShareDot')}
+				size={$uiSettings.inputSize}
+				col={{ md: '6', xl: '12', xxl: '6' }}
+				disabled={!$settings.suffixPrice}
+			/>
+			<SettingsSwitch
+				id="verticalDesc"
+				bind:checked={$settings.verticalDesc}
+				label={$_('section.settings.verticalDesc')}
+				size={$uiSettings.inputSize}
+				col={{ md: '6', xl: '12', xxl: '6' }}
+			/>
+
+			{#if !$settings.actCurrencies}
+				<SettingsSwitch
+					id="fetchEurPrice"
+					bind:checked={$settings.fetchEurPrice}
+					label="{$_('section.settings.fetchEuroPrice')} ({$_('restartRequired')})"
+					size={$uiSettings.inputSize}
+					col={{ md: '6', xl: '12', xxl: '6' }}
+				/>
+			{/if}
+		</Row>
+		<Row>
+			<h5>{$_('section.settings.screens')}</h5>
+			{#if $settings.screens}
+				{#each $settings.screens as s}
+					<SettingsSwitch
+						id="screens_{s.id}"
+						bind:checked={s.enabled}
+						label={s.name}
+						size={$uiSettings.inputSize}
+						col={{ md: '6', xl: '12', xxl: '6' }}
+					/>
+				{/each}
+			{/if}
+		</Row>
+		{#if $settings.actCurrencies && $settings.dataSource == DataSourceType.BTCLOCK_SOURCE}
+			<Row>
+				<h5>{$_('section.settings.currencies')}</h5>
+				<small>{$_('restartRequired')}</small>
+				{#if $settings.availableCurrencies}
+					{#each $settings.availableCurrencies as c}
+						<Col md="6" xl="12" xxl="6">
+							<div class="form-check form-control-{$uiSettings.inputSize}">
+								<input
+									id="currency_{c}"
+									bind:group={$settings.actCurrencies}
+									value={c}
+									type="checkbox"
+									class="form-check-input"
+								/>
+								<label class="form-check-label" for="currency_{c}">{c}</label>
+							</div>
+						</Col>
+					{/each}
+				{/if}
+			</Row>
+		{/if}
+	</ToggleHeader>
+</Row>

src/lib/components/settings/SystemSettings.svelte

@@ -0,0 +1,113 @@
+<script lang="ts">
+	import { SettingsInput, SettingsSwitch } from '$lib/components';
+	import { _ } from 'svelte-i18n';
+	import { Row, Button } from '@sveltestrap/sveltestrap';
+	import ToggleHeader from '../ToggleHeader.svelte';
+	import { uiSettings } from '$lib/uiSettings';
+	import EyeIcon from 'svelte-bootstrap-icons/lib/Eye.svelte';
+	import EyeSlashIcon from 'svelte-bootstrap-icons/lib/EyeSlash.svelte';
+
+	export let settings;
+	export let isOpen = false;
+
+	let showPassword = false;
+
+	const getTzOffsetFromSystem = () => {
+		const dt = new Date();
+		let diffTZ = dt.getTimezoneOffset();
+		$settings.tzOffset = diffTZ * -1;
+	};
+</script>
+
+<Row>
+	<ToggleHeader header={$_('section.settings.section.system')} bind:isOpen defaultOpen={false}>
+		<SettingsInput
+			id="tzOffset"
+			label={$_('section.settings.timezoneOffset')}
+			bind:value={$settings.tzOffset}
+			type="number"
+			step={1}
+			required={true}
+			suffix={$_('time.minutes')}
+			helpText={$_('section.settings.tzOffsetHelpText')}
+			size={$uiSettings.inputSize}
+		>
+			<Button type="button" color="info" on:click={getTzOffsetFromSystem}>
+				{$_('auto-detect')}
+			</Button>
+		</SettingsInput>
+
+		{#if $settings.httpAuthEnabled}
+			<SettingsInput
+				id="httpAuthUser"
+				label={$_('section.settings.httpAuthUser')}
+				bind:value={$settings.httpAuthUser}
+				required={true}
+				size={$uiSettings.inputSize}
+			/>
+			<SettingsInput
+				id="httpAuthPass"
+				label={$_('section.settings.httpAuthPass')}
+				bind:value={$settings.httpAuthPass}
+				type={showPassword ? 'text' : 'password'}
+				required={true}
+				size={$uiSettings.inputSize}
+			>
+				<Button
+					type="button"
+					on:click={() => (showPassword = !showPassword)}
+					color={showPassword ? 'success' : 'danger'}
+				>
+					{#if !showPassword}<EyeIcon />{:else}<EyeSlashIcon />{/if}
+				</Button>
+			</SettingsInput>
+		{/if}
+
+		<SettingsInput
+			id="hostnamePrefix"
+			label={$_('section.settings.hostnamePrefix')}
+			bind:value={$settings.hostnamePrefix}
+			required={true}
+			size={$uiSettings.inputSize}
+		/>
+
+		<SettingsInput
+			id="wpTimeout"
+			label={$_('section.settings.wpTimeout')}
+			bind:value={$settings.wpTimeout}
+			type="number"
+			min={1}
+			step={1}
+			required={true}
+			suffix={$_('time.seconds')}
+			size={$uiSettings.inputSize}
+		/>
+
+		<Row>
+			<SettingsSwitch
+				id="otaEnabled"
+				bind:checked={$settings.otaEnabled}
+				label="{$_('section.settings.otaUpdates')} ({$_('restartRequired')})"
+				size={$uiSettings.inputSize}
+			/>
+			<SettingsSwitch
+				id="mdnsEnabled"
+				bind:checked={$settings.mdnsEnabled}
+				label="{$_('section.settings.enableMdns')} ({$_('restartRequired')})"
+				size={$uiSettings.inputSize}
+			/>
+			<SettingsSwitch
+				id="httpAuthEnabled"
+				bind:checked={$settings.httpAuthEnabled}
+				label="{$_('section.settings.httpAuthEnabled')} ({$_('restartRequired')})"
+				size={$uiSettings.inputSize}
+			/>
+			<SettingsSwitch
+				id="enableDebugLog"
+				bind:checked={$settings.enableDebugLog}
+				label="{$_('section.settings.enableDebugLog')} ({$_('restartRequired')})"
+				size={$uiSettings.inputSize}
+			/>
+		</Row>
+	</ToggleHeader>
+</Row>

src/lib/components/settings/index.ts

@@ -0,0 +1,5 @@
+export { default as ScreenSpecificSettings } from './ScreenSpecificSettings.svelte';
+export { default as DisplaySettings } from './DisplaySettings.svelte';
+export { default as DataSourceSettings } from './DataSourceSettings.svelte';
+export { default as ExtraFeaturesSettings } from './ExtraFeaturesSettings.svelte';
+export { default as SystemSettings } from './SystemSettings.svelte';

src/lib/locales/de.json

@@ -30,7 +30,7 @@
 			"wifiTxPower": "WiFi-TX-Leistung",
 			"settingsSaved": "Einstellungen gespeichert",
 			"errorSavingSettings": "Fehler beim Speichern der Einstellungen",
-			"ownDataSource": "BTClock-Datenquelle verwenden",
+			"ownDataSource": "BTClock-Datenquelle",
 			"flAlwaysOn": "Displaybeleuchtung immer an",
 			"flEffectDelay": "Displaybeleuchtungeffekt Geschwindigkeit",
 			"flFlashOnUpd": "Displaybeleuchting bei neuem Block",
@@ -58,7 +58,22 @@
 			"hideAll": "Alles ausblenden",
 			"flOffWhenDark": "Displaybeleuchtung aus, wenn es dunkel ist",
 			"luxLightToggleText": "Zum Deaktivieren auf 0 setzen",
-			"verticalDesc": "Vrtikale Bildschirmbeschreibung"
+			"verticalDesc": "Vrtikale Bildschirmbeschreibung",
+			"enableDebugLog": "Debug-Protokoll aktivieren",
+			"bitaxeEnabled": "BitAxe-Integration aktivieren",
+			"miningPoolStats": "Mining-Pool-Statistiken Integration Aktivieren",
+			"nostrZapNotify": "Nostr Zap-Benachrichtigungen aktivieren",
+			"thirdPartySource": "mempool.space/coincap.io Verwenden",
+			"dataSource": {
+				"nostr": "Nostr-Verlag",
+				"custom": "Benutzerdefinierter dataquelle"
+			},
+			"fontName": "Schriftart",
+			"timeBasedDnd": "Aktivieren Sie den Zeitplan „Bitte nicht stören“.",
+			"dndStartHour": "Startstunde",
+			"dndStartMinute": "Startminute",
+			"dndEndHour": "Endstunde",
+			"dndEndMinute": "Schlussminute"
 		},
 		"control": {
 			"systemInfo": "Systeminfo",
@@ -86,7 +101,9 @@
 			"wifiSignalStrength": "WiFi-Signalstärke",
 			"wsDataConnection": "BTClock-Datenquelle verbindung",
 			"lightSensor": "Lichtsensor",
-			"nostrConnection": "Nostr Relay-Verbindung"
+			"nostrConnection": "Nostr Relay-Verbindung",
+			"doNotDisturb": "Bitte nicht stören",
+			"timeBasedDnd": "Zeitbasierter Zeitplan"
 		},
 		"firmwareUpdater": {
 			"fileUploadSuccess": "Datei erfolgreich hochgeladen, Gerät neu gestartet. WebUI in {countdown} Sekunden neu geladen",
@@ -98,7 +115,8 @@
 			"latestVersion": "Letzte Version",
 			"releaseDate": "Veröffentlichungsdatum",
 			"viewRelease": "Veröffentlichung anzeigen",
-			"autoUpdate": "Update installieren (experimentell)"
+			"autoUpdate": "Update installieren (experimentell)",
+			"autoUpdateInProgress": "Automatische Aktualisierung läuft, bitte warten..."
 		}
 	},
 	"colors": {

src/lib/locales/en.json

@@ -29,7 +29,7 @@
 			"wifiTxPower": "WiFi TX power",
 			"settingsSaved": "Settings saved",
 			"errorSavingSettings": "Error saving settings",
-			"ownDataSource": "Use BTClock data source",
+			"ownDataSource": "BTClock data source",
 			"flMaxBrightness": "Frontlight brightness",
 			"flAlwaysOn": "Frontlight always on",
 			"flEffectDelay": "Frontlight effect speed",
@@ -40,11 +40,11 @@
 			"nostrPubKey": "Nostr source pubkey",
 			"nostrZapKey": "Nostr zap pubkey",
 			"nostrRelay": "Nostr Relay",
-			"nostrZapNotify": "Nostr Zap Notifications",
+			"nostrZapNotify": "Enable Nostr Zap Notifications",
 			"useNostr": "Use Nostr data source",
 			"bitaxeHostname": "BitAxe hostname or IP",
-			"bitaxeEnabled": "Enable BitAxe",
-			"miningPoolStats": "Enable Mining Pool Stats",
+			"bitaxeEnabled": "Enable BitAxe-integration",
+			"miningPoolStats": "Enable Mining Pool Stats integration",
 			"miningPoolName": "Mining Pool",
 			"miningPoolUser": "Mining Pool username or api key",
 			"nostrZapPubkey": "Nostr Zap pubkey",
@@ -56,7 +56,7 @@
 			"httpAuthPass": "WebUI Password",
 			"httpAuthText": "Only password-protects WebUI, not API-calls.",
 			"currencies": "Currencies",
-			"stagingSource": "Use Staging data source (for development)",
+			"customSource": "Use custom data source endpoint",
 			"useNostrTooltip": "Very experimental and unstable. Nostr data source is not required for Nostr Zap notifications.",
 			"mowMode": "Mow Suffix Mode",
 			"suffixShareDot": "Suffix compact notation",
@@ -73,7 +73,24 @@
 			"hideAll": "Hide all",
 			"flOffWhenDark": "Frontlight off when dark",
 			"luxLightToggleText": "Set to 0 to disable",
-			"verticalDesc": "Use vertical screen description"
+			"verticalDesc": "Use vertical screen description",
+			"enableDebugLog": "Enable Debug-log",
+			"dataSource": {
+				"label": "Data Source",
+				"btclock": "BTClock Data Source",
+				"thirdParty": "mempool.space/coincap.io",
+				"nostr": "Nostr publisher",
+				"custom": "Custom Endpoint"
+			},
+			"thirdPartySource": "Use mempool.space/coincap.io",
+			"ceDisableSSL": "Disable SSL",
+			"ceEndpoint": "Endpoint hostname",
+			"fontName": "Font",
+			"timeBasedDnd": "Enable Do Not Disturb time schedule",
+			"dndStartHour": "Start hour",
+			"dndStartMinute": "Start minute",
+			"dndEndHour": "End hour",
+			"dndEndMinute": "End minute"
 		},
 		"control": {
 			"systemInfo": "System info",
@@ -103,7 +120,9 @@
 			"wifiSignalStrength": "WiFi Signal strength",
 			"wsDataConnection": "BTClock data-source connection",
 			"lightSensor": "Light sensor",
-			"nostrConnection": "Nostr Relay connection"
+			"nostrConnection": "Nostr Relay connection",
+			"doNotDisturb": "Do not disturb",
+			"timeBasedDnd": "Time-based schedule"
 		},
 		"firmwareUpdater": {
 			"fileUploadFailed": "File upload failed. Make sure you have selected the correct file and try again.",
@@ -115,7 +134,8 @@
 			"latestVersion": "Latest Version",
 			"releaseDate": "Release Date",
 			"viewRelease": "View Release",
-			"autoUpdate": "Install update (experimental)"
+			"autoUpdate": "Install update (experimental)",
+			"autoUpdateInProgress": "Auto-update in progress, please wait..."
 		}
 	},
 	"colors": {

src/lib/locales/es.json

@@ -28,7 +28,7 @@
 			"wifiTxPowerText": "En la mayoría de los casos no es necesario configurar esto.",
 			"settingsSaved": "Configuración guardada",
 			"errorSavingSettings": "Error al guardar la configuración",
-			"ownDataSource": "Utilice la fuente de datos BTClock",
+			"ownDataSource": "fuente de datos BTClock",
 			"flMaxBrightness": "Brillo de luz de la pantalla",
 			"flAlwaysOn": "Luz de la pantalla siempre encendida",
 			"flEffectDelay": "Velocidad del efecto de luz de la pantalla",
@@ -57,7 +57,22 @@
 			"hideAll": "Ocultar todo",
 			"flOffWhenDark": "Luz de la pantalla cuando está oscuro",
 			"luxLightToggleText": "Establecer en 0 para desactivar",
-			"verticalDesc": "Descripción de pantalla vertical"
+			"verticalDesc": "Descripción de pantalla vertical",
+			"enableDebugLog": "Habilitar registro de depuración",
+			"bitaxeEnabled": "Habilitar la integración de BitAxe",
+			"miningPoolStats": "Habilitar la integración de estadísticas del grupo minero",
+			"nostrZapNotify": "Habilitar notificaciones de Nostr Zap",
+			"thirdPartySource": "Utilice mempool.space/coincap.io",
+			"dataSource": {
+				"nostr": "editorial nostr",
+				"custom": "Punto final personalizado"
+			},
+			"fontName": "Fuente",
+			"timeBasedDnd": "Habilitar el horario de No molestar",
+			"dndStartHour": "Hora de inicio",
+			"dndStartMinute": "Minuto de inicio",
+			"dndEndHour": "Hora final",
+			"dndEndMinute": "Minuto final"
 		},
 		"control": {
 			"turnOff": "Apagar",
@@ -85,7 +100,9 @@
 			"wifiSignalStrength": "Fuerza de la señal WiFi",
 			"wsDataConnection": "Conexión de fuente de datos BTClock",
 			"lightSensor": "Sensor de luz",
-			"nostrConnection": "Conexión de relé Nostr"
+			"nostrConnection": "Conexión de relé Nostr",
+			"doNotDisturb": "No molestar",
+			"timeBasedDnd": "Horario basado en el tiempo"
 		},
 		"firmwareUpdater": {
 			"fileUploadSuccess": "Archivo cargado exitosamente, reiniciando el dispositivo. Recargando WebUI en {countdown} segundos",
@@ -97,7 +114,8 @@
 			"latestVersion": "Ultima versión",
 			"releaseDate": "Fecha de lanzamiento",
 			"viewRelease": "Ver lanzamiento",
-			"autoUpdate": "Instalar actualización (experimental)"
+			"autoUpdate": "Instalar actualización (experimental)",
+			"autoUpdateInProgress": "Actualización automática en progreso, espere..."
 		}
 	},
 	"button": {

src/lib/locales/nl.json

@@ -58,7 +58,13 @@
 			"hideAll": "Alles verbergen",
 			"flOffWhenDark": "Displaylicht uit als het donker is",
 			"luxLightToggleText": "Stel in op 0 om uit te schakelen",
-			"verticalDesc": "Verticale schermbeschrijving"
+			"verticalDesc": "Verticale schermbeschrijving",
+			"fontName": "Lettertype",
+			"timeBasedDnd": "Schakel het tijdschema Niet storen in",
+			"dndStartHour": "Begin uur",
+			"dndStartMinute": "Beginminuut",
+			"dndEndHour": "Eind uur",
+			"dndEndMinute": "Einde minuut"
 		},
 		"control": {
 			"systemInfo": "Systeeminformatie",
@@ -85,7 +91,9 @@
 			"wifiSignalStrength": "WiFi signaalsterkte",
 			"wsDataConnection": "BTClock-gegevensbron verbinding",
 			"lightSensor": "Licht sensor",
-			"nostrConnection": "Nostr Relay-verbinding"
+			"nostrConnection": "Nostr Relay-verbinding",
+			"doNotDisturb": "Niet storen",
+			"timeBasedDnd": "Op tijd gebaseerd schema"
 		},
 		"firmwareUpdater": {
 			"fileUploadSuccess": "Bestand geüpload, apparaat herstart. WebUI opnieuw geladen over {countdown} seconden",
@@ -97,7 +105,8 @@
 			"latestVersion": "Laatste versie",
 			"releaseDate": "Datum van publicatie",
 			"viewRelease": "Bekijk publicatie",
-			"autoUpdate": "Update installeren (experimenteel)"
+			"autoUpdate": "Update installeren (experimenteel)",
+			"autoUpdateInProgress": "Automatische update wordt uitgevoerd. Even geduld a.u.b...."
 		}
 	},
 	"colors": {

src/lib/style/app.scss

@@ -53,6 +53,8 @@ $input-font-size-sm: $font-size-base * 0.875;
 @import '../node_modules/bootstrap/scss/tooltip';
 @import '../node_modules/bootstrap/scss/toasts';
 @import '../node_modules/bootstrap/scss/alert';
+@import '../node_modules/bootstrap/scss/placeholders';
+@import '../node_modules/bootstrap/scss/spinners';
 
 @import '../node_modules/bootstrap/scss/helpers';
 @import '../node_modules/bootstrap/scss/utilities/api';
@@ -317,3 +319,34 @@ input[type='number'] {
 .lightMode .bitaxelogo {
 	filter: brightness(0) saturate(100%);
 }
+
+.connection-lost-overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.75);
+	z-index: 1050;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+
+	.overlay-content {
+		background-color: rgba(255, 255, 255, 0.75);
+
+		padding: 0.5rem;
+		border-radius: 0.5rem;
+		text-align: center;
+
+		i {
+			font-size: 1rem;
+			color: $danger;
+			margin-bottom: 1rem;
+		}
+
+		h4 {
+			margin-bottom: 0.5rem;
+		}
+	}
+}

src/lib/types/dataSource.ts

@@ -0,0 +1,6 @@
+export enum DataSourceType {
+	BTCLOCK_SOURCE = 0,
+	THIRD_PARTY_SOURCE = 1,
+	NOSTR_SOURCE = 2,
+	CUSTOM_SOURCE = 3
+}

src/routes/+page.svelte

@@ -14,7 +14,8 @@
 
 	let settings = writable({
 		fgColor: '0',
-		bgColor: '0'
+		bgColor: '0',
+		isLoaded: false
 	});
 
 	let status = writable({
@@ -25,34 +26,45 @@
 			price: false,
 			blocks: false
 		},
-		leds: []
+		leds: [],
+		isUpdating: false
 	});
 
-	const fetchStatusData = () => {
-		fetch(`${PUBLIC_BASE_URL}/api/status`, { credentials: 'same-origin' })
-			.then((res) => res.json())
-			.then((data) => {
-				status.set(data);
-			});
+	const fetchStatusData = async () => {
+		const res = await fetch(`${PUBLIC_BASE_URL}/api/status`, { credentials: 'same-origin' });
+
+		if (!res.ok) {
+			console.error('Error fetching status data:', res.statusText);
+			return false;
+		}
+
+		const data = await res.json();
+		status.set(data);
+		return true;
 	};
 
-	const fetchSettingsData = () => {
-		fetch(PUBLIC_BASE_URL + `/api/settings`, { credentials: 'same-origin' })
-			.then((res) => res.json())
-			.then((data) => {
-				data.fgColor = String(data.fgColor);
-				data.bgColor = String(data.bgColor);
-				data.timePerScreen = data.timerSeconds / 60;
+	const fetchSettingsData = async () => {
+		const res = await fetch(PUBLIC_BASE_URL + `/api/settings`, { credentials: 'same-origin' });
 
-				if (data.fgColor > 65535) {
-					data.fgColor = '65535';
-				}
+		if (!res.ok) {
+			console.error('Error fetching settings data:', res.statusText);
+			return;
+		}
 
-				if (data.bgColor > 65535) {
-					data.bgColor = '65535';
-				}
-				settings.set(data);
-			});
+		const data = await res.json();
+
+		data.fgColor = String(data.fgColor);
+		data.bgColor = String(data.bgColor);
+		data.timePerScreen = data.timerSeconds / 60;
+
+		if (data.fgColor > 65535) {
+			data.fgColor = '65535';
+		}
+
+		if (data.bgColor > 65535) {
+			data.bgColor = '65535';
+		}
+		settings.set(data);
 	};
 
 	let sections: (HTMLElement | null)[];
@@ -89,18 +101,44 @@
 		}
 	};
 
-	onMount(() => {
+	onMount(async () => {
 		setupObserver();
 
-		fetchSettingsData();
-		fetchStatusData();
+		const connectEventSource = () => {
+			const evtSource = new EventSource(`${PUBLIC_BASE_URL}/events`);
 
-		const evtSource = new EventSource(`${PUBLIC_BASE_URL}/events`);
+			evtSource.addEventListener('status', (e) => {
+				let dataObj = JSON.parse(e.data);
+				status.update((s) => ({ ...s, isUpdating: true }));
+				status.set(dataObj);
+			});
 
-		evtSource.addEventListener('status', (e) => {
-			let dataObj = JSON.parse(e.data);
-			status.set(dataObj);
-		});
+			evtSource.addEventListener('message', (e) => {
+				if (e.data == 'closing') {
+					console.log('EventSource closing');
+					status.update((s) => ({ ...s, isUpdating: false }));
+					evtSource.close(); // Close the current connection
+					setTimeout(connectEventSource, 5000);
+				}
+			});
+
+			evtSource.addEventListener('error', (e) => {
+				console.error('EventSource failed:', e);
+				status.update((s) => ({ ...s, isUpdating: false }));
+				evtSource.close(); // Close the current connection
+				setTimeout(connectEventSource, 1000);
+			});
+		};
+
+		try {
+			await fetchSettingsData();
+			if (await fetchStatusData()) {
+				settings.update((s) => ({ ...s, isLoaded: true }));
+				connectEventSource();
+			}
+		} catch (error) {
+			console.log('Error fetching data:', error);
+		}
 
 		function handleResize() {
 			if (observer) {
@@ -159,7 +197,7 @@
 </svelte:head>
 
 <Container fluid>
-	<Row>
+	<Row class="placeholder-glow">
 		<Control bind:settings on:showToast={showToast} bind:status lg="3" xxl="4"></Control>
 
 		<Status bind:settings bind:status lg="6" xxl="4"></Status>

src/routes/Control.svelte

@@ -17,6 +17,7 @@
 	} from '@sveltestrap/sveltestrap';
 	import FirmwareUpdater from './FirmwareUpdater.svelte';
 	import { uiSettings } from '$lib/uiSettings';
+	import { Placeholder } from '$lib/components';
 
 	export let settings = {};
 
@@ -214,15 +215,16 @@
 					</li>
 				{/if}
 				<li>
-					{$_('section.control.buildTime')}: {new Date(
-						$settings.lastBuildTime * 1000
-					).toLocaleString()}
+					{$_('section.control.buildTime')}: <Placeholder
+						value={new Date($settings.lastBuildTime * 1000).toLocaleString()}
+						checkValue={$settings.lastBuildTime}
+					/>
 				</li>
-				<li>IP: {$settings.ip}</li>
-				<li>HW revision: {$settings.hwRev}</li>
-				<li>{$_('section.control.fwCommit')}: {$settings.gitRev}</li>
-				<li>WebUI commit: {$settings.fsRev}</li>
-				<li>{$_('section.control.hostname')}: {$settings.hostname}</li>
+				<li>IP: <Placeholder value={$settings.ip} /></li>
+				<li>HW revision: <Placeholder value={$settings.hwRev} /></li>
+				<li>{$_('section.control.fwCommit')}: <Placeholder value={$settings.gitRev} /></li>
+				<li>WebUI commit: <Placeholder value={$settings.fsRev} /></li>
+				<li>{$_('section.control.hostname')}: <Placeholder value={$settings.hostname} /></li>
 			</ul>
 			<Row>
 				<Col class="d-flex justify-content-end">
@@ -239,7 +241,7 @@
 			{#if $settings.otaEnabled}
 				<hr />
 				<h3>{$_('section.control.firmwareUpdate')}</h3>
-				<FirmwareUpdater on:showToast bind:settings />
+				<FirmwareUpdater on:showToast bind:settings bind:status />
 			{/if}
 		</CardBody>
 	</Card>

src/routes/FirmwareUpdater.svelte

@@ -4,11 +4,12 @@
 	import { _ } from 'svelte-i18n';
 	import { writable } from 'svelte/store';
 	import { Progress, Alert, Button } from '@sveltestrap/sveltestrap';
+	import HourglassSplitIcon from 'svelte-bootstrap-icons/lib/HourglassSplit.svelte';
 
 	const dispatch = createEventDispatcher();
 
 	export let settings = { hwRev: '' };
-
+	export let status = writable({ isOTAUpdating: false });
 	let currentVersion: string = $settings.gitTag; // Replace with your current version
 
 	let latestVersion: string = '';
@@ -112,6 +113,25 @@
 		return binaryFilename;
 	};
 
+	const getWebUiBinaryName = () => {
+		let webuiFilename = '';
+		switch ($settings.hwRev) {
+			case 'REV_V8_EPD_2_13':
+				webuiFilename = 'littlefs_16MB.bin';
+				break;
+			case 'REV_B_EPD_2_13':
+				webuiFilename = 'littlefs_8MB.bin';
+				break;
+			case 'REV_A_EPD_2_13':
+				webuiFilename = 'littlefs_4MB.bin';
+				break;
+			default:
+				webuiFilename = 'Unsupported hardware, unable to determine WebUI binary filename';
+		}
+
+		return webuiFilename;
+	};
+
 	const onAutoUpdate = async (e: Event) => {
 		e.preventDefault();
 
@@ -188,8 +208,12 @@
 		)}: {releaseDate} -
 		<a href={releaseUrl} target="_blank">{$_('section.firmwareUpdater.viewRelease')}</a><br />
 		{#if isNewerVersionAvailable}
-			{$_('section.firmwareUpdater.swUpdateAvailable')} -
-			<a href="/" on:click={onAutoUpdate}>{$_('section.firmwareUpdater.autoUpdate')}</a>.
+			{#if !$status.isOTAUpdating}
+				{$_('section.firmwareUpdater.swUpdateAvailable')} -
+				<a href="/" on:click={onAutoUpdate}>{$_('section.firmwareUpdater.autoUpdate')}</a>.
+			{:else}
+				<HourglassSplitIcon /> {$_('section.firmwareUpdater.autoUpdateInProgress')}
+			{/if}
 		{:else}
 			{$_('section.firmwareUpdater.swUpToDate')}
 		{/if}
@@ -199,57 +223,59 @@
 {:else}
 	<p>Loading...</p>
 {/if}
-<section class="row row-cols-lg-auto align-items-end">
-	<div class="col flex-fill">
-		<label for="firmwareFile" class="form-label">Firmware file ({getFirmwareBinaryName()})</label>
-		<input
-			type="file"
-			id="firmwareFile"
-			on:change={(e) => handleFileChange(e, (file) => (firmwareUploadFile = file))}
-			name="update"
-			class="form-control"
-			accept=".bin"
-		/>
-	</div>
-	<div class="flex-fill">
-		<Button block on:click={uploadFirmwareFile} color="primary" disabled={!firmwareUploadFile}
-			>Update firmware</Button
+{#if !$status.isOTAUpdating}
+	<section class="row row-cols-lg-auto align-items-end">
+		<div class="col flex-fill">
+			<label for="firmwareFile" class="form-label">Firmware file ({getFirmwareBinaryName()})</label>
+			<input
+				type="file"
+				id="firmwareFile"
+				on:change={(e) => handleFileChange(e, (file) => (firmwareUploadFile = file))}
+				name="update"
+				class="form-control"
+				accept=".bin"
+			/>
+		</div>
+		<div class="flex-fill">
+			<Button block on:click={uploadFirmwareFile} color="primary" disabled={!firmwareUploadFile}
+				>Update firmware</Button
+			>
+		</div>
+		<div class="col flex-fill">
+			<label for="webuiFile" class="form-label">WebUI file ({getWebUiBinaryName()})</label>
+			<input
+				type="file"
+				id="webuiFile"
+				name="update"
+				class="form-control"
+				placeholder="littlefs.bin"
+				on:change={(e) => handleFileChange(e, (file) => (firmwareWebUiFile = file))}
+				accept=".bin"
+			/>
+		</div>
+		<div class="flex-fill">
+			<Button block on:click={uploadWebUiFile} color="secondary" disabled={!firmwareWebUiFile}
+				>Update WebUI</Button
+			>
+		</div>
+	</section>
+	{#if firmwareUploadProgress > 0}
+		<Progress striped value={firmwareUploadProgress} class="progress" id="firmwareUploadProgress"
+			>{$_('section.firmwareUpdater.uploading')}... {firmwareUploadProgress}%</Progress
 		>
-	</div>
-	<div class="col flex-fill">
-		<label for="webuiFile" class="form-label">WebUI file (littlefs.bin)</label>
-		<input
-			type="file"
-			id="webuiFile"
-			name="update"
-			class="form-control"
-			placeholder="littlefs.bin"
-			on:change={(e) => handleFileChange(e, (file) => (firmwareWebUiFile = file))}
-			accept=".bin"
-		/>
-	</div>
-	<div class="flex-fill">
-		<Button block on:click={uploadWebUiFile} color="secondary" disabled={!firmwareWebUiFile}
-			>Update WebUI</Button
-		>
-	</div>
-</section>
-{#if firmwareUploadProgress > 0}
-	<Progress striped value={firmwareUploadProgress} class="progress" id="firmwareUploadProgress"
-		>{$_('section.firmwareUpdater.uploading')}... {firmwareUploadProgress}%</Progress
-	>
-{/if}
-{#if firmwareUploadSuccess}
-	<Alert color="success" class="firmwareUploadStatusAlert"
-		>{$_('section.firmwareUpdater.fileUploadSuccess', { values: { countdown: $countdown } })}
-	</Alert>
-{/if}
+	{/if}
+	{#if firmwareUploadSuccess}
+		<Alert color="success" class="firmwareUploadStatusAlert"
+			>{$_('section.firmwareUpdater.fileUploadSuccess', { values: { countdown: $countdown } })}
+		</Alert>
+	{/if}
 
-{#if firmwareUploadError}
-	<Alert color="danger" class="firmwareUploadStatusAlert"
-		>{$_('section.firmwareUpdater.fileUploadFailed')}</Alert
+	{#if firmwareUploadError}
+		<Alert color="danger" class="firmwareUploadStatusAlert"
+			>{$_('section.firmwareUpdater.fileUploadFailed')}</Alert
+		>
+	{/if}
+	<small
+		>⚠️ <strong>{$_('warning')}</strong>: {$_('section.firmwareUpdater.firmwareUpdateText')}</small
 	>
 {/if}
-<small
-	>⚠️ <strong>{$_('warning')}</strong>: {$_('section.firmwareUpdater.firmwareUpdateText')}</small
->

src/routes/Settings.svelte

@@ -1,7 +1,5 @@
 <script lang="ts">
-	import { isValidNostrRelay, getPubKey, isValidHexPubKey, isValidNpub } from '$lib';
 	import { PUBLIC_BASE_URL } from '$lib/config';
-	import { uiSettings } from '$lib/uiSettings';
 	import { createEventDispatcher } from 'svelte';
 	import { _ } from 'svelte-i18n';
 	import {
@@ -14,42 +12,28 @@
 		Form,
 		Row
 	} from '@sveltestrap/sveltestrap';
-	import EyeIcon from 'svelte-bootstrap-icons/lib/Eye.svelte';
-	import EyeSlashIcon from 'svelte-bootstrap-icons/lib/EyeSlash.svelte';
-	import { derived } from 'svelte/store';
-	import { SettingsSwitch, SettingsInput, SettingsSelect, ToggleHeader } from '$lib/components';
+	import {
+		ScreenSpecificSettings,
+		DisplaySettings,
+		DataSourceSettings,
+		ExtraFeaturesSettings,
+		SystemSettings
+	} from '$lib/components/settings';
 
 	export let settings;
 
-	const wifiTxPowerMap = new Map<string, number>([
-		['Default', 80],
-		['19.5dBm', 78], // 19.5dBm
-		['19dBm', 76], // 19dBm
-		['18.5dBm', 74], // 18.5dBm
-		['17dBm', 68], // 17dBm
-		['15dBm', 60], // 15dBm
-		['13dBm', 52], // 13dBm
-		['11dBm', 44], // 11dBm
-		['8.5dBm', 34], // 8.5dBm
-		['7dBm', 28], // 7dBm
-		['5dBm', 20] // 5dBm
-	]);
-
 	const miningPoolMap = new Map<string, string>([
 		['noderunners', 'Noderunners.network'],
 		['braiins', 'Braiins Pool'],
 		['ocean', 'ocean.xyz'],
 		['satoshi_radio', 'Satoshi Radio pool'],
 		['public_pool', 'public-pool.io'],
-		['gobrrr_pool', 'Go Brrr pool']
+		['gobrrr_pool', 'Go Brrr pool'],
+		['ckpool', 'CKPool'],
+		['eu_ckpool', 'EU CKPool'],
+		['local_public_pool', 'Public Pool (local)']
 	]);
 
-	const getMiningPoolName = (name: string) => {
-		if (miningPoolMap.has(name)) return miningPoolMap.get(name);
-
-		return name;
-	};
-
 	const dispatch = createEventDispatcher();
 
 	const handleReset = (e: Event) => {
@@ -57,20 +41,10 @@
 		dispatch('formReset');
 	};
 
-	const getTzOffsetFromSystem = () => {
-		const dt = new Date();
-		let diffTZ = dt.getTimezoneOffset();
-		$settings.tzOffset = diffTZ * -1;
-	};
-
 	const onSave = async (e: Event) => {
 		e.preventDefault();
 
-		// const form = e.target as HTMLFormElement;
-		// const formData = new FormData(form);
-
 		let formSettings = $settings;
-
 		delete formSettings['gitRev'];
 		delete formSettings['ip'];
 		delete formSettings['lastBuildTime'];
@@ -79,10 +53,6 @@
 			'Content-Type': 'application/json'
 		});
 
-		//if ($settings.httpAuthEnabled) {
-		//	headers.set('Authorization', 'Basic ' + btoa($settings.httpAuthUser + ":" + $settings.httpAuthPass));
-		//}
-
 		await fetch(`${PUBLIC_BASE_URL}/api/json/settings`, {
 			method: 'PATCH',
 			headers: headers,
@@ -110,110 +80,6 @@
 			});
 	};
 
-	let validNostrRelay = false;
-	const testNostrRelay = async () => {
-		validNostrRelay = await isValidNostrRelay($settings.nostrRelay);
-	};
-
-	let validBitaxe = false;
-	const testBitaxe = async () => {
-		try {
-			const response = await fetch(`http://${$settings.bitaxeHostname}/api/system/info`);
-
-			if (!response.ok) {
-				dispatch('showToast', {
-					color: 'danger',
-					text: `Failed to connect to BitAxe HTTP error! status: ${response.status}`
-				});
-				validBitaxe = false;
-				throw new Error();
-			}
-
-			const systemInfo = await response.json();
-			dispatch('showToast', {
-				color: 'success',
-				text: `Connected to BitAxe ${systemInfo.ASICModel} (Board version ${systemInfo.boardVersion}) running firmware ${systemInfo.version}.\r\nCurrent hashrate ${Math.round(systemInfo.hashRate)} GH/s`
-			});
-			validBitaxe = true;
-		} catch (error) {
-			if (error instanceof TypeError && error.message.includes('Failed to fetch')) {
-				dispatch('showToast', {
-					color: 'danger',
-					text: `Failed to connect to BitAxe, make sure you are connected to the same network.`
-				});
-			}
-			console.error('Failed to fetch Bitaxe system info:', error);
-			validBitaxe = false;
-		}
-	};
-
-	const checkValidNostrPubkey = (key: string) => {
-		$settings[key] = $settings[key].trim();
-		if (isValidNpub($settings[key])) {
-			dispatch('showToast', {
-				color: 'info',
-				text: $_('section.settings.convertingValidNpub')
-			});
-		}
-
-		let ret = getPubKey($settings[key]);
-
-		if (ret) $settings[key] = ret;
-	};
-
-	const onFlBrightnessChange = async () => {
-		await fetch(`${PUBLIC_BASE_URL}/api/frontlight/brightness/${$settings.flMaxBrightness}`, {
-			method: 'GET',
-			headers: {
-				'Content-Type': 'application/json'
-			}
-		});
-	};
-
-	let showPassword = false;
-
-	let textColor = '0';
-	const colorStore = derived(settings, ($settings) => ({
-		fgColor: $settings.fgColor,
-		bgColor: $settings.bgColor
-	}));
-
-	// $: {
-	// 	if ($colorStore) {
-	// 		console.log('Settings model changed:', $colorStore);
-	// 		if ($colorStore.fgColor < $colorStore.bgColor)
-	// 			textColor = "0";
-	// 		else
-	// 			textColor = "1"; // 65535
-	// 	}
-	// }
-
-	colorStore.subscribe(() => {
-		if ($colorStore) {
-			if ($colorStore.fgColor < $colorStore.bgColor) textColor = '0';
-			else textColor = '1'; // 65535
-		}
-	});
-
-	const setTextColor = () => {
-		console.log(textColor);
-		if (textColor == '1') {
-			$settings.fgColor = 65535;
-			$settings.bgColor = 0;
-		} else {
-			$settings.fgColor = 0;
-			$settings.bgColor = 65535;
-		}
-	};
-
-	const showAll = (show: boolean) => {
-		screenSettingsIsOpen = show;
-		displaysAndLedIsOpen = show;
-		dataSourceIsOpen = show;
-		extraFeaturesIsOpen = show;
-		systemIsOpen = show;
-	};
-
 	export let xs = 12;
 	export let sm = xs;
 	export let md = sm;
@@ -221,581 +87,76 @@
 	export let xl = lg;
 	export let xxl = xl;
 
-	let screenSettingsIsOpen: boolean,
-		displaysAndLedIsOpen: boolean,
-		dataSourceIsOpen: boolean,
-		extraFeaturesIsOpen: boolean,
-		systemIsOpen: boolean;
+	let screenSettingsIsOpen = true,
+		displaySettingsIsOpen = false,
+		dataSourceIsOpen = false,
+		extraFeaturesIsOpen = false,
+		systemIsOpen = false;
+
+	const showAll = () => {
+		screenSettingsIsOpen = true;
+		displaySettingsIsOpen = true;
+		dataSourceIsOpen = true;
+		extraFeaturesIsOpen = true;
+		systemIsOpen = true;
+	};
+
+	const hideAll = () => {
+		screenSettingsIsOpen = false;
+		displaySettingsIsOpen = false;
+		dataSourceIsOpen = false;
+		extraFeaturesIsOpen = false;
+		systemIsOpen = false;
+	};
 </script>
 
 <Col {xs} {sm} {md} {lg} {xl} {xxl} class="mb-4 mb-xl-0">
 	<Card id="settings">
 		<CardHeader>
 			<div class="float-end">
-				<small
-					><button
-						on:click={() => {
-							showAll(true);
-						}}
-						type="button">{$_('section.settings.showAll')}</button
+				<small>
+					<button type="button" on:click={showAll} id="showAllBtn"
+						>{$_('section.settings.showAll')}</button
 					>
 					|
-					<button
-						type="button"
-						on:click={() => {
-							showAll(false);
-						}}>{$_('section.settings.hideAll')}</button
-					></small
-				>
+					<button type="button" on:click={hideAll} id="hideAllBtn"
+						>{$_('section.settings.hideAll')}</button
+					>
+				</small>
 			</div>
-			<CardTitle>{$_('section.settings.title', { default: 'Settings' })}</CardTitle>
+			<CardTitle>{$_('section.settings.title')}</CardTitle>
 		</CardHeader>
-
 		<CardBody>
-			<Form on:submit={onSave} class="clearfix">
-				<Row>
-					<ToggleHeader
-						header={$_('section.settings.section.screenSettings')}
-						defaultOpen={true}
-						isOpen={screenSettingsIsOpen}
-					>
-						<Row>
-							<SettingsSwitch
-								id="stealFocus"
-								bind:checked={$settings.stealFocus}
-								label={$_('section.settings.StealFocusOnNewBlock')}
-								size={$uiSettings.inputSize}
-								col={{ md: '6', xl: '12', xxl: '6' }}
-							/>
-							<SettingsSwitch
-								id="mcapBigChar"
-								bind:checked={$settings.mcapBigChar}
-								label={$_('section.settings.useBigCharsMcap')}
-								size={$uiSettings.inputSize}
-								col={{ md: '6', xl: '12', xxl: '6' }}
-							/>
-							<SettingsSwitch
-								id="useBlkCountdown"
-								bind:checked={$settings.useBlkCountdown}
-								label={$_('section.settings.useBlkCountdown')}
-								size={$uiSettings.inputSize}
-								col={{ md: '6', xl: '12', xxl: '6' }}
-							/>
-							<SettingsSwitch
-								id="useSatsSymbol"
-								bind:checked={$settings.useSatsSymbol}
-								label={$_('section.settings.useSatsSymbol')}
-								size={$uiSettings.inputSize}
-								col={{ md: '6', xl: '12', xxl: '6' }}
-							/>
-							<SettingsSwitch
-								id="suffixPrice"
-								bind:checked={$settings.suffixPrice}
-								label={$_('section.settings.suffixPrice')}
-								size={$uiSettings.inputSize}
-								col={{ md: '6', xl: '12', xxl: '6' }}
-							/>
-							<SettingsSwitch
-								id="mowMode"
-								bind:checked={$settings.mowMode}
-								label={$_('section.settings.mowMode')}
-								size={$uiSettings.inputSize}
-								col={{ md: '6', xl: '12', xxl: '6' }}
-								disabled={!$settings.suffixPrice}
-							/>
-							<SettingsSwitch
-								id="suffixShareDot"
-								bind:checked={$settings.suffixShareDot}
-								label={$_('section.settings.suffixShareDot')}
-								size={$uiSettings.inputSize}
-								col={{ md: '6', xl: '12', xxl: '6' }}
-								disabled={!$settings.suffixPrice}
-							/>
-							<SettingsSwitch
-								id="verticalDesc"
-								bind:checked={$settings.verticalDesc}
-								label={$_('section.settings.verticalDesc')}
-								size={$uiSettings.inputSize}
-								col={{ md: '6', xl: '12', xxl: '6' }}
-							/>
+			{#if $settings.isLoaded === false}
+				<div class="d-flex align-items-center">
+					<strong role="status">Loading...</strong>
+					<div class="spinner-border ms-auto" aria-hidden="true"></div>
+				</div>
+			{:else}
+				<Form on:submit={onSave}>
+					<ScreenSpecificSettings {settings} bind:isOpen={screenSettingsIsOpen} />
+					<DisplaySettings {settings} bind:isOpen={displaySettingsIsOpen} />
+					<DataSourceSettings {settings} bind:isOpen={dataSourceIsOpen} on:showToast />
+					<ExtraFeaturesSettings
+						{settings}
+						bind:isOpen={extraFeaturesIsOpen}
+						{miningPoolMap}
+						on:showToast
+					/>
+					<SystemSettings {settings} bind:isOpen={systemIsOpen} />
 
-							{#if !$settings.actCurrencies}
-								<SettingsSwitch
-									id="fetchEurPrice"
-									bind:checked={$settings.fetchEurPrice}
-									label="{$_('section.settings.fetchEuroPrice')} ({$_('restartRequired')})"
-									size={$uiSettings.inputSize}
-									col={{ md: '6', xl: '12', xxl: '6' }}
-								/>
-							{/if}
-						</Row>
-						<Row>
-							<h5>{$_('section.settings.screens')}</h5>
-							{#if $settings.screens}
-								{#each $settings.screens as s}
-									<SettingsSwitch
-										id="screens_{s.id}"
-										bind:checked={s.enabled}
-										label={s.name}
-										size={$uiSettings.inputSize}
-										col={{ md: '6', xl: '12', xxl: '6' }}
-									/>
-								{/each}
-							{/if}
-						</Row>
-						{#if $settings.actCurrencies && $settings.useNostr !== true}
-							<Row>
-								<h5>{$_('section.settings.currencies')}</h5>
-								<small>{$_('restartRequired')}</small>
-								{#if $settings.availableCurrencies}
-									{#each $settings.availableCurrencies as c}
-										<Col md="6" xl="12" xxl="6">
-											<div class="form-check form-control-{$uiSettings.inputSize}">
-												<input
-													id="currency_{c}"
-													bind:group={$settings.actCurrencies}
-													value={c}
-													type="checkbox"
-													class="form-check-input"
-													bsSize={$uiSettings.inputSize}
-													label={c}
-												/>
-												<label class="form-check-label" for="currency_{c}">{c}</label>
-											</div>
-										</Col>
-									{/each}
-								{/if}
-							</Row>
-						{/if}
-					</ToggleHeader>
-				</Row><Row>
-					<ToggleHeader
-						header={$_('section.settings.section.displaysAndLed')}
-						isOpen={displaysAndLedIsOpen}
-					>
-						<SettingsSelect
-							id="textColor"
-							label={$_('section.settings.textColor')}
-							bind:value={textColor}
-							options={[
-								[$_('colors.black') + ' on ' + $_('colors.white'), '0'],
-								[$_('colors.white') + ' on ' + $_('colors.black'), '1']
-							]}
-							size={$uiSettings.inputSize}
-							selectClass={$uiSettings.selectClass}
-							onChange={setTextColor}
-						/>
-
-						<SettingsInput
-							id="timePerScreen"
-							label={$_('section.settings.timePerScreen')}
-							bind:value={$settings.timePerScreen}
-							type="number"
-							min={1}
-							step="1"
-							required={true}
-							suffix={$_('time.minutes')}
-							size={$uiSettings.inputSize}
-						/>
-
-						<SettingsInput
-							id="fullRefreshMin"
-							label={$_('section.settings.fullRefreshEvery')}
-							bind:value={$settings.fullRefreshMin}
-							type="number"
-							min={1}
-							step="1"
-							required={true}
-							suffix={$_('time.minutes')}
-							size={$uiSettings.inputSize}
-						/>
-
-						<SettingsInput
-							id="minSecPriceUpd"
-							label={$_('section.settings.timeBetweenPriceUpdates')}
-							bind:value={$settings.minSecPriceUpd}
-							type="number"
-							min={1}
-							step="1"
-							suffix={$_('time.seconds')}
-							helpText={$_('section.settings.shortAmountsWarning')}
-							size={$uiSettings.inputSize}
-						/>
-
-						<SettingsInput
-							id="ledBrightness"
-							label={$_('section.settings.ledBrightness')}
-							bind:value={$settings.ledBrightness}
-							type="range"
-							min={0}
-							max={255}
-							step={1}
-							size={$uiSettings.inputSize}
-						/>
-
-						{#if $settings.hasFrontlight && !$settings.flDisable}
-							<SettingsInput
-								id="flMaxBrightness"
-								label={$_('section.settings.flMaxBrightness')}
-								bind:value={$settings.flMaxBrightness}
-								type="range"
-								min={0}
-								max={4095}
-								step={1}
-								size={$uiSettings.inputSize}
-								onChange={onFlBrightnessChange}
-							/>
-
-							<SettingsInput
-								id="flEffectDelay"
-								label={$_('section.settings.flEffectDelay')}
-								bind:value={$settings.flEffectDelay}
-								type="range"
-								min={5}
-								max={300}
-								step={1}
-								size={$uiSettings.inputSize}
-							/>
-						{/if}
-
-						{#if !$settings.flDisable && $settings.hasLightLevel}
-							<SettingsInput
-								id="luxLightToggle"
-								label={`${$_('section.settings.luxLightToggle')} (${$settings.luxLightToggle})`}
-								bind:value={$settings.luxLightToggle}
-								type="range"
-								min={0}
-								max={1000}
-								step={1}
-								helpText={$_('section.settings.luxLightToggleText')}
-								size={$uiSettings.inputSize}
-							/>
-						{/if}
-
-						<Row>
-							<SettingsSwitch
-								id="ledTestOnPower"
-								bind:checked={$settings.ledTestOnPower}
-								label={$_('section.settings.ledPowerOnTest')}
-								size={$uiSettings.inputSize}
-							/>
-
-							<SettingsSwitch
-								id="ledFlashOnUpd"
-								bind:checked={$settings.ledFlashOnUpd}
-								label={$_('section.settings.ledFlashOnBlock')}
-								size={$uiSettings.inputSize}
-							/>
-
-							<SettingsSwitch
-								id="disableLeds"
-								bind:checked={$settings.disableLeds}
-								label={$_('section.settings.disableLeds')}
-								size={$uiSettings.inputSize}
-							/>
-
-							{#if $settings.hasFrontlight}
-								<SettingsSwitch
-									id="flDisable"
-									bind:checked={$settings.flDisable}
-									label={$_('section.settings.flDisable')}
-									size={$uiSettings.inputSize}
-								/>
-							{/if}
-
-							{#if $settings.hasFrontlight && !$settings.flDisable}
-								<SettingsSwitch
-									id="flAlwaysOn"
-									bind:checked={$settings.flAlwaysOn}
-									label={$_('section.settings.flAlwaysOn')}
-									size={$uiSettings.inputSize}
-								/>
-
-								<SettingsSwitch
-									id="flFlashOnUpd"
-									bind:checked={$settings.flFlashOnUpd}
-									label={$_('section.settings.flFlashOnUpd')}
-									size={$uiSettings.inputSize}
-								/>
-
-								<SettingsSwitch
-									id="flOffWhenDark"
-									bind:checked={$settings.flOffWhenDark}
-									label={$_('section.settings.flOffWhenDark')}
-									size={$uiSettings.inputSize}
-								/>
-							{/if}
-						</Row>
-					</ToggleHeader>
-				</Row><Row>
-					<ToggleHeader
-						header={$_('section.settings.section.dataSource')}
-						isOpen={dataSourceIsOpen}
-					>
-						<SettingsInput
-							id="mempoolInstance"
-							label={$_('section.settings.mempoolnstance')}
-							bind:value={$settings.mempoolInstance}
-							disabled={$settings.ownDataSource}
-							required={true}
-							helpText={$_('section.settings.mempoolInstanceHelpText')}
-							size={$uiSettings.inputSize}
-						/>
-
-						<Row>
-							<SettingsSwitch
-								id="ownDataSource"
-								bind:checked={$settings.ownDataSource}
-								label="{$_('section.settings.ownDataSource')} ({$_('restartRequired')})"
-								size={$uiSettings.inputSize}
-							/>
-
-							{#if $settings.nostrRelay}
-								<SettingsSwitch
-									id="useNostr"
-									bind:checked={$settings.useNostr}
-									label="{$_('section.settings.useNostr')} ({$_('restartRequired')})"
-									size={$uiSettings.inputSize}
-								/>
-							{/if}
-
-							{#if 'stagingSource' in $settings}
-								<SettingsSwitch
-									id="stagingSource"
-									bind:checked={$settings.stagingSource}
-									label="{$_('section.settings.stagingSource')} ({$_('restartRequired')})"
-									size={$uiSettings.inputSize}
-								/>
-							{/if}
-						</Row>
-					</ToggleHeader>
-				</Row><Row>
-					<ToggleHeader
-						header={$_('section.settings.section.extraFeatures')}
-						isOpen={extraFeaturesIsOpen}
-					>
-						{#if $settings.bitaxeEnabled}
-							<SettingsInput
-								id="bitaxeHostname"
-								label={$_('section.settings.bitaxeHostname')}
-								bind:value={$settings.bitaxeHostname}
-								required={true}
-								valid={validBitaxe}
-								size={$uiSettings.inputSize}
-							>
-								<Button type="button" color="success" on:click={testBitaxe}
-									>{$_('test', { default: 'Test' })}</Button
-								>
-							</SettingsInput>
-						{/if}
-						{#if $settings.miningPoolStats}
-							<SettingsSelect
-								id="miningPoolName"
-								label={$_('section.settings.miningPoolName')}
-								bind:value={$settings.miningPoolName}
-								options={$settings.availablePools.map((pool) => [getMiningPoolName(pool), pool])}
-								size={$uiSettings.inputSize}
-								selectClass={$uiSettings.selectClass}
-							/>
-							<SettingsInput
-								id="miningPoolUser"
-								label={$_('section.settings.miningPoolUser')}
-								bind:value={$settings.miningPoolUser}
-								required={true}
-								size={$uiSettings.inputSize}
-							/>
-						{/if}
-						{#if 'nostrZapNotify' in $settings && $settings['nostrZapNotify']}
-							<SettingsInput
-								id="nostrZapPubkey"
-								label={$_('section.settings.nostrZapPubkey')}
-								bind:value={$settings.nostrZapPubkey}
-								required={true}
-								minlength="64"
-								invalid={!isValidHexPubKey($settings.nostrZapPubkey)}
-								helpText={!isValidHexPubKey($settings.nostrZapPubkey)
-									? $_('section.settings.invalidNostrPubkey')
-									: undefined}
-								size={$uiSettings.inputSize}
-								onChange={() => checkValidNostrPubkey('nostrZapPubkey')}
-								onInput={() => checkValidNostrPubkey('nostrZapPubkey')}
-							/>
-						{/if}
-						{#if $settings.useNostr}
-							<SettingsInput
-								id="nostrPubKey"
-								label={$_('section.settings.nostrPubKey')}
-								bind:value={$settings.nostrPubKey}
-								invalid={!isValidHexPubKey($settings.nostrPubKey)}
-								helpText={!isValidHexPubKey($settings.nostrPubKey)
-									? $_('section.settings.invalidNostrPubkey')
-									: undefined}
-								size={$uiSettings.inputSize}
-								onChange={() => checkValidNostrPubkey('nostrPubKey')}
-								onInput={() => checkValidNostrPubkey('nostrPubKey')}
-							/>
-						{/if}
-						{#if 'nostrZapNotify' in $settings || $settings.useNostr}
-							<SettingsInput
-								id="nostrRelay"
-								label={$_('section.settings.nostrRelay')}
-								bind:value={$settings.nostrRelay}
-								required={true}
-								valid={validNostrRelay}
-								size={$uiSettings.inputSize}
-							>
-								<Button type="button" color="success" on:click={testNostrRelay}
-									>{$_('test', { default: 'Test' })}</Button
-								>
-							</SettingsInput>
-						{/if}
-						<Row>
-							{#if 'bitaxeEnabled' in $settings}
-								<SettingsSwitch
-									id="bitaxeEnabled"
-									bind:checked={$settings.bitaxeEnabled}
-									label="{$_('section.settings.bitaxeEnabled')} ({$_('restartRequired')})"
-									size={$uiSettings.inputSize}
-								/>
-							{/if}
-							{#if 'miningPoolStats' in $settings}
-								<SettingsSwitch
-									id="miningPoolStats"
-									bind:checked={$settings.miningPoolStats}
-									label="{$_('section.settings.miningPoolStats')} ({$_('restartRequired')})"
-									size={$uiSettings.inputSize}
-								/>
-							{/if}
-							{#if 'nostrZapNotify' in $settings}
-								<SettingsSwitch
-									id="nostrZapNotify"
-									bind:checked={$settings.nostrZapNotify}
-									label="{$_('section.settings.nostrZapNotify')} ({$_('restartRequired')})"
-									size={$uiSettings.inputSize}
-								/>
-								<SettingsSwitch
-									id="ledFlashOnZap"
-									bind:checked={$settings.ledFlashOnZap}
-									label={$_('section.settings.ledFlashOnZap')}
-									size={$uiSettings.inputSize}
-								/>
-								{#if $settings.hasFrontlight && !$settings.flDisable}
-									<SettingsSwitch
-										id="flFlashOnZap"
-										bind:checked={$settings.flFlashOnZap}
-										label={$_('section.settings.flFlashOnZap')}
-										size={$uiSettings.inputSize}
-									/>
-								{/if}
-							{/if}
-						</Row>
-					</ToggleHeader>
-				</Row><Row>
-					<ToggleHeader header={$_('section.settings.section.system')} isOpen={systemIsOpen}>
-						<SettingsInput
-							id="tzOffset"
-							label={$_('section.settings.timezoneOffset')}
-							bind:value={$settings.tzOffset}
-							type="number"
-							step="1"
-							required={true}
-							suffix={$_('time.minutes')}
-							helpText={$_('section.settings.tzOffsetHelpText')}
-							size={$uiSettings.inputSize}
-						>
-							<Button type="button" color="info" on:click={getTzOffsetFromSystem}
-								>{$_('auto-detect')}</Button
-							>
-						</SettingsInput>
-
-						{#if $settings.httpAuthEnabled}
-							<SettingsInput
-								id="httpAuthUser"
-								label={$_('section.settings.httpAuthUser')}
-								bind:value={$settings.httpAuthUser}
-								required={true}
-								size={$uiSettings.inputSize}
-							/>
-							<SettingsInput
-								id="httpAuthPass"
-								label={$_('section.settings.httpAuthPass')}
-								bind:value={$settings.httpAuthPass}
-								type={showPassword ? 'text' : 'password'}
-								required={true}
-								size={$uiSettings.inputSize}
-							>
-								<Button
-									type="button"
-									on:click={() => (showPassword = !showPassword)}
-									color={showPassword ? 'success' : 'danger'}
-								>
-									{#if !showPassword}<EyeIcon />{:else}<EyeSlashIcon />{/if}
-								</Button>
-							</SettingsInput>
-						{/if}
-
-						<SettingsInput
-							id="hostnamePrefix"
-							label={$_('section.settings.hostnamePrefix')}
-							bind:value={$settings.hostnamePrefix}
-							required={true}
-							minlength="1"
-							size={$uiSettings.inputSize}
-						/>
-
-						<SettingsSelect
-							id="wifiTxPower"
-							label={$_('section.settings.wifiTxPower', { default: 'WiFi Tx Power' })}
-							bind:value={$settings.txPower}
-							options={Array.from(wifiTxPowerMap.entries())}
-							size={$uiSettings.inputSize}
-							selectClass={$uiSettings.selectClass}
-							helpText={$_('section.settings.wifiTxPowerText')}
-						/>
-
-						<SettingsInput
-							id="wpTimeout"
-							label={$_('section.settings.wpTimeout')}
-							bind:value={$settings.wpTimeout}
-							type="number"
-							min={1}
-							step="1"
-							required={true}
-							suffix={$_('time.seconds')}
-							size={$uiSettings.inputSize}
-						/>
-
-						<Row>
-							<SettingsSwitch
-								id="otaEnabled"
-								bind:checked={$settings.otaEnabled}
-								label="{$_('section.settings.otaUpdates')} ({$_('restartRequired')})"
-								size={$uiSettings.inputSize}
-							/>
-							<SettingsSwitch
-								id="mdnsEnabled"
-								bind:checked={$settings.mdnsEnabled}
-								label="{$_('section.settings.enableMdns')} ({$_('restartRequired')})"
-								size={$uiSettings.inputSize}
-							/>
-							<SettingsSwitch
-								id="httpAuthEnabled"
-								bind:checked={$settings.httpAuthEnabled}
-								label="{$_('section.settings.httpAuthEnabled')} ({$_('restartRequired')})"
-								size={$uiSettings.inputSize}
-							/>
-						</Row>
-					</ToggleHeader>
-				</Row>
-
-				<Row>
-					<Col class="d-flex justify-content-end">
-						<Button on:click={handleReset} color="secondary">{$_('button.reset')}</Button>
-						<div class="mx-2"></div>
-						<Button color="primary">{$_('button.save')}</Button>
-					</Col>
-				</Row>
-			</Form>
+					<Row class="mt-4">
+						<Col>
+							<Button type="submit" color="primary" class="me-2">
+								{$_('button.save')}
+							</Button>
+							<Button type="button" color="secondary" on:click={handleReset}>
+								{$_('button.reset')}
+							</Button>
+						</Col>
+					</Row>
+				</Form>
+			{/if}
 		</CardBody>
 	</Card>
 </Col>

src/routes/Status.svelte

@@ -17,6 +17,7 @@
 		Row
 	} from '@sveltestrap/sveltestrap';
 	import Rendered from './Rendered.svelte';
+	import { DataSourceType } from '$lib/types/dataSource';
 
 	export let settings;
 	export let status: writable<object>;
@@ -74,7 +75,7 @@
 	});
 
 	settings.subscribe((value: object) => {
-		lightMode = value.bgColor > value.fgColor;
+		lightMode = !value.invertedColor;
 
 		if (value.screens) buttonChunks = chunkArray(value.screens, 5);
 	});
@@ -96,6 +97,16 @@
 		}
 	};
 
+	const toggleDoNotDisturb = (currentStatus: boolean) => (e: Event) => {
+		e.preventDefault();
+		console.log(currentStatus);
+		if (!currentStatus) {
+			fetch(`${PUBLIC_BASE_URL}/api/dnd/enable`);
+		} else {
+			fetch(`${PUBLIC_BASE_URL}/api/dnd/disable`);
+		}
+	};
+
 	export let xs = 12;
 	export let sm = xs;
 	export let md = sm;
@@ -110,11 +121,29 @@
 			<CardTitle>{$_('section.status.title', { default: 'Status' })}</CardTitle>
 		</CardHeader>
 		<CardBody>
-			{#if $settings.screens}
-				<div class=" d-block d-sm-none mx-auto text-center">
-					{#each buttonChunks as chunk}
-						<ButtonGroup size="sm" class="mx-auto mb-1">
-							{#each chunk as s}
+			{#if $settings.isLoaded === false}
+				<div class="d-flex align-items-center">
+					<strong role="status">Loading...</strong>
+					<div class="spinner-border ms-auto" aria-hidden="true"></div>
+				</div>
+			{:else}
+				{#if $settings.screens}
+					<div class=" d-block d-sm-none mx-auto text-center">
+						{#each buttonChunks as chunk}
+							<ButtonGroup size="sm" class="mx-auto mb-1">
+								{#each chunk as s}
+									<Button
+										color="outline-primary"
+										active={$status.currentScreen == s.id}
+										on:click={setScreen(s.id)}>{s.name}</Button
+									>
+								{/each}
+							</ButtonGroup>
+						{/each}
+					</div>
+					<div class="d-flex justify-content-center d-none d-sm-flex">
+						<ButtonGroup size="sm">
+							{#each $settings.screens as s}
 								<Button
 									color="outline-primary"
 									active={$status.currentScreen == s.id}
@@ -122,148 +151,169 @@
 								>
 							{/each}
 						</ButtonGroup>
-					{/each}
-				</div>
-				<div class="d-flex justify-content-center d-none d-sm-flex">
-					<ButtonGroup size="sm">
-						{#each $settings.screens as s}
-							<Button
-								color="outline-primary"
-								active={$status.currentScreen == s.id}
-								on:click={setScreen(s.id)}>{s.name}</Button
-							>
-						{/each}
-					</ButtonGroup>
-				</div>
-				{#if $settings.actCurrencies && $settings.ownDataSource}
-					<div class="d-flex justify-content-center d-sm-flex mt-2">
-						<ButtonGroup size="sm">
-							{#each $settings.actCurrencies as c}
-								<Button
-									color="outline-success"
-									active={$status.currency == c}
-									on:click={setCurrency(c)}>{c}</Button
-								>
-							{/each}
-						</ButtonGroup>
 					</div>
-				{/if}
-				<hr />
-				{#if $status.data}
-					<section class={lightMode ? 'lightMode' : 'darkMode'}>
-						<Rendered
-							status={$status}
-							className="btclock-wrapper"
-							verticalDesc={$settings.verticalDesc}
-						></Rendered>
-					</section>
-					{$_('section.status.screenCycle')}:
-					<a
-						id="timerStatusText"
-						href={'#'}
-						style="cursor: pointer"
-						tabindex="0"
-						role="button"
-						aria-pressed="false"
-						on:click={toggleTimer($status.timerRunning)}
-						>{#if $status.timerRunning}&#9205; {$_('timer.running')}{:else}&#9208; {$_(
-								'timer.stopped'
-							)}{/if}</a
-					>
-				{/if}
-			{/if}
-			<hr />
-			{#if !$settings.disableLeds}
-				<Row class="justify-content-evenly">
-					{#if $status.leds}
-						{#each $status.leds as led}
-							<Col>
-								<Input
-									type="color"
-									id="ledColorPicker"
-									bind:value={led.hex}
-									class="mx-auto"
-									disabled
-								/>
-							</Col>
-						{/each}
+					{#if $settings.actCurrencies && ($settings.dataSource == DataSourceType.BTCLOCK_SOURCE || $settings.dataSource == DataSourceType.CUSTOM_SOURCE)}
+						<div class="d-flex justify-content-center d-sm-flex mt-2">
+							<ButtonGroup size="sm">
+								{#each $settings.actCurrencies as c}
+									<Button
+										color="outline-success"
+										active={$status.currency == c}
+										on:click={setCurrency(c)}>{c}</Button
+									>
+								{/each}
+							</ButtonGroup>
+						</div>
 					{/if}
-				</Row>
-				<hr />
-			{/if}
-			<Progress striped value={memoryFreePercent}>{memoryFreePercent}%</Progress>
-			<div class="d-flex justify-content-between">
-				<div>{$_('section.status.memoryFree')}</div>
-				<div>
-					{Math.round($status.espFreeHeap / 1024)} / {Math.round($status.espHeapSize / 1024)} KiB
-				</div>
-			</div>
-			<hr />
-			{#if $settings.hasLightLevel}
-				{$_('section.status.lightSensor')}: {Number(Math.round($status.lightLevel))} lux
-				<hr />
-			{/if}
-			<Progress striped id="rssiBar" color={wifiStrengthColor} value={rssiPercent}
-				>{rssiPercent}%</Progress
-			>
-			<Tooltip target="rssiBar" placement="bottom">{$_('rssiBar.tooltip')}</Tooltip>
+					<hr />
+					{#if $status.data}
+						<section class={lightMode ? 'lightMode' : 'darkMode'} style="position: relative;">
+							{#if $status.isUpdating === false && ($status.isFake ?? false) === false}
+								<div class="connection-lost-overlay">
+									<div class="overlay-content">
+										<i class="bi bi-wifi-off"></i>
+										<h4>Lost connection</h4>
+										<p>Trying to reconnect...</p>
+									</div>
+								</div>
+							{/if}
+							<Rendered
+								status={$status}
+								className="btclock-wrapper"
+								verticalDesc={$settings.verticalDesc}
+							></Rendered>
+						</section>
+						{$_('section.status.screenCycle')}:
+						<a
+							id="timerStatusText"
+							href={'#'}
+							style="cursor: pointer"
+							tabindex="0"
+							role="button"
+							aria-pressed="false"
+							on:click={toggleTimer($status.timerRunning)}
+							>{#if $status.timerRunning}&#9205; {$_('timer.running')}{:else}&#9208; {$_(
+									'timer.stopped'
+								)}{/if}</a
+						><br />
 
-			<div class="d-flex justify-content-between">
-				<div>{$_('section.status.wifiSignalStrength')}</div>
-				<div>
-					{$status.rssi} dBm
-				</div>
-			</div>
-			<hr />
-			{$_('section.status.uptime')}: {toUptimestring($status.espUptime)}
-			<br />
-			<p>
-				{#if $settings.useNostr || $settings.nostrZapNotify}
-					{$_('section.status.nostrConnection')}:
-					<span>
-						{#if $status.connectionStatus && $status.connectionStatus.nostr}
-							&#9989;
-						{:else}
-							&#10060;
-						{/if}
-					</span>
+						{$_('section.status.doNotDisturb')}:
+						<a
+							id="dndStatusText"
+							href={'#'}
+							style="cursor: pointer"
+							tabindex="0"
+							role="button"
+							aria-pressed="false"
+							on:click={toggleDoNotDisturb($status.dnd?.enabled)}
+						>
+							{#if $status.dnd?.active}&#9205; {$_('on')}{:else}&#9208; {$_('off')}{/if}</a
+						>
+						<small>
+							{#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}
+						</small>
+					{/if}
 				{/if}
-				{#if !$settings.useNostr}
-					{#if !$settings.ownDataSource}
-						{$_('section.status.wsPriceConnection')}:
+				<hr />
+				{#if !$settings.disableLeds}
+					<Row class="justify-content-evenly">
+						{#if $status.leds}
+							{#each $status.leds as led}
+								<Col>
+									<Input
+										type="color"
+										id="ledColorPicker"
+										bind:value={led.hex}
+										class="mx-auto"
+										disabled
+									/>
+								</Col>
+							{/each}
+						{/if}
+					</Row>
+					<hr />
+				{/if}
+				<Progress striped value={memoryFreePercent}>{memoryFreePercent}%</Progress>
+				<div class="d-flex justify-content-between">
+					<div>{$_('section.status.memoryFree')}</div>
+					<div>
+						{Math.round($status.espFreeHeap / 1024)} / {Math.round($status.espHeapSize / 1024)} KiB
+					</div>
+				</div>
+				<hr />
+				{#if $settings.hasLightLevel}
+					{$_('section.status.lightSensor')}: {Number(Math.round($status.lightLevel))} lux
+					<hr />
+				{/if}
+				<Progress striped id="rssiBar" color={wifiStrengthColor} value={rssiPercent}
+					>{rssiPercent}%</Progress
+				>
+				<Tooltip target="rssiBar" placement="bottom">{$_('rssiBar.tooltip')}</Tooltip>
+
+				<div class="d-flex justify-content-between">
+					<div>{$_('section.status.wifiSignalStrength')}</div>
+					<div>
+						{$status.rssi} dBm
+					</div>
+				</div>
+				<hr />
+				{$_('section.status.uptime')}: {toUptimestring($status.espUptime)}
+				<br />
+				<p>
+					{#if $settings.dataSource == DataSourceType.NOSTR_SOURCE || $settings.nostrZapNotify}
+						{$_('section.status.nostrConnection')}:
 						<span>
-							{#if $status.connectionStatus && $status.connectionStatus.price}
-								&#9989;
-							{:else}
-								&#10060;
-							{/if}
-						</span>
-						-
-						{$_('section.status.wsMempoolConnection', {
-							values: { instance: $settings.mempoolInstance }
-						})}:
-						<span>
-							{#if $status.connectionStatus && $status.connectionStatus.blocks}
-								&#9989;
-							{:else}
-								&#10060;
-							{/if}
-						</span><br />
-					{:else}
-						{$_('section.status.wsDataConnection')}:
-						<span>
-							{#if $status.connectionStatus && $status.connectionStatus.V2}
+							{#if $status.connectionStatus && $status.connectionStatus.nostr}
 								&#9989;
 							{:else}
 								&#10060;
 							{/if}
 						</span>
 					{/if}
-				{/if}
-				{#if $settings.fetchEurPrice}
-					<small>{$_('section.status.fetchEuroNote')}</small>
-				{/if}
-			</p>
+					{#if $settings.dataSource != DataSourceType.NOSTR_SOURCE}
+						{#if $settings.dataSource == DataSourceType.THIRD_PARTY_SOURCE}
+							{$_('section.status.wsPriceConnection')}:
+							<span>
+								{#if $status.connectionStatus && $status.connectionStatus.price}
+									&#9989;
+								{:else}
+									&#10060;
+								{/if}
+							</span>
+							-
+							{$_('section.status.wsMempoolConnection', {
+								values: { instance: $settings.mempoolInstance }
+							})}:
+							<span>
+								{#if $status.connectionStatus && $status.connectionStatus.blocks}
+									&#9989;
+								{:else}
+									&#10060;
+								{/if}
+							</span><br />
+						{:else}
+							{$_('section.status.wsDataConnection')}:
+							<span>
+								{#if $status.connectionStatus && $status.connectionStatus.V2}
+									&#9989;
+								{:else}
+									&#10060;
+								{/if}
+							</span>
+						{/if}
+					{/if}
+					{#if $settings.fetchEurPrice}
+						<small>{$_('section.status.fetchEuroNote')}</small>
+					{/if}
+				</p>
+			{/if}
 		</CardBody>
 	</Card>
 </Col>
+
+<style lang="scss">
+</style>

tests/doc-screenshots/viewport-screenshots.spec.ts

@@ -0,0 +1,70 @@
+import { test, expect } from '@playwright/test';
+
+import { initMock, settingsJson, statusJson } from '../shared';
+import sharp from 'sharp';
+
+test.beforeEach(initMock);
+
+// Define the translations for the headings
+const headings = {
+	en: {
+		control: 'Control',
+		status: 'Status',
+		settings: 'Settings',
+		language: 'English'
+	},
+	de: {
+		control: 'Steuerung',
+		status: 'Status',
+		settings: 'Einstellungen',
+		language: 'Deutsch'
+	},
+	nl: {
+		control: 'Besturing',
+		status: 'Status',
+		settings: 'Instellingen',
+		language: 'Nederlands'
+	},
+	es: {
+		control: 'Control',
+		status: 'Estado',
+		settings: 'Ajustes',
+		language: 'Español'
+	}
+};
+
+test('capture screenshots across devices', async ({ page }, testInfo) => {
+	// Get the locale from the browser or default to 'en'
+	const locale = testInfo.project.use?.locale?.split('-')[0].toLowerCase() || 'en';
+	const translations = headings[locale] || headings.en;
+
+	statusJson.isUpdating = true;
+	// Set the color scheme
+	if (testInfo.project.use?.colorScheme === 'dark') {
+		settingsJson.invertedColor = true;
+	} else {
+		settingsJson.invertedColor = false;
+	}
+
+	await page.goto('/');
+	await expect(page.getByRole('heading', { name: translations.control })).toBeVisible();
+	await expect(page.getByRole('heading', { name: translations.status })).toBeVisible();
+	await expect(page.getByRole('heading', { name: translations.settings })).toBeVisible();
+
+	if (await page.locator('#nav-language-dropdown').isVisible()) {
+		await expect(page.getByRole('link', { name: translations.language })).toBeVisible();
+	}
+
+	const screenshot = await page.screenshot({
+		fullPage: true
+	});
+
+	await sharp(screenshot)
+		.toFormat('webp', {
+			quality: 95,
+			nearLossless: true
+		})
+		.toFile(
+			`./doc/screenshot-${test.info().project.use.colorScheme?.toLowerCase().replace(' ', '_')}.webp`
+		);
+});

tests/playwright/test.ts

@@ -132,7 +132,7 @@ test('screens should be able to change', async ({ page }) => {
 
 	await page.getByRole('button', { name: 'Sats per Dollar' }).click();
 	const response = await responsePromise;
-	expect(response.url()).toContain('api/show/screen/1');
+	expect(response.url()).toContain('api/show/screen/10');
 });
 
 test('parse all types of EPD content correctly', async ({ page }) => {

tests/shared.ts

@@ -1,33 +1,81 @@
+interface Page {
+	route: (url: string, handler: (route: Route) => Promise<void>) => Promise<void>;
+}
+
+interface Route {
+	fulfill: (response: {
+		json?: typeof statusJson | typeof settingsJson | typeof latestReleaseFake;
+		status?: number;
+		headers?: Record<string, string>;
+		body?: ReadableStream;
+	}) => Promise<void>;
+}
+
+export const fetchLatestBlockHeight = async () => {
+	const response = await fetch('https://ws.btclock.dev/api/lastblock');
+	const blockHeight = await response.text();
+	return ['BLOCK/HEIGHT', ...blockHeight.trim().split('')];
+};
+
+export const fetchLatestRelease = async () => {
+	try {
+		const response = await fetch(
+			'https://git.btclock.dev/api/v1/repos/btclock/btclock_v3/releases/latest'
+		);
+		if (!response.ok) throw new Error('Failed to fetch latest release');
+		const data = await response.json();
+		settingsJson.gitTag = data.tag_name;
+		return data;
+	} catch (error) {
+		console.warn('Failed to fetch latest release, using fallback:', error);
+		settingsJson.gitTag = latestReleaseFake.tag_name;
+		return latestReleaseFake;
+	}
+};
+
 export const statusJson = {
-	currentScreen: 0,
+	currentScreen: 20,
 	numScreens: 7,
 	timerRunning: true,
+	isOTAUpdating: false,
 	espUptime: 4479,
 	espFreeHeap: 58508,
 	espHeapSize: 342108,
-	connectionStatus: { price: true, blocks: true },
+	connectionStatus: {
+		price: false,
+		blocks: false,
+		V2: true,
+		nostr: true
+	},
 	rssi: -66,
-	data: ['BLOCK/HEIGHT', '8', '1', '8', '0', '2', '6'],
-	rendered: ['BLOCK/HEIGHT', '8', '1', '8', '0', '2', '6'],
+	data: ['BLOCK/HEIGHT', '0', '0', '0', '0', '0', '0'],
+	currency: 'USD',
 	leds: [
 		{ red: 0, green: 0, blue: 0, hex: '#000000' },
 		{ red: 0, green: 0, blue: 0, hex: '#000000' },
 		{ red: 0, green: 0, blue: 0, hex: '#000000' },
 		{ red: 0, green: 0, blue: 0, hex: '#000000' }
-	]
+	],
+	isUpdating: true,
+	isFake: true,
+	dnd: {
+		enabled: true,
+		timeBasedEnabled: true,
+		startTime: '23:00',
+		endTime: '7:00',
+		active: true
+	}
 };
 
 export const settingsJson = {
 	numScreens: 7,
-	fgColor: 415029,
-	bgColor: 0,
 	timerSeconds: 1800,
 	timerRunning: true,
 	minSecPriceUpd: 30,
 	fullRefreshMin: 60,
 	wpTimeout: 600,
 	tzOffset: 0,
-	useBitcoinNode: false,
+	dataSource: 0,
 	mempoolInstance: 'mempool.space',
 	ledTestOnPower: true,
 	ledFlashOnUpd: true,
@@ -42,7 +90,7 @@ export const settingsJson = {
 	ip: '192.168.20.231',
 	txPower: 78,
 	gitRev: '25d8b92bcbc8938417c140355ea3ba99ff9eb4b7',
-	gitTag: '3.1.9',
+	gitTag: '3.2.27',
 	bitaxeEnabled: false,
 	bitaxeHostname: 'bitaxe1',
 	miningPoolStats: false,
@@ -50,9 +98,9 @@ export const settingsJson = {
 	miningPoolUser: '38Qkkei3SuF1Eo45BaYmRHUneRD54yyTFy',
 	nostrZapNotify: true,
 	hwRev: 'REV_A_EPD_2_13',
-	fsRev: '4c5d9616212b27e3f05c35370f0befcf2c5a04b2',
+	fsRev: '64e518bf58f89749753167a8b6826e10bb6455c5',
 	nostrZapPubkey: 'b5127a08cf33616274800a4387881a9f98e04b9c37116e92de5250498635c422',
-	lastBuildTime: '1700666677',
+	lastBuildTime: Math.round(new Date().getTime() / 1000),
 	screens: [
 		{
 			id: 0,
@@ -62,17 +110,17 @@ export const settingsJson = {
 		{
 			id: 3,
 			name: 'Time',
-			enabled: true
+			enabled: false
 		},
 		{
 			id: 4,
 			name: 'Halving countdown',
-			enabled: true
+			enabled: false
 		},
 		{
 			id: 6,
 			name: 'Block Fee Rate',
-			enabled: true
+			enabled: false
 		},
 		{
 			id: 10,
@@ -87,32 +135,79 @@ export const settingsJson = {
 		{
 			id: 30,
 			name: 'Market Cap',
-			enabled: true
+			enabled: false
 		}
 	],
 	actCurrencies: ['USD', 'EUR'],
-	availableCurrencies: ['USD', 'EUR', 'GBP', 'JPY', 'AUD', 'CAD']
+	availableCurrencies: ['USD', 'EUR', 'GBP', 'JPY', 'AUD', 'CAD'],
+	availablePools: [
+		'ocean',
+		'noderunners',
+		'satoshi_radio',
+		'braiins',
+		'public_pool',
+		'gobrrr_pool',
+		'ckpool',
+		'eu_ckpool'
+	],
+	dnd: {
+		enabled: false,
+		timeBasedEnabled: true,
+		startHour: 23,
+		startMinute: 0,
+		endHour: 7,
+		endMinute: 0
+	},
+	availableFonts: ['antonio', 'oswald'],
+	invertedColor: false,
+	isLoaded: true,
+	isFake: true
 };
 
-export const initMock = async ({ page }) => {
+export const latestReleaseFake = {
+	id: 782,
+	tag_name: '3.2.24',
+	target_commitish: '',
+	name: '3.2.24',
+	body: '',
+	url: 'https://git.btclock.dev/api/v1/repos/btclock/btclock_v3/releases/782',
+	html_url: 'https://git.btclock.dev/btclock/btclock_v3/releases/tag/3.2.24',
+	tarball_url: 'https://git.btclock.dev/btclock/btclock_v3/archive/3.2.24.tar.gz',
+	zipball_url: 'https://git.btclock.dev/btclock/btclock_v3/archive/3.2.24.zip',
+	hide_archive_links: false,
+	upload_url: 'https://git.btclock.dev/api/v1/repos/btclock/btclock_v3/releases/782/assets',
+	draft: false,
+	prerelease: false,
+	created_at: '2024-12-28T17:48:05Z',
+	published_at: '2024-12-28T17:48:05Z',
+	author: {},
+	assets: [],
+	archive_download_count: {
+		zip: 0,
+		tar_gz: 0
+	}
+};
+
+export const initMock = async ({ page }: { page: Page }) => {
+	// Update status with latest block height
+	statusJson.data = await fetchLatestBlockHeight();
+	const latestRelease = await fetchLatestRelease();
+
 	await page.route('*/**/api/status', async (route) => {
 		await route.fulfill({ json: statusJson });
 	});
 
-	await page.route('*/**/api/show/screen/1', async (route) => {
+	await page.route('*/**/api/show/screen/10', async (route) => {
 		//if (route.request().url().includes('*/**/api/show/screen/1')) {
 		statusJson.currentScreen = 1;
 		statusJson.data = ['MSCW/TIME', ' ', ' ', '2', '6', '4', '4'];
-		statusJson.rendered = statusJson.data;
-		//}
 
 		await route.fulfill({ json: statusJson });
 	});
 
-	await page.route('*/**/api/show/screen/2', async (route) => {
+	await page.route('*/**/api/show/screen/20', async (route) => {
 		statusJson.currentScreen = 2;
 		statusJson.data = ['BTC/USD', '$', '3', '7', '8', '2', '4'];
-		statusJson.rendered = statusJson.data;
 
 		await route.fulfill({ json: statusJson });
 	});
@@ -120,7 +215,6 @@ export const initMock = async ({ page }) => {
 	await page.route('*/**/api/show/screen/4', async (route) => {
 		statusJson.currentScreen = 4;
 		statusJson.data = ['BIT/COIN', 'HALV/ING', '0/YRS', '149/DAYS', '8/HRS', '30/MINS', 'TO/GO'];
-		statusJson.rendered = statusJson.data;
 
 		await route.fulfill({ json: statusJson });
 	});
@@ -129,15 +223,35 @@ export const initMock = async ({ page }) => {
 		await route.fulfill({ json: settingsJson });
 	});
 
-	await page.route('**/events', (route) => {
+	await page.route('**/events', async (route) => {
 		const newStatus = statusJson;
 		newStatus.data = ['BLOCK/HEIGHT', '8', '0', '0', '8', '1', '5'];
+		newStatus.isUpdating = true;
 
-		// Respond with a custom SSE message
-		route.fulfill({
+		// Format the SSE message correctly
+		const sseMessage = `data: ${JSON.stringify(newStatus)}\n\n`;
+
+		// Create a readable stream for SSE
+		const stream = new ReadableStream({
+			start(controller) {
+				controller.enqueue(new TextEncoder().encode(sseMessage));
+				// Keep the connection open
+				// controller.close(); // Don't close if you want to send more events
+			}
+		});
+
+		await route.fulfill({
 			status: 200,
-			contentType: 'text/event-stream',
-			json: `${JSON.stringify(newStatus)}\n\n`
+			headers: {
+				'Content-Type': 'text/event-stream',
+				'Cache-Control': 'no-cache',
+				Connection: 'keep-alive'
+			},
+			body: stream
 		});
 	});
+
+	await page.route('**/api/v1/repos/btclock/btclock_v3/releases/latest', async (route) => {
+		await route.fulfill({ json: latestRelease });
+	});
 };

vite.config.test.ts

@@ -0,0 +1,18 @@
+import { sveltekit } from '@sveltejs/kit/vite';
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+	plugins: [sveltekit()],
+	build: {
+		sourcemap: true,
+		minify: false,
+		rollupOptions: {
+			output: {
+				manualChunks: undefined // Disable code splitting
+			}
+		}
+	},
+	test: {
+		include: ['tests/**/*.{test,spec}.{js,ts}']
+	}
+});