From f9bfb8e258217e3fc8808cb94e0a4e9eb8365788 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sun, 7 Jan 2024 08:12:20 +0800 Subject: [PATCH] added custom logo to space manage view --- cookbook/serializer.py | 10 +++++- .../apps/SpaceManageView/SpaceManageView.vue | 31 +++++++++++++++++++ vue/src/locales/en.json | 4 ++- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/cookbook/serializer.py b/cookbook/serializer.py index bb7bbf62..d4f7bd47 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -283,6 +283,13 @@ class SpaceSerializer(WritableNestedModelSerializer): image = UserFileViewSerializer(required=False, many=False, allow_null=True) nav_logo = UserFileViewSerializer(required=False, many=False, allow_null=True) custom_space_theme = UserFileViewSerializer(required=False, many=False, allow_null=True) + logo_color_32 = UserFileViewSerializer(required=False, many=False, allow_null=True) + logo_color_128 = UserFileViewSerializer(required=False, many=False, allow_null=True) + logo_color_144 = UserFileViewSerializer(required=False, many=False, allow_null=True) + logo_color_180 = UserFileViewSerializer(required=False, many=False, allow_null=True) + logo_color_192 = UserFileViewSerializer(required=False, many=False, allow_null=True) + logo_color_512 = UserFileViewSerializer(required=False, many=False, allow_null=True) + logo_color_svg = UserFileViewSerializer(required=False, many=False, allow_null=True) def get_user_count(self, obj): return UserSpace.objects.filter(space=obj).count() @@ -304,7 +311,8 @@ class SpaceSerializer(WritableNestedModelSerializer): fields = ( 'id', 'name', 'created_by', 'created_at', 'message', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing', 'demo', 'food_inherit', 'user_count', 'recipe_count', 'file_size_mb', - 'image', 'nav_logo', 'space_theme', 'custom_space_theme', 'nav_bg_color', 'nav_text_color', 'use_plural',) + 'image', 'nav_logo', 'space_theme', 'custom_space_theme', 'nav_bg_color', 'nav_text_color', 'use_plural', + 'logo_color_32', 'logo_color_128', 'logo_color_144', 'logo_color_180', 'logo_color_192', 'logo_color_512', 'logo_color_svg',) read_only_fields = ( 'id', 'created_by', 'created_at', 'max_recipes', 'max_file_storage_mb', 'max_users', 'allow_sharing', 'demo',) diff --git a/vue/src/apps/SpaceManageView/SpaceManageView.vue b/vue/src/apps/SpaceManageView/SpaceManageView.vue index 3dab190a..01bf7e23 100644 --- a/vue/src/apps/SpaceManageView/SpaceManageView.vue +++ b/vue/src/apps/SpaceManageView/SpaceManageView.vue @@ -191,6 +191,37 @@ +
{{ $t('CustomLogos') }}
+

{{$t('CustomLogoHelp')}}

+ + + + + + + + + + + + + + + + + + + + + + {{ $t('Update') }} diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json index 5dc72049..e085bd92 100644 --- a/vue/src/locales/en.json +++ b/vue/src/locales/en.json @@ -284,7 +284,9 @@ "CustomTheme": "Custom Theme", "CustomThemeHelp": "Override styles of the selected theme by uploading a custom CSS file.", "CustomImageHelp": "Upload an image to show in the space overview.", - "CustomNavLogoHelp": "Upload an image to use as the space logo.", + "CustomNavLogoHelp": "Upload an image to use as the navigation bar logo.", + "CustomLogoHelp": "Upload square images in different sizes to change to logo in the browser tab and installed web app.", + "CustomLogos": "Custom Logos", "SupermarketCategoriesOnly": "Supermarket Categories Only", "MoveCategory": "Move To: ", "CountMore": "...+{count} more",