diff --git a/node_modules/express/node_modules/vary/History.md b/node_modules/express/node_modules/vary/History.md index e5d8e69..cddbcd4 100644 --- a/node_modules/express/node_modules/vary/History.md +++ b/node_modules/express/node_modules/vary/History.md @@ -1,3 +1,10 @@ +1.0.1 / 2015-07-08 +================== + + * Fix setting empty header from empty `field` + * perf: enable strict mode + * perf: remove argument reassignments + 1.0.0 / 2014-08-10 ================== diff --git a/routes/index.js b/routes/index.js index 1423958..c246617 100644 --- a/routes/index.js +++ b/routes/index.js @@ -17,10 +17,22 @@ router.get('/discord', function(req, res, next) { }); -router.get('/vpn', function(req, red, next){ - red.redirect('https://mitchellg.me:943'); +router.get('/vpn', function(req, res, next){ + res.redirect('https://mitchellg.me:943'); }); + +router.get('/sensors', function(req, res, next) { + + temperature.aggregate( [ {$sort : {location : -1, updated : -1}}, { $group : { _id : "$location", temperature : {$first : "$temperature"}, humidity : {$first : "$humidity"}} } ] ).exec(function(err, info){ + + res.render('sensors', {query : info}); + }); + + +}); + + /* GET home page. */ router.get('/', function(req, res, next) { @@ -170,7 +182,7 @@ function timeValidator(time){ function renderIndex(res, json){ - temperature.findOne().sort('-updated').exec(function(err,info) { + temperature.findOne({location : "Winona Apartment"}).sort("-updated").exec(function(err, info){ posts.find().sort('-updated').exec(function(err, postsQuery){ @@ -182,4 +194,16 @@ function renderIndex(res, json){ }); -} \ No newline at end of file +} + + + + + + + + + + + + diff --git a/routes/temperature.js b/routes/temperature.js index 98d7d14..a495f29 100644 --- a/routes/temperature.js +++ b/routes/temperature.js @@ -6,12 +6,13 @@ var info = mongoose.model('temperature'); /* GET home page. */ router.get('/', function(req, res, next) { + var temperature = req.query.temperature; var humidity = req.query.humidity; var location = req.query.location; var key = req.query.key; - if(key == "esp1234"){ + if(key == "esp1234" && temperature != "nan" && humidity != "nan"){ var insert = new info({ diff --git a/views/sensors.ejs b/views/sensors.ejs new file mode 100644 index 0000000..f684944 --- /dev/null +++ b/views/sensors.ejs @@ -0,0 +1,85 @@ + + + + + mitchellg.me + + + + + + + + + + +
+ +
+ + <% if (query[0] != null) { %> + +
+ ESP8266 With DHT11 Sensor +
+ Location: <%=query[0]._id%> +
+ Temperature: <%=query[0].temperature%>°F +
+ Humidity: <%=query[0].humidity%>% +
+ + <%}%> + +
+ +
+ +
+
+

ESP8266 Temperature Sensors

+
+ <% for (var i = 0; i < query.length; i++){ %> +
+

<%=query[i]._id%>

+

Temperature: <%=query[i].temperature%>

+

Humidity: <%=query[i].humidity%>

+
+ <%}%> + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + +