From 9650f8eb85c7006d245e2756ffb43c0f418517b2 Mon Sep 17 00:00:00 2001 From: 5chdn <5chdn@users.noreply.github.com> Date: Mon, 3 Dec 2018 13:30:37 +0100 Subject: [PATCH] grunt: disallow pow and poa at the same time --- Gruntfile.js | 41 +++++++++--------- src/{poa => }/css/animation.css | 0 src/{poa => }/css/bootstrap.min.css | 0 src/{poa => }/css/minimal-icons-codes.css | 0 src/{poa => }/css/minimal-icons-embedded.css | 0 src/{poa => }/css/minimal-icons-ie7-codes.css | 0 src/{poa => }/css/minimal-icons-ie7.css | 0 src/{poa => }/css/minimal-icons.css | 0 src/{poa => }/css/style.css | 0 src/{poa => }/css/toastr.min.css | 0 src/{poa => }/fonts/Simple-Line-Icons.ttf | Bin src/{poa => }/fonts/SourceSansPro-Bold.woff2 | Bin .../fonts/SourceSansPro-ExtraLight.woff2 | Bin src/{poa => }/fonts/SourceSansPro-Light.woff2 | Bin .../fonts/SourceSansPro-Regular.woff2 | Bin .../fonts/SourceSansPro-SemiBold.woff2 | Bin src/{poa => }/fonts/minimal-icons.eot | Bin src/{poa => }/fonts/minimal-icons.svg | 0 src/{poa => }/fonts/minimal-icons.ttf | Bin src/{poa => }/fonts/minimal-icons.woff | Bin src/{poa => }/images/favicon.ico | Bin src/{poa => }/images/favicon.png | Bin src/{poa => }/images/screenshot-v0.0.1.jpg | Bin src/{poa => }/images/screenshot-v0.0.2.jpg | Bin src/{poa => }/images/screenshot-v0.0.5.jpg | Bin src/{poa => }/images/screenshot-v0.1.0.png | Bin src/{poa => }/images/screenshot.jpg | Bin src/{poa => }/js/app.js | 0 src/{poa => }/js/controllers.js | 0 src/{poa => }/js/directives.js | 0 src/{poa => }/js/filters.js | 0 src/{poa => }/js/lib/angular.js | 0 src/{poa => }/js/lib/angular.min.js | 0 src/{poa => }/js/lib/angular.min.js.map | 0 src/{poa => }/js/lib/bootstrap.min.js | 0 src/{poa => }/js/lib/d3.js | 0 src/{poa => }/js/lib/d3.min.js | 0 src/{poa => }/js/lib/d3.tip.min.js | 0 src/{poa => }/js/lib/datamaps.min.js | 0 src/{poa => }/js/lib/jquery-1.11.3.js | 0 src/{poa => }/js/lib/jquery-1.11.3.min.js | 0 src/{poa => }/js/lib/jquery-1.11.3.min.js.map | 0 src/{poa => }/js/lib/jquery.sparkline.js | 0 src/{poa => }/js/lib/jquery.sparkline.min.js | 0 src/{poa => }/js/lib/lodash.js | 0 src/{poa => }/js/lib/lodash.min.js | 0 src/{poa => }/js/lib/moment.en.min.js | 0 src/{poa => }/js/lib/moment.js | 0 src/{poa => }/js/lib/moment.min.js | 0 src/{poa => }/js/lib/ngStorage.min.js | 0 src/{poa => }/js/lib/primus.min.js | 0 src/{poa => }/js/lib/toastr.min.js | 0 src/{poa => }/js/lib/topojson.min.js | 0 src/{poa => }/js/script.js | 0 src/{poa => }/views/error.jade | 0 src/{poa => }/views/index.jade | 0 src/{poa => }/views/layout.jade | 0 57 files changed, 20 insertions(+), 21 deletions(-) rename src/{poa => }/css/animation.css (100%) rename src/{poa => }/css/bootstrap.min.css (100%) rename src/{poa => }/css/minimal-icons-codes.css (100%) rename src/{poa => }/css/minimal-icons-embedded.css (100%) rename src/{poa => }/css/minimal-icons-ie7-codes.css (100%) rename src/{poa => }/css/minimal-icons-ie7.css (100%) rename src/{poa => }/css/minimal-icons.css (100%) rename src/{poa => }/css/style.css (100%) rename src/{poa => }/css/toastr.min.css (100%) rename src/{poa => }/fonts/Simple-Line-Icons.ttf (100%) rename src/{poa => }/fonts/SourceSansPro-Bold.woff2 (100%) rename src/{poa => }/fonts/SourceSansPro-ExtraLight.woff2 (100%) rename src/{poa => }/fonts/SourceSansPro-Light.woff2 (100%) rename src/{poa => }/fonts/SourceSansPro-Regular.woff2 (100%) rename src/{poa => }/fonts/SourceSansPro-SemiBold.woff2 (100%) rename src/{poa => }/fonts/minimal-icons.eot (100%) rename src/{poa => }/fonts/minimal-icons.svg (100%) rename src/{poa => }/fonts/minimal-icons.ttf (100%) rename src/{poa => }/fonts/minimal-icons.woff (100%) rename src/{poa => }/images/favicon.ico (100%) rename src/{poa => }/images/favicon.png (100%) rename src/{poa => }/images/screenshot-v0.0.1.jpg (100%) rename src/{poa => }/images/screenshot-v0.0.2.jpg (100%) rename src/{poa => }/images/screenshot-v0.0.5.jpg (100%) rename src/{poa => }/images/screenshot-v0.1.0.png (100%) rename src/{poa => }/images/screenshot.jpg (100%) rename src/{poa => }/js/app.js (100%) rename src/{poa => }/js/controllers.js (100%) rename src/{poa => }/js/directives.js (100%) rename src/{poa => }/js/filters.js (100%) rename src/{poa => }/js/lib/angular.js (100%) rename src/{poa => }/js/lib/angular.min.js (100%) rename src/{poa => }/js/lib/angular.min.js.map (100%) rename src/{poa => }/js/lib/bootstrap.min.js (100%) rename src/{poa => }/js/lib/d3.js (100%) rename src/{poa => }/js/lib/d3.min.js (100%) rename src/{poa => }/js/lib/d3.tip.min.js (100%) rename src/{poa => }/js/lib/datamaps.min.js (100%) rename src/{poa => }/js/lib/jquery-1.11.3.js (100%) rename src/{poa => }/js/lib/jquery-1.11.3.min.js (100%) rename src/{poa => }/js/lib/jquery-1.11.3.min.js.map (100%) rename src/{poa => }/js/lib/jquery.sparkline.js (100%) rename src/{poa => }/js/lib/jquery.sparkline.min.js (100%) rename src/{poa => }/js/lib/lodash.js (100%) rename src/{poa => }/js/lib/lodash.min.js (100%) rename src/{poa => }/js/lib/moment.en.min.js (100%) rename src/{poa => }/js/lib/moment.js (100%) rename src/{poa => }/js/lib/moment.min.js (100%) rename src/{poa => }/js/lib/ngStorage.min.js (100%) rename src/{poa => }/js/lib/primus.min.js (100%) rename src/{poa => }/js/lib/toastr.min.js (100%) rename src/{poa => }/js/lib/topojson.min.js (100%) rename src/{poa => }/js/script.js (100%) rename src/{poa => }/views/error.jade (100%) rename src/{poa => }/views/index.jade (100%) rename src/{poa => }/views/layout.jade (100%) diff --git a/Gruntfile.js b/Gruntfile.js index d8d9264..7649bc0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -34,7 +34,7 @@ var styles = [ ]; var src_pow = 'src/pow/'; -var dest_pow = 'dist/pow/'; +var dest_pow = 'dist/'; var styles_pow = [ 'bootstrap.min.css', @@ -50,9 +50,9 @@ module.exports = function(grunt) { build: ['dist'], cleanup_js: ['dist/js/*.*', '!dist/js/netstats.*'], cleanup_css: ['dist/css/*.css', '!dist/css/netstats.*.css'], - build_pow: ['dist/pow'], - cleanup_js_pow: ['dist/pow/js/*.*', '!dist/pow/js/netstats.*'], - cleanup_css_pow: ['dist/pow/css/*.css', '!dist/pow/css/netstats.*.css'] + build_pow: ['dist'], + cleanup_js_pow: ['dist/js/*.*', '!dist/js/netstats.*'], + cleanup_css_pow: ['dist/css/*.css', '!dist/css/netstats.*.css'] }, jade: { build: { @@ -74,7 +74,7 @@ module.exports = function(grunt) { } }, files: { - 'dist/pow/index.html': 'src/pow/views/index.jade' + 'dist/index.html': 'src/pow/views/index.jade' } } }, @@ -116,28 +116,28 @@ module.exports = function(grunt) { expand: true, cwd: 'src/pow/fonts/', src: ['minimal-*.*'], - dest: 'dist/pow/fonts/', + dest: 'dist/fonts/', filter: 'isFile' }, { expand: true, cwd: 'src/pow/images/', src: ['*.ico'], - dest: 'dist/pow/', + dest: 'dist/', filter: 'isFile' }, { expand: true, cwd: 'src/pow/css/', src: styles_pow, - dest: 'dist/pow/css/', + dest: 'dist/css/', filter: 'isFile' }, { expand: true, cwd: 'src/pow/js/lib/', src: ['*.*'], - dest: 'dist/pow/js/lib' + dest: 'dist/js/lib' } ] } @@ -154,9 +154,9 @@ module.exports = function(grunt) { build_pow: { files: [{ expand: true, - cwd: 'dist/pow/css', + cwd: 'dist/css', src: ['*.css', '!*.min.css'], - dest: 'dist/pow/css/' + dest: 'dist/css/' }] } }, @@ -195,31 +195,31 @@ module.exports = function(grunt) { options: { sourceMap: false, sourceMapIncludeSources: true, - sourceMapIn: ['dist/pow/js/lib/*.map'] + sourceMapIn: ['dist/js/lib/*.map'] }, src: vendor, - dest: 'dist/pow/js/vendor.min.js' + dest: 'dist/js/vendor.min.js' }, scripts : { options: { separator: ';\n', }, src: scripts, - dest: 'dist/pow/js/app.js' + dest: 'dist/js/app.js' }, netstats_pow: { options: { sourceMap: false, sourceMapIncludeSources: true, - sourceMapIn: ['dist/pow/js/vendor.min.js.map', 'dist/pow/js/app.min.js.map'] + sourceMapIn: ['dist/js/vendor.min.js.map', 'dist/js/app.min.js.map'] }, src: ['<%= concat.vendor.dest %>', '<%= uglify.app_pow.dest %>'], - dest: 'dist/pow/js/netstats.min.js', + dest: 'dist/js/netstats.min.js', nonull: true, }, css_pow: { - src: ['dist/pow/css/*.min.css', 'dist/pow/css/*.css'], - dest: 'dist/pow/css/netstats.min.css' + src: ['dist/css/*.min.css', 'dist/css/*.css'], + dest: 'dist/css/netstats.min.css' } }, uglify: { @@ -238,7 +238,7 @@ module.exports = function(grunt) { sourceMap: false, sourceMapIncludeSources: true }, - dest: 'dist/pow/js/app.min.js', + dest: 'dist/js/app.min.js', src: ['<%= concat.scripts.dest %>'] } } @@ -253,6 +253,5 @@ module.exports = function(grunt) { grunt.registerTask('default', ['clean:build', 'clean:cleanup_js', 'clean:cleanup_css', 'jade:build', 'copy:build', 'cssmin:build', 'concat:vendor', 'concat:scripts', 'uglify:app', 'concat:netstats', 'concat:css', 'clean:cleanup_js', 'clean:cleanup_css']); grunt.registerTask('pow', ['clean:build_pow', 'clean:cleanup_js_pow', 'clean:cleanup_css_pow', 'jade:build_pow', 'copy:build_pow', 'cssmin:build_pow', 'concat:vendor', 'concat:scripts', 'uglify:app_pow', 'concat:netstats_pow', 'concat:css_pow', 'clean:cleanup_js_pow', 'clean:cleanup_css_pow']); - grunt.registerTask('build', 'default'); - grunt.registerTask('all', ['default', 'pow']); + grunt.registerTask('poa', 'default'); }; diff --git a/src/poa/css/animation.css b/src/css/animation.css similarity index 100% rename from src/poa/css/animation.css rename to src/css/animation.css diff --git a/src/poa/css/bootstrap.min.css b/src/css/bootstrap.min.css similarity index 100% rename from src/poa/css/bootstrap.min.css rename to src/css/bootstrap.min.css diff --git a/src/poa/css/minimal-icons-codes.css b/src/css/minimal-icons-codes.css similarity index 100% rename from src/poa/css/minimal-icons-codes.css rename to src/css/minimal-icons-codes.css diff --git a/src/poa/css/minimal-icons-embedded.css b/src/css/minimal-icons-embedded.css similarity index 100% rename from src/poa/css/minimal-icons-embedded.css rename to src/css/minimal-icons-embedded.css diff --git a/src/poa/css/minimal-icons-ie7-codes.css b/src/css/minimal-icons-ie7-codes.css similarity index 100% rename from src/poa/css/minimal-icons-ie7-codes.css rename to src/css/minimal-icons-ie7-codes.css diff --git a/src/poa/css/minimal-icons-ie7.css b/src/css/minimal-icons-ie7.css similarity index 100% rename from src/poa/css/minimal-icons-ie7.css rename to src/css/minimal-icons-ie7.css diff --git a/src/poa/css/minimal-icons.css b/src/css/minimal-icons.css similarity index 100% rename from src/poa/css/minimal-icons.css rename to src/css/minimal-icons.css diff --git a/src/poa/css/style.css b/src/css/style.css similarity index 100% rename from src/poa/css/style.css rename to src/css/style.css diff --git a/src/poa/css/toastr.min.css b/src/css/toastr.min.css similarity index 100% rename from src/poa/css/toastr.min.css rename to src/css/toastr.min.css diff --git a/src/poa/fonts/Simple-Line-Icons.ttf b/src/fonts/Simple-Line-Icons.ttf similarity index 100% rename from src/poa/fonts/Simple-Line-Icons.ttf rename to src/fonts/Simple-Line-Icons.ttf diff --git a/src/poa/fonts/SourceSansPro-Bold.woff2 b/src/fonts/SourceSansPro-Bold.woff2 similarity index 100% rename from src/poa/fonts/SourceSansPro-Bold.woff2 rename to src/fonts/SourceSansPro-Bold.woff2 diff --git a/src/poa/fonts/SourceSansPro-ExtraLight.woff2 b/src/fonts/SourceSansPro-ExtraLight.woff2 similarity index 100% rename from src/poa/fonts/SourceSansPro-ExtraLight.woff2 rename to src/fonts/SourceSansPro-ExtraLight.woff2 diff --git a/src/poa/fonts/SourceSansPro-Light.woff2 b/src/fonts/SourceSansPro-Light.woff2 similarity index 100% rename from src/poa/fonts/SourceSansPro-Light.woff2 rename to src/fonts/SourceSansPro-Light.woff2 diff --git a/src/poa/fonts/SourceSansPro-Regular.woff2 b/src/fonts/SourceSansPro-Regular.woff2 similarity index 100% rename from src/poa/fonts/SourceSansPro-Regular.woff2 rename to src/fonts/SourceSansPro-Regular.woff2 diff --git a/src/poa/fonts/SourceSansPro-SemiBold.woff2 b/src/fonts/SourceSansPro-SemiBold.woff2 similarity index 100% rename from src/poa/fonts/SourceSansPro-SemiBold.woff2 rename to src/fonts/SourceSansPro-SemiBold.woff2 diff --git a/src/poa/fonts/minimal-icons.eot b/src/fonts/minimal-icons.eot similarity index 100% rename from src/poa/fonts/minimal-icons.eot rename to src/fonts/minimal-icons.eot diff --git a/src/poa/fonts/minimal-icons.svg b/src/fonts/minimal-icons.svg similarity index 100% rename from src/poa/fonts/minimal-icons.svg rename to src/fonts/minimal-icons.svg diff --git a/src/poa/fonts/minimal-icons.ttf b/src/fonts/minimal-icons.ttf similarity index 100% rename from src/poa/fonts/minimal-icons.ttf rename to src/fonts/minimal-icons.ttf diff --git a/src/poa/fonts/minimal-icons.woff b/src/fonts/minimal-icons.woff similarity index 100% rename from src/poa/fonts/minimal-icons.woff rename to src/fonts/minimal-icons.woff diff --git a/src/poa/images/favicon.ico b/src/images/favicon.ico similarity index 100% rename from src/poa/images/favicon.ico rename to src/images/favicon.ico diff --git a/src/poa/images/favicon.png b/src/images/favicon.png similarity index 100% rename from src/poa/images/favicon.png rename to src/images/favicon.png diff --git a/src/poa/images/screenshot-v0.0.1.jpg b/src/images/screenshot-v0.0.1.jpg similarity index 100% rename from src/poa/images/screenshot-v0.0.1.jpg rename to src/images/screenshot-v0.0.1.jpg diff --git a/src/poa/images/screenshot-v0.0.2.jpg b/src/images/screenshot-v0.0.2.jpg similarity index 100% rename from src/poa/images/screenshot-v0.0.2.jpg rename to src/images/screenshot-v0.0.2.jpg diff --git a/src/poa/images/screenshot-v0.0.5.jpg b/src/images/screenshot-v0.0.5.jpg similarity index 100% rename from src/poa/images/screenshot-v0.0.5.jpg rename to src/images/screenshot-v0.0.5.jpg diff --git a/src/poa/images/screenshot-v0.1.0.png b/src/images/screenshot-v0.1.0.png similarity index 100% rename from src/poa/images/screenshot-v0.1.0.png rename to src/images/screenshot-v0.1.0.png diff --git a/src/poa/images/screenshot.jpg b/src/images/screenshot.jpg similarity index 100% rename from src/poa/images/screenshot.jpg rename to src/images/screenshot.jpg diff --git a/src/poa/js/app.js b/src/js/app.js similarity index 100% rename from src/poa/js/app.js rename to src/js/app.js diff --git a/src/poa/js/controllers.js b/src/js/controllers.js similarity index 100% rename from src/poa/js/controllers.js rename to src/js/controllers.js diff --git a/src/poa/js/directives.js b/src/js/directives.js similarity index 100% rename from src/poa/js/directives.js rename to src/js/directives.js diff --git a/src/poa/js/filters.js b/src/js/filters.js similarity index 100% rename from src/poa/js/filters.js rename to src/js/filters.js diff --git a/src/poa/js/lib/angular.js b/src/js/lib/angular.js similarity index 100% rename from src/poa/js/lib/angular.js rename to src/js/lib/angular.js diff --git a/src/poa/js/lib/angular.min.js b/src/js/lib/angular.min.js similarity index 100% rename from src/poa/js/lib/angular.min.js rename to src/js/lib/angular.min.js diff --git a/src/poa/js/lib/angular.min.js.map b/src/js/lib/angular.min.js.map similarity index 100% rename from src/poa/js/lib/angular.min.js.map rename to src/js/lib/angular.min.js.map diff --git a/src/poa/js/lib/bootstrap.min.js b/src/js/lib/bootstrap.min.js similarity index 100% rename from src/poa/js/lib/bootstrap.min.js rename to src/js/lib/bootstrap.min.js diff --git a/src/poa/js/lib/d3.js b/src/js/lib/d3.js similarity index 100% rename from src/poa/js/lib/d3.js rename to src/js/lib/d3.js diff --git a/src/poa/js/lib/d3.min.js b/src/js/lib/d3.min.js similarity index 100% rename from src/poa/js/lib/d3.min.js rename to src/js/lib/d3.min.js diff --git a/src/poa/js/lib/d3.tip.min.js b/src/js/lib/d3.tip.min.js similarity index 100% rename from src/poa/js/lib/d3.tip.min.js rename to src/js/lib/d3.tip.min.js diff --git a/src/poa/js/lib/datamaps.min.js b/src/js/lib/datamaps.min.js similarity index 100% rename from src/poa/js/lib/datamaps.min.js rename to src/js/lib/datamaps.min.js diff --git a/src/poa/js/lib/jquery-1.11.3.js b/src/js/lib/jquery-1.11.3.js similarity index 100% rename from src/poa/js/lib/jquery-1.11.3.js rename to src/js/lib/jquery-1.11.3.js diff --git a/src/poa/js/lib/jquery-1.11.3.min.js b/src/js/lib/jquery-1.11.3.min.js similarity index 100% rename from src/poa/js/lib/jquery-1.11.3.min.js rename to src/js/lib/jquery-1.11.3.min.js diff --git a/src/poa/js/lib/jquery-1.11.3.min.js.map b/src/js/lib/jquery-1.11.3.min.js.map similarity index 100% rename from src/poa/js/lib/jquery-1.11.3.min.js.map rename to src/js/lib/jquery-1.11.3.min.js.map diff --git a/src/poa/js/lib/jquery.sparkline.js b/src/js/lib/jquery.sparkline.js similarity index 100% rename from src/poa/js/lib/jquery.sparkline.js rename to src/js/lib/jquery.sparkline.js diff --git a/src/poa/js/lib/jquery.sparkline.min.js b/src/js/lib/jquery.sparkline.min.js similarity index 100% rename from src/poa/js/lib/jquery.sparkline.min.js rename to src/js/lib/jquery.sparkline.min.js diff --git a/src/poa/js/lib/lodash.js b/src/js/lib/lodash.js similarity index 100% rename from src/poa/js/lib/lodash.js rename to src/js/lib/lodash.js diff --git a/src/poa/js/lib/lodash.min.js b/src/js/lib/lodash.min.js similarity index 100% rename from src/poa/js/lib/lodash.min.js rename to src/js/lib/lodash.min.js diff --git a/src/poa/js/lib/moment.en.min.js b/src/js/lib/moment.en.min.js similarity index 100% rename from src/poa/js/lib/moment.en.min.js rename to src/js/lib/moment.en.min.js diff --git a/src/poa/js/lib/moment.js b/src/js/lib/moment.js similarity index 100% rename from src/poa/js/lib/moment.js rename to src/js/lib/moment.js diff --git a/src/poa/js/lib/moment.min.js b/src/js/lib/moment.min.js similarity index 100% rename from src/poa/js/lib/moment.min.js rename to src/js/lib/moment.min.js diff --git a/src/poa/js/lib/ngStorage.min.js b/src/js/lib/ngStorage.min.js similarity index 100% rename from src/poa/js/lib/ngStorage.min.js rename to src/js/lib/ngStorage.min.js diff --git a/src/poa/js/lib/primus.min.js b/src/js/lib/primus.min.js similarity index 100% rename from src/poa/js/lib/primus.min.js rename to src/js/lib/primus.min.js diff --git a/src/poa/js/lib/toastr.min.js b/src/js/lib/toastr.min.js similarity index 100% rename from src/poa/js/lib/toastr.min.js rename to src/js/lib/toastr.min.js diff --git a/src/poa/js/lib/topojson.min.js b/src/js/lib/topojson.min.js similarity index 100% rename from src/poa/js/lib/topojson.min.js rename to src/js/lib/topojson.min.js diff --git a/src/poa/js/script.js b/src/js/script.js similarity index 100% rename from src/poa/js/script.js rename to src/js/script.js diff --git a/src/poa/views/error.jade b/src/views/error.jade similarity index 100% rename from src/poa/views/error.jade rename to src/views/error.jade diff --git a/src/poa/views/index.jade b/src/views/index.jade similarity index 100% rename from src/poa/views/index.jade rename to src/views/index.jade diff --git a/src/poa/views/layout.jade b/src/views/layout.jade similarity index 100% rename from src/poa/views/layout.jade rename to src/views/layout.jade