Skip to content

Commit 9790fbf

Browse files
devansh-webkuldevansh-webkul
authored
Merge pull request #2004 from amit-webkul/config
feat: update brand color to use CSS variable.
2 parents cd53e6e + 7df5c35 commit 9790fbf

File tree

20 files changed

+96
-150
lines changed

20 files changed

+96
-150
lines changed

‎packages/Webkul/Admin/src/Config/core_config.php

+8-46
Original file line numberDiff line numberDiff line change
@@ -52,39 +52,11 @@
5252
'sort' => 1,
5353
'fields' => [
5454
[
55-
'name' => 'powered_by',
55+
'name' => 'label',
5656
'title' => 'admin::app.configuration.index.general.settings.footer.powered-by',
57-
'type' => 'text',
58-
'default' => 'Powered by',
59-
'validation' => 'max:50',
60-
], [
61-
'name' => 'powered_by_redirection_title',
62-
'title' => 'admin::app.configuration.index.general.settings.footer.powered-by-redirection-title',
63-
'type' => 'text',
64-
'default' => 'Krayin',
65-
'validation' => 'max:20',
66-
], [
67-
'name' => 'powered_by_redirection_link',
68-
'title' => 'admin::app.configuration.index.general.settings.footer.powered-by-redirection-link',
69-
'default' => 'https://krayincrm.com',
70-
'type' => 'text',
71-
], [
72-
'name' => 'other',
73-
'title' => 'admin::app.configuration.index.general.settings.footer.other',
74-
'type' => 'text',
75-
'default' => 'an open-source project by',
76-
'validation' => 'max:100',
77-
], [
78-
'name' => 'other_redirection_title',
79-
'title' => 'admin::app.configuration.index.general.settings.footer.other-redirection-title',
80-
'type' => 'text',
81-
'default' => 'Webkul',
82-
'validation' => 'max:25',
83-
], [
84-
'name' => 'other_redirection_link',
85-
'title' => 'admin::app.configuration.index.general.settings.footer.other-redirection-link',
86-
'default' => 'https://webkul.com',
87-
'type' => 'text',
57+
'type' => 'editor',
58+
'default' => 'Powered by <span style="color: rgb(14, 144, 217);"><a href="http://www.krayincrm.com" target="_blank">Krayin</a></span>, an open-source project by <span style="color: rgb(14, 144, 217);"><a href="https://webkul.com" target="_blank">Webkul</a></span>.',
59+
'tinymce' => true,
8860
],
8961
],
9062
], [
@@ -198,20 +170,10 @@
198170
'sort' => 2,
199171
'fields' => [
200172
[
201-
'name' => 'active_background_color',
202-
'title' => 'admin::app.configuration.index.general.settings.menu-color.active-background-color',
203-
'type' => 'color',
204-
'default' => '#0E90D9',
205-
], [
206-
'name' => 'active_text_color',
207-
'title' => 'admin::app.configuration.index.general.settings.menu-color.active-text-color',
208-
'type' => 'color',
209-
'default' => '#ffffff',
210-
], [
211-
'name' => 'text_color',
212-
'title' => 'admin::app.configuration.index.general.settings.menu-color.text-color',
213-
'type' => 'color',
214-
'default' => '#757575',
173+
'name' => 'brand_color',
174+
'title' => 'admin::app.configuration.index.general.settings.menu-color.brand-color',
175+
'type' => 'color',
176+
'default' => '#0E90D9',
215177
],
216178
],
217179
],

‎packages/Webkul/Admin/src/Resources/lang/ar/app.php

+3-8
Original file line numberDiff line numberDiff line change
@@ -1904,14 +1904,9 @@
19041904
'info' => 'قم بتحديث إعداداتك هنا.',
19051905

