Merge branch 'dev' into feat/assignment-page
This commit is contained in:
		
						commit
						c29b4f8c29
					
				
					 21 changed files with 1004 additions and 490 deletions
				
			
		|  | @ -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; | ||||
|  |  | |||
|  | @ -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; | ||||
|  |  | |||
		Reference in a new issue
	
	 Laure Jablonski
						Laure Jablonski