hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 03:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

migrating dependencies from bower to npm

Browse Source
This commit is contained in:
Mike Ng
2018-01-16 09:42:29 +04:00
parent 06413e9f9c
commit 431d9dc46a
32 changed files with 14197 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
bower.json
View File

@@ -2,43 +2,11 @@
"name": "Phraseanet", "name": "Phraseanet",
"version": "4.0.0", "version": "4.0.0",
"dependencies": { "dependencies": {
"jquery": "~1.11.3",
"jquery-ui": "~1.10.4",
"jquery-mobile-bower": "~1.3.0",
"underscore": "~1.4.4",
"font-awesome": "~3.2.1",
"modernizr": "~2.8.3",
"normalize-css": "~2.1.3",
"json2": "latest",
"humane-js": "~3.0.6",
"jquery-file-upload": "~8.3.2",
"blueimp-load-image": "latest",
"requirejs": "~2.1",
"backbone-amd": "~1.0",
"underscore-amd": "~1.4", "underscore-amd": "~1.4",
"i18next": "~1.6",
"bootstrap-multiselect": "v0.9",
"zxcvbn": "https://github.com/lowe/zxcvbn.git",
"geonames-server-jquery-plugin": "~0.2",
"tinymce": "~4.0",
"jquery-galleria": "1.2.9",
"jquery.cookie": "~1.4",
"fancytree": "~2.7",
"bootstrap-sass": "v2.3.2.2",
"jquery.lazyload": "~1.9.7",
"jquery-treeview": "~1.4.2",
"alchemy-embed-medias": "~0.3.4", "alchemy-embed-medias": "~0.3.4",
"html5shiv": "^3.7.3", "i18next": "~1.6",
"jquery-simplecolorpicker": "^0.3.1" "backbone-amd": "~1.0",
}, "font-awesome": "~3.2.1"
"devDependencies": {
"mocha": "latest",
"sinonjs": "~1.7.0",
"chai": "~1.6",
"squire": "~0",
"sinon-chai": "~2.5",
"qunit": "https://github.com/jquery/qunit.git#1.11.0",
"js-fixtures": "https://github.com/badunk/js-fixtures/archive/master.zip"
}, },
"resolutions": { "resolutions": {
"jquery": "~1.11.3" "jquery": "~1.11.3"

14055
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

39
package.json
View File

@@ -23,7 +23,13 @@
"jake": "latest", "jake": "latest",
"path": "^0.12.7", "path": "^0.12.7",
"tmp": "0.0.23", "tmp": "0.0.23",
"wrench": "^1.5.8" "wrench": "^1.5.8",
"chai": "^1.6.1",
"js-fixtures": "^1.5.3",
"mocha": "^4.1.0",
"sinon": "^1.17.7",
"sinon-chai": "^2.5.0",
"squire": "^1.1.8"
}, },
"engines": { "engines": {
"node": ">=5.8" "node": ">=5.8"
@@ -35,7 +41,36 @@
"phraseanet-production-client": "npm uninstall phraseanet-production-client && npm install phraseanet-production-client && ./node_modules/.bin/gulp build-phraseanet-production-client" "phraseanet-production-client": "npm uninstall phraseanet-production-client && npm install phraseanet-production-client && ./node_modules/.bin/gulp build-phraseanet-production-client"
}, },
"dependencies": { "dependencies": {
"JSON2": "^0.1.0",
"alchemy-embed-medias": "^0.4.4", "alchemy-embed-medias": "^0.4.4",
"phraseanet-production-client": "^0.32.3" "backbone": "^1.0.0",
"blueimp-file-upload": "^8.3.0",
"blueimp-load-image": "^2.17.1",
"bootstrap-multiselect": "^0.9.13",
"bootstrap-sass": "^2.3.2",
"font-awesome": "^4.7.0",
"galleria": "^1.5.7",
"geonames-server-jquery-plugin": "^0.2.2",
"html5shiv": "^3.7.3",
"humane-js": "^3.0.6",
"i18next": "^1.10.6",
"jquery": "^1.11.3",
"jquery-lazyload": "^1.9.7",
"jquery-mobile": "^1.5.0-alpha.1",
"jquery-simplecolorpicker": "^0.3.1",
"jquery-ui": "^1.12.1",
"jquery-ui-datepicker-with-i18n": "^1.10.4",
"jquery-ui-dist": "^1.12.1",
"jquery.cookie": "^1.4.1",
"jquery.fancytree": "^2.27.0",
"modernizr": "^3.0.0",
"normalize-css": "^2.1.0",
"npm": "^5.6.0",
"phraseanet-production-client": "../Phraseanet-production-client",
"qunit": "^1.0.0",
"requirejs": "^2.1.22",
"tinymce": "^4.0.28",
"underscore": "^1.4.4",
"zxcvbn": "git+https://github.com/lowe/zxcvbn.git"
} }
} }

