This commit is contained in:
briandavidjoyner 2017-10-26 00:01:37 -04:00
parent 09c90c2e5d
commit 2430900fc7
3 changed files with 40 additions and 7 deletions

25
package-lock.json generated
View File

@ -23,6 +23,14 @@
"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
"integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
},
"basic-auth": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.0.tgz",
"integrity": "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=",
"requires": {
"safe-buffer": "5.1.1"
}
},
"body-parser": {
"version": "1.18.2",
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
@ -230,6 +238,18 @@
"mime-db": "1.30.0"
}
},
"morgan": {
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz",
"integrity": "sha1-0B+mxlhZt2/PMbPLU6OCGjEdgFE=",
"requires": {
"basic-auth": "2.0.0",
"debug": "2.6.9",
"depd": "1.1.1",
"on-finished": "2.3.0",
"on-headers": "1.0.1"
}
},
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@ -248,6 +268,11 @@
"ee-first": "1.1.1"
}
},
"on-headers": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
"integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c="
},
"parseurl": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",

View File

@ -3,7 +3,9 @@
"version": "1.0.0",
"description": "",
"main": "server.js",
"scripts": {},
"scripts": {
"start": "node server.js"
},
"repository": {
"type": "git",
"url": "git+https://github.com/briandavidjoyner/diapers_new.git"
@ -16,6 +18,7 @@
"homepage": "https://github.com/briandavidjoyner/diapers_new#readme",
"dependencies": {
"express": "^4.16.2",
"morgan": "^1.9.0",
"promise": "^8.0.1"
}
}

View File

@ -1,11 +1,15 @@
//Dependencies
var express = require('express'),
webapp = express(),
Promise = require('promise');
Promise = require('promise'),
morgan = require('morgan');
//OpenShift Settings
var ipaddress = process.env.OPENSHIFT_NODEJS_IP || 'localhost',
port = process.env.OPENSHIFT_NODEJS_PORT || 3000;
var ip = process.env.OPENSHIFT_NODEJS_IP || 'localhost',
var port = process.env.OPENSHIFT_NODEJS_PORT || 3000;
//Reporting
app.use(morgan('combined'));
//External Routing
webapp.get('/', function (req, res, next) {
@ -25,6 +29,7 @@ webapp.get('/', function (req, res, next) {
webapp.use('/public', express.static(__dirname + '/public'));
//Webapp Initialize
webapp.listen(3000, function () {
console.log('started');
});
app.listen(port, ip);
console.log('working');
module.exports = webapp;