From 160ef0dcda2c0b72b85e46cf98cac296c88258e4 Mon Sep 17 00:00:00 2001 From: grey Date: Wed, 2 Mar 2022 22:09:27 +0100 Subject: [PATCH] Added better color picker --- README.MD | 1 - index.js | 9 +++---- package-lock.json | 36 ++++++++++++++++++++++++++++ package.json | 1 + static/colorpicker/css | 1 + static/colorpicker/js | 1 + templates/newAdminPanel.html | 46 +++++++++++++++++++++++------------- 7 files changed, 74 insertions(+), 21 deletions(-) create mode 120000 static/colorpicker/css create mode 120000 static/colorpicker/js diff --git a/README.MD b/README.MD index 806fe89..06ad406 100644 --- a/README.MD +++ b/README.MD @@ -6,7 +6,6 @@ - [X] time on countdown page - [X] one-way messaging - [P] Better UI - - [ ] Wait for all resources to load - [ ] Error popups - [X] Progress bar - [P] Endpoint docs diff --git a/index.js b/index.js index d8def66..6f34552 100644 --- a/index.js +++ b/index.js @@ -155,8 +155,9 @@ app.get("/api/v1/ctrl/message/hide", function (req, res) { res.json({ status: "ok" }); }); console.log("Starting server..."); -app.listen(3005); +const port = 8005 +app.listen(port); -console.info("Server running on port 3005"); -console.info("Visit localhost:3005/timer for the timer page"); -console.info("Visit localhost:3005 for the admin page"); +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"); diff --git a/package-lock.json b/package-lock.json index 590f14d..32978f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "body-parser": "^1.19.2", "bootstrap": "^5.1.3", + "bootstrap-colorpicker": "^3.4.0", "bootstrap-icons": "^1.8.1", "countdown": "^2.6.0", "darkreader": "^4.9.44", @@ -80,6 +81,16 @@ "@popperjs/core": "^2.10.2" } }, + "node_modules/bootstrap-colorpicker": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/bootstrap-colorpicker/-/bootstrap-colorpicker-3.4.0.tgz", + "integrity": "sha512-7vA0hvLrat3ptobEKlT9+6amzBUJcDAoh6hJRQY/AD+5dVZYXXf1ivRfrTwmuwiVLJo9rZwM8YB4lYzp6agzqg==", + "dependencies": { + "bootstrap": ">=4.0", + "jquery": ">=2.2", + "popper.js": ">=1.10" + } + }, "node_modules/bootstrap-icons": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.8.1.tgz", @@ -415,6 +426,16 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, + "node_modules/popper.js": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", + "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -628,6 +649,16 @@ "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", "requires": {} }, + "bootstrap-colorpicker": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/bootstrap-colorpicker/-/bootstrap-colorpicker-3.4.0.tgz", + "integrity": "sha512-7vA0hvLrat3ptobEKlT9+6amzBUJcDAoh6hJRQY/AD+5dVZYXXf1ivRfrTwmuwiVLJo9rZwM8YB4lYzp6agzqg==", + "requires": { + "bootstrap": ">=4.0", + "jquery": ">=2.2", + "popper.js": ">=1.10" + } + }, "bootstrap-icons": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.8.1.tgz", @@ -881,6 +912,11 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, + "popper.js": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" + }, "proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", diff --git a/package.json b/package.json index a5e0fa7..1690043 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "dependencies": { "body-parser": "^1.19.2", "bootstrap": "^5.1.3", + "bootstrap-colorpicker": "^3.4.0", "bootstrap-icons": "^1.8.1", "countdown": "^2.6.0", "darkreader": "^4.9.44", diff --git a/static/colorpicker/css b/static/colorpicker/css new file mode 120000 index 0000000..3cf966e --- /dev/null +++ b/static/colorpicker/css @@ -0,0 +1 @@ +../../node_modules/bootstrap-colorpicker/dist/css \ No newline at end of file diff --git a/static/colorpicker/js b/static/colorpicker/js new file mode 120000 index 0000000..cc23749 --- /dev/null +++ b/static/colorpicker/js @@ -0,0 +1 @@ +../../node_modules/bootstrap-colorpicker/dist/js \ No newline at end of file diff --git a/templates/newAdminPanel.html b/templates/newAdminPanel.html index f0ad15e..417ac57 100644 --- a/templates/newAdminPanel.html +++ b/templates/newAdminPanel.html @@ -21,6 +21,8 @@ + + @@ -230,7 +232,8 @@
+ value="1800000">00:30:00
@@ -372,7 +375,10 @@ - +
+ test + +
@@ -389,8 +395,8 @@ - Aurelia Vega - + 2000 +