Merge pull request #287 from dotkernel/issue-275

Issue #275: Template refactoring
dotkernel · Sep 27, 2024 · d36c6f3 · d36c6f3
2 parents 60bb6f5 + d852bbd
commit d36c6f3
Show file tree

Hide file tree

Showing 15 changed files with 58 additions and 65 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,8 +8,8 @@
 
 ### Added
 
-* Issue [#284](https://github.com/dotkernel/admin/issues/284): Created file `CHANGELOG.md` by @alexmerlin in [#285](https://github.com/dotkernel/admin/pull/285)
-* Issue [#282](https://github.com/dotkernel/admin/issues/282): Show current page as active/open in left menu by @alexmerlin in [#286](https://github.com/dotkernel/admin/pull/286)
+* Issue [#284](https://github.com/dotkernel/admin/issues/284): Created file `CHANGELOG.md` by [@alexmerlin](https://github.com/alexmerlin) in [#285](https://github.com/dotkernel/admin/pull/285)
+* Issue [#282](https://github.com/dotkernel/admin/issues/282): Show current page as active/open in left menu by [@alexmerlin](https://github.com/alexmerlin) in [#286](https://github.com/dotkernel/admin/pull/286)
 
 ### Deprecated
 

diff --git a/config/autoload/app.global.php b/config/autoload/app.global.php
@@ -5,7 +5,7 @@
 $baseUrl = 'http://localhost:8080';
 
 $app = [
-    'name' => 'DotKernel Admin V4',
+    'name' => 'Dotkernel Admin V5',
     'url'  => $baseUrl,
 ];
 

diff --git a/config/autoload/cli.global.php b/config/autoload/cli.global.php
@@ -11,7 +11,7 @@
      */
     'dot_cli'                  => [
         'version'  => '1.0.0',
-        'name'     => 'DotKernel CLI',
+        'name'     => 'Dotkernel CLI',
         'commands' => [
             DemoCommand::getDefaultName()                    => DemoCommand::class,
             Dot\GeoIP\Command\GeoIpCommand::getDefaultName() => Dot\GeoIP\Command\GeoIpCommand::class,

diff --git a/config/autoload/mail.local.php.dist b/config/autoload/mail.local.php.dist
@@ -33,7 +33,7 @@ return [
 //            message configuration
             'message_options' => [
                 'from'          => '',
-                'from_name'     => 'DotKernel',
+                'from_name'     => 'Dotkernel',
                 'reply_to'      => '',
                 'reply_to_name' => '',
                 'to'            => [],

diff --git a/config/config.php b/config/config.php
@@ -27,7 +27,7 @@
     Mezzio\Router\FastRouteRouter\ConfigProvider::class,
     Mezzio\Twig\ConfigProvider::class,
 
-    // DotKernel packages
+    // Dotkernel packages
     Dot\Cli\ConfigProvider::class,
     Dot\DataFixtures\ConfigProvider::class,
     Dot\DependencyInjection\ConfigProvider::class,
@@ -47,7 +47,7 @@
     // Include cache configuration
     new ArrayProvider($cacheConfig),
 
-    // DotKernel modules
+    // Dotkernel modules
     Admin\App\ConfigProvider::class,
     Admin\Admin\ConfigProvider::class,
     Admin\Setting\ConfigProvider::class,

diff --git a/src/Admin/src/Controller/AdminController.php b/src/Admin/src/Controller/AdminController.php
@@ -180,8 +180,6 @@ public function deleteAction(): ResponseInterface
         assert($admin instanceof Admin);
 
         $form = new AdminDeleteForm();
-        $form->setAttribute('id', 'deleteAdminForm');
-        $form->setAttribute('method', RequestMethodInterface::METHOD_POST);
         $form->setAttribute(
             'action',
             $this->router->generateUri('admin', ['action' => 'delete', 'uuid' => $uuid])
@@ -304,7 +302,7 @@ public function loginAction(): ResponseInterface
 
         return new HtmlResponse(
             $this->template->render('admin::login', [
-                'form' => $form,
+                'form' => $form->prepare(),
             ])
         );
     }
@@ -320,16 +318,19 @@ public function logoutAction(): ResponseInterface
 
     public function accountAction(): ResponseInterface
     {
-        $form               = new AccountForm();
+        $accountForm        = new AccountForm();
         $changePasswordForm = new ChangePasswordForm();
-        $identity           = $this->authenticationService->getIdentity();
-        $admin              = $this->adminService->getAdminRepository()->findOneBy(['uuid' => $identity->getUuid()]);
+        $changePasswordForm
+            ->setAttribute('action', $this->router->generateUri('admin', ['action' => 'change-password']));
+
+        $identity = $this->authenticationService->getIdentity();
+        $admin    = $this->adminService->getAdminRepository()->findOneBy(['uuid' => $identity->getUuid()]);
 
         if ($this->isPost()) {
-            $form->setData($this->getPostParams());
-            if ($form->isValid()) {
+            $accountForm->setData($this->getPostParams());
+            if ($accountForm->isValid()) {
                 /** @var array $result */
-                $result = $form->getData();
+                $result = $accountForm->getData();
                 try {
                     $this->adminService->updateAdmin($admin, $result);
                     $this->messenger->addSuccess(Message::ACCOUNT_UPDATE_SUCCESSFULLY);
@@ -341,17 +342,17 @@ public function accountAction(): ResponseInterface
                     $this->messenger->addError(Message::AN_ERROR_OCCURRED);
                 }
             } else {
-                $this->messenger->addError($this->forms->getMessagesAsString($form));
+                $this->messenger->addError($this->forms->getMessagesAsString($accountForm));
             }
             return new RedirectResponse($this->router->generateUri('admin', ['action' => 'account']));
         }
 
-        $form->bind($admin);
+        $accountForm->bind($admin);
 
         return new HtmlResponse(
             $this->template->render('admin::account', [
-                'form'               => $form,
-                'changePasswordForm' => $changePasswordForm,
+                'accountForm'        => $accountForm->prepare(),
+                'changePasswordForm' => $changePasswordForm->prepare(),
             ])
         );
     }

diff --git a/src/Admin/src/Form/AccountForm.php b/src/Admin/src/Form/AccountForm.php
@@ -36,6 +36,7 @@ public function init(): void
             ],
             'attributes' => [
                 'placeholder' => 'Identity...',
+                'class'       => 'form-control',
             ],
         ], ['priority' => -9]);
 
@@ -47,6 +48,7 @@ public function init(): void
             ],
             'attributes' => [
                 'placeholder' => 'First name...',
+                'class'       => 'form-control',
             ],
         ], ['priority' => -10]);
 
@@ -58,6 +60,7 @@ public function init(): void
             ],
             'attributes' => [
                 'placeholder' => 'Last name...',
+                'class'       => 'form-control',
             ],
         ], ['priority' => -11]);
 
