- fixed issue #8

„README.MD“ ändern
Merge pull request 'Rewrite of timerpage' (#7) from better-timer-page into master
2022-11-19 15:49:46 +01:00 · 2022-11-15 20:50:12 +01:00 · 2022-11-15 18:48:57 +01:00 · 2022-11-15 18:46:06 +01:00 · 2022-11-15 18:28:59 +01:00 · 2022-11-15 18:26:50 +01:00
46 changed files with 22328 additions and 1634 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,12 @@
 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
--- a/README.MD
+++ b/README.MD
@ -1,9 +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
- [P] Endpoint docs
- [ ] Better WS frames
- [X] Diffrent time picker for countdown selection
- [X] Deprecate old UI
- [X] Proper 404 page
- [ ] Countdown to time
+Endpoint documentation is currently pretty thin. This will be changed in the future.
+- [ ] Endpoint docs (in Progress)
+- [ ] Better WS frames
--- a/build.sh
+++ b/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
--- a/build_win.sh
+++ b/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
--- a/docs/swagger.yaml
+++ b/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."
--- a/electronAssets/background.svg
+++ b/electronAssets/background.svg
--- a/electronAssets/index.html
+++ b/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>
--- a/electronAssets/window.js
+++ b/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')
--- a/electronAssets/windowPreload.js
+++ b/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))
+	},
+})
--- a/helpers.js
+++ b/helpers.js
@ -29,4 +29,27 @@ function wrapBooleanConverter(stringBoolean, res) {
  }
 }