4
resources/gulp/components/admin.js
View File

@@ -16,13 +16,13 @@ gulp.task('build-admin-css', function(){
gulp.task('build-admin-js', function(){ gulp.task('build-admin-js', function(){
var adminGroup = [ var adminGroup = [
config.paths.vendors + 'underscore-amd/underscore.js', config.paths.vendors + 'underscore-amd/underscore.js',
config.paths.vendors + 'jquery-treeview/jquery.treeview.js', config.paths.nodes + 'jquery-treeview/jquery.treeview.js',
// config.paths.vendors + 'jquery-file-upload/js/vendor/jquery.ui.widget.js', // config.paths.vendors + 'jquery-file-upload/js/vendor/jquery.ui.widget.js',
// config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js', // config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js',
// config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js', // config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js',
config.paths.src + 'admin/js/jquery.kb-event.js', config.paths.src + 'admin/js/jquery.kb-event.js',
config.paths.src + 'admin/js/template-dialogs.js', config.paths.src + 'admin/js/template-dialogs.js',
config.paths.vendors + 'requirejs/require.js', config.paths.nodes + 'requirejs/require.js',
config.paths.dist + 'scripts/apps/admin/require.config.js', config.paths.dist + 'scripts/apps/admin/require.config.js',
config.paths.dist + 'scripts/apps/admin/main/main.js' config.paths.dist + 'scripts/apps/admin/main/main.js'
]; ];

2
resources/gulp/components/authentication.js
View File

@@ -15,7 +15,7 @@ gulp.task('build-authentication-css', function(){
gulp.task('build-authentication-js', function(){ gulp.task('build-authentication-js', function(){
var authenticationGroup = [ var authenticationGroup = [
config.paths.vendors + 'requirejs/require.js', config.paths.nodes + 'requirejs/require.js',
config.paths.dist + 'scripts/apps/login/home/config.js' config.paths.dist + 'scripts/apps/login/home/config.js'
]; ];
return utils.buildJsGroup(authenticationGroup, 'authentication', 'authentication/js', debugMode); return utils.buildJsGroup(authenticationGroup, 'authentication', 'authentication/js', debugMode);

14
resources/gulp/components/common.js
View File

@@ -31,13 +31,13 @@ gulp.task('build-common-js', function(){
// config.paths.dist + 'assets/bootstrap/js/bootstrap.js', // should append no conflict // config.paths.dist + 'assets/bootstrap/js/bootstrap.js', // should append no conflict
config.paths.src + 'vendors/jquery-mousewheel/js/jquery.mousewheel.js', config.paths.src + 'vendors/jquery-mousewheel/js/jquery.mousewheel.js',
// jquery ui date picker langs // jquery ui date picker langs
config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-ar.js', config.paths.nodes + 'jquery-ui-datepicker-with-i18n/ui/i18n/jquery.ui.datepicker-ar.js',
config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-de.js', config.paths.nodes + 'jquery-ui-datepicker-with-i18n/ui/i18n/jquery.ui.datepicker-de.js',
config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-es.js', config.paths.nodes + 'jquery-ui-datepicker-with-i18n/ui/i18n/jquery.ui.datepicker-es.js',
config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-fr.js', config.paths.nodes + 'jquery-ui-datepicker-with-i18n/ui/i18n/jquery.ui.datepicker-fr.js',
config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-nl.js', config.paths.nodes + 'jquery-ui-datepicker-with-i18n/ui/i18n/jquery.ui.datepicker-nl.js',
config.paths.vendors + 'jquery-ui/ui/i18n/jquery.ui.datepicker-en-GB.js', config.paths.nodes + 'jquery-ui-datepicker-with-i18n/ui/i18n/jquery.ui.datepicker-en-GB.js',
config.paths.vendors + 'jquery.cookie/jquery.cookie.js', config.paths.nodes + 'jquery.cookie/jquery.cookie.js',
config.paths.src + 'vendors/jquery-contextmenu/js/jquery.contextmenu_custom.js', config.paths.src + 'vendors/jquery-contextmenu/js/jquery.contextmenu_custom.js',
config.paths.src + 'common/js/components/common.js', config.paths.src + 'common/js/components/common.js',
config.paths.src + 'common/js/components/tooltip.js', config.paths.src + 'common/js/components/tooltip.js',

2
resources/gulp/components/setup.js
View File

@@ -15,7 +15,7 @@ gulp.task('build-setup-css', function(){
gulp.task('build-setup-js', function(){ gulp.task('build-setup-js', function(){
var setupGroup = [ var setupGroup = [
config.paths.vendors + 'jquery.cookie/jquery.cookie.js', config.paths.nodes + 'jquery.cookie/jquery.cookie.js',
config.paths.src + 'vendors/jquery-validation/js/jquery.validate.js', config.paths.src + 'vendors/jquery-validation/js/jquery.validate.js',
config.paths.src + 'vendors/jquery-validate.password/js/jquery.validate.password.js', config.paths.src + 'vendors/jquery-validate.password/js/jquery.validate.password.js',
config.paths.src + 'vendors/jquery-test-paths/jquery.test-paths.js' config.paths.src + 'vendors/jquery-test-paths/jquery.test-paths.js'

2
resources/gulp/components/vendors/blueimp-load-image.js vendored
View File

@@ -4,6 +4,6 @@ var utils = require('../../utils.js');
gulp.task('build-blueimp-load-image', function(){ gulp.task('build-blueimp-load-image', function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'blueimp-load-image/js/load-image.js' config.paths.nodes + 'blueimp-load-image/js/load-image.js'
], 'load-image', 'vendors/blueimp-load-image'); ], 'load-image', 'vendors/blueimp-load-image');
}); });

2
resources/gulp/components/vendors/bootstrap-multiselect.js vendored
View File

@@ -4,6 +4,6 @@ var utils = require('../../utils.js');
gulp.task('build-bootstrap-multiselect', function(){ gulp.task('build-bootstrap-multiselect', function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'bootstrap-multiselect/dist/js/bootstrap-multiselect.js' config.paths.nodes + 'bootstrap-multiselect/dist/js/bootstrap-multiselect.js'
], 'bootstrap-multiselect', 'vendors/bootstrap-multiselect'); ], 'bootstrap-multiselect', 'vendors/bootstrap-multiselect');
}); });

34
resources/gulp/components/vendors/bootstrap.js vendored
View File

@@ -9,19 +9,19 @@ var utils = require('../../utils.js');
gulp.task('bootstrap-js', function () { gulp.task('bootstrap-js', function () {
var btSource = [ var btSource = [
config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-transition.js', config.paths.nodes + 'bootstrap-sass/js/bootstrap-transition.js',
config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-alert.js', config.paths.nodes + 'bootstrap-sass/js/bootstrap-alert.js',
config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-modal.js', config.paths.nodes + 'bootstrap-sass/js/bootstrap-modal.js',
config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-dropdown.js', config.paths.nodes + 'bootstrap-sass/js/bootstrap-dropdown.js',
config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-scrollspy.js', config.paths.nodes + 'bootstrap-sass/js/bootstrap-scrollspy.js',
config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-tab.js', config.paths.nodes + 'bootstrap-sass/js/bootstrap-tab.js',
config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-tooltip.js', config.paths.nodes + 'bootstrap-sass/js/bootstrap-tooltip.js',
config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-popover.js', config.paths.nodes + 'bootstrap-sass/js/bootstrap-popover.js',
config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-button.js', config.paths.nodes + 'bootstrap-sass/jss/bootstrap-button.js',
config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-collapse.js', config.paths.nodes + 'bootstrap-sass/js/bootstrap-collapse.js',
config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-carousel.js', config.paths.nodes + 'bootstrap-sass/js/bootstrap-carousel.js',
config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-typeahead.js', config.paths.nodes + 'bootstrap-sass/js/bootstrap-typeahead.js',
config.paths.vendors + 'bootstrap-sass/vendor/assets/javascripts/bootstrap-affix.js']; config.paths.nodes + 'bootstrap-sass/js/bootstrap-affix.js'];
gulp.src(btSource) gulp.src(btSource)
.pipe(concat('bootstrap.js')) .pipe(concat('bootstrap.js'))
@@ -31,21 +31,21 @@ gulp.task('bootstrap-js', function () {
.pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/js')) .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/js'))
}); });
gulp.task('bootstrap-assets', function () { gulp.task('bootstrap-assets', function () {
gulp.src([config.paths.vendors + 'bootstrap-sass/vendor/assets/images/**/*']) gulp.src([config.paths.nodes + 'bootstrap-sass/img/**/*'])
.pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/img')); .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/img'));
}); });
gulp.task('build-bootstrap', ['bootstrap-assets', 'bootstrap-js'], function () { gulp.task('build-bootstrap', ['bootstrap-assets', 'bootstrap-js'], function () {
// build standalone version (not used, see: Common Component) // build standalone version (not used, see: Common Component)
gulp.src(config.paths.vendors + 'bootstrap-sass/vendor/assets/stylesheets/bootstrap.scss') gulp.src(config.paths.nodes + 'bootstrap-sass/bootstrap-2.3.2.css')
.pipe(sass().on('error', sass.logError)) .pipe(sass().on('error', sass.logError))
.pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css/')) .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css/'))
.pipe(cssmin()) .pipe(cssmin())
.pipe(rename({ suffix: '.min' })) .pipe(rename({ suffix: '.min' }))
.pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css')); .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css'));
gulp.src([ gulp.src([
config.paths.vendors + 'bootstrap-sass/vendor/assets/stylesheets/bootstrap-responsive.scss', config.paths.nodes + 'bootstrap-sass/bootstrap-responsive-2.3.2.css',
config.paths.vendors + 'bootstrap-sass/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss' config.paths.nodes + 'bootstrap-sass/lib/_responsive-utilities.scss'
]) ])
.pipe(sass().on('error', sass.logError)) .pipe(sass().on('error', sass.logError))
.pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css/')) .pipe(gulp.dest( config.paths.build + 'vendors/bootstrap/css/'))

2
resources/gulp/components/vendors/geonames-server-jquery-plugin.js vendored
View File

@@ -4,6 +4,6 @@ var utils = require('../../utils.js');
gulp.task('build-geonames-server-jquery-plugin', function(){ gulp.task('build-geonames-server-jquery-plugin', function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'geonames-server-jquery-plugin/jquery.geonames.js' config.paths.nodes + 'geonames-server-jquery-plugin/jquery.geonames.js'
], 'jquery.geonames', 'vendors/jquery.geonames'); ], 'jquery.geonames', 'vendors/jquery.geonames');
}); });

2
resources/gulp/components/vendors/html5shiv.js vendored
View File

@@ -4,6 +4,6 @@ var utils = require('../../utils.js');
gulp.task('build-html5shiv', function(){ gulp.task('build-html5shiv', function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'html5shiv/dist/html5shiv.js' config.paths.nodes + 'html5shiv/dist/html5shiv.js'
], 'html5shiv', 'vendors/html5shiv'); ], 'html5shiv', 'vendors/html5shiv');
}); });

