mitchell/mywebsite
1
0
Fork 0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-11 18:32:50 +00:00
Code Issues Releases Wiki Activity

added sensor page

Browse Source
This commit is contained in:
Mitchell
2015-12-14 19:43:50 -06:00
parent f0261f5b60
commit 0b161e8525
4 changed files with 122 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
routes/index.js
View File

@@ -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){
});
}
}

3
routes/temperature.js
View File

@@ -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({