moved the js files to make it easier to create a deployment

jettro · Dec 23, 2014 · 0fac52b · 0fac52b
1 parent c05e97e
commit 0fac52b
Show file tree

Hide file tree

Showing 26 changed files with 40 additions and 7 deletions.
diff --git 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,18 +73,46 @@ 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');
     grunt.loadNpmTasks('grunt-contrib-uglify');
     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']);
 };
diff --git a/js/app.js → javascript/app.js b/js/app.js → javascript/app.js
diff --git a/js/c3js-directive.js → javascript/c3js-directive.js b/js/c3js-directive.js → javascript/c3js-directive.js
diff --git a/js/controllers/AggregateDialogCtrl.js → ...script/controllers/AggregateDialogCtrl.js b/js/controllers/AggregateDialogCtrl.js → ...script/controllers/AggregateDialogCtrl.js
diff --git a/js/controllers/ConfigDialogCtrl.js → javascript/controllers/ConfigDialogCtrl.js b/js/controllers/ConfigDialogCtrl.js → javascript/controllers/ConfigDialogCtrl.js
diff --git a/js/controllers/CreateSnapshotCtrl.js → javascript/controllers/CreateSnapshotCtrl.js b/js/controllers/CreateSnapshotCtrl.js → javascript/controllers/CreateSnapshotCtrl.js
diff --git a/...ntrollers/CreateSnapshotRepositoryCtrl.js → ...ntrollers/CreateSnapshotRepositoryCtrl.js b/...ntrollers/CreateSnapshotRepositoryCtrl.js → ...ntrollers/CreateSnapshotRepositoryCtrl.js
diff --git a/js/controllers/DashboardCtrl.js → javascript/controllers/DashboardCtrl.js b/js/controllers/DashboardCtrl.js → javascript/controllers/DashboardCtrl.js
diff --git a/js/controllers/GraphCtrl.js → javascript/controllers/GraphCtrl.js b/js/controllers/GraphCtrl.js → javascript/controllers/GraphCtrl.js
diff --git a/js/controllers/NavbarCtrl.js → javascript/controllers/NavbarCtrl.js b/js/controllers/NavbarCtrl.js → javascript/controllers/NavbarCtrl.js
diff --git a/js/controllers/NodeInfoCtrl.js → javascript/controllers/NodeInfoCtrl.js b/js/controllers/NodeInfoCtrl.js → javascript/controllers/NodeInfoCtrl.js
diff --git a/js/controllers/NotificationCtrl.js → javascript/controllers/NotificationCtrl.js b/js/controllers/NotificationCtrl.js → javascript/controllers/NotificationCtrl.js
diff --git a/js/controllers/QueryCtrl.js → javascript/controllers/QueryCtrl.js b/js/controllers/QueryCtrl.js → javascript/controllers/QueryCtrl.js
diff --git a/js/controllers/SearchCtrl.js → javascript/controllers/SearchCtrl.js b/js/controllers/SearchCtrl.js → javascript/controllers/SearchCtrl.js
diff --git a/js/controllers/SnapshotsCtrl.js → javascript/controllers/SnapshotsCtrl.js b/js/controllers/SnapshotsCtrl.js → javascript/controllers/SnapshotsCtrl.js
diff --git a/js/controllers/SuggestionsCtrl.js → javascript/controllers/SuggestionsCtrl.js b/js/controllers/SuggestionsCtrl.js → javascript/controllers/SuggestionsCtrl.js
diff --git a/js/controllers/WhereShardsCtrl.js → javascript/controllers/WhereShardsCtrl.js b/js/controllers/WhereShardsCtrl.js → javascript/controllers/WhereShardsCtrl.js
diff --git a/js/directives.js → javascript/directives.js b/js/directives.js → javascript/directives.js
diff --git a/js/filters.js → javascript/filters.js b/js/filters.js → javascript/filters.js
diff --git a/js/services/AggregateBuilderService.js → ...cript/services/AggregateBuilderService.js b/js/services/AggregateBuilderService.js → ...cript/services/AggregateBuilderService.js
diff --git a/js/services/ConfigurationService.js → javascript/services/ConfigurationService.js b/js/services/ConfigurationService.js → javascript/services/ConfigurationService.js
diff --git a/js/services/ElasticService.js → javascript/services/ElasticService.js b/js/services/ElasticService.js → javascript/services/ElasticService.js
diff --git a/js/services/ErrorHandlingService.js → javascript/services/ErrorHandlingService.js b/js/services/ErrorHandlingService.js → javascript/services/ErrorHandlingService.js
diff --git a/js/services/QueryStorageService.js → javascript/services/QueryStorageService.js b/js/services/QueryStorageService.js → javascript/services/QueryStorageService.js
diff --git a/js/services/ServerConfigService.js → javascript/services/ServerConfigService.js b/js/services/ServerConfigService.js → javascript/services/ServerConfigService.js
diff --git 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"
   }
 }