diff --git a/src/components/BaseComponents/NavBar.vue b/src/components/BaseComponents/NavBar.vue index 3281cf2e521896053954387941ba03dc04c88281..56bef37c1e9db83f78f09316b7de6ed2324523e4 100644 --- a/src/components/BaseComponents/NavBar.vue +++ b/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"); diff --git a/src/components/ChatComponents/ChatMessage.vue b/src/components/ChatComponents/ChatMessage.vue index d6996776b48e22224434b1696f64e2cdb5fa3aef..3a69ca3c3237be6ec7ccae999e136a482f2b4c3f 100644 --- a/src/components/ChatComponents/ChatMessage.vue +++ b/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"; diff --git a/src/components/ChatComponents/ChatProfile.vue b/src/components/ChatComponents/ChatProfile.vue index 7e1e9aa2c20ec518844d64ebfb940f8723b84340..136db539f851d668d7e435b3fdd9cccabaec9768 100644 --- a/src/components/ChatComponents/ChatProfile.vue +++ b/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); }, }, diff --git a/src/components/CommunityComponents/CommunityHamburger.vue b/src/components/CommunityComponents/CommunityHamburger.vue index c53a4d751caf362fd37a4cad34038edd1d4562cb..83caf2163016c723bd4d686b017a8a313351bacc 100644 --- a/src/components/CommunityComponents/CommunityHamburger.vue +++ b/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> diff --git a/src/components/CommunityComponents/CommunityHome.vue b/src/components/CommunityComponents/CommunityHome.vue index dc41215d91840e3e6c0b941edff2491b76453379..67e524cc31cd7257fb54b0b684510579eef98009 100644 --- a/src/components/CommunityComponents/CommunityHome.vue +++ b/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; } diff --git a/src/components/CommunityComponents/CommunitySettings.vue b/src/components/CommunityComponents/CommunitySettings.vue index 9e6b3d4484c26cffbafd66a1c0bf1f516ff1cd6c..0dd0328534c890eb348d4e02f6d16fb7da791762 100644 --- a/src/components/CommunityComponents/CommunitySettings.vue +++ b/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); }, }, diff --git a/src/components/FormComponents/LoginForm.vue b/src/components/FormComponents/LoginForm.vue index bbb849a1008414ed2abc3899b7216c9a80d7d562..03c6482b6272c6f1ffaa3461906e1260044c0ea1 100644 --- a/src/components/FormComponents/LoginForm.vue +++ b/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"); } }, }, diff --git a/src/components/FormComponents/NewPasswordForm.vue b/src/components/FormComponents/NewPasswordForm.vue index d13c08349360250ff4f0cf96b5f3faab00d7a841..bc777bf8401c74f5857ea8323cea4cf83c243d91 100644 --- a/src/components/FormComponents/NewPasswordForm.vue +++ b/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() { diff --git a/src/components/FormComponents/ResetPasswordForm.vue b/src/components/FormComponents/ResetPasswordForm.vue index a4c2d80e1533e2c7be82804041bd49208b4ab6be..9f5457d9569dcd1c4d0f8f0a1b1eda7d30cfb3b3 100644 --- a/src/components/FormComponents/ResetPasswordForm.vue +++ b/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("/"); diff --git a/src/components/ItemComponents/NewItemForm.vue b/src/components/ItemComponents/NewItemForm.vue index f9f5f06e0e6a8fc5e610ee8cfc326a276d111e18..d0ff2bde33b2ad7da50e1fe7ede41171c38cdbf2 100644 --- a/src/components/ItemComponents/NewItemForm.vue +++ b/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]) { diff --git a/src/components/TimepickerComponents/DatepickerRange/MonthSelector.vue b/src/components/TimepickerComponents/DatepickerRange/MonthSelector.vue index a16a3b840b9efd770d970b0f7313f5e1d0198ec9..bfcbaef6757e67706693a0680345aaf40f36b68a 100644 --- a/src/components/TimepickerComponents/DatepickerRange/MonthSelector.vue +++ b/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); }, }, diff --git a/src/main.js b/src/main.js index 32764da4a55678ff6ed1fbf6e21819a55990f716..2d3b35cdcc6b5aaa8e21905ac4abba260db9a30e 100644 --- a/src/main.js +++ b/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); diff --git a/src/services/ws.js b/src/services/ws.js index 80951c9ea5fcc921a59c9ab8d175a5ff25d7b677..b9adba0dd168d0e183dc6b151b95fff38d806ef4 100644 --- a/src/services/ws.js +++ b/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", {}, diff --git a/src/utils/apiutil.js b/src/utils/apiutil.js index daac6a7fc495ca0716e84b93c0da6a49b7baf183..4df5907c9470ac4c4bca53ec0d29f8c58eecb35f 100644 --- a/src/utils/apiutil.js +++ b/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"; } diff --git a/src/views/ChatViews/ChatView.vue b/src/views/ChatViews/ChatView.vue index 1b7cfad3b7730e1991953a8f5340ff45669f568b..b260cfd92c6b9d1e5862ae56f27c977d3c68b642 100644 --- a/src/views/ChatViews/ChatView.vue +++ b/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() {