@@ -67,6 +70,7 @@ public function init(): void
             'attributes' => [
                 'type'  => 'submit',
                 'value' => 'Update account',
+                'class' => 'btn btn-primary btn-color',
             ],
         ], ['priority' => -100]);
 

diff --git a/src/Admin/src/Form/AdminDeleteForm.php b/src/Admin/src/Form/AdminDeleteForm.php
@@ -22,6 +22,8 @@ public function __construct(?string $name = null, array $options = [])
 
         $this->init();
 
+        $this->setAttribute('id', 'deleteAdminForm');
+
         $this->inputFilter = new AdminDeleteInputFilter();
         $this->inputFilter->init();
     }

diff --git a/src/Admin/src/Form/ChangePasswordForm.php b/src/Admin/src/Form/ChangePasswordForm.php
@@ -36,6 +36,7 @@ public function init(): void
             ],
             'attributes' => [
                 'placeholder' => '',
+                'class'       => 'form-control',
             ],
         ]);
 
@@ -47,6 +48,7 @@ public function init(): void
             ],
             'attributes' => [
                 'placeholder' => '',
+                'class'       => 'form-control',
             ],
         ]);
 
@@ -58,6 +60,7 @@ public function init(): void
             ],
             'attributes' => [
                 'placeholder' => '',
+                'class'       => 'form-control',
             ],
         ]);
 
@@ -67,6 +70,7 @@ public function init(): void
             'attributes' => [
                 'type'  => 'submit',
                 'value' => 'Change Password',
+                'class' => 'btn btn-primary btn-color',
             ],
         ], ['priority' => -100]);
 

diff --git a/src/Admin/templates/admin/account.html.twig b/src/Admin/templates/admin/account.html.twig
@@ -12,36 +12,29 @@
             <div class="bgc-white p-20 bd">
                 <h6 class="c-grey-900">Update personal data</h6>
                 <div class="mT-30">
+                    {{ form().openTag(accountForm)|raw }}
 
-                    {% set dummy = form.prepare() %}
-                    {{ form().openTag(form)|raw }}
-
-                    {% set identity = form.getElements().identity %}
+                    {% set identity = accountForm.get('identity') %}
                     <div class="mb-3 form-group {% if identity.getMessages() %}has-error{% endif %}">
