fix(2.0): fixes for 2.0

maximehuran · maximehuran · commit a182e3f942e6 · 2025-11-12T17:26:56.000+01:00
diff --git a/UPGRADE-2.0.md b/UPGRADE-2.0.md
@@ -0,0 +1,13 @@
+# Upgrade Guide to Sylius 2.x
+
+## Configuration Changes
+
+- The configuration is now in `config` folder instead of `src/Resources/config`.
+
+## Removed Settings
+
+- Removed `circular_icon_color` setting from admin settings form and configuration
+
+## Templates
+
+- Templates path changed and now use Twig Hooks
diff --git a/UPGRADE.md b/UPGRADE.md
diff --git a/config/settings.yaml b/config/settings.yaml
@@ -4,13 +4,12 @@ monsieurbiz_sylius_settings:
             vendor_name: Monsieur Biz
             plugin_name: monsieurbiz_better_admin.settings.admin.plugin_name
             description: monsieurbiz_better_admin.settings.admin.description
-            icon: cog
+            icon: bi:gear
             use_locales: false
             classes:
                 form: MonsieurBiz\SyliusBetterAdminPlugin\Form\Type\Settings\AdminSettingsType
             default_values:
                 color: '#1abb9c'
-                circular_icon_color: '#ffffff'
                 logo_login_width: '200'
                 logo_sidebar_width: '200'
                 logo: ''
diff --git a/config/twig_hooks.yaml b/config/twig_hooks.yaml
@@ -2,23 +2,41 @@ sylius_twig_hooks:
     hooks:
         sylius_admin.base#stylesheets:
             monsieurbiz_better_admin_stylesheet:
-                template: "@MonsieurBizSyliusBetterAdminPlugin/shared/layout/base/styles.html.twig"
+                template: "@MonsieurBizSyliusBetterAdminPlugin/styles.html.twig"
                 priority: 9999
         sylius_admin.common.component.sidebar.logo:
             image:
-                template: "@MonsieurBizSyliusBetterAdminPlugin/shared/crud/common/sidebar/logo/image.html.twig"
+                template: "@MonsieurBizSyliusBetterAdminPlugin/sidebar/logo.html.twig"
                 priority: 9999
-        sylius_admin.security.login:
-            monsieurbiz_better_admin_login:
-                template: "@MonsieurBizSyliusBetterAdminPlugin/security/common/login.html.twig"
-                priority: 9999
-                context:
-                    form: form
-                    last_error: last_error
-                    last_username: last_username
         sylius_admin.security.login.page.logo:
             image:
-                template: "@MonsieurBizSyliusBetterAdminPlugin/security/common/logo/image.html.twig"
+                enabled: false
+        sylius_admin.security.login.page.content:
+            header:
+                enabled: false
+            image:
+                template: "@MonsieurBizSyliusBetterAdminPlugin/security/logo.html.twig"
+                priority: 9999
+            background:
+                template: "@MonsieurBizSyliusBetterAdminPlugin/security/background.html.twig"
+                priority: -9999
+        sylius_admin.security.request_password_reset.page.logo:
+            image:
+                enabled: false
+        sylius_admin.security.request_password_reset.page.content:
+            image:
+                template: "@MonsieurBizSyliusBetterAdminPlugin/security/logo.html.twig"
+                priority: 9999
+            background:
+                template: "@MonsieurBizSyliusBetterAdminPlugin/security/background.html.twig"
+                priority: -9999
+        sylius_admin.security.reset_password.page.logo:
+            image:
+                enabled: false
+        sylius_admin.security.reset_password.page.content:
+            image:
+                template: "@MonsieurBizSyliusBetterAdminPlugin/security/logo.html.twig"
                 priority: 9999
-                context:
-                    paths: paths
+            background:
+                template: "@MonsieurBizSyliusBetterAdminPlugin/security/background.html.twig"
+                priority: -9999
diff --git a/dist/.env.local b/dist/.env.local
@@ -1 +1,2 @@
 SYLIUS_FIXTURES_HOSTNAME=${SYMFONY_DEFAULT_ROUTE_HOST:-localhost}
+MAILER_DSN=smtp://localhost:50437
diff --git a/src/Form/Type/Settings/AdminSettingsType.php b/src/Form/Type/Settings/AdminSettingsType.php
@@ -87,16 +87,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 'required' => false,
             ]
         );
