From 2ba725f2323cb5b7d3066555781cb5f4a2b87a0f Mon Sep 17 00:00:00 2001 From: leca Date: Sat, 6 Apr 2024 15:26:38 +0300 Subject: [PATCH] changed color picking, removed server pings --- docker-compose.yml | 2 +- html/logic.js | 5 +++++ src/index.js | 13 +++++++------ views/index.pug | 1 - 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 67567d3..b352dc0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: image: pixelbattle build: . ports: - - 8089:8089 + - 8080:8080 volumes: - ./pb-data:/usr/src/app/data # - ./settings.json:/usr/src/app/settings.json diff --git a/html/logic.js b/html/logic.js index 18c9830..e0d0465 100644 --- a/html/logic.js +++ b/html/logic.js @@ -128,6 +128,11 @@ function redraw() { // All the code that is making zooms and moving around cavnas is made with big help of http://phrogz.net/tmp/canvas_zoom_to_cursor.html. Thanks alot! window.onload = function() { + colorInput.addEventListener("change", (e) => { + console.log("changed") + currentColor = e.target.value; + }, false); + connect(); var ctx = canvas.getContext("2d"); trackTransforms(ctx); diff --git a/src/index.js b/src/index.js index 1d9fd72..ce76559 100644 --- a/src/index.js +++ b/src/index.js @@ -143,13 +143,14 @@ server.on('connection', (client) => { }); -const pingClient = () => { - clients.forEach(client => { - client.send(JSON.stringify({})); - }); -}; +// const pingClient = () => { +// clients.forEach(client => { +// client.send(JSON.stringify({})); +// }); +// }; + +// setInterval(pingClient, 15000) -setInterval(pingClient, 15000) app.get('/', (req, res) => { res.render('index.pug', { root: __dirname, server: serverAddress, port: httpPort }); }) diff --git a/views/index.pug b/views/index.pug index 5c8ad5f..1e6aae8 100644 --- a/views/index.pug +++ b/views/index.pug @@ -13,7 +13,6 @@ html(lang='en') input(type="button" id="server-button" value="connect" onclick="connect()") p input(type="color" id="color") - input(type="button" id="submicColor" value="change color" onclick="changeColor()") br | timer: b(id="timer")