diff --git a/frontend/pages/shopping-lists/_id.vue b/frontend/pages/shopping-lists/_id.vue index 004dbcbb7a6..c575f0de3bf 100644 --- a/frontend/pages/shopping-lists/_id.vue +++ b/frontend/pages/shopping-lists/_id.vue @@ -17,11 +17,69 @@ - + - + + + + @@ -119,27 +177,6 @@ - - - - - - - - -
- - - {{ $t('shopping-list.reorder-labels') }} - {{ $t('general.add') }}
- -
- -
-
- +
+
+ +
+
+ +
+
@@ -277,29 +277,6 @@ - - -
- - - {{ $t('general.settings') }} - -
-
- - -
- -
-
@@ -314,7 +291,6 @@ import { useUserApi } from "~/composables/api"; import MultiPurposeLabelSection from "~/components/Domain/ShoppingList/MultiPurposeLabelSection.vue" import ShoppingListItem from "~/components/Domain/ShoppingList/ShoppingListItem.vue"; import { ShoppingListItemOut, ShoppingListMultiPurposeLabelOut, ShoppingListOut } from "~/lib/api/types/household"; -import { UserOut } from "~/lib/api/types/user"; import RecipeList from "~/components/Domain/Recipe/RecipeList.vue"; import ShoppingListItemEditor from "~/components/Domain/ShoppingList/ShoppingListItemEditor.vue"; import { useFoodStore, useLabelStore, useUnitStore } from "~/composables/store"; @@ -349,8 +325,8 @@ export default defineComponent({ const userApi = useUserApi(); const edit = ref(false); + const threeDot = ref(false); const reorderLabelsDialog = ref(false); - const settingsDialog = ref(false); const preserveItemOrder = ref(false); const route = useRoute(); @@ -678,13 +654,6 @@ export default defineComponent({ localLabels.value = shoppingList.value?.labelSettings } - async function toggleSettingsDialog() { - if (!settingsDialog.value) { - await fetchAllUsers(); - } - settingsDialog.value = !settingsDialog.value; - } - function updateLabelOrder(labelSettings: ShoppingListMultiPurposeLabelOut[]) { if (!shoppingList.value) { return; @@ -1064,39 +1033,6 @@ export default defineComponent({ refresh(); } - // =============================================================== - // Shopping List Settings - - const allUsers = ref([]); - const currentUserId = ref(); - async function fetchAllUsers() { - const { data } = await userApi.households.fetchMembers(); - if (!data) { - return; - } - - // update current user - allUsers.value = data.items.sort((a, b) => ((a.fullName || "") < (b.fullName || "") ? -1 : 1)); - currentUserId.value = shoppingList.value?.userId; - } - - async function updateSettings() { - if (!shoppingList.value || !currentUserId.value) { - return; - } - - loadingCounter.value += 1; - const { data } = await userApi.shopping.lists.updateOne( - shoppingList.value.id, - {...shoppingList.value, userId: currentUserId.value}, - ); - loadingCounter.value -= 1; - - if (data) { - refresh(); - } - } - return { ...toRefs(state), addRecipeReferenceToList, @@ -1112,6 +1048,7 @@ export default defineComponent({ openDeleteChecked, deleteListItem, edit, + threeDot, getLabelColor, groupSlug, itemsByLabel, @@ -1123,8 +1060,6 @@ export default defineComponent({ removeRecipeReferenceToList, reorderLabelsDialog, toggleReorderLabelsDialog, - settingsDialog, - toggleSettingsDialog, localLabels, updateLabelOrder, cancelLabelOrder, @@ -1144,9 +1079,6 @@ export default defineComponent({ updateIndexUncheckedByLabel, allUnits, allFoods, - allUsers, - currentUserId, - updateSettings, getTextColor, }; }, diff --git a/frontend/pages/shopping-lists/index.vue b/frontend/pages/shopping-lists/index.vue index 430ab9a70e7..ab5af4bd47a 100644 --- a/frontend/pages/shopping-lists/index.vue +++ b/frontend/pages/shopping-lists/index.vue @@ -6,6 +6,27 @@ + + + + + + + + + {{ $t('shopping-list.are-you-sure-you-want-to-delete-this-item') }} @@ -38,26 +59,34 @@ {{ $globals.icons.cartCheck }} - {{ list.name }} - - - {{ $globals.icons.delete }} - - +
+ {{ list.name }} +
+
+ + + {{ $globals.icons.user }} + + + + + {{ $globals.icons.delete }} + + +
-
- -