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

7
node_modules/express/node_modules/vary/History.md generated vendored
View File

@@ -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
==================

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

85
views/sensors.ejs Normal file
View File

@@ -0,0 +1,85 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>mitchellg.me</title>
<link rel="stylesheet" href="bootstrap/css/bootstrap.css">
<link rel="stylesheet" href="/stylesheets/style.css">
<link rel="stylesheet" href="jquery-ui-1.11.4.custom/jquery-ui.css">
<link rel="stylesheet" href="bootstrap/css/bootstrap.icon-large.min.css">
<link href="http://fonts.googleapis.com/css?family=Arvo" rel="stylesheet" type="text/css">
</head>
<body>
<div class="header">
<div class="container">
<% if (query[0] != null) { %>
<div class="lowerLeft">
<span class="colorWhite">ESP8266 With DHT11 Sensor</span>
<br>
<span class="colorWhite">Location: <%=query[0]._id%></span>
<br>
<span class="colorWhite">Temperature: <%=query[0].temperature%>°F</span>
<br>
<span class="colorWhite">Humidity: <%=query[0].humidity%>%</span>
</div>
<%}%>
</div>
</div>
<div class="container">
<br>
<h1 class="text-center">ESP8266 Temperature Sensors</h1>
<hr>
<% for (var i = 0; i < query.length; i++){ %>
<div class="col-lg-4">
<h3><%=query[i]._id%></h3>
<h4>Temperature: <%=query[i].temperature%></h4>
<h4>Humidity: <%=query[i].humidity%></h4>
</div>
<%}%>
</div>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<footer class="blog-footer">
<p>Site created and managed by Mitchell Gerber</p>
<span>©2015</span>
<br>
<span>Glyphicons provided by</span><br>
<a href="http://glyphicons.com/" target="_blank"><span>glyphicons.com</span></a>
</footer>
</body>
<script src="jquery-1.11.3.min.js"></script>
<script src="bootstrap/js/bootstrap.js"></script>
<script src="jquery-ui-1.11.4.custom/jquery-ui.min.js"></script>
<script src="javascripts/custom.js"></script>
</html>