[BootstrapAdminUi] Reorganize login page Twig hooks (#122)

Based on https://github.com/Sylius/Sylius/blob/2.0/src/Sylius/Bundle/AdminBundle/Resources/config/app/twig_hooks/security/login.yaml
Sylius · Nov 22, 2024 · 457a297 · 457a297
2 parents 30b5f7c + 32cf4e5
commit 457a297
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 14 deletions.
diff --git a/src/AdminUi/templates/security/login.html.twig b/src/AdminUi/templates/security/login.html.twig
@@ -5,9 +5,5 @@
 {% block body_class %}d-flex flex-column{% endblock %}
 
 {% block body %}
-    <div class="page page-center">
-        <div class="container container-tight py-4">
-            {% hook 'sylius_admin.security.login' with { form, last_error, last_username } %}
-        </div>
-    </div>
+    {% hook 'sylius_admin.security.login' with { form, last_error, last_username } %}
 {% endblock %}
diff --git a/src/BootstrapAdminUi/config/app/twig_hooks/security/login.php b/src/BootstrapAdminUi/config/app/twig_hooks/security/login.php
@@ -17,6 +17,12 @@
     $container->extension('sylius_twig_hooks', [
         'hooks' => [
             'sylius_admin.security.login' => [
+                'page' => [
+                    'template' => '@SyliusBootstrapAdminUi/security/common/page.html.twig',
+                ],
+            ],
+
+            'sylius_admin.security.login.page' => [
                 'logo' => [
                     'template' => '@SyliusBootstrapAdminUi/security/common/logo.html.twig',
                 ],
@@ -25,39 +31,39 @@
                 ],
             ],
 
-            'sylius_admin.security.login.logo' => [
+            'sylius_admin.security.login.page.logo' => [
                 'image' => [
                     'template' => '@SyliusBootstrapAdminUi/security/common/logo/image.html.twig',
                 ],
             ],
 
-            'sylius_admin.security.login.content' => [
+            'sylius_admin.security.login.page.content' => [
                 'header' => [
                     'template' => '@SyliusBootstrapAdminUi/security/common/content/header.html.twig',
                 ],
                 'flashes' => [
                     'template' => '@SyliusBootstrapAdminUi/shared/crud/common/content/flashes.html.twig',
                 ],
                 'form' => [
-                    'template' => '@SyliusBootstrapAdminUi/security/login/content/form.html.twig',
+                    'template' => '@SyliusBootstrapAdminUi/security/login/page/content/form.html.twig',
                 ],
             ],
 
-            'sylius_admin.security.login.content.form' => [
+            'sylius_admin.security.login.page.content.form' => [
                 'error' => [
-                    'template' => '@SyliusBootstrapAdminUi/security/login/content/form/error.html.twig',
+                    'template' => '@SyliusBootstrapAdminUi/security/login/page/content/form/error.html.twig',
                 ],
                 'username' => [
-                    'template' => '@SyliusBootstrapAdminUi/security/login/content/form/username.html.twig',
+                    'template' => '@SyliusBootstrapAdminUi/security/login/page/content/form/username.html.twig',
                 ],
                 'password' => [
-                    'template' => '@SyliusBootstrapAdminUi/security/login/content/form/password.html.twig',
+                    'template' => '@SyliusBootstrapAdminUi/security/login/page/content/form/password.html.twig',
                 ],
                 'remember_me' => [
-                    'template' => '@SyliusBootstrapAdminUi/security/login/content/form/remember_me.html.twig',
+                    'template' => '@SyliusBootstrapAdminUi/security/login/page/content/form/remember_me.html.twig',
                 ],
                 'submit' => [
-                    'template' => '@SyliusBootstrapAdminUi/security/login/content/form/submit.html.twig',
+                    'template' => '@SyliusBootstrapAdminUi/security/login/page/content/form/submit.html.twig',
                 ],
             ],
         ],

diff --git a/src/BootstrapAdminUi/templates/security/common/page.html.twig b/src/BootstrapAdminUi/templates/security/common/page.html.twig
@@ -0,0 +1,5 @@
+<div class="page page-center">
+    <div class="container container-tight py-4">
+        {% hook 'page' %}
+    </div>
+</div>
diff --git a/...tes/security/login/content/form.html.twig → ...ecurity/login/page/content/form.html.twig b/...tes/security/login/content/form.html.twig → ...ecurity/login/page/content/form.html.twig
diff --git a/...curity/login/content/form/error.html.twig → ...y/login/page/content/form/error.html.twig b/...curity/login/content/form/error.html.twig → ...y/login/page/content/form/error.html.twig
diff --git a/...ity/login/content/form/password.html.twig → ...ogin/page/content/form/password.html.twig b/...ity/login/content/form/password.html.twig → ...ogin/page/content/form/password.html.twig
diff --git a/.../login/content/form/remember_me.html.twig → ...n/page/content/form/remember_me.html.twig b/.../login/content/form/remember_me.html.twig → ...n/page/content/form/remember_me.html.twig
diff --git a/...urity/login/content/form/submit.html.twig → .../login/page/content/form/submit.html.twig b/...urity/login/content/form/submit.html.twig → .../login/page/content/form/submit.html.twig
diff --git a/...ity/login/content/form/username.html.twig → ...ogin/page/content/form/username.html.twig b/...ity/login/content/form/username.html.twig → ...ogin/page/content/form/username.html.twig