-        $this->addWithDefaultCheckbox(
-            $builder,
-            'circular_icon_color',
-            ColorType::class,
-            [
-                'label' => 'monsieurbiz_better_admin.form.circular_icon_color',
-                'help' => 'monsieurbiz_better_admin.form.circular_icon_color_help',
-                'required' => false,
-            ]
-        );
         $this->addWithDefaultCheckbox(
             $builder,
             'custom_css',
diff --git a/templates/security/background.html.twig b/templates/security/background.html.twig
@@ -0,0 +1,26 @@
+
+{% set backgroundImage = setting('monsieurbiz_better_admin.admin', 'background_image')|default('') %}
+
+<script type="text/javascript">
+    function changeBodyBackground(imgUrl)
+    {
+        let bodyStyle = document.body.style;
+        bodyStyle.backgroundSize = 'cover';
+        bodyStyle.backgroundRepeat = 'no-repeat';
+        bodyStyle.backgroundImage = "url('" + imgUrl + "')";
+    }
+
+    document.addEventListener('DOMContentLoaded', function() {
+        {% if backgroundImage is empty %}
+        changeBodyBackground('https://picsum.photos/1600/900?random');
+        {% else %}
+        changeBodyBackground('{{ asset(backgroundImage) | imagine_filter('admin_login_background') | escape('js') }}');
+        {% endif %}
+    });
+</script>
+
+<style>
+    html {
+        margin: 0 !important;
+    }
+</style>
diff --git a/templates/security/common/login.html.twig b/templates/security/common/login.html.twig
diff --git a/templates/security/common/logo/image.html.twig b/templates/security/common/logo/image.html.twig
diff --git a/templates/security/logo.html.twig b/templates/security/logo.html.twig
@@ -0,0 +1,13 @@
+{% set logo = setting('monsieurbiz_better_admin.admin', 'logo')|default('') %}
+
+<div class="mb-4 text-center"> 
+    {% if logo is not empty %}
+        {% if is_svg_image(logo) %}
+            <img src="{{ logo }}" class="monsieurbiz-better-admin-login-logo" id="logo" alt="Logo">
+        {% else %}
+            <img src="{{ logo|imagine_filter('admin_login_logo') }}" class="monsieurbiz-better-admin-login-logo" id="logo" alt="Logo">
+        {% endif %}
+    {% else %}
+        <img src="{{ asset('build/admin/images/sylius-logo.svg', 'admin') }}" alt="Sylius" class="navbar-brand-image" />
+    {% endif %}
+</div>
diff --git a/templates/shared/crud/common/sidebar/logo/image.html.twig b/templates/shared/crud/common/sidebar/logo/image.html.twig
diff --git a/templates/sidebar/logo.html.twig b/templates/sidebar/logo.html.twig
@@ -0,0 +1,12 @@
+{% set logoSidebar = setting('monsieurbiz_better_admin.admin', 'logo_sidebar')|default('') %}
+{% if logoSidebar is not empty %}
+    <div class="monsieurbiz-better-admin-sidebar-logo">
+        {% if is_svg_image(logoSidebar) %}
+            <img src="{{ logoSidebar }}" class="sidebar-logo-image" alt="Logo">
+        {% else %}
+            <img src="{{ logoSidebar|imagine_filter('admin_sidebar_logo') }}" class="sidebar-logo-image" alt="Logo">
+        {% endif %}
+    </div>
+{% else %}
+    <img src="{{ asset('build/admin/images/sylius-logo.svg', 'admin') }}" alt="Sylius" class="navbar-brand-image" />
+{% endif %}
diff --git a/templates/styles.html.twig b/templates/styles.html.twig
@@ -1,5 +1,4 @@
 {% set mainColor = setting('monsieurbiz_better_admin.admin', 'color')|default('#2fcb9c') %}
-{% set circularIconColor = setting('monsieurbiz_better_admin.admin', 'circular_icon_color')|default('#1abb9c') %}
 {% set logoSidebarWidth = setting('monsieurbiz_better_admin.admin', 'logo_sidebar_width')|default('90') %}
 {% set logoLoginWidth = setting('monsieurbiz_better_admin.admin', 'logo_login_width')|default('200') %}
 {% set customCss = setting('monsieurbiz_better_admin.admin', 'custom_css')|default('') %}
@@ -88,7 +87,6 @@ button.bg-secondary, .btn-secondary {
 
 .monsieurbiz-better-admin-login-logo {
     max-width: {{ logoLoginWidth }}px;
-    margin: 0 auto 40px auto;
 }
 
 form[name="settings"] .monsieurbiz-sylius-file-manager__field {
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
@@ -2,8 +2,6 @@ monsieurbiz_better_admin:
     form:
         color: 'Color'
         color_help: 'The main color of your website used in admin displays'
-        circular_icon_color: 'Color of circular icon'
-        circular_icon_color_help: 'The color of the circular icon in the headers'
         custom_css: 'Custom CSS'
         custom_css_help: 'Custom CSS to apply to the admin (Be careful)'
         logo: 'Logo'
diff --git a/translations/messages.fr.yaml b/translations/messages.fr.yaml
@@ -2,8 +2,6 @@ monsieurbiz_better_admin:
     form:
         color: 'Couleur'
         color_help: 'La couleur principale de votre site utilisée dans les affichages d''administration'
-        circular_icon_color: 'Couleur de l''icône circulaire'
-        circular_icon_color_help: 'La couleur de l''icône circulaire dans les en-têtes'
         custom_css: 'CSS personnalisé'
         custom_css_help: 'CSS personnalisé à appliquer à l''administration (Soyez prudents)'
         logo: 'Logo'

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`SYLIUS_FIXTURES_HOSTNAME=${SYMFONY_DEFAULT_ROUTE_HOST:-localhost}`
	`2`	`+MAILER_DSN=smtp://localhost:50437`