Merge branch 'community-admin' of...

Merge branch 'community-admin' of https://gitlab.stud.idi.ntnu.no/idatt2106_2022_02/boco-frontend into community-request

src/components/BaseComponents/NavBar.vue

@@ -53,9 +53,9 @@ export default {
     async loadProfile() {
       if (this.$store.state.user.token !== null) {
         let user = parseUserFromToken(this.$store.state.user.token);
-        console.log(user);
+        //console.log(user);
         let id = user.accountId;
-        console.log(id);
+        //console.log(id);
         await this.$router.push("/profile/" + id);
       } else {
         await this.$router.push("/login");

src/components/ChatComponents/ChatMessage.vue

@@ -33,7 +33,7 @@ export default {
   },
   methods: {
     color() {
-      console.log(this.userID);
+      //console.log(this.userID);
       return this?.message.from == this.userID
         ? "bg-gray-300"
         : "bg-primary-medium";

src/components/ChatComponents/ChatProfile.vue

@@ -52,7 +52,7 @@ export default {
   },
   methods: {
     selectUser() {
-      console.log(this.conversation.recipient.userId);
+      //console.log(this.conversation.recipient.userId);
       this.$emit("recipient", this.conversation.recipient.userId);
     },
   },

src/components/CommunityComponents/CommunityHamburger.vue

@@ -60,7 +60,9 @@ export default {
     },
   },
   mounted() {
-    this.admin = CommunityAdminService.isUserAdmin();
+    this.admin = CommunityAdminService.isUserAdmin(
+      this.$route.params.communityID
+    );
   },
 };
 </script>

src/components/CommunityComponents/CommunityHome.vue

@@ -101,7 +101,7 @@ export default {
       this.items = await GetListingsInCommunity(this.communityID);
       for (var i = 0; i < this.items.length; i++) {
         let images = await getItemPictures(this.items[i].listingID);
-        console.log(images);
+        //console.log(images);
         if (images.length > 0) {
           this.items[i].img = images[0].picture;
         }

src/components/CommunityComponents/CommunitySettings.vue

@@ -20,7 +20,7 @@ export default {
   },
   methods: {
     deleteCommunity() {
-      console.log("DELETED");
+      //console.log("DELETED");
       // AdminService.deleteCommunity(this.$route.params.communityID);
     },
   },

src/components/FormComponents/LoginForm.vue

@@ -137,7 +137,7 @@ export default {
       this.v$.user.$touch();
 
       if (this.v$.user.$invalid) {
-        console.log("Ugyldig, avslutter...");
+        //console.log("Ugyldig, avslutter...");
         return;
       }
 
@@ -154,7 +154,7 @@ export default {
         this.$store.commit("saveToken", loginResponse.token);
         await this.$router.push("/");
       } else {
-        console.log("Something went wrong");
+        //console.log("Something went wrong");
       }
     },
   },

src/components/FormComponents/NewPasswordForm.vue

@@ -130,7 +130,7 @@ export default {
       this.v$.user.$touch();
 
       if (this.v$.user.$invalid) {
-        console.log("Invalid, exiting...");
+        //console.log("Invalid, exiting...");
         return;
       }
 
@@ -142,12 +142,12 @@ export default {
       const newPasswordResponse = doNewPassword(newPasswordInfo);
 
       if (newPasswordResponse.newPasswordSet === true) {
-        console.log("New password set");
+        //console.log("New password set");
         await this.$router.push("/");
       } else if (newPasswordResponse.newPasswordSet === false) {
-        console.log("Couldn't set new password");
+        //console.log("Couldn't set new password");
       } else {
-        console.log("Something went wrong");
+        //console.log("Something went wrong");
       }
     },
     validate() {

src/components/FormComponents/ResetPasswordForm.vue

@@ -83,7 +83,7 @@ export default {
       this.v$.email.$touch();
 
       if (this.v$.email.$invalid) {
-        console.log("Ugyldig, avslutter...");
+        //console.log("Ugyldig, avslutter...");
         return;
       } else {
         this.$router.push("/");

src/components/ItemComponents/NewItemForm.vue

@@ -311,36 +311,36 @@ export default {
   },
   methods: {
     checkValidation: function () {
-      console.log("sjekker validering");
+      //console.log("sjekker validering");
 
       this.v$.item.$touch();
       if (this.v$.item.$invalid || this.item.selectedGroups.length === 0) {
         if (this.item.selectedGroups.length === 0) {
           this.groupErrorMessage = "Velg gruppe/grupper";
         }
-        console.log("Invalid, avslutter...");
+        //console.log("Invalid, avslutter...");
         return false;
       }
 
-      console.log("validert!");
+      //console.log("validert!");
       return true;
     },
 
     async saveClicked() {
-      console.log("Attempting to save item");
+      //console.log("Attempting to save item");
 
       if (this.checkValidation()) {
-        console.log("validert, videre...");
+        //console.log("validert, videre...");
 
         this.checkUser();
 
-        console.log("Tittel: " + this.item.title);
-        console.log("Kategori: " + this.item.select);
-        console.log("Beskrivelse: " + this.item.description);
-        console.log("Addressen: " + this.item.address);
-        console.log("Pris: " + this.item.price);
-        console.log("bilder: " + this.item.images);
-        console.log("gruppe: " + this.item.selectedGroups);
+        //console.log("Tittel: " + this.item.title);
+        //console.log("Kategori: " + this.item.select);
+        //console.log("Beskrivelse: " + this.item.description);
+        //console.log("Addressen: " + this.item.address);
+        //console.log("Pris: " + this.item.price);
+        //console.log("bilder: " + this.item.images);
+        //console.log("gruppe: " + this.item.selectedGroups);
 
         const itemInfo = {
           title: this.item.title,
@@ -352,11 +352,11 @@ export default {
           communityIDs: this.item.selectedGroups,
         };
 
-        console.log(itemInfo);
+        //console.log(itemInfo);
 
-        const postRequest = await postNewItem(itemInfo);
+        /* const postRequest = */ await postNewItem(itemInfo);
 
-        console.log("posted: " + postRequest);
+        //console.log("posted: " + postRequest);
 
         this.$router.push("/");
       }
@@ -368,7 +368,7 @@ export default {
     },
 
     addImage: function (event) {
-      console.log(event.target.files);
+      //console.log(event.target.files);
       this.item.images.push(URL.createObjectURL(event.target.files[0]));
     },
 
@@ -379,7 +379,7 @@ export default {
     onChangeGroup: function (e) {
       this.selectedGroupId = e.target.value;
       let alreadyInGroupList = false;
-      console.log("selected clicked");
+      //console.log("selected clicked");
 
       for (let i = 0; i <= this.item.selectedGroups.length; i++) {
         if (this.selectedGroupId == this.item.selectedGroups[i]) {

src/components/TimepickerComponents/DatepickerRange/MonthSelector.vue

@@ -81,7 +81,7 @@ export default {
       this.$emit("back", this.type);
     },
     forward() {
-      console.log(this.type);
+      //console.log(this.type);
       this.$emit("forward", this.type);
     },
   },

src/main.js

@@ -5,4 +5,4 @@ import store from "./store";
 import ws from "./services/ws";
 
 createApp(App).use(router).use(store).mount("#app");
-console.log("WS", ws.test);
+//console.log("WS", ws.test);

src/services/ws.js

@@ -17,18 +17,18 @@ const ws = (function () {
   const onMessageReceived = (payload) => {
     const data = JSON.parse(payload.body);
 
-    console.log("New message!");
+    //console.log("New message!");
     // Fire message event
     fire("MESSAGE", JSON.parse(payload.body));
 
     if (data.status == "NEW_MESSAGE")
       fire("NEW_MESSAGE", JSON.parse(payload.body));
 
-    console.log("Received message: " + payload);
+    //console.log("Received message: " + payload);
   };
 
   const onConnected = () => {
-    console.log("Websocket Connected");
+    //console.log("Websocket Connected");
     stompClient.subscribe(
       "/user/" + parseCurrentUser().accountId + "/queue/messages",
       onMessageReceived
@@ -56,8 +56,8 @@ const ws = (function () {
         throw new Error("No handler for event: " + event);
       }
     },
-    sendMessage: ({ sender, recipient, status }) => {
-      if (status) console.log(status);
+    sendMessage: ({ sender, recipient /* , status */ }) => {
+      //if (status) console.log(status);
       stompClient.send(
         "/app/chat",
         {},

src/utils/apiutil.js

@@ -91,7 +91,7 @@ export function doNewPassword() {
   //return axios
   //.post(API_URL + "newPassword", newPasswordInfo)
   //.then((response) => {auth.newPasswordSet = true;return auth;})
-  //.catch((error) => {console.log(error);return auth;});
+  //.catch((error) => {//console.log(error);return auth;});
   return auth; //remove after axios is added
 }
 
@@ -101,7 +101,7 @@ export function postNewItem(itemInfo) {
       headers: tokenHeader(),
     })
     .then((response) => {
-      console.log("poster: " + response.data);
+      //console.log("poster: " + response.data);
       return response;
     })
     .catch((error) => {
@@ -127,7 +127,7 @@ export function postNewRent(rentInfo) {
       headers: tokenHeader(),
     })
     .then((response) => {
-      console.log("poster: " + response.data);
+      //console.log("poster: " + response.data);
       return response;
     })
     .catch((error) => {
@@ -230,7 +230,7 @@ export async function GetMembersOfCommunity(communityID) {
 
 export function JoinOpenCommunity(communityId) {
   if (tokenHeader().Authorization == "Bearer " + null) {
-    console.log("ikke logget på!");
+    //console.log("ikke logget på!");
     return "Login to join any community";
   }
 

src/views/ChatViews/ChatView.vue

@@ -64,7 +64,7 @@ export default {
       this.selected = this.conversations.find(
         (conversation) => conversation.recipient.userId == userid
       ).recipient;
-      console.log(this.selected);
+      //console.log(this.selected);
     },
   },
   async created() {