diff --git a/webapp/composer.json b/webapp/composer.json index 4885128f1a..e1eca2ebef 100644 --- a/webapp/composer.json +++ b/webapp/composer.json @@ -54,17 +54,11 @@ "ext-posix": "*", "ext-simplexml": "*", "ext-zip": "*", - "apalfrey/select2-bootstrap-5-theme": "^1.3", - "components/flag-icon-css": "^6", - "components/jquery": "^3.6", - "datatables.net/datatables.net": "dev-master", - "datatables.net/datatables.net-bs5": "dev-master", "doctrine/doctrine-bundle": "^2.8", "doctrine/doctrine-fixtures-bundle": "^4.0", "doctrine/doctrine-migrations-bundle": "^3.2", "doctrine/orm": "^2.14", "enshrined/svg-sanitize": "^0.22.0", - "fortawesome/font-awesome": "6.*", "friendsofsymfony/rest-bundle": "^3.5", "ircmaxell/password-compat": "*", "jms/serializer-bundle": "^5.2", @@ -103,7 +97,6 @@ "symfony/validator": "6.4.*", "symfony/web-profiler-bundle": "6.4.*", "symfony/yaml": "6.4.*", - "twbs/bootstrap": "^5.2.0", "twig/extra-bundle": "^3.5", "twig/markdown-extra": "^3.5", "twig/string-extra": "^3.5", diff --git a/webapp/composer.lock b/webapp/composer.lock index 99a5839324..ada6539001 100644 --- a/webapp/composer.lock +++ b/webapp/composer.lock @@ -4,51 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "629e7d2150fc6058701b85863ce56292", + "content-hash": "2c42433af2762bb2c5f7f4133a88c1ad", "packages": [ - { - "name": "apalfrey/select2-bootstrap-5-theme", - "version": "1.3.0", - "source": { - "type": "git", - "url": "https://github.com/apalfrey/select2-bootstrap-5-theme.git", - "reference": "ab448b2ac36a6f7f90b162e384ca2b1469a3cc1f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/apalfrey/select2-bootstrap-5-theme/zipball/ab448b2ac36a6f7f90b162e384ca2b1469a3cc1f", - "reference": "ab448b2ac36a6f7f90b162e384ca2b1469a3cc1f", - "shasum": "" - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andrew Palfrey", - "email": "apalfrey@apalfrey.me" - } - ], - "description": "Select2 theme for Bootstrap 5", - "homepage": "https://github.com/apalfrey/select2-bootstrap-5-theme", - "keywords": [ - "bootstrap", - "bootstrap-5", - "bootstrap5", - "css", - "scss", - "select2", - "theme" - ], - "support": { - "issues": "https://github.com/apalfrey/select2-bootstrap-5-theme/issues", - "source": "https://github.com/apalfrey/select2-bootstrap-5-theme/tree/1.3.0" - }, - "abandoned": true, - "time": "2022-05-08T00:12:43+00:00" - }, { "name": "brick/math", "version": "0.13.1", @@ -109,184 +66,6 @@ ], "time": "2025-03-29T13:50:30+00:00" }, - { - "name": "components/flag-icon-css", - "version": "v6.15.0", - "source": { - "type": "git", - "url": "https://github.com/lipis/flag-icons.git", - "reference": "be01befd268ae71183d339901cd2ea64e0da4307" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/lipis/flag-icons/zipball/be01befd268ae71183d339901cd2ea64e0da4307", - "reference": "be01befd268ae71183d339901cd2ea64e0da4307", - "shasum": "" - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Panayiotis Lipiridis", - "email": "lipiridis@gmail.com", - "role": "Lead" - } - ], - "description": "A curated collection of all country flags in SVG — plus the CSS for easier integration.", - "homepage": "https://flagicons.lipis.dev", - "keywords": [ - "country", - "country-flags", - "css", - "icon-css", - "svg" - ], - "support": { - "issues": "https://github.com/lipis/flag-icons/issues", - "source": "https://github.com/lipis/flag-icons/tree/v6.15.0" - }, - "time": "2023-11-09T10:49:39+00:00" - }, - { - "name": "components/jquery", - "version": "v3.7.1", - "source": { - "type": "git", - "url": "https://github.com/components/jquery.git", - "reference": "8edc7785239bb8c2ad2b83302b856a1d61de60e7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/components/jquery/zipball/8edc7785239bb8c2ad2b83302b856a1d61de60e7", - "reference": "8edc7785239bb8c2ad2b83302b856a1d61de60e7", - "shasum": "" - }, - "type": "component", - "extra": { - "component": { - "files": [ - "jquery.min.js", - "jquery.min.map", - "jquery.slim.js", - "jquery.slim.min.js", - "jquery.slim.min.map" - ], - "scripts": [ - "jquery.js" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "JS Foundation and other contributors" - } - ], - "description": "jQuery JavaScript Library", - "homepage": "http://jquery.com", - "support": { - "forum": "http://forum.jquery.com", - "irc": "irc://irc.freenode.org/jquery", - "issues": "https://github.com/jquery/jquery/issues", - "source": "https://github.com/jquery/jquery", - "wiki": "http://docs.jquery.com/" - }, - "time": "2023-09-22T01:43:46+00:00" - }, - { - "name": "datatables.net/datatables.net", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/DataTables/Dist-DataTables.git", - "reference": "bb84edac11e767b7b5a504624ea03cd7781fd9a8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/DataTables/Dist-DataTables/zipball/bb84edac11e767b7b5a504624ea03cd7781fd9a8", - "reference": "bb84edac11e767b7b5a504624ea03cd7781fd9a8", - "shasum": "" - }, - "require": { - "components/jquery": ">=1.7" - }, - "default-branch": true, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "SpryMedia", - "homepage": "https://datatables.net" - } - ], - "description": "DataTables is a plug-in for the jQuery Javascript library. It is a highly flexible tool, based upon the foundations of progressive enhancement, which will add advanced interaction controls to any HTML table. This is jQuery DataTables", - "homepage": "http://www.datatables.net/", - "keywords": [ - "datatables", - "jquery", - "table" - ], - "support": { - "forum": "https://datatables.net/forums", - "source": "https://github.com/DataTables/Dist-DataTables" - }, - "time": "2025-07-02T16:25:26+00:00" - }, - { - "name": "datatables.net/datatables.net-bs5", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/DataTables/Dist-DataTables-Bootstrap5.git", - "reference": "ccfecb5f2e6e16a2ea5ab3aa8df03ba45c58c237" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/DataTables/Dist-DataTables-Bootstrap5/zipball/ccfecb5f2e6e16a2ea5ab3aa8df03ba45c58c237", - "reference": "ccfecb5f2e6e16a2ea5ab3aa8df03ba45c58c237", - "shasum": "" - }, - "require": { - "datatables.net/datatables.net": ">=1.12.1", - "twbs/bootstrap": "5.*" - }, - "default-branch": true, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "SpryMedia", - "homepage": "https://datatables.net" - } - ], - "description": "DataTables is a plug-in for the jQuery Javascript library. It is a highly flexible tool, based upon the foundations of progressive enhancement, which will add advanced interaction controls to any HTML table. This is DataTables with styling for [Bootstrap5](https://getbootstrap.com/)", - "homepage": "http://www.datatables.net/", - "keywords": [ - "bootstrap", - "bootstrap5", - "datatables", - "jquery", - "table" - ], - "support": { - "forum": "https://datatables.net/forums", - "issues": "https://github.com/DataTables/Dist-DataTables-Bootstrap5/issues", - "source": "https://github.com/DataTables/Dist-DataTables-Bootstrap5" - }, - "time": "2025-07-02T16:26:15+00:00" - }, { "name": "dflydev/dot-access-data", "version": "v3.0.3", @@ -1897,15 +1676,6 @@ }, "time": "2025-08-12T10:13:48+00:00" }, - { - "name": "fortawesome/font-awesome", - "version": "6.5.2", - "dist": { - "type": "zip", - "url": "https://github.com/FortAwesome/Font-Awesome/releases/download/6.5.2/fontawesome-free-6.5.2-web.zip" - }, - "type": "library" - }, { "name": "friendsofsymfony/rest-bundle", "version": "3.8.0", @@ -9892,56 +9662,6 @@ ], "time": "2025-06-03T06:46:12+00:00" }, - { - "name": "twbs/bootstrap", - "version": "v5.3.7", - "source": { - "type": "git", - "url": "https://github.com/twbs/bootstrap.git", - "reference": "e0032ae6a5a628a51a8552091816cec09b6434df" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twbs/bootstrap/zipball/e0032ae6a5a628a51a8552091816cec09b6434df", - "reference": "e0032ae6a5a628a51a8552091816cec09b6434df", - "shasum": "" - }, - "replace": { - "twitter/bootstrap": "self.version" - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mark Otto", - "email": "markdotto@gmail.com" - }, - { - "name": "Jacob Thornton", - "email": "jacobthornton@gmail.com" - } - ], - "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "homepage": "https://getbootstrap.com/", - "keywords": [ - "JS", - "css", - "framework", - "front-end", - "mobile-first", - "responsive", - "sass", - "web" - ], - "support": { - "issues": "https://github.com/twbs/bootstrap/issues", - "source": "https://github.com/twbs/bootstrap/tree/v5.3.7" - }, - "time": "2025-06-10T15:44:49+00:00" - }, { "name": "twig/extra-bundle", "version": "v3.21.0", @@ -12697,10 +12417,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "datatables.net/datatables.net": 20, - "datatables.net/datatables.net-bs5": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/webapp/package.json b/webapp/package.json index fcb1bdf6ff..c97d546996 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,12 +1,19 @@ { "dependencies": { + "@fortawesome/fontawesome-free": "^7.1.0", "@melloware/coloris": "^0.25.0", + "@popperjs/core": "^2.11.8", + "bootstrap": "^5.3.8", "bootstrap-toggle": "^2.2.2", "d3": "3.5.17", + "datatables.net": "^2.3.4", + "datatables.net-bs5": "^2.3.4", "file-saver": "^2.0.5", + "flag-icons": "^7.5.0", "jquery-debounce-throttle": "^1.0.6-rc.0", "monaco-editor": "^0.54.0", "nvd3": "1.8.6", - "select2": "^4.0.13" + "select2": "^4.0.13", + "select2-bootstrap-5-theme": "^1.3.0" } } diff --git a/webapp/public/css/bootstrap-toggle.min.css b/webapp/public/css/bootstrap-toggle.min.css deleted file mode 100644 index 0d42ed09cd..0000000000 --- a/webapp/public/css/bootstrap-toggle.min.css +++ /dev/null @@ -1,28 +0,0 @@ -/*! ======================================================================== - * Bootstrap Toggle: bootstrap-toggle.css v2.2.0 - * http://www.bootstraptoggle.com - * ======================================================================== - * Copyright 2014 Min Hur, The New York Times Company - * Licensed under MIT - * ======================================================================== */ -.checkbox label .toggle,.checkbox-inline .toggle{margin-left:-20px;margin-right:5px} -.toggle{position:relative;overflow:hidden} -.toggle input[type=checkbox]{display:none} -.toggle-group{position:absolute;width:200%;top:0;bottom:0;left:0;transition:left .35s;-webkit-transition:left .35s;-moz-user-select:none;-webkit-user-select:none} -.toggle.off .toggle-group{left:-100%} -.toggle-on{position:absolute;top:0;bottom:0;left:0;right:50%;margin:0;border:0;border-radius:0} -.toggle-off{position:absolute;top:0;bottom:0;left:50%;right:0;margin:0;border:0;border-radius:0} -.toggle-handle{position:relative;margin:0 auto;padding-top:0;padding-bottom:0;height:100%;width:0;border-width:0 1px} -.toggle.btn{min-width:59px;min-height:34px} -.toggle-on.btn{padding-right:24px} -.toggle-off.btn{padding-left:24px} -.toggle.btn-lg{min-width:79px;min-height:45px} -.toggle-on.btn-lg{padding-right:31px} -.toggle-off.btn-lg{padding-left:31px} -.toggle-handle.btn-lg{width:40px} -.toggle.btn-sm{min-width:50px;min-height:30px} -.toggle-on.btn-sm{padding-right:20px} -.toggle-off.btn-sm{padding-left:20px} -.toggle.btn-xs{min-width:35px;min-height:22px} -.toggle-on.btn-xs{padding-right:12px} -.toggle-off.btn-xs{padding-left:12px} \ No newline at end of file diff --git a/webapp/public/css/bootstrap-toggle.min.css b/webapp/public/css/bootstrap-toggle.min.css new file mode 120000 index 0000000000..85b236d586 --- /dev/null +++ b/webapp/public/css/bootstrap-toggle.min.css @@ -0,0 +1 @@ +../../node_modules/bootstrap-toggle/css/bootstrap-toggle.min.css \ No newline at end of file diff --git a/webapp/public/css/bootstrap.min.css b/webapp/public/css/bootstrap.min.css index 8be6e0f2c4..93c3bac565 120000 --- a/webapp/public/css/bootstrap.min.css +++ b/webapp/public/css/bootstrap.min.css @@ -1 +1 @@ -../../vendor/twbs/bootstrap/dist/css/bootstrap.min.css \ No newline at end of file +../../node_modules/bootstrap/dist/css/bootstrap.min.css \ No newline at end of file diff --git a/webapp/public/css/bootstrap.min.css.map b/webapp/public/css/bootstrap.min.css.map index 80d05e88d0..7a98d200ba 120000 --- a/webapp/public/css/bootstrap.min.css.map +++ b/webapp/public/css/bootstrap.min.css.map @@ -1 +1 @@ -../../vendor/twbs/bootstrap/dist/css/bootstrap.min.css.map \ No newline at end of file +../../node_modules/bootstrap/dist/css/bootstrap.min.css.map \ No newline at end of file diff --git a/webapp/public/css/coloris.min.css b/webapp/public/css/coloris.min.css deleted file mode 100644 index bc552d4cba..0000000000 --- a/webapp/public/css/coloris.min.css +++ /dev/null @@ -1 +0,0 @@ -.clr-picker{display:none;flex-wrap:wrap;position:absolute;width:200px;z-index:1000;border-radius:10px;background-color:#fff;justify-content:space-between;box-shadow:0 0 5px rgba(0,0,0,.05),0 5px 20px rgba(0,0,0,.1);-moz-user-select:none;-webkit-user-select:none;user-select:none}.clr-picker.clr-open{display:flex}.clr-gradient{position:relative;width:100%;height:100px;margin-bottom:15px;border-radius:3px 3px 0 0;background-image:linear-gradient(rgba(0,0,0,0),#000),linear-gradient(90deg,#fff,currentColor);cursor:pointer}.clr-marker{position:absolute;width:12px;height:12px;margin:-6px 0 0 -6px;border:1px solid #fff;border-radius:50%;background-color:currentColor;cursor:pointer}.clr-picker input[type=range]::-webkit-slider-runnable-track{width:100%;height:8px}.clr-picker input[type=range]::-webkit-slider-thumb{width:8px;height:8px;-webkit-appearance:none}.clr-picker input[type=range]::-moz-range-track{width:100%;height:8px;border:0}.clr-picker input[type=range]::-moz-range-thumb{width:8px;height:8px;border:0}.clr-hue{background-image:linear-gradient(to right,red 0,#ff0 16.66%,#0f0 33.33%,#0ff 50%,#00f 66.66%,#f0f 83.33%,red 100%)}.clr-alpha,.clr-hue{position:relative;width:calc(100% - 40px);height:8px;margin:5px 20px;border-radius:4px}.clr-alpha span{display:block;height:100%;width:100%;border-radius:inherit;background-image:linear-gradient(90deg,rgba(0,0,0,0),currentColor)}.clr-alpha input,.clr-hue input{position:absolute;width:calc(100% + 16px);height:16px;left:-8px;top:-4px;margin:0;background-color:transparent;opacity:0;cursor:pointer;appearance:none;-webkit-appearance:none}.clr-alpha div,.clr-hue div{position:absolute;width:16px;height:16px;left:0;top:50%;margin-left:-8px;transform:translateY(-50%);border:2px solid #fff;border-radius:50%;background-color:currentColor;box-shadow:0 0 1px #888;pointer-events:none}.clr-alpha div:before{content:'';position:absolute;height:100%;width:100%;left:0;top:0;border-radius:50%;background-color:currentColor}.clr-swatches{order:2;width:calc(100% - 40px);margin:0 20px}.clr-swatches div{display:flex;flex-wrap:wrap;padding-bottom:12px;justify-content:center}.clr-swatches button{position:relative;width:20px;height:20px;margin:0 8px 6px 0;border:0;border-radius:50%;color:inherit;text-indent:-1000px;white-space:nowrap;overflow:hidden;cursor:pointer}.clr-swatches button:last-child,.clr-swatches button:nth-child(6n){margin-right:0}.clr-swatches button:after{content:'';display:block;position:absolute;width:100%;height:100%;left:0;top:0;border-radius:inherit;background-color:currentColor;box-shadow:inset 0 0 0 1px rgba(0,0,0,.1)}input.clr-color{order:1;width:calc(100% - 80px);height:32px;margin:15px 20px 20px 0;padding:0 15px;border:1px solid #ddd;border-radius:16px;color:#444;background-color:#fff;font-family:sans-serif;font-size:14px;text-align:left;box-shadow:none}input.clr-color:focus{outline:0;border:1px solid #aaa}.clr-clear{display:none;order:2;height:24px;margin:0 20px 20px auto;padding:0 20px;border:0;border-radius:12px;color:#fff;background-color:#666;font-family:inherit;font-size:12px;font-weight:400;cursor:pointer}.clr-preview{position:relative;width:32px;height:32px;margin:15px 0 20px 20px;border:0;border-radius:50%;overflow:hidden;cursor:pointer}.clr-preview:after,.clr-preview:before{content:'';position:absolute;height:100%;width:100%;left:0;top:0;border:1px solid #fff;border-radius:50%}.clr-preview:after{border:0;background-color:currentColor;box-shadow:inset 0 0 0 1px rgba(0,0,0,.1)}.clr-alpha div,.clr-color,.clr-hue div,.clr-marker{box-sizing:border-box}.clr-field{display:inline-block;position:relative;color:transparent}.clr-field button{position:absolute;width:30px;height:100%;right:0;top:50%;transform:translateY(-50%);border:0;color:inherit;text-indent:-1000px;white-space:nowrap;overflow:hidden;pointer-events:none}.clr-field button:after{content:'';display:block;position:absolute;width:100%;height:100%;left:0;top:0;border-radius:inherit;background-color:currentColor;box-shadow:inset 0 0 1px rgba(0,0,0,.5)}.clr-alpha,.clr-alpha div,.clr-field button,.clr-preview:before,.clr-swatches button{background-image:repeating-linear-gradient(45deg,#aaa 25%,transparent 25%,transparent 75%,#aaa 75%,#aaa),repeating-linear-gradient(45deg,#aaa 25%,#fff 25%,#fff 75%,#aaa 75%,#aaa);background-position:0 0,4px 4px;background-size:8px 8px}.clr-marker:focus{outline:0}.clr-keyboard-nav .clr-alpha input:focus+div,.clr-keyboard-nav .clr-hue input:focus+div,.clr-keyboard-nav .clr-marker:focus{outline:0;box-shadow:0 0 0 2px #1e90ff,0 0 2px 2px #fff}.clr-dark{background-color:#444}.clr-dark .clr-swatches button:after{box-shadow:inset 0 0 0 1px rgba(255,255,255,.3)}.clr-dark input.clr-color{color:#fff;border-color:#777;background-color:#555}.clr-dark .clr-preview:after{box-shadow:inset 0 0 0 1px rgba(255,255,255,.5)}.clr-picker.clr-polaroid{border-radius:6px;box-shadow:0 0 5px rgba(0,0,0,.1),0 5px 30px rgba(0,0,0,.2)}.clr-picker.clr-polaroid:before{content:'';display:block;position:absolute;width:16px;height:10px;left:20px;top:-10px;border:solid transparent;border-width:0 8px 10px 8px;border-bottom-color:currentColor;box-sizing:border-box;color:#fff;filter:drop-shadow(0 -4px 3px rgba(0,0,0,.1));pointer-events:none}.clr-picker.clr-polaroid.clr-dark:before{color:#444}.clr-picker.clr-polaroid.clr-left:before{left:auto;right:20px}.clr-picker.clr-polaroid.clr-top:before{top:auto;bottom:-10px;transform:rotateZ(180deg)}.clr-polaroid .clr-gradient{width:calc(100% - 20px);height:120px;margin:10px;border-radius:3px}.clr-polaroid .clr-alpha,.clr-polaroid .clr-hue{width:calc(100% - 30px);height:10px;margin:6px 15px;border-radius:5px}.clr-polaroid .clr-alpha div,.clr-polaroid .clr-hue div{box-shadow:0 0 5px rgba(0,0,0,.2)}.clr-polaroid .clr-swatches{width:calc(100% - 20px);margin:0 10px}.clr-polaroid .clr-swatches div{padding-bottom:10px}.clr-polaroid .clr-swatches button{width:22px;height:22px}.clr-polaroid input.clr-color{width:calc(100% - 60px);margin:10px 10px 15px 0}.clr-polaroid .clr-clear{margin:0 10px 15px auto}.clr-polaroid .clr-preview{margin:10px 0 15px 10px} \ No newline at end of file diff --git a/webapp/public/css/coloris.min.css b/webapp/public/css/coloris.min.css new file mode 120000 index 0000000000..1a6699b49d --- /dev/null +++ b/webapp/public/css/coloris.min.css @@ -0,0 +1 @@ +../../node_modules/@melloware/coloris/dist/coloris.min.css \ No newline at end of file diff --git a/webapp/public/css/dataTables.bootstrap5.min.css b/webapp/public/css/dataTables.bootstrap5.min.css index c2bb4544bf..4eb0723346 120000 --- a/webapp/public/css/dataTables.bootstrap5.min.css +++ b/webapp/public/css/dataTables.bootstrap5.min.css @@ -1 +1 @@ -../../vendor/datatables.net/datatables.net-bs5/css/dataTables.bootstrap5.min.css \ No newline at end of file +../../node_modules/datatables.net-bs5/css/dataTables.bootstrap5.min.css \ No newline at end of file diff --git a/webapp/public/css/fontawesome-all.min.css b/webapp/public/css/fontawesome-all.min.css index a95a7f46b0..a5a17e0b92 120000 --- a/webapp/public/css/fontawesome-all.min.css +++ b/webapp/public/css/fontawesome-all.min.css @@ -1 +1 @@ -../../vendor/fortawesome/font-awesome/css/all.min.css \ No newline at end of file +../../node_modules/@fortawesome/fontawesome-free/css/all.min.css \ No newline at end of file diff --git a/webapp/public/css/select2-bootstrap-5-theme.min.css b/webapp/public/css/select2-bootstrap-5-theme.min.css index cd8fd07b88..7de3aa3c1b 120000 --- a/webapp/public/css/select2-bootstrap-5-theme.min.css +++ b/webapp/public/css/select2-bootstrap-5-theme.min.css @@ -1 +1 @@ -../../vendor/apalfrey/select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.min.css \ No newline at end of file +../../node_modules/select2-bootstrap-5-theme/dist/select2-bootstrap-5-theme.min.css \ No newline at end of file diff --git a/webapp/public/flags b/webapp/public/flags index d54be4395b..cda3415dcc 120000 --- a/webapp/public/flags +++ b/webapp/public/flags @@ -1 +1 @@ -../vendor/components/flag-icon-css/flags \ No newline at end of file +../node_modules/flag-icons/flags \ No newline at end of file diff --git a/webapp/public/js/bootstrap.bundle.min.js b/webapp/public/js/bootstrap.bundle.min.js index 0889d27957..de449d1e65 120000 --- a/webapp/public/js/bootstrap.bundle.min.js +++ b/webapp/public/js/bootstrap.bundle.min.js @@ -1 +1 @@ -../../vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js \ No newline at end of file +../../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js \ No newline at end of file diff --git a/webapp/public/js/bootstrap.bundle.min.js.map b/webapp/public/js/bootstrap.bundle.min.js.map index 61f03fce66..7fec6204ca 120000 --- a/webapp/public/js/bootstrap.bundle.min.js.map +++ b/webapp/public/js/bootstrap.bundle.min.js.map @@ -1 +1 @@ -../../vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js.map \ No newline at end of file +../../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js.map \ No newline at end of file diff --git a/webapp/public/js/dataTables.bootstrap5.min.js b/webapp/public/js/dataTables.bootstrap5.min.js index 3b9c9206a6..09028413b7 120000 --- a/webapp/public/js/dataTables.bootstrap5.min.js +++ b/webapp/public/js/dataTables.bootstrap5.min.js @@ -1 +1 @@ -../../vendor/datatables.net/datatables.net-bs5/js/dataTables.bootstrap5.min.js \ No newline at end of file +../../node_modules/datatables.net-bs5/js/dataTables.bootstrap5.min.js \ No newline at end of file diff --git a/webapp/public/js/dataTables.min.js b/webapp/public/js/dataTables.min.js index 179e4bf625..bb9165854e 120000 --- a/webapp/public/js/dataTables.min.js +++ b/webapp/public/js/dataTables.min.js @@ -1 +1 @@ -../../vendor/datatables.net/datatables.net/js/dataTables.min.js \ No newline at end of file +../../node_modules/datatables.net/js/dataTables.min.js \ No newline at end of file diff --git a/webapp/public/js/jquery.min.js b/webapp/public/js/jquery.min.js index 2380e19217..08ac9f2fff 120000 --- a/webapp/public/js/jquery.min.js +++ b/webapp/public/js/jquery.min.js @@ -1 +1 @@ -../../vendor/components/jquery/jquery.min.js \ No newline at end of file +../../node_modules/jquery/dist/jquery.min.js \ No newline at end of file diff --git a/webapp/public/webfonts b/webapp/public/webfonts index a7aa14cc23..886ba37d9b 120000 --- a/webapp/public/webfonts +++ b/webapp/public/webfonts @@ -1 +1 @@ -../vendor/fortawesome/font-awesome/webfonts \ No newline at end of file +../node_modules/@fortawesome/fontawesome-free/webfonts \ No newline at end of file diff --git a/webapp/symfony.lock b/webapp/symfony.lock index 8577d99a4a..c1ec7f5268 100644 --- a/webapp/symfony.lock +++ b/webapp/symfony.lock @@ -2,12 +2,6 @@ "brick/math": { "version": "0.9.3" }, - "components/flag-icon-css": { - "version": "3.5.0" - }, - "components/jquery": { - "version": "3.3.1" - }, "dama/doctrine-test-bundle": { "version": "7.2", "recipe": { @@ -107,9 +101,6 @@ "endclothing/prometheus_client_php": { "version": "1.0.1" }, - "fortawesome/font-awesome": { - "version": "5.9.0" - }, "friendsofphp/proxy-manager-lts": { "version": "v1.0.3" }, @@ -695,9 +686,6 @@ "theseer/tokenizer": { "version": "1.2.0" }, - "twbs/bootstrap": { - "version": "v4.3.1" - }, "twig/extra-bundle": { "version": "v3.3.0" }, diff --git a/webapp/yarn.lock b/webapp/yarn.lock index a5ab78227d..1a9e6f48e5 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -2,21 +2,51 @@ # yarn lockfile v1 +"@fortawesome/fontawesome-free@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-7.1.0.tgz#8eb76278515341720aa74485266f8be121089529" + integrity sha512-+WxNld5ZCJHvPQCr/GnzCTVREyStrAJjisUPtUxG5ngDA8TMlPnKp6dddlTpai4+1GNmltAeuk1hJEkBohwZYA== + "@melloware/coloris@^0.25.0": version "0.25.0" resolved "https://registry.yarnpkg.com/@melloware/coloris/-/coloris-0.25.0.tgz#7012c10dc510dca1660b3692ed3c812344aec6ca" integrity sha512-RBWVFLjWbup7GRkOXb9g3+ZtR9AevFtJinrRz2cYPLjZ3TCkNRGMWuNbmQWbZ5cF3VU7aQDZwUsYgIY/bGrh2g== +"@popperjs/core@^2.11.8": + version "2.11.8" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" + integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== + bootstrap-toggle@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/bootstrap-toggle/-/bootstrap-toggle-2.2.2.tgz#2b88534fc1b998674f877f98ba0d8b5b743e96fe" integrity sha512-AkYD/i3NGCEksIb/PmmUrrxpa0DYi7Si30e9Ldhou2t1HTd9npoXUsxJJjFPvlV7iLUptlysWTcYD7i3DKV6qg== +bootstrap@^5.1.3, bootstrap@^5.3.8: + version "5.3.8" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.8.tgz#6401a10057a22752d21f4e19055508980656aeed" + integrity sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg== + d3@3.5.17: version "3.5.17" resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8" integrity sha512-yFk/2idb8OHPKkbAL8QaOaqENNoMhIaSHZerk3oQsECwkObkCpJyjYwCe+OHiq6UEdhe1m8ZGARRRO3ljFjlKg== +datatables.net-bs5@^2.3.4: + version "2.3.4" + resolved "https://registry.yarnpkg.com/datatables.net-bs5/-/datatables.net-bs5-2.3.4.tgz#63326190c20552c8c2c4d19a57ecdd10f0fe27ff" + integrity sha512-OSoPWhNfiU71VjNP604uTmFRxiX32U7SCW0KRZ2X6z3ZYbIwjjoWcMEjjPWOH3uOqaI0OTDBgOgOs5G28VaJog== + dependencies: + datatables.net "2.3.4" + jquery ">=1.7" + +datatables.net@2.3.4, datatables.net@^2.3.4: + version "2.3.4" + resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.3.4.tgz#8cf69f2e6cb8d271be3d5c4f75a479684d20f253" + integrity sha512-fKuRlrBIdpAl2uIFgl9enKecHB41QmFd/2nN9LBbOvItV/JalAxLcyqdZXex7wX4ZXjnJQEnv6xeS9veOpKzSw== + dependencies: + jquery ">=1.7" + dompurify@3.1.7: version "3.1.7" resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.7.tgz#711a8c96479fb6ced93453732c160c3c72418a6a" @@ -27,6 +57,11 @@ file-saver@^2.0.5: resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38" integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA== +flag-icons@^7.5.0: + version "7.5.0" + resolved "https://registry.yarnpkg.com/flag-icons/-/flag-icons-7.5.0.tgz#66462df3e8bc5ef3a283322a46bb9dde1b290505" + integrity sha512-kd+MNXviFIg5hijH766tt+3x76ele1AXlo4zDdCxIvqWZhKt4T83bOtxUOOMlTx/EcFdUMH5yvQgYlFh1EqqFg== + jquery-debounce-throttle@^1.0.6-rc.0: version "1.0.6-rc.0" resolved "https://registry.yarnpkg.com/jquery-debounce-throttle/-/jquery-debounce-throttle-1.0.6-rc.0.tgz#59a7737e46d8b435d01bc94b224e98fa126aba46" @@ -57,6 +92,13 @@ nvd3@1.8.6: resolved "https://registry.yarnpkg.com/nvd3/-/nvd3-1.8.6.tgz#2d3eba74bf33363b5101ebf1d093c59a53ae73c4" integrity sha512-YGQ9hAQHuQCF0JmYkT2GhNMHb5pA+vDfQj6C2GdpQPzdRPj/srPG3mh/3fZzUFt+at1NusLk/RqICUWkxm4viQ== +select2-bootstrap-5-theme@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/select2-bootstrap-5-theme/-/select2-bootstrap-5-theme-1.3.0.tgz#b7126b01c4e2cfb5ee683b219820d49da31b4810" + integrity sha512-uEJDruP4tmwyKcs3V0oP7CIsyC45PGF5ddo8unwTp8OucJ1PSuTOBr+xbWaHTQPGnvp7N96psVQ5UBMQvFCcHA== + dependencies: + bootstrap "^5.1.3" + select2@^4.0.13: version "4.0.13" resolved "https://registry.yarnpkg.com/select2/-/select2-4.0.13.tgz#0dbe377df3f96167c4c1626033e924372d8ef44d"