From 649e4686c1d9ae65b45dbd41a03c780e21a86f1d Mon Sep 17 00:00:00 2001 From: Ingrid Martinsheimen Egge <ingrimeg@stud.ntnu.no> Date: Mon, 1 May 2023 07:35:24 +0200 Subject: [PATCH] =?UTF-8?q?Melding=20forteller=20hva=20slags=20vare=20som?= =?UTF-8?q?=20har=20blitt=20lagt=20i=20kj=C3=B8leskapet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ItemSearch.vue | 2 +- src/views/FridgeView.vue | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/ItemSearch.vue b/src/components/ItemSearch.vue index 8a61e32..3dd71e3 100644 --- a/src/components/ItemSearch.vue +++ b/src/components/ItemSearch.vue @@ -55,7 +55,7 @@ export default { { "quantity": this.selectedItem.amount.quantity*num, "unit": this.selectedItem.amount.unit}} - ).then(() => this.$emit('itemsAdded',this)).catch((_)=> console.log("No items were added to the fridge")) + ).then(() => this.$emit('itemsAdded',this.selectedItem)).catch((_)=> console.log("No items were added to the fridge")) } } } diff --git a/src/views/FridgeView.vue b/src/views/FridgeView.vue index eb6c950..958ffd6 100644 --- a/src/views/FridgeView.vue +++ b/src/views/FridgeView.vue @@ -1,9 +1,7 @@ <template><h1>Kjøleskap</h1><br><br> <main> - <ItemSearch v-if="searchVisible" @itemsAdded="updateFridge"></ItemSearch> - <div id = "fridgeMsg"><p>Melding fra kjøleskapet:</p><span>{{this.fridgeMsg}}</span></div> <eat-fridge-item-modal @closeModal="hideModal" v-if="visible" :fridge-item="selectedItem"></eat-fridge-item-modal> @@ -63,15 +61,19 @@ export default { updateFridgeMessage(msg){ this.fridgeMsg=msg; }, - async updateFridge() { + async updateFridge(addedItem) { + this.fridgeItems = await API.getFridgeItems(); this.fridgeItems = await API.getFridgeItems(); this.hideItemSearch(); - this.updateFridgeMessage("Varen ble lagt i kjøleskapet.") + this.updateFridgeMessage(addedItem.name + " ble lagt i kjøleskapet.") }, }, async mounted() { this.fridgeItems = await API.getFridgeItems(); + if(this.fridgeItems.length===0){ + this.fridgeMsg="Kjøleskapet ditt er tomt. Legg inn varer ved å trykke på pluss-knappen nederst i høyre hjørne" + } } } </script> -- GitLab