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

fix: fixed merge errors

Browse source
This commit is contained in:
Adriaan Jacquet 2025-04-06 17:55:01 +02:00
parent effaeb0277
commit 7e250e2649
4 changed files with 3 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backend/src/routes/groups.ts
View file

@ -12,15 +12,5 @@ router.post('/', createGroupHandler);
router.get('/:groupid', getGroupHandler);
router.get('/:groupid/submissions', getGroupSubmissionsHandler);
<<<<<<< HEAD
=======
// The list of questions a group has made
router.get('/:id/questions', (_req, res) => {
res.json({
questions: ['0'],
});
});
>>>>>>> 6c3dbc99bb1afb79fa867505e52656c49bada1b6
export default router;

8
backend/src/routes/submissions.ts
View file

@ -3,15 +3,7 @@ import { createSubmissionHandler, deleteSubmissionHandler, getAllSubmissionsHand
const router = express.Router({ mergeParams: true });
// Root endpoint used to search objects
<<<<<<< HEAD
router.get('/', getAllSubmissionsHandler);
=======
router.get('/', (_req, res) => {
res.json({
submissions: ['0', '1'],
});
});
>>>>>>> 6c3dbc99bb1afb79fa867505e52656c49bada1b6
router.post('/:id', createSubmissionHandler);