cleanup

AprilBrother · May 28, 2018 · 323bcda · 323bcda
1 parent d236103
commit 323bcda
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 22 deletions.
diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="UTF-8">
-    <title>Hello World!</title>
+    <title>BLE Viewer</title>
     <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
 <style>
 #container {
@@ -13,6 +13,7 @@
   </head>
   <body class="container-fluid">
     <h1>BLE Viewer</h1>
+    <h6>BLE data viewer for AB BLE Gateway V4 (MQTT client only)</h6>
 
     <div id="container"></div>
 

diff --git a/package.json b/package.json
@@ -1,20 +1,12 @@
 {
-  "name": "electron-quick-start",
+  "name": "ble viewer",
   "version": "1.0.0",
-  "description": "A minimal Electron application",
+  "description": "BLE data viewer",
   "main": "main.js",
   "scripts": {
     "start": "electron ."
   },
   "repository": "https://github.com/electron/electron-quick-start",
-  "keywords": [
-    "Electron",
-    "quick",
-    "start",
-    "tutorial",
-    "demo"
-  ],
-  "author": "GitHub",
   "license": "CC0-1.0",
   "devDependencies": {},
   "dependencies": {

diff --git a/partials/server-form.ejs b/partials/server-form.ejs
@@ -9,13 +9,12 @@
             <label for="mqtt-port">MQTT Port</label>
             <input type="number" id="mqtt-port" name="mqtt-port" placeholder="MQTT Port" value="1883" class="form-control">
         </div>
-
     </div>
 
-        <div class="form-group">
-            <label for="mqtt-topic">MQTT Topic</label>
-            <input type="text" class="form-control" id="mqtt-topic" name="mqtt-topic" placeholder="Topic" value="beacon6c">
-        </div>
+    <div class="form-group">
+        <label for="mqtt-topic">MQTT Topic</label>
+        <input type="text" class="form-control" id="mqtt-topic" name="mqtt-topic" placeholder="Topic" value="MQTT topic, please check the setting of BLE gateway">
+    </div>
 
     <div class="form-row">
         <div class="form-group col-md-6">

diff --git a/renderer.js b/renderer.js
@@ -31,13 +31,22 @@ $(function () {
 
     $('#container').on('click', '#btn-test', function() {
         var mqtt = require('mqtt')
-            host = 'mqtt://' + $('input[name=mqtt-host]').val()
-            port = parseInt($('input[name=mqtt-port]').val())
-            topic = $('input[name=mqtt-topic]').val()
+            host = 'mqtt://' + $('input[name=mqtt-host]').val(),
+            port = parseInt($('input[name=mqtt-port]').val()),
+            user = parseInt($('#mqtt-username').val()),
+            pass = parseInt($('#mqtt-password').val()),
+            topic = $('input[name=mqtt-topic]').val(),
+            opt = {
+                port: port
+            }
 
-        var client  = mqtt.connect(host, {
-            port: port
-        })
+        if (user.length) {
+            opt.username = user;
+            if (pass.length) {
+                opt.password = pass;
+            }
+        }
+        var client  = mqtt.connect(host, opt);
 
         client.on('connect', function () {
             console.log("connected")