.forgejo/workflows/build.yaml

@@ -39,7 +39,6 @@ jobs:
           submodules: recursive
       - uses: actions/setup-node@v4
         with:
-          token: ${{ secrets.GH_TOKEN }}
           node-version: lts/*
           cache: yarn
           cache-dependency-path: '**/yarn.lock'
@@ -50,6 +49,9 @@ 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
@@ -118,7 +120,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.3
+        uses: https://code.forgejo.org/actions/forgejo-release@v2.5.1
         with:
           url: 'https://git.btclock.dev/'
           repo: '${{ github.repository }}'

README.md

@@ -1,7 +1,6 @@
 # BTClock WebUI
 
-[![Latest release](https://git.btclock.dev/btclock/webui/badges/release.svg)](https://git.btclock.dev/btclock/webui/releases/latest)
+[![BTClock CI](https://github.com/btclock/webui/actions/workflows/workflow.yml/badge.svg)](https://github.com/btclock/webui2/actions/workflows/workflow.yml)
-[![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.
 

package.json

@@ -5,7 +5,6 @@
 	"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",
@@ -69,5 +68,6 @@
 		"es5-ext": ">=0.10.64",
 		"ws": ">=8.18.0",
 		"micromatch": ">=4.0.8"
-	}
+	},
+	"packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }

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

@@ -1,17 +1,30 @@
 diff --git a/node_modules/@sveltejs/kit/src/exports/vite/index.js b/node_modules/@sveltejs/kit/src/exports/vite/index.js
-index ddbe746..1d926a4 100644
+index 21bc3d4..eef2db3 100644
 --- a/node_modules/@sveltejs/kit/src/exports/vite/index.js
 +++ b/node_modules/@sveltejs/kit/src/exports/vite/index.js
-@@ -658,9 +658,9 @@ async function kit({ svelte_config }) {
+@@ -648,9 +648,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/[hash].${ext}`,
+-								chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/chunks/[name].[hash].${ext}`,
 -								assetFileNames: `${prefix}/assets/[name].[hash][extname]`,
 +								entryFileNames: ssr ? '[name].js' : `${prefix}/[hash].${ext}`,
-+								chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/c[hash].${ext}`,
++								chunkFileNames: ssr ? 'chunks/[name].js' : `${prefix}/chunks/[hash].${ext}`,
-+								assetFileNames: `${prefix}/a[hash][extname]`,
++								assetFileNames: `${prefix}/assets/[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:test && npm run preview',
+		command: 'npm run build && npm run preview',
 		port: 4173
 	},
 	reporter: process.env.CI ? 'github' : 'list',

src/lib/components/settings/DisplaySettings.svelte

@@ -20,19 +20,14 @@
 
 	const setTextColor = () => {
 		$settings.invertedColor = !$settings.invertedColor;
+		$settings.fgColor = $settings.invertedColor ? 65535 : 0;
+		$settings.bgColor = $settings.invertedColor ? 0 : 65535;
 	};
 
 	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>
@@ -50,14 +45,6 @@
 			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')}
@@ -115,7 +102,7 @@
 				max={4095}
 				step={1}
 				size={$uiSettings.inputSize}
-				onChange={onFlBrightnessChange}
+				on:change={onFlBrightnessChange}
 			/>
 
 			<SettingsInput
@@ -190,14 +177,12 @@
 					size={$uiSettings.inputSize}
 				/>
 
-				{#if $settings.hasLightLevel}
+				<SettingsSwitch
-					<SettingsSwitch
+					id="flOffWhenDark"
-						id="flOffWhenDark"
+					bind:checked={$settings.flOffWhenDark}
-						bind:checked={$settings.flOffWhenDark}
+					label={$_('section.settings.flOffWhenDark')}
-						label={$_('section.settings.flOffWhenDark')}
+					size={$uiSettings.inputSize}
-						size={$uiSettings.inputSize}
+				/>
-					/>
-				{/if}
 			{/if}
 		</Row>
 	</ToggleHeader>

src/lib/components/settings/ExtraFeaturesSettings.svelte

@@ -13,7 +13,6 @@
 	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`);
@@ -62,49 +61,6 @@
 		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>
@@ -113,64 +69,6 @@
 		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">
@@ -222,21 +120,6 @@
 							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')}

src/lib/components/settings/ScreenSpecificSettings.svelte

@@ -4,7 +4,6 @@
 	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;
@@ -100,7 +99,7 @@
 				{/each}
 			{/if}
 		</Row>
-		{#if $settings.actCurrencies && $settings.dataSource == DataSourceType.BTCLOCK_SOURCE}
+		{#if $settings.actCurrencies && $settings.useNostr !== true}
 			<Row>
 				<h5>{$_('section.settings.currencies')}</h5>
 				<small>{$_('restartRequired')}</small>

src/lib/components/settings/SystemSettings.svelte

@@ -6,21 +6,36 @@
 	import { uiSettings } from '$lib/uiSettings';
 	import EyeIcon from 'svelte-bootstrap-icons/lib/Eye.svelte';
 	import EyeSlashIcon from 'svelte-bootstrap-icons/lib/EyeSlash.svelte';
-	import TimezoneSelector from './TimezoneSelector.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}>
-		<TimezoneSelector
+		<SettingsInput
-			value={$settings.tzString}
+			id="tzOffset"
-			onChange={(value) => ($settings.tzString = value)}
+			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

src/lib/components/settings/TimezoneSelector.svelte

@@ -1,56 +0,0 @@
-<script lang="ts">
-	import { _ } from 'svelte-i18n';
-	import { Row, Button, Col, Label, InputGroup, Input, FormText } from '@sveltestrap/sveltestrap';
-	import { onMount } from 'svelte';
-
-	export let value: string;
-	export let onChange: (value: string) => void;
-	export let size: string = 'sm';
-
-	let timezones: string[] = [];
-	let selectedTimezone: string = '';
-
-	onMount(async () => {
-		const response = await fetch('/zones.json');
-		const zones = await response.json();
-
-		// Convert zones data into array of {name, offset} objects
-		timezones = Object.keys(zones);
-
-		// Set the selected timezone to the current value
-		selectedTimezone = value;
-	});
-
-	function handleTimezoneChange(event: Event) {
-		const select = event.target as HTMLSelectElement;
-		onChange(select.value);
-	}
-
-	function getTzOffsetFromSystem() {
-		const detectedTzString = Intl.DateTimeFormat().resolvedOptions().timeZone;
-
-		onChange(detectedTzString);
-		selectedTimezone = detectedTzString;
-	}
-</script>
-
-<Row>
-	<Label md={6} {size} for="timezone">
-		{$_('section.settings.timezoneOffset')}
-	</Label>
-	<Col md="6" {size}>
-		<InputGroup>
-			<Input type="select" {size} bind:value={selectedTimezone} on:change={handleTimezoneChange}>
-				{#each timezones as tz}
-					<option value={tz}>
-						{tz}
-					</option>
-				{/each}
-			</Input>
-			<Button type="button" color="info" on:click={getTzOffsetFromSystem}>
-				{$_('auto-detect')}
-			</Button>
-		</InputGroup>
-		<FormText>{$_('section.settings.tzOffsetHelpText')}</FormText>
-	</Col>
-</Row>

src/lib/locales/de.json

@@ -67,13 +67,7 @@
 			"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",
@@ -101,9 +95,7 @@
 			"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",

src/lib/locales/en.json

@@ -84,13 +84,7 @@
 			},
 			"thirdPartySource": "Use mempool.space/coincap.io",
 			"ceDisableSSL": "Disable SSL",
-			"ceEndpoint": "Endpoint hostname",
+			"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",
@@ -120,9 +114,7 @@
 			"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.",

src/lib/locales/es.json

@@ -66,13 +66,7 @@
 			"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",
@@ -100,9 +94,7 @@
 			"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",

src/lib/locales/nl.json

@@ -58,13 +58,7 @@
 			"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",
@@ -91,9 +85,7 @@
 			"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",

src/routes/+page.svelte

@@ -105,6 +105,7 @@
 		setupObserver();
 
 		const connectEventSource = () => {
+			console.log('Connecting to EventSource');
 			const evtSource = new EventSource(`${PUBLIC_BASE_URL}/events`);
 
 			evtSource.addEventListener('status', (e) => {

src/routes/Settings.svelte

@@ -30,8 +30,7 @@
 		['public_pool', 'public-pool.io'],
 		['gobrrr_pool', 'Go Brrr pool'],
 		['ckpool', 'CKPool'],
-		['eu_ckpool', 'EU CKPool'],
+		['eu_ckpool', 'EU CKPool']
-		['local_public_pool', 'Public Pool (local)']
 	]);
 
 	const dispatch = createEventDispatcher();
@@ -115,13 +114,9 @@
 		<CardHeader>
 			<div class="float-end">
 				<small>
-					<button type="button" on:click={showAll} id="showAllBtn"
+					<button type="button" on:click={showAll}>{$_('section.settings.showAll')}</button>
-						>{$_('section.settings.showAll')}</button
-					>
 					|
-					<button type="button" on:click={hideAll} id="hideAllBtn"
+					<button type="button" on:click={hideAll}>{$_('section.settings.hideAll')}</button>
-						>{$_('section.settings.hideAll')}</button
-					>
 				</small>
 			</div>
 			<CardTitle>{$_('section.settings.title')}</CardTitle>

src/routes/Status.svelte

@@ -97,16 +97,6 @@
 		}
 	};
 
-	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;
@@ -168,7 +158,7 @@
 					<hr />
 					{#if $status.data}
 						<section class={lightMode ? 'lightMode' : 'darkMode'} style="position: relative;">
-							{#if $status.isUpdating === false && ($status.isFake ?? false) === false}
+							{#if $status.isUpdating === false && $status.isFake === false}
 								<div class="connection-lost-overlay">
 									<div class="overlay-content">
 										<i class="bi bi-wifi-off"></i>
@@ -195,27 +185,7 @@
 							>{#if $status.timerRunning}&#9205; {$_('timer.running')}{:else}&#9208; {$_(
 									'timer.stopped'
 								)}{/if}</a
-						><br />
-
-						{$_('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}
 				<hr />

static/zones.json

@@ -1,463 +0,0 @@
-{
-	"Africa/Abidjan": "GMT0",
-	"Africa/Accra": "GMT0",
-	"Africa/Addis_Ababa": "EAT-3",
-	"Africa/Algiers": "CET-1",
-	"Africa/Asmara": "EAT-3",
-	"Africa/Bamako": "GMT0",
-	"Africa/Bangui": "WAT-1",
-	"Africa/Banjul": "GMT0",
-	"Africa/Bissau": "GMT0",
-	"Africa/Blantyre": "CAT-2",
-	"Africa/Brazzaville": "WAT-1",
-	"Africa/Bujumbura": "CAT-2",
-	"Africa/Cairo": "EET-2EEST,M4.5.5/0,M10.5.4/24",
-	"Africa/Casablanca": "<+01>-1",
-	"Africa/Ceuta": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Africa/Conakry": "GMT0",
-	"Africa/Dakar": "GMT0",
-	"Africa/Dar_es_Salaam": "EAT-3",
-	"Africa/Djibouti": "EAT-3",
-	"Africa/Douala": "WAT-1",
-	"Africa/El_Aaiun": "<+01>-1",
-	"Africa/Freetown": "GMT0",
-	"Africa/Gaborone": "CAT-2",
-	"Africa/Harare": "CAT-2",
-	"Africa/Johannesburg": "SAST-2",
-	"Africa/Juba": "CAT-2",
-	"Africa/Kampala": "EAT-3",
-	"Africa/Khartoum": "CAT-2",
-	"Africa/Kigali": "CAT-2",
-	"Africa/Kinshasa": "WAT-1",
-	"Africa/Lagos": "WAT-1",
-	"Africa/Libreville": "WAT-1",
-	"Africa/Lome": "GMT0",
-	"Africa/Luanda": "WAT-1",
-	"Africa/Lubumbashi": "CAT-2",
-	"Africa/Lusaka": "CAT-2",
-	"Africa/Malabo": "WAT-1",
-	"Africa/Maputo": "CAT-2",
-	"Africa/Maseru": "SAST-2",
-	"Africa/Mbabane": "SAST-2",
-	"Africa/Mogadishu": "EAT-3",
-	"Africa/Monrovia": "GMT0",
-	"Africa/Nairobi": "EAT-3",
-	"Africa/Ndjamena": "WAT-1",
-	"Africa/Niamey": "WAT-1",
-	"Africa/Nouakchott": "GMT0",
-	"Africa/Ouagadougou": "GMT0",
-	"Africa/Porto-Novo": "WAT-1",
-	"Africa/Sao_Tome": "GMT0",
-	"Africa/Tripoli": "EET-2",
-	"Africa/Tunis": "CET-1",
-	"Africa/Windhoek": "CAT-2",
-	"America/Adak": "HST10HDT,M3.2.0,M11.1.0",
-	"America/Anchorage": "AKST9AKDT,M3.2.0,M11.1.0",
-	"America/Anguilla": "AST4",
-	"America/Antigua": "AST4",
-	"America/Araguaina": "<-03>3",
-	"America/Argentina/Buenos_Aires": "<-03>3",
-	"America/Argentina/Catamarca": "<-03>3",
-	"America/Argentina/Cordoba": "<-03>3",
-	"America/Argentina/Jujuy": "<-03>3",
-	"America/Argentina/La_Rioja": "<-03>3",
-	"America/Argentina/Mendoza": "<-03>3",
-	"America/Argentina/Rio_Gallegos": "<-03>3",
-	"America/Argentina/Salta": "<-03>3",
-	"America/Argentina/San_Juan": "<-03>3",
-	"America/Argentina/San_Luis": "<-03>3",
-	"America/Argentina/Tucuman": "<-03>3",
-	"America/Argentina/Ushuaia": "<-03>3",
-	"America/Aruba": "AST4",
-	"America/Asuncion": "<-04>4<-03>,M10.1.0/0,M3.4.0/0",
-	"America/Atikokan": "EST5",
-	"America/Bahia": "<-03>3",
-	"America/Bahia_Banderas": "CST6",
-	"America/Barbados": "AST4",
-	"America/Belem": "<-03>3",
-	"America/Belize": "CST6",
-	"America/Blanc-Sablon": "AST4",
-	"America/Boa_Vista": "<-04>4",
-	"America/Bogota": "<-05>5",
-	"America/Boise": "MST7MDT,M3.2.0,M11.1.0",
-	"America/Cambridge_Bay": "MST7MDT,M3.2.0,M11.1.0",
-	"America/Campo_Grande": "<-04>4",
-	"America/Cancun": "EST5",
-	"America/Caracas": "<-04>4",
-	"America/Cayenne": "<-03>3",
-	"America/Cayman": "EST5",
-	"America/Chicago": "CST6CDT,M3.2.0,M11.1.0",
-	"America/Chihuahua": "CST6",
-	"America/Costa_Rica": "CST6",
-	"America/Creston": "MST7",
-	"America/Cuiaba": "<-04>4",
-	"America/Curacao": "AST4",
-	"America/Danmarkshavn": "GMT0",
-	"America/Dawson": "MST7",
-	"America/Dawson_Creek": "MST7",
-	"America/Denver": "MST7MDT,M3.2.0,M11.1.0",
-	"America/Detroit": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Dominica": "AST4",
-	"America/Edmonton": "MST7MDT,M3.2.0,M11.1.0",
-	"America/Eirunepe": "<-05>5",
-	"America/El_Salvador": "CST6",
-	"America/Fort_Nelson": "MST7",
-	"America/Fortaleza": "<-03>3",
-	"America/Glace_Bay": "AST4ADT,M3.2.0,M11.1.0",
-	"America/Godthab": "<-02>2<-01>,M3.5.0/-1,M10.5.0/0",
-	"America/Goose_Bay": "AST4ADT,M3.2.0,M11.1.0",
-	"America/Grand_Turk": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Grenada": "AST4",
-	"America/Guadeloupe": "AST4",
-	"America/Guatemala": "CST6",
-	"America/Guayaquil": "<-05>5",
-	"America/Guyana": "<-04>4",
-	"America/Halifax": "AST4ADT,M3.2.0,M11.1.0",
-	"America/Havana": "CST5CDT,M3.2.0/0,M11.1.0/1",
-	"America/Hermosillo": "MST7",
-	"America/Indiana/Indianapolis": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Indiana/Knox": "CST6CDT,M3.2.0,M11.1.0",
-	"America/Indiana/Marengo": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Indiana/Petersburg": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Indiana/Tell_City": "CST6CDT,M3.2.0,M11.1.0",
-	"America/Indiana/Vevay": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Indiana/Vincennes": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Indiana/Winamac": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Inuvik": "MST7MDT,M3.2.0,M11.1.0",
-	"America/Iqaluit": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Jamaica": "EST5",
-	"America/Juneau": "AKST9AKDT,M3.2.0,M11.1.0",
-	"America/Kentucky/Louisville": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Kentucky/Monticello": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Kralendijk": "AST4",
-	"America/La_Paz": "<-04>4",
-	"America/Lima": "<-05>5",
-	"America/Los_Angeles": "PST8PDT,M3.2.0,M11.1.0",
-	"America/Lower_Princes": "AST4",
-	"America/Maceio": "<-03>3",
-	"America/Managua": "CST6",
-	"America/Manaus": "<-04>4",
-	"America/Marigot": "AST4",
-	"America/Martinique": "AST4",
-	"America/Matamoros": "CST6CDT,M3.2.0,M11.1.0",
-	"America/Mazatlan": "MST7",
-	"America/Menominee": "CST6CDT,M3.2.0,M11.1.0",
-	"America/Merida": "CST6",
-	"America/Metlakatla": "AKST9AKDT,M3.2.0,M11.1.0",
-	"America/Mexico_City": "CST6",
-	"America/Miquelon": "<-03>3<-02>,M3.2.0,M11.1.0",
-	"America/Moncton": "AST4ADT,M3.2.0,M11.1.0",
-	"America/Monterrey": "CST6",
-	"America/Montevideo": "<-03>3",
-	"America/Montreal": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Montserrat": "AST4",
-	"America/Nassau": "EST5EDT,M3.2.0,M11.1.0",
-	"America/New_York": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Nipigon": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Nome": "AKST9AKDT,M3.2.0,M11.1.0",
-	"America/Noronha": "<-02>2",
-	"America/North_Dakota/Beulah": "CST6CDT,M3.2.0,M11.1.0",
-	"America/North_Dakota/Center": "CST6CDT,M3.2.0,M11.1.0",
-	"America/North_Dakota/New_Salem": "CST6CDT,M3.2.0,M11.1.0",
-	"America/Nuuk": "<-02>2<-01>,M3.5.0/-1,M10.5.0/0",
-	"America/Ojinaga": "CST6CDT,M3.2.0,M11.1.0",
-	"America/Panama": "EST5",
-	"America/Pangnirtung": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Paramaribo": "<-03>3",
-	"America/Phoenix": "MST7",
-	"America/Port-au-Prince": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Port_of_Spain": "AST4",
-	"America/Porto_Velho": "<-04>4",
-	"America/Puerto_Rico": "AST4",
-	"America/Punta_Arenas": "<-03>3",
-	"America/Rainy_River": "CST6CDT,M3.2.0,M11.1.0",
-	"America/Rankin_Inlet": "CST6CDT,M3.2.0,M11.1.0",
-	"America/Recife": "<-03>3",
-	"America/Regina": "CST6",
-	"America/Resolute": "CST6CDT,M3.2.0,M11.1.0",
-	"America/Rio_Branco": "<-05>5",
-	"America/Santarem": "<-03>3",
-	"America/Santiago": "<-04>4<-03>,M9.1.6/24,M4.1.6/24",
-	"America/Santo_Domingo": "AST4",
-	"America/Sao_Paulo": "<-03>3",
-	"America/Scoresbysund": "<-02>2<-01>,M3.5.0/-1,M10.5.0/0",
-	"America/Sitka": "AKST9AKDT,M3.2.0,M11.1.0",
-	"America/St_Barthelemy": "AST4",
-	"America/St_Johns": "NST3:30NDT,M3.2.0,M11.1.0",
-	"America/St_Kitts": "AST4",
-	"America/St_Lucia": "AST4",
-	"America/St_Thomas": "AST4",
-	"America/St_Vincent": "AST4",
-	"America/Swift_Current": "CST6",
-	"America/Tegucigalpa": "CST6",
-	"America/Thule": "AST4ADT,M3.2.0,M11.1.0",
-	"America/Thunder_Bay": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Tijuana": "PST8PDT,M3.2.0,M11.1.0",
-	"America/Toronto": "EST5EDT,M3.2.0,M11.1.0",
-	"America/Tortola": "AST4",
-	"America/Vancouver": "PST8PDT,M3.2.0,M11.1.0",
-	"America/Whitehorse": "MST7",
-	"America/Winnipeg": "CST6CDT,M3.2.0,M11.1.0",
-	"America/Yakutat": "AKST9AKDT,M3.2.0,M11.1.0",
-	"America/Yellowknife": "MST7MDT,M3.2.0,M11.1.0",
-	"Antarctica/Casey": "<+08>-8",
-	"Antarctica/Davis": "<+07>-7",
-	"Antarctica/DumontDUrville": "<+10>-10",
-	"Antarctica/Macquarie": "AEST-10AEDT,M10.1.0,M4.1.0/3",
-	"Antarctica/Mawson": "<+05>-5",
-	"Antarctica/McMurdo": "NZST-12NZDT,M9.5.0,M4.1.0/3",
-	"Antarctica/Palmer": "<-03>3",
-	"Antarctica/Rothera": "<-03>3",
-	"Antarctica/Syowa": "<+03>-3",
-	"Antarctica/Troll": "<+00>0<+02>-2,M3.5.0/1,M10.5.0/3",
-	"Antarctica/Vostok": "<+05>-5",
-	"Arctic/Longyearbyen": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Asia/Aden": "<+03>-3",
-	"Asia/Almaty": "<+05>-5",
-	"Asia/Amman": "<+03>-3",
-	"Asia/Anadyr": "<+12>-12",
-	"Asia/Aqtau": "<+05>-5",
-	"Asia/Aqtobe": "<+05>-5",
-	"Asia/Ashgabat": "<+05>-5",
-	"Asia/Atyrau": "<+05>-5",
-	"Asia/Baghdad": "<+03>-3",
-	"Asia/Bahrain": "<+03>-3",
-	"Asia/Baku": "<+04>-4",
-	"Asia/Bangkok": "<+07>-7",
-	"Asia/Barnaul": "<+07>-7",
-	"Asia/Beirut": "EET-2EEST,M3.5.0/0,M10.5.0/0",
-	"Asia/Bishkek": "<+06>-6",
-	"Asia/Brunei": "<+08>-8",
-	"Asia/Chita": "<+09>-9",
-	"Asia/Choibalsan": "<+08>-8",
-	"Asia/Colombo": "<+0530>-5:30",
-	"Asia/Damascus": "<+03>-3",
-	"Asia/Dhaka": "<+06>-6",
-	"Asia/Dili": "<+09>-9",
-	"Asia/Dubai": "<+04>-4",
-	"Asia/Dushanbe": "<+05>-5",
-	"Asia/Famagusta": "EET-2EEST,M3.5.0/3,M10.5.0/4",
-	"Asia/Gaza": "EET-2EEST,M3.4.4/50,M10.4.4/50",
-	"Asia/Hebron": "EET-2EEST,M3.4.4/50,M10.4.4/50",
-	"Asia/Ho_Chi_Minh": "<+07>-7",
-	"Asia/Hong_Kong": "HKT-8",
-	"Asia/Hovd": "<+07>-7",
-	"Asia/Irkutsk": "<+08>-8",
-	"Asia/Jakarta": "WIB-7",
-	"Asia/Jayapura": "WIT-9",
-	"Asia/Jerusalem": "IST-2IDT,M3.4.4/26,M10.5.0",
-	"Asia/Kabul": "<+0430>-4:30",
-	"Asia/Kamchatka": "<+12>-12",
-	"Asia/Karachi": "PKT-5",
-	"Asia/Kathmandu": "<+0545>-5:45",
-	"Asia/Khandyga": "<+09>-9",
-	"Asia/Kolkata": "IST-5:30",
-	"Asia/Krasnoyarsk": "<+07>-7",
-	"Asia/Kuala_Lumpur": "<+08>-8",
-	"Asia/Kuching": "<+08>-8",
-	"Asia/Kuwait": "<+03>-3",
-	"Asia/Macau": "CST-8",
-	"Asia/Magadan": "<+11>-11",
-	"Asia/Makassar": "WITA-8",
-	"Asia/Manila": "PST-8",
-	"Asia/Muscat": "<+04>-4",
-	"Asia/Nicosia": "EET-2EEST,M3.5.0/3,M10.5.0/4",
-	"Asia/Novokuznetsk": "<+07>-7",
-	"Asia/Novosibirsk": "<+07>-7",
-	"Asia/Omsk": "<+06>-6",
-	"Asia/Oral": "<+05>-5",
-	"Asia/Phnom_Penh": "<+07>-7",
-	"Asia/Pontianak": "WIB-7",
-	"Asia/Pyongyang": "KST-9",
-	"Asia/Qatar": "<+03>-3",
-	"Asia/Qyzylorda": "<+05>-5",
-	"Asia/Riyadh": "<+03>-3",
-	"Asia/Sakhalin": "<+11>-11",
-	"Asia/Samarkand": "<+05>-5",
-	"Asia/Seoul": "KST-9",
-	"Asia/Shanghai": "CST-8",
-	"Asia/Singapore": "<+08>-8",
-	"Asia/Srednekolymsk": "<+11>-11",
-	"Asia/Taipei": "CST-8",
-	"Asia/Tashkent": "<+05>-5",
-	"Asia/Tbilisi": "<+04>-4",
-	"Asia/Tehran": "<+0330>-3:30",
-	"Asia/Thimphu": "<+06>-6",
-	"Asia/Tokyo": "JST-9",
-	"Asia/Tomsk": "<+07>-7",
-	"Asia/Ulaanbaatar": "<+08>-8",
-	"Asia/Urumqi": "<+06>-6",
-	"Asia/Ust-Nera": "<+10>-10",
-	"Asia/Vientiane": "<+07>-7",
-	"Asia/Vladivostok": "<+10>-10",
-	"Asia/Yakutsk": "<+09>-9",
-	"Asia/Yangon": "<+0630>-6:30",
-	"Asia/Yekaterinburg": "<+05>-5",
-	"Asia/Yerevan": "<+04>-4",
-	"Atlantic/Azores": "<-01>1<+00>,M3.5.0/0,M10.5.0/1",
-	"Atlantic/Bermuda": "AST4ADT,M3.2.0,M11.1.0",
-	"Atlantic/Canary": "WET0WEST,M3.5.0/1,M10.5.0",
-	"Atlantic/Cape_Verde": "<-01>1",
-	"Atlantic/Faroe": "WET0WEST,M3.5.0/1,M10.5.0",
-	"Atlantic/Madeira": "WET0WEST,M3.5.0/1,M10.5.0",
-	"Atlantic/Reykjavik": "GMT0",
-	"Atlantic/South_Georgia": "<-02>2",
-	"Atlantic/St_Helena": "GMT0",
-	"Atlantic/Stanley": "<-03>3",
-	"Australia/Adelaide": "ACST-9:30ACDT,M10.1.0,M4.1.0/3",
-	"Australia/Brisbane": "AEST-10",
-	"Australia/Broken_Hill": "ACST-9:30ACDT,M10.1.0,M4.1.0/3",
-	"Australia/Currie": "AEST-10AEDT,M10.1.0,M4.1.0/3",
-	"Australia/Darwin": "ACST-9:30",
-	"Australia/Eucla": "<+0845>-8:45",
-	"Australia/Hobart": "AEST-10AEDT,M10.1.0,M4.1.0/3",
-	"Australia/Lindeman": "AEST-10",
-	"Australia/Lord_Howe": "<+1030>-10:30<+11>-11,M10.1.0,M4.1.0",
-	"Australia/Melbourne": "AEST-10AEDT,M10.1.0,M4.1.0/3",
-	"Australia/Perth": "AWST-8",
-	"Australia/Sydney": "AEST-10AEDT,M10.1.0,M4.1.0/3",
-	"Etc/GMT": "GMT0",
-	"Etc/GMT+0": "GMT0",
-	"Etc/GMT+1": "<-01>1",
-	"Etc/GMT+10": "<-10>10",
-	"Etc/GMT+11": "<-11>11",
-	"Etc/GMT+12": "<-12>12",
-	"Etc/GMT+2": "<-02>2",
-	"Etc/GMT+3": "<-03>3",
-	"Etc/GMT+4": "<-04>4",
-	"Etc/GMT+5": "<-05>5",
-	"Etc/GMT+6": "<-06>6",
-	"Etc/GMT+7": "<-07>7",
-	"Etc/GMT+8": "<-08>8",
-	"Etc/GMT+9": "<-09>9",
-	"Etc/GMT-0": "GMT0",
-	"Etc/GMT-1": "<+01>-1",
-	"Etc/GMT-10": "<+10>-10",
-	"Etc/GMT-11": "<+11>-11",
-	"Etc/GMT-12": "<+12>-12",
-	"Etc/GMT-13": "<+13>-13",
-	"Etc/GMT-14": "<+14>-14",
-	"Etc/GMT-2": "<+02>-2",
-	"Etc/GMT-3": "<+03>-3",
-	"Etc/GMT-4": "<+04>-4",
-	"Etc/GMT-5": "<+05>-5",
-	"Etc/GMT-6": "<+06>-6",
-	"Etc/GMT-7": "<+07>-7",
-	"Etc/GMT-8": "<+08>-8",
-	"Etc/GMT-9": "<+09>-9",
-	"Etc/GMT0": "GMT0",
-	"Etc/Greenwich": "GMT0",
-	"Etc/UCT": "UTC0",
-	"Etc/UTC": "UTC0",
-	"Etc/Universal": "UTC0",
-	"Etc/Zulu": "UTC0",
-	"Europe/Amsterdam": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Andorra": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Astrakhan": "<+04>-4",
-	"Europe/Athens": "EET-2EEST,M3.5.0/3,M10.5.0/4",
-	"Europe/Belgrade": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Berlin": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Bratislava": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Brussels": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Bucharest": "EET-2EEST,M3.5.0/3,M10.5.0/4",
-	"Europe/Budapest": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Busingen": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Chisinau": "EET-2EEST,M3.5.0,M10.5.0/3",
-	"Europe/Copenhagen": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Dublin": "IST-1GMT0,M10.5.0,M3.5.0/1",
-	"Europe/Gibraltar": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Guernsey": "GMT0BST,M3.5.0/1,M10.5.0",
-	"Europe/Helsinki": "EET-2EEST,M3.5.0/3,M10.5.0/4",
-	"Europe/Isle_of_Man": "GMT0BST,M3.5.0/1,M10.5.0",
-	"Europe/Istanbul": "<+03>-3",
-	"Europe/Jersey": "GMT0BST,M3.5.0/1,M10.5.0",
-	"Europe/Kaliningrad": "EET-2",
-	"Europe/Kiev": "EET-2EEST,M3.5.0/3,M10.5.0/4",
-	"Europe/Kirov": "MSK-3",
-	"Europe/Lisbon": "WET0WEST,M3.5.0/1,M10.5.0",
-	"Europe/Ljubljana": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/London": "GMT0BST,M3.5.0/1,M10.5.0",
-	"Europe/Luxembourg": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Madrid": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Malta": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Mariehamn": "EET-2EEST,M3.5.0/3,M10.5.0/4",
-	"Europe/Minsk": "<+03>-3",
-	"Europe/Monaco": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Moscow": "MSK-3",
-	"Europe/Oslo": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Paris": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Podgorica": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Prague": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Riga": "EET-2EEST,M3.5.0/3,M10.5.0/4",
-	"Europe/Rome": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Samara": "<+04>-4",
-	"Europe/San_Marino": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Sarajevo": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Saratov": "<+04>-4",
-	"Europe/Simferopol": "MSK-3",
-	"Europe/Skopje": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Sofia": "EET-2EEST,M3.5.0/3,M10.5.0/4",
-	"Europe/Stockholm": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Tallinn": "EET-2EEST,M3.5.0/3,M10.5.0/4",
-	"Europe/Tirane": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Ulyanovsk": "<+04>-4",
-	"Europe/Uzhgorod": "EET-2EEST,M3.5.0/3,M10.5.0/4",
-	"Europe/Vaduz": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Vatican": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Vienna": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Vilnius": "EET-2EEST,M3.5.0/3,M10.5.0/4",
-	"Europe/Volgograd": "MSK-3",
-	"Europe/Warsaw": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Zagreb": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Europe/Zaporozhye": "EET-2EEST,M3.5.0/3,M10.5.0/4",
-	"Europe/Zurich": "CET-1CEST,M3.5.0,M10.5.0/3",
-	"Indian/Antananarivo": "EAT-3",
-	"Indian/Chagos": "<+06>-6",
-	"Indian/Christmas": "<+07>-7",
-	"Indian/Cocos": "<+0630>-6:30",
-	"Indian/Comoro": "EAT-3",
-	"Indian/Kerguelen": "<+05>-5",
-	"Indian/Mahe": "<+04>-4",
-	"Indian/Maldives": "<+05>-5",
-	"Indian/Mauritius": "<+04>-4",
-	"Indian/Mayotte": "EAT-3",
-	"Indian/Reunion": "<+04>-4",
-	"Pacific/Apia": "<+13>-13",
-	"Pacific/Auckland": "NZST-12NZDT,M9.5.0,M4.1.0/3",
-	"Pacific/Bougainville": "<+11>-11",
-	"Pacific/Chatham": "<+1245>-12:45<+1345>,M9.5.0/2:45,M4.1.0/3:45",
-	"Pacific/Chuuk": "<+10>-10",
-	"Pacific/Easter": "<-06>6<-05>,M9.1.6/22,M4.1.6/22",
-	"Pacific/Efate": "<+11>-11",
-	"Pacific/Enderbury": "<+13>-13",
-	"Pacific/Fakaofo": "<+13>-13",
-	"Pacific/Fiji": "<+12>-12",
-	"Pacific/Funafuti": "<+12>-12",
-	"Pacific/Galapagos": "<-06>6",
-	"Pacific/Gambier": "<-09>9",
-	"Pacific/Guadalcanal": "<+11>-11",
-	"Pacific/Guam": "ChST-10",
-	"Pacific/Honolulu": "HST10",
-	"Pacific/Kiritimati": "<+14>-14",
-	"Pacific/Kosrae": "<+11>-11",
-	"Pacific/Kwajalein": "<+12>-12",
-	"Pacific/Majuro": "<+12>-12",
-	"Pacific/Marquesas": "<-0930>9:30",
-	"Pacific/Midway": "SST11",
-	"Pacific/Nauru": "<+12>-12",
-	"Pacific/Niue": "<-11>11",
-	"Pacific/Norfolk": "<+11>-11<+12>,M10.1.0,M4.1.0/3",
-	"Pacific/Noumea": "<+11>-11",
-	"Pacific/Pago_Pago": "SST11",
-	"Pacific/Palau": "<+09>-9",
-	"Pacific/Pitcairn": "<-08>8",
-	"Pacific/Pohnpei": "<+11>-11",
-	"Pacific/Port_Moresby": "<+10>-10",
-	"Pacific/Rarotonga": "<-10>10",
-	"Pacific/Saipan": "ChST-10",
-	"Pacific/Tahiti": "<-10>10",
-	"Pacific/Tarawa": "<+12>-12",
-	"Pacific/Tongatapu": "<+13>-13",
-	"Pacific/Wake": "<+12>-12",
-	"Pacific/Wallis": "<+12>-12"
-}

tests/playwright/test.ts

@@ -28,19 +28,19 @@ test('api page has expected load button', async ({ page }) => {
 	await expect(page.getByRole('button', { name: 'Load' })).toBeVisible();
 });
 
-// test('timezone can be negative, zero and positive', async ({ page }) => {
+test('timezone can be negative, zero and positive', async ({ page }) => {
-// 	await page.goto('/');
+	await page.goto('/');
-// 	await page.getByRole('button', { name: 'Show all' }).click();
+	await page.getByRole('button', { name: 'Show all' }).click();
 
-// 	const tzOffsetField = 'input#tzOffset';
+	const tzOffsetField = 'input#tzOffset';
 
-// 	for (const val of ['-10', '0', '42']) {
+	for (const val of ['-10', '0', '42']) {
-// 		await page.fill(tzOffsetField, val);
+		await page.fill(tzOffsetField, val);
-// 		const resultValue = await page.$eval(tzOffsetField, (input: HTMLInputElement) => input.value);
+		const resultValue = await page.$eval(tzOffsetField, (input: HTMLInputElement) => input.value);
-// 		expect(resultValue).toBe(val);
+		expect(resultValue).toBe(val);
-// 		await page.getByRole('button', { name: 'Save' }).click();
+		await page.getByRole('button', { name: 'Save' }).click();
-// 	}
+	}
-// });
+});
 
 test('time values can not be zero or negative', async ({ page }) => {
 	await page.goto('/');

tests/shared.ts

@@ -1,38 +1,3 @@
-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: 20,
 	numScreens: 7,
@@ -48,7 +13,7 @@ export const statusJson = {
 		nostr: true
 	},
 	rssi: -66,
-	data: ['BLOCK/HEIGHT', '0', '0', '0', '0', '0', '0'],
+	data: ['BLOCK/HEIGHT', '8', '7', '6', '5', '4', '3'],
 	currency: 'USD',
 	leds: [
 		{ red: 0, green: 0, blue: 0, hex: '#000000' },
@@ -57,14 +22,7 @@ export const statusJson = {
 		{ red: 0, green: 0, blue: 0, hex: '#000000' }
 	],
 	isUpdating: true,
-	isFake: true,
+	isFake: true
-	dnd: {
-		enabled: true,
-		timeBasedEnabled: true,
-		startTime: '23:00',
-		endTime: '7:00',
-		active: true
-	}
 };
 
 export const settingsJson = {
@@ -90,7 +48,7 @@ export const settingsJson = {
 	ip: '192.168.20.231',
 	txPower: 78,
 	gitRev: '25d8b92bcbc8938417c140355ea3ba99ff9eb4b7',
-	gitTag: '3.2.27',
+	gitTag: '3.2.23',
 	bitaxeEnabled: false,
 	bitaxeHostname: 'bitaxe1',
 	miningPoolStats: false,
@@ -150,18 +108,8 @@ export const settingsJson = {
 		'ckpool',
 		'eu_ckpool'
 	],
-	dnd: {
-		enabled: false,
-		timeBasedEnabled: true,
-		startHour: 23,
-		startMinute: 0,
-		endHour: 7,
-		endMinute: 0
-	},
-	availableFonts: ['antonio', 'oswald'],
 	invertedColor: false,
-	isLoaded: true,
+	isLoaded: true
-	isFake: true
 };
 
 export const latestReleaseFake = {
@@ -188,11 +136,7 @@ export const latestReleaseFake = {
 	}
 };
 
-export const initMock = async ({ page }: { page: Page }) => {
+export const initMock = async ({ 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 });
 	});
@@ -223,35 +167,20 @@ export const initMock = async ({ page }: { page: Page }) => {
 		await route.fulfill({ json: settingsJson });
 	});
 
-	await page.route('**/events', async (route) => {
+	await page.route('**/events', (route) => {
 		const newStatus = statusJson;
 		newStatus.data = ['BLOCK/HEIGHT', '8', '0', '0', '8', '1', '5'];
 		newStatus.isUpdating = true;
 
-		// Format the SSE message correctly
+		// Respond with a custom SSE message
-		const sseMessage = `data: ${JSON.stringify(newStatus)}\n\n`;
+		route.fulfill({
-
-		// 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,
-			headers: {
+			contentType: 'text/event-stream',
-				'Content-Type': 'text/event-stream',
+			json: `${JSON.stringify(newStatus)}\n\n`
-				'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 });
+		await route.fulfill({ json: latestReleaseFake });
 	});
 };

vite.config.test.ts

@@ -1,18 +0,0 @@
-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}']
-	}
-});