Merge branch 'asset-mapper' into v2

Author: jbtronics

.env

@@ -15,9 +15,13 @@
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
 SUPPORT_EMAIL=[email protected]
-FSB_EMAIL=[email protected]
 HHV_EMAIL=[email protected]
 
+# DEPRECATED
+FSB_EMAIL=[email protected]
+
+
+
 FSR_KOM_ACCOUNT_ID=0
 
 # The email address from which all automatic notifications should be sent

.gitignore

@@ -41,3 +41,8 @@ public/uploads/*
 ###> phpstan/phpstan ###
 phpstan.neon
 ###< phpstan/phpstan ###
+
+###> symfony/asset-mapper ###
+/public/assets/
+/assets/vendor/
+###< symfony/asset-mapper ###

assets/bootstrap.js

@@ -0,0 +1,5 @@
+import { startStimulusApp } from '@symfony/stimulus-bundle';
+
+const app = startStimulusApp();
+// register any custom, 3rd party controllers here
+// app.register('some_controller_name', SomeImportedController);

assets/controllers.json

@@ -0,0 +1,16 @@
+{
+    "controllers": {
+        "@symfony/ux-autocomplete": {
+            "autocomplete": {
+                "enabled": true,
+                "fetch": "eager",
+                "autoimport": {
+                    "tom-select/dist/css/tom-select.default.css": true,
+                    "tom-select/dist/css/tom-select.bootstrap4.css": false,
+                    "tom-select/dist/css/tom-select.bootstrap5.css": true
+                }
+            }
+        }
+    },
+    "entrypoints": []
+}

assets/controllers/hello_controller.js

@@ -0,0 +1,16 @@
+import { Controller } from '@hotwired/stimulus';
+
+/*
+ * This is an example Stimulus controller!
+ *
+ * Any element with a data-controller="hello" attribute will cause
+ * this controller to be executed. The name "hello" comes from the filename:
+ * hello_controller.js -> "hello"
+ *
+ * Delete this file or adapt it for your use!
+ */
+export default class extends Controller {
+    connect() {
+        this.element.textContent = 'Hello Stimulus! Edit me in assets/controllers/hello_controller.js';
+    }
+}

assets/frontend.js

@@ -0,0 +1,27 @@
+/*
+ * Welcome to your app's main JavaScript file!
+ *
+ * This file will be included onto the page via the importmap() Twig function,
+ * which should already be in your base.html.twig.
+ */
+import './styles/frontend.css';
+
+//Default CSS
+import 'bootstrap/dist/css/bootstrap.min.css';
+import '@fortawesome/fontawesome-free/css/solid.min.css';
+import '@fortawesome/fontawesome-free/css/fontawesome.min.css';
+
+import "bootstrap";
+import * as bootstrap from "bootstrap";
+
+//Load stimulus
+import "./bootstrap.js";
+
+//Show flash messages
+document.addEventListener('DOMContentLoaded', function () {
+    const toastElList = [].slice.call(document.querySelectorAll('.toast'))
+    const toastList = toastElList.map(function (toastEl) {
+        return new bootstrap.Toast(toastEl)
+    })
+    toastList.forEach(toast => toast.show())
+});

public/styles.css renamed to assets/styles/frontend.css

@@ -16,20 +16,11 @@
     z-index: 1030;
 }
 
