diff --git a/src/components/ItemSearch.vue b/src/components/ItemSearch.vue index 8a61e32767ab7a2fa65827d5bd6c4450732e984e..3dd71e39c197f30acfc297918e1732bae3573beb 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 eb6c9501ebcc95a86db2dfefe322455b0ad8e3f0..958ffd6ceb5cdf5b04151a293748e417cf02d364 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>