diff --git a/gulpfile.js b/gulpfile.js index 5014cbd7a..8b8c1b584 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -52,7 +52,7 @@ const inquirer = require('inquirer'); // Configurazione const config = { production: 'public/assets', // Cartella di destinazione - development: 'legacy/assets/src', // Cartella dei file di personalizzazione + development: 'vendor/devcode-it/legacy/assets/src', // Cartella dei file di personalizzazione debug: false, nodeDirectory: './node_modules', // Percorso per node_modules paths: { @@ -313,14 +313,6 @@ function chartjs() { .pipe(gulp.dest(config.production + '/' + config.paths.js + '/chartjs')); } -function csrf() { - return gulp.src([ - './vendor/owasp/csrf-protector-php/js/csrfprotector.js', - ]) - .pipe(flatten()) - .pipe(gulp.dest(config.production + '/' + config.paths.js + '/csrf')); -} - function pdfjs() { const web = gulp.src([ config.nodeDirectory + '/pdf.js/web/**/*', @@ -489,7 +481,7 @@ function clean() { } // Operazioni di default per la generazione degli assets -const bower = gulp.series(clean, gulp.parallel(JS, CSS, images, fonts, phpDebugBar, ckeditor, colorpicker, i18n, pdfjs, hotkeys, chartjs, password_strength, csrf)); +const bower = gulp.series(clean, gulp.parallel(JS, CSS, images, fonts, phpDebugBar, ckeditor, colorpicker, i18n, pdfjs, hotkeys, chartjs, password_strength)); // Debug su CSS e JS exports.srcJS = srcJS; diff --git a/package.json b/package.json index afd985d08..6e365eb27 100644 --- a/package.json +++ b/package.json @@ -74,6 +74,7 @@ "scripts": { "gulp": "gulp", "develop-OSM": "php composer.phar update && yarn install && npm run gulp", + "build": "npm run gulp", "dev": "npm run development", "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --config=node_modules/laravel-mix/setup/webpack.config.js", "watch": "npm run development -- --watch", diff --git a/resources/img/ajax-loader.gif b/resources/img/ajax-loader.gif new file mode 100644 index 000000000..cc70a7a8b Binary files /dev/null and b/resources/img/ajax-loader.gif differ diff --git a/resources/img/favicon.png b/resources/img/favicon.png new file mode 100644 index 000000000..63def4f30 Binary files /dev/null and b/resources/img/favicon.png differ diff --git a/resources/img/help.png b/resources/img/help.png new file mode 100644 index 000000000..bb4ce6eac Binary files /dev/null and b/resources/img/help.png differ diff --git a/resources/img/logo.png b/resources/img/logo.png new file mode 100644 index 000000000..39604dba5 Binary files /dev/null and b/resources/img/logo.png differ diff --git a/resources/img/logo_completo.png b/resources/img/logo_completo.png new file mode 100644 index 000000000..8ac0d15fb Binary files /dev/null and b/resources/img/logo_completo.png differ diff --git a/resources/img/progress.gif b/resources/img/progress.gif new file mode 100644 index 000000000..cb59a04f9 Binary files /dev/null and b/resources/img/progress.gif differ diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php index 6873b9dec..232a27d86 100644 --- a/resources/views/auth/forgot-password.blade.php +++ b/resources/views/auth/forgot-password.blade.php @@ -7,7 +7,7 @@
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index d5027a85b..49ce2f665 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -7,7 +7,7 @@
diff --git a/resources/views/auth/password-reset.blade.php b/resources/views/auth/password-reset.blade.php index a488c8353..07b94a801 100644 --- a/resources/views/auth/password-reset.blade.php +++ b/resources/views/auth/password-reset.blade.php @@ -7,7 +7,7 @@