Synchro back-office, fix on tariffs

This commit is contained in:
Ludovic CANDELLIER
2021-10-26 21:41:46 +02:00
parent c150be2c3e
commit 86f6ee9a13
45 changed files with 1095 additions and 406 deletions

View File

@@ -14,6 +14,19 @@ var jsCompat = [
'node_modules/es6-promise/dist/es6-promise.min.js',
]
var jsSite = [
jsBase,
jsBootstrap,
'build/js/site.js',
]
var cssSite = [
'node_modules/bootstrap/dist/css/bootstrap.min.css',
'node_modules/@fortawesome/fontawesome-free/css/all.min.css',
'node_modules/animate.css/animate.min.css',
'build/css/site.css',
]
var jsAdminLTE = [
jsBase,
jsBootstrap,
@@ -88,7 +101,7 @@ var jsMain = [
var cssPrint = [
// 'node_modules/bootstrap/dist/css/bootstrap.min.css',
'node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css',
'cssIcons',
'build/print.css'
]
@@ -179,7 +192,8 @@ module.exports = function(grunt) {
'public/assets/js/main.min.js': jsMain,
'public/assets/css/main.min.css': cssMain,
'public/assets/plugins/datatables.min.js': jsDataTables,
'public/assets/plugins/adminlte/adminlte.min.js': jsAdminLTE
'public/assets/plugins/adminlte/adminlte.min.js': jsAdminLTE,
'public/js/site.min.js': jsSite,
},
]
},
@@ -194,6 +208,14 @@ module.exports = function(grunt) {
options: {
separator: '\n'
},
sitecss: {
src: cssSite,
dest: 'public/css/site.min.css'
},
siteJs: {
src: jsSite,
dest: 'public/js/site.min.js'
},
mainjs: {
src: jsMain,
dest: 'public/assets/js/main.min.js'
@@ -232,6 +254,9 @@ module.exports = function(grunt) {
{
'public/assets/css/print.min.css': cssPrint
},
{
'public/css/site.min.css': cssSite
},
]
}
},
@@ -242,13 +267,13 @@ module.exports = function(grunt) {
expand: true,
cwd: 'node_modules/@fortawesome/fontawesome-free/webfonts/',
src: ['**'],
dest: 'public/assets/fonts/'
dest: 'public/webfonts/'
},
{
expand: true,
cwd: 'build/fonts',
src: ['**'],
dest: 'public/assets/fonts/'
dest: 'public/webfonts/'
},
{
expand: true,