diff --git a/src/components/CommunityComponents/MemberList.vue b/src/components/CommunityComponents/MemberList.vue index a201e1de086868a09e3462db12e5f66c5cbc3594..bf2d75aeb736678ba47b4ba1106107e7aa44e899 100644 --- a/src/components/CommunityComponents/MemberList.vue +++ b/src/components/CommunityComponents/MemberList.vue @@ -10,6 +10,7 @@ <script> import UserListItemCard from "@/components/UserProfileComponents/UserListItemCard.vue"; import CommunityService from "@/services/community.service"; +import {GetMemberRequestsOfCommunity} from "@/utils/apiutil"; export default { name: "MemberList", @@ -18,6 +19,7 @@ export default { }, props: { buttons: Array, + requests: Boolean, }, data() { return { @@ -30,9 +32,14 @@ export default { }, async created() { this.loading = true; - this.members = await CommunityService.getCommunityMembers( + if(this.requests){ + this.members = await GetMemberRequestsOfCommunity( this.$route.params.communityID ); + } else { + this.members = await CommunityService.getCommunityMembers( + this.$route.params.communityID + );} this.loading = false; }, }; diff --git a/src/utils/apiutil.js b/src/utils/apiutil.js index d77f41d83beeed65607d787da00577995f8df514..7193b8a6cf707dbfec4527ae6bd94c060272c920 100644 --- a/src/utils/apiutil.js +++ b/src/utils/apiutil.js @@ -237,6 +237,19 @@ export async function GetMembersOfCommunity(communityID) { }); } +export async function GetMemberRequestsOfCommunity(communityID) { + return axios + .get(API_URL + "communities/" + communityID + "/requests", { + headers: tokenHeader(), + }) + .then((response) => { + return response.data; + }) + .catch((error) => { + console.error(error); + }); +} + export function JoinOpenCommunity(communityId) { if (tokenHeader().Authorization == "Bearer " + null) { //console.log("ikke logget på!"); diff --git a/src/views/CommunityViews/AdminView.vue b/src/views/CommunityViews/AdminView.vue index cd801ebe72f747c0d0939551eeec4606dbe5595f..4c7fa00a00973f9b2818ad15dc6a7e7256dad19b 100644 --- a/src/views/CommunityViews/AdminView.vue +++ b/src/views/CommunityViews/AdminView.vue @@ -13,8 +13,8 @@ {{ tab }} </button> </div> - <MemberList :buttons="['chat', 'kick']" v-if="currentTab === 0" /> - <MemberList :buttons="['accept', 'reject']" v-if="currentTab === 1" /> + <MemberList :requests ='false' :buttons="['chat', 'kick']" v-if="currentTab === 0" /> + <MemberList :requests ='true' :buttons="['accept', 'reject']" v-if="currentTab === 1" /> <CommunitySettings v-if="currentTab === 2" /> </template>