mirror of
https://github.com/mgerb/mywebsite
synced 2026-01-10 09:52:51 +00:00
New Changes
This commit is contained in:
4
app.js
4
app.js
@@ -8,6 +8,8 @@ var bodyParser = require('body-parser');
|
||||
var routes = require('./routes/index');
|
||||
var users = require('./routes/users');
|
||||
var mongoose = require('mongoose');
|
||||
var mainLoop = require('./main');
|
||||
|
||||
|
||||
var app = express();
|
||||
mongoose.connect('mongodb://localhost/sitedb');
|
||||
@@ -64,5 +66,7 @@ app.use(function(err, req, res, next) {
|
||||
});
|
||||
});
|
||||
|
||||
//////////////////Main program loop //////////////////
|
||||
//mainLoop.queryLoop;
|
||||
|
||||
module.exports = app;
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
var mongoose = require('mongoose');
|
||||
|
||||
var infoSchema = new mongoose.Schema({
|
||||
number: String,
|
||||
date: Date,
|
||||
time: String,
|
||||
message: String,
|
||||
updated: {type: Date, default: Date.now}
|
||||
});
|
||||
|
||||
|
||||
mongoose.model('info', infoSchema);
|
||||
@@ -1,35 +0,0 @@
|
||||
0 info it worked if it ends with ok
|
||||
1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'start' ]
|
||||
2 info using npm@2.10.1
|
||||
3 info using node@v0.12.4
|
||||
4 verbose run-script [ 'prestart', 'start', 'poststart' ]
|
||||
5 info prestart myapp@0.0.0
|
||||
6 info start myapp@0.0.0
|
||||
7 verbose unsafe-perm in lifecycle true
|
||||
8 info myapp@0.0.0 Failed to exec start script
|
||||
9 verbose stack Error: myapp@0.0.0 start: `node ./bin/www && node ./mongoui/mongoui-master/index.js`
|
||||
9 verbose stack Exit status 1
|
||||
9 verbose stack at EventEmitter.<anonymous> (/usr/local/lib/node_modules/npm/lib/utils/lifecycle.js:213:16)
|
||||
9 verbose stack at EventEmitter.emit (events.js:110:17)
|
||||
9 verbose stack at ChildProcess.<anonymous> (/usr/local/lib/node_modules/npm/lib/utils/spawn.js:24:14)
|
||||
9 verbose stack at ChildProcess.emit (events.js:110:17)
|
||||
9 verbose stack at maybeClose (child_process.js:1015:16)
|
||||
9 verbose stack at Process.ChildProcess._handle.onexit (child_process.js:1087:5)
|
||||
10 verbose pkgid myapp@0.0.0
|
||||
11 verbose cwd /home/mitchell/Desktop/myapp
|
||||
12 error Linux 3.13.0-55-generic
|
||||
13 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "start"
|
||||
14 error node v0.12.4
|
||||
15 error npm v2.10.1
|
||||
16 error code ELIFECYCLE
|
||||
17 error myapp@0.0.0 start: `node ./bin/www && node ./mongoui/mongoui-master/index.js`
|
||||
17 error Exit status 1
|
||||
18 error Failed at the myapp@0.0.0 start script 'node ./bin/www && node ./mongoui/mongoui-master/index.js'.
|
||||
18 error This is most likely a problem with the myapp package,
|
||||
18 error not with npm itself.
|
||||
18 error Tell the author that this fails on your system:
|
||||
18 error node ./bin/www && node ./mongoui/mongoui-master/index.js
|
||||
18 error You can get their info via:
|
||||
18 error npm owner ls myapp
|
||||
18 error There is likely additional logging output above.
|
||||
19 verbose exit [ 1, true ]
|
||||
@@ -3,7 +3,7 @@
|
||||
"version": "0.0.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"start": "node ./bin/www && node ./mongoui/mongoui-master/index.js"
|
||||
"start": "node ./bin/www"
|
||||
},
|
||||
"dependencies": {
|
||||
"body-parser": "~1.12.4",
|
||||
|
||||
123
routes/index.js
123
routes/index.js
@@ -1,47 +1,104 @@
|
||||
var express = require('express');
|
||||
var router = express.Router();
|
||||
var mongoose = require('mongoose');
|
||||
require('../models/information');
|
||||
var info = mongoose.model('info');
|
||||
require('../models/currentdata');
|
||||
var info = mongoose.model('currentdata');
|
||||
|
||||
/* GET home page. */
|
||||
router.get('/', function(req, res, next) {
|
||||
var getString = req.param("test");
|
||||
var find = {number : "555-555-5555"};
|
||||
res.render('index', {findParams : find});
|
||||
});
|
||||
|
||||
router.post('/information', function(req, res,next) {
|
||||
var number = req.param("number");
|
||||
var date = req.param("date");
|
||||
var time = req.param("time");
|
||||
var message = req.param("message");
|
||||
|
||||
var entry = new info({
|
||||
number: number,
|
||||
date: date,
|
||||
time: time,
|
||||
message: message
|
||||
});
|
||||
|
||||
entry.save(function(err, entry) {
|
||||
if(err) return console.error(err);
|
||||
console.dir(entry);
|
||||
});
|
||||
|
||||
console.log(entry);
|
||||
res.render('index');
|
||||
});
|
||||
|
||||
router.post('/', function(req, res,next) {
|
||||
|
||||
//check to see which form is being submitted
|
||||
var checkPage = req.body.searchNumber;
|
||||
|
||||
//if searching for number
|
||||
if (typeof checkPage != 'undefined'){
|
||||
|
||||
var searchNumber = req.param("searchNumber");
|
||||
|
||||
var query = info.find({'number' : searchNumber});
|
||||
|
||||
query.select("number date time message updated");
|
||||
|
||||
query.exec(function (err, callback) {
|
||||
if (err) return handleError(err);
|
||||
else {
|
||||
console.log(callback);
|
||||
res.render('index', {findParams : callback});
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
//if submitting records
|
||||
else {
|
||||
|
||||
var number = req.body.number;
|
||||
var date = new Date(req.body.date);
|
||||
var time = req.body.time;
|
||||
var message = req.body.message;
|
||||
var carrier = req.body.carrier;
|
||||
console.log("------------------------------" + carrier);
|
||||
number = number.replace("-", "");
|
||||
number = number.replace("-", "");
|
||||
number = number.concat(carrier);
|
||||
|
||||
date.setHours(get24Hours(time));
|
||||
date.setMinutes(getMinutes(time));
|
||||
console.log("------------------ " + number);
|
||||
|
||||
var entry = new info({
|
||||
number: number,
|
||||
date: date,
|
||||
time: time,
|
||||
message: message
|
||||
});
|
||||
|
||||
entry.save(function(err, entry) {
|
||||
if(err) return console.error(err);
|
||||
console.dir(entry);
|
||||
});
|
||||
|
||||
console.log(entry);
|
||||
res.render('index');
|
||||
}
|
||||
});
|
||||
|
||||
router.post('/search', function(req, res, next) {
|
||||
var searchNumber = req.param("searchNumber");
|
||||
|
||||
info.findOne({'number' : searchNumber}, "number date time message updated", function(err, seach) {
|
||||
if (err) return handleError(err);
|
||||
});
|
||||
|
||||
res.render('index', {findParams : search});
|
||||
|
||||
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
|
||||
|
||||
function get24Hours(time){
|
||||
var getAMPM = time.substring((time.length - 2), time.length);
|
||||
var getHours = parseInt(time.substring(0,2));
|
||||
|
||||
//if time is in the am and greater than 12:00am
|
||||
if (getAMPM == 'am' && getHours < 12){
|
||||
return (parseInt(time.substring(0,time.indexOf(':'))));
|
||||
}
|
||||
//if time is between 12:00am and 1:00am
|
||||
else if (getAMPM == 'am' && getHours == 12){
|
||||
return 0;
|
||||
}
|
||||
//return hours greater than 12
|
||||
else if (getAMPM == 'pm' && getHours < 12) {
|
||||
return (parseInt(time.substring(0,time.indexOf(':'))) + 12);
|
||||
}
|
||||
//return hour if noon
|
||||
if (getAMPM == 'pm' && getHours == 12) {
|
||||
return 12;
|
||||
}
|
||||
}
|
||||
|
||||
function getMinutes(time){
|
||||
var minutes = parseInt(time.substring(time.indexOf(':') + 1, time.length -2));
|
||||
return minutes;
|
||||
}
|
||||
@@ -9,27 +9,31 @@ block content
|
||||
div.row
|
||||
div.col-lg-4
|
||||
h1 Submit Form
|
||||
form(action="/information", method="post")
|
||||
form(action="/", method="post")
|
||||
div.form-group
|
||||
Span Phone Number:
|
||||
br
|
||||
input.form-control(type="text", name="number", placeholder="555-555-5555")
|
||||
br
|
||||
Span Carrier:
|
||||
select.form-control(name="carrier")
|
||||
option(value="@vtext.com") Verizon
|
||||
br
|
||||
Span Date:
|
||||
br
|
||||
input.form-control(type="text", name="date", id="datepicker" placeholder="mm/dd/yy")
|
||||
input.form-control(type="text", name="date", id="datepicker" placeholder="YYYY-MM-DD")
|
||||
br
|
||||
Span Time:
|
||||
br
|
||||
input.form-control(type="text", name="time", id="timepicker" placeholder="12:00 am")
|
||||
input.form-control(type="text", name="time", id="timepicker" placeholder="12:00am")
|
||||
br
|
||||
Span Message:
|
||||
input.form-control(type="textarea", name="message")
|
||||
input.form-control(type="textarea", name="message", placeholder="Type your message here...")
|
||||
br
|
||||
input(type="submit", value="submit").btn
|
||||
div.col-lg-4
|
||||
h1 Search by number
|
||||
form(action="/search", method="post")
|
||||
form(action="/", method="post")
|
||||
div.form-group
|
||||
Span Phone Number:
|
||||
br
|
||||
@@ -37,7 +41,20 @@ block content
|
||||
br
|
||||
input(type="submit", value="submit").btn
|
||||
br
|
||||
ul
|
||||
each val, index in findParams
|
||||
li= index + " " + val
|
||||
br
|
||||
if (findParams != null)
|
||||
div.col-lg-4
|
||||
each index in findParams
|
||||
-var date = new Date(index.date);
|
||||
|
||||
Span= index.number
|
||||
br
|
||||
Span= date
|
||||
br
|
||||
Span= index.time
|
||||
br
|
||||
Span= index.message
|
||||
br
|
||||
Span= index.updated
|
||||
br
|
||||
br
|
||||
|
||||
Reference in New Issue
Block a user