diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..b2bdd7b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "docker.defaultRegistryPath": "karl0ss" +} \ No newline at end of file diff --git a/index.js b/index.js index eecb84e..75e6931 100644 --- a/index.js +++ b/index.js @@ -44,14 +44,14 @@ orvibo.on('plugDisconnectedWithError', ({uid, name }) => { orvibo.startServer(); app.get('/', (req, res) => { - let sockets = orvibo.getConnectedSocket(); - // let sockets = [{name: "Plug1", state: 1, uid: "222222"},{name: "Plug2", state: 0, uid: "111111"}] + // let sockets = orvibo.getConnectedSocket(); + let sockets = [{name: "Plug1", state: 1, uid: "222222", modelId: "f8b11bed724647e98bd07a66dca6d5b6"},{name: "Plug2", state: 0, uid: "111111", modelId: "123"}] if (req.query.uid != undefined) { orvibo.toggleSocket(req.query.uid); } - sockets = orvibo.getConnectedSocket(); + // sockets = orvibo.getConnectedSocket(); utils.setState(sockets) diff --git a/server/css/style.css b/server/css/style.css index 8079dae..df851fe 100644 --- a/server/css/style.css +++ b/server/css/style.css @@ -36,6 +36,12 @@ body { margin-bottom: 5px; } +.socket-image { + width: 100%; + height: 300px; + } + + .button-off { background-color:#fc0000; -moz-border-radius:28px; diff --git a/server/images/b25.jpg b/server/images/b25.jpg new file mode 100644 index 0000000..c00b3ea Binary files /dev/null and b/server/images/b25.jpg differ diff --git a/server/images/b25UK.jpg b/server/images/b25UK.jpg new file mode 100644 index 0000000..aa8477c Binary files /dev/null and b/server/images/b25UK.jpg differ diff --git a/views/index.pug b/views/index.pug index 5be2d40..fe84ba9 100644 --- a/views/index.pug +++ b/views/index.pug @@ -8,6 +8,13 @@ block content else each socket in sockets div.socket + case socket.modelId + when 'f8b11bed724647e98bd07a66dca6d5b6' + div.socket-image(style=`background: url('/images/b25UK.jpg') top center + no-repeat; background-size: cover;`) + when '123' + div.socket-image(style=`background: url('/images/b25.jpg') top center + no-repeat; background-size: cover;`) h2.socket-name | #{socket.name} h2.socket-name