feat: Use Twig global for main_color variable

roadiz · Aug 29, 2024 · 106b564 · 106b564
1 parent 9c82755
commit 106b564
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 26 deletions.
diff --git a/lib/RoadizCoreBundle/src/Controller/CustomFormController.php b/lib/RoadizCoreBundle/src/Controller/CustomFormController.php
@@ -212,7 +212,6 @@ private function prepareAndHandleCustomFormAssignation(
             'fields' => $customFormsEntity->getFields(),
             'head' => [
                 'siteTitle' => $this->settingsBag->get('site_name'),
-                'mainColor' => $this->settingsBag->get('main_color'),
             ]
         ];
         $helper = $this->customFormHelperFactory->createHelper($customFormsEntity);

diff --git a/lib/RoadizCoreBundle/src/Mailer/EmailManager.php b/lib/RoadizCoreBundle/src/Mailer/EmailManager.php
@@ -113,17 +113,12 @@ public function renderPlainTextEmailBody(): string
     }
 
     /**
-     * Added mainColor and headerImageSrc assignation
-     * to display email header.
+     * Added headerImageSrc assignation to display email header.
      *
      * @return $this
      */
     public function appendWebsiteIcon(): static
     {
-        if (empty($this->assignation['mainColor']) && null !== $this->settingsBag) {
-            $this->assignation['mainColor'] = $this->settingsBag->get('main_color');
-        }
-
         if (empty($this->assignation['headerImageSrc']) && null !== $this->settingsBag) {
             $adminImage = $this->settingsBag->getDocument('admin_image');
             if ($adminImage instanceof DocumentInterface && null !== $this->documentUrlGenerator) {

diff --git a/lib/RoadizCoreBundle/src/TwigExtension/RoadizExtension.php b/lib/RoadizCoreBundle/src/TwigExtension/RoadizExtension.php
@@ -41,6 +41,7 @@ public function getGlobals(): array
                 'nodeTypes' => $this->nodeTypesBag,
             ],
             'chroot_resolver' => $this->chrootResolver,
+            'main_color' => $this->settingsBag->get('main_color'),
             'meta' => [
                 'siteName' => $this->settingsBag->get('site_name'),
                 'siteCopyright' => $this->settingsBag->get('site_copyright'),

diff --git a/lib/RoadizCoreBundle/templates/customForm/base_custom_form.html.twig b/lib/RoadizCoreBundle/templates/customForm/base_custom_form.html.twig
@@ -10,10 +10,10 @@
     {% include '@RoadizRozier/admin/meta-icon.html.twig' %}
     {# CSS scripts inclusions / Using webpack #}
     {% include '@RoadizRozier/partials/css-inject.html.twig' %}
-    {% if head.mainColor %}
+    {% if main_color %}
         <style>
             :root {
-                --rz-accent-color: {{ head.mainColor|raw }};
+                --rz-accent-color: {{ main_color|raw }};
                 --rz-accent-color-lighter: color-mix(in srgb, var(--rz-accent-color) var(--color-light-mix), white);
                 --rz-accent-color-darker: color-mix(in srgb, var(--rz-accent-color) var(--color-darker-mix), black);
                 --rz-accent-color-darkest: color-mix(in srgb, var(--rz-accent-color) var(--color-darkest-mix), black);

diff --git a/lib/RoadizCoreBundle/templates/email/base_email.html.twig b/lib/RoadizCoreBundle/templates/email/base_email.html.twig
@@ -14,7 +14,7 @@
                 <table class="main" width="100%" cellpadding="0" cellspacing="0">
                     {% if headerImageSrc is defined %}
                         <tr>
-                            <td class="header-image-wrap aligncenter"{% if mainColor is defined %}style="background-color: {{ mainColor }};"{% endif %}>
+                            <td class="header-image-wrap aligncenter"{% if main_color is defined %}style="background-color: {{ main_color }};"{% endif %}>
                                 <img class="header-image" src="{{ headerImageSrc }}" alt="{{ title }}" />
                             </td>
                         </tr>

diff --git a/lib/RoadizRozierBundle/src/Controller/SecurityController.php b/lib/RoadizRozierBundle/src/Controller/SecurityController.php
@@ -48,7 +48,6 @@ public function login(Request $request, AuthenticationUtils $authenticationUtils
             'themeServices' => $this->rozierServiceRegistry,
             'head' => [
                 'siteTitle' => $this->settingsBag->get('site_name') . ' backstage',
-                'mainColor' => $this->settingsBag->get('main_color'),
             ]
         ];
 
@@ -77,7 +76,6 @@ public function requestLoginLink(
             'themeServices' => $this->rozierServiceRegistry,
             'head' => [
                 'siteTitle' => $this->settingsBag->get('site_name') . ' backstage',
-                'mainColor' => $this->settingsBag->get('main_color'),
             ]
         ];
         // check if form is submitted

diff --git a/lib/RoadizRozierBundle/templates/simple.html.twig b/lib/RoadizRozierBundle/templates/simple.html.twig
@@ -10,10 +10,10 @@
     {% include '@RoadizRozier/admin/meta-icon.html.twig' %}
     {# CSS scripts inclusions / Using webpack #}
     {% include '@RoadizRozier/partials/css-inject.html.twig' %}
-    {% if head.mainColor %}
+    {% if main_color %}
         <style>
             :root {
-                --rz-accent-color: {{ head.mainColor|raw }};
+                --rz-accent-color: {{ main_color|raw }};
                 --rz-accent-color-lighter: color-mix(in srgb, var(--rz-accent-color) var(--color-light-mix), white);
                 --rz-accent-color-darker: color-mix(in srgb, var(--rz-accent-color) var(--color-darker-mix), black);
                 --rz-accent-color-darkest: color-mix(in srgb, var(--rz-accent-color) var(--color-darkest-mix), black);

diff --git a/lib/Rozier/src/Resources/views/admin/meta-icon.html.twig b/lib/Rozier/src/Resources/views/admin/meta-icon.html.twig
@@ -11,13 +11,13 @@
     <link rel="icon" type="image/png" sizes="32x32" href="{{ asset('assets/img/favicon-32x32.png', 'Rozier') }}">
     <link rel="icon" type="image/png" sizes="16x16" href="{{ asset('assets/img/favicon-16x16.png', 'Rozier') }}">
 {% endif %}
-{% if themeServices.adminImage and themeServices.adminImage.mimeType == 'image/svg+xml' and head.mainColor %}
-    <link rel="mask-icon" href="{{ themeServices.adminImage|url({absolute: true}) }}" color="{{ head.mainColor }}">
+{% if themeServices.adminImage and themeServices.adminImage.mimeType == 'image/svg+xml' and main_color %}
+    <link rel="mask-icon" href="{{ themeServices.adminImage|url({absolute: true}) }}" color="{{ main_color }}">
 {% endif %}
-{% if head.mainColor %}
-    <meta name="msapplication-TileColor" content="{{ head.mainColor }}">
-    <meta name="apple-mobile-web-app-status-bar-style" content="{{ head.mainColor }}">
-    <meta name="theme-color" content="{{ head.mainColor }}">
+{% if main_color %}
+    <meta name="msapplication-TileColor" content="{{ main_color }}">
+    <meta name="apple-mobile-web-app-status-bar-style" content="{{ main_color }}">
+    <meta name="theme-color" content="{{ main_color }}">
 {% else %}
     <meta name="msapplication-TileColor" content="#2d89ef">
     <meta name="apple-mobile-web-app-status-bar-style" content="#808080">

diff --git a/lib/Rozier/src/Resources/views/base.html.twig b/lib/Rozier/src/Resources/views/base.html.twig
@@ -12,10 +12,10 @@
         {# CSS scripts inclusions / Using webpack #}
         {% include '@RoadizRozier/partials/css-inject.html.twig' %}
 
-        {% if head.mainColor %}
+        {% if main_color %}
             <style>
                 :root {
-                    --rz-accent-color: {{ head.mainColor|raw }};
+                    --rz-accent-color: {{ main_color|raw }};
                     --rz-accent-color-lighter: color-mix(in srgb, var(--rz-accent-color) var(--color-light-mix), white);
                     --rz-accent-color-darker: color-mix(in srgb, var(--rz-accent-color) var(--color-darker-mix), black);
                     --rz-accent-color-darkest: color-mix(in srgb, var(--rz-accent-color) var(--color-darkest-mix), black);
@@ -94,7 +94,7 @@
                 'baseUrl':           '{{ head.baseUrl }}',
                 'resourcesUrl':      '{{ asset('', 'Rozier') }}',
                 'ajaxToken':         '{{ head.ajaxToken }}',
-                'mainColor':         '{{ head.mainColor }}',
+                'mainColor':         '{{ main_color }}',
                 'mapsStyle':         {% if head.mapsStyle %}{{ head.mapsStyle|raw }}{% else %}[]{% endif %},
                 'leafletMapTileUrl': '{{ bags.settings.get('leaflet_map_tile_url')|default('https://{s}.tile.osm.org/{z}/{x}/{y}.png') }}',
                 'googleClientId':    '{{ head.googleClientId }}',

diff --git a/lib/Rozier/src/Resources/views/css/mainColor.css.twig b/lib/Rozier/src/Resources/views/css/mainColor.css.twig
@@ -1,6 +1,6 @@
-{% if head.mainColor %}
+{% if main_color %}
 :root {
-    --rz-accent-color: {{ head.mainColor|raw }};
+    --rz-accent-color: {{ main_color|raw }};
     --rz-accent-color-lighter: color-mix(in srgb, var(--rz-accent-color) 70%, white);
     --rz-accent-color-darker: color-mix(in srgb, var(--rz-accent-color) 90%, black);
     --rz-accent-color-darkest: color-mix(in srgb, var(--rz-accent-color) 80%, black);

diff --git a/lib/Rozier/src/RozierApp.php b/lib/Rozier/src/RozierApp.php
@@ -113,7 +113,6 @@ public function prepareBaseAssignation(): static
         $this->assignation['head']['backDevMode'] = false;
         $this->assignation['head']['siteTitle'] = $this->getSettingsBag()->get('site_name') . ' backstage';
         $this->assignation['head']['mapsLocation'] = $this->getSettingsBag()->get('maps_default_location') ? $this->getSettingsBag()->get('maps_default_location') : null;
-        $this->assignation['head']['mainColor'] = $this->getSettingsBag()->get('main_color');
         $this->assignation['head']['googleClientId'] = $this->getSettingsBag()->get('google_client_id', "");
         $this->assignation['head']['themeName'] = static::$themeName;
         $this->assignation['head']['ajaxToken'] = $tokenManager->getToken(static::AJAX_TOKEN_INTENTION);