4 Commits

Author SHA1 Message Date
3ba06013b0 - added new relativ add millis 2022-07-14 23:12:18 +02:00
a2106f01b1 Merge pull request 'Porintg more fixes' (#4) from language into master
Reviewed-on: #4
2022-07-13 18:27:54 +02:00
22de906767 - add a build command
- fix an error in swagger doc
2022-07-13 18:26:50 +02:00
fcc2172f1f fixing config.json not existing causing a crash 2022-07-13 18:24:17 +02:00
4 changed files with 16 additions and 4 deletions

1
build.ssh Normal file
View File

@@ -0,0 +1 @@
nexe index.js --build --python python3 --resource "./static/*" --resource "./templates/*"

View File

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

View File

@@ -58,7 +58,9 @@ currentState = {
let configObject = { let configObject = {
language: "en_uk" language: "en_uk"
} }
if(!fs.existsSync("config.json")) {
fs.writeFileSync("config.json", "{}");
}
const tempJsonText = JSON.parse(fs.readFileSync("config.json", "utf8")); const tempJsonText = JSON.parse(fs.readFileSync("config.json", "utf8"));
configObject = _.extend(configObject, tempJsonText); configObject = _.extend(configObject, tempJsonText);
fs.writeFileSync("config.json", JSON.stringify(configObject)); fs.writeFileSync("config.json", JSON.stringify(configObject));
@@ -197,6 +199,14 @@ app.get("/api/v1/set/addMillisToTimer", function (req, res) {
updatedData() 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) { app.get("/api/v1/ctrl/timer/pause", function (req, res) {
currentState.timerRunState = false; currentState.timerRunState = false;
currentState.pauseMoment = new Date().getTime(); currentState.pauseMoment = new Date().getTime();

View File

@@ -1,10 +1,11 @@
{ {
"name": "opencountdown", "name": "opencountdown",
"version": "1.0.1", "version": "1.0.2",
"description": "An opensource countdown", "description": "An opensource countdown",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1",
"build": "nexe index.js --build"
}, },
"author": "TheGreydiamond", "author": "TheGreydiamond",
"license": "LGPL-3.0", "license": "LGPL-3.0",