Merge pull request #2 from sydeslyde/master

Added meaningful page when no devices discovered
jamesbarnett91 · Apr 15, 2018 · 158e5a4 · 158e5a4
2 parents 531964e + 57f1ac8
commit 158e5a4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/public/javascripts/dash.js b/public/javascripts/dash.js
@@ -11,7 +11,9 @@ var dash = {
   init: function(deviceId) {
     this.deviceId = deviceId;
 
-    $('.' + deviceId).addClass('active');
+    if (this.deviceId) {
+      $('.' + deviceId).addClass('active');
+    }
 
     this.initRealtimeGauge();
     this.initRealtimeTrendChart();

diff --git a/routes/index.js b/routes/index.js
@@ -5,9 +5,15 @@ const deviceManager = require('../services/device-manager');
 
 router.get('/', function(req, res, next) {
 
-  let deviceId = sortDevices(deviceManager.getAllDevices())[0].deviceId;
+  let devices = sortDevices(deviceManager.getAllDevices());
 
-  res.redirect('/' + deviceId);
+  if (devices && devices.length > 0) {
+    let deviceId = devices[0].deviceId;
+
+    res.redirect('/' + deviceId);
+  } else {
+    res.render('index', {});
+  }
 
 });
 

diff --git a/views/index.hbs b/views/index.hbs
@@ -21,6 +21,13 @@
                     {{this.alias}}
                   </a>
                 </li>
+                {{else}}
+                <li>
+                  <a href='index.html'>
+                    <i class="fa fa-info"></i>
+                    no devices discovered yet
+                  </a>
+                </li>
                 {{/each}}
               </ul>
             </div>
@@ -43,6 +50,13 @@
                     {{this.alias}}
                   </a>
                 </li>
+                {{else}}
+                <li>
+                  <a href="index.html">
+                    <i class="fa fa-info"></i>
+                    no devices discovered yet
+                  </a>
+                </li>
                 {{/each}}
               </ul>
               </div>