Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@
var express = require('express');
var http = require('http');
var path = require('path');
var handlebars = require('express3-handlebars')
var handlebars = require('express3-handlebars');

var index = require('./routes/index');
var record = require('./routes/record');
var forum = require('./routes/forum');
var help = require('./routes/help');
var profile = require('./routes/profile');
// Example route
// var user = require('./routes/user');

Expand Down Expand Up @@ -37,7 +41,10 @@ if ('development' == app.get('env')) {
app.get('/', index.view);
// Example route
// app.get('/users', user.list);

app.get("/record",record.viewR);
app.get("/help",help.viewHelp);
app.get("/forum",forum.viewForum);
app.get("/profile",profile.viewProfile);
http.createServer(app).listen(app.get('port'), function(){
console.log('Express server listening on port ' + app.get('port'));
});
40 changes: 37 additions & 3 deletions public/css/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,10 @@ samp {
display: block;
}



.title{
line-height: 100px;
margin-left: -950px;
}

/* Change the background color of the dropdown button when the dropdown content is shown */
.dropdown:hover .dropbtn {color: blue;}
Expand Down Expand Up @@ -253,8 +255,9 @@ input {
button,
select {
text-transform: none;
}

}
s
button,
html input[type="button"],
input[type="reset"],
Expand Down Expand Up @@ -1959,10 +1962,41 @@ legend {

label {
display: inline-block;

margin-bottom: 5px;
font-weight: bold;


}
.recordsel{
width: 179px;
height: 27px;
}
.formlabels{
margin-top: 20px;
text-align: left;

}
.formlabels2{
margin-top: 20px;
margin-left: -20px;
}
.submitform{
border: solid;
}
.cancel{
background-color: grey;
color: white;
border: none;
outline: none;
margin-right: 30px;
}
.save{
background-color: black;
color: white;
border: none;
outline: none;
}
input[type="search"] {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
Expand Down
Binary file added public/images/img_graph.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions routes/forum.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
exports.viewForum= function(req,res){
res.render("forum");
};
3 changes: 3 additions & 0 deletions routes/help.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
exports.viewHelp= function(req,res){
res.render("help");
};
18 changes: 3 additions & 15 deletions routes/index.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@

/*
* GET home page.
*/

function openNav() {
document.getElementById("mySidebar").style.width = "250px";
document.getElementById("main").style.marginLeft = "250px";
}

/* Set the width of the sidebar to 0 and the left margin of the page content to 0 */
function closeNav() {
document.getElementById("mySidebar").style.width = "0";
document.getElementById("main").style.marginLeft = "0";
}
exports.view = function(req, res){
res.render('index');
};
3 changes: 3 additions & 0 deletions routes/profile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
exports.viewProfile = function(req, res){
res.render('profile');
};
3 changes: 3 additions & 0 deletions routes/record.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
exports.viewR = function(req,res){
res.render("record");
};
29 changes: 29 additions & 0 deletions views/forum.handlebars
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<html>
<head>
<title>Wellness Tracker</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="/css/bootstrap.min.css" rel="stylesheet">
<link href="/css/bootstrap-theme.min.css" rel="stylesheet">
<link href="/css/bootstrap.css" rel="stylesheet">
<script src="/js/bar.js"></script>
</head>

<body>
<div id="main" class="screen">
<div class="dropdown">
<button onClick="openMenu()" class="dropbtn">&#9776;</button>
<div id="sidebar" class="dropdown-content">
<a class="selected" href="/">Home</a>
<a href="record">Record</a>
<a href="forum">Forum</a>
<a href="profile">Profile</a>
<a href="help">Help</a>
</div>
</div>
<h3 class="title">Forum</h3>
</div>


</body>
</html>
29 changes: 29 additions & 0 deletions views/help.handlebars
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<html>
<head>
<title>Wellness Tracker</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="/css/bootstrap.min.css" rel="stylesheet">
<link href="/css/bootstrap-theme.min.css" rel="stylesheet">
<link href="/css/bootstrap.css" rel="stylesheet">
<script src="/js/bar.js"></script>
</head>

<body>
<div id="main" class="screen">
<div class="dropdown">
<button onClick="openMenu()" class="dropbtn">&#9776;</button>
<div id="sidebar" class="dropdown-content">
<a class="selected" href="/">Home</a>
<a href="record">Record</a>
<a href="forum">Forum</a>
<a href="profile">Profile</a>
<a href="help">Help</a>
</div>
</div>
<h3 class="title">Help</h3>
</div>


</body>
</html>
12 changes: 6 additions & 6 deletions views/index.handlebars
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<button onClick="openMenu()" class="dropbtn">&#9776;</button>
<div id="sidebar" class="dropdown-content">
<a class="selected" href="#">Home</a>
<a href="#">Record</a>
<a href="#">Forum</a>
<a href="#">Profile</a>
<a href="#">Help</a>
<a href="record">Record</a>
<a href="forum">Forum</a>
<a href="profile">Profile</a>
<a href="help">Help</a>
</div>
</div>
<h3 class="welcome"> Welcome,</h3>
Expand All @@ -42,8 +42,8 @@
</div>
</div>
<div class="graph">
<p>SLEEP</p>
<img src="img_graph" alt="Record some data" width="300" height="200">
<p></p>
<img src="images/img_graph.JPG" alt="Record some data" width="300" height="300">
</div>
</div>
</body>
Expand Down
29 changes: 29 additions & 0 deletions views/profile.handlebars
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<html>
<head>
<title>Wellness Tracker</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="/css/bootstrap.min.css" rel="stylesheet">
<link href="/css/bootstrap-theme.min.css" rel="stylesheet">
<link href="/css/bootstrap.css" rel="stylesheet">
<script src="/js/bar.js"></script>
</head>

<body>
<div id="main" class="screen">
<div class="dropdown">
<button onClick="openMenu()" class="dropbtn">&#9776;</button>
<div id="sidebar" class="dropdown-content">
<a class="selected" href="/">Home</a>
<a href="record">Record</a>
<a href="forum">Forum</a>
<a href="#">Profile</a>
<a href="help">Help</a>
</div>
</div>
<h3 class="title">Profile</h3>
</div>


</body>
</html>
59 changes: 59 additions & 0 deletions views/record.handlebars
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<html>
<head>
<title>Wellness Tracker</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="/css/bootstrap.min.css" rel="stylesheet">
<link href="/css/bootstrap-theme.min.css" rel="stylesheet">
<link href="/css/bootstrap.css" rel="stylesheet">
<script src="/js/bar.js"></script>
</head>

<body>
<div id="main" class="screen">
<div class="dropdown">
<button onClick="openMenu()" class="dropbtn">&#9776;</button>
<div id="sidebar" class="dropdown-content">
<a class="selected" href="/">Home</a>
<a href="record">Record</a>
<a href="forum">Forum</a>
<a href="profile">Profile</a>
<a href="help">Help</a>
</div>
</div>
<h3 class="title">Record Data</h3>
<div class="submitform">
<form>
<label class="formlabels" for="date">Date:</label>
<input type="text" id="date" name="date"><br>

<label class="formlabels" for="title">Title:</label>
<input type="text" id="title" name="title"><br>

<label class="formlabels2" for="subject" class="recordlabel">Subject:</label>
<select name="Subject" id="subject" class="recordsel">
<option value="sleep">Sleeping</option>
<option value="Mood">Mood</option>
<option value="Excercise">Excercise</option>
</select><br>
</form>

</div><br>
<p> How many hours did you sleep last night?</p>
<select name="time" id="time" class="recordsel">
<option value="6 hours">6 hours</option>
<option value="7 hours">7 hours</option>
<option value="8 hours">8 hours</option>
</select><br>
<p>&#160;</p>
<p> On a scale of 1 to 10 how stressed were you yesterday?</p>
<input type="text" id="title" name="title"><br>
<p>&#160;</p>

<button type="button" class="cancel">Cancel</button>
<button type="button" class="save">Save</button>
</div>


</body>
</html>