Correzioni minori sulle dipendenze

This commit is contained in:
Thomas Zilio 2021-10-18 10:10:37 +02:00
parent 9d831ea808
commit 4655be391d
13 changed files with 8 additions and 15 deletions

12
gulpfile.js vendored
View File

@ -52,7 +52,7 @@ const inquirer = require('inquirer');
// Configurazione // Configurazione
const config = { const config = {
production: 'public/assets', // Cartella di destinazione 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, debug: false,
nodeDirectory: './node_modules', // Percorso per node_modules nodeDirectory: './node_modules', // Percorso per node_modules
paths: { paths: {
@ -313,14 +313,6 @@ function chartjs() {
.pipe(gulp.dest(config.production + '/' + config.paths.js + '/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() { function pdfjs() {
const web = gulp.src([ const web = gulp.src([
config.nodeDirectory + '/pdf.js/web/**/*', config.nodeDirectory + '/pdf.js/web/**/*',
@ -489,7 +481,7 @@ function clean() {
} }
// Operazioni di default per la generazione degli assets // 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 // Debug su CSS e JS
exports.srcJS = srcJS; exports.srcJS = srcJS;

View File

@ -74,6 +74,7 @@
"scripts": { "scripts": {
"gulp": "gulp", "gulp": "gulp",
"develop-OSM": "php composer.phar update && yarn install && npm run gulp", "develop-OSM": "php composer.phar update && yarn install && npm run gulp",
"build": "npm run gulp",
"dev": "npm run development", "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", "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", "watch": "npm run development -- --watch",

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
resources/img/favicon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
resources/img/help.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

BIN
resources/img/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

BIN
resources/img/progress.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

View File

@ -7,7 +7,7 @@
<div class="login-box box-center-large"> <div class="login-box box-center-large">
<div class="login-logo"> <div class="login-logo">
<a href="//openstamanager.com" target="_blank"> <a href="//openstamanager.com" target="_blank">
<img src="{{ url('/') }}/assets/img/full_logo.png" style="max-width: 360px"> <img src="{{ url('/') }}/assets/img/logo_completo.png" style="max-width: 360px">
</a> </a>
</div> </div>

View File

@ -7,7 +7,7 @@
<div class="login-box"> <div class="login-box">
<div class="login-logo"> <div class="login-logo">
<a href="//openstamanager.com" target="_blank"> <a href="//openstamanager.com" target="_blank">
<img src="{{ url('/') }}/assets/img/full_logo.png" style="max-width: 360px"> <img src="{{ url('/') }}/assets/img/logo_completo.png" style="max-width: 360px">
</a> </a>
</div> </div>

View File

@ -7,7 +7,7 @@
<div class="login-box box-center-large"> <div class="login-box box-center-large">
<div class="login-logo"> <div class="login-logo">
<a href="//openstamanager.com" target="_blank"> <a href="//openstamanager.com" target="_blank">
<img src="{{ url('/') }}/assets/img/full_logo.png" style="max-width: 360px"> <img src="{{ url('/') }}/assets/img/logo_completo.png" style="max-width: 360px">
</a> </a>
</div> </div>

View File

@ -9,7 +9,7 @@
@csrf @csrf
<div class="py-5 text-center" style="margin-top: 40px"> <div class="py-5 text-center" style="margin-top: 40px">
<img class="d-block mx-auto mb-4" src="{{ url('/') }}/assets/img/full_logo.png" alt="{{ tr('Logo OpenSTAManager') }}"> <img class="d-block mx-auto mb-4" src="{{ url('/') }}/assets/img/logo_completo.png" alt="{{ tr('Logo OpenSTAManager') }}">
<h2>{!! tr('Benvenuto in _NAME_!', ['_NAME_' => '<strong>'.tr('OpenSTAManager').'</strong>']) !!}</h2> <h2>{!! tr('Benvenuto in _NAME_!', ['_NAME_' => '<strong>'.tr('OpenSTAManager').'</strong>']) !!}</h2>
<p class="lead">{!! tr('Puoi procedere alla configurazione tecnica del software attraverso i parametri seguenti, che potranno essere corretti secondo necessità tramite il file _FILE_', ['_FILE_' => '<i>.env</i>']) !!}. </p> <p class="lead">{!! tr('Puoi procedere alla configurazione tecnica del software attraverso i parametri seguenti, che potranno essere corretti secondo necessità tramite il file _FILE_', ['_FILE_' => '<i>.env</i>']) !!}. </p>

View File

@ -6,7 +6,7 @@
@section('body') @section('body')
<div class="container pb-5"> <div class="container pb-5">
<div class="py-5 text-center" style="margin-top: 40px"> <div class="py-5 text-center" style="margin-top: 40px">
<img class="d-block mx-auto mb-4" src="{{ url('/') }}/assets/img/full_logo.png" alt="{{ tr('Logo OpenSTAManager') }}"> <img class="d-block mx-auto mb-4" src="{{ url('/') }}/assets/img/logo_completo.png" alt="{{ tr('Logo OpenSTAManager') }}">
<h2>{!! tr('Inizializzazione di _NAME_!', ['_NAME_' => '<strong>'.tr('OpenSTAManager').'</strong>']) !!}</h2> <h2>{!! tr('Inizializzazione di _NAME_!', ['_NAME_' => '<strong>'.tr('OpenSTAManager').'</strong>']) !!}</h2>
<p class="lead">{{ tr("Completa la configurazione del gestionale inserendo le ultime informazioni di base") }}. </p> <p class="lead">{{ tr("Completa la configurazione del gestionale inserendo le ultime informazioni di base") }}. </p>
</div> </div>