19061906
'footer' => [
1907-
'info' => 'يمكننا تكوين قسم "مشغل بواسطة" هنا.',
1908-
'other' => 'أخرى',
1909-
'other-redirection-link' => 'رابط إعادة التوجيه الآخر',
1910-
'other-redirection-title' => 'عنوان إعادة التوجيه الآخر',
1911-
'powered-by' => 'مشغل بواسطة',
1912-
'powered-by-redirection-link' => 'رابط إعادة التوجيه "مشغل بواسطة"',
1913-
'powered-by-redirection-title' => 'عنوان إعادة التوجيه "مشغل بواسطة"',
1914-
'title' => 'تكوينات قسم "مشغل بواسطة"',
1907+
'info' => 'يمكننا تكوين قسم "مشغل بواسطة" هنا.',
1908+
'powered-by' => 'مشغل بواسطة',
1909+
'title' => 'تكوينات قسم "مشغل بواسطة"',
19151910
],
19161911

19171912
'menu' => [

‎packages/Webkul/Admin/src/Resources/lang/en/app.php

+6-13
Original file line numberDiff line numberDiff line change
@@ -1906,14 +1906,9 @@
19061906
'info' => 'Update your settings here.',
19071907

19081908
'footer' => [
1909-
'info' => 'We can configure the powered by section here.',
1910-
'other' => 'Other',
1911-
'other-redirection-link' => 'Other Redirection Link',
1912-
'other-redirection-title' => 'Other Redirection Title',
1913-
'powered-by' => 'Powered by',
1914-
'powered-by-redirection-link' => 'Powered by Redirection Link',
1915-
'powered-by-redirection-title' => 'Powered by Redirection Title',
1916-
'title' => 'Powered by Section Configurations',
1909+
'info' => 'We can configure the powered by section here.',
1910+
'powered-by' => 'Powered by text editor',
1911+
'title' => 'Powered by Section Configurations',
19171912
],
19181913

19191914
'menu' => [
@@ -1938,11 +1933,9 @@
19381933
],
19391934

19401935
'menu-color' => [
1941-
'active-background-color' => 'Active Background Color',
1942-
'active-text-color' => 'Active Text Color',
1943-
'info' => 'We can change the menu items colors here.',
1944-
'text-color' => 'Text Color',
1945-
'title' => 'Menu Item Color Configurations',
1936+
'brand-color' => 'Brand Color',
1937+
'info' => 'We can change the menu items colors here.',
1938+
'title' => 'Menu Item Color Configurations',
19461939
],
19471940
],
19481941
],

‎packages/Webkul/Admin/src/Resources/lang/es/app.php

+3-8
Original file line numberDiff line numberDiff line change
@@ -1905,14 +1905,9 @@
19051905
'info' => 'Actualiza tus configuraciones aquí.',
19061906

19071907
'footer' => [
1908-
'info' => 'Podemos configurar la sección de powered by aquí.',
1909-
'other' => 'Otro',
1910-
'other-redirection-link' => 'Otro Enlace de Redirección',
1911-
'other-redirection-title' => 'Otro Título de Redirección',
1912-
'powered-by' => 'Desarrollado por',
1913-
'powered-by-redirection-link' => 'Enlace de Redirección de Powered by',
1914-
'powered-by-redirection-title' => 'Título de Redirección de Powered by',
1915-
'title' => 'Configuraciones de la Sección Powered by',
1908+
'info' => 'Podemos configurar la sección de powered by aquí.',
1909+
'powered-by' => 'Editor de texto impulsado por',
1910+
'title' => 'Configuraciones de la Sección Powered by',
19161911
],
19171912

