tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
Archived
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

Merge remote-tracking branch 'origin/dev' into fix/verschillende-authenticatieproblemen

Browse source 
# Conflicts:
#	frontend/src/i18n/locale/de.json
#	frontend/src/i18n/locale/en.json
This commit is contained in:
Gerald Schmittinger 2025-04-20 11:34:21 +02:00
commit af0f40f63e
21 changed files with 1006 additions and 492 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/src/controllers/teacher-invitations.ts
View file

@ -40,7 +40,7 @@ export async function updateInvitationHandler(req: Request, res: Response): Prom
const sender = req.body.sender;
const receiver = req.body.receiver;
const classId = req.body.class;
req.body.accepted = req.body.accepted !== 'false';
req.body.accepted = req.body.accepted !== false;
requireFields({ sender, receiver, classId });
const data = req.body as TeacherInvitationData;

2
backend/src/routes/teachers.ts
View file

@ -34,6 +34,6 @@ router.get('/:username/joinRequests/:classId', getStudentJoinRequestHandler);
router.put('/:username/joinRequests/:classId/:studentUsername', updateStudentJoinRequestHandler);
// Invitations to other classes a teacher received
router.get('/invitations', invitationRouter);
router.use('/invitations', invitationRouter);
export default router;