-                        {% set dummy = identity.setAttribute('class', 'form-control') %}
                         {{ formLabel(identity) }}
                         {{ formElement(identity) }}
                     </div>
 
-                    {% set firstName = form.getElements().firstName %}
+                    {% set firstName = accountForm.get('firstName') %}
                     <div class="mb-3 form-group {% if firstName.getMessages() %}has-error{% endif %}">
-                        {% set dummy = firstName.setAttribute('class', 'form-control') %}
                         {{ formLabel(firstName) }}
                         {{ formElement(firstName) }}
                     </div>
 
-                    {% set lastName = form.getElements().lastName %}
+                    {% set lastName = accountForm.get('lastName') %}
                     <div class="mb-3 form-group {% if lastName.getMessages() %}has-error{% endif %}">
-                        {% set dummy = lastName.setAttribute('class', 'form-control') %}
                         {{ formLabel(lastName) }}
                         {{ formElement(lastName) }}
                     </div>
 
-                    {{ formElement(form.get('accountCsrf')) }}
+                    {{ formElement(accountForm.get('accountCsrf')) }}
 
-                    {% set submit = form.get('submit') %}
-                    {% set dummy = submit.setAttribute('class', 'btn btn-primary btn-color') %}
-                    {{ formSubmit(submit) }}
+                    {{ formSubmit(accountForm.get('submit')) }}
 
                     {{ form().closeTag()|raw }}
                 </div>
@@ -51,36 +44,29 @@
             <div class="bgc-white p-20 bd">
                 <h6 class="c-grey-900">Change password</h6>
                 <div class="mT-30">
-                    {% set dummy = changePasswordForm.prepare() %}
-                    {% set dummy = changePasswordForm.setAttribute('action', path('admin', {action: 'change-password'})) %}
                     {{ form().openTag(changePasswordForm)|raw }}
 
                     {% set currentPassword = changePasswordForm.get('currentPassword') %}
                     <div class="mb-3 form-group {% if currentPassword.getMessages() %}has-error{% endif %}">
-                        {% set dummy = currentPassword.setAttribute('class', 'form-control') %}
                         {{ formLabel(currentPassword) }}
                         {{ formElement(currentPassword) }}
                     </div>
 
                     {% set password = changePasswordForm.getElements().password %}
                     <div class="mb-3 form-group {% if password.getMessages() %}has-error{% endif %}">
-                        {% set dummy = password.setAttribute('class', 'form-control') %}
                         {{ formLabel(password) }}
                         {{ formElement(password) }}
                     </div>
 
                     {% set passwordConfirm = changePasswordForm.getElements().passwordConfirm %}
                     <div class="mb-3 form-group {% if passwordConfirm.getMessages() %}has-error{% endif %}">
-                        {% set dummy = passwordConfirm.setAttribute('class', 'form-control') %}
                         {{ formLabel(passwordConfirm) }}
                         {{ formElement(passwordConfirm) }}
                     </div>
 
                     {{ formElement(changePasswordForm.get('changePasswordCsrf')) }}
 
-                    {% set submit = changePasswordForm.get('submit') %}
-                    {% set dummy = submit.setAttribute('class', 'btn btn-primary btn-color') %}
-                    {{ formSubmit(submit) }}
+                    {{ formSubmit(changePasswordForm.get('submit')) }}
 
                     {{ form().closeTag()|raw }}
                 </div>

diff --git a/src/Admin/templates/admin/login.html.twig b/src/Admin/templates/admin/login.html.twig
@@ -2,7 +2,14 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ asset('images/app/favicon/apple-touch-icon.png') }}">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ asset('images/app/favicon/favicon-32x32.png') }}">
+    <link rel="icon" type="image/png" sizes="16x16" href="{{ asset('images/app/favicon/favicon-16x16.png') }}">
+    <link rel="manifest" href="{{ asset('images/app/favicon/site.webmanifest') }}">
+    <meta name="msapplication-TileColor" content="#2d89ef">
+    <meta name="theme-color" content="#ffffff">
     <title>Sign In</title>
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
 </head>
@@ -14,36 +21,25 @@
                     <div class="pos-a centerXY">
                         <div class="bgc-white bdrs-50p w-100">
                             <a href="{{ path('dashboard') }}">