19181913
'menu' => [

‎packages/Webkul/Admin/src/Resources/lang/fa/app.php

+3-8
Original file line numberDiff line numberDiff line change
@@ -1906,14 +1906,9 @@
19061906
'info' => 'تنظیمات خود را اینجا به‌روزرسانی کنید.',
19071907

19081908
'footer' => [
1909-
'info' => 'ما می‌توانیم بخش "توسعه یافته توسط" را اینجا پیکربندی کنیم.',
1910-
'other' => 'دیگر',
1911-
'other-redirection-link' => 'لینک هدایت دیگر',
1912-
'other-redirection-title' => 'عنوان هدایت دیگر',
1913-
'powered-by' => 'توسعه یافته توسط',
1914-
'powered-by-redirection-link' => 'لینک هدایت توسعه یافته توسط',
1915-
'powered-by-redirection-title' => 'عنوان هدایت توسعه یافته توسط',
1916-
'title' => 'پیکربندی بخش "توسعه یافته توسط"',
1909+
'info' => 'ما می‌توانیم بخش "توسعه یافته توسط" را اینجا پیکربندی کنیم.',
1910+
'powered-by' => 'توسعه یافته توسط ویرایشگر متن',
1911+
'title' => 'پیکربندی بخش "توسعه یافته توسط"',
19171912
],
19181913

19191914
'menu' => [

‎packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php

+3-8
Original file line numberDiff line numberDiff line change
@@ -1899,14 +1899,9 @@
18991899
'info' => 'Atualize suas configurações aqui.',
19001900

19011901
'footer' => [
1902-
'info' => 'Podemos configurar a seção powered by aqui.',
1903-
'other' => 'Outro',
1904-
'other-redirection-link' => 'Outro Link de Redirecionamento',
1905-
'other-redirection-title' => 'Outro Título de Redirecionamento',
1906-
'powered-by' => 'Powered by',
1907-
'powered-by-redirection-link' => 'Link de Redirecionamento Powered by',
1908-
'powered-by-redirection-title' => 'Título de Redirecionamento Powered by',
1909-
'title' => 'Configurações da Seção Powered by',
1902+
'info' => 'Podemos configurar a seção powered by aqui.',
1903+
'powered-by' => 'Editor de texto "Powered by"',
1904+
'title' => 'Configurações da Seção Powered by',
19101905
],
19111906

19121907
'menu' => [

‎packages/Webkul/Admin/src/Resources/lang/tr/app.php

+3-8
Original file line numberDiff line numberDiff line change
@@ -1906,14 +1906,9 @@
19061906
'info' => 'Ayarlarınızı burada güncelleyin.',
19071907

19081908
'footer' => [
1909-
'info' => 'Powered by bölümünü burada yapılandırabiliriz.',
1910-
'other' => 'Diğer',
1911-
'other-redirection-link' => 'Diğer Yönlendirme Bağlantısı',
1912-
'other-redirection-title' => 'Diğer Yönlendirme Başlığı',
1913-
'powered-by' => 'Tarafından desteklenmektedir',
1914-
'powered-by-redirection-link' => 'Powered by Yönlendirme Bağlantısı',
1915-
'powered-by-redirection-title' => 'Powered by Yönlendirme Başlığı',
1916-
'title' => 'Powered by Bölüm Yapılandırmaları',
1909+
'info' => 'Powered by bölümünü burada yapılandırabiliriz.',
1910+
'powered-by' => 'Powered by metin düzenleyici',
1911+
'title' => 'Powered by Bölüm Yapılandırmaları',
19171912
],
19181913

19191914
'menu' => [

‎packages/Webkul/Admin/src/Resources/lang/vi/app.php

+3-8
Original file line numberDiff line numberDiff line change
@@ -1905,14 +1905,9 @@
19051905
'info' => 'Cập nhật cài đặt của bạn tại đây.',
19061906

19071907
'footer' => [
1908-
'info' => 'Chúng tôi có thể cấu hình phần powered by tại đây.',
1909-
'other' => 'Khác',
1910-
'other-redirection-link' => 'Liên kết Chuyển hướng Khác',
1911-
'other-redirection-title' => 'Tiêu đề Chuyển hướng Khác',
1912-
'powered-by' => 'Được hỗ trợ bởi',
1913-
'powered-by-redirection-link' => 'Liên kết Chuyển hướng Powered by',
1914-
'powered-by-redirection-title' => 'Tiêu đề Chuyển hướng Powered by',
1915-
'title' => 'Cấu hình Phần Powered by',
1908+
'info' => 'Chúng tôi có thể cấu hình phần powered by tại đây.',
1909+
'powered-by' => 'Được hỗ trợ bởi trình chỉnh sửa văn bản',
1910+
'title' => 'Cấu hình Phần Powered by',
19161911
],
19171912

19181913
'menu' => [

‎packages/Webkul/Admin/src/Resources/views/components/form/control-group/control.blade.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,15 @@ class="flex w-full items-center overflow-hidden rounded-md border text-sm text-g
9999
type="{{ $type }}"
100100
name="{{ $name }}"
101101
v-bind="field"
102+
id="{{ $attributes->get(':id', $attributes->get('id')) }}"
102103
:class="[errors.length ? 'border !border-red-600 hover:border-red-600' : '']"
103104
{{ $attributes->except(['value', ':value', 'v-model', 'rules', ':rules', 'label', ':label'])->merge(['class' => 'w-full rounded border border-gray-200 px-2.5 py-2 text-sm font-normal text-gray-800 transition-all hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:bg-gray-900 dark:text-gray-300 dark:hover:border-gray-400 dark:focus:border-gray-400']) }}
104105
>
105106
</textarea>
106107

107108
@if ($attributes->get('tinymce', false) || $attributes->get(':tinymce', false))
108109
<x-admin::tinymce
109-
:selector="'textarea#' . $attributes->get('id')"
110+
:selector="'textarea#' . $attributes->get(':id', 'id')"
110111
::field="field"
111112
/>
112113
@endif

‎packages/Webkul/Admin/src/Resources/views/components/layouts/index.blade.php

+9-19
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,17 @@ class="{{ request()->cookie('dark_mode') ? 'dark' : '' }}"
7474
/>
7575
@endif
7676

77+
@php
78+
$brandColor = core()->getConfigData('general.settings.menu_color.brand_color') ?? '#0E90D9';
79+
@endphp
80+
7781
@stack('styles')
7882

7983
<style>
84+
:root {
85+
--brand-color: {{ $brandColor }};
86+
}
87+
8088
{!! core()->getConfigData('general.content.custom_scripts.custom_css') !!}
8189
</style>
8290

@@ -117,25 +125,7 @@ class="group/container sidebar-collapsed flex gap-4"
117125
<!-- Powered By -->
118126
<div class="mt-auto pt-6">
119127
<div class="border-t bg-white py-5 text-center text-sm font-normal dark:border-gray-800 dark:bg-gray-900 dark:text-white">
120-
<p>
121-
{{ core()->getConfigData('general.settings.footer.powered_by') }}
122-
123-
<a
124-
class="text-brandColor hover:underline dark:text-brandColor"
125-
href="{{ core()->getConfigData('general.settings.footer.powered_by_redirection_link') }}"
126-
>
127-
{{ core()->getConfigData('general.settings.footer.powered_by_redirection_title') }}
128-
</a>,
129-
130-
{{ core()->getConfigData('general.settings.footer.other') }}
131-
132-
<a
133-
class="text-brandColor hover:underline dark:text-brandColor"
134-
href="{{ core()->getConfigData('general.settings.footer.other_redirection_link') }}"
135-
>
136-
{{ core()->getConfigData('general.settings.footer.other_redirection_title') }}
137-
</a>
138-
</p>
128+
<p>{!! core()->getConfigData('general.settings.footer.label') !!}</p>
139129
</div>
140130
</div>
141131
</div>

‎packages/Webkul/Admin/src/Resources/views/components/layouts/sidebar/index.blade.php

+4-14
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,15 @@ class="duration-80 fixed top-[60px] z-[10002] h-full w-[200px] border-gray-200 b
1010
@foreach (menu()->getItems('admin') as $menuItem)
1111
<div class="px-4 group/item {{ $menuItem->isActive() ? 'active' : 'inactive' }}">
1212
<a
13-
class="flex gap-2 p-1.5 items-center cursor-pointer hover:rounded-lg {{ $menuItem->isActive() == 'active' ? 'rounded-lg' : ' hover:bg-gray-100 hover:dark:bg-gray-950' }} peer"
14-
style="background-color: {{ $menuItem->isActive() == 'active' ? (core()->getConfigData('general.settings.menu_color.active_background_color') ?? '#0E90D9') : '' }}"
13+
class="flex gap-2 p-1.5 items-center cursor-pointer hover:rounded-lg {{ $menuItem->isActive() == 'active' ? 'bg-brandColor rounded-lg' : ' hover:bg-gray-100 hover:dark:bg-gray-950' }} peer"
1514
href="{{ ! in_array($menuItem->getKey(), ['settings', 'configuration']) && $menuItem->haveChildren() ? 'javascript:void(0)' : $menuItem->getUrl() }}"
1615
@mouseleave="!isMenuActive ? hoveringMenu = '' : {}"
1716
@mouseover="hoveringMenu='{{$menuItem->getKey()}}'"
1817
@click="isMenuActive = !isMenuActive"
1918
>
20-
<span
21-
class="{{ $menuItem->getIcon() }} text-2xl"
22-
style="color: {{ $menuItem->isActive() ? (core()->getConfigData('general.settings.menu_color.active_text_color') ?? '#ffffff') : (core()->getConfigData('general.settings.menu_color.text_color') ?? '#757575') }}"
23-
></span>
19+
<span class="{{ $menuItem->getIcon() }} text-2xl {{ $menuItem->isActive() ? 'text-white' : ''}}"></span>
2420

25-
<div
26-
class="group flex flex-1 items-center justify-between whitespace-nowrap font-medium text-gray-600 group-[.sidebar-collapsed]/container:hidden dark:text-gray-300"
27-
style="color: {{ $menuItem->isActive() ? (core()->getConfigData('general.settings.menu_color.active_text_color') ?? '#ffffff') : (core()->getConfigData('general.settings.menu_color.text_color') ?? '#757575') }}"
28-
>
21+
<div class="flex-1 flex justify-between items-center text-gray-600 dark:text-gray-300 font-medium whitespace-nowrap group-[.sidebar-collapsed]/container:hidden {{ $menuItem->isActive() ? 'text-white' : ''}} group">
2922
<p>{{ core()->getConfigData('general.settings.menu.'.$menuItem->getKey()) ?? $menuItem->getName() }}</p>
3023

3124
@if ( ! in_array($menuItem->getKey(), ['settings', 'configuration']) && $menuItem->haveChildren())
@@ -52,10 +45,7 @@ class="absolute top-0 hidden flex-col bg-gray-100 ltr:left-[200px] rtl:right-[19
5245
href="{{ $subMenuItem->getUrl() }}"
5346
class="flex gap-2.5 p-2 items-center cursor-pointer hover:rounded-lg {{ $subMenuItem->isActive() == 'active' ? 'bg-brandColor rounded-lg' : ' hover:bg-gray-100 hover:dark:bg-gray-950' }} peer"
5447
>
55-
<p
56-
class="dark:text-gray-300 font-medium whitespace-nowrap {{ $subMenuItem->isActive() ? 'text-white' : ''}}"
57-
style="color: {{ core()->getConfigData('general.settings.menu_color.text_color') ?? '#757575' }}"
58-
>
48+
<p class="text-gray-600 dark:text-gray-300 font-medium whitespace-nowrap {{ $subMenuItem->isActive() ? 'text-white' : ''}}">
5949
{{ core()->getConfigData('general.settings.menu.'.$subMenuItem->getKey()) ?? $subMenuItem->getName() }}
6050
</p>
6151
</a>

‎packages/Webkul/Admin/src/Resources/views/components/tinymce/index.blade.php

-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
},
3737
3838
mounted() {
39-
tinymce.remove(this.selector);
40-
4139
this.init();
4240
4341
this.$emitter.on('change-theme', (theme) => {

0 commit comments

Comments
 (0)