2
resources/gulp/components/vendors/jquery-cookie.js vendored
View File

@@ -4,6 +4,6 @@ var utils = require('../../utils.js');
gulp.task('build-jquery-cookie', function(){ gulp.task('build-jquery-cookie', function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'jquery.cookie/jquery.cookie.js' config.paths.nodes + 'jquery.cookie/jquery.cookie.js'
], 'jquery.cookie', 'vendors/jquery.cookie'); ], 'jquery.cookie', 'vendors/jquery.cookie');
}); });

6
resources/gulp/components/vendors/jquery-file-upload.js vendored
View File

@@ -6,18 +6,18 @@ var utils = require('../../utils.js');
gulp.task('build-jquery-file-upload-widget', [], function(){ gulp.task('build-jquery-file-upload-widget', [], function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'jquery-file-upload/js/vendor/jquery.ui.widget.js' config.paths.nodes + 'blueimp-file-upload/js/vendor/jquery.ui.widget.js'
], 'jquery.ui.widget', 'vendors/jquery-file-upload'); ], 'jquery.ui.widget', 'vendors/jquery-file-upload');
}); });
gulp.task('build-jquery-file-transport', [], function(){ gulp.task('build-jquery-file-transport', [], function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js' config.paths.nodes + 'blueimp-file-upload/js/jquery.iframe-transport.js'
], 'jquery.iframe-transport', 'vendors/jquery-file-upload'); ], 'jquery.iframe-transport', 'vendors/jquery-file-upload');
}); });
gulp.task('build-jquery-file-upload', ['build-jquery-file-transport', 'build-jquery-file-upload-widget'], function(){ gulp.task('build-jquery-file-upload', ['build-jquery-file-transport', 'build-jquery-file-upload-widget'], function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js' config.paths.nodes + 'blueimp-file-upload/js/jquery.fileupload.js'
], 'jquery.fileupload', 'vendors/jquery-file-upload'); ], 'jquery.fileupload', 'vendors/jquery-file-upload');
}); });

