From ee602ee891eb8a4d4a6dc980f2e482e6548722cc Mon Sep 17 00:00:00 2001 From: Selcuk Sari Date: Fri, 15 Jul 2022 18:48:31 +0300 Subject: [PATCH] backup --- Rev1/node/index.js | 8 ++++++++ Rev1/node/public/js/flasher.js | 31 +++++++++++++++++-------------- Rev1/node/routes/flasher.js | 6 +++++- Rev1/node/views/p_generator.pug | 2 +- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/Rev1/node/index.js b/Rev1/node/index.js index 2eecdf4..90927e4 100644 --- a/Rev1/node/index.js +++ b/Rev1/node/index.js @@ -40,3 +40,11 @@ app.use("/pcb_panel_bom", pcbPanelRoute); server.listen(PORT, function () { console.log(`Server started on port ${PORT}...`); }); + +var i = 0; +function myFunc(arg) { + // io.emit("test", arg); + io.emit("test", i); + i++; +} +// setInterval(myFunc, 1500, i); diff --git a/Rev1/node/public/js/flasher.js b/Rev1/node/public/js/flasher.js index 380a172..89e8ead 100644 --- a/Rev1/node/public/js/flasher.js +++ b/Rev1/node/public/js/flasher.js @@ -1,21 +1,24 @@ -console.log("starting"); -fetch("http://localhost:3000/flasher/getProjects", { - method: "POST", - body: "body", - headers: { - // "Content-Type": "multipart/form-data", - // "content-type": "text/html; charset=utf-8", - }, -}) - .then(function (res) { - console.log("hello world"); - console.log(res); - location.reload(); +window.addEventListener("load", function () { + fetch("http://localhost:3000/flasher/getProjects", { + method: "POST", + body: "body", + headers: { + // "Content-Type": "multipart/form-data", + // "content-type": "text/html; charset=utf-8", + }, }) - .catch((err) => ("Error occured", err)); + .then(function (res) { + console.log(res); + }) + .catch((err) => ("Error occured", err)); +}); var socket = io(); +socket.on("test", (s) => { + console.log(s); +}); + form.addEventListener("submit", function (e) { e.preventDefault(); if (input.value) { diff --git a/Rev1/node/routes/flasher.js b/Rev1/node/routes/flasher.js index f7ea06a..7f93bee 100644 --- a/Rev1/node/routes/flasher.js +++ b/Rev1/node/routes/flasher.js @@ -23,12 +23,16 @@ const router = express.Router(); router.post("/getProjects", function (req, res, next) { console.log("yes there is a request"); var io = req.app.get("io"); - io.emit("world", "This will emit projects"); + io.emit("test", "This will emit projects"); + io.emit("test", "Hello from socket"); // io.to(//socket.id//).emit("message", data); // db.rides.find(function(err, docs) { // res.json(docs); // }); + res.setHeader("content-type", "text/html; charset=utf-8"); + res.setHeader("Access-Control-Allow-Origin", "*"); + res.send("ok you got it back"); }); router.get("/", function (req, res) { diff --git a/Rev1/node/views/p_generator.pug b/Rev1/node/views/p_generator.pug index ad58924..7a80cf2 100644 --- a/Rev1/node/views/p_generator.pug +++ b/Rev1/node/views/p_generator.pug @@ -9,7 +9,7 @@ block content .input-group .input-group-prepend span.input-group-text(id='') Device Id - input.form-control(type='text',id="in-id") + input.form-control(type='text',id="in-id",placeholder="Please input your device id") .input-group-append button#getkeybtn.btn.btn-outline-secondary.disabled(type="button", onclick="clickme()") Get Keys