Skip to content

Commit

Permalink
Added various javascript fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mminella committed Aug 17, 2015
1 parent 2138b15 commit 58c651c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
2 changes: 0 additions & 2 deletions IoT-Dashboard/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,6 @@ module.exports = function (grunt) {
grunt.task.run([
'replace:development',
'clean:server',
//'wiredep',
'concurrent:server',
'autoprefixer',
'connect:livereload',
Expand All @@ -438,7 +437,6 @@ module.exports = function (grunt) {
grunt.registerTask('build', [
'replace:production',
'clean:dist',
'wiredep',
'useminPrepare',
'concurrent:dist',
'autoprefixer',
Expand Down
4 changes: 2 additions & 2 deletions IoT-Dashboard/app/scripts/services/connected_car_service.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
17 changes: 13 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 58c651c

Please sign in to comment.