8
resources/gulp/components/vendors/jquery-galleria.js vendored
View File

@@ -4,23 +4,23 @@ var utils = require('../../utils.js');
gulp.task('build-galleria-css', function(){ gulp.task('build-galleria-css', function(){
return utils.buildCssGroup([ return utils.buildCssGroup([
config.paths.vendors + 'jquery-galleria/src/themes/classic/galleria.classic.css' config.paths.nodes + 'galleria/src/themes/classic/galleria.classic.css'
], 'galleria.classic', 'vendors/jquery-galleria'); ], 'galleria.classic', 'vendors/jquery-galleria');
}); });
gulp.task('build-galleria-js-classic', function(){ gulp.task('build-galleria-js-classic', function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'jquery-galleria/src/themes/classic/galleria.classic.js' config.paths.nodes + 'galleria/src/themes/classic/galleria.classic.js'
], 'galleria.classic', 'vendors/jquery-galleria'); ], 'galleria.classic', 'vendors/jquery-galleria');
}); });
gulp.task('build-galleria-js', ['build-galleria-js-classic'], function(){ gulp.task('build-galleria-js', ['build-galleria-js-classic'], function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'jquery-galleria/src/galleria.js' config.paths.nodes + 'galleria/src/galleria.js'
], 'galleria', 'vendors/jquery-galleria'); ], 'galleria', 'vendors/jquery-galleria');
}); });
gulp.task('build-jquery-galleria', ['build-galleria-js', 'build-galleria-css'], function(){ gulp.task('build-jquery-galleria', ['build-galleria-js', 'build-galleria-css'], function(){
// copy jquery mobile assets // copy jquery mobile assets
return gulp.src(config.paths.vendors + 'jquery-galleria/src/themes/classic/!(*.js|*.map|*.css|*.html)') return gulp.src(config.paths.nodes + 'galleria/src/themes/classic/!(*.js|*.map|*.css|*.html)')
.pipe(gulp.dest( config.paths.build + 'vendors/jquery-galleria')); .pipe(gulp.dest( config.paths.build + 'vendors/jquery-galleria'));
}); });

