From ab9f9701d8272a09f633db855c9c84b25a16cea5 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sun, 1 Dec 2024 15:35:40 +0100 Subject: [PATCH] general layout improvements --- cookbook/serializer.py | 3 + cookbook/views/api.py | 2 + vue3/package.json | 2 +- vue3/src/apps/tandoor/Tandoor.vue | 63 ++++++++++++++----- vue3/src/components/inputs/ModelSelect.vue | 15 +++-- vue3/src/openapi/apis/ApiApi.ts | 45 +++++-------- .../openapi/models/PatchedUserPreference.ts | 9 ++- vue3/src/openapi/models/ServerSettings.ts | 9 +++ vue3/src/openapi/models/UserPreference.ts | 9 ++- vue3/src/pages/StartPage.vue | 8 --- vue3/yarn.lock | 8 +-- 11 files changed, 102 insertions(+), 71 deletions(-) diff --git a/cookbook/serializer.py b/cookbook/serializer.py index 011cf3568..9b5f86d35 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -401,6 +401,7 @@ class MealTypeSerializer(SpacedModelSerializer, WritableNestedModelSerializer): class UserPreferenceSerializer(WritableNestedModelSerializer): + user = UserSerializer(read_only=True) food_inherit_default = serializers.SerializerMethodField('get_food_inherit_defaults') plan_share = UserSerializer(many=True, allow_null=True, required=False) shopping_share = UserSerializer(many=True, allow_null=True, required=False) @@ -436,6 +437,7 @@ class UserPreferenceSerializer(WritableNestedModelSerializer): 'filter_to_supermarket', 'shopping_add_onhand', 'left_handed', 'show_step_ingredients', 'food_children_exist' ) + read_only_fields = ('user',) class StorageSerializer(SpacedModelSerializer): @@ -1438,6 +1440,7 @@ class ServerSettingsSerializer(serializers.Serializer): imprint_url = serializers.CharField() hosted = serializers.BooleanField() debug = serializers.BooleanField() + version = serializers.CharField() class Meta: fields = '__ALL__' diff --git a/cookbook/views/api.py b/cookbook/views/api.py index 4c630c387..1d519db18 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -107,6 +107,7 @@ from cookbook.serializer import (AccessTokenSerializer, AutomationSerializer, Au UserSerializer, UserSpaceSerializer, ViewLogSerializer, ImportImageSerializer, LocalizationSerializer, ServerSettingsSerializer ) +from cookbook.version_info import TANDOOR_VERSION from cookbook.views.import_export import get_integration from recipes import settings from recipes.settings import DRF_THROTTLE_RECIPE_URL_IMPORT, FDC_API_KEY, GOOGLE_AI_API_KEY @@ -1964,6 +1965,7 @@ class ServerSettingsViewSet(viewsets.GenericViewSet): s['imprint_url'] = settings.IMPRINT_URL s['hosted'] = settings.HOSTED s['debug'] = settings.DEBUG + s['version'] = TANDOOR_VERSION return Response(ServerSettingsSerializer(s, many=False).data) diff --git a/vue3/package.json b/vue3/package.json index 82cc92ccd..0466d03bf 100644 --- a/vue3/package.json +++ b/vue3/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@types/luxon": "^3.4.2", - "@vueform/multiselect": "^2.6.8", + "@vueform/multiselect": "^2.6.11", "@vueuse/core": "^10.11.0", "luxon": "^3.4.4", "mavon-editor": "^3.0.1", diff --git a/vue3/src/apps/tandoor/Tandoor.vue b/vue3/src/apps/tandoor/Tandoor.vue index 34ff7546f..de49c5b89 100644 --- a/vue3/src/apps/tandoor/Tandoor.vue +++ b/vue3/src/apps/tandoor/Tandoor.vue @@ -7,35 +7,59 @@ - V + {{useUserPreferenceStore().userSettings.user.displayName.charAt(0)}} - - - V vabene1111 - + + + {{ useUserPreferenceStore().userSettings.user.displayName }} + {{ useUserPreferenceStore().activeSpace.name }} - {{$t('Settings')}} - {{$t('Database')}} - - + + + {{ $t('Settings') }} + + + + {{ $t('Database') }} + + + Spaces Space 1 Space 2 Space 3 - {{$t('Messages')}} - {{$t('Logout')}} + + + {{ $t('Messages') }} + + + + + {{ $t('Logout') }} +

- {{ $t('HostedFreeVersion')}} {{$t('UpgradeNow')}} + {{ $t('HostedFreeVersion') }} + {{ $t('UpgradeNow') }}

@@ -50,13 +74,24 @@ - + + + {{ useUserPreferenceStore().userSettings.user.displayName }} + {{ useUserPreferenceStore().activeSpace.name }} + - + diff --git a/vue3/src/components/inputs/ModelSelect.vue b/vue3/src/components/inputs/ModelSelect.vue index 847f3a54d..932146a10 100644 --- a/vue3/src/components/inputs/ModelSelect.vue +++ b/vue3/src/components/inputs/ModelSelect.vue @@ -1,15 +1,14 @@