From 50489b99c92157a36fce5f7afe3e48562df85f11 Mon Sep 17 00:00:00 2001 From: Ivan Date: Tue, 8 Aug 2023 20:46:12 +0300 Subject: [PATCH] live map update --- server.js | 20 +-- static/styles/main.css | 1 - static/templates/devices/index.html | 2 +- static/templates/devices/update.html | 2 +- static/templates/live.html | 259 ++++++++++++--------------- static/templates/reports/report.html | 67 ++++--- 6 files changed, 154 insertions(+), 197 deletions(-) diff --git a/server.js b/server.js index c4466ec..c75e0d2 100644 --- a/server.js +++ b/server.js @@ -33,17 +33,17 @@ app.get("/devices/drivers", drivers); app.get("/devices/update", update); -// const DB_User = process.env.DB_USER; -// const DB_Password = process.env.DB_PASSWORD; -// const DB_Host = process.env.DB_HOST; -// const DB_Port = process.env.DB_PORT; -// const DB_Name = process.env.DB_NAME; +const DB_User = process.env.DB_USER; +const DB_Password = process.env.DB_PASSWORD; +const DB_Host = process.env.DB_HOST; +const DB_Port = process.env.DB_PORT; +const DB_Name = process.env.DB_NAME; -const DB_User = "postgres"; -const DB_Password = process.env.POSTGRES_PASSWORD; -const DB_Host = "postgres"; -const DB_Port = "5432"; -const DB_Name = "postgres"; +// const DB_User = "postgres"; +// const DB_Password = process.env.POSTGRES_PASSWORD; +// const DB_Host = "postgres"; +// const DB_Port = "5432"; +// const DB_Name = "postgres"; async function index(req, res) { var templateData = { diff --git a/static/styles/main.css b/static/styles/main.css index af7609d..196ee83 100644 --- a/static/styles/main.css +++ b/static/styles/main.css @@ -18,7 +18,6 @@ body { margin: 0; width: 100%; min-height: 100%; - overflow-y: hidden; } header { diff --git a/static/templates/devices/index.html b/static/templates/devices/index.html index 0bf7bb3..dfdaee1 100644 --- a/static/templates/devices/index.html +++ b/static/templates/devices/index.html @@ -64,7 +64,7 @@