1
0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-11 18:32:50 +00:00

added graphs

This commit is contained in:
2015-12-19 03:53:29 -06:00
parent 78f5e35270
commit 7d3822904d
7 changed files with 182 additions and 42 deletions

View File

@@ -0,0 +1,59 @@
<!DOCTYPE html>
<html lang="en">
<head>
<% include layout.ejs %>
</head>
<body>
<div class="header"></div>
<% include ../public/html/navbar.html %>
<div class="container">
<br>
<h1 class="text-center" id="sensor-location"><%=info.location%></h1>
<hr>
<br>
<canvas class="center" id="info-chart" width="800" height="400"></canvas>
</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>
<% include layoutBottom.ejs %>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js"></script>
<script src="/javascripts/sensor_information.js"></script>
</html>

View File

@@ -2,38 +2,13 @@
<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">
<% include layout.ejs %>
</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="header"></div>
<% include ../public/html/navbar.html %>
@@ -53,7 +28,9 @@
<%} else {%>
<span class="colorRed">Disconnected</span>
<%}%>
<br>
<br>
<a href="<%=query[i].info_link%>"><button class="btn btn-default">View Graph</button></a>
</div>
<%}%>
@@ -86,10 +63,7 @@
<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>
<% include layoutBottom.ejs %>
</html>