Skip to content
Snippets Groups Projects
Commit b9073216 authored by Håkon Eilertsen Røskaft's avatar Håkon Eilertsen Røskaft
Browse files

Changed rental message to display correct image

parent c9fb7a01
No related branches found
No related tags found
1 merge request!143Rental image chat
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<p>Pris: {{ price }}kr</p> <p>Pris: {{ price }}kr</p>
</div> </div>
<div class="img-container"> <div class="img-container">
<img class="img" :src="img" alt="Produkt Bilde" /> <img class="img" :src="image" alt="Produkt Bilde" />
</div> </div>
</div> </div>
<div> <div>
...@@ -19,11 +19,21 @@ ...@@ -19,11 +19,21 @@
</p> </p>
</div> </div>
</div> </div>
<div class="buttons" v-if="(!rent.isAccepted && !rent.deleted && this.rent.renterId != this.userID)"> <div
class="buttons"
v-if="
!rent.isAccepted && !rent.deleted && this.rent.renterId != this.userID
"
>
<button class="button green" @click="accept">Godta</button> <button class="button green" @click="accept">Godta</button>
<button class="button red" @click="reject">Avslå</button> <button class="button red" @click="reject">Avslå</button>
</div> </div>
<div class="waiting" v-if="!rent.isAccepted && !rent.deleted && this.rent.renterId == this.userID"> <div
class="waiting"
v-if="
!rent.isAccepted && !rent.deleted && this.rent.renterId == this.userID
"
>
Waiting for owner to accept Waiting for owner to accept
</div> </div>
<div class="" v-if="rent.isAccepted"> <div class="" v-if="rent.isAccepted">
...@@ -38,8 +48,8 @@ ...@@ -38,8 +48,8 @@
<script> <script>
import axios from "axios"; import axios from "axios";
import { tokenHeader } from "@/utils/token-utils"; import { tokenHeader, parseCurrentUser } from "@/utils/token-utils";
import { parseCurrentUser } from "@/utils/token-utils"; import { getItemPictures, } from "@/utils/apiutil";
export default { export default {
props: { props: {
...@@ -48,13 +58,15 @@ export default { ...@@ -48,13 +58,15 @@ export default {
required: true, required: true,
}, },
}, },
data() {
return {
image: "https://images.unsplash.com/photo-1453728013993-6d66e9c9123a?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8Mnx8dmlld3xlbnwwfHwwfHw%3D&w=1000&q=80",
}
},
computed: { computed: {
userID() { userID() {
return parseCurrentUser().accountId; return parseCurrentUser().accountId;
}, },
img() {
return "https://images.unsplash.com/photo-1453728013993-6d66e9c9123a?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8Mnx8dmlld3xlbnwwfHwwfHw%3D&w=1000&q=80"; //this.rent.listing.imageUrl;
},
from() { from() {
// take ms and turn into date and return date // take ms and turn into date and return date
return new Date(this.rent.fromTime).toLocaleDateString(); return new Date(this.rent.fromTime).toLocaleDateString();
...@@ -75,9 +87,8 @@ export default { ...@@ -75,9 +87,8 @@ export default {
return this.rent.message || "Ingen Melding"; return this.rent.message || "Ingen Melding";
}, },
side() { side() {
return this.rent.renterId == this.userID return this.rent.renterId == this.userID ? "flex-end" : "flex-start";
? "flex-end" : "flex-start"; },
}
}, },
methods: { methods: {
async accept() { async accept() {
...@@ -93,6 +104,18 @@ export default { ...@@ -93,6 +104,18 @@ export default {
{ headers: tokenHeader() } { headers: tokenHeader() }
); );
}, },
async getImage() {
console.log(this.rent);
let images = await getItemPictures(this.rent.listingId);
console.log(images);
if (images.length > 0) {
this.image = images[0].picture;
}
},
},
async beforeMount() {
await this.getImage();
}, },
}; };
</script> </script>
......
...@@ -13,7 +13,6 @@ jest.mock("@/utils/token-utils", () => { ...@@ -13,7 +13,6 @@ jest.mock("@/utils/token-utils", () => {
}; };
}); });
jest.mock("axios"); jest.mock("axios");
describe("RentalMessage.vue", () => { describe("RentalMessage.vue", () => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment