Web Introduced

app.js

@@ -3,9 +3,22 @@
  * Module dependencies.
  */
 
+// built-in modules
 var express = require('express');
+var bodyParser = require('body-parser');
+var favicon = require('serve-favicon');
+var compression = require('compression');
+var methodOverride = require('method-override');
+var serveStatic = require('serve-static');
+var cookieParser = require('cookie-parser');
+var session = require('express-session');
+var csrf = require('csurf');
+var errorhandler = require('errorhandler');
+var morgan  = require('morgan');
+
+
 var routes = require('./routes');
-//var user = require('./routes/user');
+var routesProbes = require('./routes/probes');
 //var webApp = require('./routes/app');
 var http = require('http');
 var path = require('path');
@@ -16,39 +29,38 @@ var app = express();
 app.set('port', process.env.PORT || 3000);
 app.set('views', __dirname + '/views');
 app.set('view engine', 'jade');
-app.use(express.favicon());
-app.use(express.logger('dev'));
-app.use(express.compress());
-app.use(express.methodOverride());
-app.use(express.bodyParser({uploadDir: '/tmp'}));
-app.use(express.limit('32mb'));
-app.use(express.static(path.join(__dirname, 'public')));
+//app.use(favicon(__dirname + '/public/img/favicon.ico'));
+morgan({ format: 'dev', immediate: true }); // ex. logger
+app.use(compression());
+app.use(methodOverride('X-HTTP-Method-Override'));
+app.use(bodyParser.urlencoded({ extended: false }));
+//app.use(express.limit('32mb'));
+app.use(serveStatic(path.join(__dirname, 'public')));
 
 
 // session support
-app.use(express.cookieParser());
-app.use(express.session({
-  secret: 'HjN8*&&ahj[::9io'
-}));
+app.use(cookieParser('KuukL9*#85zR$!qW'));
+app.use(session({secret: 'HjN8*&&ahj[::9io'}));
 
 // CSRF protection middleware
-app.use(express.csrf());
-app.configure(function() {
+app.use(csrf());
+/*app.configure(function() {
 	app.use(function(req, res, next) {
 		res.locals.token = req.csrfToken();
 		next();
 	});
-});
+}); //*/
 
 // development only
-if ('development' == app.get('env')) {
-  app.use(express.errorHandler());
+if (process.env.NODE_ENV === 'development') {
+  app.use(errorhandler());
 }
 
 
-app.use(app.router);
+app.use(express.Router());
 
 app.get('/', routes.index);
+app.get('/probes', routesProbes.list);
 //app.get('/app/new', webApp.startOrder);
 //app.post('/app/step1Process', webApp.step1Process);
 //app.get('/app/step2Prepare', webApp.step2Prepare);

lib/Dao.js

@@ -1,6 +1,11 @@
 /**
  * DAO
- */ var sqlite3 = require('sqlite3').verbose(); var db = new sqlite3.Database('/opt/reefmonitor/db/reefmonitor.db'); var Probe = require("./Probe")(); 
+ */
+
+var sqlite3 = require('sqlite3').verbose(); 
+var db = new sqlite3.Database('/opt/reefmonitor/db/reefmonitor.db'); 
+var Probe = require("./Probe")(); 
+
 module.exports = function() {
 	function Dao() {
 	};

package.json

@@ -6,7 +6,22 @@
     "start": "node app.js"
   },
   "dependencies": {
-	  "express": "3.x",
-	  "jade": "*"
+	  "express": "4.6.1",
+	  "body-parser": "1.0.2",
+	  "jade": "1.4.2",
+	  "serve-favicon": "2.0.1",
+	  "compression": "1.0.8",
+	  "method-override": "2.1.1",
+	  "serve-static": "1.3.2",
+	  "cookie-parser": "1.3.2",
+	  "express-session": "1.6.5",
+	  "csurf": "1.3.0",
+	  "errorhandler": "1.1.1",
+	  "morgan": "1.1.1",
+	  "sqlite3": "2.2.3",
+	  "serialport": "1.4.0",
+	  "rpi-gpio": "0.0.4",
+	  "async": "0.8.0",
+	  "nodemon": "1.2.0"
   }
 }

routes/index.js

@@ -1,4 +1,3 @@
-
 /*
  * GET home page.
  */