Merge branch 'main' of...

Merge branch 'main' of https://gitlab.stud.idi.ntnu.no/idatt2106_2022_02/boco-frontend into change-password

src/services/community-admin.service.js

@@ -21,7 +21,8 @@ class CommunityAdminService {
   async acceptUserIntoCommunity(communityID, userID) {
     return await axios.post(
       API_URL + "communities/" + communityID + "/requests",
-      { params: { userId: userID } }
+      null,
+      { headers: tokenHeader(), params: { userId: userID } }
     );
   }
 
@@ -29,9 +30,8 @@ class CommunityAdminService {
   async rejectUserFromCommunity(communityID, userID) {
     return await axios.patch(
       API_URL + "communitites/" + communityID + "/requests/reject",
-      {
-        params: { userId: userID },
-      }
+      null,
+      { headers: tokenHeader(), params: { userId: userID } }
     );
   }
 

src/services/community.service.js

@@ -17,9 +17,24 @@ class CommunityService {
       });
   }
 
-  async getPublicCommunities() {
+  async getAllCommunities() {
     return await axios
-      .get(API_URL + "communities")
+      .get(API_URL + "communities", {
+        headers: tokenHeader(),
+      })
+      .then((response) => {
+        return response.data;
+      })
+      .catch((error) => {
+        console.error(error);
+      });
+  }
+
+  async getUserCommunities() {
+    return await axios
+      .get(API_URL + "user/communities", {
+        headers: tokenHeader(),
+      })
       .then((response) => {
         return response.data;
       })

src/views/CommunityViews/CommunityView.vue

@@ -68,9 +68,9 @@
 
 <script>
 import CommunityList from "@/components/CommunityComponents/CommunityList.vue";
-import { getMyGroups, getVisibleGroups } from "@/utils/apiutil";
 import { UserAddIcon, SearchIcon } from "@heroicons/vue/outline";
 import PaginationTemplate from "@/components/BaseComponents/PaginationTemplate";
+import CommunityService from "@/services/community.service";
 
 export default {
   name: "HomeView",
@@ -153,10 +153,10 @@ export default {
       this.showSearched = this.search.length > 0;
     },
     async load() {
-      this.publicCommunities = await getVisibleGroups();
+      this.publicCommunities = await CommunityService.getAllCommunities();
       this.loggedIn = this.$store.state.user.token !== null;
       if (!this.loggedIn) return;
-      this.myCommunities = await getMyGroups();
+      this.myCommunities = await CommunityService.getUserCommunities();
     },
   },
   async mounted() {