From 255fb97dd34ec5384874899aa0e05d574fdbbbd9 Mon Sep 17 00:00:00 2001 From: "Torsten Schulz (notebook)" Date: Sat, 17 Aug 2024 13:05:03 +0200 Subject: [PATCH] more control --- backend/controllers/memberController.js | 2 +- backend/routes/memberRoutes.js | 3 ++- frontend/src/App.vue | 4 +--- frontend/src/views/ClubView.vue | 21 ++++++++++++++++++++- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/backend/controllers/memberController.js b/backend/controllers/memberController.js index 71c81ff..f2f0a78 100644 --- a/backend/controllers/memberController.js +++ b/backend/controllers/memberController.js @@ -7,7 +7,7 @@ const getClubMembers = async(req, res) => { const getWaitingApprovals = async(req, res) => { try { - const { clubid: clubId } = req.body; + const { clubid: clubId } = req.params; const { hashedId: userToken} = req.headers; const waitingApprovals = MemberService.getApprovalRequests(userToken, clubId); res.status(200).json(waitingApprovals); diff --git a/backend/routes/memberRoutes.js b/backend/routes/memberRoutes.js index bc84e13..57fde07 100644 --- a/backend/routes/memberRoutes.js +++ b/backend/routes/memberRoutes.js @@ -1,9 +1,10 @@ -import { getClubMembers } from '../controllers/memberController'; +import { getClubMembers, getWaitingApprovals } from '../controllers/memberController'; import express from 'express'; import { authenticate } from '../middleware/authMiddleware'; const router = express.Router; router.post('/', authenticate, getClubMembers); +router.get('/notapproved/:id', authenticate, getWaitingApprovals); export default router; diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 412b632..0b65c4a 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -20,7 +20,7 @@ export default { name: 'App', data() { return { - selectedClub: null, // Initialisiere selectedClub als null + selectedClub: null, }; }, computed: { @@ -28,11 +28,9 @@ export default { }, watch: { selectedClub(newVal) { - console.log('selectedClub watcher:', newVal); this.setCurrentClub(newVal); }, currentClub(newVal) { - console.log('currentClub watcher:', newVal); if (newVal === 'new') { this.$router.push('/createclub'); } else if (newVal) { diff --git a/frontend/src/views/ClubView.vue b/frontend/src/views/ClubView.vue index 63bea23..39b386b 100644 --- a/frontend/src/views/ClubView.vue +++ b/frontend/src/views/ClubView.vue @@ -1,8 +1,20 @@ \ No newline at end of file