diff --git a/api/request.js b/api/request.js index d318beb..d377f2c 100644 --- a/api/request.js +++ b/api/request.js @@ -27,6 +27,12 @@ router.route("/request").get(async (req, res) => { return res.send(rWines) }) +router.route("/request/all").get(async (req, res) => { + const allWines = await RequestedWine.find({}).populate("wine"); + + res.json(allWines); +}); + router.route("/request").post(async (req, res) => { const {wine} = req.body diff --git a/api/retrieve.js b/api/retrieve.js index 9cbd64a..ef9d7c9 100644 --- a/api/retrieve.js +++ b/api/retrieve.js @@ -104,12 +104,6 @@ router.route("/highscore/statistics").get(async (req, res) => { res.json(highscore); }); -router.route("/wines/all-requested-wines").get(async (req, res) => { - const allWines = await RequestedWine.find({}).populate("wine"); - - res.json(allWines); -}); - router.route("/wines/statistics").get(async (req, res) => { const wines = await Wine.find(); diff --git a/api/wineinfo.js b/api/wineinfo.js index a5d0497..b7bd7d7 100644 --- a/api/wineinfo.js +++ b/api/wineinfo.js @@ -18,7 +18,7 @@ const convertToOurWineObject = wine => { rating: wine.basic.alcoholContent, occurences: 0, id: wine.basic.productId, - image: `https://bilder.vinmonopolet.no/cache/300x300-0/${wine.basic.productId}-1.jpg`, + image: `https://bilder.vinmonopolet.no/cache/500x500-0/${wine.basic.productId}-1.jpg`, price: wine.prices[0].salesPrice.toString(), country: wine.origins.origin.country } diff --git a/src/api.js b/src/api.js index f08e3ed..52fbbb3 100644 --- a/src/api.js +++ b/src/api.js @@ -25,7 +25,7 @@ const overallWineStatistics = () => { }; const allRequestedWines = () => { - const url = new URL("/api/wines/all-requested-wines", BASE_URL); + const url = new URL("/api/request/all", BASE_URL); return fetch(url.href).then(resp => resp.json()); }; diff --git a/src/components/RequestWine.vue b/src/components/RequestWine.vue index d1861b0..f8b8e54 100644 --- a/src/components/RequestWine.vue +++ b/src/components/RequestWine.vue @@ -7,7 +7,7 @@ v-if="showModal" modalText="Ønsket ditt har blitt lagt til" :buttons="modalButtons" - @modalBtnClicked="emitFromModalButton" + @click="emitFromModalButton" >
diff --git a/src/ui/Modal.vue b/src/ui/Modal.vue index 0d0e8f8..4fd002f 100644 --- a/src/ui/Modal.vue +++ b/src/ui/Modal.vue @@ -38,7 +38,7 @@ export default { }, methods:{ modalButtonClicked(action){ - this.$emit('modalBtnClicked', action) + this.$emit('click', action) } } } diff --git a/src/ui/RequestedWineCard.vue b/src/ui/RequestedWineCard.vue index 3c85be0..232431b 100644 --- a/src/ui/RequestedWineCard.vue +++ b/src/ui/RequestedWineCard.vue @@ -19,9 +19,9 @@ class="wine-link" >Les mer på polet
-