From 0fac52b2c3a07a5f84631c0a1c8c2bf509ba4adc Mon Sep 17 00:00:00 2001 From: jettro Date: Tue, 23 Dec 2014 15:24:12 +0100 Subject: [PATCH] moved the js files to make it easier to create a deployment --- Gruntfile.js | 44 ++++++++++++++++--- {js => javascript}/app.js | 0 {js => javascript}/c3js-directive.js | 0 .../controllers/AggregateDialogCtrl.js | 0 .../controllers/ConfigDialogCtrl.js | 0 .../controllers/CreateSnapshotCtrl.js | 0 .../CreateSnapshotRepositoryCtrl.js | 0 .../controllers/DashboardCtrl.js | 0 {js => javascript}/controllers/GraphCtrl.js | 0 {js => javascript}/controllers/NavbarCtrl.js | 0 .../controllers/NodeInfoCtrl.js | 0 .../controllers/NotificationCtrl.js | 0 {js => javascript}/controllers/QueryCtrl.js | 0 {js => javascript}/controllers/SearchCtrl.js | 0 .../controllers/SnapshotsCtrl.js | 0 .../controllers/SuggestionsCtrl.js | 0 .../controllers/WhereShardsCtrl.js | 0 {js => javascript}/directives.js | 0 {js => javascript}/filters.js | 0 .../services/AggregateBuilderService.js | 0 .../services/ConfigurationService.js | 0 {js => javascript}/services/ElasticService.js | 0 .../services/ErrorHandlingService.js | 0 .../services/QueryStorageService.js | 0 .../services/ServerConfigService.js | 0 package.json | 3 +- 26 files changed, 40 insertions(+), 7 deletions(-) rename {js => javascript}/app.js (100%) rename {js => javascript}/c3js-directive.js (100%) rename {js => javascript}/controllers/AggregateDialogCtrl.js (100%) rename {js => javascript}/controllers/ConfigDialogCtrl.js (100%) rename {js => javascript}/controllers/CreateSnapshotCtrl.js (100%) rename {js => javascript}/controllers/CreateSnapshotRepositoryCtrl.js (100%) rename {js => javascript}/controllers/DashboardCtrl.js (100%) rename {js => javascript}/controllers/GraphCtrl.js (100%) rename {js => javascript}/controllers/NavbarCtrl.js (100%) rename {js => javascript}/controllers/NodeInfoCtrl.js (100%) rename {js => javascript}/controllers/NotificationCtrl.js (100%) rename {js => javascript}/controllers/QueryCtrl.js (100%) rename {js => javascript}/controllers/SearchCtrl.js (100%) rename {js => javascript}/controllers/SnapshotsCtrl.js (100%) rename {js => javascript}/controllers/SuggestionsCtrl.js (100%) rename {js => javascript}/controllers/WhereShardsCtrl.js (100%) rename {js => javascript}/directives.js (100%) rename {js => javascript}/filters.js (100%) rename {js => javascript}/services/AggregateBuilderService.js (100%) rename {js => javascript}/services/ConfigurationService.js (100%) rename {js => javascript}/services/ElasticService.js (100%) rename {js => javascript}/services/ErrorHandlingService.js (100%) rename {js => javascript}/services/QueryStorageService.js (100%) rename {js => javascript}/services/ServerConfigService.js (100%) diff --git a/Gruntfile.js b/Gruntfile.js index 68a5d60..185096a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -32,8 +32,12 @@ module.exports = function (grunt) { 'bower_components/d3/d3.js', 'bower_components/c3/c3.js', 'bower_components/moment/moment.js', - 'js/c3js-directive.js', - 'js/app.js','js/controllers/*','js/directives.js','js/filters.js','js/services/*' + 'javascript/c3js-directive.js', + 'javascript/app.js', + 'javascript/controllers/*', + 'javascript/directives.js', + 'javascript/filters.js', + 'javascript/services/*' ], dest: 'assets/js/<%= pkg.name %>.js' } @@ -45,9 +49,9 @@ module.exports = function (grunt) { }, all: [ 'Gruntfile.js', - 'js/controllers/*', - 'js/services/*', - 'js/*.js' + 'javascript/controllers/*', + 'javascript/services/*', + 'javascript/*.js' ] }, uglify: { @@ -69,11 +73,38 @@ module.exports = function (grunt) { style: 'compressed' }, files: { - // 'assets/vendor/bootstrap.min.css': 'src/scss/bootstrap/bootstrap.scss', 'assets/css/app.min.css': 'sass/style.scss' } } + }, + rsync: { + options: { + src: "./", + args: ["--verbose"], + exclude: ['.git*', + '.idea', + '.sass-cache', + 'bower_components', + 'node_modules', + 'sass', + '.jshintrc', + 'bower.json', + '*.iml', + 'Gruntfile.js', + 'package.json', + '.DS_Store', + 'README.md' + ], + recursive: true, + syncDestIgnoreExcl: true + }, + staging: { + options: { + dest: "/Users/jettrocoenradie/temp/gridshoregui" + } + } } + }); grunt.loadNpmTasks('grunt-contrib-concat'); @@ -81,6 +112,7 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-sass'); + grunt.loadNpmTasks('grunt-rsync'); grunt.registerTask('combine',['concat:dist','uglify:dist']); }; \ No newline at end of file diff --git a/js/app.js b/javascript/app.js similarity index 100% rename from js/app.js rename to javascript/app.js diff --git a/js/c3js-directive.js b/javascript/c3js-directive.js similarity index 100% rename from js/c3js-directive.js rename to javascript/c3js-directive.js diff --git a/js/controllers/AggregateDialogCtrl.js b/javascript/controllers/AggregateDialogCtrl.js similarity index 100% rename from js/controllers/AggregateDialogCtrl.js rename to javascript/controllers/AggregateDialogCtrl.js diff --git a/js/controllers/ConfigDialogCtrl.js b/javascript/controllers/ConfigDialogCtrl.js similarity index 100% rename from js/controllers/ConfigDialogCtrl.js rename to javascript/controllers/ConfigDialogCtrl.js diff --git a/js/controllers/CreateSnapshotCtrl.js b/javascript/controllers/CreateSnapshotCtrl.js similarity index 100% rename from js/controllers/CreateSnapshotCtrl.js rename to javascript/controllers/CreateSnapshotCtrl.js diff --git a/js/controllers/CreateSnapshotRepositoryCtrl.js b/javascript/controllers/CreateSnapshotRepositoryCtrl.js similarity index 100% rename from js/controllers/CreateSnapshotRepositoryCtrl.js rename to javascript/controllers/CreateSnapshotRepositoryCtrl.js diff --git a/js/controllers/DashboardCtrl.js b/javascript/controllers/DashboardCtrl.js similarity index 100% rename from js/controllers/DashboardCtrl.js rename to javascript/controllers/DashboardCtrl.js diff --git a/js/controllers/GraphCtrl.js b/javascript/controllers/GraphCtrl.js similarity index 100% rename from js/controllers/GraphCtrl.js rename to javascript/controllers/GraphCtrl.js diff --git a/js/controllers/NavbarCtrl.js b/javascript/controllers/NavbarCtrl.js similarity index 100% rename from js/controllers/NavbarCtrl.js rename to javascript/controllers/NavbarCtrl.js diff --git a/js/controllers/NodeInfoCtrl.js b/javascript/controllers/NodeInfoCtrl.js similarity index 100% rename from js/controllers/NodeInfoCtrl.js rename to javascript/controllers/NodeInfoCtrl.js diff --git a/js/controllers/NotificationCtrl.js b/javascript/controllers/NotificationCtrl.js similarity index 100% rename from js/controllers/NotificationCtrl.js rename to javascript/controllers/NotificationCtrl.js diff --git a/js/controllers/QueryCtrl.js b/javascript/controllers/QueryCtrl.js similarity index 100% rename from js/controllers/QueryCtrl.js rename to javascript/controllers/QueryCtrl.js diff --git a/js/controllers/SearchCtrl.js b/javascript/controllers/SearchCtrl.js similarity index 100% rename from js/controllers/SearchCtrl.js rename to javascript/controllers/SearchCtrl.js diff --git a/js/controllers/SnapshotsCtrl.js b/javascript/controllers/SnapshotsCtrl.js similarity index 100% rename from js/controllers/SnapshotsCtrl.js rename to javascript/controllers/SnapshotsCtrl.js diff --git a/js/controllers/SuggestionsCtrl.js b/javascript/controllers/SuggestionsCtrl.js similarity index 100% rename from js/controllers/SuggestionsCtrl.js rename to javascript/controllers/SuggestionsCtrl.js diff --git a/js/controllers/WhereShardsCtrl.js b/javascript/controllers/WhereShardsCtrl.js similarity index 100% rename from js/controllers/WhereShardsCtrl.js rename to javascript/controllers/WhereShardsCtrl.js diff --git a/js/directives.js b/javascript/directives.js similarity index 100% rename from js/directives.js rename to javascript/directives.js diff --git a/js/filters.js b/javascript/filters.js similarity index 100% rename from js/filters.js rename to javascript/filters.js diff --git a/js/services/AggregateBuilderService.js b/javascript/services/AggregateBuilderService.js similarity index 100% rename from js/services/AggregateBuilderService.js rename to javascript/services/AggregateBuilderService.js diff --git a/js/services/ConfigurationService.js b/javascript/services/ConfigurationService.js similarity index 100% rename from js/services/ConfigurationService.js rename to javascript/services/ConfigurationService.js diff --git a/js/services/ElasticService.js b/javascript/services/ElasticService.js similarity index 100% rename from js/services/ElasticService.js rename to javascript/services/ElasticService.js diff --git a/js/services/ErrorHandlingService.js b/javascript/services/ErrorHandlingService.js similarity index 100% rename from js/services/ErrorHandlingService.js rename to javascript/services/ErrorHandlingService.js diff --git a/js/services/QueryStorageService.js b/javascript/services/QueryStorageService.js similarity index 100% rename from js/services/QueryStorageService.js rename to javascript/services/QueryStorageService.js diff --git a/js/services/ServerConfigService.js b/javascript/services/ServerConfigService.js similarity index 100% rename from js/services/ServerConfigService.js rename to javascript/services/ServerConfigService.js diff --git a/package.json b/package.json index 141e9d7..542d14c 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "grunt-contrib-jshint": "~0.10.0", "grunt-contrib-uglify": "~0.5.0", "grunt-contrib-watch": "~0.6.1", - "grunt-contrib-sass": "~0.8.1" + "grunt-contrib-sass": "~0.8.1", + "grunt-rsync": "~0.6.2" } }