- fixed issue with faulty progress bar

- fixed issue with config-safe-states

.gitignore

@@ -1 +1,12 @@
-node_modules
+node_modules
+rename.sh
+data-persistence.json
+log-journal.json
+config.json
+log-journal.json
+bom.json
+log-journal.json
+openCountdown
+openCountdown.exe
+buildout
+package-lock.json

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "pwa-node",
+            "request": "launch",
+            "name": "Launch Program",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/index.js"
+        }
+    ]
+}

LICENSE.txt

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

README.MD

@@ -1,10 +1,31 @@
+<img alt="openCountdown Logo" height="90px" src="https://git.project-name-here.de/Project-Name-Here/openCountdown/raw/branch/master/static/logo/logoProposal.svg">
+
 # openCountdown
+openCountdown is a professional software for event countdowns. It can be used in a live settings such as a music event. 
+Support for companion is currently being worked on [here](https://github.com/bitfocus/companion-module-pnh-opencountdown).
+
+<a href="https://bitfocus.io/companion/?ref=pnh-Opencountdown" target="_new"><img alt="Controllable by Companion" src="https://bitfocus.io/companion-badge.png?ref=pnh-Opencountdown"></a>
+
+# Installation
+You can download complete binaries from the release tab.
+## Development build
+1. Download the repository
+2. `npm install` to install dependencies
+3. `npm start` to launch
+
+### Startup Arguments
+One can pass a `--headless` argument to start the server in headless mode. This will disable the GUI.
+## Packaging
+We've introduced a new packaging system. It is based on [electron-builder](https://www.electron.build/). This allows for easy packaging of the application for different platforms.
+```bash
+chmod +x ./build.sh
+./build.sh
+```
+*Small disclaimer: Please do not use openCountdown for military or life-depending applications. Please also refrain from using openCountdown for launching rockets.*
+
+
 
 # ToDo
-- [X] Pausing functions
-- [X] Presets
-- [X] time on countdown page
-- [X] one-way messaging
-- [ ] Better UI
-- [X] Progress bar
-- [P] Endpoint docs
+Endpoint documentation is currently pretty thin. This will be changed in the future.
+- [ ] Endpoint docs (in Progress)
+- [ ] Better WS frames

build.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+#npx electron-packager . --platform=win32 --overwrite --out=./buildout
+npx electron-packager . --platform=win32,linux --overwrite --out=./buildout
+cd "./buildout/" || exit 1
+
+resources=(
+        "electronAssets"
+        "lang"
+        "static"
+        "templates"
+        "package.json"
+)
+
+for dir in */; do
+        for i in "${resources[@]}"; do
+                echo "$dir -> $i"
+                cp -r "$dir/resources/app/$i" "$dir"
+        done
+done

build_win.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+#npx electron-packager . --platform=win32 --overwrite --out=./buildout
+npx electron-packager . --platform=win32,linux --overwrite --out=./buildout
+cd "./buildout/" || exit 1
+
+resources=(
+        "electronAssets"
+        "lang"
+        "static"
+        "templates"
+        "package.json"
+)
+
+for dir in */; do
+        for i in "${resources[@]}"; do
+                echo "$dir -> $i"
+                cp -r "$dir\resources/app/$i" "$dir"
+        done
+done

docs/swagger.yaml

@@ -170,7 +170,7 @@ paths:
       operationId: "textEnableColoring"
       parameters:
         - in: path
-          name: "show"
+          name: "enable"
           required: true
           type: boolean
           description: "If true the timer will change color by value, else the timer stays white."

electronAssets/index.html

@@ -0,0 +1,222 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8" />
+		<title>openCountdown</title>
+	</head>
+
+	<body>
+		<style>
+			body,
+			html {
+				margin: 0;
+				padding: 0;
+				-webkit-app-region: drag;
+			}
+
+			body {
+				background-color: rgba(35, 35, 35, 1);
+				color: white;
+				font-family: 'Helvetica';
+				overflow: hidden;
+			}
+
+			#wrap {
+				width: 100%;
+				margin-top: 20px;
+				display: block;
+				text-align: center;
+			}
+
+			#logo {
+				width: 200px;
+				padding-top: 20px;
+				padding-bottom: 10px;
+				text-align: center;
+				user-select: none;
+			}
+
+			#actions {
+				padding: 10px;
+				display: block;
+				box-shadow: inset 0px 5px 10px rgba(0, 0, 0, 0.3);
+				padding-top: 20px;
+				padding-bottom: 20px;
+				background-color: #d40215;
+                background-image: url("background.svg");
+            background-position: 60% 60%;
+				user-select: none;
+			}
+
+			.dobutton {
+				font-size: 1em;
+				padding: 10px 20px;
+				border: 0px;
+				user-select: none;
+				cursor: pointer;
+				border-radius: 4px;
+			}
+
+			#launch {
+				background-color: rgba(255, 255, 255, 1);
+				margin-right: 5px;
+				border: 1px solid white;
+			}
+
+			#hide {
+				background-color: rgba(255, 255, 255, 0.1);
+				color: white;
+				margin-right: 5px;
+				border: 1px solid white;
+			}
+
+			#close {
+				background-color: rgba(255, 255, 255, 0.1);
+				color: white;
+				border: 1px solid white;
+			}
+
+			input {
+				-webkit-appearance: textfield;
+				background-color: white;
+				-webkit-rtl-ordering: logical;
+				cursor: text;
+				padding: 1px;
+				border-width: 2px;
+				border-style: inset;
+				border-color: initial;
+				border-image: initial;
+			}
+
+			#status,
+			#model {
+				user-select: none !important;
+			}
+
+			#status {
+				font-size: 40px;
+				font-weight: 100;
+				margin: 0;
+				color: rgba(255, 255, 255, 0.4);
+			}
+
+			#model {
+				font-size: 14px;
+			}
+
+			h1 {
+				font-size: 40px;
+				padding-top: 20px;
+				font-weight: 100;
+			}
+
+			#url {
+				padding-top: 5px;
+				padding-bottom: 10px;
+				-webkit-app-region: no-drag !important;
+			}
+
+			#meh {
+				background-color: #b00013;
+                background-image: url("background.svg");
+            background-position: 90% 90%;
+				margin-top: 30px;
+				padding-bottom: 10px;
+			}
+
+			textarea:focus,
+			input:focus {
+				outline: 0;
+			}
+
+			#ifs,
+			input[type='button'] {
+				-webkit-app-region: no-drag !important;
+			}
+
+			input {
+				-webkit-app-region: no-drag !important;
+			}
+
+			#ifp {
+				width: 50px;
+				text-align: center;
+				border-bottom-left-radius: 3px;
+				border-top-left-radius: 3px;
+				background-color: #d40215;
+				font-size: 13px;
+				color: #fff;
+				padding-top: 3px;
+				padding-bottom: 3px;
+				border: 1px solid white;
+				border-right-width: 1px;
+			}
+
+			#ifpb {
+				cursor: pointer;
+				border: 1px solid #ccc;
+				background-color: #b00013;
+				color: white;
+				border: 1px solid white;
+				padding: 3px 8px;
+				border-bottom-right-radius: 3px;
+				border-top-right-radius: 3px;
+				border-left-width: 0px;
+				margin-top: -1px;
+				font-size: 13px;
+			}
+
+			#ifpb:hover {
+				background-color: #666;
+			}
+
+			#ift {
+				color: white;
+				-webkit-appearance: checkbox;
+				cursor: pointer;
+			}
+
+			#ifs {
+				background-color: #d40215;
+				color: #fff;
+				border: 1px solid white;
+				font-size: 12px !important;
+				margin-bottom: -4px;
+			}
+
+			#guitext {
+				font-size: 12px;
+				color: white;
+				padding-top: 0px;
+				padding-bottom: 2px;
+			}
+
+			#bottombuttons {
+				padding-bottom: 100px;
+			}
+		</style>
+		<div id="wrap">
+			<div id="topwrap">
+				<img id="logo" src="../static/logo/logoProposal.svg" alt="openCountdown" />
+				<div id="model">model_text (version_etc)</div>
+			</div>
+			<div id="meh">
+				<h1 id="status">Status</h1>
+				<div id="url">URL</div>
+			</div>
+			<div id="actions">
+				<p><input type="text" maxlength="5" id="ifp" value="8000" /><input type="button" id="ifpb" value="Change" /></p>
+				<p>
+					<input type="checkbox" id="ift" />
+					<label for="ift" style="font-size: 12px">Start minimized</label>
+				</p>
+				<div id="bottombuttons">
+					<input type="button" class="dobutton" value="Launch GUI" id="launch" />
+					<input type="button" class="dobutton" value="Hide" id="hide" />
+					<input type="button" class="dobutton" value="Quit" id="close" />
+				</div>
+			</div>
+		</div>
+		<script type="text/javascript" src="window.js"></script>
+	</body>
+</html>

electronAssets/window.js

@@ -0,0 +1,33 @@
+document.getElementById('launch').addEventListener('click', function () {
+	api.send('skeleton-launch-gui')
+})
+
+document.getElementById('hide').addEventListener('click', function () {
+	api.send('skeleton-minimize')
+})
+
+document.getElementById('close').addEventListener('click', function () {
+	api.send('skeleton-close')
+})
+
+api.receive('info', function (info) {
+	document.getElementById('status').innerHTML = info.appStatus
+	document.getElementById('url').innerHTML = info.appURL
+	document.getElementById('model').innerHTML = `${info.appName}`
+	document.getElementById('ift').checked = info.startMinimised
+	document.getElementById('ifp').value = configObject.port
+	document.title = info.appName
+})
+api.send('info')
+
+document.getElementById('ifpb').addEventListener('click', function () {
+	var e = document.getElementById('ifp')
+	api.send('skeleton-bind-port', e.value)
+})
+
+document.getElementById('ift').addEventListener('click', function () {
+	var e = document.getElementById('ift')
+	api.send('skeleton-start-minimised', e.checked)
+})
+
+api.send('skeleton-ready')

electronAssets/windowPreload.js

@@ -0,0 +1,12 @@
+const { contextBridge, ipcRenderer } = require('electron')
+
+contextBridge.exposeInMainWorld('api', {
+	send: (channel, data) => {
+		// whitelist channels
+		ipcRenderer.send(channel, data)
+	},
+	receive: (channel, func) => {
+		// Deliberately strip event as it includes `sender`
+		ipcRenderer.on(channel, (event, ...args) => func(...args))
+	},
+})

helpers.js

@@ -0,0 +1,55 @@
+/**
+ * Converts a string into a boolean
+ * @param {String} stringBoolean 
+ * @returns Boolean if valid or -1 otherwise
+ */
+function convertStringBooleanToBoolean(stringBoolean) {
+  if (stringBoolean === 'true') {
+    return true;
+  } else if(stringBoolean === 'false') {
+    return false;
+  } else {
+      return(-1)
+  }
+}
+
+/**
+ * Wraps convertStringBooleanToBoolean to be used with express. Will respond with an error if the boolean is invalid. Else dataObj will be set to the converted boolean value.
+ * @param {String} stringBoolean An input string given by the user
+ * @param {*} res Expresses response object
+ * @param {*} dataObj The data to manipulate
+ */
+
+function wrapBooleanConverter(stringBoolean, res) {
+  const temp = convertStringBooleanToBoolean(stringBoolean);
+  if(temp == -1) {
+    res.json({ status: "error", message: "Invalid boolean value" });
+  } else {
+    return(temp);
+  }
+}
+
+/**
+ * Tries to parse a string to a JSON object. Returns false if invalid. Taken from https://stackoverflow.com/a/20392392/11317151
+ * @param {String} jsonString A JSON String to parse
+ * @returns {Object/Boolean} JSON Object if valid or false otherwise
+ */
+function tryToParseJson(jsonString) {
+    try {
+        var o = JSON.parse(jsonString);
+
+        // Handle non-exception-throwing cases:
+        // Neither JSON.parse(false) or JSON.parse(1234) throw errors, hence the type-checking,
+        // but... JSON.parse(null) returns null, and typeof null === "object", 
+        // so we must check for that, too. Thankfully, null is falsey, so this suffices:
+        if (o && typeof o === "object") {
+            return o;
+        }
+    }
+    catch (e) { }
+
+    return false;
+}
+
+
+module.exports = { convertStringBooleanToBoolean, wrapBooleanConverter, tryToParseJson };

index.js

@@ -1,12 +1,22 @@
 const express = require("express");
 const fs = require("fs");
 const bodyParser = require("body-parser");
+const ws = require("ws");
+const helper = require("./helpers.js");
+const loggy = require("./logging");
+const Eta = require("eta");
+const _ = require("underscore");
+const path = require("path");
 
+loggy.init(true);
+
+loggy.log("Preparing server", "info", "Server");
 const app = express();
 
+loggy.log("Preparing static routes", "info", "Server");
 app.use(express.static("static"));
-app.use(express.static("node_modules"));
 
