From cc24ae901a53a923d00ad9053ca5d9ae032152e0 Mon Sep 17 00:00:00 2001
From: user1 <user1@localhost.localdomain>
Date: Tue, 22 Nov 2016 16:29:20 +0100
Subject: [PATCH 1/2] Corrected loaders

---
 web/vue/package.json          |  2 +-
 web/vue/src/layout/footer.vue |  4 ++--
 web/vue/webpack.config.js     | 10 +++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/web/vue/package.json b/web/vue/package.json
index 5a00fa7ad..1fa705e23 100644
--- a/web/vue/package.json
+++ b/web/vue/package.json
@@ -7,7 +7,6 @@
     "dev": "cross-env NODE_ENV=development webpack-dev-server --open --inline --hot",
     "build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
   },
-  "dependencies": {},
   "devDependencies": {
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
@@ -21,6 +20,7 @@
     "superagent-no-cache": "uditalias/superagent-no-cache",
     "vue": "^2.0.1",
     "vue-loader": "^9.7.0",
+    "vue-router": "^2.0.3",
     "webpack": "^2.1.0-beta.25",
     "webpack-dev-server": "^2.1.0-beta.0"
   }
diff --git a/web/vue/src/layout/footer.vue b/web/vue/src/layout/footer.vue
index 2acaa8883..e1474f88d 100644
--- a/web/vue/src/layout/footer.vue
+++ b/web/vue/src/layout/footer.vue
@@ -7,8 +7,8 @@
 </template>
 
 <script>
-const gekkoPackage = require('json!../../../../package.json');
-const uiPackage = require('json!../../package.json');
+const gekkoPackage = require('../../../../package.json');
+const uiPackage = require('../../package.json');
 
 export default {
   data: () => {
diff --git a/web/vue/webpack.config.js b/web/vue/webpack.config.js
index d9e389950..e049641ba 100644
--- a/web/vue/webpack.config.js
+++ b/web/vue/webpack.config.js
@@ -14,22 +14,26 @@ module.exports = {
     rules: [
       {
         test: /\.vue$/,
-        loader: 'vue',
+        loader: 'vue-loader',
         options: {
           // vue-loader options go here
         }
       },
       {
         test: /\.js$/,
-        loader: 'babel',
+        loader: 'babel-loader',
         exclude: /node_modules/
       },
       {
         test: /\.(png|jpg|gif|svg)$/,
-        loader: 'file',
+        loader: 'file-loader',
         options: {
           name: '[name].[ext]?[hash]'
         }
+      },
+      {
+        test: /\.json$/,
+        loader: 'json-loader'
       }
     ]
   },

From 3c203701c9564e918b028d44eb79df5f66c9355e Mon Sep 17 00:00:00 2001
From: mattbrun <me@matteobrunati.net>
Date: Tue, 22 Nov 2016 16:31:53 +0100
Subject: [PATCH 2/2] Corrected typo

---
 web/vue/src/backtester/backtestConfigBuilder.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/vue/src/backtester/backtestConfigBuilder.vue b/web/vue/src/backtester/backtestConfigBuilder.vue
index ce5e35d9f..125906568 100644
--- a/web/vue/src/backtester/backtestConfigBuilder.vue
+++ b/web/vue/src/backtester/backtestConfigBuilder.vue
@@ -7,7 +7,7 @@
 
 <script>
 
-import datasetPicker from '../global/configbuilder/datasetPicker.vue'
+import datasetPicker from '../global/configbuilder/datasetpicker.vue'
 import stratPicker from '../global/configbuilder/stratpicker.vue'
 import _ from 'lodash'