mirror of
https://github.com/mgerb/mywebsite
synced 2026-01-12 02:42:48 +00:00
new changes
This commit is contained in:
9
app.js
9
app.js
@@ -5,8 +5,8 @@ var logger = require('morgan');
|
|||||||
var cookieParser = require('cookie-parser');
|
var cookieParser = require('cookie-parser');
|
||||||
var bodyParser = require('body-parser');
|
var bodyParser = require('body-parser');
|
||||||
|
|
||||||
var routes = require('./routes/index');
|
var index = require('./routes/index');
|
||||||
var users = require('./routes/users');
|
var success = require('./routes/success');
|
||||||
var mongoose = require('mongoose');
|
var mongoose = require('mongoose');
|
||||||
var mainLoop = require('./main');
|
var mainLoop = require('./main');
|
||||||
|
|
||||||
@@ -32,9 +32,8 @@ app.use(bodyParser.urlencoded({ extended: false }));
|
|||||||
app.use(cookieParser());
|
app.use(cookieParser());
|
||||||
app.use(express.static(path.join(__dirname, 'public')));
|
app.use(express.static(path.join(__dirname, 'public')));
|
||||||
|
|
||||||
app.use('/', routes);
|
app.use('/', index);
|
||||||
app.use('/users', users);
|
app.use('/success', success)
|
||||||
|
|
||||||
// catch 404 and forward to error handler
|
// catch 404 and forward to error handler
|
||||||
app.use(function(req, res, next) {
|
app.use(function(req, res, next) {
|
||||||
var err = new Error('Not Found');
|
var err = new Error('Not Found');
|
||||||
|
|||||||
@@ -1,4 +1,10 @@
|
|||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
|
|
||||||
|
var date = new Date();
|
||||||
|
var offset = new Date().getTimezoneOffset();
|
||||||
|
$("#timeZone").val(offset);
|
||||||
|
|
||||||
|
console.log("offset - " + offset);
|
||||||
$(function() {
|
$(function() {
|
||||||
$( "#datepicker" ).datepicker();
|
$( "#datepicker" ).datepicker();
|
||||||
});
|
});
|
||||||
@@ -6,4 +12,5 @@ $(document).ready(function(){
|
|||||||
$(function() {
|
$(function() {
|
||||||
$("#timepicker").timepicker();
|
$("#timepicker").timepicker();
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
@@ -10,6 +10,16 @@ router.get('/', function(req, res, next) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
router.post('/', function(req, res,next) {
|
router.post('/', function(req, res,next) {
|
||||||
|
var serverTimeZone = 240;
|
||||||
|
var clientTimeZone = req.body.timeZone;
|
||||||
|
var timeZoneOffset = clientTimeZone - serverTimeZone;
|
||||||
|
|
||||||
|
if (timeZoneOffset < 0){
|
||||||
|
timeZoneOffset = 0 - (Math.abs(timeZoneOffset)/60);
|
||||||
|
}
|
||||||
|
else if (timeZoneOffset > 0){
|
||||||
|
timeZoneOffset = timeZoneOffset/60;
|
||||||
|
}
|
||||||
|
|
||||||
var number = req.body.number;
|
var number = req.body.number;
|
||||||
var date = req.body.date;
|
var date = req.body.date;
|
||||||
@@ -43,7 +53,26 @@ router.post('/', function(req, res,next) {
|
|||||||
number = number.concat(carrier);
|
number = number.concat(carrier);
|
||||||
|
|
||||||
date = new Date(date);
|
date = new Date(date);
|
||||||
date.setHours(get24Hours(time));
|
var newTime;
|
||||||
|
|
||||||
|
//check to see if time zone sets back a day
|
||||||
|
//if the time zone offset is greater than 24 hours and the offset is possitive
|
||||||
|
//need to set date ahead a day
|
||||||
|
if ((get24Hours(time) + timeZoneOffset) > 23){
|
||||||
|
date.setDate(date.getDate() + 1);
|
||||||
|
newTime = (get24Hours(time) + timeZoneOffset) - 24;
|
||||||
|
}
|
||||||
|
|
||||||
|
else if ((get24Hours(time) + timeZoneOffset) < 0){
|
||||||
|
date.setDate(date.getDate() - 1);
|
||||||
|
newTime = (get24Hours(time) + timeZoneOffset) + 24;
|
||||||
|
}
|
||||||
|
|
||||||
|
else {
|
||||||
|
newTime = get24Hours(time) + timeZoneOffset;
|
||||||
|
}
|
||||||
|
|
||||||
|
date.setHours(newTime);
|
||||||
date.setMinutes(getMinutes(time));
|
date.setMinutes(getMinutes(time));
|
||||||
|
|
||||||
var entry = new info({
|
var entry = new info({
|
||||||
@@ -59,7 +88,7 @@ router.post('/', function(req, res,next) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
console.log(entry);
|
console.log(entry);
|
||||||
res.render('index');
|
res.render('success');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
10
routes/success.js
Normal file
10
routes/success.js
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
var express = require('express');
|
||||||
|
var router = express.Router();
|
||||||
|
|
||||||
|
/* GET home page. */
|
||||||
|
router.get('/', function(req, res, next) {
|
||||||
|
res.render('success');
|
||||||
|
});
|
||||||
|
|
||||||
|
module.exports = router;
|
||||||
|
|
||||||
@@ -6,7 +6,7 @@ block content
|
|||||||
h1.headerText.textCenter mitchellG.me
|
h1.headerText.textCenter mitchellG.me
|
||||||
|
|
||||||
div.container
|
div.container
|
||||||
h1.textCenter Submit Form
|
h1.textCenter Enter Reminder
|
||||||
form(action="/", method="post")
|
form(action="/", method="post")
|
||||||
div.form-signin
|
div.form-signin
|
||||||
Span Phone Number:
|
Span Phone Number:
|
||||||
@@ -48,5 +48,7 @@ block content
|
|||||||
Span Message:
|
Span Message:
|
||||||
textarea.form-control(required type="textarea", name="message", placeholder="Type your message here...")
|
textarea.form-control(required type="textarea", name="message", placeholder="Type your message here...")
|
||||||
br
|
br
|
||||||
input(type="submit", value="Remind Me").btn.btn-lg.btn-primary.btn-block
|
input(hidden type="text" name="timeZone" id="timeZone")
|
||||||
|
input(type="submit", value="Remind Me", id="submitButton").btn.btn-lg.btn-primary.btn-block
|
||||||
|
|
||||||
|
|
||||||
@@ -13,4 +13,5 @@ html
|
|||||||
script(src="bootstrap/js/bootstrap.js")
|
script(src="bootstrap/js/bootstrap.js")
|
||||||
script(src="jquery-ui-1.11.4/jquery-ui.js")
|
script(src="jquery-ui-1.11.4/jquery-ui.js")
|
||||||
script(src="jquery-timepicker/jquery.timepicker.js")
|
script(src="jquery-timepicker/jquery.timepicker.js")
|
||||||
|
script(src="javascripts/notify.min.js")
|
||||||
script(src="javascripts/custom.js")
|
script(src="javascripts/custom.js")
|
||||||
18
views/success.jade
Normal file
18
views/success.jade
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
extends layout
|
||||||
|
|
||||||
|
block content
|
||||||
|
div.header
|
||||||
|
div.centerDiv
|
||||||
|
h1.headerText.textCenter mitchellG.me
|
||||||
|
|
||||||
|
div.container
|
||||||
|
div.form-signin
|
||||||
|
h1.textCenter Reminder Submitted!
|
||||||
|
br
|
||||||
|
br
|
||||||
|
p.textCenter Thanks for using this service! Click here to submit another reminder!
|
||||||
|
br
|
||||||
|
a(href="/")
|
||||||
|
button.btn.btn-lg.btn-primary.btn-block Home Page
|
||||||
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user