diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index d0f0b6f..0000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "directory": "app/bower_components"
-}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 60d3c17..8f60910 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@ node_modules
dist
.tmp
.sass-cache
-app/bower_components
\ No newline at end of file
+app/node_modules
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index ae5d896..83a57cb 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -54,6 +54,7 @@ module.exports = function (grunt) {
'<%= yeoman.app %>/*.html',
'{.tmp,<%= yeoman.app %>}/styles/{,*/}*.css',
'{.tmp,<%= yeoman.app %>}/scripts/**/*.js',
+ 'node_modules/requirejs/require.js',
'<%= yeoman.app %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}',
'<%= yeoman.app %>/scripts/config.json',
'<%= yeoman.app %>/templates/{,*/}*.hbs',
@@ -109,6 +110,7 @@ module.exports = function (grunt) {
return [
lrSnippet,
proxySnippet,
+ mountFolder(connect, '.'),
mountFolder(connect, '.tmp'),
mountFolder(connect, yeomanConfig.app)
];
@@ -200,7 +202,7 @@ module.exports = function (grunt) {
imagesDir: '<%= yeoman.app %>/images',
javascriptsDir: '<%= yeoman.app %>/scripts',
fontsDir: '<%= yeoman.app %>/fonts',
- importPath: '<%= yeoman.app %>/bower_components',
+ importPath: '<%= yeoman.app %>/../node_modules',
httpImagesPath: '/images',
httpGeneratedImagesPath: '/images/generated',
httpFontsPath: '/fonts',
@@ -333,51 +335,53 @@ module.exports = function (grunt) {
files: [
{
expand: true,
- cwd: '<%= yeoman.app %>',
+ cwd: '.',
dest: '<%= yeoman.dist %>',
// If new bower components are installed they have to be added to this list
src: [
- 'bower_components/requirejs/require.js',
- 'bower_components/jquery/jquery.min.js',
- 'bower_components/jquery/jquery.min.map',
- 'bower_components/jquery-ui/ui/minified/jquery-ui.min.js',
- "bower_components/jquery-ui/themes/smoothness/jquery-ui.min.css",
- 'bower_components/jquery-ui/ui/minified/jquery-ui.slider.min.js',
- 'bower_components/jqueryui-touch-punch/jquery.ui.touch-punch.min.js',
- 'bower_components/backbone-amd/backbone-min.js',
- 'bower_components/backbone-amd/backbone-min.map',
- 'bower_components/underscore-amd/underscore-min.js',
- 'bower_components/d3/d3.min.js',
- 'bower_components/d3.TimeSlider/d3.timeslider.min.js',
- 'bower_components/FileSaver.js/FileSaver.js',
- 'bower_components/canvas-toBlob.js/canvas-toBlob.js',
- 'bower_components/Blob.js/Blob.js',
- 'bower_components/backbone.marionette/lib/core/amd/backbone.marionette.min.js',
- 'bower_components/backbone.wreqr/lib/amd/backbone.wreqr.min.js',
- 'bower_components/backbone.babysitter/lib/amd/backbone.babysitter.min.js',
- 'bower_components/requirejs-text/text.js',
- 'bower_components/require-handlebars-plugin/hbs/handlebars.js',
- 'bower_components/require-handlebars-plugin/hbs/i18nprecompile.js',
- 'bower_components/require-handlebars-plugin/hbs/json2.js',
- 'bower_components/require-handlebars-plugin/hbs/underscore.js',
- 'bower_components/require-handlebars-plugin/hbs.js',
- 'bower_components/backbone.marionette.handlebars/backbone.marionette.handlebars.min.js',
- 'bower_components/bootstrap/dist/*/*',
- 'bower_components/font-awesome/css/*',
- 'bower_components/lm.js/lm.js',
- 'bower_components/cesium/Build/Cesium/**',
- 'bower_components/papaparse/papaparse.min.js',
- 'bower_components/plotty/dist/plotty.min.js',
- 'bower_components/sumoselect/jquery.sumoselect.min.js',
- 'bower_components/w2ui/dist/w2ui-fields.min.js',
- 'bower_components/w2ui/src/w2popup.js',
- 'bower_components/w2ui/src/w2utils.js',
- 'bower_components/msgpack-lite/dist/msgpack.min.js',
- 'bower_components/graphly/dist/graphly.min.js',
- 'bower_components/filepond/dist/filepond.js',
- 'bower_components/anno.js/anno.js',
- 'bower_components/jquery-scrollintoview/jquery.scrollintoview.min.js',
- 'bower_components/expr-eval/index.js',
+ 'node_modules/requirejs/require.js',
+ 'node_modules/jquery/dist/jquery.min.js',
+ 'node_modules/jquery/dist/jquery.min.map',
+ 'node_modules/jquery-ui/dist/jquery-ui.min.js',
+ "node_modules/jquery-ui/dist/themes/smoothness/jquery-ui.min.css",
+ 'node_modules/jquery-ui/ui/minified/jquery-ui.slider.min.js',
+ 'node_modules/jqueryui-touch-punch/jquery.ui.touch-punch.min.js',
+ 'node_modules/backbone/backbone-min.js',
+ 'node_modules/backbone/backbone-min.map',
+ 'node_modules/underscore-amd/underscore-min.js',
+ 'node_modules/d3/d3.min.js',
+ 'node_modules/d3.TimeSlider/d3.timeslider.min.js',
+ 'node_modules/FileSaver.js/FileSaver.js',
+ 'node_modules/canvas-toBlob.js/canvas-toBlob.js',
+ 'node_modules/Blob.js/Blob.js',
+ 'node_modules/backbone.marionette/lib/core/amd/backbone.marionette.min.js',
+ 'node_modules/backbone.wreqr/lib/backbone.wreqr.min.js',
+ 'node_modules/backbone.babysitter/lib/backbone.babysitter.min.js',
+ 'node_modules/modernizr/src/Modernizr.js',
+ 'node_modules/requirejs-text/text.js',
+ 'node_modules/require-handlebars-plugin/hbs/handlebars.js',
+ 'node_modules/require-handlebars-plugin/hbs/i18nprecompile.js',
+ 'node_modules/require-handlebars-plugin/hbs/json2.js',
+ 'node_modules/require-handlebars-plugin/hbs/underscore.js',
+ 'node_modules/require-handlebars-plugin/hbs.js',
+ 'node_modules/backbone.marionette.handlebars/backbone.marionette.handlebars.min.js',
+ 'node_modules/bootstrap/dist/*/*',
+ 'node_modules/font-awesome/css/*',
+ 'node_modules/lm.js/lm.js',
+ 'node_modules/cesium/Build/Cesium/**',
+ 'node_modules/papaparse/papaparse.min.js',
+ 'node_modules/requirejs/require.js',
+ 'node_modules/plotty/dist/plotty.min.js',
+ 'node_modules/sumoselect/jquery.sumoselect.min.js',
+ 'node_modules/w2ui/dist/w2ui-fields.min.js',
+ 'node_modules/w2ui/src/w2popup.js',
+ 'node_modules/w2ui/src/w2utils.js',
+ 'node_modules/msgpack-lite/dist/msgpack.min.js',
+ 'node_modules/graphly/dist/graphly.min.js',
+ 'node_modules/filepond/dist/filepond.js',
+ 'node_modules/anno.js/anno.js',
+ 'node_modules/jquery-scrollintoview/jquery.scrollintoview.min.js',
+ 'node_modules/expr-eval/index.js',
'scripts/vendor/**',
]
},{
@@ -386,7 +390,7 @@ module.exports = function (grunt) {
cwd: '<%= yeoman.app %>',
dest: '<%= yeoman.dist %>/fonts/',
src: [
- 'bower_components/*/fonts/*',
+ 'node_modules/*/fonts/*',
]
},{
expand: true,
@@ -394,8 +398,8 @@ module.exports = function (grunt) {
cwd: '<%= yeoman.app %>',
dest: '<%= yeoman.dist %>/images/',
src: [
- 'bower_components/*/images/*',
- 'bower_components/*/img/*',
+ 'node_modules/*/images/*',
+ 'node_modules/*/img/*',
]
},{
expand: true,
@@ -435,7 +439,7 @@ module.exports = function (grunt) {
cwd: '<%= yeoman.app %>',
dest: '<%= yeoman.dist %>/styles/images',
src: [
- 'bower_components/jquery-ui/themes/smoothness/images/*'
+ 'node_modules/jquery-ui/themes/smoothness/images/*'
]
}]
}
@@ -443,10 +447,10 @@ module.exports = function (grunt) {
replace: {
dist: {
src: [
- '<%= yeoman.dist %>/bower_components/jquery/jquery.min.js',
- '<%= yeoman.dist %>/bower_components/backbone-amd/backbone-min.js',
- '<%= yeoman.dist %>/bower_components/require-handlebars-plugin/hbs.js',
- '<%= yeoman.dist %>/bower_components/cesium/Build/Cesium/Cesium.js'
+ '<%= yeoman.dist %>/node_modules/jquery/jquery.min.js',
+ '<%= yeoman.dist %>/node_modules/backbone/backbone-min.js',
+ '<%= yeoman.dist %>/node_modules/require-handlebars-plugin/hbs.js',
+ '<%= yeoman.dist %>/node_modules/cesium/Build/Cesium/Cesium.js'
],
overwrite: true,
replacements: [
diff --git a/app/index.html b/app/index.html
index 4254512..43967a0 100644
--- a/app/index.html
+++ b/app/index.html
@@ -12,17 +12,17 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+