2
resources/gulp/components/vendors/jquery-lazyload.js vendored
View File

@@ -4,6 +4,6 @@ var utils = require('../../utils.js');
gulp.task('build-jquery-lazyload', function(){ gulp.task('build-jquery-lazyload', function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'jquery.lazyload/jquery.lazyload.js' config.paths.nodes + 'jquery-lazyload/jquery.lazyload.js'
], 'jquery.lazyload', 'vendors/jquery.lazyload'); ], 'jquery.lazyload', 'vendors/jquery.lazyload');
}); });

6
resources/gulp/components/vendors/jquery-mobile.js vendored
View File

@@ -4,18 +4,18 @@ var utils = require('../../utils.js');
gulp.task('build-jquery-mobile-css', function(){ gulp.task('build-jquery-mobile-css', function(){
return utils.buildCssGroup([ return utils.buildCssGroup([
config.paths.vendors + 'jquery-mobile-bower/css/jquery.mobile-1.3.2.css' config.paths.nodes + 'jquery-mobile/css/themes/default/jquery.mobile.css'
], 'jquery-mobile', 'vendors/jquery-mobile'); ], 'jquery-mobile', 'vendors/jquery-mobile');
}); });
gulp.task('build-jquery-mobile-js', function(){ gulp.task('build-jquery-mobile-js', function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'jquery-mobile-bower/js/jquery.mobile-1.3.2.js' config.paths.nodes + 'jquery-mobile/js/jquery.mobile.js'
], 'jquery-mobile', 'vendors/jquery-mobile'); ], 'jquery-mobile', 'vendors/jquery-mobile');
}); });
gulp.task('build-jquery-mobile', ['build-jquery-mobile-js', 'build-jquery-mobile-css'], function(){ gulp.task('build-jquery-mobile', ['build-jquery-mobile-js', 'build-jquery-mobile-css'], function(){
// copy jquery mobile assets // copy jquery mobile assets
return gulp.src(config.paths.vendors + 'jquery-mobile-bower/css/images/**/*') return gulp.src(config.paths.nodes + 'jquery-mobile-bower/css/themes/default/images/**/*')
.pipe(gulp.dest( config.paths.build + 'vendors/jquery-mobile/images')); .pipe(gulp.dest( config.paths.build + 'vendors/jquery-mobile/images'));
}); });

4
resources/gulp/components/vendors/jquery-treeview.js vendored
View File