+loggy.log("Preparing middlewares", "info", "Server");
 app.use(bodyParser.json());
 app.use(
   bodyParser.urlencoded({
@@ -15,133 +25,528 @@ app.use(
   })
 );
 
+// Allowed urls for requests to /assets/
+const allowsURLs = [
+  "bootstrap-icons/font/bootstrap-icons.css",
+  "js-cookie/dist/js.cookie.min.js",
+  "bootstrap/dist/css/bootstrap.min.css",
+  "mdbootstrap/css/style.css",
+  "bootstrap/dist/js/bootstrap.bundle.min.js",
+  "jquery/dist/jquery.min.js",
+  "darkreader/darkreader.js",
+  "bootstrap-duration-picker/dist/bootstrap-duration-picker.css",
+  "flatpickr/dist/flatpickr.min.css",
+  "bootstrap-duration-picker/dist/bootstrap-duration-picker-debug.js",
+  "flatpickr/dist/flatpickr.js",
+  "bootstrap-icons/font/fonts/bootstrap-icons.woff2",
+  "bootstrap/dist/css/bootstrap.min.css.map",
+  "less/dist/less.min.js",
+  "less/dist/less.min.js.map",
+  "mdbootstrap/js/mdb.min.js",
+];
+
+let loadedData = {};
+let dataToBeWritten = {}
+
+loggy.log("Loading config", "info", "Config");
+if (fs.existsSync("data-persistence.json")) {
+  const loadedDataRaw = fs.readFileSync("data-persistence.json", "utf8");
+  loadedData = JSON.parse(loadedDataRaw);
+} else {
+  console.warn("Unable to load persistent data");
+}
+
 currentState = {
   mode: "clock",
   countdownGoal: new Date().getTime(),
   showMilliSeconds: true,
   defaultFullScreen: true,
   timeAmountInital: 0,
-  timerRunState: true,
+  timerRunState: false,
   pauseMoment: 0,
   showTimeOnCountdown: true,
   message: "",
   showMessage: false,
   messageAppearTime: 0,
   showProgressbar: true,
-  colorSegments: {20000: "#FFAE00", 5000: "#ff0000", "START": "yellow"},
+  colorSegments: {
+    40000: "yellow",
+    20000: "#FFAE00",
+    5000: "#ff0000",
+    START: "green",
+  },
   textColors: {},
   srvTime: 0,
   enableColoredText: true,
-  debug: false
+  debug: false,
+  enableOverrun: true,
+  sessionToken:
+    Math.random().toString(36).substring(2, 15) +
+    Math.random().toString(36).substring(2, 15),
 };
 
-currentState.textColors = currentState.colorSegments
+let configObject = {
+  language: "en_uk",
+  port: 3000,
+};
+if (!fs.existsSync("config.json")) {
+  fs.writeFileSync("config.json", "{}");
+}
+const tempJsonText = JSON.parse(fs.readFileSync("config.json", "utf8"));
+configObject = _.extend(configObject, tempJsonText);
+fs.writeFileSync("config.json", JSON.stringify(configObject));
 
+currentState = Object.assign({}, currentState, loadedData);
+currentState.textColors = currentState.colorSegments;
 
+loggy.log("Searching for languages", "info", "Language");
+const languagesRaw = fs.readdirSync("./lang");
+const languages = [];
+for (let i = 0; i < languagesRaw.length; i++) {
+  if (languagesRaw[i].endsWith(".json")) {
+    languages.push(languagesRaw[i].replace(".json", ""));
+  }
+}
+loggy.log("Found " + languages.length + " languages", "info", "Language");
+
+loggy.log("Reading language file", "info", "Language");
+let languageProfile = JSON.parse(
+  fs.readFileSync("lang/" + configObject.language + ".json", "utf8")
+);
+
+loggy.log("Preparing websocket", "info", "Websocket");
+const wsServer = new ws.Server({ noServer: true });
+wsServer.on("connection", (socket) => {
+  socket.on("message", function incoming(data) {
+    if (data.toString() == "new client") {
+      updatedData();
+    }
+  });
+});
+
+wsServer.broadcast = function broadcast(data) {
+  wsServer.clients.forEach(function each(client) {
+    // The data is coming in correctly
+    // console.log(data);
+    client.send(data);
+  });
+};
+
+let updatey = undefined;
+
+function updatedData() {
+  currentState.srvTime = new Date().getTime();
+  wsServer.broadcast(JSON.stringify(currentState));
+  clearTimeout(updatey);
+  setTimeout(updatedData, 5000);
+}
+
+loggy.log("Preparing routes", "info", "Server");
 app.get("/", function (req, res) {
-  const data = fs.readFileSync("templates/adminPanel.html", "utf8");
-  res.send(data);
+  const data = fs.readFileSync("templates/newAdminPanel.html", "utf8");
+  try {
+    res.send(
+      Eta.render(data, {
+        lang: languageProfile,
+        additional: {
+          languages: languages,
+        },
+      })
+    );
+  } catch (e) {
+    loggy.log("Error rendering template", "error", "Server");
+    const dataN = fs.readFileSync("templates/brokenTranslation.html", "utf8");
+    res.send(
+      Eta.render(dataN, {
+        additional: {
+          languages: languages,
+        },
+      })
+    );
+  }
 });
 
 app.get("/timer", function (req, res) {
+  const data = fs.readFileSync("templates/ng-timerview.html", "utf8");
+  res.send(data);
+});
+
+app.get("/timer-old", function (req, res) {
   const data = fs.readFileSync("templates/timerPage.html", "utf8");
   res.send(data);
 });
 
 app.get("/api/v1/data", function (req, res) {
-  currentState.srvTime = new Date().getTime()
+  currentState.srvTime = new Date().getTime();
   res.json(currentState);
 });
 
+app.get("/api/v1/system", function (req, res) {
+  const tempPkgFile = fs.readFileSync("package.json", "utf8");
+  const tempPkgObj = JSON.parse(tempPkgFile);
+  const systemData = {
+    uptime: process.uptime(),
+    memoryUsage: process.memoryUsage(),
+    cpuUsage: process.cpuUsage(),
+    platform: process.platform,
+    arch: process.arch,
+    nodeVersion: process.version,
+    nodePath: process.execPath,
+    nodeArgv: process.argv,
+    nodeExecArgv: process.execArgv,
+    nodeCwd: process.cwd(),
+    nodeEnv: process.env,
+    nodeConfig: process.config,
+    nodeTitle: process.title,
+    systemVersion: tempPkgObj.version,
+  };
+  res.json(systemData);
+});
+
 app.get("/api/v1/set/mode", function (req, res) {
   currentState.mode = req.query.mode;
+  updatedData();
   res.json({ status: "ok" });
 });
 
 app.get("/api/v1/set/layout/showMillis", function (req, res) {
-  currentState.showMilliSeconds = (req.query.show === 'true');
-  res.json({ status: "ok" });
+  const resy = helper.wrapBooleanConverter(req.query.show, res);
+  if (resy != undefined) {
+    currentState.showMilliSeconds = resy;
+    if (req.query.persist === "true") {
+      dataToBeWritten.showMilliSeconds = currentState.showMilliSeconds;
+    }
+    res.json({ status: "ok" });
+  }
+  updatedData();
 });
 
 app.get("/api/v1/set/timerGoal", function (req, res) {
   currentState.countdownGoal = new Date(parseInt(req.query.time)).getTime(); // ToDO error handling
   res.json({ status: "ok" });
+  updatedData();
 });
 
 app.get("/api/v1/set/addMillisToTimer", function (req, res) {
   currentState.timeAmountInital = req.query.time;
-  currentState.countdownGoal = new Date().getTime() + parseInt(req.query.time)
+  currentState.countdownGoal = new Date().getTime() + parseInt(req.query.time);
+  currentState.pauseMoment = new Date().getTime();
   res.json({ status: "ok" });
-}); 
+  updatedData();
+});
+
+app.get("/api/v1/set/relativAddMillisToTimer", function (req, res) {
+	
+	currentState.timeAmountInital = parseInt(req.query.time) + parseInt(currentState.timeAmountInital);
+	currentState.countdownGoal = currentState.countdownGoal + parseInt(req.query.time);
+	// currentState.pauseMoment = new Date().getTime();
+	
+	res.json({ status: "ok" });
+	updatedData();
+});
 
 app.get("/api/v1/ctrl/timer/pause", function (req, res) {
   currentState.timerRunState = false;
   currentState.pauseMoment = new Date().getTime();
   res.json({ status: "ok" });
+  updatedData();
 });
 
 app.get("/api/v1/ctrl/timer/play", function (req, res) {
-  currentState.timerRunState = true
-  currentState.countdownGoal += new Date().getTime() - currentState.pauseMoment;
+  if (currentState.timerRunState == false) {
+    currentState.timerRunState = true;
+    currentState.countdownGoal +=
+      new Date().getTime() - currentState.pauseMoment;
+  }
   res.json({ status: "ok" });
+  updatedData();
 });
 
 app.get("/api/v1/ctrl/timer/restart", function (req, res) {
-  currentState.countdownGoal = new Date().getTime() + parseInt(currentState.timeAmountInital)
+  currentState.countdownGoal =
+    new Date().getTime() + parseInt(currentState.timeAmountInital);
   res.json({ status: "ok" });
+  updatedData();
 });
 
 app.get("/api/v1/set/layout/showTime", function (req, res) {
-  currentState.showTimeOnCountdown = (req.query.show === 'true');
-  res.json({ status: "ok" });
+  const resy = helper.wrapBooleanConverter(req.query.show, res);
+  if (resy != undefined) {
+    currentState.showTimeOnCountdown = resy;
+    if (req.query.persist === "true") {
+      dataToBeWritten.showTimeOnCountdown = currentState.showTimeOnCountdown;
+    }
+    res.json({ status: "ok" });
+  }
+  updatedData();
+});
+
+app.get("/api/v1/set/enableOverrun", function (req, res) {
+  const resy = helper.wrapBooleanConverter(req.query.enable, res);
+  if (resy != undefined) {
+    currentState.enableOverrun = resy;
+    if (req.query.persist === "true") {
+      dataToBeWritten.enableOverrun = currentState.enableOverrun;
+    }
+    res.json({ status: "ok" });
+  }
+  updatedData();
 });
 
 app.get("/api/v1/set/progressbar/show", function (req, res) {
-  currentState.showProgressbar = (req.query.show === 'true');
+  currentState.showProgressbar = req.query.show === "true";
+  if (req.query.persist === "true") {
+    dataToBeWritten.showProgressbar = currentState.showProgressbar;
+  }
   res.json({ status: "ok" });
+  updatedData();
 });
 
 app.get("/api/v1/set/progressbar/colors", function (req, res) {
   try {
-    currentState.colorSegments = JSON.parse(req.query.colors);
-    res.json({ status: "ok" });
-  } catch (error) {
-    res.json({ status: "error", message: error });
-  }
-});
-
-app.get("/api/v1/set/text/colors", function (req, res) {
-  try {
-    if(req.query.copy === "true"){
-      currentState.textColors = currentState.colorSegments;
-    } else {
-      currentState.textColors = JSON.parse(req.query.colors);
+    let data = req.query.colors;
+    if (req.query.isBase64 === "true") {
+	let buff = new Buffer(data, 'base64');
+	data = buff.toString('ascii');
+    }
+    currentState.colorSegments = JSON.parse(data);
+    if (req.query.persist === "true") {
+      dataToBeWritten.colorSegments = currentState.colorSegments;
     }
     res.json({ status: "ok" });
   } catch (error) {
     res.json({ status: "error", message: error });
+    console.error(error);
   }
+  updatedData();
+});
+
+app.get("/api/v1/set/text/colors", function (req, res) {
+  try {
+    if (req.query.copy === "true") {
+      currentState.textColors = currentState.colorSegments;
+      res.json({ status: "ok" });
+    } else {
+      let data = req.query.colors;
+      if (req.query.isBase64 === "true") {
+        let buff = new Buffer(data, 'base64');
+	let data = buff.toString('ascii');
+      }
+      console.debug(data);
+      currentState.textColors = JSON.parse(data);
+      if (req.query.persist === "true") {
+        dataToBeWritten.textColors = currentState.textColors;
+      }
+    }
+    res.json({ status: "ok" });
+  } catch (error) {
+    res.json({ status: "error", message: error });
+    console.error(error);
+  }
+  updatedData();
 });
 
 app.get("/api/v1/set/text/enableColoring", function (req, res) {
-  currentState.enableColoredText = (req.query.enable === 'true');
+  currentState.enableColoredText = req.query.enable === "true";
+  if (req.query.persist === "true") {
+    dataToBeWritten.enableColoredText = currentState.enableColoredText;
+  }
+  res.json({ status: "ok" });
+  updatedData();
 });
 
 app.get("/api/v1/ctrl/message/show", function (req, res) {
-  currentState.message = req.query.msg
-  currentState.showMessage = true
-  currentState.messageAppearTime = new Date().getTime()
+  currentState.message = req.query.msg;
+  currentState.showMessage = true;
+  currentState.messageAppearTime = new Date().getTime();
   res.json({ status: "ok" });
+  updatedData();
 });
 
 app.get("/api/v1/debug", function (req, res) {
-  currentState.debug = (req.query.enable === 'true');
+  currentState.debug = req.query.enable === "true";
   res.json({ status: "ok" });
+  updatedData();
 });
 
 app.get("/api/v1/ctrl/message/hide", function (req, res) {
-  currentState.showMessage = false
+  currentState.showMessage = false;
   res.json({ status: "ok" });
+  updatedData();
 });
 
-app.listen(3005);
+app.get("/api/v1/storage/commit", function (req, res) {
+  const tempString = JSON.stringify(dataToBeWritten);
+  try {
+    fs.writeFileSync("data-persistence.json", tempString);
+    res.json({ status: "ok" });
+  } catch (error) {
+    res.json({ status: "error", reason: error });
+  }
+  updatedData();
+});
+
+app.get("/api/v1/storage/delete", function (req, res) {
+  if (req.query.delete === "true") {
+    if (fs.existsSync("data-persistence.json")) {
+      fs.unlinkSync("data-persistence.json");
+      res.json({ status: "ok" });
+    } else {
+      res.json({ status: "error", reason: "No persistence data was found" });
+    }
+  } else {
+  }
+  res.json({ status: "error", reason: "Missing delete argument" });
+  updatedData();
+});
+
+// UI Routes
+// Returns an object containg all available languages
+app.get("/api/ui/v1/lang/list", function handleLangList(req, res) {
+  const tempRespObject = {
+    status: "ok",
+    languages: languages,
+  };
+  res.json(tempRespObject);
+});
+
+app.get("/api/ui/v1/lang/set", function (req, res) {
+  if (req.query.lang == undefined || req.query.lang == "") {
+    res.json({ status: "error", reason: "Missing language" });
+    return;
+  }
+  const testLang = req.query.lang;
+  loggy.log("Reloading language file", "info", "Language");
+  if (!fs.existsSync("lang/" + testLang + ".json")) {
+    loggy.log(
+      "Language reload failed, file does not exist",
+      "error",
+      "Language"
+    );
+    res
+      .status(500)
+      .json({ status: "error", reason: "Language file not found" });
+    return;
+  }
+  const tempLang = fs.readFileSync("lang/" + testLang + ".json", "utf8");
+  const tempLangObj = helper.tryToParseJson(tempLang);
+  if (!tempLangObj) {
+    loggy.log("Language reload failed, file is not valid", "error", "Language");
+    res
+      .status(500)
+      .json({ status: "error", reason: "Language file is not valid" });
+    return;
+  }
+  if (tempLangObj._metadata == undefined) {
+    loggy.log(
+      "Language reload failed, file is not valid, metadata missing",
+      "error",
+      "Language"
+    );
+    res
+      .status(500)
+      .json({ status: "error", reason: "Language file is not valid" });
+    return;
+  }
+  loggy.log(
+    "Language reloaded, loaded " +
+      tempLangObj._metadata.lang +
+      "@" +
+      tempLangObj._metadata.version,
+    "info",
+    "Language"
+  );
+  configObject.language = req.query.lang;
+  languageProfile = tempLangObj;
+  res.status(200).json({ status: "ok" });
+  fs.writeFileSync("config.json", JSON.stringify(configObject));
+});
+
+app.use("/assets/*", function handleModuleFiles(req, res) {
+  if (allowsURLs.indexOf(req.params[0]) > -1) {
+    res.sendFile(path.join(__dirname, "node_modules", req.params[0]));
+  } else {
+    loggy.log(
+      "Attempt to access restricted asset file " + req.params[0],
+      "error",
+      "Security"
+    );
+    res.status(403).json({
+      status: "error",
+      reason: "Access to restricted asset file denied",
+    });
+  }
+  // console.log(recordedURLs)
+});
+
+app.use(function (req, res, next) {
+  res.status(404);
+  loggy.log("Server responded with 404 error", "warn", "Server", true);
+
+  // respond with html page
+  if (req.accepts("html")) {
+    const data = fs.readFileSync("templates/errorPages/404.html", "utf8");
+    res.status(404);
+    res.send(data);
+    return;
+  }
+
+  // respond with json
+  if (req.accepts("json")) {
+    res.json({ error: "Not found" });
+    return;
+  }
+
+  // default to plain-text. send()
+  res.type("txt").send("Not found");
+});
+
+/*app.use(function(err, req, res, next) {
+  console.error(err.stack);
+  if(String(err.stack).includes("TypeError: Cannot read properties of undefined")) {
+	const data = fs.readFileSync("templates/brokenTranslation.html", "utf8");
+	res.send(data);
+  }else{
+	res.status(500).send('Something broke!');
+  }
+ 
+});*/
+
+loggy.log("Starting server", "info", "Server");
+
+const port = configObject.port;
+
+process.on("SIGINT", function () {
+  loggy.log(
+    "Caught interrupt signal and shutting down gracefully",
+    "info",
+    "Shutdown"
+  );
+  server.close(); // Make the express server stop
+  loggy.log("Goodbye! 👋", "magic", "Shutdown", true);
+  loggy.close(); // Close and write log
+  process.exit(); // Quit the application
+});
+
+const server = app.listen(port);
+server.on("upgrade", (request, socket, head) => {
+  wsServer.handleUpgrade(request, socket, head, (socket) => {
+    wsServer.emit("connection", socket, request);
+  });
+});
+
+loggy.log("=======================", "info", "", true);
+loggy.log("Server running on port " + port, "magic", "", true);
+loggy.log(
+  "Visit http://localhost:" + port + "/timer for the timer view",
+  "magic",
+  "",
+  true
+);
+loggy.log(
+  "Visit http://localhost:" + port + " for the admin view",
+  "magic",
+  "",
+  true
+);
+loggy.log("=======================", "info", "", true);

lang/de_de.json

@@ -0,0 +1,71 @@
+{
+    "titles": {
+        "home": "Startseite",
+        "preview": "Vorschau",
+        "mode": "Modus",
+        "messaging": "Nachrichten",
+        "countdownToTime": "Auf Uhrzeit runterzählen",
+        "attention": "Achtung",
+        "hostinfo": "Host Informationen"
+    },
+    "sidebar": {
+        "home": "Startseite",
+        "settings": "Einstellungen",
+        "debug": "Debug",
+        "about": "Über"
+    },
+    "hints": 
+    {
+        "previewHint": "Eine Vorschau der Timeransicht.",
+        "modeHint": "",
+        "messagingHint": "Zeigt eine Nachricht auf der Timeransicht an.",
+        "copyHint": "Kopiert den Link zu der Countdown-Seite.",
+        "openInNewTab": "Öffnet den Link in einem neuen Tab.",
+        "selectMode": "Wählt einen Modus für die Timeransicht."
+    },
+    "placeholders": {
+        "msgHere": "Message here"
+    },
+    "others":
+    {
+        "timer": "Timer",
+        "clock": "Uhr",
+        "black": "Leer",
+        "test": "Testbild",
+	"screensaver": "Bildschirmschoner"
+    },
+    "labels":
+    {
+        "clockOnTimer": "Zeigt die Uhrzeit auf dem Timer:",
+        "showMillis": "Zeigt Millisekunden auf dem Timer:",
+        "showProgress": "Zeige Fortschrittsbalken:",
+        "progbarColors": "Fortschrittsbalken Farben",
+        "time": "Zeit",
+        "color": "Farbe",
+        "remove": "Entfernen",
+        "enableTextClrs": "Text Farben aktivieren:",
+        "textClrs": "Text Farben",
+        "addRow": "Neue Zeile",
+        "timeVar": "Aktiviere zeitabweichungs display:",
+	"allowOverrun": "Überlauf erlauben: "
+    },
+    "untis": 
+    {
+        "seconds": "Sekunden",
+        "minutes": "Minutes",
+        "hours": "Stunden",
+        "days": "Tage",
+        "weeks": "Wochen",
+        "months": "Monate",
+        "years": "Jahre"
+    },
+    "informationTexts": {
+        "debugInfo": "Das hier ist eine debug seite welche nur von professionellen Personen verwendet werden sollte. ",
+        "proceedCaution": "Gehen Sie vorsichtig vor."
+    },
+    "_metadata": {
+        "lang": "de",
+        "version": "1.0.0",
+        "authors": ["TheGreydiamond"]
+    }
+}

lang/en_uk.json

@@ -0,0 +1,74 @@
+{
+    "titles": {
+        "home": "Homepage",
+        "preview": "Preview",
+        "mode": "Mode",
+        "messaging": "Messaging",
+        "countdownToTime": "Countdown to time",
+        "attention": "Attention",
+        "hostinfo": "Host information",
+        "uiSettings": "UI settings"
+    },
+    "sidebar": {
+        "home": "Home",
+        "settings": "Settings",
+        "debug": "Debug",
+        "about": "About"
+    },
+    "hints": 
+    {
+        "previewHint": "A preview of what is currently visible on the countdown view",
+        "modeHint": "",
+        "messagingHint": "Shows a given message on the timer view",
+        "copyHint": "Copies the link to the timer view",
+        "openInNewTab": "Open the countdown view in a new tab",
+        "selectMode": "Select what to show on the countdown view"
+    },
+    "placeholders": {
+        "msgHere": "Message here"
+    },
+    "others":
+    {
+        "timer": "Timer",
+        "clock": "Clock",
+        "black": "Black",
+        "test": "Testimage",
+	"screensaver": "Screensaver"
+    },
+    "labels":
+    {
+        "clockOnTimer": "Show clock on Timer:",
+        "showMillis": "Show Milliseconds on Timer:",
+        "showProgress": "Show progressbar:",
+        "progbarColors": "Progressbar Colors",
+        "time": "Time",
+        "color": "Color",
+        "remove": "Remove",
+        "enableTextClrs": "Enable Text Colours:",
+        "textClrs": "Text Colours",
+        "addRow": "Add Row",
+        "timeVar": "Enable time variance display:",
+        "language": "Select a language",
+        "apply": "Apply",
+	"allowOverrun": "Allow overrun:"
+    },
+    "untis": 
+    {
+        "seconds": "Seconds",
+        "minutes": "Minutes",
+        "hours": "Hours",
+        "days": "Days",
+        "weeks": "Weeks",
+        "months": "Months",
+        "years": "Years"
+    },
+    "informationTexts": {
+        "debugInfo": "This is a debug page which should only be used by professionals. Changing any options below might impact operation.",
+        "proceedCaution": "Proceed with caution."
+    },
+    "_metadata": {
+        "lang": "en",
+        "version": "1.0.0",
+        "authors": ["TheGreydiamond"]
+    }
+}

lang/proto_black.json

@@ -0,0 +1,72 @@
+{
+    "titles": {
+        "home": "████████",
+        "preview": "██████",
+        "mode": "████",
+        "messaging": "█████████",
+        "countdownToTime": "█████████ ██ ████",
+        "attention": "███████████",
+        "hostinfo": "████ █████████"
+    },
+    "sidebar": {
+        "home": "████",
+        "settings": "████████",
+        "debug": "█████",
+        "about": "█████"
+    },
+    "hints": 
+    {
+        "previewHint": "█ ████ ███████ ████",
+        "modeHint": "",
+        "messagingHint": "████ █ ██████ ██ █████",
+        "copyHint": "██████ ███ ████ ██ ███ █████ ████",
+        "openInNewTab": "████ ███ ████████ ████ █ █ ███ ███",
+        "selectMode": "█████ ████ ██ ████ ██ ███ ████████ ████"
+    },
+    "placeholders": {
+        "msgHere": "██████ ████"
+    },
+    "others":
+    {
+        "timer": "████",
+        "clock": "█████",
+        "black": "████",
+        "test": "███████",
+	"screensaver": "████████"
+    },
+    "labels":
+    {
+        "clockOnTimer": "████ █████ ██ █████:",
+        "showMillis": "████ ███████████ ██ █████:",
+        "showProgress": "████ █████████:",
+        "progbarColors": "████████ ████",
+        "time": "████",
+        "color": "█████",
+        "remove": "██████",
+        "enableTextClrs": "██████ ████ ███████:",
+        "textClrs": "████ ██████",
+        "addRow": "███ ███",
+        "timeVar": "██████ ████ ███████ ███████:",
+	"allowOverrun": "██████ ████████:"
+    },
+    "untis": 
+    {
+        "seconds": "Seconds",
+        "minutes": "Minutes",
+        "hours": "Hours",
+        "days": "Days",
+        "weeks": "Weeks",
+        "months": "Months",
+        "years": "Years"
+    },
+    "informationTexts": {
+        "debugInfo": "████ ██ █ █████ ████ █████ █████ ████ ██ ████ ██ ██████████. ████████ ███ ██████ █████ █████ █████ ██████.",
+        "proceedCaution": "█████ ████ ███████."
+    },
+    "_metadata": {
+        "lang": "none",
+        "version": "1.0.0",
+        "authors": ["TheGreydiamond"],
+        "comment": "A test language without proper text and only black blocks. █"
+    }
+}

logging.js

@@ -0,0 +1,61 @@
+const colors = require('colors');
+const util = require('util')
+const fs = require('fs');
+
+let logToFileJson = false;
+let logJournal = [];
+
+function init(logToFile = false) {
+  logToFileJson = logToFile;
+  log("Logging initialized", "info", "Logging");
+}
+
+function close(){
+  if(logToFileJson){
+    const tempString = JSON.stringify(logJournal);
+    try {
+      fs.writeFileSync("log-journal.json", tempString);
+    } catch (error) {
+      log("Error while closing log file: " + error, "error", "Logging");
+    }
+  }
+  log("Saved log", "info", "Logging");
+}
+
+/**
+ * A simple logging function
+ * @param {String} message A messaged to be logged
+ * @param {String} level  Loglevel, may either be warn, error, magic or info
+ * @param {String} module Kinda the source
+ */
+function log(message, level, module, ignore = false) {
+  if (level == undefined) {
+    level = "info";
+  }
+  if (module == undefined) {
+    module = "Unknown";
+  }
+  if(String(message) == "[object Object]"){
+    message = util.inspect(message, false, null, false);
+  }
+  const timestamp = new Date().toISOString().replace("T", " ").replace("Z", "");
+  var message = timestamp + " [" + String(level) + "] " + " [" + String(module) + "] " + String(message);
+  if (level == "warn") {
+    console.warn(message.yellow);
+  } else if (level == "error") {
+    console.error(message.red);
+  } else if (level == "magic") {
+    console.error(message.magenta);
+  } else if (level == "info") {
+    console.info(message.white);
+  } else {
+    console.log(message.gray);
+  }
+
+  if(logToFileJson && ignore == false){
+    jsonObject = {timestamp: timestamp, level: level, module: module, message: message};
+    logJournal.push(jsonObject);
+  }
+}
+
+module.exports = { log, init, close };

package.json

@@ -1,16 +1,39 @@
 {
-  "name": "opencountdown",
-  "version": "1.0.0",
-  "description": "An opensource countdown",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "TheGreydiamond",
-  "license": "LGPL-3.0",
-  "dependencies": {
-    "body-parser": "^1.19.2",
-    "countdown": "^2.6.0",
-    "express": "^4.17.3"
-  }
+	"name": "opencountdown",
+	"version": "1.0.7",
+	"description": "An opensource countdown",
+	"main": "startHandler.js",
+	"scripts": {
+		"test": "echo \"Error: no test specified\" && exit 1",
+		"start": "electron startHandler.js"
+	},
+	"author": "TheGreydiamond",
+	"license": "LGPL-3.0",
+	"dependencies": {
+		"body-parser": "^1.20.2",
+		"bootstrap": "^5.3.1",
+		"bootstrap-duration-picker": "^2.1.3",
+		"bootstrap-icons": "^1.10.5",
+		"colors": "^1.4.0",
+		"darkreader": "^4.9.58",
+		"eta": "^1.14.2",
+		"express": "^4.18.2",
+		"flatpickr": "^4.6.13",
+		"jquery": "^3.7.0",
+		"js-cookie": "^3.0.1",
+		"less": "^4.1.3",
+		"mdbootstrap": "^4.20.0",
+		"open": "^8.4.0",
+		"underscore": "^1.13.6",
+		"ws": "^8.13.0"
+	},
+	"devDependencies": {
+		"electron": "^25.4.0",
+		"electron-builder": "^24.6.3"
+	},
+	"build": {
+		"extraMetadata": {
+			"main": "startHandler.js"
+		}
+	}
 }

startHandler.js

@@ -0,0 +1,226 @@
+const { app, BrowserWindow, ipcMain, Tray, Menu, MenuItem, dialog } = require('electron')
+const path = require('path')
+const fs = require('fs')
+const _ = require("underscore")
+const open = require('open');
+const childProcess = require('child_process');
+const http = require('http');
+
+
+const packageJson = JSON.parse(fs.readFileSync("package.json"))
+
+// a minimal config
+let configObject = {
+	language: "en_uk",
+	startMinimised: false,
+	port: 3000
+}
+if (!fs.existsSync("config.json")) {
+	fs.writeFileSync("config.json", "{}");
+}
+const tempJsonText = JSON.parse(fs.readFileSync("config.json", "utf8"));
+configObject = _.extend(configObject, tempJsonText);
+fs.writeFileSync("config.json", JSON.stringify(configObject));
+
+// Set a serverStatus
+let serverStatus = "Starting"
+
+// Check if --headless is passed as an argument
+const processArgs = process.argv;
+if (processArgs.includes("--headless")) {
+	startServer()
+} else {
+	// Start electron 
+	app.whenReady().then(() => {
+		startServer()
+		createTray()
+		createWindow()
+		setInterval(() => {
+			// Check if the server is running
+			http.get('http://127.0.0.1:' + configObject.port + "/api/v1/system", (resp) => {
+				let data = '';
+
+				// A chunk of data has been received.
+				resp.on('data', (chunk) => {
+					data += chunk;
+				});
+
+				// The whole response has been received. Print out the result.
+				resp.on('end', () => {
+					// If we have a valid response, set the serverStatus to "Running"
+					let parsed = JSON.parse(data)
+					console.log(parsed)
+					serverStatus = "Running"
+					// Send the serverStatus to the window
+					if (win) {
+						win.webContents.send('info', { "appStatus": serverStatus, "appURL": "http://127.0.0.1:" + configObject.port, "appName": "openCountdown " + packageJson.version, "startMinimised": configObject.startMinimised, "port": configObject.port })
+					}
+				});
+			}).on("error", (err) => {
+				console.log("Error: " + err.message);
+			});
+		}, 2000);
+	})
+
+	ipcMain.on('info', function () {
+		// Send inital data to the window
+		if (win) {
+			win.webContents.send('info', { "appStatus": serverStatus, "appURL": "http://127.0.0.1:" + configObject.port, "appName": "openCountdown " + packageJson.version, "startMinimised": configObject.startMinimised, "port": configObject.port })
+		}
+	})
+
+	ipcMain.on('skeleton-close', function (req, cb) {
+		trayQuit()
+	})
+
+	ipcMain.on('skeleton-minimize', function (req, cb) {
+		win.hide()
+	})
+
+	ipcMain.on('skeleton-launch-gui', function () {
+		launchUI()
+	})
+
+	ipcMain.on('skeleton-start-minimised', function (e, msg) {
+		configObject.startMinimised = msg
+		fs.writeFileSync("config.json", JSON.stringify(configObject));
+	})
+
+	ipcMain.on('skeleton-bind-port', function (e, msg) {
+		configObject.port = msg
+		console.log("Update port")
+		fs.writeFileSync("config.json", JSON.stringify(configObject));
+		dialog.showMessageBoxSync({
+			message: "Port changed. Restart openCountdown to apply change.",
+			buttons: ["OK"]
+		})
+	})
+}
+
+var win, tray = null;
+
+
+const createWindow = () => {
+	win = new BrowserWindow({
+		width: 370,
+		height: 500,
+		transparent: true,
+		frame: false,
+		resizable: false,
+		icon: path.join(__dirname, 'static/logo/faviconLogo.svg'),
+		webPreferences: {
+			pageVisibility: true,
+			nodeIntegration: true,
+			contextIsolation: true,
+			preload: path.join(__dirname, 'electronAssets/windowPreload.js'),
+		}
+	})
+
+
+
+
+	win.loadFile('electronAssets/index.html')
+	if (configObject.startMinimised) {
+		win.hide()
+	}
+}
+
+function createTray() {
+	tray = new Tray('static/logo/faviconLogo.png')
+	tray.setIgnoreDoubleClickEvents(true)
+
+	const menu = new Menu()
+	menu.append(
+		new MenuItem({
+			label: 'Show window',
+			click: showScreen,
+		})
+	)
+	menu.append(
+		new MenuItem({
+			label: 'Launch GUI',
+			click: launchUI,
+		})
+	)
+	menu.append(
+		new MenuItem({
+			label: 'Quit',
+			accelerator: 'Command+Q',
+			click: trayQuit,
+		})
+	)
+
+	tray.setToolTip('openCountdown ' + packageJson.version)
+	tray.setContextMenu(menu)
+
+	tray.on('click', function (e) {
+		if (win.isVisible()) {
+			win.hide()
+		} else {
+			win.show()
+		}
+	});
+}
+
+function showScreen() {
+	win.show()
+}
+
+function launchUI() {
+	open("http://127.0.0.1:" + configObject.port)
+}
+
+function trayQuit() {
+	let options = {
+		buttons: ["Yes", "No"],
+		message: "Do you really want to quit openCountdown?"
+	}
+	let response = dialog.showMessageBoxSync(options)
+	if (response == 0) {
+		serverStatus = "Stopping"
+		if (win) {
+			win.webContents.send('info', { "appStatus": serverStatus, "appURL": "http://127.0.0.1:" + configObject.port, "appName": "openCountdown " + packageJson.version, "startMinimised": configObject.startMinimised, "port": configObject.port })
+		}
+		srvProc.kill("SIGINT")
+		setTimeout(app.quit, 1000)
+	}
+}
+
+
+// taken from https://stackoverflow.com/a/22649812/11317151
+function runScript(scriptPath, callback, valueCb) {
+
+	// keep track of whether callback has been invoked to prevent multiple invocations
+	var invoked = false;
+
+	var process = childProcess.fork(scriptPath);
+
+	valueCb(process)
+	// listen for errors as they may prevent the exit event from firing
+	process.on('error', function (err) {
+		if (invoked) return;
+		invoked = true;
+		callback(err);
+	});
+	// execute the callback once the process has finished running
+	process.on('exit', function (code) {
+		if (invoked) return;
+		invoked = true;
+		// var err = code === 0 ? null : new Error('exit code ' + code);
+		callback(code);
+	});
+
+
+}
+
+srvProc = null;
+
+function setServer(process) {
+	srvProc = process
+}
+
+function startServer() {
+	runScript(path.join(__dirname, 'index.js'), function (err) {
+		if (err) throw err;
+	}, setServer)
+}

static/css/errorPage/style.css

@@ -0,0 +1,86 @@
+html, body {
+    height: 100%;
+    width: 100%;
+    margin: 0;
+    padding: 0;
+}
+
+.container {
+    height: 100%;
+    width: 100%;
+    background-color: #0B161E;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    font-family: 'Segoe UI';
+    text-align: center;
+}
+
+.color-foreground {
+    color: #474849 !important;
+}
+
+.text-shadow {
+    text-shadow: 1px 1px 2px;
+}
+
+.rainbow {
+    -webkit-animation:rainbow 16s infinite;
+    -ms-animation:rainbow 16s infinite;
+    -o-animation:rainbow 16s infinite;
+    animation:rainbow 16s infinite;
+}
+
+@-webkit-keyframes rainbow {
+0% {color: #ff0000;}
+10% {color: #ff8000;}
+20% {color: #ffff00;}
+30% {color: #80ff00;}
+40% {color: #00ff00;}
+50% {color: #00ff80;}
+60% {color: #00ffff;}
+70% {color: #0080ff;}
+80% {color: #0000ff;}
+90% {color: #8000ff;}
+100% {color: #ff0080;}
+}
+@-ms-keyframes rainbow {
+0% {color: #ff0000;}
+10% {color: #ff8000;}
+20% {color: #ffff00;}
+30% {color: #80ff00;}
+40% {color: #00ff00;}
+50% {color: #00ff80;}
+60% {color: #00ffff;}
+70% {color: #0080ff;}
+80% {color: #0000ff;}
+90% {color: #8000ff;}
+100% {color: #ff0080;}
+}
+@-o-keyframes rainbow {
+0% {color: #ff0000;}
+10% {color: #ff8000;}
+20% {color: #ffff00;}
+30% {color: #80ff00;}
+40% {color: #00ff00;}
+50% {color: #00ff80;}
+60% {color: #00ffff;}
+70% {color: #0080ff;}
+80% {color: #0000ff;}
+90% {color: #8000ff;}
+100% {color: #ff0080;}
+}
+@keyframes rainbow {
+0% {color: #ff0000;}
+10% {color: #ff8000;}
+20% {color: #ffff00;}
+30% {color: #80ff00;}
+40% {color: #00ff00;}
+50% {color: #00ff80;}
+60% {color: #00ffff;}
+70% {color: #0080ff;}
+80% {color: #0000ff;}
+90% {color: #8000ff;}
+100% {color: #ff0080;}
+}

static/css/errorPage/styles.less

@@ -0,0 +1,62 @@
+.glitch-wrapper {
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.glitch {
+  @offset1: 2px;
+  @offset2: -2px;
+  @highlight1: #49FC00;
+  @highlight2: spin(@highlight1, 180);
+  
+  color: white;
+  font-size: 150px;
+  text-transform: upercase;
+  position: relative;
+  display: inline-block;
+  
+  &::before,
+  &::after  {
+    content: attr(data-text);
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: #0B161E;
+  }
+  
+  &::before {
+    left: @offset1;
+    text-shadow: -2px 0 @highlight1;
+    clip: rect(24px, 550px, 90px, 0);
+    animation: glitch-anim-2 3s infinite linear alternate-reverse;
+  }
+  
+  &::after {
+    left: @offset2;
+    text-shadow: -2px 0 @highlight2;
+    clip: rect(85px, 550px, 140px, 0);
+    animation: glitch-anim 2.5s infinite linear alternate-reverse;
+  }
+}
+
+.glitch-frames (@n: 20, @index: 0) when (@index <= @n) {
+  @keyframeSel: percentage(@index/@n);
+  @rand1: unit(round(`Math.random()*150`),px);
+  @rand2: unit(round(`Math.random()*150`), px);
+  @{keyframeSel} {
+    clip: rect(@rand1, 9999px, @rand2, 0);
+  }
+  .glitch-frames(@n, (@index + 1));
+}
+
+@keyframes glitch-anim {
+  .glitch-frames(24);
+}
+
+@keyframes glitch-anim-2 {
+  .glitch-frames(30,2);
+}

static/css/mainStyle.css

@@ -0,0 +1,129 @@
+body {
+    min-height: 100vh;
+    min-height: -webkit-fill-available;
+  }
+  
+  html {
+    height: -webkit-fill-available;
+  }
+  
+  main {
+    display: flex;
+    flex-wrap: nowrap;
+    height: 100vh !important;
+    height: -webkit-fill-available;
+    max-height: 100vh;
+    overflow-x: auto;
+    overflow-y: hidden;
+  }
+
+  .full .clr-field button {
+    width: 100%;
+    height: 100%;
+    border-radius: 5px;
+  }
+  
+  .b-example-divider {
+    flex-shrink: 0;
+    width: 1.5rem;
+    height: 100vh;
+    background-color: rgba(0, 0, 0, .1);
+    border: solid rgba(0, 0, 0, .15);
+    border-width: 1px 0;
+    box-shadow: inset 0 .5em 1.5em rgba(0, 0, 0, .1), inset 0 .125em .5em rgba(0, 0, 0, .15);
+  }
+  
+  .bi {
+    vertical-align: -.125em;
+    pointer-events: none;
+    fill: currentColor;
+  }
+  
+  .dropdown-toggle { outline: 0; }
+  
+  .nav-flush .nav-link {
+    border-radius: 0;
+  }
+  
+  .btn-toggle {
+    display: inline-flex;
+    align-items: center;
+    padding: .25rem .5rem;
+    font-weight: 600;
+    color: rgba(0, 0, 0, .65);
+    background-color: transparent;
+    border: 0;
+  }
+  .btn-toggle:hover,
+  .btn-toggle:focus {
+    color: rgba(0, 0, 0, .85);
+    background-color: #d2f4ea;
+  }
+  
+  .btn-toggle::before {
+    width: 1.25em;
+    line-height: 0;
+    content: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='rgba%280,0,0,.5%29' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M5 14l6-6-6-6'/%3e%3c/svg%3e");
+    transition: transform .35s ease;
+    transform-origin: .5em 50%;
+  }
+  
+  .btn-toggle[aria-expanded="true"] {
+    color: rgba(0, 0, 0, .85);
+  }
+  .btn-toggle[aria-expanded="true"]::before {
+    transform: rotate(90deg);
+  }
+  
+  .btn-toggle-nav a {
+    display: inline-flex;
+    padding: .1875rem .5rem;
+    margin-top: .125rem;
+    margin-left: 1.25rem;
+    text-decoration: none;
+  }
+  .btn-toggle-nav a:hover,
+  .btn-toggle-nav a:focus {
+    background-color: #d2f4ea;
+  }
+  
+  .scrollarea {
+    overflow-y: auto;
+  }
+  
+  .fw-semibold { font-weight: 600; }
+  .lh-tight { line-height: 1.25; }
+  
+
+  .hidden{
+      display: none;
+  }
+
+  .pageC {
+      padding: 20px;
+  }
+
+  
+placeholder {
+  border: red 2px dashed;
+  background-color: yellow;
+}
+
+pre {
+  overflow: auto;
+  word-wrap: normal;
+  white-space: pre;
+}
+
+.hidden {
+  display: none !important;
+}
+
+.trans {
+  transition: .5s
+}
+
+.helperTip {
+  opacity: 0.8;
+  font-size: small;
+}

static/css/smallerTextMod.css

@@ -1,3 +1,7 @@
 body {
-    font-size:0.5em;
+    font-size:0.3em;
+}
+
+.moverLogo {
+    height: 80px !important;
 }

static/css/styles.css

@@ -55,7 +55,7 @@ html, body {
 .progBar {
   appearance: none;
   height: 100%;
-  width: 80%;
+  width: 0%;
   border-radius: 0px;
   background-color: darkcyan;
 }
@@ -103,4 +103,55 @@ html, body {
 .blink {
 animation:fade 1000ms infinite;
 -webkit-animation:fade 1000ms infinite;
-}
+}
+
+.connectionWarning{
+  background-color: red;
+  width: 100vw;
+  font-size: x-large;
+  font-family: sans-serif;
+}
+
+:root {
+	--my-end-left: 99%;
+	--my-end-top: 99%;
+    }
+    
+
+#moveClock {
+	font-size: 6em;
+	font-family: sans-serif;
+	position: absolute;
+	-webkit-animation: moveX 40s linear 0s infinite alternate, moveY 45s linear 0s infinite alternate;
+	-moz-animation: moveX 40s linear 0s infinite alternate, moveY 45s linear 0s infinite alternate;
+	-o-animation: moveX 40s linear 0s infinite alternate, moveY 45s linear 0s infinite alternate;
+	animation: moveX 40s linear 0s infinite alternate, moveY 45s linear 0s infinite alternate;
+	transition: all 0.8s ease;
+}
+
+
+@-webkit-keyframes moveX {
+	from { left: 0; } to { left: var(--my-end-left) }
+      }
+      @-moz-keyframes moveX {
+	from { left: 0; } to { left: var(--my-end-left); }
+      }
+      @-o-keyframes moveX {
+	from { left: 0; } to { left: var(--my-end-left); }
+      }
+      @keyframes moveX {
+	from { left: 0; } to { left: var(--my-end-left); }
+      }
+      
+      @-webkit-keyframes moveY {
+	from { top: 0; } to { top: var(--my-end-top); }
+      }
+      @-moz-keyframes moveY {
+	from { top: 0; } to { top: var(--my-end-top); }
+      }
+      @-o-keyframes moveY {
+	from { top: 0; } to { top: var(--my-end-top); }
+      }
+      @keyframes moveY {
+	from { top: 0; } to { top: var(--my-end-top); }
+      }

static/favicon.svg

@@ -0,0 +1 @@
+logo/faviconLogo.svg

static/js/countdown.js

@@ -1 +0,0 @@
-../../node_modules/countdown/countdown.js

static/js/interface.js

@@ -1,4 +1,548 @@
-function convertTimeOffset(){
+function convertTimeOffset() {
     selTime = new Date().getTime() + document.getElementById('time2').valueAsNumber
     document.getElementById("time").value = selTime
 }
+
+
+function convertColorSegments(elementId) {
+    const raw = document.getElementById(elementId);
+    const segmentData = {}
+    for (elm in raw.children) {
+        if (raw.children[elm].nodeName == "TR") {
+            const child = raw.children[elm].children[1].children[0]
+            let timeVal = parseInt(raw.children[elm].children[0].children[0].value * 1000);
+            if (Number.isInteger(timeVal)) {
+                segmentData[timeVal] = child.style.color
+            } else {
+                segmentData["START"] = child.style.color
+            }
+        }
+    }
+    console.info(segmentData)
+    return (segmentData)
+}
+
+$(function () {
+    // $(".numVal").bind("DOMSubtreeModified", alert);
+
+    const modes = ["timer", "clock", "black", "test", "screensaver"]
+    let selectPresetTime = 0;
+
+    if (Cookies.get("interfaceColor") != undefined) {
+        const color = Cookies.get("interfaceColor");
+        $("#Mbtnradio" + (color))[0].checked = true
+        if (color == 1) {
+            DarkReader.disable()
+        } else if (color == 2) {
+            DarkReader.enable()
+        } else {
+            DarkReader.auto()
+        }
+    }
+
+    saveOption("/api/v1/system", function systemInfoLoader(event) {
+        const dataSystem = JSON.parse(event.target.response)
+        document.getElementById("nodejsVers").innerHTML = dataSystem.nodeVersion
+        document.getElementById("nodeSwVers").innerHTML = dataSystem.systemVersion
+
+        const tree2 = jsonview.create(dataSystem);
+        jsonview.render(tree2, document.getElementById("systemInfo"));
+        jsonview.expand(tree2);
+    })
+
+    $("#applyLang").on("click", function (event) {
+        const lang = $("#lang").val()
+        saveOption("/api/ui/v1/lang/set?lang=" + lang, function handleLangSelect(event, xmlHttp) {
+            const temp = JSON.parse(xmlHttp.responseText)
+            if(temp.status == "error") {
+                alert("Request failed reason: " + temp.reason)
+            } else {
+                location.reload()
+            }
+            console.log(JSON.parse(xmlHttp.responseText))
+        })
+    })
+
+    $("#addRow").on("click", function (event) {
+        const tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
+        let temp = tableEntryDom.innerHTML
+        temp = temp.replace("#COLOR#", "gray");
+        temp = temp.replace("#bg-COLOR#", "gray");
+        temp = temp.replace("#VALUE#", 60); // BUG: Doesn't work but not too important
+        temp = temp.replace("timeValue-ID", Math.floor(Math.random() * 9999999))
+        tableEntryDom.innerHTML = temp;
+        tableEntryDom.firstChild.nextSibling.children[0].classList.add("timeDurPicker")
+        tableEntryDom.id = Math.floor(Math.random() * 9999999)
+        document.getElementById("colors1").appendChild(tableEntryDom)
+        $(".deleteRow1").on("click", function removeRowEntry(event) {
+            $(event.target).closest("tr").remove();
+        });
+        $('.timeDurPicker').durationPicker({
+            showSeconds: true,
+            showDays: false,
+            onChanged: function (newVal, test, val2) {
+                //   $('#duration-label2').text(newVal);
+                val2.days[0].parentElement.parentElement.parentElement.parentElement.children[1].value = newVal
+                //console.log(val2.days[0].parentElement.parentElement.parentElement.parentElement.children[1].value)
+                //console.log(val2.days[0].parentElement.parentElement.parentElement.parentElement.children[1])
+            }
+        });
+    });
+
+    $("#addRow2").on("click", function (event) {
+        const tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
+        let temp = tableEntryDom.innerHTML
+        temp = temp.replace("#COLOR#", "gray");
+        temp = temp.replace("#bg-COLOR#", "gray");
+        temp = temp.replace("#VALUE#", 60); // BUG: Doesn't work but not too important
+        temp = temp.replace("timeValue-ID", Math.floor(Math.random() * 9999999))
+        tableEntryDom.innerHTML = temp;
+        tableEntryDom.firstChild.nextSibling.children[0].classList.add("timeDurPicker")
+        tableEntryDom.id = Math.floor(Math.random() * 9999999)
+        document.getElementById("colors2").appendChild(tableEntryDom)
+        $(".deleteRow1").on("click", function removeRowEntry(event) {
+            $(event.target).closest("tr").remove();
+        });
+        $('.timeDurPicker').durationPicker({
+            showSeconds: true,
+            showDays: false,
+            onChanged: function (newVal, test, val2) {
+                //   $('#duration-label2').text(newVal);
+                val2.days[0].parentElement.parentElement.parentElement.parentElement.children[1].value = newVal
+            }
+        });
+    });
+
+
+
+    // Restore settings
+    saveOption("/api/v1/data", function (event, xmlHttp) {
+        const jsonResult = JSON.parse(xmlHttp.response)
+        const tree = jsonview.create(jsonResult);
+        jsonview.render(tree, document.getElementById("responeSnippet"));
+        jsonview.expand(tree);
+
+        // Restore mode radio
+        const currentModeInt = modes.indexOf(jsonResult.mode);
+        $("#btnradio" + (currentModeInt + 1))[0].checked = true
+
+        // Restore layout settings
+        $("#showTime")[0].checked = jsonResult.showTimeOnCountdown;
+        $("#showMillis")[0].checked = jsonResult.showMilliSeconds;
+        $("#progBarShow")[0].checked = jsonResult.showProgressbar;
+        $("#textColors")[0].checked = jsonResult.enableColoredText;
+	$("#allowOverrun")[0].checked = jsonResult.enableOverrun;
+        console.log(document.getElementById("tableCopySource"))
+
+        let tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
+        let currIndex = 0
+        for (item in jsonResult.colorSegments) {
+            tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
+            let temp = tableEntryDom.innerHTML
+            temp = temp.replace("#COLOR#", jsonResult.colorSegments[item]);
+            temp = temp.replace("#bg-COLOR#", jsonResult.colorSegments[item]);
+            temp = temp.replace("timeValue-ID", "timeValue-1C" + currIndex)
+
+            if (item != "START") {
+                temp = temp.replace("#VALUE#", item / 1000);
+                tableEntryDom.innerHTML = temp;
+                tableEntryDom.firstChild.nextSibling.children[0].classList.add("timeDurPicker")
+            } else {
+                tableEntryDom.innerHTML = temp;
+                tableEntryDom.children[2].children[0].children[0].disabled = true;
+                tableEntryDom.children[2].children[0].setAttribute("data-toggle", "tooltip")
+                tableEntryDom.children[2].children[0].setAttribute("data-placement", "right")// 'data-placement="right" title="Tooltip on right"'
+                tableEntryDom.children[2].children[0].setAttribute("title", "You cannot delete the start time")
+
+                tableEntryDom.children[0].innerHTML = '<i class="bi bi-flag-fill"></i> Start'
+            }
+            tableEntryDom.id = "1C" + currIndex
+            tableEntryDom.style.display = "table-row"
+            document.getElementById("colors1").appendChild(tableEntryDom)
+            currIndex++;
+        }
+
+
+        // Text colors
+        currIndex = 0
+        for (item in jsonResult.textColors) {
+            tableEntryDom = document.getElementById("tableCopySource").cloneNode(true)
+            let temp = tableEntryDom.innerHTML
+            temp = temp.replace("#COLOR#", jsonResult.textColors[item]);
+            temp = temp.replace("#bg-COLOR#", jsonResult.textColors[item]);
+            temp = temp.replace("timeValue-ID", "timeValue-1C" + currIndex)
+
+            if (item != "START") {
+                temp = temp.replace("#VALUE#", item / 1000);
+                tableEntryDom.innerHTML = temp;
+                tableEntryDom.firstChild.nextSibling.children[0].classList.add("timeDurPicker")
+            } else {
+                tableEntryDom.innerHTML = temp;
+                tableEntryDom.children[2].children[0].children[0].disabled = true;
+                tableEntryDom.children[2].children[0].setAttribute("data-toggle", "tooltip")
+                tableEntryDom.children[2].children[0].setAttribute("data-placement", "right")// 'data-placement="right" title="Tooltip on right"'
+                tableEntryDom.children[2].children[0].setAttribute("title", "You cannot delete the start time")
+
+                tableEntryDom.children[0].innerHTML = '<i class="bi bi-flag-fill"></i> Start'
+            }
+
+
+            // timeDurPicker
+            tableEntryDom.id = "1C" + currIndex
+            tableEntryDom.style.display = "table-row"
+            document.getElementById("colors2").appendChild(tableEntryDom)
+            currIndex++;
+        }
+
+
+        $('.timeDurPicker').durationPicker({
+            showSeconds: true,
+            showDays: false,
+            onChanged: function (newVal, test, val2) {
+                val2.days[0].parentElement.parentElement.parentElement.parentElement.children[1].value = newVal
+            }
+        });
+
+
+
+        //console.debug(jsonResult, currentModeInt)
+        $('.colorPicky').on('colorpickerChange', function (event) {
+            event.target.parentElement.style.backgroundColor = event.target.value
+        });
+
+        $(".deleteRow1").on("click", function removeRowEntry(event) {
+            $(event.target).closest("tr").remove();
+        });
+        $('[data-toggle="tooltip"]').tooltip({ container: "body" })
+    })
+
+    $("#copyColors").click(function CopyTextColors(event) {
+        event.target.innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
+        saveOption("/api/v1/set/text/colors?copy=true", function finishCopyColors(event) {
+            setTimeout(function () {
+                document.getElementById("copyColors").innerHTML = "Copy from progressbar colors"
+            }, 500)
+
+        })
+    });
+
+
+    $("input[name='btnradio2']").click(function (event) {
+        const darkid = parseInt(event.currentTarget.id.replace("Mbtnradio", ""))
+        if (darkid == 1) {
+            DarkReader.disable()
+        } else if (darkid == 2) {
+            DarkReader.enable()
+        } else {
+            DarkReader.auto()
+        }
+        Cookies.set("interfaceColor", darkid)
+    });
+
+    // Presets
+    $(".pres").click(function (event) {
+        currentTime = parseInt(event.currentTarget.value)
+        $("#customValue").data("durationPicker").setValue(currentTime / 1000)
+    })
+
+
+    $(".goTimer").on("click", function (event) {
+        event.currentTarget.innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
+        setTimeout(function () {
+            event.currentTarget.innerHTML = 'Go'
+        }, 200);
+
+        saveOption("/api/v1/set/addMillisToTimer?time=" + currentTime, function (ev) {
+        })
+    })
+
+    // Layout settings
+    $("#applyLayout").click(function (event) {
+        $("#applyLayout")[0].innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
+
+        // Collect all data, build all paths
+        const allPathes = [];
+
+        const showTimeB = $("#showTime")[0].checked
+        const showMillisB = $("#showMillis")[0].checked
+        const progBarShowB = $("#progBarShow")[0].checked
+        const textColorsB = $("#textColors")[0].checked
+	const allowOverrun = $("#allowOverrun")[0].checked
+
+        const colors = convertColorSegments("colors1")
+        const colors2 = convertColorSegments("colors2")
+
+        allPathes.push("/api/v1/set/layout/showTime?show=" + showTimeB)
+        allPathes.push("/api/v1/set/layout/showMillis?show=" + showMillisB)
+        allPathes.push("/api/v1/set/progressbar/show?show=" + progBarShowB)
+        allPathes.push("/api/v1/set/text/enableColoring?enable=" + textColorsB)
+        allPathes.push("/api/v1/set/progressbar/colors?isBase64=true&colors=" + btoa(JSON.stringify(colors)))
+        allPathes.push("/api/v1/set/text/colors?isBase64=true&colors=" + btoa(JSON.stringify(colors2)))
+	allPathes.push("/api/v1/set/enableOverrun?enable=" + allowOverrun)
+
+
+
+        for (pI in allPathes) {
+            const path = allPathes[pI];
+            saveOption(path, function (event) {
+                console.debug(event)
+            })
+        }
+
+        setTimeout(function () {
+            $("#applyLayout")[0].innerHTML = 'Apply settings'
+        }, 500)
+    })
+
+
+    $("#saveLayout").click(function (event) {
+        $("#saveLayout")[0].innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
+
+        // Collect all data, build all paths3
+        const allPathes = [];
+
+        const showTimeB = $("#showTime")[0].checked
+        const showMillisB = $("#showMillis")[0].checked
+        const progBarShowB = $("#progBarShow")[0].checked
+        const textColorsB = $("#textColors")[0].checked
+	const allowOverrun = $("#allowOverrun")[0].checked
+
+        allPathes.push("/api/v1/set/layout/showTime?persist=true&show=" + showTimeB)
+        allPathes.push("/api/v1/set/layout/showMillis?persist=true&show=" + showMillisB)
+        allPathes.push("/api/v1/set/progressbar/show?persist=true&show=" + progBarShowB)
+        allPathes.push("/api/v1/set/text/enableColoring?persist=true&enable=" + textColorsB)
+	allPathes.push("/api/v1/set/enableOverrun?persist=true&enable=" + allowOverrun)
+
+        for (pI in allPathes) {
+            const path = allPathes[pI];
+            saveOption(path, function (event) {
+                console.debug(event)
+            })
+        }
+
+        saveOption("/api/v1/storage/commit", function (event) {
+            console.debug(event)
+            setTimeout(function () {
+                $("#saveLayout")[0].innerHTML = 'Save as startup settings (Layout only)'
+            }, 500)
+        })
+
+
+
+    })
+
+
+    function msToTime(s, data) {
+        var ms = s % 1000;
+        s = (s - ms) / 1000;
+        var secs = s % 60;
+        s = (s - secs) / 60;
+        var mins = s % 60;
+        var hrs = (s - mins) / 60;
+        let out = ""
+
+        return [ms, secs, mins, hrs];
+    }
+
+    //  Timer custom
+    let currentTime = 0;
+    $("#timerHourInc").click(function (event) {
+        currentTime += 3600000
+        const times = msToTime(currentTime)
+        $("#timerHoursV")[0].innerHTML = times[3];
+        $("#timerMinuteV")[0].innerHTML = times[2];
+        $("#timerSecondsV")[0].innerHTML = times[1];
+    })
+
+    $("#timerHourDec").click(function (event) {
+        if (currentTime >= 3600000) {
+            currentTime -= 3600000
+            const times = msToTime(currentTime)
+            $("#timerHoursV")[0].innerHTML = times[3];
+            $("#timerMinuteV")[0].innerHTML = times[2];
+            $("#timerSecondsV")[0].innerHTML = times[1];
+        }
+    })
+
+    $("#timerMinuteInc").click(function (event) {
+        currentTime += 60000
+        const times = msToTime(currentTime)
+        $("#timerHoursV")[0].innerHTML = times[3];
+        $("#timerMinuteV")[0].innerHTML = times[2];
+        $("#timerSecondsV")[0].innerHTML = times[1];
+    })
+    $("#timerMinuteDec").click(function (event) {
+        if (currentTime >= 60000) {
+            currentTime -= 60000
+            const times = msToTime(currentTime)
+            $("#timerHoursV")[0].innerHTML = times[3];
+            $("#timerMinuteV")[0].innerHTML = times[2];
+            $("#timerSecondsV")[0].innerHTML = times[1];
+        }
+    })
+    $("#timerSecondsInc").click(function (event) {
+        currentTime += 1000
+        const times = msToTime(currentTime)
+        $("#timerHoursV")[0].innerHTML = times[3];
+        $("#timerMinuteV")[0].innerHTML = times[2];
+        $("#timerSecondsV")[0].innerHTML = times[1];
+    })
+    $("#timerSecondsDec").click(function (event) {
+        if (currentTime >= 1000) {
+            currentTime -= 1000
+            const times = msToTime(currentTime)
+            $("#timerHoursV")[0].innerHTML = times[3];
+            $("#timerMinuteV")[0].innerHTML = times[2];
+            $("#timerSecondsV")[0].innerHTML = times[1];
+        }
+    })
+
+    $("input[name='btnradio']").click(function (event) {
+        $("#sendMessage")[0].innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
+        let value = modes[parseInt(event.currentTarget.id.replace("btnradio", "")) - 1]
+        console.log(value, parseInt(event.currentTarget.id.replace("btnradio", "")))
+        saveOption("/api/v1/set/mode?mode=" + value, function (event) {
+            setTimeout(function () {
+                $("#sendMessage")[0].innerHTML = '<i class="bi bi-send"></i>'
+            }, 200)
+
+        })
+    })
+
+
+    $("#sendMessage").click(function (event) {
+        $("#sendMessage")[0].innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
+        let value = $("#messageContent").val()
+        saveOption("/api/v1/ctrl/message/show?msg=" + value, function (event) {
+            setTimeout(function () {
+                $("#sendMessage")[0].innerHTML = '<i class="bi bi-send"></i>'
+            }, 200)
+
+        })
+    })
+
+    $("#ctrlRemoveMessage").click(function (event) {
+        $("#ctrlRemoveMessage")[0].innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
+        saveOption("/api/v1/ctrl/message/hide", function (event) {
+            setTimeout(function () {
+                $("#ctrlRemoveMessage")[0].innerHTML = '<i class="bi bi-eye-slash-fill"></i>'
+            }, 200)
+
+        })
+    })
+
+    $("#funcPlay").click(function (event) {
+        $("#funcPlay")[0].innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
+        saveOption("/api/v1/ctrl/timer/play", function (event) {
+            setTimeout(function () {
+                $("#funcPlay")[0].innerHTML = '<i class="bi bi-play-fill"></i>'
+            }, 200);
+        })
+    })
+
+
+    $("#funcPause").click(function (event) {
+        $("#funcPause")[0].innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
+
+        saveOption("/api/v1/ctrl/timer/pause", function (event) {
+            setTimeout(function () {
+                $("#funcPause")[0].innerHTML = '<i class="bi bi-pause"></i>'
+            }, 200);
+        })
+    })
+
+    $("#funcRestart").click(function (event) {
+        $("#funcRestart")[0].innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
+        saveOption("/api/v1/ctrl/timer/restart", function (event) {
+            setTimeout(function () {
+                $("#funcRestart")[0].innerHTML = '<i class="bi bi-arrow-clockwise"></i>'
+            }, 200)
+        })
+    })
+
+    $("#applyDebug").click(function (event) {
+        $("#applyDebug")[0].innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
+        let value = $("#debugModeEnable")[0].checked
+        saveOption("/api/v1/debug?enable=" + value, function (event) {
+            setTimeout(function () {
+                $("#applyDebug")[0].innerHTML = "Apply settings"
+            }, 200)
+
+        })
+    })
+
+    $("a.nav-link").click(function (event) {
+        event.preventDefault();
+        $("a.nav-link").removeClass("active")
+
+        event.currentTarget.classList.add("active")
+
+        $(".pageC").addClass("hidden")
+        $("#" + event.target.href.split("#")[1]).removeClass("hidden")
+        // console.log(event.target.href.split("#")[1])
+    });
+    $("#customValue").durationPicker({
+        showSeconds: true,
+        showDays: false,
+        onChanged: function (newVal, test, val2) {
+            currentTime = newVal * 1000
+        }
+    })
+
+    flatty = flatpickr("#datetimetester", {
+        enableTime: true,
+        time_24hr: true,
+        dateFormat: "H:i d.m.Y",
+    });
+
+    $(".goTimeGoalCountdown").on("click", function handleCountdownToTime() {
+        const selectTime = flatty.selectedDates[0].getTime()
+        const timeDiff = selectTime - new Date().getTime()
+        $(".goTimeGoalCountdown")[0].innerHTML = '<div class="spinner-border-sm spinner-border"></div>'
+        saveOption("/api/v1/set/addMillisToTimer?time=" + timeDiff, function (ev) {
+            setTimeout(function () {
+                $(".goTimeGoalCountdown")[0].innerHTML = '<i class="bi bi-check2-circle"></i>'
+            }, 200);
+        })
+    })
+});
+
+function saveOption(path, callback) {
+    var xmlHttp = new XMLHttpRequest();
+    xmlHttp.open("GET", path, true); // false for synchronous request
+    xmlHttp.send(null);
+    xmlHttp.onerror = function (e) {
+        console.log(e); // ToDo: Popup, etc.
+    };
+    xmlHttp.onloadend = function (event) {
+        callback(event, xmlHttp)
+    }
+}
+
+navStatus = true
+function openNav() {
+    document.getElementById("navbarToggleExternalContent").style.width = "250px";
+    document.getElementById("navbarToggleExternalContent").style.opacity = "1";
+    document.getElementById("navbarToggleExternalContent").style.display = "block";
+    document.getElementById("navbarToggleExternalContent").style.zIndex = 999999;
+    document.getElementById("pageCont").style.marginLeft = "0px";
+    navStatus = true
+}
+
+function closeNav() {
+    document.getElementById("navbarToggleExternalContent").style.width = "0px";
+    document.getElementById("navbarToggleExternalContent").style.opacity = "0";
+    document.getElementById("navbarToggleExternalContent").style.display = "none";
+    document.getElementById("navbarToggleExternalContent").style.zIndex = -999999;
+    document.getElementById("pageCont").style.marginLeft = "0";
+    navStatus = false
+}
+
+function toogleNav() {
+    if (navStatus) {
+        closeNav()
+    } else {
+        openNav()
+    }
+
+}

static/js/reconnecting-websocket.min.js

@@ -0,0 +1 @@
+!function(a,b){"function"==typeof define&&define.amd?define([],b):"undefined"!=typeof module&&module.exports?module.exports=b():a.ReconnectingWebSocket=b()}(this,function(){function a(b,c,d){function l(a,b){var c=document.createEvent("CustomEvent");return c.initCustomEvent(a,!1,!1,b),c}var e={debug:!1,automaticOpen:!0,reconnectInterval:1e3,maxReconnectInterval:3e4,reconnectDecay:1.5,timeoutInterval:2e3};d||(d={});for(var f in e)this[f]="undefined"!=typeof d[f]?d[f]:e[f];this.url=b,this.reconnectAttempts=0,this.readyState=WebSocket.CONNECTING,this.protocol=null;var h,g=this,i=!1,j=!1,k=document.createElement("div");k.addEventListener("open",function(a){g.onopen(a)}),k.addEventListener("close",function(a){g.onclose(a)}),k.addEventListener("connecting",function(a){g.onconnecting(a)}),k.addEventListener("message",function(a){g.onmessage(a)}),k.addEventListener("error",function(a){g.onerror(a)}),this.addEventListener=k.addEventListener.bind(k),this.removeEventListener=k.removeEventListener.bind(k),this.dispatchEvent=k.dispatchEvent.bind(k),this.open=function(b){h=new WebSocket(g.url,c||[]),b||k.dispatchEvent(l("connecting")),(g.debug||a.debugAll)&&console.debug("ReconnectingWebSocket","attempt-connect",g.url);var d=h,e=setTimeout(function(){(g.debug||a.debugAll)&&console.debug("ReconnectingWebSocket","connection-timeout",g.url),j=!0,d.close(),j=!1},g.timeoutInterval);h.onopen=function(){clearTimeout(e),(g.debug||a.debugAll)&&console.debug("ReconnectingWebSocket","onopen",g.url),g.protocol=h.protocol,g.readyState=WebSocket.OPEN,g.reconnectAttempts=0;var d=l("open");d.isReconnect=b,b=!1,k.dispatchEvent(d)},h.onclose=function(c){if(clearTimeout(e),h=null,i)g.readyState=WebSocket.CLOSED,k.dispatchEvent(l("close"));else{g.readyState=WebSocket.CONNECTING;var d=l("connecting");d.code=c.code,d.reason=c.reason,d.wasClean=c.wasClean,k.dispatchEvent(d),b||j||((g.debug||a.debugAll)&&console.debug("ReconnectingWebSocket","onclose",g.url),k.dispatchEvent(l("close")));var e=g.reconnectInterval*Math.pow(g.reconnectDecay,g.reconnectAttempts);setTimeout(function(){g.reconnectAttempts++,g.open(!0)},e>g.maxReconnectInterval?g.maxReconnectInterval:e)}},h.onmessage=function(b){(g.debug||a.debugAll)&&console.debug("ReconnectingWebSocket","onmessage",g.url,b.data);var c=l("message");c.data=b.data,k.dispatchEvent(c)},h.onerror=function(b){(g.debug||a.debugAll)&&console.debug("ReconnectingWebSocket","onerror",g.url,b),k.dispatchEvent(l("error"))}},1==this.automaticOpen&&this.open(!1),this.send=function(b){if(h)return(g.debug||a.debugAll)&&console.debug("ReconnectingWebSocket","send",g.url,b),h.send(b);throw"INVALID_STATE_ERR : Pausing to reconnect websocket"},this.close=function(a,b){"undefined"==typeof a&&(a=1e3),i=!0,h&&h.close(a,b)},this.refresh=function(){h&&h.close()}}return a.prototype.onopen=function(){},a.prototype.onclose=function(){},a.prototype.onconnecting=function(){},a.prototype.onmessage=function(){},a.prototype.onerror=function(){},a.debugAll=!1,a.CONNECTING=WebSocket.CONNECTING,a.OPEN=WebSocket.OPEN,a.CLOSING=WebSocket.CLOSING,a.CLOSED=WebSocket.CLOSED,a});

static/js/script.js

@@ -1,202 +1,297 @@
 var newDateObj = new Date();
 newDateObj = new Date(newDateObj.getTime() + 1000 * 20)
 
+backReqInt = 0;
+websocketFailed = false
+recoveryAttempts = 0;
+
+let socket = new ReconnectingWebSocket("ws://localhost:" + location.port);
+let ackdSessionToken = false
+let isFirstPacket = true
+
+let lastTime = "00:00:00";
+let timerCountdownFirst = true;
+
+socket.onopen = function (e) {
+	// alert("[open] Connection established");
+	//alert("Sending to server");
+	socket.send("new client");
+};
+
+socket.onmessage = function (event) {
+	// alert(`[message] Data received from server: ${event.data}`);
+	let inData = JSON.parse(event.data)
+	if (isFirstPacket) {
+		isFirstPacket = false
+		dataFame = JSON.parse(event.data);
+		timeDiff = new Date().getTime() - dataFame.srvTime
+	} else {
+		if (inData.sessionToken == dataFame.sessionToken) {
+			dataFame = JSON.parse(event.data);
+			timeDiff = new Date().getTime() - dataFame.srvTime
+		} else {
+			if (ackdSessionToken == false) {
+
+				ackdSessionToken = true
+
+				if (confirm("Session token mismatch, reload the page?")) {
+					location.reload();
+				}
+			}
+		}
+	}
+
+};
+
+socket.onclose = function (event) {
+	if (event.wasClean) {
+		console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
+	} else {
+		// e.g. server process killed or network down
+		// event.code is usually 1006 in this case
+		console.error('[close] Connection died');
+	}
+};
+
 allowFullscreen = true
+let dataFame = {}
+let timeDiff = 0
 
 function enterFullscreen(element) {
-  if (element.requestFullscreen) {
-    element.requestFullscreen();
-  } else if (element.msRequestFullscreen) {      // for IE11 (remove June 15, 2022)
-    element.msRequestFullscreen();
-  } else if (element.webkitRequestFullscreen) {  // iOS Safari
-    element.webkitRequestFullscreen();
-  }
+	if (element.requestFullscreen) {
+		element.requestFullscreen();
+	} else if (element.msRequestFullscreen) {
+		element.msRequestFullscreen();
+	} else if (element.webkitRequestFullscreen) {
+		element.webkitRequestFullscreen();
+	}
 }
 
 function returnData() {
-  return (JSON.parse(document.getElementById("incomeData").innerHTML))
+	return (JSON.parse(document.getElementById("incomeData").innerHTML))
 }
 
 function percentage(partialValue, totalValue) {
-  return (100 * partialValue) / totalValue;
+	return (100 * partialValue) / totalValue;
 }
 
 function updateFullscreen() {
-  if (JSON.parse(document.getElementById("incomeData").innerHTML).defaultFullScreen && allowFullscreen) {
-    enterFullscreen(document.documentElement)
-  }
+	if (JSON.parse(document.getElementById("incomeData").innerHTML).defaultFullScreen && allowFullscreen) {
+		enterFullscreen(document.documentElement)
+	}
 }
 
 
-
 function msToTime(s, data) {
-  isSmallerThenZero = false
-  if (s < 0) {
-    isSmallerThenZero = true
-  }
+	isSmallerThenZero = false
+	if (s < 0) {
+		isSmallerThenZero = true
+	}
 
-  var ms = s % 1000;
-  s = (s - ms) / 1000;
-  var secs = s % 60;
-  s = (s - secs) / 60;
-  var mins = s % 60;
-  var hrs = (s - mins) / 60;
-  let out = ""
+	var ms = s % 1000;
+	s = (s - ms) / 1000;
+	var secs = s % 60;
+	s = (s - secs) / 60;
+	var mins = s % 60;
+	var hrs = (s - mins) / 60;
+	let out = ""
 
-  if (!data.showMilliSeconds) {
-    out = ('00' + Math.abs(hrs)).slice(-2) + ':' + ('00' + Math.abs(mins)).slice(-2) + ':' + ('00' + Math.abs(secs)).slice(-2)
-  } else {
-    out = ('00' + Math.abs(hrs)).slice(-2) + ':' + ('00' + Math.abs(mins)).slice(-2) + ':' + ('00' + Math.abs(secs)).slice(-2) + '.' + ('000' + Math.abs(ms)).slice(-3)
-  }
+	if (!data.showMilliSeconds) {
+		out = ('00' + Math.abs(hrs)).slice(-2) + ':' + ('00' + Math.abs(mins)).slice(-2) + ':' + ('00' + Math.abs(secs)).slice(-2)
+	} else {
+		out = ('00' + Math.abs(hrs)).slice(-2) + ':' + ('00' + Math.abs(mins)).slice(-2) + ':' + ('00' + Math.abs(secs)).slice(-2) + '.' + ('000' + Math.abs(ms)).slice(-3)
+	}
 
-  if (isSmallerThenZero) {
-    out = "-" + out
-  }
-  return out;
+	if (isSmallerThenZero) {
+		out = "-" + out
+	}
+	return out;
 }
 
 function findProgessColor(colors, value) {
-  const allColors = Object.keys(colors);
-  let resColor = colors["START"]
-  for (let color in allColors) {
-    const currColor = allColors[color]
-    // console.log(color, currColor, parseInt(currColor), value, colors[String(currColor)], resColor)
-    if (value <= parseInt(currColor)) {
-      resColor = colors[String(currColor)]
-      break
-    }
-  }
-  return (resColor)
+	const allColors = Object.keys(colors);
+	let resColor = colors["START"]
+	for (let color in allColors) {
+		const currColor = allColors[color]
+		// console.log(color, currColor, parseInt(currColor), value, colors[String(currColor)], resColor)
+		if (value <= parseInt(currColor)) {
+			resColor = colors[String(currColor)]
+			break
+		}
+	}
+	return (resColor)
 }
 
+function requestBackend() {
+	resp = httpGet("/api/v1/data");
+	resp.onloadend = function (e) {
+		if (resp.status == 200) {
+			resp = resp.responseText;
+			var data = JSON.parse(resp);
+			timeDiff = new Date().getTime() - data.srvTime
+			dataFame = data;
+		}
+	}
+}
+
+let isSlowed = false
+
+function handleRecovery() {
+	var img = document.body.appendChild(document.createElement("img"));
+	img.onload = function () {
+		location.reload();
+	};
+	img.src = "SMPTE_Color_Bars.svg";
+}
+
+let recoInter = -1
+
 function handleUpdate() {
-  resp = httpGet("/api/v1/data");
+	var data = dataFame;
+	document.getElementById("incomeData").innerHTML = JSON.stringify(data)
+	document.getElementById("timediff").innerHTML = timeDiff + "<br>" + String(new Date().getTime() - data.srvTime);
 
-  resp.onloadend = function (e) {
-    if(resp.status == 200){
-      resp = resp.responseText;
-      var data = JSON.parse(resp);
-      document.getElementById("incomeData").innerHTML = JSON.stringify(data)
-      document.getElementById("timediff").innerHTML = new Date().getTime() - data.srvTime;
-      if(data.debug){
-        document.getElementById("timediff").style.display = "block";
-      }else{
-        document.getElementById("timediff").style.display = "none";
-      }
-  
-      if (data.defaultFullScreen && document.getElementById("initalDate").innerHTML.includes("true") && allowFullscreen) {
-        enterFullscreen(document.documentElement);
-        document.getElementById("initalDate").innerHTML = "false"
-      }
-  
-      if (data.showMessage) {
-        document.getElementById("overlay").style.display = "block";
-        document.getElementById("text").innerHTML = data.message
-      } else {
-        off()
-      }
-  
-      if (new Date().getTime() - data.messageAppearTime < 5000) {
-        if (!document.getElementById("text").classList.contains('blink')) {
-          document.getElementById("text").classList.add("blink")
-        }
-      } else {
-        if (document.getElementById("text").classList.contains('blink')) {
-          document.getElementById("text").classList.remove("blink")
-        }
-      }
-  
-  
-      if (data.mode == "clock") {
-        document.getElementById("timer").innerHTML = getTime();
-        document.getElementById("testImg").style.display = "none";
-        document.getElementById("wholeProgBar").style.display = "none";
-  
-      } else if (data.mode == "timer") {
-  
-        document.getElementById("wholeProgBar").style.display = "block";
-  
-        if (data.timerRunState) {
-          const now = new Date()
-          const diff = data.countdownGoal - now.getTime()
-          document.getElementById("timer").innerHTML = msToTime(diff, data);
-          if (diff > 0) {
-            document.getElementById("progBar").style.width = percentage(diff, data.timeAmountInital) + "%";
-          } else {
-            document.getElementById("progBar").style.width = "0%";
-          }
-  
-          document.getElementById("progBar").style.backgroundColor = findProgessColor(data.colorSegments, diff)
-          document.getElementById("testImg").style.display = "none";
-          if (data.enableColoredText) {
-            document.getElementById("timer").style.color = findProgessColor(data.textColors, diff)
-          } else {
-            document.getElementById("timer").style.color = "white"
-          }
-  
-        }
-        if (data.showTimeOnCountdown) {
-          document.getElementById("clockSec").innerHTML = getTime();
-        } else {
-          document.getElementById("clockSec").innerHTML = "";
-        }
-  
-      } else if (data.mode == "black") {
-        document.getElementById("timer").innerHTML = "";
-        document.getElementById("testImg").style.display = "none";
-        document.getElementById("wholeProgBar").style.display = "none";
-  
-      } else if (data.mode == "test") {
-        document.getElementById("timer").innerHTML = "";
-        document.getElementById("testImg").style.display = "block";
-        document.getElementById("progBar").style.display = "none";
-      }
-    }
-    
-  }
+	if (data.debug) {
+		document.getElementById("timediff").style.display = "block";
+	} else {
+		document.getElementById("timediff").style.display = "none";
+	}
+
+	if (data.defaultFullScreen && document.getElementById("initalDate").innerHTML.includes("true") && allowFullscreen) {
+		enterFullscreen(document.documentElement);
+		document.getElementById("initalDate").innerHTML = "false"
+	}
+
+	if (data.showMessage) {
+		document.getElementById("overlay").style.display = "block";
+		document.getElementById("text").innerHTML = data.message
+	} else {
+		document.getElementById("overlay").style.display = "none";
+	}
+
+	if (data.showTimeOnCountdown && data.mode == "timer") {
+		document.getElementById("clockSec").innerHTML = getTime();
+	} else {
+		document.getElementById("clockSec").innerHTML = "";
+	}
+
+	if (new Date().getTime() - data.messageAppearTime < 5000) {
+		if (!document.getElementById("text").classList.contains('blink')) {
+			document.getElementById("text").classList.add("blink")
+		}
+	} else {
+		if (document.getElementById("text").classList.contains('blink')) {
+			document.getElementById("text").classList.remove("blink")
+		}
+	}
 
 
+	if (data.mode == "clock") {
+		document.getElementById("timer").innerHTML = getTime();
+		document.getElementById("testImg").style.display = "none";
+		document.getElementById("wholeProgBar").style.display = "none";
+		document.getElementById("clockSec").innerHTML = "";
+		document.getElementById("timer").style.color = "white"
+		timerCountdownFirst = true;
+
+	} else if (data.mode == "timer") {
+		if (data.showProgressbar) {
+			document.getElementById("wholeProgBar").style.display = "block";
+		} else {
+			document.getElementById("wholeProgBar").style.display = "none";
+		}
+
+		const now = new Date()
+
+		if (timerCountdownFirst) {
+			const diff = data.countdownGoal - now.getTime()
+			timerCountdownFirst = false
+			document.getElementById("timer").innerHTML = msToTime(diff, data);
+			if (diff > 0) {
+				document.getElementById("progBar").style.width = percentage(diff, data.timeAmountInital) + "%";
+			} else {
+				document.getElementById("progBar").style.width = "0%";
+			}
+
+			document.getElementById("progBar").style.backgroundColor = findProgessColor(data.colorSegments, diff)
+			document.getElementById("testImg").style.display = "none";
+			if (data.enableColoredText) {
+				document.getElementById("timer").style.color = findProgessColor(data.textColors, diff)
+			} else {
+				document.getElementById("timer").style.color = "white"
+			}
+		}
+
+		if (data.timerRunState) {
+			const diff = data.countdownGoal - now.getTime()
+			document.getElementById("timer").innerHTML = msToTime(diff, data);
+			lastTime = msToTime(diff, data);
+			if (diff > 0) {
+				document.getElementById("progBar").style.width = percentage(diff, data.timeAmountInital) + "%";
+			} else {
+				document.getElementById("progBar").style.width = "0%";
+			}
+
+			document.getElementById("progBar").style.backgroundColor = findProgessColor(data.colorSegments, diff)
+			document.getElementById("testImg").style.display = "none";
+			if (data.enableColoredText) {
+				document.getElementById("timer").style.color = findProgessColor(data.textColors, diff)
+			} else {
+				document.getElementById("timer").style.color = "white"
+			}
+
+		} else {
+			document.getElementById("timer").innerHTML = lastTime
+		}
+	} else if (data.mode == "black") {
+		timerCountdownFirst = true;
+		document.getElementById("timer").innerHTML = "";
+		document.getElementById("testImg").style.display = "none";
+		document.getElementById("wholeProgBar").style.display = "none";
+		document.getElementById("clockSec").innerHTML = "";
+
+	} else if (data.mode == "test") {
+		timerCountdownFirst = true;
+		document.getElementById("timer").innerHTML = "";
+		document.getElementById("testImg").style.display = "block";
+		document.getElementById("progBar").style.display = "none";
+		document.getElementById("clockSec").innerHTML = "";
+	}
 }
 
 function httpGet(theUrl) {
-  var xmlHttp = new XMLHttpRequest();
-  xmlHttp.open("GET", theUrl, true); // false for synchronous request
-  xmlHttp.send(null);
-  xmlHttp.onerror = function (e) {
-    console.log(e);
-  };
-  return xmlHttp;
+	var xmlHttp = new XMLHttpRequest();
+	xmlHttp.open("GET", theUrl, true); // false for synchronous request
+	xmlHttp.send(null);
+	xmlHttp.onerror = function (e) {
+		console.log(e);
+	};
+	return xmlHttp;
 }
 
 function getTime() {
-  var date = new Date();
-  var h = date.getHours(); // 0 - 23
-  var m = date.getMinutes(); // 0 - 59
-  var s = date.getSeconds(); // 0 - 59
+	var date = new Date();
+	var h = date.getHours(); // 0 - 23
+	var m = date.getMinutes(); // 0 - 59
+	var s = date.getSeconds(); // 0 - 59
 
-  h = h < 10 ? "0" + h : h;
-  m = m < 10 ? "0" + m : m;
-  s = s < 10 ? "0" + s : s;
+	h = h < 10 ? "0" + h : h;
+	m = m < 10 ? "0" + m : m;
+	s = s < 10 ? "0" + s : s;
 
-  var time = h + ":" + m + ":" + s;
-  return time;
+	var time = h + ":" + m + ":" + s;
+	return time;
 }
 
-function on() {
-  document.getElementById("overlay").style.display = "block";
-}
 
-function off() {
-  document.getElementById("overlay").style.display = "none";
-}
-
-setInterval(handleUpdate, 200);
+// setInterval(requestBackend, 500);
+updateInter = setInterval(handleUpdate, 2);
 
 let temp = new URLSearchParams(window.location.search).get("smaller");
 
 
 if (temp == "true") {
-  var cssURL = '/css/smallerTextMod.css';
-  document.head.innerHTML += '<link rel="stylesheet" href="' + cssURL + '"/>'
-  allowFullscreen = false
+	var cssURL = '/css/smallerTextMod.css';
+	document.head.innerHTML += '<link rel="stylesheet" href="' + cssURL + '"/>'
+	allowFullscreen = false
 }

static/js/timer/timerview.js

@@ -0,0 +1,284 @@
+
+
+// References to the HTML elements
+let warningBox = document.getElementById("warningBanner");
+let timer = document.getElementById("timer");
+let testImage = document.getElementById("testImg");
+let clockSec = document.getElementById("clockSec");
+let timeDiffContainer = document.getElementById("timediff");
+let wholeProgressBar = document.getElementById("wholeProgBar");
+let progressBar = document.getElementById("progBar");
+let overlay = document.getElementById("overlay");
+let overlayText = document.getElementById("text");
+let screensaverText = document.getElementById("moveClock");
+let screensaverClock = document.getElementById("screensaverClock");
+
+// Prepare connection to backend
+let socket = new ReconnectingWebSocket("ws://" + location.hostname + ":" + location.port);
+
+// State variables
+let ackSessionTokenChange = false; // Wether the user has acknowledged the session token mismatch
+let dataFrame = {};
+let timeDiffToServer = 0;
+let sessionToken = ""; // Our current session token
+let defaultToFullscreen = false;
+let allowFullscreen = true; // If the system is allowed to go fullscreen
+
+// Scale down the interface if the smaller parameter is set
+let smallerFlag = new URLSearchParams(window.location.search).get("smaller");
+if (smallerFlag == "true") {
+	var cssURL = '/css/smallerTextMod.css';
+	document.head.innerHTML += '<link rel="stylesheet" href="' + cssURL + '"/>';
+	allowFullscreen = false;
+}
+
+// Handle the screensaver to fit the screen
+setTimeout(handleDVD, 200);
+setTimeout(handleDVD, 400);
+document.body.onresize = handleDVD;
+
+// Handle connection event
+socket.onopen = function (e) {
+	socket.send("new client");
+};
+
+// Handle connection close event 
+socket.onclose = function (event) {
+	warningBox.style.display = "block"; // Show warning banner
+	if (event.wasClean) {
+		console.log(`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`);
+	} else {
+		// e.g. server process killed or network down
+		// event.code is usually 1006 in this case
+		console.error('[close] Connection died');
+	}
+};
+
+// Handle incoming data
+socket.onmessage = function (event) {
+	// Parse the incoming data as JSON
+	const inData = JSON.parse(event.data);
+	// Check if the backend has restarted in the background
+	if (inData.sessionToken == sessionToken || sessionToken == "") {
+		dataFrame = JSON.parse(event.data);
+		// Time difference between the client and the server
+		timeDiffToServer = new Date().getTime() - dataFrame.srvTime;
+
+		if(dataFrame.debug) {
+			console.log(dataFrame)
+			timeDiffContainer.innerHTML = timeDiffToServer
+			timeDiffContainer.style.display = "block"
+		} else {
+			timeDiffContainer.style.display = "none"
+		}
+
+		// Process the data
+		handleUpdate();
+	} else {
+		// If the user has not acknowledged the session token mismatch, show a warning
+		if (!ackSessionTokenChange) {
+			ackSessionTokenChange = true;
+			if (confirm("Session token mismatch, reload the page?")) {
+				location.reload();
+			}
+		}
+	}
+};
+
+// Update timer data regularly (every 20ms)
+let updateIntervalReference = setInterval(handleUpdate, 20);
+
+// Helper functions
+
+// Get the current time in a HH:MM:SS format
+function getTime() {
+	var date = new Date();
+	var h = date.getHours(); // 0 - 23
+	var m = date.getMinutes(); // 0 - 59
+	var s = date.getSeconds(); // 0 - 59
+
+	h = h < 10 ? "0" + h : h;
+	m = m < 10 ? "0" + m : m;
+	s = s < 10 ? "0" + s : s;
+
+	var time = h + ":" + m + ":" + s;
+	return time;
+}
+
+function percentage(partialValue, totalValue) {
+	return (100 * partialValue) / totalValue;
+}
+
+function msToTime(s, data) {
+	isSmallerThenZero = false
+	if (s < 0) {
+		isSmallerThenZero = true
+	}
+
+	var ms = s % 1000;
+	s = (s - ms) / 1000;
+	var secs = s % 60;
+	s = (s - secs) / 60;
+	var mins = s % 60;
+	var hrs = (s - mins) / 60;
+	let out = ""
+
+	if (!data.showMilliSeconds) {
+		out = ('00' + Math.abs(hrs)).slice(-2) + ':' + ('00' + Math.abs(mins)).slice(-2) + ':' + ('00' + Math.abs(secs)).slice(-2)
+	} else {
+		out = ('00' + Math.abs(hrs)).slice(-2) + ':' + ('00' + Math.abs(mins)).slice(-2) + ':' + ('00' + Math.abs(secs)).slice(-2) + '.' + ('000' + Math.abs(ms)).slice(-3)
+	}
+
+	if (isSmallerThenZero) {
+		out = "-" + out
+	}
+	return out;
+}
+
+function findProgessColor(colors, value) {
+	const allColors = Object.keys(colors);
+	let resColor = colors["START"]
+	for (let color in allColors) {
+		const currColor = allColors[color]
+		if (value <= parseInt(currColor)) {
+			resColor = colors[String(currColor)]
+			break
+		}
+	}
+	return (resColor)
+}
+
+function handleUpdate() {
+	defaultToFullscreen = dataFrame.defaultFullScreen;
+	switch (dataFrame.mode) {
+		case "timer":
+			// Timer mode
+			timer.style.display = "block";
+			testImage.style.display = "none";
+			screensaverText.style.display = "none";
+
+			if(dataFrame.showTimeOnCountdown) {
+				// Show time on countdown
+				clockSec.innerHTML = getTime();
+				clockSec.style.display = "block";
+			} else {
+				clockSec.style.display = "none";
+			}
+			if(dataFrame.showProgressbar) {
+				// Show progressbar
+				wholeProgressBar.style.display = "block";
+			} else {
+				wholeProgressBar.style.display = "none";
+			}
+			// Calculate the time difference between the goal and the current time
+			const now = new Date();
+			let diff = 0;
+			if(dataFrame.timerRunState) {
+				diff = dataFrame.countdownGoal - now.getTime()
+			} else {
+				diff = (now.getTime() - dataFrame.pauseMoment) + dataFrame.countdownGoal - now.getTime() 
+			}
+			 
+			timer.innerHTML = msToTime(diff, dataFrame);
+
+			// Handle the progressbar
+			if (diff >= 0) {
+				progressBar.style.width = percentage(diff, dataFrame.timeAmountInital) + "%";
+			} else {
+				progressBar.style.width = "0%";
+				if(!dataFrame.enableOverrun) {
+					timer.innerHTML = "00:00:00";
+				}
+			}
+			progressBar.style.backgroundColor = findProgessColor(dataFrame.colorSegments, diff)
+
+			// Handle the text color
+			if (dataFrame.enableColoredText) {
+				timer.style.color = findProgessColor(dataFrame.textColors, diff)
+			} else {
+				timer.style.color = "white"
+			}
+			break;
+		case "clock":
+			// Clock mode
+			timer.innerHTML = getTime();
+			testImage.style.display = "none";
+			clockSec.style.display = "none";
+			wholeProgressBar.style.display = "none";
+			timer.style.display = "block";
+			screensaverText.style.display = "none";
+			timer.style.color = "white";
+			break;
+		case "black":
+			// Black screen mode
+			testImage.style.display = "none";
+			clockSec.style.display = "none";
+			wholeProgressBar.style.display = "none";
+			timer.style.display = "none";
+			screensaverText.style.display = "none";
+			timer.style.color = "white";
+			break;
+		case "test":
+			// Test image mode
+			testImage.style.display = "block";
+			clockSec.style.display = "none";
+			wholeProgressBar.style.display = "none";
+			timer.style.display = "none";
+			screensaverText.style.display = "none";
+			timer.style.color = "white";
+			break;
+		case "screensaver":
+			// Screensaver mode
+			testImage.style.display = "none";
+			clockSec.style.display = "none";
+			wholeProgressBar.style.display = "none";
+			timer.style.display = "none";
+			timer.style.color = "white";
+			screensaverText.style.display = "block";
+			screensaverClock.innerHTML = getTime();
+			break;
+	}
+
+	// Handle the message overlay
+	if (dataFrame.showMessage) {
+		overlay.style.display = "block";
+		overlayText.innerHTML = dataFrame.message
+	} else {
+		overlay.style.display = "none";
+	}
+
+	// This will result in the text fading in and out when the message changes
+	if (new Date().getTime() - dataFrame.messageAppearTime < 5000) {
+		if (!overlayText.classList.contains('blink')) {
+			overlayText.classList.add("blink")
+		}
+	} else {
+		if (overlayText.classList.contains('blink')) {
+			overlayText.classList.remove("blink")
+		}
+	}
+}
+
+function handleDVD() {
+	console.info("Recalculating screensaver size")
+	const objHeight = document.body.offsetHeight - screensaverText.offsetHeight;
+	const objWidth = document.body.offsetWidth - screensaverText.offsetWidth;
+	document.documentElement.style.setProperty('--my-end-left', objWidth + "px");
+	document.documentElement.style.setProperty('--my-end-top', objHeight + "px");
+}
+
+function enterFullscreen(element) {
+	if (element.requestFullscreen) {
+		element.requestFullscreen();
+	} else if (element.msRequestFullscreen) {
+		element.msRequestFullscreen();
+	} else if (element.webkitRequestFullscreen) {
+		element.webkitRequestFullscreen();
+	}
+}
+
+function updateFullscreen() {
+	if (defaultToFullscreen && allowFullscreen) {
+		enterFullscreen(document.documentElement)
+	}
+}

templates/adminPanel.html

@@ -1,94 +0,0 @@
-<!doctype html>
-
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-
-  <title>openCountdown - Admin</title>
-  <meta name="description" content="openCountdown">
-  <meta name="author" content="TheGreydiamond">
-
-  <link rel="stylesheet" href="css/styles.css?v=1.1">
-</head>
-
-<body>
-
-
-  <form action="/api/v1/set/mode" target="hiddenFrame">
-    <select id="mode" name="mode">
-      <option value="timer">Timer</option>
-      <option value="clock">Clock</option>
-      <option value="black">Black</option>
-      <option value="test">Test</option>
-    </select>
-    <button type="submit">Submit</button>
-  </form>
-
-  <br>
-  <form action="/api/v1/set/layout/showMillis" target="hiddenFrame">
-    <select id="show" name="show">
-      <option value="true">Enable Milliseconds</option>
-      <option value="false">Disable Milliseconds</option>
-    </select>
-    <button type="submit">Submit</button>
-  </form>
-
-  <form action="/api/v1/set/layout/showTime" target="hiddenFrame">
-    <select id="show" name="show">
-      <option value="true">Show Clock on Countdown page</option>
-      <option value="false">Do not show Clock on Countdown page</option>
-    </select>
-    <button type="submit">Submit</button>
-  </form>
-
-  <form action="/api/v1/set/addMillisToTimer" target="hiddenFrame">
-    <input type="time" step="0.001" name="time2" id="time2" onchange="updateHiddenForm()"></input>
-    <input type="hidden" step="0.001" name="time" id="time"></input>
-    <button type="submit">Submit</button>
-  </form>
-
-  <form action="/api/v1/set/addMillisToTimer" target="hiddenFrame">
-    <select id="time" name="time" onchange="">
-      <option value="20000">debug 1 (20 secs)</option>
-      <option value="300000">00:05:00</option>
-      <option value="600000">00:10:00</option>
-      <option value="900000">00:15:00</option>
-      <option value="1200000">00:20:00</option>
-      <option value="1500000">00:25:00</option>
-      <option value="1800000">00:30:00</option>
-      <option value="2100000">00:35:00</option>
-      <option value="2400000">00:40:00</option>
-      <option value="2700000">00:45:00</option>
-    </select>
-    <button type="submit">Submit</button>
-  </form>
-
-  Play controls:
-  <form action="/api/v1/ctrl/timer/play" target="hiddenFrame">
-    <button type="submit">Play</button>
-  </form>
-  <form action="/api/v1/ctrl/timer/pause" target="hiddenFrame">
-    <button type="submit">Pause</button>
-  </form>
-  <form action="/api/v1/ctrl/timer/restart" target="hiddenFrame">
-    <button type="submit">Restart</button>
-  </form>
-
-  Message: 
-  <form action="/api/v1/ctrl/message/show" target="hiddenFrame">
-    <input type="text" name="msg">
-    <button type="submit">Submit</button>
-  </form>
-  <form action="/api/v1/ctrl/message/hide" target="hiddenFrame">
-    <button type="submit">Hide</button>
-  </form>
-  <iframe name="hiddenFrame" style="display: none"></iframe>
-
-
-  <iframe src="/timer?smaller=true" height="80%" width="80%"> </iframe>
-</body>
-<script src="js/interface.js"></script>
-
-</html>

templates/brokenTranslation.html

@@ -0,0 +1,139 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>openCountdown - Admin</title>
+    <meta name="description" content="openCountdown">
+    <meta name="author" content="TheGreydiamond">
+
+
+    <link rel="stylesheet" href="/assets/bootstrap-icons/font/bootstrap-icons.css">
+    <link rel="stylesheet" href="/assets/mdbootstrap/css/style.css">
+
+    <script src="/assets/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="/assets/jquery/dist/jquery.min.js"></script>
+    <script type="text/javascript" src="/mdbootstrap/js/mdb.min.js"></script>
+
+    <script type="text/javascript" src="/js/darkreader.js"></script>
+    <script type="text/javascript" src="/assets/js-cookie/dist/js.cookie.min.js"></script>
+    <link href="/assets/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/css/mainStyle.css" rel="stylesheet">
+    <link rel="stylesheet" href="/coloris/coloris.min.css" />
+    <link rel="stylesheet" href="/assets/bootstrap-duration-picker/dist/bootstrap-duration-picker.css" />
+    <link rel="stylesheet" href="/assets/flatpickr/dist/flatpickr.min.css" />
+    <script src="/assets/bootstrap-duration-picker/dist/bootstrap-duration-picker-debug.js"></script>
+    <script src="/coloris/coloris.min.js"></script>
+
+    <script type="text/javascript" src="/assets/flatpickr/dist/flatpickr.js"> </script>
+
+
+    <link rel="icon" href="/logo/favicon.svg" type="image/svg+xml">
+</head>
+
+<body>
+
+    <main>
+        <div class="d-flex flex-column flex-shrink-0 p-3 text-white bg-dark trans" style="width: 250px;"
+            id="navbarToggleExternalContent">
+            <a href="/" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-white text-decoration-none">
+                <svg class="bi me-2" width="40" height="32">
+                    <use xlink:href="#bootstrap" />
+                </svg>
+                <span class="fs-4">Sidebar</span>
+            </a>
+            <hr>
+            <ul class="nav nav-pills flex-column mb-auto">
+                <li class="nav-item">
+                    <a href="#homeP" class="nav-link active" aria-current="page" id="PageIndex">
+                        <i class="bi bi-house-door"></i>
+                        Home
+                    </a>
+                </li>
+            </ul>
+            <hr>
+            openCountdown <div class="btn-group" role="group" aria-label="Basic radio toggle button group">
+
+                <input type="radio" class="btn-check" name="btnradio2" id="Mbtnradio1" autocomplete="off" checked>
+                <label class="btn btn-outline-primary" for="Mbtnradio1"><svg xmlns="http://www.w3.org/2000/svg"
+                        width="16" height="16" fill="currentColor" class="bi bi-brightness-high-fill"
+                        viewBox="0 0 16 16">
+                        <path
+                            d="M12 8a4 4 0 1 1-8 0 4 4 0 0 1 8 0zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z" />
+                    </svg>
+                </label>
+
+                <input type="radio" class="btn-check" name="btnradio2" id="Mbtnradio2" autocomplete="off">
+                <label class="btn btn-outline-primary" for="Mbtnradio2">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
+                        class="bi bi-moon-fill" viewBox="0 0 16 16">
+                        <path
+                            d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278z" />
+                    </svg>
+                </label>
+
+                <input type="radio" class="btn-check" name="btnradio2" id="Mbtnradio3" autocomplete="off">
+                <label class="btn btn-outline-primary" for="Mbtnradio3">
+                    Auto
+                </label>
+
+            </div>
+        </div>
+        <pages class="d-flex flex-fill" id="pageCont" class="z-index: 50;">
+
+
+            <page id="homeP" class="pageC flex-fill overflow-auto">
+
+                <div class="container">
+                    <div class=""
+                        style=" display: flex;align-items: center;justify-content: center; flex-wrap: wrap; flex-direction: column;">
+
+                        <h1>Oh no!</h1>
+                        <h1>
+                            <i class="bi bi-translate"></i>
+                        </h1>
+                        <h5>
+                            There is a critical error with the current language template. Please select a diffrent
+                            language.
+                        </h5>
+                        <label for="lang">Please choose a language: </label>
+                        <select name="lang" id="lang">
+                            <% it.additional.languages.forEach(function(lang){ %>
+                                <option value="<%= lang %>">
+                                    <%= lang %>
+                                </option>
+                                <% }) %>
+                        </select>
+                        <button id="applyLang" class="btn btn-outline-success">
+                            Apply & Reload
+                        </button>
+
+                    </div>
+                </div>
+
+            </page>
+        </pages>
+    </main>
+    <script type="text/javascript" src="/js/jsonview.js"></script>
+    <script type="text/javascript" src="/js/interface.js"> </script>
+    <script type="text/javascript">
+        $("#applyLang").on("click", function (event) {
+            const lang = $("#lang").val()
+            saveOption("/api/ui/v1/lang/set?lang=" + lang, function handleLangSelect(event, xmlHttp) {
+                const temp = JSON.parse(xmlHttp.responseText)
+                if (temp.status == "error") {
+                    alert("Request failed reason: " + temp.reason)
+                } else {
+                    location.reload()
+                }
+                console.log(JSON.parse(xmlHttp.responseText))
+            })
+        })
+
+    </script>
+
+</body>
+
+</html>

templates/errorPages/404.html

@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>openCountdown - Not found</title>
+    <meta name="description" content="openCountdown">
+    <meta name="author" content="TheGreydiamond">
+
+    <script type="text/javascript" src="/assets/js-cookie/dist/js.cookie.min.js"></script>
+    <link rel="stylesheet" href="/assets/bootstrap-icons/font/bootstrap-icons.css">
+    <link rel="stylesheet/less" type="text/css" href="/css/errorPage/styles.less" />
+
+
+    <script>
+        less = {
+            javascriptEnabled: true
+        };
+    </script>
+    <script src="/assets/less/dist/less.min.js"></script>
+
+    <link rel="stylesheet" href="/css/errorPage/style.css">
+</head>
+
+<body>
+    <div class="container">
+        <h1 class="rainbow">
+            <div class="glitch" data-text="404">
+                404
+            </div>
+        </h1>
+        <h2 class="color-foreground">
+            We're sorry, the page you were looking for isn't found here.<br>
+            The link you followed may either be broken or no longer exists. Please
+            check your spelling.<br>
+
+            <a href="/"><i class="bi bi-house-door"></i> Back home</a>
+        </h2>
+
+    </div>
+</body>
+
+</html>

templates/newAdminPanel.html

@@ -0,0 +1,452 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>openCountdown - Admin</title>
+    <meta name="description" content="openCountdown">
+    <meta name="author" content="TheGreydiamond">
+
+
+    <link rel="stylesheet" href="/assets/bootstrap-icons/font/bootstrap-icons.css">
+    <link rel="stylesheet" href="/assets/mdbootstrap/css/style.css">
+
+    <script src="/assets/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="/assets/jquery/dist/jquery.min.js"></script>
+    <script type="text/javascript" src="/assets/mdbootstrap/js/mdb.min.js"></script>
+
+    <script type="text/javascript" src="/assets/darkreader/darkreader.js"></script>
+    <script type="text/javascript" src="/assets/js-cookie/dist/js.cookie.min.js"></script>
+    <link href="/assets/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/css/mainStyle.css" rel="stylesheet">
+    <link rel="stylesheet" href="/coloris/coloris.min.css" />
+    <link rel="stylesheet" href="/assets/bootstrap-duration-picker/dist/bootstrap-duration-picker.css" />
+    <link rel="stylesheet" href="/assets/flatpickr/dist/flatpickr.min.css" />
+    <script src="/assets/bootstrap-duration-picker/dist/bootstrap-duration-picker-debug.js"></script>
+    <script src="/coloris/coloris.min.js"></script>
+
+    <script type="text/javascript" src="/assets/flatpickr/dist/flatpickr.js"> </script>
+
+
+    <link rel="icon" href="/logo/faviconLogo.svg" type="image/svg+xml">
+</head>
+
+<body>
+
+    <main>
+        <div class="d-flex flex-column flex-shrink-0 p-3 text-white bg-dark trans" style="width: 250px;"
+            id="navbarToggleExternalContent">
+            <a href="/" class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-white text-decoration-none">
+                <center>
+                    <img  class="bi me-2" width="200" height="128" src="/logo/logoProposal.svg">
+                    
+                </img >
+                </center>
+               
+            </a>
+            <hr>
+            <ul class="nav nav-pills flex-column mb-auto">
+                <li class="nav-item">
+                    <a href="#homeP" class="nav-link active" aria-current="page" id="PageIndex">
+                        <i class="bi bi-house-door"></i>
+                        <%= it.lang.sidebar.home %>
+                    </a>
+                </li>
+                <li>
+                    <a href="#settings" class="nav-link text-white" id="PageSettings">
+                        <i class="bi bi-gear"></i>
+                        <%= it.lang.sidebar.settings %>
+                    </a>
+                </li>
+                <li>
+                    <a href="#debug" class="nav-link text-white" id="PageDebug">
+                        <i class="bi bi-bug"></i>
+                        <%= it.lang.sidebar.debug %>
+                    </a>
+                </li>
+                <li>
+                    <a href="#about" class="nav-link text-white" id="PageAbout">
+                        <i class="bi bi-info-circle"></i>
+                        <%= it.lang.sidebar.about %>
+                    </a>
+                </li>
+            </ul>
+            <hr>
+            openCountdown <div class="btn-group" role="group" aria-label="Basic radio toggle button group">
+
+                <input type="radio" class="btn-check" name="btnradio2" id="Mbtnradio1" autocomplete="off" checked>
+                <label class="btn btn-outline-primary" for="Mbtnradio1"><svg xmlns="http://www.w3.org/2000/svg"
+                        width="16" height="16" fill="currentColor" class="bi bi-brightness-high-fill"
+                        viewBox="0 0 16 16">
+                        <path
+                            d="M12 8a4 4 0 1 1-8 0 4 4 0 0 1 8 0zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z" />
+                    </svg>
+                </label>
+
+                <input type="radio" class="btn-check" name="btnradio2" id="Mbtnradio2" autocomplete="off">
+                <label class="btn btn-outline-primary" for="Mbtnradio2">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
+                        class="bi bi-moon-fill" viewBox="0 0 16 16">
+                        <path
+                            d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278z" />
+                    </svg>
+                </label>
+
+                <input type="radio" class="btn-check" name="btnradio2" id="Mbtnradio3" autocomplete="off">
+                <label class="btn btn-outline-primary" for="Mbtnradio3">
+                    Auto
+                </label>
+
+            </div>
+        </div>
+        <pages class="d-flex flex-fill" id="pageCont" class="z-index: 50;">
+            <div class="">
+                <button type="button"
+                    class="opacity mx-2 svg-center btn btn-outline-transparent rounded-circle border-0"
+                    onclick="toogleNav()">
+                    <i class="bi bi-list"></i>
+                </button>
+            </div>
+
+
+            <page id="homeP" class="pageC flex-fill overflow-auto">
+                <h1><%= it.lang.titles.home %></h1>
+
+                <div class="container">
+                    <div class="row">
+                        <div class="col">
+                            <h3 class="d-flex"><%= it.lang.titles.preview %> <span class="helperTip" data-placement="right" title="<%= it.lang.hints.previewHint %>" data-toggle="tooltip">
+                                    <i class="bi bi-question-circle-fill"></i>
+                                </span>
+                                 <div class="ms-auto">
+                                    <span class="helperTip" data-placement="right"
+                                        title="<%= it.lang.hints.copyHint %>" data-toggle="tooltip">
+                                        <button class="btn" onclick="navigator.clipboard.writeText(window.location.toString() + 'timer')">
+                                            <i class="bi bi-clipboard"></i>
+                                        </button>
+                                    </span>
+
+                                    <span class="helperTip" data-placement="right"
+                                        title="<%= it.lang.hints.openInNewTab %>" data-toggle="tooltip">
+                                        <a href="/timer" class="btn " target="_blank"><i
+                                                class="bi bi-box-arrow-up-right"></i></a>
+                                    </span>
+                                </div>
+                            </h3>
+                            <iframe src="/timer?smaller=true" height="100%" width="100%" style="min-height: 400px;">
+                            </iframe>
+                        </div>
+                        <div class="col">
+                            <h3><%= it.lang.titles.mode %> <span class="helperTip" data-placement="right"
+                                    title="<%= it.lang.hints.selectMode %>" data-toggle="tooltip">
+                                    <i class="bi bi-question-circle-fill"></i>
+                                </span></h3>
+                            <div class="btn-group" role="group" aria-label="Basic radio toggle button group">
+                                <input type="radio" class="btn-check" name="btnradio" id="btnradio1" autocomplete="off"
+                                    checked>
+                                <label class="btn btn-outline-primary" for="btnradio1"><%= it.lang.others.timer %></label>
+
+                                <input type="radio" class="btn-check" name="btnradio" id="btnradio2" autocomplete="off">
+                                <label class="btn btn-outline-primary" for="btnradio2"><%= it.lang.others.clock %></label>
+
+                                <input type="radio" class="btn-check" name="btnradio" id="btnradio3" autocomplete="off">
+                                <label class="btn btn-outline-primary" for="btnradio3"><%= it.lang.others.black %></label>
+
+                                <input type="radio" class="btn-check" name="btnradio" id="btnradio4" autocomplete="off">
+                                <label class="btn btn-outline-primary" for="btnradio4"><%= it.lang.others.test %></label>
+
+				<input type="radio" class="btn-check" name="btnradio" id="btnradio5" autocomplete="off">
+                                <label class="btn btn-outline-primary" for="btnradio5"><%= it.lang.others.screensaver %></label>
+                            </div>
+                            <br>
+                            <br>
+                            <br>
+                            <controls>
+                                <button class="btn btn-outline-success p-4" id="funcPlay"><svg
+                                        xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
+                                        class="bi bi-play-fill" viewBox="0 0 16 16">
+                                        <path
+                                            d="m11.596 8.697-6.363 3.692c-.54.313-1.233-.066-1.233-.697V4.308c0-.63.692-1.01 1.233-.696l6.363 3.692a.802.802 0 0 1 0 1.393z" />
+                                    </svg></button>
+
+                                <button class="btn btn-outline-warning p-4" id="funcPause"><svg
+                                        xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
+                                        class="bi bi-pause" viewBox="0 0 16 16">
+                                        <path
+                                            d="M6 3.5a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-1 0V4a.5.5 0 0 1 .5-.5zm4 0a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-1 0V4a.5.5 0 0 1 .5-.5z" />
+                                    </svg></button>
+                                <button class="btn btn-outline-info p-4" id="funcRestart"><svg
+                                        xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
+                                        class="bi bi-arrow-clockwise" viewBox="0 0 16 16">
+                                        <path fill-rule="evenodd"
+                                            d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z" />
+                                        <path
+                                            d="M8 4.466V.534a.25.25 0 0 1 .41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 0 1 8 4.466z" />
+                                    </svg></button>
+                            </controls>
+                            <br>
+                            <br>
+                            <br>
+                            <h3><%= it.lang.titles.messaging %> <span class="helperTip" data-placement="right"
+                                    title="<%= it.lang.hints.messagingHint %>" data-toggle="tooltip">
+                                    <i class="bi bi-question-circle-fill"></i>
+                                </span></h3>
+
+                            <input type="text" id="messageContent" class="form-control" placeholder="<%= it.lang.placeholders.msgHere %>"
+                                style="width: 50%;">
+
+                            <br>
+                            <button class="btn btn-outline-primary m-1" id="sendMessage"><i
+                                    class="bi bi-send"></i></button>
+                            <button class="btn btn-outline-primary m-1" id="ctrlRemoveMessage">
+                                <i class="bi bi-eye-slash-fill"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+                <br><br><br>
+                <h3><%= it.lang.others.timer %></h3>
+                <div class="container">
+
+
+                    <div class="row">
+                        <presets class="d-inline-flex justify-content-center">
+                            <button class="btn btn-outline-secondary m-1 pres" value="300000">00:05:00</button>
+                            <button class="btn btn-outline-secondary m-1 pres" value="600000">00:10:00</button>
+                            <button class="btn btn-outline-secondary m-1 pres" value="900000">00:15:00</button>
+                            <button class="btn btn-outline-secondary m-1 pres" value="1200000">00:20:00</button>
+                            <button class="btn btn-outline-secondary m-1 pres" value="1500000">00:25:00</button>
+                            <button class="btn btn-outline-secondary m-1 pres" value="1800000">00:30:00</button>
+                            <button class="btn btn-outline-secondary m-1 pres" value="2100000">00:35:00</button>
+                            <button class="btn btn-outline-secondary m-1 pres" value="2400000">00:40:00</button>
+                            <button class="btn btn-outline-secondary m-1 pres" value="2700000">00:45:00</button>
+                        </presets>
+                        
+                        <div class="row" style="width: 100%;">
+                            
+                            
+                            <div class="d-inline-flex justify-content-center p-2 col">
+                                <input type="text" class="form-control m-1" id="customValue">
+                                
+                                <button class="btn btn-outline-primary m-1 mt-0 goTimer"><i
+                                        class="bi bi-check2-circle"></i></button>
+                            </div>
+                        </div>
+                        <h5>
+                            <%= it.lang.titles.countdownToTime %>
+                        </h5>
+                        <div class="row justify-content-center flex-nowrap d-flex" >
+                            <input id="datetimetester" class="form-control input-sm" style="width: 20%;">
+                            <button class="btn btn-outline-primary goTimeGoalCountdown ms-2" style="width: 5%;"><i
+                                class="bi bi-check2-circle"></i></button>
+                        </input>
+                        </div>
+                        
+                    </div>
+                </div>
+            </page>
+
+
+
+
+
+            <page id="settings" class="pageC hidden flex-fill overflow-auto">
+                <h1><%= it.lang.sidebar.settings %></h1>
+                <label for="showTime"><%= it.lang.labels.clockOnTimer %></label>
+                <input type="checkbox" name="showTime" id="showTime"><br>
+
+                <label for="showMillis"><%= it.lang.labels.showMillis %></label>
+                <input type="checkbox" name="showMillis" id="showMillis"><br>
+
+                <label for="progBarShow"><%= it.lang.labels.showProgress %></label>
+                <input type="checkbox" name="progBarShow" id="progBarShow"><br>
+
+		<label for="allowOverrun"><%= it.lang.labels.allowOverrun %></label>
+                <input type="checkbox" name="allowOverrun" id="allowOverrun"><br>
+                <details>
+                    <summary><%= it.lang.labels.progbarColors %></summary>
+                    <p>
+                    <div id="table" class="table-editable">
+                        <span class="table-add float-right mb-3 mr-2"><a href="#!" class="text-success"><i
+                                    class="fas fa-plus fa-2x" aria-hidden="true"></i></a></span>
+                        <table class="table table-bordered table-responsive-md table-striped text-center" id="colors1">
+                            <thead>
+                                <tr>
+                                    <th class="text-center"><%= it.lang.labels.time %></th>
+                                    <th class="text-center"><%= it.lang.labels.color %></th>
+                                    <th class="text-center"><%= it.lang.labels.remove %></th>
+                                </tr>
+                            </thead>
+                            </tbody>
+                        </table>
+                    </div>
+
+                    <button type="button" class="btn btn-outline-success" id="addRow">Add row</button>
+                    </p>
+                </details>
+                <hr>
+                <label for="textColors"><%= it.lang.labels.enableTextClrs %></label>
+                <input type="checkbox" name="textColors" id="textColors"><br>
+                <details>
+                    <summary><%= it.lang.labels.textClrs %></summary>
+                    <p>
+
+                    <div id="table2" class="table-editable">
+                        <table class="table table-bordered table-responsive-md table-striped text-center" id="colors2">
+                            <thead>
+                                <tr>
+                                    <th class="text-center"><%= it.lang.labels.time %></th>
+                                    <th class="text-center"><%= it.lang.labels.color %></th>
+                                    <th class="text-center"><%= it.lang.labels.remove %></th>
+                                </tr>
+                            </thead>
+                            </tbody>
+                        </table>
+                    </div>
+                    <button type="button" class="btn btn-outline-success" id="copyColors">Copy from progressbar
+                        colors</button>
+
+                    <button type="button" class="btn btn-outline-success" id="addRow2"><%= it.lang.labels.row %></button>
+                    </p>
+                </details>
+                <br>
+
+
+                <button type="button" class="btn btn-outline-success" id="applyLayout"><i class="bi bi-save"></i> Apply
+                    settings</button>
+
+                <button type="button" class="btn btn-outline-success" id="saveLayout"><i class="bi bi-save"></i> Save as
+                    startup settings (Layout
+                    only)</button>
+
+                <hr>
+                <h2><%= it.lang.titles.uiSettings %></h2>
+                <label for="lang"><%= it.lang.labels.language %>:</label>
+                <select name="lang" id="lang">-
+                  <% it.additional.languages.forEach(function(lang){ %>
+                    <option value="<%= lang %>"><%= lang %></option>
+                  <% }) %>
+                </select>
+                <button id="applyLang" class="btn btn-outline-success">
+                    <%= it.lang.labels.apply %>
+                </button>
+            </page>
+
+
+            <page id="debug" class="pageC hidden flex-fill overflow-auto">
+                <h1>Debug page</h1>
+                <div class="alert alert-danger" role="alert">
+                    <h4 class="alert-heading"><%= it.lang.titles.attention %></h4>
+                    <p><%= it.lang.informationTexts.debugInfo %></p>
+                    <hr>
+                    <p class="mb-0"><b><%= it.lang.informationTexts.proceedCaution %></b></p>
+                </div>
+                <label for="debugMode"><%= it.lang.labels.timeVar %></label>
+                <input type="checkbox" name="debugMode" id="debugModeEnable" value="true"><br><br>
+
+                <button type="button" class="btn btn-outline-success" id="applyDebug">Apply settings</button>
+                <br>
+                <hr>
+                <br>
+
+                <h3><%= it.lang.titles.hostinfo %></h3>
+                <code id="systemInfo" class="overflow-auto">
+
+                </code>
+                <h3>Raw server reponse</h3>
+                <code id="responeSnippet" style="width: 40%; display: inline-block;" class="overflow-auto">
+
+                </code>
+                <br>
+                <hr>
+                <br>
+                <templateObj>
+                    <table class="table table-bordered table-responsive-md table-striped text-center" id="colors1">
+                        <thead>
+                            <tr><%= it.lang.labels.time %>
+                                <th class="text-center"><%= it.lang.labels.time %></th>
+                                <th class="text-center"><%= it.lang.labels.color %></th>
+                                <th class="text-center"><%= it.lang.labels.remove %></th>
+                            </tr>
+                        </thead>
+                        <tr id="tableCopySource">
+                            <td contenteditable="false" class="time">
+                                <input type="text" class="form-control " id="timeValue-ID" value="#VALUE#">
+                                <value></value>
+                            </td>
+                            <td class="pt-3-half full" contenteditable="false">
+                                <div class="clr-field" style="color: #bg-COLOR#;">
+                                    <button aria-labelledby="clr-open-label"></button>
+                                    <input type="text" class="coloris" value="#COLOR#">
+                                </div>
+                                </div>
+                            </td>
+                            <td>
+                                <span class="table-remove"><button type="button"
+                                        class="btn btn-danger btn-rounded btn-sm my-0 deleteRow1">
+                                        Remove
+                                    </button></span>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                    <tr>
+                        <td class="pt-3-half numVal" contenteditable="true">#VALUE#</td>
+                        <td class="pt-3-half full" contenteditable="false">
+                            <div class="clr-field" style="color: #bg-COLOR#;">
+                                <button aria-labelledby="clr-open-label"></button>
+                                <input id="demo-input1" type="text" class="coloris" value="#COLOR#">
+                            </div>
+                            </div>
+                        </td>
+                        <td>
+                            <span class="table-remove"><button type="button"
+                                    class="btn btn-danger btn-rounded btn-sm my-0 deleteRow1">
+                                    Remove
+                                </button></span>
+                        </td>
+                    </tr>
+                </templateObj>
+                <script>
+                    $('#duration2').durationPicker({
+                        showSeconds: true,
+                        showDays: false,
+                        onChanged: function (newVal, test, val2) {
+                            $('#duration-label2').text(newVal);
+                            val2.days[0].parentElement.parentElement.parentElement.parentElement.children[1].value = newVal
+                            console.log(val2.days[0].parentElement.parentElement.parentElement.parentElement.children[1].value)
+                        }
+                    });
+                </script>
+
+                <br><br>
+            </page>
+            <page id="about" class="pageC hidden flex-fill overflow-auto">
+                <h1>About</h1>
+                Version: <b id="nodeSwVers"></b><br>
+                NodeJS Version: <b id="nodejsVers"></b><br>
+                <h2>About the translation</h2>
+                Author: <%= it.lang._metadata.authors %><br>
+                Language: <%= it.lang._metadata.lang %><br>
+                Version: <%= it.lang._metadata.version %><br>
+            </page>
+        </pages>
+    </main>
+    <script type="text/javascript" src="/js/jsonview.js"></script>
+    <script type="text/javascript" src="/js/interface.js"> </script>
+    <script type="text/javascript">
+
+        Coloris({
+            el: '.coloris',
+            alpha: false,
+        });
+        $(function () {
+            $('[data-toggle="tooltip"]').tooltip({ container: "body" })
+        })                        
+    </script>
+
+</body>
+
+</html>

templates/ng-timerview.html

@@ -0,0 +1,64 @@
+<!doctype html>
+
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <title>openCountdown - Timerpage</title>
+    <meta name="description" content="openCountdown">
+    <meta name="author" content="TheGreydiamond">
+
+    <link rel="stylesheet" href="css/styles.css?v=1.1">
+    
+    <link rel="icon" href="/logo/faviconLogo.svg" type="image/svg+xml">
+</head>
+
+<body onclick="updateFullscreen()" onresize="handleDVD()">
+    <div id="overlay">
+        <div id="text">Message here</div>
+    </div>
+
+    <!-- Collection of warning and errors  -->
+    <noscript>
+	<div class="connectionWarning">
+	    Javascript is disabled. Please enable it to use openCountdown.
+	</div>
+    </noscript>
+
+    <div class="connectionWarning" id="warningBanner" style="display: none;">
+        Connection lost. Trying to reconnect...
+    </div>
+
+    <!-- Color Bar Image -->
+    <img src='SMPTE_Color_Bars.svg' class='testImg' id="testImg" style="display: none;">
+    </img>
+
+    <div class="container">
+        <div class="progWrapper" id="wholeProgBar">
+            <div class="progBar" id="progBar"></div>
+        </div>
+        <div class="timer" id="timer">
+            00:00:00
+        </div>
+        <div class="clockSec" id="clockSec">
+        </div>
+        <div class="clockSec" id="timediff">
+            
+        </div>
+    </div>
+    <div id="moveClock" style="display: none;">
+	<img src="logo/logoProposal-invert.svg"  alt="openCountdown" height="180px" class="moverLogo" >
+	<center><div id="screensaverClock">
+		00:00:00
+	</div>
+</center>
+	
+    </div>
+    <!-- Load scripts -->
+    <script src="js/reconnecting-websocket.min.js"></script>
+    <script src="js/timer/timerview.js"></script>
+</body>
+
+</html>

templates/timerPage.html

@@ -6,19 +6,27 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <title>openCountdown</title>
+    <title>openCountdown - Timerpage</title>
     <meta name="description" content="openCountdown">
     <meta name="author" content="TheGreydiamond">
 
     <link rel="stylesheet" href="css/styles.css?v=1.1">
+    
+    <link rel="icon" href="/logo/faviconLogo.svg" type="image/svg+xml">
 </head>
 
 <body onclick="updateFullscreen()">
 
+
+
     <div id="overlay" onclick="off()">
         <div id="text">Message here</div>
     </div>
 
+    <div class="connectionWarning" id="warningBanner" style="display: none;">
+        Connection lost. Trying to reconnect...
+    </div>
+
     <img src='SMPTE_Color_Bars.svg' class='testImg' id="testImg" style="display: none;">
     </img>
     <valueStore style="display: none;">
@@ -39,7 +47,7 @@
             
         </div>
     </div>
-    <script src="js/countdown.js"></script>
+    <script src="js/reconnecting-websocket.min.js"></script>
     <script src="js/script.js"></script>
 </body>