Fix missing fonts from font-awesome in the assets build

assets/js/admin.js

@@ -4,7 +4,7 @@ import 'bootstrap/dist/js/bootstrap';
 import 'bootstrap/dist/css/bootstrap.css';
 
 import '@fortawesome/fontawesome-free/js/all.js';
-import '@fortawesome/fontawesome-free/css/all.css';
+//import '@fortawesome/fontawesome-free/css/all.css';
 
 import '../scss/admin.scss';
 import Collapse from "./components/Collapse";

assets/scss/admin.scss

@@ -4,3 +4,7 @@
 @import "partials/menu";
 
 @import "partials/crud/list";
+
+@import "~@fortawesome/fontawesome-free/scss/fontawesome";
+@import "~@fortawesome/fontawesome-free/scss/solid";
+@import "~@fortawesome/fontawesome-free/scss/regular";

assets/scss/partials/_variables.scss

@@ -1 +1 @@
-$fa-font-path: "../fonts";
+

src/Admin/Admin.php

@@ -78,7 +78,7 @@ public function handleRequest(Request $request)
     {
         $this->request = $request;
         $event = new AdminEvent($this, $request);
-        $this->eventDispatcher->dispatch(Events::ADMIN_HANDLE_REQUEST, $event);
+        $this->eventDispatcher->dispatch($event, Events::ADMIN_HANDLE_REQUEST);
 
         if (!$event->hasAction()) {
             throw new Exception('The current action was not set during the dispatch of the event');
@@ -87,23 +87,23 @@ public function handleRequest(Request $request)
 
         // Dispatch an event to allow entities to be filtered
         $filterEvent = new FilterEvent($this, $request);
-        $this->eventDispatcher->dispatch(Events::ADMIN_FILTER, $filterEvent);
+        $this->eventDispatcher->dispatch($filterEvent, Events::ADMIN_FILTER);
 
         $event = new EntityEvent($this, $request);
         $event->setFilters($filterEvent->getFilters());
-        $this->eventDispatcher->dispatch(Events::ENTITY_LOAD, $event);
+        $this->eventDispatcher->dispatch($event, Events::ENTITY_LOAD);
 
         if (null !== $event->getEntities()) {
             $this->entities = $event->getEntities();
         }
         $event = new FormEvent($this, $request);
-        $this->eventDispatcher->dispatch(Events::ADMIN_CREATE_FORM, $event);
+        $this->eventDispatcher->dispatch($event, Events::ADMIN_CREATE_FORM);
 
         // Merge the regular forms and the filter forms
         $this->forms = array_merge($filterEvent->getForms(), $event->getForms());
 
         $this->handleEntityForm($request);
-        $this->eventDispatcher->dispatch(Events::ADMIN_HANDLE_FORM, new FormEvent($this, $request));
+        $this->eventDispatcher->dispatch(new FormEvent($this, $request), Events::ADMIN_HANDLE_FORM);
     }
 
     public function getRequest(): Request
@@ -146,7 +146,7 @@ public function createView(): ViewInterface
             throw new Exception('The handleRequest() method should be called before creating a view');
         }
         $event = new ViewEvent($this, $this->request);
-        $this->eventDispatcher->dispatch(Events::ADMIN_VIEW, $event);
+        $this->eventDispatcher->dispatch($event, Events::ADMIN_VIEW);
 
         return $event->getView();
     }
@@ -194,11 +194,13 @@ private function handleEntityForm(Request $request)
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
+            dump($form->getData());
+            //die;
             if ($this->entities->isEmpty()) {
                 $this->entities->add($form->getData());
             }
             $event = new EntityEvent($this, $request);
-            $this->eventDispatcher->dispatch(Events::ENTITY_SAVE, $event);
+            $this->eventDispatcher->dispatch($event, Events::ENTITY_SAVE);
         }
     }
 }

src/Factory/FormFactory.php

@@ -64,7 +64,7 @@ public function createEntityForm(AdminInterface $admin, Request $request, $entit
                 ])
             ;
             $event = new FormEvent($admin, $request);
-            $this->eventDispatcher->dispatch(Events::FORM_PRE_CREATE_ENTITY_FORM, $event);
+            $this->eventDispatcher->dispatch($event, Events::FORM_PRE_CREATE_ENTITY_FORM);
 
             foreach ($event->getFieldDefinitions() as $field => $definition) {
                 if (!$definition instanceof FieldDefinitionInterface) {

src/Factory/FormFactoryInterface.php

@@ -9,7 +9,21 @@
 
 interface FormFactoryInterface
 {
+    /**
+     * @param AdminInterface $admin
+     * @param Request        $request
+     * @param null           $entity
+     *
+     * @return FormInterface
+     */
     public function createEntityForm(AdminInterface $admin, Request $request, $entity = null): FormInterface;
 
+    /**
+     * @param ActionInterface $action
+     * @param Request         $request
+     * @param                 $entity
+     *
+     * @return FormInterface
+     */
     public function createDeleteForm(ActionInterface $action, Request $request, $entity): FormInterface;
 }