-module.exports = { convertStringBooleanToBoolean, wrapBooleanConverter };
+/**
+ * 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 };
--- a/index.js
+++ b/index.js
@ -3,13 +3,20 @@ 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")

-console.log("Preparing server...");
+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({
@ -18,8 +25,29 @@ 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 = {}

+loggy.log("Loading config", "info", "Config");
 if (fs.existsSync("data-persistence.json")) {
  const loadedDataRaw = fs.readFileSync("data-persistence.json", "utf8");
  loadedData = JSON.parse(loadedDataRaw);
@ -48,13 +76,36 @@ currentState = {
  sessionToken: Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15),
 };

-const dataToBeWritten = {};
+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) {
@ -81,17 +132,39 @@ function updatedData() {
  setTimeout(updatedData, 5000);
 }

-console.log("Preparing routes...");
+loggy.log("Preparing routes", "info", "Server");
 app.get("/", function (req, res) {
  const data = fs.readFileSync("templates/newAdminPanel.html", "utf8");
-  res.send(data);
+  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/timerPage.html", "utf8");
+  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()
  res.json(currentState);
@ -153,6 +226,14 @@ app.get("/api/v1/set/addMillisToTimer", function (req, res) {
  updatedData()
 });

+app.get("/api/v1/set/relativAddMillisToTimer", function (req, res) {
+  currentState.timeAmountInital = req.query.time;
+  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();
@ -295,8 +376,61 @@ app.get("/api/v1/storage/delete", function (req, res) {
  updatedData()
 });

-app.use(function(req, res, next) {
+// 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')) {
@ -318,8 +452,33 @@ app.use(function(req, res, next) {



-console.log("Starting server...");
-const port = 3006
+
+
+/*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 => {
@ -328,7 +487,8 @@ server.on('upgrade', (request, socket, head) => {
 });


-
-console.info("Server running on port " + port);
-console.info("Visit localhost:" + port + "/timer for the timer page");
-console.info("Visit localhost:" + port + " for the admin page");
+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);
--- a/lang/de_de.json
+++ b/lang/de_de.json
@ -0,0 +1,70 @@
+{
+    "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:"
+    },
+    "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"]
+    }
+}
--- a/lang/en_uk.json
+++ b/lang/en_uk.json
@ -0,0 +1,73 @@
+{
+    "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"
+    },
+    "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"]
+    }
+}
--- a/lang/proto_black.json
+++ b/lang/proto_black.json
@ -0,0 +1,71 @@
+{
+    "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": "██████ ████ ███████ ███████:"
+    },
+    "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. █"
+    }
+}
--- a/logging.js
+++ b/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 };
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,24 +1,39 @@
 {
-  "name": "opencountdown",
-  "version": "1.0.1",
-  "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",
-    "bootstrap": "^5.1.3",
-    "bootstrap-duration-picker": "^2.1.3",
-    "bootstrap-icons": "^1.8.1",
-    "darkreader": "^4.9.44",
-    "express": "^4.17.3",
-    "jquery": "^3.6.0",
-    "js-cookie": "^3.0.1",
-    "less": "^3.13",
-    "mdbootstrap": "^4.20.0",
-    "ws": "^8.5.0"
-  }
+	"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.1",
+		"bootstrap": "^5.2.2",
+		"bootstrap-duration-picker": "^2.1.3",
+		"bootstrap-icons": "^1.10.1",
+		"colors": "^1.4.0",
+		"darkreader": "^4.9.58",
+		"eta": "^1.12.3",
+		"express": "^4.18.2",
+		"flatpickr": "^4.6.13",
+		"jquery": "^3.6.1",
+		"js-cookie": "^3.0.1",
+		"less": "^4.1.3",
+		"mdbootstrap": "^4.20.0",
+		"open": "^8.4.0",
+		"underscore": "^1.13.6",
+		"ws": "^8.11.0"
+	},
+	"devDependencies": {
+		"electron": "^21.2.3",
+		"electron-builder": "^23.6.0"
+	},
+	"build": {
+		"extraMetadata": {
+			"main": "startHandler.js"
+		}
+	}
 }
--- a/startHandler.js
+++ b/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)
+}
--- a/static/bootstrap-duration-picker
+++ b/static/bootstrap-duration-picker
@ -1 +0,0 @@
-../node_modules/bootstrap-duration-picker/dist/
--- a/static/bootstrap/dist
+++ b/static/bootstrap/dist
@ -1 +0,0 @@
-../../node_modules/bootstrap/dist
--- a/static/colorpicker/css
+++ b/static/colorpicker/css
@ -1 +0,0 @@
-../../node_modules/bootstrap-colorpicker/dist/css
--- a/static/colorpicker/js
+++ b/static/colorpicker/js
@ -1 +0,0 @@
-../../node_modules/bootstrap-colorpicker/dist/js
--- a/static/css/bootstrap-icons.css
+++ b/static/css/bootstrap-icons.css
@ -1 +0,0 @@
-../../node_modules/bootstrap-icons/font/bootstrap-icons.css
--- a/static/css/fonts/bootstrap-icons.woff
+++ b/static/css/fonts/bootstrap-icons.woff
@ -1 +0,0 @@
-../../../node_modules/bootstrap-icons/font/fonts/bootstrap-icons.woff
--- a/static/css/fonts/bootstrap-icons.woff2
+++ b/static/css/fonts/bootstrap-icons.woff2
@ -1 +0,0 @@
-../../../node_modules/bootstrap-icons/font/fonts/bootstrap-icons.woff2
--- a/static/css/smallerTextMod.css
+++ b/static/css/smallerTextMod.css
@ -1,3 +1,7 @@
 body {
    font-size:0.3em;
+}
+
+.moverLogo {
+    height: 80px !important;
 }
--- a/static/css/styles.css
+++ b/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;
 }
@ -110,4 +110,48 @@ animation:fade 1000ms infinite;
  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); }
+      }
--- a/static/favicon.svg
+++ b/static/favicon.svg
@ -0,0 +1 @@
+logo/faviconLogo.svg
--- a/static/js/cookie.js
+++ b/static/js/cookie.js
@ -1 +0,0 @@
-../../node_modules/js-cookie/dist/js.cookie.min.js
--- a/static/js/darkreader.js
+++ b/static/js/darkreader.js
@ -1 +0,0 @@
-../../node_modules/darkreader/darkreader.js
--- a/static/js/interface.js
+++ b/static/js/interface.js
@ -11,7 +11,7 @@ function convertColorSegments(elementId) {
        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)){
+            if (Number.isInteger(timeVal)) {
                segmentData[timeVal] = child.style.color
            } else {
                segmentData["START"] = child.style.color
@ -25,7 +25,7 @@ function convertColorSegments(elementId) {
 $(function () {
    // $(".numVal").bind("DOMSubtreeModified", alert);

-    const modes = ["timer", "clock", "black", "test"]
+    const modes = ["timer", "clock", "black", "test", "screensaver"]
    let selectPresetTime = 0;

    if (Cookies.get("interfaceColor") != undefined) {
@ -50,6 +50,19 @@ $(function () {
        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
@ -100,7 +113,7 @@ $(function () {
        });
    });

-    
+

    // Restore settings
    saveOption("/api/v1/data", function (event, xmlHttp) {
@ -129,8 +142,8 @@ $(function () {
            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);
+            if (item != "START") {
+                temp = temp.replace("#VALUE#", item / 1000);
                tableEntryDom.innerHTML = temp;
                tableEntryDom.firstChild.nextSibling.children[0].classList.add("timeDurPicker")
            } else {
@ -139,7 +152,7 @@ $(function () {
                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
@ -158,8 +171,8 @@ $(function () {
            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);
+            if (item != "START") {
+                temp = temp.replace("#VALUE#", item / 1000);
                tableEntryDom.innerHTML = temp;
                tableEntryDom.firstChild.nextSibling.children[0].classList.add("timeDurPicker")
            } else {
@ -168,11 +181,11 @@ $(function () {
                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"
@ -199,7 +212,7 @@ $(function () {
        $(".deleteRow1").on("click", function removeRowEntry(event) {
            $(event.target).closest("tr").remove();
        });
-        $('[data-toggle="tooltip"]').tooltip({container: "body"})
+        $('[data-toggle="tooltip"]').tooltip({ container: "body" })
    })

    $("#copyColors").click(function CopyTextColors(event) {
@ -224,11 +237,11 @@ $(function () {
        }
        Cookies.set("interfaceColor", darkid)
    });
-    
+
    // Presets
    $(".pres").click(function (event) {
        currentTime = parseInt(event.currentTarget.value)
-        $("#customValue").data("durationPicker").setValue(currentTime/1000)
+        $("#customValue").data("durationPicker").setValue(currentTime / 1000)
    })


@ -462,6 +475,30 @@ $(function () {
        $("#" + 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) {
@ -484,22 +521,22 @@ function openNav() {
    document.getElementById("navbarToggleExternalContent").style.zIndex = 999999;
    document.getElementById("pageCont").style.marginLeft = "0px";
    navStatus = true
-  }
-  
-  function closeNav() {
+}
+
+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()
-      }
+function toogleNav() {
+    if (navStatus) {
+        closeNav()
+    } else {
+        openNav()
+    }

-  }
+}
--- a/static/js/jquery.min.js
+++ b/static/js/jquery.min.js
@ -1 +0,0 @@
-../../node_modules/jquery/dist/jquery.min.js
--- a/static/js/less.min.js
+++ b/static/js/less.min.js
@ -1 +0,0 @@
-../../node_modules/less/dist/less.min.js
--- a/static/js/script.js
+++ b/static/js/script.js
@ -13,44 +13,44 @@ let lastTime = "00:00:00";
 let timerCountdownFirst = true;

 socket.onopen = function (e) {
-  // alert("[open] Connection established");
-  //alert("Sending to server");
-  socket.send("new client");
+	// 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) {
+	// 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
+				ackdSessionToken = true

-        if (confirm("Session token mismatch, reload the page?")) {
-          location.reload();
-        }
-      }
-    }
-  }
+				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');
-  }
+	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
@ -58,224 +58,229 @@ let dataFame = {}
 let timeDiff = 0

 function enterFullscreen(element) {
-  if (element.requestFullscreen) {
-    element.requestFullscreen();
-  } else if (element.msRequestFullscreen) {
-    element.msRequestFullscreen();
-  } else if (element.webkitRequestFullscreen) {
-    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;
-    }
-  }
+	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";
+	var img = document.body.appendChild(document.createElement("img"));
+	img.onload = function () {
+		location.reload();
+	};
+	img.src = "SMPTE_Color_Bars.svg";
 }

 let recoInter = -1

 function handleUpdate() {
-  var data = dataFame;
-  document.getElementById("incomeData").innerHTML = JSON.stringify(data)
-  document.getElementById("timediff").innerHTML = timeDiff + "<br>" + String(new Date().getTime() - data.srvTime);
- 
-  if (data.debug) {
-    document.getElementById("timediff").style.display = "block";
-  } else {
-    document.getElementById("timediff").style.display = "none";
-  }
+	var data = dataFame;
+	document.getElementById("incomeData").innerHTML = JSON.stringify(data)
+	document.getElementById("timediff").innerHTML = timeDiff + "<br>" + String(new Date().getTime() - data.srvTime);

-  if (data.defaultFullScreen && document.getElementById("initalDate").innerHTML.includes("true") && allowFullscreen) {
-    enterFullscreen(document.documentElement);
-    document.getElementById("initalDate").innerHTML = "false"
-  }
+	if (data.debug) {
+		document.getElementById("timediff").style.display = "block";
+	} else {
+		document.getElementById("timediff").style.display = "none";
+	}

-  if (data.showMessage) {
-    document.getElementById("overlay").style.display = "block";
-    document.getElementById("text").innerHTML = data.message
-  } else {
-    document.getElementById("overlay").style.display = "none";
-  }
+	if (data.defaultFullScreen && document.getElementById("initalDate").innerHTML.includes("true") && allowFullscreen) {
+		enterFullscreen(document.documentElement);
+		document.getElementById("initalDate").innerHTML = "false"
+	}

-  if (data.showTimeOnCountdown && data.mode == "timer") {
-    document.getElementById("clockSec").innerHTML = getTime();
-  } else {
-    document.getElementById("clockSec").innerHTML = "";
-  }
+	if (data.showMessage) {
+		document.getElementById("overlay").style.display = "block";
+		document.getElementById("text").innerHTML = data.message
+	} else {
+		document.getElementById("overlay").style.display = "none";
+	}

-  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.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;
+	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") {
-    document.getElementById("wholeProgBar").style.display = "block";
-    const now = new Date()
+	} else if (data.mode == "timer") {
+		if (data.showProgressbar) {
+			document.getElementById("wholeProgBar").style.display = "block";
+		} else {
+			document.getElementById("wholeProgBar").style.display = "none";
+		}

-    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%";
-      }
+		const now = new Date()

-      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 (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%";
+			}

-    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"
+			}
+		}

-      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%";
+			}

-    } 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 = "";
+			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 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 = "";
-  }
+		} 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;
 }


@ -286,7 +291,7 @@ 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
 }
--- a/static/js/timer/timerview.js
+++ b/static/js/timer/timerview.js
@ -0,0 +1,281 @@
+
+
+// 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%";
+			}
+			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)
+	}
+}
--- a/static/logo/faviconLogo.png
+++ b/static/logo/faviconLogo.png
--- a/static/logo/faviconLogo.svg
+++ b/static/logo/faviconLogo.svg
--- a/static/logo/logoProposal-invert.svg
+++ b/static/logo/logoProposal-invert.svg
--- a/static/logo/logoProposal.svg
+++ b/static/logo/logoProposal.svg
--- a/static/mdbootstrap/css
+++ b/static/mdbootstrap/css
@ -1 +0,0 @@
-../../node_modules/mdbootstrap/css/
--- a/static/mdbootstrap/js
+++ b/static/mdbootstrap/js
@ -1 +0,0 @@
-../../node_modules/mdbootstrap/js
--- a/templates/brokenTranslation.html
+++ b/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>
--- a/templates/errorPages/404.html
+++ b/templates/errorPages/404.html
@ -9,8 +9,8 @@
    <meta name="description" content="openCountdown">
    <meta name="author" content="TheGreydiamond">

-    <script type="text/javascript" src="/js/cookie.js"></script>
-
+    <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" />


@ -19,11 +19,9 @@
            javascriptEnabled: true
        };
    </script>
-    <script src="/js/less.min.js"></script>
+    <script src="/assets/less/dist/less.min.js"></script>

    <link rel="stylesheet" href="/css/errorPage/style.css">
-
-    <link rel="stylesheet" href="/css/bootstrap-icons.css">
 </head>

 <body>
--- a/templates/newAdminPanel.html
+++ b/templates/newAdminPanel.html
@ -10,23 +10,27 @@
    <meta name="author" content="TheGreydiamond">


-    <link rel="stylesheet" href="/css/bootstrap-icons.css">
-    <link rel="stylesheet" href="/mdbootstrap/css/style.css">
+    <link rel="stylesheet" href="/assets/bootstrap-icons/font/bootstrap-icons.css">
+    <link rel="stylesheet" href="/assets/mdbootstrap/css/style.css">

-    <script src="/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
-    <script src="/js/jquery.min.js"></script>
-    <script type="text/javascript" src="/mdbootstrap/js/mdb.min.js"></script>
+    <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="/js/darkreader.js"></script>
-    <script type="text/javascript" src="/js/cookie.js"></script>
-    <link href="/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+    <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="/bootstrap-duration-picker/bootstrap-duration-picker.css" />
-    <script src="/bootstrap-duration-picker/bootstrap-duration-picker-debug.js"></script>
+    <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>

-    <link rel="stylesheet" href="/css/bootstrap-icons.css">
+    <script type="text/javascript" src="/assets/flatpickr/dist/flatpickr.js"> </script>
+
+
+    <link rel="icon" href="/logo/faviconLogo.svg" type="image/svg+xml">
 </head>

 <body>
@ -35,35 +39,37 @@
        <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>
+                <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>
-                        Home
+                        <%= it.lang.sidebar.home %>
                    </a>
                </li>
                <li>
                    <a href="#settings" class="nav-link text-white" id="PageSettings">
                        <i class="bi bi-gear"></i>
-                        Settings
+                        <%= it.lang.sidebar.settings %>
                    </a>
                </li>
                <li>
                    <a href="#debug" class="nav-link text-white" id="PageDebug">
                        <i class="bi bi-bug"></i>
-                        Debug
+                        <%= it.lang.sidebar.debug %>
                    </a>
                </li>
                <li>
                    <a href="#about" class="nav-link text-white" id="PageAbout">
                        <i class="bi bi-info-circle"></i>
-                        About
+                        <%= it.lang.sidebar.about %>
                    </a>
                </li>
            </ul>
@ -106,44 +112,53 @@


            <page id="homeP" class="pageC flex-fill overflow-auto">
-                <h1>Home page</h1>
+                <h1><%= it.lang.titles.home %></h1>

                <div class="container">
                    <div class="row">
                        <div class="col">
-                            <h3>Preview <span class="helperTip" data-placement="right" title="A preview of what is currently visible on the countdown view" data-toggle="tooltip">
-                                <i class="bi bi-question-circle-fill" ></i>
-                                
-                            </span>
-                            <span class="helperTip" data-placement="right" title="Copies the link to the timer view" 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="Open the countdown view in a new tab" data-toggle="tooltip">
-                                <a href="/timer" class="btn " target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>
-                                
-                            </span>
-                            
-                        </h3>
+                            <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>Mode <span class="helperTip" data-placement="right" title="Select what to show on the countdown view" data-toggle="tooltip">
-                                <i class="bi bi-question-circle-fill" ></i>
-                            </span></h3>
+                            <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">Timer</label>
+                                <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">Clock</label>
+                                <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">Black</label>
+                                <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">Testimage</label>
+                                <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>
@ -174,12 +189,14 @@
                            <br>
                            <br>
                            <br>
-                            <h3>Messaging <span class="helperTip" data-placement="right" title="Shows a given message on the timer view" data-toggle="tooltip">
-                                <i class="bi bi-question-circle-fill" ></i>
-                            </span></h3>
-                            
-                            <input type="text" id="messageContent" class="form-control" placeholder="Message here" style="width: 50%;">
-                            
+                            <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>
@ -190,41 +207,43 @@
                    </div>
                </div>
                <br><br><br>
-                <h3>Timer</h3>
+                <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>
-                                    <script>
-                                        $("#customValue").durationPicker({
-                                            showSeconds: true,
-                                            showDays: false,
-                                            onChanged: function(val, t1, t2) {
-                                                currentTime = val * 1000
-                                            }
-                                        })
-                                    </script>
-                                </div>
-
-        
+                    <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>
@ -234,17 +253,17 @@


            <page id="settings" class="pageC hidden flex-fill overflow-auto">
-                <h1>Settings</h1>
-                <label for="showTime">Show clock on Timer:</label>
+                <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">Show Milliseconds on Timer:</label>
+                <label for="showMillis"><%= it.lang.labels.showMillis %></label>
                <input type="checkbox" name="showMillis" id="showMillis"><br>

-                <label for="progBarShow">Show progressbar:</label>
+                <label for="progBarShow"><%= it.lang.labels.showProgress %></label>
                <input type="checkbox" name="progBarShow" id="progBarShow"><br>
                <details>
-                    <summary>Progressbar Colors</summary>
+                    <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
@ -252,9 +271,9 @@
                        <table class="table table-bordered table-responsive-md table-striped text-center" id="colors1">
                            <thead>
                                <tr>
-                                    <th class="text-center">Time</th>
-                                    <th class="text-center">Color</th>
-                                    <th class="text-center">Remove</th>
+                                    <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>
@ -265,19 +284,19 @@
                    </p>
                </details>
                <hr>
-                <label for="textColors">Enable Text Colors:</label>
+                <label for="textColors"><%= it.lang.labels.enableTextClrs %></label>
                <input type="checkbox" name="textColors" id="textColors"><br>
                <details>
-                    <summary>Text Colors</summary>
+                    <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">Time</th>
-                                    <th class="text-center">Color</th>
-                                    <th class="text-center">Remove</th>
+                                    <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>
@ -286,7 +305,7 @@
                    <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">Add row</button>
+                    <button type="button" class="btn btn-outline-success" id="addRow2"><%= it.lang.labels.row %></button>
                    </p>
                </details>
                <br>
@ -298,18 +317,30 @@
                <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">Attention</h4>
-                    <p>This is a debug page which should only be used by professionals. Changing any options below might
-                        impact operation.</p>
+                    <h4 class="alert-heading"><%= it.lang.titles.attention %></h4>
+                    <p><%= it.lang.informationTexts.debugInfo %></p>
                    <hr>
-                    <p class="mb-0"><b>Proceed with caution.</b></p>
+                    <p class="mb-0"><b><%= it.lang.informationTexts.proceedCaution %></b></p>
                </div>
-                <label for="debugMode">Enable time variance display:</label>
+                <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>
@ -317,13 +348,7 @@
                <hr>
                <br>

-                <button class="navbar-toggler" type="button" data-toggle="collapse"
-                    data-target="#navbarToggleExternalContent" aria-controls="navbarToggleExternalContent"
-                    aria-expanded="false" aria-label="Toggle navigation">
-                    <i class="bi bi-list"></i>
-                </button>
-
-                <h3>Host information</h3>
+                <h3><%= it.lang.titles.hostinfo %></h3>
                <code id="systemInfo" class="overflow-auto">

                </code>
@ -337,10 +362,10 @@
                <templateObj>
                    <table class="table table-bordered table-responsive-md table-striped text-center" id="colors1">
                        <thead>
-                            <tr>
-                                <th class="text-center">Time</th>
-                                <th class="text-center">Color</th>
-                                <th class="text-center">Remove</th>
+                            <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">
@ -364,9 +389,6 @@
                        </tr>
                        </tbody>
                    </table>
-
-
-
                    <tr>
                        <td class="pt-3-half numVal" contenteditable="true">#VALUE#</td>
                        <td class="pt-3-half full" contenteditable="false">
@ -402,11 +424,14 @@
                <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/jsonview.js"></script>
    <script type="text/javascript" src="/js/interface.js"> </script>
    <script type="text/javascript">

--- a/templates/ng-timerview.html
+++ b/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>
--- a/templates/timerPage.html
+++ b/templates/timerPage.html
@ -6,12 +6,13 @@
    <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()">
Author	SHA1	Message	Date
grey	5398817a1e	- fixed issue #8	2022-11-19 15:49:46 +01:00
Sören Oesterwind	1fc16fdc14	„README.MD“ ändern	2022-11-15 20:50:12 +01:00
Sören Oesterwind	b04a376b1d	Merge pull request 'Rewrite of timerpage' (#7) from better-timer-page into master Reviewed-on: #7	2022-11-15 18:48:57 +01:00
grey	0bf867daf6	fix onresize issue	2022-11-15 18:46:06 +01:00
Sören Oesterwind	2e1fc97f6f	Merge pull request 'Add proper Electron launcher and building process' (#6) from electron into master Reviewed-on: #6	2022-11-15 18:28:59 +01:00
grey	cee06bbe11	add windows build script	2022-11-15 18:26:50 +01:00
grey	1423f51104	improved screen saver	2022-11-14 19:37:20 +01:00
grey	389d9a9b13	bump version in package.json	2022-11-13 21:58:25 +01:00
grey	7dd2438881	- rewrote timerview - added new timerview mode	2022-11-13 21:57:01 +01:00
grey	94c81ee76d	some cleanup and fixes	2022-11-13 20:01:41 +01:00
grey	59aa625a6d	version increment	2022-11-13 19:15:19 +01:00
grey	de22ec5c3a	added proper status message	2022-11-13 19:12:33 +01:00
grey	811d96f5fa	small cleanup	2022-11-13 00:46:18 +01:00
grey	3eab7cc6eb	add electron packaging	2022-11-13 00:30:42 +01:00
Sören Oesterwind	4e28df6eea	„README.MD“ ändern	2022-10-28 18:43:08 +02:00
grey	013ad881d3	- add gui electron application ! sometimes the tray icon does not open it's context menu	2022-08-18 22:00:24 +02:00
grey	16a2549942	Merge branch 'master' of https://git.project-name-here.de/Project-Name-Here/openCountdown	2022-08-18 18:16:58 +02:00
grey	92a3d94429	- removed symblic links	2022-08-18 18:15:36 +02:00
grey	f3114e7cd6	- removal of most symblic links (works better on windows)	2022-08-18 18:15:24 +02:00
Sören Oesterwind	6479979293	„README.MD“ ändern	2022-07-23 18:15:14 +02:00
Sören Oesterwind	4ed8ad2dd3	„README.MD“ ändern	2022-07-23 18:15:01 +02:00
grey	f65bf30809	- introduction of logo	2022-07-23 18:12:32 +02:00
Sören Oesterwind	91d8e0135d	„README.MD“ ändern	2022-07-15 23:59:48 +02:00
Sören Oesterwind	20bf5b133b	„README.MD“ ändern	2022-07-15 18:40:30 +02:00
Sören Oesterwind	32e0c707be	„README.MD“ ändern	2022-07-15 17:32:12 +02:00
Sören Oesterwind	f73155ab01	„README.MD“ ändern	2022-07-15 17:30:03 +02:00
Sören Oesterwind	a0602a3b9b	„README.MD“ ändern	2022-07-15 17:29:43 +02:00
grey	3ba06013b0	- added new relativ add millis	2022-07-14 23:12:18 +02:00
Sören Oesterwind	a2106f01b1	Merge pull request 'Porintg more fixes' (#4) from language into master Reviewed-on: #4	2022-07-13 18:27:54 +02:00
grey	22de906767	- add a build command - fix an error in swagger doc	2022-07-13 18:26:50 +02:00
grey	fcc2172f1f	fixing config.json not existing causing a crash	2022-07-13 18:24:17 +02:00
Sören Oesterwind	ffcd716038	Merge pull request 'Porting a fix from a wrong branch to main' (#3) from language into master	2022-07-13 18:19:52 +02:00
grey	0ae35590f4	fix progressbar not disappearing	2022-07-12 22:15:27 +02:00
Sören Oesterwind	7106bef0bf	Add multilanguage support Reviewed-on: #2	2022-05-12 21:03:13 +02:00
grey	f3bcf63860	Add language settings in UI	2022-05-12 21:01:49 +02:00
grey	c201d6b2e1	fixed german	2022-05-12 17:40:44 +02:00
grey	b790c6ff80	More language support	2022-05-10 21:49:08 +02:00
grey	0b3df97975	work on translation system	2022-04-06 22:17:55 +02:00
grey	3b99939ef3	add logging system	2022-03-30 16:16:59 +02:00
grey	d04998d613	Merge branch 'ui-rework'	2022-03-28 22:15:40 +02:00
grey	292cdebecb	clean readme	2022-03-28 22:14:33 +02:00
grey	7e8f3f902a	remove unused debug output	2022-03-28 22:12:04 +02:00
grey	104c52b575	- add countdown to function - small cleanup	2022-03-28 22:11:12 +02:00
grey	7dbe7ed6b1	- make the open buttons float right	2022-03-27 16:41:40 +02:00
Sören Oesterwind	ee52bc0482	License in package.json	2022-03-11 08:09:53 +01:00
				`@ -1 +0,0 @@`
				`../node_modules/bootstrap-duration-picker/dist/`
				`@ -1 +0,0 @@`
				`../../node_modules/bootstrap-colorpicker/dist/css`
				`@ -1 +0,0 @@`
				`../../node_modules/bootstrap-icons/font/bootstrap-icons.css`
				`@ -1 +0,0 @@`
				`../../../node_modules/bootstrap-icons/font/fonts/bootstrap-icons.woff`
				`@ -1 +0,0 @@`
				`../../node_modules/js-cookie/dist/js.cookie.min.js`
				`@ -1 +0,0 @@`
				`../../node_modules/jquery/dist/jquery.min.js`