From e73ab20928a03f29e102393da04582ab9544dcb2 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Mon, 15 Apr 2024 15:14:52 -0500 Subject: [PATCH 01/22] Iternal: API: disable pagination for ColorTheme endpoint --- src/CoreBundle/Entity/ColorTheme.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CoreBundle/Entity/ColorTheme.php b/src/CoreBundle/Entity/ColorTheme.php index c298cf56ac..ad13a75998 100644 --- a/src/CoreBundle/Entity/ColorTheme.php +++ b/src/CoreBundle/Entity/ColorTheme.php @@ -26,6 +26,7 @@ use Symfony\Component\Serializer\Annotation\Groups; denormalizationContext: [ 'groups' => ['color_theme:write'], ], + paginationEnabled: false, security: "is_granted('ROLE_ADMIN')", )] class ColorTheme From 1a8f998f6e56f05b5684df70183772c81845789b Mon Sep 17 00:00:00 2001 From: Daniel <50702276+daniboygg@users.noreply.github.com> Date: Mon, 15 Apr 2024 22:31:59 +0200 Subject: [PATCH 02/22] Gh 5341 save colors with name (#5350) * Admin: Change format of colors to see more in the screen * Minor: fix label for radio button * Minor: add loading state to baseselect * Minor: format base select * Admin: add theme selector for chamilo * Admin: update color when other theme is selected --- .../basecomponents/BaseColorPicker.vue | 8 +- .../basecomponents/BaseRadioButtons.vue | 2 +- .../components/basecomponents/BaseSelect.vue | 29 +- assets/vue/composables/theme.js | 11 + assets/vue/services/colorThemeService.js | 33 + .../vue/views/admin/AdminConfigureColors.vue | 825 ++++++++++-------- 6 files changed, 520 insertions(+), 388 deletions(-) create mode 100644 assets/vue/services/colorThemeService.js diff --git a/assets/vue/components/basecomponents/BaseColorPicker.vue b/assets/vue/components/basecomponents/BaseColorPicker.vue index eba9e89118..7b393ae9bc 100644 --- a/assets/vue/components/basecomponents/BaseColorPicker.vue +++ b/assets/vue/components/basecomponents/BaseColorPicker.vue @@ -5,11 +5,12 @@ {{ error }} -
+
diff --git a/assets/vue/components/basecomponents/BaseRadioButtons.vue b/assets/vue/components/basecomponents/BaseRadioButtons.vue index 5fcfa52782..9e1a4c0ea8 100644 --- a/assets/vue/components/basecomponents/BaseRadioButtons.vue +++ b/assets/vue/components/basecomponents/BaseRadioButtons.vue @@ -8,7 +8,7 @@ :name="name" :value="option.value" /> - + diff --git a/assets/vue/components/basecomponents/BaseSelect.vue b/assets/vue/components/basecomponents/BaseSelect.vue index d27e9859b1..8c7e45459c 100644 --- a/assets/vue/components/basecomponents/BaseSelect.vue +++ b/assets/vue/components/basecomponents/BaseSelect.vue @@ -7,24 +7,29 @@ :options="realOptions" :option-label="optionLabel" :option-value="optionValue" + :loading="isLoading" placeholder="--" @update:model-value="emit('update:modelValue', $event)" > -