@@ -3,7 +3,7 @@ var config = require('../../config.js');
var utils = require('../../utils.js'); var utils = require('../../utils.js');
gulp.task('copy-jquery-treeview-images', function(){ gulp.task('copy-jquery-treeview-images', function(){
return gulp.src([config.paths.vendors + 'jquery-treeview/images/**/*']) return gulp.src([config.paths.nodes + 'jquery-treeview/images/**/*'])
.pipe(gulp.dest( config.paths.build + 'vendors/jquery-treeview/images')); .pipe(gulp.dest( config.paths.build + 'vendors/jquery-treeview/images'));
}); });
gulp.task('build-jquery-treeview', ['copy-jquery-treeview-images'], function(){ gulp.task('build-jquery-treeview', ['copy-jquery-treeview-images'], function(){
@@ -12,6 +12,6 @@ gulp.task('build-jquery-treeview', ['copy-jquery-treeview-images'], function(){
config.paths.vendors + 'jquery-treeview/jquery.treeview.async.js' config.paths.vendors + 'jquery-treeview/jquery.treeview.async.js'
], 'jquery.treeview.async', 'vendors/jquery-treeview');*/ ], 'jquery.treeview.async', 'vendors/jquery-treeview');*/
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'jquery-treeview/jquery.treeview.js' config.paths.nodes + 'jquery-treeview/jquery.treeview.js'
], 'jquery.treeview', 'vendors/jquery-treeview'); ], 'jquery.treeview', 'vendors/jquery-treeview');
}); });

2
resources/gulp/components/vendors/jquery-ui.js vendored
View File

@@ -19,6 +19,6 @@ gulp.task('copy-jquery-ui-theme2', function(){
gulp.task('build-jquery-ui', ['copy-jquery-ui-images', 'copy-jquery-ui-theme1', 'copy-jquery-ui-theme2'], function(){ gulp.task('build-jquery-ui', ['copy-jquery-ui-images', 'copy-jquery-ui-theme1', 'copy-jquery-ui-theme2'], function(){
// copy jquery ui assets // copy jquery ui assets
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'jquery-ui/ui/jquery-ui.js' config.paths.nodes + 'jquery-ui-dist/jquery-ui.js'
], 'jquery-ui', 'vendors/jquery-ui'); ], 'jquery-ui', 'vendors/jquery-ui');
}); });

2
resources/gulp/components/vendors/jquery.js vendored
View File

@@ -4,6 +4,6 @@ var utils = require('../../utils.js');
gulp.task('build-jquery', function(){ gulp.task('build-jquery', function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'jquery/dist/jquery.js' config.paths.nodes + 'jquery/dist/jquery.js'
], 'jquery', 'vendors/jquery'); ], 'jquery', 'vendors/jquery');
}); });

2
resources/gulp/components/vendors/json2.js vendored
View File

@@ -4,6 +4,6 @@ var utils = require('../../utils.js');
gulp.task('build-json2', [], function(){ gulp.task('build-json2', [], function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'json2/json2.js' config.paths.nodes + 'JSON2/json2.js'
], 'json2', 'vendors/json2'); ], 'json2', 'vendors/json2');
}); });

2
resources/gulp/components/vendors/requirejs.js vendored
View File

@@ -4,6 +4,6 @@ var utils = require('../../utils.js');
gulp.task('build-requirejs', function(){ gulp.task('build-requirejs', function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'requirejs/require.js' config.paths.nodes + 'requirejs/require.js'
], 'require', 'vendors/requirejs'); ], 'require', 'vendors/requirejs');
}); });

2
resources/gulp/components/vendors/simple-colorpicker.js vendored
View File

@@ -7,6 +7,6 @@ gulp.task('build-simple-colorpicker', function () {
}); });
gulp.task('copy-simple-colorpicker', function () { gulp.task('copy-simple-colorpicker', function () {
return gulp.src(config.paths.vendors + 'jquery-simplecolorpicker/*') return gulp.src(config.paths.nodes + 'jquery-simplecolorpicker/*')
.pipe(gulp.dest(config.paths.build + 'vendors/jquery-simplecolorpicker')); .pipe(gulp.dest(config.paths.build + 'vendors/jquery-simplecolorpicker'));
}); });

2
resources/gulp/components/vendors/tinymce.js vendored
View File

@@ -3,6 +3,6 @@ var config = require('../../config.js');
var utils = require('../../utils.js'); var utils = require('../../utils.js');
gulp.task('build-tinymce', [], function(){ gulp.task('build-tinymce', [], function(){
return gulp.src([config.paths.vendors + 'tinymce/**']) return gulp.src([config.paths.nodes + 'tinymce/**'])
.pipe(gulp.dest(config.paths.build + 'vendors/tinymce')); .pipe(gulp.dest(config.paths.build + 'vendors/tinymce'));
}); });

2
resources/gulp/components/vendors/zxcvbn.js vendored
View File