-
-:root {
-    --border-radius: 4px;
-    --border-width: 1px;
-    --border-style: solid;
-    --border-color: #e3e7ee;
-}
-
 fieldset {
-    background: var(--fieldset-bg);
-    border: var(--border-width) var(--border-style) var(--border-color);
-    border-radius: var(--border-radius);
-    margin: 10px 0;
-    padding: 10px 20px 15px;
+   /* background: var(--fieldset-bg); */
+    border: var(--bs-border-width) var(--bs-border-style) var(--bs-border-color) !important;
+    border-radius: var(--bs-border-radius) !important;
+    padding: 10px 20px 15px !important;
 }
 
 fieldset>legend {
@@ -40,6 +31,7 @@ fieldset>legend {
     margin: 0 0 5px -5px;
     padding: 0 5px;
     width: auto;
+    float: none;
 }
 
 legend {
@@ -61,16 +53,17 @@ legend {
     background-color: #f5f5f5;
 }
 
-.form-group .col-form-label.required:after, .form-group label.required:after {
+form .col-form-label.required:after, form label.required:after {
     bottom: 4px;
-    color: var(--color-danger);
+    color: var(--bs-secondary-color);
     content: "\2022";
     filter: opacity(75%);
     position: relative;
     right: -2px;
-    z-index: var(--zindex-700);
+    z-index: 700;
 }
 
-.custom-file-label {
-    z-index: 0;
+/*** Make form-control placeholders italic ***/
+.form-control::placeholder {
+    font-style: italic;
 }

composer.json

@@ -18,7 +18,6 @@
         "doctrine/orm": "^2.19.5",
         "easycorp/easyadmin-bundle": "^4.10.3",
         "endroid/qr-code": "^5.0.9",
-        "fortawesome/font-awesome": "^5.14",
         "league/html-to-markdown": "^5.0",
         "nelmio/security-bundle": "^v3.3.0",
         "nesbot/carbon": "^3.6.0",
@@ -27,12 +26,10 @@
         "scheb/2fa-bundle": "^6.8.0",
         "scheb/2fa-google-authenticator": "^6.8.0",
         "scheb/2fa-trusted-device": "^6.8.0",
-        "select2/select2": "^4.0",
-        "slowprog/composer-copy-file": "^0.3.3",
-        "snapappointments/bootstrap-select": "^1.13",
         "stevegrunwell/mailto-link-formatter": "^1.0",
         "symfony/apache-pack": "^1.0",
         "symfony/asset": "6.4.*",
+        "symfony/asset-mapper": "6.4.*",
         "symfony/console": "6.4.*",
         "symfony/dotenv": "6.4.*",
         "symfony/expression-language": "6.4.*",
@@ -54,16 +51,17 @@
         "symfony/runtime": "6.4.*",
         "symfony/security-bundle": "6.4.*",
         "symfony/serializer": "6.4.*",
+        "symfony/stimulus-bundle": "^2.19",
         "symfony/string": "6.4.*",
         "symfony/translation": "6.4.*",
         "symfony/twig-bridge": "6.4.*",
         "symfony/twig-bundle": "6.4.*",
+        "symfony/ux-autocomplete": "^2.19",
         "symfony/validator": "6.4.*",
         "symfony/web-link": "6.4.*",
         "symfony/yaml": "6.4.*",
         "symfonycasts/reset-password-bundle": "^1.6",
         "tecnickcom/tcpdf": "^6.3",
-        "twbs/bootstrap": "^v5.3.3",
         "twig/cssinliner-extra": "^3.0",
         "twig/extra-bundle": "^3.0",
         "twig/inky-extra": "^3.0",
@@ -133,15 +131,14 @@
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
-            "assets:install %PUBLIC_DIR%": "symfony-cmd"
+            "assets:install %PUBLIC_DIR%": "symfony-cmd",
+            "importmap:install": "symfony-cmd"
         },
         "post-install-cmd": [
-            "@auto-scripts",
-            "SlowProg\\CopyFile\\ScriptHandler::copy"
+            "@auto-scripts"
         ],
         "post-update-cmd": [
-            "@auto-scripts",
-            "SlowProg\\CopyFile\\ScriptHandler::copy"
+            "@auto-scripts"
         ],
         "phpstan": "vendor/bin/phpstan analyse src --memory-limit 1G --level 3"
     },
@@ -152,18 +149,6 @@
         "symfony": {
             "allow-contrib": false,
             "require": "6.4.*"
-        },
-        "copy-file": {
-            "vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js": "public/assets/js/bootstrap.js",
-            "vendor/twbs/bootstrap/dist/css/bootstrap.min.css": "public/assets/css/bootstrap.css",
-            "vendor/snapappointments/bootstrap-select/dist/css/bootstrap-select.min.css": "public/assets/css/bootstrap-select.css",
-            "vendor/snapappointments/bootstrap-select/dist/js/bootstrap-select.min.js": "public/assets/js/bootstrap-select.js",
-            "vendor/components/jquery/jquery.slim.min.js": "public/assets/js/jquery.slim.js",
-            "vendor/fortawesome/font-awesome/css/all.min.css": "public/assets/css/fa-all.css",
-            "vendor/fortawesome/font-awesome/webfonts/": "public/assets/webfonts/",
-
-            "vendor/select2/select2/dist/css/select2.min.css": "public/assets/css/select2.min.css",
-            "vendor/select2/select2/dist/js/select2.full.min.js": "public/assets/js/select2.full.min.js"
         }
     }
 }