diff --git a/app/js/appv2.js b/app/js/appv2.js index 04c1e21..85892bf 100644 --- a/app/js/appv2.js +++ b/app/js/appv2.js @@ -9,7 +9,7 @@ var SOController = (function() { var path; var wsUrl; - var local = true; + var local = false; var bus = {}; var prevDate; var prevTime; @@ -36,8 +36,10 @@ var SOController = (function() { } else { console.log('Using remote urls'); - wsUrl = 'ws://ec2-52-50-147-81.eu-west-1.compute.amazonaws.com:8080'; - path = 'http://ec2-52-50-147-81.eu-west-1.compute.amazonaws.com/'; + /*wsUrl = 'ws://ec2-52-50-147-81.eu-west-1.compute.amazonaws.com:8080'; + path = 'http://ec2-52-50-147-81.eu-west-1.compute.amazonaws.com/';*/ + wsUrl = 'ws://13.80.9.55:8080'; + path = 'http://13.80.9.55/'; } MicroEvent.mixin(bus); diff --git a/package.json b/package.json index eb5edcb..8aefa69 100644 --- a/package.json +++ b/package.json @@ -35,16 +35,16 @@ "elapsed": "0.0.7", "gulp": "^3.9.1", "gulp-autoprefixer": "^3.1.0", - "gulp-cache": "^0.4.2", + "gulp-cache": "^0.4.5", "gulp-concat": "^2.6.0", "gulp-cssmin": "^0.1.7", "gulp-cssnano": "^2.1.2", "gulp-debug": "^2.1.2", "gulp-google-webfonts": "0.0.12", "gulp-html-replace": "^1.5.5", - "gulp-htmlmin": "^1.3.0", + "gulp-htmlmin": "^2.0.0", "gulp-inject": "^4.0.0", - "gulp-jshint": "^2.0.0", + "gulp-jshint": "^2.0.1", "gulp-jsmin": "^0.1.5", "gulp-livereload": "^3.8.1", "gulp-notify": "^2.2.0", @@ -53,7 +53,7 @@ "gulp-strip-debug": "^1.1.0", "gulp-uglify": "^1.5.3", "jshint": "^2.9.2", - "jsonfile": "^2.3.0", + "jsonfile": "^2.3.1", "log4js": "^0.6.36", "mocha": "^2.4.5", "mqtt-ws": "^0.2.0",