-                                <img class="pos-a centerXY logo-img" src="{{ asset('images/app/logo.svg') }}" alt="">
+                                <img class="pos-a centerXY logo-img" src="{{ asset('images/app/logo.svg') }}" alt="Dotkernel logo" />
                             </a>
                         </div>
                     </div>
                 </div>
                 <div class="col-md-4">
-                    {% set dummy = form.prepare() %}
                     {{ form().openTag(form)|raw }}
                     <h4 class="fw-300 c-grey-900 mB-20">Login</h4>
                     <div class="mb-3">
-                        {% set username = form.get('username') %}
-                        {% set elementTranslatePlaceholder = username.getAttribute('placeholder')|trans|raw %}
-                        {% set dummy = username.setAttribute('placeholder', elementTranslatePlaceholder) %}
-                        {{ formElement(username) }}
+                        {{ formElement(form.get('username')) }}
                     </div>
                     <div class="mb-3">
-                        {% set password = form.get('password') %}
-                        {% set elementTranslatePlaceholder = password.getAttribute('placeholder')|trans|raw %}
-                        {% set dummy = password.setAttribute('placeholder', elementTranslatePlaceholder) %}
-                        {{ formElement(password) }}
+                        {{ formElement(form.get('password')) }}
                     </div>
-                    {% set submit = form.get('submit') %}
-                    {% set submitValue = submit.getValue|trans|raw %}
-                    {% set dummy = submit.setAttribute('value', submitValue) %}
-
                     {{ messagesPartial('partial::alerts', {}, null, 'user-login') }}
 
                     {{ formElement(form.get('loginCsrf')) }}
 
-                    {{ formSubmit(submit) }}
+                    {{ formSubmit(form.get('submit')) }}
 
                     {{ form().closeTag()|raw }}
                 </div>

diff --git a/src/Admin/templates/admin/simple-logins.html.twig b/src/Admin/templates/admin/simple-logins.html.twig
@@ -24,7 +24,7 @@
                                     data-bs-placement="top"
                                     data-bs-custom-class="custom-tooltip"
                                     data-bs-title="Filter by login identity">
-                                <option value="">Select identity</option>
+                                <option value="">Select identity ({{ identities|length }})</option>
                                 {% for identity in identities %}
                                 <option value="{{ identity }}" {{ identity == params.identity ? 'selected' : '' }}>{{ identity }}</option>
                                 {% endfor %}

diff --git a/src/App/templates/layout/default.html.twig b/src/App/templates/layout/default.html.twig
@@ -11,14 +11,14 @@
     <meta name="msapplication-TileColor" content="#2d89ef">
     <meta name="theme-color" content="#ffffff">
 
-    <title>{% block title %}{% endblock %} - DotKernel</title>
+    <title>{% block title %}{% endblock %} - Dotkernel</title>
 
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
 
-        <!--[if lt IE 9]>
-        <script src="{{ asset('js/html5shiv.js') }}"></script>
-        <script src="{{ asset('js/respond.min.js') }}"></script>
-        <![endif]-->
+    <!--[if lt IE 9]>
+    <script src="{{ asset('js/html5shiv.js') }}"></script>
+    <script src="{{ asset('js/respond.min.js') }}"></script>
+    <![endif]-->
 </head>
 <body class="app">
     {{ include('@partial/left-menu.html.twig') }}

diff --git a/src/App/templates/layout/main.html.twig b/src/App/templates/layout/main.html.twig
@@ -11,7 +11,7 @@
     <meta name="msapplication-TileColor" content="#2d89ef">
     <meta name="theme-color" content="#ffffff">
 
-    <title>{% block title %}{% endblock %} - DotKernel</title>
+    <title>{% block title %}{% endblock %} - Dotkernel</title>
 
     <link href="{{ asset('css/app.css') }}" rel="stylesheet">
 </head>

diff --git a/src/App/templates/partial/left-menu.html.twig b/src/App/templates/partial/left-menu.html.twig
@@ -8,8 +8,8 @@
                         <div class="peers ai-c fxw-nw">
                             <div class="peer">
                                 <div class="logo d-flex align-items-center">
-                                    <img id="min-logo" src="{{ asset('images/app/min-logo.svg') }}" alt="DotKernel">
-                                    <img id="full-logo" src="{{ asset('images/app/logo.svg') }}" alt="DotKernel">
+                                    <img id="min-logo" src="{{ asset('images/app/min-logo.svg') }}" alt="Dotkernel logo">
+                                    <img id="full-logo" src="{{ asset('images/app/logo.svg') }}" alt="Dotkernel logo">
                                 </div>
                             </div>
                             <div class="peer peer-greed">