From 41ecff437509625afbfb9cdd32fabc715b8e9689 Mon Sep 17 00:00:00 2001
From: Ingrid Martinsheimen Egge <ingrimeg@stud.ntnu.no>
Date: Fri, 28 Apr 2023 07:07:59 +0200
Subject: [PATCH] =?UTF-8?q?kj=C3=B8leskapsfunksjoner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/ItemSearch.vue | 35 +++++++++++++++++++++++++++--------
src/util/API.js | 3 ++-
src/views/FridgeView.vue | 4 ++--
3 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/src/components/ItemSearch.vue b/src/components/ItemSearch.vue
index 0f05f9d..56ce919 100644
--- a/src/components/ItemSearch.vue
+++ b/src/components/ItemSearch.vue
@@ -36,16 +36,17 @@ export default {
this.selectedItem= this.searchResult[0];
},
addToFridge(){
- //@ResponseBody Fridge addIngredients(@RequestBody List<Ingredient> ingredientList)
- const item = this.selectedItem;
const num = this.numOfItemsToAdd;
- let items = [];
-
- for(let i = 0; i < num; i++){
- items.push(item);
+ //const request = [{ingredient: this.selectedItem}]
+ const ingr = {
+ item: this.selectedItem,
+ amount: this.selectedItem.amount //why?
}
- API.addToFridge(JSON.stringify(items))
+
+ const request = [{ingredient: JSON.stringify(ingr)}]
+ console.log(request)
+ API.addToFridge(request)
}
}
}
@@ -59,4 +60,22 @@ select {
#wrapper{
background-color: #04be80;
}
-</style>
\ No newline at end of file
+
+/*let thisItem = {
+ allergens : item.allergens,
+ ean : item.ean,
+ shelfLife : item.shelfLife,
+ image_url : item.image_url,
+ name : item.name,
+ nutrition : item.nutrition,
+ amount : item.amount,
+ }*/
+/*
+//const sAmount = {quantity:item.amount.quantity,unit:item.amount.unit}
+//const ingredient = {Item:thisItem, SerializedAmount:sAmount}
+
+//console.log("ITEM::::" + thisItem.name)
+//API.addToFridge({ingredient,num})
+//const request = [{item: this.selectedItem, amount : this.selectedItem.amount}]*/
+</style>
+
diff --git a/src/util/API.js b/src/util/API.js
index 04eda4b..31c6ed4 100644
--- a/src/util/API.js
+++ b/src/util/API.js
@@ -156,8 +156,9 @@ export const API = {
* @returns {Promise<void>}
*/
addToFridge: async(request) =>{
+
const authStore = useAuthStore();
- axios.post(`${import.meta.env.VITE_BACKEND_URL}/fridge`, {
+ axios.post(`${import.meta.env.VITE_BACKEND_URL}/fridge`, request,{
headers: { Authorization: `Bearer ${authStore.token}` },
}).then((response) => {
return response.data;
diff --git a/src/views/FridgeView.vue b/src/views/FridgeView.vue
index e50b332..a900355 100644
--- a/src/views/FridgeView.vue
+++ b/src/views/FridgeView.vue
@@ -2,10 +2,10 @@
<main>
<h1>Kjøleskap</h1><br><br>
<ItemSearch></ItemSearch>
- <eat-fridge-item-modal @closeModal="hideModal" v-if="visible" :fridge-item="selectedItem"></eat-fridge-item-modal>
+ <eat-fridge-item-modal @closeModal="hideModal" v-if="visible" :fridge-item="selectedItem"></eat-fridge-item-modal>
<div id = "itemContainer">
<!--<FridgeItem v-for="item in fridgeStore.items"></FridgeItem>-->
- <!--<FridgeItem v-for="item in fridgeItems" :key="item.id" fridgeItem="item"></FridgeItem>-->
+ <FridgeItem v-for="item in fridgeItems" :item="item"></FridgeItem>
<FridgeItem @appleBtnPressed="showModal" :item=testItem ></FridgeItem>
<FridgeItem @appleBtnPressed="showModal" :item=testItem ></FridgeItem>
<FridgeItem @appleBtnPressed="showModal" :item=testItem ></FridgeItem>
--
GitLab