From c63345dac56150ebdbd3f6b5ef327a4e789f89b6 Mon Sep 17 00:00:00 2001
From: Johannes Harms <johannes.harms@inso.tuwien.ac.at>
Date: Sat, 10 Oct 2015 21:54:07 +0200
Subject: [PATCH] Upgrades package versions and fixes installation errors. *
 Uses Express 4 * Uses backbone 1.1.0 because 1.1.1 breaks AMD compatibility,
 compare
 https://github.com/marionettejs/backbone.marionette/issues/1249#issuecomment-41739400
 * Fixes paths to d3.js in the gruntfile

---
 Gruntfile.js |  4 ++--
 app.js       | 66 +++++++++++++++++++++++++++-------------------------
 bower.json   |  1 +
 package.json | 19 ++++++++-------
 4 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index c9feb38..a86578a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -42,8 +42,8 @@ module.exports = function(grunt) {
           { src: 'bower_components/bootstrap/docs/assets/js/bootstrap.js', dest: 'public/js/vendor/bootstrap.js' },
           { src: 'bower_components/d3/d3.js', dest: 'public/js/vendor/d3.js' },
           { src: 'bower_components/jquery/jquery.js', dest: 'public/js/vendor/jquery.js' },
-          { src: 'bower_components/nvd3/nv.d3.js', dest: 'public/js/vendor/nv.d3.js' },
-          { src: 'bower_components/nvd3/nv.d3.css', dest: 'public/css/vendor/nv.d3.css' },
+          { src: 'bower_components/nvd3/build/nv.d3.js', dest: 'public/js/vendor/nv.d3.js' },
+          { src: 'bower_components/nvd3/build/nv.d3.css', dest: 'public/css/vendor/nv.d3.css' },
           { src: 'bower_components/react/react.js', dest: 'public/js/vendor/react.js' },
           { src: 'bower_components/requirejs/require.js', dest: 'public/js/vendor/require.js' },
           { src: 'bower_components/requirejs-tpl/tpl.js', dest: 'public/js/vendor/tpl.js' },
diff --git a/app.js b/app.js
index a39e994..bbf1919 100644
--- a/app.js
+++ b/app.js
@@ -1,5 +1,8 @@
 var _ = require('lodash'),
     express = require('express'),
+    errorHandler = require('errorhandler'),
+    logger = require('morgan'),
+    methodOverride = require('method-override'),
     home = require('./routes/home'),
     http = require('http'),
     path = require('path'),
@@ -9,42 +12,41 @@ var _ = require('lodash'),
 
 var app = express();
 
-app.configure(function() {
-  var port = parseInt(process.env.PORT || 3000, 10);
-  
-  app.set('port', port);
-  app.set('views', __dirname + '/views');
-  app.set('view engine', 'html');
-  app.engine('html', engine);
-  
-  app.use(express.favicon());
-  app.use(express.logger('dev'));
-  app.use(express.methodOverride());
-  app.use(app.router);
-  app.use(express.static(path.join(__dirname, 'public')));
-  
-  var proxy = httpProxy.createProxyServer();
-  
-  // Example ledger .dat file from the appendix of the Ledger 3 manual
-  var ledgerRest = new LedgerRest({ file: path.join(__dirname, 'example/example.dat') });
-  
-  ledgerRest.listen(port + 1, function() {
-    console.log('Ledger REST server listening on port ' + port + 1);
-  });
-  
-  // Proxy API requests to the ledger REST service
-  app.use('/api', function (req, res) {
-    proxy.web(req, res, { target: {
-      host: 'localhost',
-      port: port + 1
-    }});
-  });
+
+var port = parseInt(process.env.PORT || 3000, 10);
+
+app.set('port', port);
+app.set('views', __dirname + '/views');
+app.set('view engine', 'html');
+app.engine('html', engine);
+
+app.use(logger('dev'));
+app.use(methodOverride());
+app.use(express.static(path.join(__dirname, 'public')));
+
+var proxy = httpProxy.createProxyServer();
+
+// Example ledger .dat file from the appendix of the Ledger 3 manual
+var ledgerRest = new LedgerRest({ file: path.join(__dirname, 'example/example.dat') });
+
+ledgerRest.listen(port + 1, function() {
+console.log('Ledger REST server listening on port ' + port + 1);
 });
 
-app.configure('development', function(){
-  app.use(express.errorHandler());
+// Proxy API requests to the ledger REST service
+app.use('/api', function (req, res) {
+proxy.web(req, res, { target: {
+  host: 'localhost',
+  port: port + 1
+}});
 });
 
+
+if(process.env.NODE_ENV == 'development') {
+  app.use(errorHandler());
+}
+
+
 var routes = [
   '/',
   '/income', '/income/*',
diff --git a/bower.json b/bower.json
index 5761842..ab376bc 100644
--- a/bower.json
+++ b/bower.json
@@ -5,6 +5,7 @@
     "bootstrap": "~2.3.2",
     "modernizr": "~2.7.1",
     "jquery": "~2.0.3",
+    "backbone": "1.1.0",
     "backbone.marionette": "~1.4.1",
     "handlebars": "~1.2.1",
     "nvd3": "git://github.com/novus/nvd3",
diff --git a/package.json b/package.json
index dbe7797..1516630 100644
--- a/package.json
+++ b/package.json
@@ -23,18 +23,21 @@
   },
   "devDependencies": {
     "grunt": "~0.4.2",
-    "grunt-contrib-copy": "~0.5.0",
-    "grunt-contrib-jshint": "~0.8.0",
+    "grunt-contrib-copy": "~0.8.1",
+    "grunt-contrib-jshint": "~0.11.3",
     "grunt-contrib-requirejs": "~0.4.1",
-    "grunt-contrib-watch": "~0.5.3",
-    "grunt-react": "~0.6.0",
-    "grunt-recess": "~0.5.0"
+    "grunt-contrib-watch": "~0.6.1",
+    "grunt-react": "~0.12.3",
+    "grunt-recess": "~1.0.1"
   },
   "dependencies": {
-    "express": "~3.4.8",
     "ejs-locals": "~1.0.2",
-    "http-proxy": "~1.0.2",
+    "errorhandler": "^1.4.2",
+    "express": "~4.13.3",
+    "http-proxy": "~1.11.2",
     "ledger-rest": "0.1.0",
-    "lodash": "~2.4.1"
+    "lodash": "~3.10.1",
+    "method-override": "^2.3.5",
+    "morgan": "^1.6.1"
   }
 }