diff --git a/apps/server/Main.js b/apps/server/Main.js index 83df1e8..6100de3 100644 --- a/apps/server/Main.js +++ b/apps/server/Main.js @@ -29,7 +29,7 @@ global.pluginloader = new pl(); pluginloader.loadFromFolder(); //config last to be loaded -//It fires off the config_changed event that signals the app is ready +//It fires off the config_ready event that signals the app is ready cm.init(); diff --git a/apps/server/lib/Systray.js b/apps/server/lib/Systray.js index 9fa2e3c..fd991ea 100644 --- a/apps/server/lib/Systray.js +++ b/apps/server/lib/Systray.js @@ -1,5 +1,6 @@ const SysTray = require('systray2'); const os = require('os'); +const open = require("open"); const EVENTS = require('./Events'); @@ -33,10 +34,10 @@ const systray = new SysTray.default({ systray.onClick(action => { switch(action.seq_id){ case 0: - eventBus.emit(EVENTS.OPEN_CONFIG) + open("http://localhost:8080/") break; case 2: - eventBus.emit(EVENTS.ABOUT) + open("http://localhost:8080/about") break; case 3: eventBus.emit(EVENTS.QUIT) diff --git a/apps/server/webserver/api/info.js b/apps/server/webserver/api/info.js index b5af208..183c07c 100644 --- a/apps/server/webserver/api/info.js +++ b/apps/server/webserver/api/info.js @@ -3,7 +3,7 @@ const router = express.Router(); const EVENTS = require('../../lib/Events'); router.get('/', (req, res) => { - res.sendStatus(200); + res.status(200).send({}); }); router.get('/device', (req, res) => { diff --git a/apps/web/package.json b/apps/web/package.json index 41d3ed1..20e1ca1 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -15,7 +15,8 @@ "rollup-plugin-livereload": "^2.0.0", "rollup-plugin-svelte": "^7.0.0", "rollup-plugin-terser": "^7.0.0", - "svelte": "^3.0.0" + "svelte": "^3.0.0", + "bulma": "0.9.4" }, "dependencies": { "sirv-cli": "^2.0.0", diff --git a/apps/web/public/global.css b/apps/web/public/global.css deleted file mode 100644 index bb28a94..0000000 --- a/apps/web/public/global.css +++ /dev/null @@ -1,63 +0,0 @@ -html, body { - position: relative; - width: 100%; - height: 100%; -} - -body { - color: #333; - margin: 0; - padding: 8px; - box-sizing: border-box; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; -} - -a { - color: rgb(0,100,200); - text-decoration: none; -} - -a:hover { - text-decoration: underline; -} - -a:visited { - color: rgb(0,80,160); -} - -label { - display: block; -} - -input, button, select, textarea { - font-family: inherit; - font-size: inherit; - -webkit-padding: 0.4em 0; - padding: 0.4em; - margin: 0 0 0.5em 0; - box-sizing: border-box; - border: 1px solid #ccc; - border-radius: 2px; -} - -input:disabled { - color: #ccc; -} - -button { - color: #333; - background-color: #f4f4f4; - outline: none; -} - -button:disabled { - color: #999; -} - -button:not(:disabled):active { - background-color: #ddd; -} - -button:focus { - border-color: #666; -} diff --git a/apps/web/public/index.html b/apps/web/public/index.html index 5da7ed3..a9c8fd6 100644 --- a/apps/web/public/index.html +++ b/apps/web/public/index.html @@ -7,7 +7,6 @@
Visit the Svelte tutorial to learn how to build Svelte apps.
{JSON.stringify(test)}
- - \ No newline at end of file + \ No newline at end of file