@@ -4,6 +4,6 @@ var utils = require('../../utils.js');
gulp.task('build-zxcvbn', [], function(){ gulp.task('build-zxcvbn', [], function(){
return utils.buildJsGroup([ return utils.buildJsGroup([
config.paths.vendors + 'zxcvbn/dist/zxcvbn.js' config.paths.nodes + 'zxcvbn/dist/zxcvbn.js'
], 'zxcvbn', 'vendors/zxcvbn'); ], 'zxcvbn', 'vendors/zxcvbn');
}); });

3
resources/gulp/config.js
View File

@@ -5,7 +5,8 @@ var configPaths = {
src: 'resources/www/', src: 'resources/www/',
vendors: 'www/bower_components/', vendors: 'www/bower_components/',
build: 'www/assets/', build: 'www/assets/',
dist: 'www/' dist: 'www/',
nodes: 'node_modules/'
}; };
exports.paths = configPaths; exports.paths = configPaths;

2
resources/www/account/styles/main.scss
View File

@@ -5,7 +5,7 @@
@import '../../vendors/bootstrap/bootstrap'; @import '../../vendors/bootstrap/bootstrap';
@import 'skin'; @import 'skin';
@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss'; @import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss';
@import '../../../../www/bower_components/jquery-ui/themes/base/jquery.ui.autocomplete'; // not extension for inline import @import '../../../../node_modules/jquery-ui/themes/base/autocomplete'; // not extension for inline import
$mainMenuBackgroundColor: #3b3b3b; $mainMenuBackgroundColor: #3b3b3b;
$mainMenuLinkColor: #A6A6A6; $mainMenuLinkColor: #A6A6A6;

3
resources/www/admin/styles/main.scss
View File

@@ -1,7 +1,8 @@
@import '../../_shared/styles/variables'; @import '../../_shared/styles/variables';
@import '../../vendors/jquery-treeview/jquery.treeview'; // to inline import css file, don't put extension @import '../../vendors/jquery-treeview/jquery.treeview'; // to inline import css file, don't put extension
@import '../../../../www/bower_components/jquery-file-upload/css/jquery.fileupload-ui'; // to inline import css file, don't put extension @import '../../../../node_modules/blueimp-file-upload/css/jquery.fileupload-ui';
// to inline import css file, don't put extension
@import '../../vendors/jquery-contextmenu/styles/jquery.contextmenu'; @import '../../vendors/jquery-contextmenu/styles/jquery.contextmenu';
@import '../../_shared/styles/main'; @import '../../_shared/styles/main';

2
resources/www/authentication/styles/main.scss
View File

@@ -4,4 +4,4 @@
@import '../../account/styles/skin'; @import '../../account/styles/skin';
@import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss'; @import '../../../../www/bower_components/font-awesome/scss/font-awesome.scss';
@import '../../../../www/bower_components/jquery-ui/themes/base/jquery.ui.autocomplete'; // not extension for inline import @import '../../../../node_modules/jquery-ui/themes/base/autocomplete'; // not extension for inline import

70
resources/www/vendors/bootstrap/bootstrap.scss vendored
View File

