diff --git a/src/components/ChatComponents/ChatMessage.vue b/src/components/ChatComponents/ChatMessage.vue index 0d05a808f6f0fc95f7170144436a6332dc7672be..3c63cef6850cdad57f8a1dd9ca9a39a7e3f96099 100644 --- a/src/components/ChatComponents/ChatMessage.vue +++ b/src/components/ChatComponents/ChatMessage.vue @@ -58,12 +58,18 @@ export default { calculateTime() { var time = this?.message.timestamp; var date = new Date(time); - //Todo add timing for mm and hh and week of message + var mmOfMessage = String(date.getMinutes()); var hhOfMessage = String(date.getHours()); + if(mmOfMessage <= 9){ + mmOfMessage = "0" + mmOfMessage; + } + if(hhOfMessage<=9){ + hhOfMessage = "0" + hhOfMessage; + } var ddOfMessage = String(date.getDate()).padStart(2, "0"); var dayOfMessage = date.toLocaleString("default", { weekday: "short" }); - var monthOfMessage = String(date.getMonth() + 1).padStart(2, "0"); //January is 0! + var monthOfMessage = String(date.getMonth() + 1).padStart(2, "0"); const shortMonthOfMessage = date.toLocaleString("default", { month: "short", }); @@ -71,7 +77,7 @@ export default { var today = new Date(); var dd = String(today.getDate()).padStart(2, "0"); - var mm = String(today.getMonth() + 1).padStart(2, "0"); //January is 0! + var mm = String(today.getMonth() + 1).padStart(2, "0"); var yyyy = today.getFullYear(); if (ddOfMessage == dd) { return "" + hhOfMessage + ":" + mmOfMessage + ""; diff --git a/src/components/CommunityComponents/CommunitySettings.vue b/src/components/CommunityComponents/CommunitySettings.vue index 8ea68e5261329fb85624ce68a201be8e02273416..eade2eeb081e0f08e491aa6b723e926418de70cb 100644 --- a/src/components/CommunityComponents/CommunitySettings.vue +++ b/src/components/CommunityComponents/CommunitySettings.vue @@ -9,7 +9,7 @@ </template> <script> -// import CommunityAdminService from "@/services/community-admin.service"; +import CommunityAdminService from "@/services/community-admin.service"; import IconButton from "@/components/BaseComponents/IconButton.vue"; //TODO: OPEN CONFIRMATION DIALOG WHEN DELETING @@ -19,9 +19,12 @@ export default { IconButton, }, methods: { - deleteCommunity() { - console.log("DELETED"); - // CommunityAdminService.deleteCommunity(this.$route.params.communityID); + async deleteCommunity() { + let response = await CommunityAdminService.deleteCommunity( + this.$route.params.communityID + ); + if (response.status === 200) + this.$router.push({ name: "home", replace: true }); }, }, }; diff --git a/src/components/UserProfileComponents/RentHistoryComponents/RentHistoryItem.vue b/src/components/UserProfileComponents/RentHistoryComponents/RentHistoryItem.vue index 675524104ec1ebe1b74410ae9114131c666f4023..c05823dcee3cd9a5bdcaf4661ec727d755346432 100644 --- a/src/components/UserProfileComponents/RentHistoryComponents/RentHistoryItem.vue +++ b/src/components/UserProfileComponents/RentHistoryComponents/RentHistoryItem.vue @@ -97,7 +97,10 @@ export default { getDateString(milliseconds) { let today = new Date(); let date = new Date(milliseconds); - let dateString = date.getDate() + "." + (date.getMonth() + 1); + const shortMonthOfRentHistoryItem = date.toLocaleString("default", { + month: "short", + }); + let dateString = date.getDate() + ". " + shortMonthOfRentHistoryItem; if (date.getFullYear() != today.getFullYear()) { dateString += "." + date.getFullYear(); diff --git a/src/components/UserProfileComponents/UserProfile.vue b/src/components/UserProfileComponents/UserProfile.vue index c7c39da640c00bc06ee1e4b39ee0f38b8579e721..7f0f32eb3451295d6a9d6b73e8ff3eea326be53a 100644 --- a/src/components/UserProfileComponents/UserProfile.vue +++ b/src/components/UserProfileComponents/UserProfile.vue @@ -98,7 +98,7 @@ <rating-component :rating="ownerRating" :ratingType="'Utleier'" /> </div> - <div v-show="!isCurrentUser" 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 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" diff --git a/src/services/community-admin.service.js b/src/services/community-admin.service.js index c935f1181ea5d8c81306dddae21a8015d95a8d9d..eb2c23e00d5d3ca456f5685429dc5d0393d01047 100644 --- a/src/services/community-admin.service.js +++ b/src/services/community-admin.service.js @@ -60,7 +60,7 @@ class CommunityAdminService { * @returns TODO */ async deleteCommunity(communityID) { - return await axios.post( + return await axios.delete( API_URL + "communities/" + communityID + "/remove", { headers: tokenHeader(),