mirror of
https://github.com/mgerb/mywebsite
synced 2026-01-11 18:32:50 +00:00
Started working on MGO
This commit is contained in:
@@ -1,13 +1,10 @@
|
||||
|
||||
<br>
|
||||
<br>
|
||||
<br>
|
||||
<br>
|
||||
<br>
|
||||
|
||||
<h1 class="text-center large-text">404</h1>
|
||||
<h4 class="text-center">This page may be in production, or it may not exist.</h4>
|
||||
|
||||
<br>
|
||||
<br>
|
||||
<br>
|
||||
|
||||
26
public/view/default.html
Normal file
26
public/view/default.html
Normal file
@@ -0,0 +1,26 @@
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-sm-8 blog-main">
|
||||
<div ng-repeat="post in posts">
|
||||
<h2 class="blog-post-title">{{post.title}}</h2>
|
||||
|
||||
<p class="blog-post-meta">{{post.date}}</p>
|
||||
|
||||
<p>{{post.intro}}
|
||||
<br>
|
||||
<a href="/post/{{post.name}}">Continue reading...</a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<!-- new blog posts-->
|
||||
<div class="col-sm-4 blog-sidebar">
|
||||
<h1 class="text-center">About Me</h1>
|
||||
<img class="aboutMeImage center img-rounded" src="/public/images/aboutme.jpg">
|
||||
<br>
|
||||
<div class="sidebar-module sidebar-module-inset">
|
||||
<p> I'm 22 years old and currently attending Winona State University as a Computer Science major. I am graduating in Spring of 2016 and plan to pursue a career in the field of software development.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,25 +0,0 @@
|
||||
<div class="container">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-8 blog-main">
|
||||
|
||||
</div> <!-- new blog posts-->
|
||||
|
||||
<div class="col-sm-4 blog-sidebar">
|
||||
<h1 class="text-center">About Me</h1>
|
||||
<img class="aboutMeImage center img-rounded" src="/public/images/aboutme.jpg">
|
||||
|
||||
<br>
|
||||
|
||||
<div class="sidebar-module sidebar-module-inset">
|
||||
<p> I'm 22 years old and currently attending Winona State University as a Computer Science major.
|
||||
I am graduating in Spring of 2016 and plan to pursue a career in the field of software development.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -1,27 +1,17 @@
|
||||
<div class="container">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-8 blog-main">
|
||||
|
||||
<ng-include src="post"></ng-include>
|
||||
|
||||
</div> <!-- new blog posts-->
|
||||
|
||||
<div class="col-sm-4 blog-sidebar">
|
||||
<h1 class="text-center">About Me</h1>
|
||||
<img class="aboutMeImage center img-rounded" src="/public/images/aboutme.jpg">
|
||||
|
||||
<br>
|
||||
|
||||
<div class="sidebar-module sidebar-module-inset">
|
||||
<p> I'm 22 years old and currently attending Winona State University as a Computer Science major.
|
||||
I am graduating in Spring of 2016 and plan to pursue a career in the field of software development.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-8 blog-main">
|
||||
<ng-include src="post"></ng-include>
|
||||
</div>
|
||||
<!-- new blog posts-->
|
||||
<div class="col-sm-4 blog-sidebar">
|
||||
<h1 class="text-center">About Me</h1>
|
||||
<img class="aboutMeImage center img-rounded" src="/public/images/aboutme.jpg">
|
||||
<br>
|
||||
<div class="sidebar-module sidebar-module-inset">
|
||||
<p> I'm 22 years old and currently attending Winona State University as a Computer Science major. I am graduating in Spring of 2016 and plan to pursue a career in the field of software development.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
37
public/view/sensor_info.html
Normal file
37
public/view/sensor_info.html
Normal file
@@ -0,0 +1,37 @@
|
||||
<div class="container">
|
||||
<br>
|
||||
<h1 class="text-center" id="sensor-location">{{location}}</h1>
|
||||
<hr>
|
||||
<br>
|
||||
<form class="text-center form-inline">
|
||||
<div class="form-group">
|
||||
<select class="form-control" id="option-year">
|
||||
<option value=">">Years</option>
|
||||
</select>
|
||||
</div>
|
||||
</form>
|
||||
<br>
|
||||
<div id="canvas1-id">
|
||||
<canvas class="center" id="info-chart-year" width="800" height="400"></canvas>
|
||||
</div>
|
||||
<br>
|
||||
<div id="legend-year" class="chart-legend"></div>
|
||||
<form class="text-center form-inline">
|
||||
<div class="form-group">
|
||||
<select class="form-control" id="option-month">
|
||||
<option value="">Month + Year</option>
|
||||
</select>
|
||||
</div>
|
||||
</form>
|
||||
<br>
|
||||
<div id="canvas2-id">
|
||||
<canvas class="center" id="info-chart-month" width="800" height="400"></canvas>
|
||||
</div>
|
||||
<br>
|
||||
<div id="legend-month" class="chart-legend"></div>
|
||||
</div>
|
||||
<br>
|
||||
<br>
|
||||
<div class="modal">
|
||||
<!-- Place at bottom of page -->
|
||||
</div>
|
||||
28
public/view/sensors.html
Normal file
28
public/view/sensors.html
Normal file
@@ -0,0 +1,28 @@
|
||||
<div class="container">
|
||||
<br>
|
||||
<h1 class="text-center">ESP8266 Temperature Sensors</h1>
|
||||
<p><span class="colorRed">Note:</span> I am using a DHT11 analog sensor for both temperature and humidity readings. I am also using a DS18B20 digital sensor, which only takes temperature readings. The digital sensor seems to get more accurate readings. Some of the data may be inconsistent as this is an experimental process.
|
||||
</p>
|
||||
<hr>
|
||||
<div class="col-lg-4">
|
||||
<h3>Sensor Title</h3>
|
||||
<h4>Temperature: °F </h4>
|
||||
<h4>Humidity: </h4>
|
||||
<span>Updated:</span>
|
||||
<br>
|
||||
<span class="colorGreen">Connected</span>
|
||||
<br>
|
||||
<br>
|
||||
<a href="/sensors/location">
|
||||
<button class="btn btn-default">View Graph</button>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
<br>
|
||||
<br>
|
||||
<br>
|
||||
<br>
|
||||
<br>
|
||||
<br>
|
||||
<br>
|
||||
@@ -2,97 +2,82 @@
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<title>mitchel.io</title>
|
||||
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="/public/css/style.css">
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.css">
|
||||
<link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
|
||||
|
||||
<style>
|
||||
[ng\:cloak], [ng-cloak], .ng-cloak {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
|
||||
<title>mitchel.io</title>
|
||||
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="/public/css/style.css">
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.css">
|
||||
<link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
|
||||
<style>
|
||||
[ng\:cloak],
|
||||
[ng-cloak],
|
||||
.ng-cloak {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body ng-app="app" ng-cloak>
|
||||
|
||||
<div class="header">
|
||||
|
||||
<body ng-app="app" ng-init="array = [1,2,3,4];" ng-cloak>
|
||||
<div class="header">
|
||||
<div class="container">
|
||||
|
||||
<div class="lowerLeft">
|
||||
<h1 class="">mitchel.io</h1>
|
||||
<p class="">A site in which I share information about my personal projects.</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<nav class="navbar mitchell-navbar" role="navigation">
|
||||
<div class="container">
|
||||
<!-- Brand and toggle get grouped for better mobile display -->
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
</div>
|
||||
<!-- Collect the nav links, forms, and other content for toggling -->
|
||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||
<ul class="nav navbar-nav">
|
||||
<li>
|
||||
<a href="/">Home</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/sensors">Sensors</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/resume">Resume</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="mailto:mgerber11@winona.edu">Contact</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li>
|
||||
<a href="/newpost">New Post</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
<!-- /.navbar-collapse -->
|
||||
</div>
|
||||
<!-- /.container -->
|
||||
</nav>
|
||||
|
||||
|
||||
|
||||
<!-- dynamically load content into the page with angular (ng-view) -->
|
||||
<ng-view></ng-view>
|
||||
<!-- ------------------------------------------------------------- -->
|
||||
|
||||
|
||||
|
||||
<footer class="blog-footer">
|
||||
<p>Site created and managed by Mitchell Gerber</p>
|
||||
<span>©2015-2016</span>
|
||||
<br>
|
||||
<span>Glyphicons provided by</span><br>
|
||||
<a href="http://glyphicons.com/" target="_blank"><span>glyphicons.com</span></a>
|
||||
</footer>
|
||||
|
||||
<nav class="navbar mitchell-navbar" role="navigation">
|
||||
<div class="container">
|
||||
<!-- Brand and toggle get grouped for better mobile display -->
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
</div>
|
||||
<!-- Collect the nav links, forms, and other content for toggling -->
|
||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||
<ul class="nav navbar-nav">
|
||||
<li>
|
||||
<a href="/">Home</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/sensors">Sensors</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="/post/resume">Resume</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="mailto:mgerber11@winona.edu">Contact</a>
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li>
|
||||
<a href="/newpost">New Post</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<!-- /.navbar-collapse -->
|
||||
</div>
|
||||
<!-- /.container -->
|
||||
</nav>
|
||||
<!-- dynamically load content into the page with angular (ng-view) -->
|
||||
<div ng-view></div>
|
||||
<!-- ------------------------------------------------------------- -->
|
||||
<footer class="blog-footer">
|
||||
<p>Site created and managed by Mitchell Gerber</p>
|
||||
<span>©2015-2016</span>
|
||||
<br>
|
||||
<span>Glyphicons provided by</span>
|
||||
<br>
|
||||
<a href="http://glyphicons.com/" target="_blank"><span>glyphicons.com</span></a>
|
||||
</footer>
|
||||
</body>
|
||||
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-beta1/jquery.min.js"></script>
|
||||
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/i18n/jquery-ui-i18n.min.js"></script> -->
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha/js/bootstrap.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.4/i18n/jquery-ui-i18n.min.js"></script>
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.5/angular.js"></script>
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.5/angular.js"></script>
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.5/angular-route.js"></script>
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.5/angular-resource.js"></script>
|
||||
<script src="/public/js/app.js"></script>
|
||||
|
||||
Reference in New Issue
Block a user