Merge branch 'main' of...

Merge branch 'main' of https://gitlab.stud.idi.ntnu.no/idatt2106_2022_02/boco-frontend into rental-image-chat

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 + "";

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 });
     },
   },
 };

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();

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"

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(),