Merge branch 'master' of https://github.com/kennyboy55/smarthome

mean-app/server/db.js

@@ -7,7 +7,7 @@ var connection = mysql.createConnection({
 });
 
 connection.connect(function(err) {
-    //if (err) throw err;
+    if (err) throw err;
 });
 
 module.exports = connection;

mean-app/server/routes/webapi.js

@@ -4,6 +4,9 @@ var connection = require('../db');
 const express = require('express');
 const router = express.Router();
 
+router.all('*', function(req, res){
+  console.log(req.path);
+});
 
 router.post('/device', function(req, res){
   console.log("Device received: ");
@@ -23,8 +26,6 @@ router.post('/device', function(req, res){
 
 
 
-
-
 router.get('/device', function(req, res){
   
   connection.query(
@@ -33,7 +34,6 @@ router.get('/device', function(req, res){
    if (error) throw error;
 
    if (results.length  > 0) {
-        console.log(results);
 
         res.status(200);
         res.send(results);
@@ -50,5 +50,22 @@ router.get('/', function(req, res) {
 
 
 
+router.get('/data', function(req, res) {
+
+  connection.query(
+    'SELECT TOE1`, time FROM measurement ORDER BY time DESC LIMIT 0,10',
+                     function (error, results, fields) {
+   if (error) throw error;
+
+   if (results.length  > 0) {
+
+        res.status(200);
+        res.send(JSON.stringify(results));
+    }
+
+  });
+
+});
+
 
 module.exports = router;