From 423dc7a6bfd81eafb0ad9a144e5517c13a487de1 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sun, 1 Dec 2024 12:32:16 +0100 Subject: [PATCH] lots of shopping tweaks --- cookbook/serializer.py | 1 + cookbook/views/api.py | 1 + .../components/display/ShoppingListView.vue | 35 +- vue3/src/openapi/.openapi-generator/FILES | 20 +- vue3/src/openapi/apis/ApiApi.ts | 1787 +++++++++++++++++ vue3/src/openapi/models/AccessToken.ts | 18 +- vue3/src/openapi/models/AuthToken.ts | 18 +- vue3/src/openapi/models/AutoMealPlan.ts | 19 +- vue3/src/openapi/models/Automation.ts | 37 +- vue3/src/openapi/models/BookmarkletImport.ts | 18 +- .../openapi/models/BookmarkletImportList.ts | 18 +- .../openapi/models/ConnectorConfigConfig.ts | 18 +- vue3/src/openapi/models/CookLog.ts | 19 +- vue3/src/openapi/models/CustomFilter.ts | 19 +- vue3/src/openapi/models/ExportLog.ts | 18 +- vue3/src/openapi/models/Food.ts | 24 +- vue3/src/openapi/models/FoodInheritField.ts | 18 +- vue3/src/openapi/models/FoodShoppingUpdate.ts | 19 +- vue3/src/openapi/models/FoodSimple.ts | 18 +- vue3/src/openapi/models/Group.ts | 18 +- vue3/src/openapi/models/ImportImage.ts | 18 +- vue3/src/openapi/models/ImportLog.ts | 19 +- vue3/src/openapi/models/Ingredient.ts | 20 +- vue3/src/openapi/models/IngredientString.ts | 18 +- vue3/src/openapi/models/InviteLink.ts | 19 +- vue3/src/openapi/models/Keyword.ts | 18 +- vue3/src/openapi/models/KeywordLabel.ts | 18 +- vue3/src/openapi/models/Localization.ts | 18 +- vue3/src/openapi/models/MealPlan.ts | 21 +- vue3/src/openapi/models/MealType.ts | 18 +- .../openapi/models/NutritionInformation.ts | 18 +- vue3/src/openapi/models/OpenDataCategory.ts | 19 +- vue3/src/openapi/models/OpenDataConversion.ts | 21 +- vue3/src/openapi/models/OpenDataFood.ts | 22 +- .../openapi/models/OpenDataFoodProperty.ts | 19 +- vue3/src/openapi/models/OpenDataProperty.ts | 19 +- vue3/src/openapi/models/OpenDataStore.ts | 20 +- .../openapi/models/OpenDataStoreCategory.ts | 19 +- vue3/src/openapi/models/OpenDataUnit.ts | 21 +- vue3/src/openapi/models/OpenDataVersion.ts | 18 +- .../openapi/models/PaginatedAutomationList.ts | 19 +- .../PaginatedBookmarkletImportListList.ts | 19 +- .../openapi/models/PaginatedCookLogList.ts | 19 +- .../models/PaginatedCustomFilterList.ts | 19 +- .../openapi/models/PaginatedExportLogList.ts | 19 +- vue3/src/openapi/models/PaginatedFoodList.ts | 19 +- .../openapi/models/PaginatedImportLogList.ts | 19 +- .../openapi/models/PaginatedIngredientList.ts | 19 +- .../openapi/models/PaginatedInviteLinkList.ts | 19 +- .../openapi/models/PaginatedKeywordList.ts | 19 +- .../openapi/models/PaginatedMealPlanList.ts | 19 +- .../openapi/models/PaginatedMealTypeList.ts | 19 +- .../openapi/models/PaginatedPropertyList.ts | 19 +- .../models/PaginatedPropertyTypeList.ts | 19 +- .../models/PaginatedRecipeBookEntryList.ts | 19 +- .../openapi/models/PaginatedRecipeBookList.ts | 19 +- .../models/PaginatedRecipeOverviewList.ts | 19 +- .../models/PaginatedShoppingListEntryList.ts | 19 +- .../models/PaginatedShoppingListRecipeList.ts | 19 +- vue3/src/openapi/models/PaginatedSpaceList.ts | 19 +- vue3/src/openapi/models/PaginatedStepList.ts | 19 +- .../PaginatedSupermarketCategoryList.ts | 19 +- ...aginatedSupermarketCategoryRelationList.ts | 19 +- .../models/PaginatedSupermarketList.ts | 19 +- vue3/src/openapi/models/PaginatedSyncList.ts | 19 +- .../openapi/models/PaginatedSyncLogList.ts | 19 +- .../models/PaginatedUnitConversionList.ts | 19 +- vue3/src/openapi/models/PaginatedUnitList.ts | 19 +- .../openapi/models/PaginatedUserFileList.ts | 19 +- .../openapi/models/PaginatedUserSpaceList.ts | 19 +- .../openapi/models/PaginatedViewLogList.ts | 19 +- vue3/src/openapi/models/ParsedIngredient.ts | 18 +- vue3/src/openapi/models/PatchedAccessToken.ts | 18 +- vue3/src/openapi/models/PatchedAutomation.ts | 37 +- .../models/PatchedBookmarkletImport.ts | 18 +- .../models/PatchedConnectorConfigConfig.ts | 18 +- vue3/src/openapi/models/PatchedCookLog.ts | 19 +- .../src/openapi/models/PatchedCustomFilter.ts | 19 +- vue3/src/openapi/models/PatchedExportLog.ts | 18 +- vue3/src/openapi/models/PatchedFood.ts | 24 +- vue3/src/openapi/models/PatchedImportLog.ts | 19 +- vue3/src/openapi/models/PatchedIngredient.ts | 20 +- vue3/src/openapi/models/PatchedInviteLink.ts | 19 +- vue3/src/openapi/models/PatchedKeyword.ts | 18 +- vue3/src/openapi/models/PatchedMealPlan.ts | 21 +- vue3/src/openapi/models/PatchedMealType.ts | 18 +- .../openapi/models/PatchedOpenDataCategory.ts | 19 +- .../models/PatchedOpenDataConversion.ts | 21 +- .../src/openapi/models/PatchedOpenDataFood.ts | 22 +- .../openapi/models/PatchedOpenDataProperty.ts | 19 +- .../openapi/models/PatchedOpenDataStore.ts | 20 +- .../src/openapi/models/PatchedOpenDataUnit.ts | 21 +- .../openapi/models/PatchedOpenDataVersion.ts | 18 +- vue3/src/openapi/models/PatchedProperty.ts | 19 +- .../src/openapi/models/PatchedPropertyType.ts | 18 +- vue3/src/openapi/models/PatchedRecipe.ts | 23 +- vue3/src/openapi/models/PatchedRecipeBook.ts | 20 +- .../openapi/models/PatchedRecipeBookEntry.ts | 20 +- .../models/PatchedShoppingListEntry.ts | 22 +- .../models/PatchedShoppingListRecipe.ts | 18 +- vue3/src/openapi/models/PatchedSpace.ts | 23 +- vue3/src/openapi/models/PatchedStep.ts | 20 +- vue3/src/openapi/models/PatchedStorage.ts | 19 +- vue3/src/openapi/models/PatchedSupermarket.ts | 19 +- .../models/PatchedSupermarketCategory.ts | 18 +- .../PatchedSupermarketCategoryRelation.ts | 19 +- vue3/src/openapi/models/PatchedSync.ts | 18 +- vue3/src/openapi/models/PatchedUnit.ts | 18 +- .../openapi/models/PatchedUnitConversion.ts | 20 +- vue3/src/openapi/models/PatchedUser.ts | 18 +- .../openapi/models/PatchedUserPreference.ts | 24 +- vue3/src/openapi/models/PatchedUserSpace.ts | 20 +- vue3/src/openapi/models/PatchedViewLog.ts | 18 +- vue3/src/openapi/models/Property.ts | 19 +- vue3/src/openapi/models/PropertyType.ts | 18 +- vue3/src/openapi/models/Recipe.ts | 23 +- vue3/src/openapi/models/RecipeBook.ts | 20 +- vue3/src/openapi/models/RecipeBookEntry.ts | 20 +- vue3/src/openapi/models/RecipeFlat.ts | 18 +- vue3/src/openapi/models/RecipeImage.ts | 18 +- vue3/src/openapi/models/RecipeOverview.ts | 19 +- .../openapi/models/RecipeShoppingUpdate.ts | 18 +- vue3/src/openapi/models/RecipeSimple.ts | 18 +- vue3/src/openapi/models/ServerSettings.ts | 27 +- vue3/src/openapi/models/ShareLink.ts | 18 +- vue3/src/openapi/models/ShoppingListEntry.ts | 22 +- .../openapi/models/ShoppingListEntryBulk.ts | 18 +- vue3/src/openapi/models/ShoppingListRecipe.ts | 18 +- vue3/src/openapi/models/Space.ts | 23 +- vue3/src/openapi/models/Step.ts | 20 +- vue3/src/openapi/models/Storage.ts | 19 +- vue3/src/openapi/models/Supermarket.ts | 19 +- .../src/openapi/models/SupermarketCategory.ts | 18 +- .../models/SupermarketCategoryRelation.ts | 19 +- vue3/src/openapi/models/Sync.ts | 18 +- vue3/src/openapi/models/SyncLog.ts | 18 +- vue3/src/openapi/models/Unit.ts | 18 +- vue3/src/openapi/models/UnitConversion.ts | 20 +- vue3/src/openapi/models/User.ts | 18 +- vue3/src/openapi/models/UserFile.ts | 19 +- vue3/src/openapi/models/UserFileView.ts | 19 +- vue3/src/openapi/models/UserPreference.ts | 24 +- vue3/src/openapi/models/UserSpace.ts | 20 +- vue3/src/openapi/models/ViewLog.ts | 18 +- vue3/src/openapi/models/index.ts | 20 +- vue3/src/stores/ShoppingListStore.js | 487 ----- vue3/src/stores/ShoppingStore.ts | 52 +- vue3/src/stores/UserPreferenceStore.ts | 5 +- vue3/src/types/Shopping.ts | 2 +- vue3/src/utils/logic_utils.ts | 2 +- 150 files changed, 2918 insertions(+), 2207 deletions(-) delete mode 100644 vue3/src/stores/ShoppingListStore.js diff --git a/cookbook/serializer.py b/cookbook/serializer.py index 89314df01..04db8c1ad 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -1436,6 +1436,7 @@ class ServerSettingsSerializer(serializers.Serializer): privacy_url = serializers.CharField() imprint_url = serializers.CharField() hosted = serializers.BooleanField() + debug = serializers.BooleanField() class Meta: fields = '__ALL__' diff --git a/cookbook/views/api.py b/cookbook/views/api.py index b0c6a9b3c..afd414292 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -1980,6 +1980,7 @@ class ServerSettingsViewSet(viewsets.GenericViewSet): s['privacy_url'] = settings.PRIVACY_URL s['imprint_url'] = settings.IMPRINT_URL s['hosted'] = settings.HOSTED + s['debug'] = settings.DEBUG return Response(ServerSettingsSerializer(s, many=False).data) diff --git a/vue3/src/components/display/ShoppingListView.vue b/vue3/src/components/display/ShoppingListView.vue index 756adfe19..aebb315e2 100644 --- a/vue3/src/components/display/ShoppingListView.vue +++ b/vue3/src/components/display/ShoppingListView.vue @@ -2,8 +2,10 @@ {{ $t('Shopping_list') }} ({{useShoppingStore().stats.countUnchecked}}) - {{ $t('Recipes') }} ({{useShoppingStore().getAssociatedRecipes().length}}) + class="d-none d-md-block ms-1">{{ $t('Shopping_list') }} ({{ useShoppingStore().stats.countUnchecked }}) + {{ + $t('Recipes') + }} ({{ useShoppingStore().getAssociatedRecipes().length }})