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

Added correct image display to rental message

parent 1c8c899c
No related branches found
No related tags found
1 merge request!143Rental image chat
Pipeline #181984 passed
...@@ -58,18 +58,18 @@ export default { ...@@ -58,18 +58,18 @@ export default {
calculateTime() { calculateTime() {
var time = this?.message.timestamp; var time = this?.message.timestamp;
var date = new Date(time); var date = new Date(time);
var mmOfMessage = String(date.getMinutes()); var mmOfMessage = String(date.getMinutes());
var hhOfMessage = String(date.getHours()); var hhOfMessage = String(date.getHours());
if(mmOfMessage <= 9){ if (mmOfMessage <= 9) {
mmOfMessage = "0" + mmOfMessage; mmOfMessage = "0" + mmOfMessage;
} }
if(hhOfMessage<=9){ if (hhOfMessage <= 9) {
hhOfMessage = "0" + hhOfMessage; hhOfMessage = "0" + hhOfMessage;
} }
var ddOfMessage = String(date.getDate()).padStart(2, "0"); var ddOfMessage = String(date.getDate()).padStart(2, "0");
var dayOfMessage = date.toLocaleString("default", { weekday: "short" }); var dayOfMessage = date.toLocaleString("default", { weekday: "short" });
var monthOfMessage = String(date.getMonth() + 1).padStart(2, "0"); var monthOfMessage = String(date.getMonth() + 1).padStart(2, "0");
const shortMonthOfMessage = date.toLocaleString("default", { const shortMonthOfMessage = date.toLocaleString("default", {
month: "short", month: "short",
}); });
...@@ -77,7 +77,7 @@ export default { ...@@ -77,7 +77,7 @@ export default {
var today = new Date(); var today = new Date();
var dd = String(today.getDate()).padStart(2, "0"); var dd = String(today.getDate()).padStart(2, "0");
var mm = String(today.getMonth() + 1).padStart(2, "0"); var mm = String(today.getMonth() + 1).padStart(2, "0");
var yyyy = today.getFullYear(); var yyyy = today.getFullYear();
if (ddOfMessage == dd) { if (ddOfMessage == dd) {
return "" + hhOfMessage + ":" + mmOfMessage + ""; return "" + hhOfMessage + ":" + mmOfMessage + "";
......
...@@ -60,13 +60,16 @@ export default { ...@@ -60,13 +60,16 @@ export default {
}, },
data() { data() {
return { return {
image: "https://images.unsplash.com/photo-1453728013993-6d66e9c9123a?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8Mnx8dmlld3xlbnwwfHwwfHw%3D&w=1000&q=80", image: null,
} }
}, },
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();
...@@ -105,13 +108,14 @@ export default { ...@@ -105,13 +108,14 @@ export default {
); );
}, },
async getImage() { async getImage() {
console.log(this.rent);
let images = await getItemPictures(this.rent.listingId); let images = await getItemPictures(this.rent.listingId);
console.log(images);
if (images.length > 0) { if (images.length > 0) {
this.image = images[0].picture; this.image = images[0].picture;
} } else {
this.image = "https://images.unsplash.com/photo-1453728013993-6d66e9c9123a?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8Mnx8dmlld3xlbnwwfHwwfHw%3D&w=1000&q=80";
}
}, },
}, },
async beforeMount() { async beforeMount() {
......
...@@ -98,7 +98,11 @@ ...@@ -98,7 +98,11 @@
<rating-component :rating="ownerRating" :ratingType="'Utleier'" /> <rating-component :rating="ownerRating" :ratingType="'Utleier'" />
</div> </div>
<div v-show="!isCurrentUser" @click="$router.push('/messages?userID=' + id)" class="flex mt-4 space-x-3 lg:mt-6"> <div
v-show="!isCurrentUser"
@click="$router.push('/messages?userID=' + id)"
class="flex mt-4 space-x-3 lg:mt-6"
>
<a <a
href="#" href="#"
class="inline-flex items-center py-2 px-4 text-sm font-medium text-center text-gray-900 bg-white rounded-lg border border-gray-300 hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-gray-200 dark:bg-gray-800 dark:text-white dark:border-gray-600 dark:hover:bg-gray-700 dark:hover:border-gray-700 dark:focus:ring-gray-700" class="inline-flex items-center py-2 px-4 text-sm font-medium text-center text-gray-900 bg-white rounded-lg border border-gray-300 hover:bg-gray-100 focus:ring-4 focus:outline-none focus:ring-gray-200 dark:bg-gray-800 dark:text-white dark:border-gray-600 dark:hover:bg-gray-700 dark:hover:border-gray-700 dark:focus:ring-gray-700"
......
...@@ -13,6 +13,16 @@ jest.mock("@/utils/token-utils", () => { ...@@ -13,6 +13,16 @@ jest.mock("@/utils/token-utils", () => {
}; };
}); });
jest.mock("@/utils/apiutil", () => {
return {
getItemPictures: () => {
return new Promise((resolve) => {
resolve([]);
});
},
};
});
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