diff --git a/IoT-Dashboard/Gruntfile.js b/IoT-Dashboard/Gruntfile.js index f84a0b6..6ddb753 100644 --- a/IoT-Dashboard/Gruntfile.js +++ b/IoT-Dashboard/Gruntfile.js @@ -412,7 +412,6 @@ module.exports = function (grunt) { grunt.task.run([ 'replace:development', 'clean:server', - //'wiredep', 'concurrent:server', 'autoprefixer', 'connect:livereload', @@ -438,7 +437,6 @@ module.exports = function (grunt) { grunt.registerTask('build', [ 'replace:production', 'clean:dist', - 'wiredep', 'useminPrepare', 'concurrent:dist', 'autoprefixer', diff --git a/IoT-Dashboard/app/scripts/services/connected_car_service.js b/IoT-Dashboard/app/scripts/services/connected_car_service.js index 44939f4..f0344dc 100644 --- a/IoT-Dashboard/app/scripts/services/connected_car_service.js +++ b/IoT-Dashboard/app/scripts/services/connected_car_service.js @@ -25,7 +25,7 @@ angular.module('iotDashboard') function hitConnectedCarEndpoint() { if (!(vin in journeys)) { console.log("3"); - $http({method: 'GET', url: configuration.baseUrl + '/journeyss/' + vin}). + $http({method: 'GET', url: configuration.baseUrl + '/journeyses/' + vin}). success(function (data) { var curJourneys = []; var journeyId = 0; @@ -110,7 +110,7 @@ angular.module('iotDashboard') } function startPolling() { - $http({method: 'GET', url: configuration.baseUrl + '/journeyss/' + vin}). + $http({method: 'GET', url: configuration.baseUrl + '/journeyses/' + vin}). success(function (data) { var curJourneys = []; var journeyId = 0; diff --git a/README.md b/README.md index e6e614c..b2b0a6a 100644 --- a/README.md +++ b/README.md @@ -104,11 +104,20 @@ There are two main pieces needed to build this project from source: 2. Everything else ### Building the dashboard + The HTML/AngularJS based dashboard was originally created via a Yeoman generator and -therefore uses it's standard stack to perform builds. To be able to perform a build of -the dashboard's static assets (JavaScript, HTML, etc), you'll need -[Grunt](http://gruntjs.com/). With Grunt installed, you can build the dashboard via the -following from the root of the IoT-Dashboard module: +therefore uses it's standard stack to perform builds. Given +the rate of change with these tools, we can only assure that the build works on the +following versions at the time of the writing of this document: + +* node - v0.10.31 +* npm - 1.4.24 +* grunt - v0.4.5 +* bower - 1.4.1 + +The best place to get the build setup is via the Yeoman website (referenced in the +dashboard's documentation). With the various build tools installed installed, you can +build the dashboard via the following from the root of the IoT-Dashboard module: ``` $ grunt clean build