diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue index 3e68edd71..f0ad74b20 100644 --- a/vue/src/apps/ShoppingListView/ShoppingListView.vue +++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue @@ -123,7 +123,7 @@
-
+
+ + +
+ +
+ + + + + + + +
+
+
@@ -643,25 +663,6 @@ - -
- -
- - - - - - - -
-
-
@@ -914,6 +915,7 @@ export default { }, }, mounted() { + console.log(screen.height) this.getShoppingList() this.getSupermarkets() this.getShoppingCategories() @@ -1102,7 +1104,6 @@ export default { if (!autosync) { if (results.data?.length) { this.items = results.data - console.log(this.items) } else { console.log("no data returned") } @@ -1483,7 +1484,7 @@ export default { font-size: 20px; } -@media (max-width: 768px) { +@media screen and (max-width: 768px) { #shoppinglist { display: flex; flex-direction: column; @@ -1494,6 +1495,17 @@ export default { padding-right: 8px !important; } } +@media screen and (min-height: 700px) and (max-width: 768px) { + #shoppinglist { + display: flex; + flex-direction: column; + flex-grow: 1; + overflow-y: scroll; + overflow-x: hidden; + height: 72vh; + padding-right: 8px !important; + } +} .settings-checkbox { font-size: 0.3rem; diff --git a/vue/src/components/GenericMultiselect.vue b/vue/src/components/GenericMultiselect.vue index b886fc258..be26f5454 100644 --- a/vue/src/components/GenericMultiselect.vue +++ b/vue/src/components/GenericMultiselect.vue @@ -117,7 +117,6 @@ export default { limit: this.limit, } this.genericAPI(this.model, this.Actions.LIST, options).then((result) => { - console.log(result) this.objects = this.sticky_options.concat(result.data?.results ?? result.data) if (this.nothingSelected && this.objects.length > 0) { this.objects.forEach((item) => { diff --git a/vue/src/components/IngredientsCard.vue b/vue/src/components/IngredientsCard.vue index b207a45b6..d1a8307d3 100644 --- a/vue/src/components/IngredientsCard.vue +++ b/vue/src/components/IngredientsCard.vue @@ -142,20 +142,12 @@ export default { this.shopping_list = result.data if (this.add_shopping_mode) { - console.log("add shopping mode", this.recipe_list, this.steps) if (this.recipe_list) { this.$emit( "starting-cart", this.shopping_list.filter((x) => x.list_recipe === this.recipe_list).map((x) => x.ingredient) ) } else { - console.log( - this.steps - .map((x) => x.ingredients) - .flat() - .filter((x) => x?.food?.food_onhand == false && x?.food?.ignore_shopping == false) - .map((x) => x.id) - ) this.$emit( "starting-cart", this.steps diff --git a/vue/src/components/MealPlanCard.vue b/vue/src/components/MealPlanCard.vue index d72eb6b1c..2770f6423 100644 --- a/vue/src/components/MealPlanCard.vue +++ b/vue/src/components/MealPlanCard.vue @@ -71,9 +71,7 @@ export default { image_placeholder: window.IMAGE_PLACEHOLDER, } }, - mounted() { - console.log(this.value) - }, + mounted() {}, computed: { entry: function () { return this.value.originalItem diff --git a/vue/src/components/RecipeContextMenu.vue b/vue/src/components/RecipeContextMenu.vue index eb53bed45..1bd7531ec 100644 --- a/vue/src/components/RecipeContextMenu.vue +++ b/vue/src/components/RecipeContextMenu.vue @@ -154,7 +154,6 @@ export default { .createMealPlan(entry) .then((result) => { this.$bvModal.hide(`modal-meal-plan_${this.modal_id}`) - console.log(entry) if (reviewshopping) { this.mealplan = result.data.id this.servings_value = result.data.servings diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue index 057e9b492..e49bb68f1 100644 --- a/vue/src/components/ShoppingLineItem.vue +++ b/vue/src/components/ShoppingLineItem.vue @@ -1,334 +1,311 @@ @@ -344,34 +321,34 @@ export default { /* border-bottom: 1px solid #000; /* …and with a border on the top */ /* } */ .checkbox-control { - font-size: 0.6rem + font-size: 0.6rem; } .checkbox-control-mobile { - font-size: 1rem + font-size: 1rem; } .rotate { - -moz-transition: all 0.25s linear; - -webkit-transition: all 0.25s linear; - transition: all 0.25s linear; + -moz-transition: all 0.25s linear; + -webkit-transition: all 0.25s linear; + transition: all 0.25s linear; } .rotated { - -moz-transform: rotate(90deg); - -webkit-transform: rotate(90deg); - transform: rotate(90deg); + -moz-transform: rotate(90deg); + -webkit-transform: rotate(90deg); + transform: rotate(90deg); } .unit-badge-lg { - font-size: 1rem !important; - font-weight: 500 !important; + font-size: 1rem !important; + font-weight: 500 !important; } @media (max-width: 768px) { - .dropdown-spacing { - padding-left: 0 !important; - padding-right: 0 !important; - } + .dropdown-spacing { + padding-left: 0 !important; + padding-right: 0 !important; + } }