show errors on login form fixed

MarioRadu · MarioRadu · commit a047903b9788 · 2025-02-14T14:38:22.000+02:00
diff --git a/src/Admin/src/Controller/AdminController.php b/src/Admin/src/Controller/AdminController.php
@@ -320,7 +320,7 @@ public function loginAction(): ResponseInterface
                     );
                     if ($identity->getStatus() === Admin::STATUS_INACTIVE) {
                         $this->authenticationService->clearIdentity();
-                        $this->messenger->addError('Admin is inactive', 'user-login');
+                        $this->messenger->addError('Admin is inactive');
                         $this->messenger->addData('shouldRebind', true);
                         $this->forms->saveState($form);
                         return new RedirectResponse($this->getRequest()->getUri(), 303);
@@ -336,13 +336,13 @@ public function loginAction(): ResponseInterface
                     );
                     $this->messenger->addData('shouldRebind', true);
                     $this->forms->saveState($form);
-                    $this->messenger->addError($authResult->getMessages(), 'user-login');
+                    $this->messenger->addError($authResult->getMessages());
                     return new RedirectResponse($this->getRequest()->getUri(), 303);
                 }
             } else {
                 $this->messenger->addData('shouldRebind', true);
                 $this->forms->saveState($form);
-                $this->messenger->addError($this->forms->getMessages($form), 'user-login');
+                $this->messenger->addError($this->forms->getMessages($form));
                 return new RedirectResponse($this->getRequest()->getUri(), 303);
             }
         }
diff --git a/src/Admin/src/Form/LoginForm.php b/src/Admin/src/Form/LoginForm.php
@@ -25,6 +25,10 @@ public function __construct(?string $name = null, array $options = [])
 
         $this->init();
 
+        $this->setAttribute('id', 'login-form');
+        $this->setAttribute('class', 'needs-validation');
+        $this->setAttribute('novalidate', 'novalidate');
+
         $this->inputFilter = new LoginInputFilter();
         $this->inputFilter->init();
     }
@@ -39,6 +43,7 @@ public function init(): void
             'attributes' => [
                 'placeholder' => 'Username',
                 'class'       => 'form-control form-control-sm',
+                'required'    => 'required',
             ],
             'type'       => Text::class,
         ]);
@@ -51,6 +56,7 @@ public function init(): void
             'attributes' => [
                 'placeholder' => 'Password',
                 'class'       => 'form-control form-control-sm',
+                'required'    => 'required',
             ],
             'type'       => Password::class,
         ]);
diff --git a/src/Admin/templates/admin/login.html.twig b/src/Admin/templates/admin/login.html.twig
@@ -14,6 +14,7 @@
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
 </head>
 <body class="app">
+    {{ messagesPartial('partial::notifications', {dismissible: true}) }}
     <div class="peers ai-s fxw-nw h-100vh align-items-center">
         <div class="container">
             <div class="row">
@@ -45,5 +46,9 @@
             </div>
         </div>
     </div>
+
+{% block javascript %}
+    <script src="{{ asset('js/app.js') }}"></script>
+{% endblock %}
 </body>
 </html>
