css/js admin

package.json

@@ -1,7 +1,7 @@
 {
     "devDependencies": {
         "@symfony/stimulus-bridge": "^2.0.0",
-        "@symfony/webpack-encore": "^1.0.0",
+        "@symfony/webpack-encore": "^1.4.0",
         "core-js": "^3.0.0",
         "regenerator-runtime": "^0.13.2",
         "sass": "^1.34.0",

public/build/adminlte-form.js

@@ -1,25 +1,45 @@
 (self["webpackChunk"] = self["webpackChunk"] || []).push([["adminlte-form"],{
 
+<<<<<<< HEAD
 /***/ "../LaClicBundle/SovBundle/Resources/assets/app/adminlte/form/app.form.js":
 /*!********************************************************************************!*\
   !*** ../LaClicBundle/SovBundle/Resources/assets/app/adminlte/form/app.form.js ***!
   \********************************************************************************/
+=======
+/***/ "../LaclicBundles/SovBundle/Resources/assets/app/adminlte/form/app.form.js":
+/*!*********************************************************************************!*\
+  !*** ../LaclicBundles/SovBundle/Resources/assets/app/adminlte/form/app.form.js ***!
+  \*********************************************************************************/
+>>>>>>> 785c411f98702d0ace08d5e8a56615e37d017d2e
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+<<<<<<< HEAD
 /* harmony import */ var _form_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./form.js */ "../LaClicBundle/SovBundle/Resources/assets/app/adminlte/form/form.js");
 /* harmony import */ var _form_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_form_js__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _form_scss__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./form.scss */ "../LaClicBundle/SovBundle/Resources/assets/app/adminlte/form/form.scss");
+=======
+/* harmony import */ var _form_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./form.js */ "../LaclicBundles/SovBundle/Resources/assets/app/adminlte/form/form.js");
+/* harmony import */ var _form_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_form_js__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _form_scss__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./form.scss */ "../LaclicBundles/SovBundle/Resources/assets/app/adminlte/form/form.scss");
+>>>>>>> 785c411f98702d0ace08d5e8a56615e37d017d2e
 
 
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ "../LaClicBundle/SovBundle/Resources/assets/app/adminlte/form/form.js":
 /*!****************************************************************************!*\
   !*** ../LaClicBundle/SovBundle/Resources/assets/app/adminlte/form/form.js ***!
   \****************************************************************************/
+=======
+/***/ "../LaclicBundles/SovBundle/Resources/assets/app/adminlte/form/form.js":
+/*!*****************************************************************************!*\
+  !*** ../LaclicBundles/SovBundle/Resources/assets/app/adminlte/form/form.js ***!
+  \*****************************************************************************/
+>>>>>>> 785c411f98702d0ace08d5e8a56615e37d017d2e
 /***/ ((__unused_webpack_module, __unused_webpack_exports, __webpack_require__) => {
 
 __webpack_require__(/*! core-js/modules/es.array.find.js */ "./node_modules/core-js/modules/es.array.find.js");
@@ -44,10 +64,17 @@ $('button[type="submit"]').on('click', function (e) {
 
 /***/ }),
 
+<<<<<<< HEAD
 /***/ "../LaClicBundle/SovBundle/Resources/assets/app/adminlte/form/form.scss":
 /*!******************************************************************************!*\
   !*** ../LaClicBundle/SovBundle/Resources/assets/app/adminlte/form/form.scss ***!
   \******************************************************************************/
+=======
+/***/ "../LaclicBundles/SovBundle/Resources/assets/app/adminlte/form/form.scss":
+/*!*******************************************************************************!*\
+  !*** ../LaclicBundles/SovBundle/Resources/assets/app/adminlte/form/form.scss ***!
+  \*******************************************************************************/
+>>>>>>> 785c411f98702d0ace08d5e8a56615e37d017d2e
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 "use strict";
@@ -62,8 +89,16 @@ __webpack_require__.r(__webpack_exports__);
 /******/ "use strict";
 /******/ 
 /******/ var __webpack_exec__ = (moduleId) => (__webpack_require__(__webpack_require__.s = moduleId))
+<<<<<<< HEAD
 /******/ __webpack_require__.O(0, ["vendors-node_modules_core-js_internals_a-function_js-node_modules_core-js_internals_export_js","vendors-node_modules_core-js_modules_es_array_find_js"], () => (__webpack_exec__("../LaClicBundle/SovBundle/Resources/assets/app/adminlte/form/app.form.js")));
 /******/ var __webpack_exports__ = __webpack_require__.O();
 /******/ }
 ]);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi4vTGFDbGljQnVuZGxlL1NvdkJ1bmRsZS9SZXNvdXJjZXMvYXNzZXRzL2FwcC9hZG1pbmx0ZS9mb3JtL2FwcC5mb3JtLmpzIiwid2VicGFjazovLy8uLi9MYUNsaWNCdW5kbGUvU292QnVuZGxlL1Jlc291cmNlcy9hc3NldHMvYXBwL2FkbWlubHRlL2Zvcm0vZm9ybS5qcyIsIndlYnBhY2s6Ly8vLi4vTGFDbGljQnVuZGxlL1NvdkJ1bmRsZS9SZXNvdXJjZXMvYXNzZXRzL2FwcC9hZG1pbmx0ZS9mb3JtL2Zvcm0uc2NzcyJdLCJuYW1lcyI6WyJjaGVja0Zvcm0iLCIkIiwiYWRkQ2xhc3MiLCJmaW5kIiwibGVuZ3RoIiwiZWFjaCIsImkiLCJwYW5lbCIsInJlbW92ZUNsYXNzIiwib24iLCJlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7O0FBQ0E7Ozs7Ozs7Ozs7Ozs7QUNDQSxTQUFTQSxTQUFULEdBQXFCO0FBQ2pCQyxHQUFDLENBQUMsTUFBRCxDQUFELENBQVVDLFFBQVYsQ0FBbUIsV0FBbkIsRUFEaUIsQ0FFakI7O0FBQ0EsTUFBSUQsQ0FBQyxDQUFDLE1BQUQsQ0FBRCxDQUFVRSxJQUFWLENBQWUsV0FBZixFQUE0QkMsTUFBaEMsRUFBd0M7QUFDcENILEtBQUMsQ0FBQyxNQUFELENBQUQsQ0FBVUUsSUFBVixDQUFlLFdBQWYsRUFBNEJFLElBQTVCLENBQWlDLFVBQVVDLENBQVYsRUFBYUMsS0FBYixFQUFvQjtBQUNqRCxVQUFJTixDQUFDLENBQUNNLEtBQUQsQ0FBRCxDQUFTSixJQUFULENBQWMsVUFBZCxFQUEwQkMsTUFBOUIsRUFBc0M7QUFDbENILFNBQUMsQ0FBQyxhQUFELENBQUQsQ0FBaUJFLElBQWpCLENBQXNCLGtCQUFrQkcsQ0FBbEIsR0FBc0IsR0FBNUMsRUFBaURKLFFBQWpELENBQTBELGFBQTFEO0FBQ0gsT0FGRCxNQUVPO0FBQ0hELFNBQUMsQ0FBQyxhQUFELENBQUQsQ0FBaUJFLElBQWpCLENBQXNCLGtCQUFrQkcsQ0FBbEIsR0FBc0IsR0FBNUMsRUFBaURFLFdBQWpELENBQTZELGFBQTdEO0FBQ0g7QUFDSixLQU5EO0FBT0g7QUFDSjs7QUFFRFAsQ0FBQyxDQUFDLHVCQUFELENBQUQsQ0FBMkJRLEVBQTNCLENBQThCLE9BQTlCLEVBQXVDLFVBQVVDLENBQVYsRUFBYTtBQUVoRFYsV0FBUztBQUNaLENBSEQsRTs7Ozs7Ozs7Ozs7O0FDaEJBIiwiZmlsZSI6ImFkbWlubHRlLWZvcm0uanMiLCJzb3VyY2VzQ29udGVudCI6WyJcbmltcG9ydCAnLi9mb3JtLmpzJ1xuaW1wb3J0ICcuL2Zvcm0uc2NzcyciLCJcblxuZnVuY3Rpb24gY2hlY2tGb3JtKCkge1xuICAgICQoJ2Zvcm0nKS5hZGRDbGFzcygnZm9ybS1zZW50Jyk7XG4gICAgLy9QYW5lbCB2dWVzIGpzXG4gICAgaWYgKCQoJ2Zvcm0nKS5maW5kKCcudGFiLXBhbmUnKS5sZW5ndGgpIHtcbiAgICAgICAgJCgnZm9ybScpLmZpbmQoJy50YWItcGFuZScpLmVhY2goZnVuY3Rpb24gKGksIHBhbmVsKSB7XG4gICAgICAgICAgICBpZiAoJChwYW5lbCkuZmluZCgnOmludmFsaWQnKS5sZW5ndGgpIHtcbiAgICAgICAgICAgICAgICAkKCcjbmF2LXBhcmFtcycpLmZpbmQoJy5uYXYtaXRlbTplcSgnICsgaSArICcpJykuYWRkQ2xhc3MoJ2hhcy1pbnZhbGlkJyk7XG4gICAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgICAgICQoJyNuYXYtcGFyYW1zJykuZmluZCgnLm5hdi1pdGVtOmVxKCcgKyBpICsgJyknKS5yZW1vdmVDbGFzcygnaGFzLWludmFsaWQnKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfSlcbiAgICB9XG59XG5cbiQoJ2J1dHRvblt0eXBlPVwic3VibWl0XCJdJykub24oJ2NsaWNrJywgZnVuY3Rpb24gKGUpIHtcblxuICAgIGNoZWNrRm9ybSgpO1xufSkiLCIvLyBleHRyYWN0ZWQgYnkgbWluaS1jc3MtZXh0cmFjdC1wbHVnaW5cbmV4cG9ydCB7fTsiXSwic291cmNlUm9vdCI6IiJ9
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi4vTGFDbGljQnVuZGxlL1NvdkJ1bmRsZS9SZXNvdXJjZXMvYXNzZXRzL2FwcC9hZG1pbmx0ZS9mb3JtL2FwcC5mb3JtLmpzIiwid2VicGFjazovLy8uLi9MYUNsaWNCdW5kbGUvU292QnVuZGxlL1Jlc291cmNlcy9hc3NldHMvYXBwL2FkbWlubHRlL2Zvcm0vZm9ybS5qcyIsIndlYnBhY2s6Ly8vLi4vTGFDbGljQnVuZGxlL1NvdkJ1bmRsZS9SZXNvdXJjZXMvYXNzZXRzL2FwcC9hZG1pbmx0ZS9mb3JtL2Zvcm0uc2NzcyJdLCJuYW1lcyI6WyJjaGVja0Zvcm0iLCIkIiwiYWRkQ2xhc3MiLCJmaW5kIiwibGVuZ3RoIiwiZWFjaCIsImkiLCJwYW5lbCIsInJlbW92ZUNsYXNzIiwib24iLCJlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7O0FBQ0E7Ozs7Ozs7Ozs7Ozs7QUNDQSxTQUFTQSxTQUFULEdBQXFCO0FBQ2pCQyxHQUFDLENBQUMsTUFBRCxDQUFELENBQVVDLFFBQVYsQ0FBbUIsV0FBbkIsRUFEaUIsQ0FFakI7O0FBQ0EsTUFBSUQsQ0FBQyxDQUFDLE1BQUQsQ0FBRCxDQUFVRSxJQUFWLENBQWUsV0FBZixFQUE0QkMsTUFBaEMsRUFBd0M7QUFDcENILEtBQUMsQ0FBQyxNQUFELENBQUQsQ0FBVUUsSUFBVixDQUFlLFdBQWYsRUFBNEJFLElBQTVCLENBQWlDLFVBQVVDLENBQVYsRUFBYUMsS0FBYixFQUFvQjtBQUNqRCxVQUFJTixDQUFDLENBQUNNLEtBQUQsQ0FBRCxDQUFTSixJQUFULENBQWMsVUFBZCxFQUEwQkMsTUFBOUIsRUFBc0M7QUFDbENILFNBQUMsQ0FBQyxhQUFELENBQUQsQ0FBaUJFLElBQWpCLENBQXNCLGtCQUFrQkcsQ0FBbEIsR0FBc0IsR0FBNUMsRUFBaURKLFFBQWpELENBQTBELGFBQTFEO0FBQ0gsT0FGRCxNQUVPO0FBQ0hELFNBQUMsQ0FBQyxhQUFELENBQUQsQ0FBaUJFLElBQWpCLENBQXNCLGtCQUFrQkcsQ0FBbEIsR0FBc0IsR0FBNUMsRUFBaURFLFdBQWpELENBQTZELGFBQTdEO0FBQ0g7QUFDSixLQU5EO0FBT0g7QUFDSjs7QUFFRFAsQ0FBQyxDQUFDLHVCQUFELENBQUQsQ0FBMkJRLEVBQTNCLENBQThCLE9BQTlCLEVBQXVDLFVBQVVDLENBQVYsRUFBYTtBQUVoRFYsV0FBUztBQUNaLENBSEQsRTs7Ozs7Ozs7Ozs7O0FDaEJBIiwiZmlsZSI6ImFkbWlubHRlLWZvcm0uanMiLCJzb3VyY2VzQ29udGVudCI6WyJcbmltcG9ydCAnLi9mb3JtLmpzJ1xuaW1wb3J0ICcuL2Zvcm0uc2NzcyciLCJcblxuZnVuY3Rpb24gY2hlY2tGb3JtKCkge1xuICAgICQoJ2Zvcm0nKS5hZGRDbGFzcygnZm9ybS1zZW50Jyk7XG4gICAgLy9QYW5lbCB2dWVzIGpzXG4gICAgaWYgKCQoJ2Zvcm0nKS5maW5kKCcudGFiLXBhbmUnKS5sZW5ndGgpIHtcbiAgICAgICAgJCgnZm9ybScpLmZpbmQoJy50YWItcGFuZScpLmVhY2goZnVuY3Rpb24gKGksIHBhbmVsKSB7XG4gICAgICAgICAgICBpZiAoJChwYW5lbCkuZmluZCgnOmludmFsaWQnKS5sZW5ndGgpIHtcbiAgICAgICAgICAgICAgICAkKCcjbmF2LXBhcmFtcycpLmZpbmQoJy5uYXYtaXRlbTplcSgnICsgaSArICcpJykuYWRkQ2xhc3MoJ2hhcy1pbnZhbGlkJyk7XG4gICAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgICAgICQoJyNuYXYtcGFyYW1zJykuZmluZCgnLm5hdi1pdGVtOmVxKCcgKyBpICsgJyknKS5yZW1vdmVDbGFzcygnaGFzLWludmFsaWQnKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfSlcbiAgICB9XG59XG5cbiQoJ2J1dHRvblt0eXBlPVwic3VibWl0XCJdJykub24oJ2NsaWNrJywgZnVuY3Rpb24gKGUpIHtcblxuICAgIGNoZWNrRm9ybSgpO1xufSkiLCIvLyBleHRyYWN0ZWQgYnkgbWluaS1jc3MtZXh0cmFjdC1wbHVnaW5cbmV4cG9ydCB7fTsiXSwic291cmNlUm9vdCI6IiJ9
+=======
+/******/ __webpack_require__.O(0, ["vendors-node_modules_core-js_internals_a-function_js-node_modules_core-js_internals_export_js","vendors-node_modules_core-js_modules_es_array_find_js"], () => (__webpack_exec__("../LaclicBundles/SovBundle/Resources/assets/app/adminlte/form/app.form.js")));
+/******/ var __webpack_exports__ = __webpack_require__.O();
+/******/ }
+]);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly8vLi4vTGFjbGljQnVuZGxlcy9Tb3ZCdW5kbGUvUmVzb3VyY2VzL2Fzc2V0cy9hcHAvYWRtaW5sdGUvZm9ybS9hcHAuZm9ybS5qcyIsIndlYnBhY2s6Ly8vLi4vTGFjbGljQnVuZGxlcy9Tb3ZCdW5kbGUvUmVzb3VyY2VzL2Fzc2V0cy9hcHAvYWRtaW5sdGUvZm9ybS9mb3JtLmpzIiwid2VicGFjazovLy8uLi9MYWNsaWNCdW5kbGVzL1NvdkJ1bmRsZS9SZXNvdXJjZXMvYXNzZXRzL2FwcC9hZG1pbmx0ZS9mb3JtL2Zvcm0uc2NzcyJdLCJuYW1lcyI6WyJjaGVja0Zvcm0iLCIkIiwiYWRkQ2xhc3MiLCJmaW5kIiwibGVuZ3RoIiwiZWFjaCIsImkiLCJwYW5lbCIsInJlbW92ZUNsYXNzIiwib24iLCJlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7O0FBQ0E7Ozs7Ozs7Ozs7Ozs7QUNDQSxTQUFTQSxTQUFULEdBQXFCO0FBQ2pCQyxHQUFDLENBQUMsTUFBRCxDQUFELENBQVVDLFFBQVYsQ0FBbUIsV0FBbkIsRUFEaUIsQ0FFakI7O0FBQ0EsTUFBSUQsQ0FBQyxDQUFDLE1BQUQsQ0FBRCxDQUFVRSxJQUFWLENBQWUsV0FBZixFQUE0QkMsTUFBaEMsRUFBd0M7QUFDcENILEtBQUMsQ0FBQyxNQUFELENBQUQsQ0FBVUUsSUFBVixDQUFlLFdBQWYsRUFBNEJFLElBQTVCLENBQWlDLFVBQVVDLENBQVYsRUFBYUMsS0FBYixFQUFvQjtBQUNqRCxVQUFJTixDQUFDLENBQUNNLEtBQUQsQ0FBRCxDQUFTSixJQUFULENBQWMsVUFBZCxFQUEwQkMsTUFBOUIsRUFBc0M7QUFDbENILFNBQUMsQ0FBQyxhQUFELENBQUQsQ0FBaUJFLElBQWpCLENBQXNCLGtCQUFrQkcsQ0FBbEIsR0FBc0IsR0FBNUMsRUFBaURKLFFBQWpELENBQTBELGFBQTFEO0FBQ0gsT0FGRCxNQUVPO0FBQ0hELFNBQUMsQ0FBQyxhQUFELENBQUQsQ0FBaUJFLElBQWpCLENBQXNCLGtCQUFrQkcsQ0FBbEIsR0FBc0IsR0FBNUMsRUFBaURFLFdBQWpELENBQTZELGFBQTdEO0FBQ0g7QUFDSixLQU5EO0FBT0g7QUFDSjs7QUFFRFAsQ0FBQyxDQUFDLHVCQUFELENBQUQsQ0FBMkJRLEVBQTNCLENBQThCLE9BQTlCLEVBQXVDLFVBQVVDLENBQVYsRUFBYTtBQUVoRFYsV0FBUztBQUNaLENBSEQsRTs7Ozs7Ozs7Ozs7O0FDaEJBIiwiZmlsZSI6ImFkbWlubHRlLWZvcm0uanMiLCJzb3VyY2VzQ29udGVudCI6WyJcbmltcG9ydCAnLi9mb3JtLmpzJ1xuaW1wb3J0ICcuL2Zvcm0uc2NzcyciLCJcblxuZnVuY3Rpb24gY2hlY2tGb3JtKCkge1xuICAgICQoJ2Zvcm0nKS5hZGRDbGFzcygnZm9ybS1zZW50Jyk7XG4gICAgLy9QYW5lbCB2dWVzIGpzXG4gICAgaWYgKCQoJ2Zvcm0nKS5maW5kKCcudGFiLXBhbmUnKS5sZW5ndGgpIHtcbiAgICAgICAgJCgnZm9ybScpLmZpbmQoJy50YWItcGFuZScpLmVhY2goZnVuY3Rpb24gKGksIHBhbmVsKSB7XG4gICAgICAgICAgICBpZiAoJChwYW5lbCkuZmluZCgnOmludmFsaWQnKS5sZW5ndGgpIHtcbiAgICAgICAgICAgICAgICAkKCcjbmF2LXBhcmFtcycpLmZpbmQoJy5uYXYtaXRlbTplcSgnICsgaSArICcpJykuYWRkQ2xhc3MoJ2hhcy1pbnZhbGlkJyk7XG4gICAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgICAgICQoJyNuYXYtcGFyYW1zJykuZmluZCgnLm5hdi1pdGVtOmVxKCcgKyBpICsgJyknKS5yZW1vdmVDbGFzcygnaGFzLWludmFsaWQnKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfSlcbiAgICB9XG59XG5cbiQoJ2J1dHRvblt0eXBlPVwic3VibWl0XCJdJykub24oJ2NsaWNrJywgZnVuY3Rpb24gKGUpIHtcblxuICAgIGNoZWNrRm9ybSgpO1xufSkiLCIvLyBleHRyYWN0ZWQgYnkgbWluaS1jc3MtZXh0cmFjdC1wbHVnaW5cbmV4cG9ydCB7fTsiXSwic291cmNlUm9vdCI6IiJ9
+>>>>>>> 785c411f98702d0ace08d5e8a56615e37d017d2e

yarn.lock

@@ -952,7 +952,7 @@
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-"@symfony/webpack-encore@^1.0.0":
+"@symfony/webpack-encore@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@symfony/webpack-encore/-/webpack-encore-1.4.0.tgz#9b5e1628a99029166f7a41f7e9bf46208b1daca4"
   integrity sha512-6L39fpTtA+vRNQdTJzzVTzwHrant5idIzgWLh06IiH2RBXQ7QhFHbJLjRhygla0rmzuBfzKf19afTI3mniHRDA==