@@ -10,55 +10,57 @@
// Core variables and mixins // Core variables and mixins
@import "variables"; // Modify this for custom colors, font-sizes, etc @import "variables"; // Modify this for custom colors, font-sizes, etc
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/mixins"; @import "../../../../node_modules/bootstrap-sass/lib/_mixins";
// CSS Reset // CSS Reset
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/reset"; @import "../../../../node_modules/bootstrap-sass/lib/_reset";
// Grid system and page structure // Grid system and page structure
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/scaffolding"; @import "../../../../node_modules/bootstrap-sass/lib/_scaffolding";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/grid"; @import "../../../../node_modules/bootstrap-sass/lib/_grid";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/layouts"; @import "../../../../node_modules/bootstrap-sass/lib/_layouts";
// Base CSS // Base CSS
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/type"; @import "../../../../node_modules/bootstrap-sass/lib/_type";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/code"; @import "../../../../node_modules/bootstrap-sass/lib/_code";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/forms"; @import "../../../../node_modules/bootstrap-sass/lib/_forms";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/tables"; @import "../../../../node_modules/bootstrap-sass/lib/_tables";
// Components: common // Components: common
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/sprites"; @import "../../../../node_modules/bootstrap-sass/lib/_sprites";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/dropdowns"; @import "../../../../node_modules/bootstrap-sass/lib/_dropdowns";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/wells"; @import "../../../../node_modules/bootstrap-sass/lib/_wells";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/component-animations"; @import "../../../../node_modules/bootstrap-sass/lib/_component-animations";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/close"; @import "../../../../node_modules/bootstrap-sass/lib/_close";
// Components: Buttons & Alerts // Components: Buttons & Alerts
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/buttons"; @import "../../../../node_modules/bootstrap-sass/lib/_buttons";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/button-groups"; @import "../../../../node_modules/bootstrap-sass/lib/_button-groups";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons @import "../../../../node_modules/bootstrap-sass/lib/_alerts";
// Note: alerts share common CSS with buttons and thus have styles in buttons
// Components: Nav // Components: Nav
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/navs"; @import "../../../../node_modules/bootstrap-sass/lib/_navs";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/navbar"; @import "../../../../node_modules/bootstrap-sass/lib/_navbar";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/breadcrumbs"; @import "../../../../node_modules/bootstrap-sass/lib/_breadcrumbs";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/pagination"; @import "../../../../node_modules/bootstrap-sass/lib/_pagination";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/pager"; @import "../../../../node_modules/bootstrap-sass/lib/_pager";
// Components: Popovers // Components: Popovers
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/modals"; @import "../../../../node_modules/bootstrap-sass/lib/_modals";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/tooltip"; @import "../../../../node_modules/bootstrap-sass/lib/_tooltip";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/popovers"; @import "../../../../node_modules/bootstrap-sass/lib/_popovers";
// Components: Misc // Components: Misc
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/thumbnails"; @import "../../../../node_modules/bootstrap-sass/lib/_thumbnails";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/media"; @import "../../../../node_modules/bootstrap-sass/lib/_media";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/labels-badges"; @import "../../../../node_modules/bootstrap-sass/lib/_labels-badges";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/progress-bars"; @import "../../../../node_modules/bootstrap-sass/lib/_progress-bars";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/accordion"; @import "../../../../node_modules/bootstrap-sass/lib/_accordion";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/carousel"; @import "../../../../node_modules/bootstrap-sass/lib/_carousel";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/hero-unit"; @import "../../../../node_modules/bootstrap-sass/lib/_hero-unit";
// Utility classes // Utility classes
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/utilities"; // Has to be last to override when necessary @import "../../../../node_modules/bootstrap-sass/lib/_utilities";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/responsive-utilities"; // Has to be last to override when necessary
@import "../../../../node_modules/bootstrap-sass/lib/_responsive-utilities";

13
resources/www/vendors/bootstrap/responsive.scss vendored
View File

@@ -19,30 +19,29 @@
// Required since we compile the responsive stuff separately // Required since we compile the responsive stuff separately
@import "variables"; // Modify this for custom colors, font-sizes, etc @import "variables"; // Modify this for custom colors, font-sizes, etc
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/mixins"; @import "../../../../node_modules/bootstrap-sass/lib/_mixins";
// RESPONSIVE CLASSES // RESPONSIVE CLASSES
// ------------------ // ------------------
@import "../../../../node_modules/bootstrap-sass/lib/_responsive-utilities";
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/responsive-utilities";
// MEDIA QUERIES // MEDIA QUERIES
// ------------------ // ------------------
// Large desktops // Large desktops
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/responsive-1200px-min"; @import "../../../../node_modules/bootstrap-sass/lib/_responsive-1200px-min";
// Tablets to regular desktops // Tablets to regular desktops
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/responsive-768px-979px"; @import "../../../../node_modules/bootstrap-sass/lib/_responsive-768px-979px";
// Phones to portrait tablets and narrow desktops // Phones to portrait tablets and narrow desktops
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/responsive-767px-max"; @import "../../../../node_modules/bootstrap-sass/lib/_responsive-767px-max";
// RESPONSIVE NAVBAR // RESPONSIVE NAVBAR
// ------------------ // ------------------
// From 979px and below, show a button to toggle navbar contents // From 979px and below, show a button to toggle navbar contents
@import "../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/responsive-navbar"; @import "../../../../node_modules/bootstrap-sass/lib/_responsive-navbar";

2
templates/web/admin/index.html.twig
View File

@@ -8,7 +8,7 @@
{% endblock %} {% endblock %}
{% block stylesheet %} {% block stylesheet %}
<link rel="stylesheet" href="/bower_components/jquery-simplecolorpicker/jquery.simplecolorpicker.css"> <link rel="stylesheet" href="/assets/vendors/jquery-simplecolorpicker/jquery.simplecolorpicker.css">
<link type="text/css" rel="stylesheet" href="/assets/admin/css/admin{% if not app.debug %}.min{% endif %}.css" /> <link type="text/css" rel="stylesheet" href="/assets/admin/css/admin{% if not app.debug %}.min{% endif %}.css" />
{% endblock %} {% endblock %}