Merge remote-tracking branch 'origin/development'

composer.json

@@ -15,7 +15,7 @@
         "slim/psr7": "^1.1.0",
         "slim/http": "^1.0",
         "slim/twig-view": "^3.0.0",
-        "slim/csrf": "^1.0",
+        "slim/csrf": "^1.3",
         "slim/flash": "^0.4.0",
         "php-di/php-di": "^6.0",
         "dflydev/fig-cookies": "^3.0",
@@ -30,7 +30,7 @@
         "robthree/twofactorauth": "^1.7",
         "endroid/qr-code": "^4.1",
         "minishlink/web-push": "^7.0",
-        "phpoffice/phpword": "^0.18.1"
+        "phpoffice/phpword": "^1.0"
     },
     "autoload": {
         "psr-4": {

gulpfile.js

@@ -87,7 +87,6 @@ function copyJSTask(cb) {
     return gulp
         .src( [ 
             './node_modules/flatpickr/dist/flatpickr.min.js',
-            './node_modules/chart.js/dist/chart.min.js',
             './node_modules/leaflet.locatecontrol/dist/L.Control.Locate.min.js',
             './node_modules/leaflet-curve/leaflet.curve.js',
             './node_modules/leaflet-extra-markers/dist/js/leaflet.extra-markers.min.js',
@@ -139,6 +138,17 @@ function renameJS(cb) {
         .pipe( gulp.dest( 'public/static/assets/js' ) );
 }
 
+function renameJS2(cb) {
+    return gulp
+        .src( [ 
+            './node_modules/chart.js/dist/chart.umd.js',
+            ] )
+         // remove source map
+        .pipe(replace(/\/\/# sourceMappingURL=(.?)*\.js\.map/g, ""))
+        .pipe( rename("chart.min.js") )
+        .pipe( gulp.dest( 'public/static/assets/js' ) );
+}
+
 function copyFlatpickrI10n(cb) {
     return gulp
         .src( [ 
@@ -175,6 +185,7 @@ function copyAndMinifyCSS(cb) {
     return gulp
         .src( [ 
             './node_modules/normalize.css/normalize.css',
+            './node_modules/leaflet.locatecontrol/dist/L.Control.Locate.css',
             ] )
         .pipe( minifyCSS() )
         .pipe( rename( {
@@ -259,25 +270,6 @@ function replaceLeafletRoutingIconCSS(cb) {
         .pipe( gulp.dest( 'public/static/assets/css' ) );
 }
 
-function copyLeafletLocateControlIcons(cb) {
-    return gulp.src( './node_modules/leaflet.locatecontrol/*.svg', )
-        .pipe( gulp.dest( 'public/static/assets/images/leaflet-locatecontrol' ) );
-}
-
-function replaceLeafletLocateControlIconCSS(cb) {
-    return gulp
-        .src( [ 
-            './node_modules/leaflet.locatecontrol/dist/L.Control.Locate.css',
-            ] )
-        .pipe( replace("../location-arrow-solid.svg", "../images/leaflet-locatecontrol/location-arrow-solid.svg") )
-        .pipe( replace("../spinner-solid.svg", "../images/leaflet-locatecontrol/spinner-solid.svg") )
-        .pipe( minifyCSS() )
-        .pipe( rename( {
-            suffix: '.min'
-        } ) )
-        .pipe( gulp.dest( 'public/static/assets/css' ) );
-}
-
 function copyFontsWeatherIconsTask(cb) {
     return gulp.src( './node_modules/weather-icons/font/**.*' )
         .pipe( gulp.dest( 'public/static/assets/fonts/weather-icons' ) );
@@ -335,7 +327,7 @@ function printError( error ) {
 exports.sass = sassTask;
 exports.uglify = uglifyTask;
 exports.default = watchTask;
-exports.copy = gulp.series(copyJSTask, copyAndMinifyJS, renameJS, copyFlatpickrI10n, copyFlatpickrI10nEN, copyCSSTask, copyAndMinifyCSS, replaceLeafletFullscreenIcon, copyLeafletFullscreenIcons, copyLeafletExtraMarkersIcons, copyLeafletIcons, replaceLeafletIconCSS, replaceLeafletExtraMarkersIconCSS, copyLeafletRoutingIcons, replaceLeafletRoutingIconCSS, copyLeafletLocateControlIcons, replaceLeafletLocateControlIconCSS, copyFontsWeatherIconsTask, replaceAutocompleteIcons, replaceFontWeatherIcons, copyAutocompleteIcon, copyFontsFontAwesome5SVG, copyDOCXJS);
+exports.copy = gulp.series(copyJSTask, copyAndMinifyJS, renameJS, renameJS2, copyFlatpickrI10n, copyFlatpickrI10nEN, copyCSSTask, copyAndMinifyCSS, replaceLeafletFullscreenIcon, copyLeafletFullscreenIcons, copyLeafletExtraMarkersIcons, copyLeafletIcons, replaceLeafletIconCSS, replaceLeafletExtraMarkersIconCSS, copyLeafletRoutingIcons, replaceLeafletRoutingIconCSS, copyFontsWeatherIconsTask, replaceAutocompleteIcons, replaceFontWeatherIcons, copyAutocompleteIcon, copyFontsFontAwesome5SVG, copyDOCXJS);
 
 exports.weather = gulp.series(copyFontsWeatherIconsTask, replaceFontWeatherIcons);
 exports.test = copyFontsFontAwesome5SVG;