resolved conflicts

backend/.gitignore

@@ -1,3 +1,4 @@
 node_modules
 local.db
 drizzle
+bun.lockb

backend/src/main.ts

@@ -23,34 +23,34 @@ app.get('/', (req, res) => {
 
 app.get('/tasks', async (req, res) => {
 	const tasks: typeof task.$inferSelect[] = await db.select().from(task)
-	res.send(tasks.map<TaskResponse>(task => {
+	res.status(200).send(tasks.map<TaskResponse>(task => {
 		return { ...task, done: task.done === 1 }
 	}));
 });
 
-app.get('/events', async (req, res) => {
+app.get('/events', async(req, res) => {
-	res.send(await db.select().from(event))
+    res.status(200).send(await db.select().from(event))
 });
 
 app.get('/user/:id', (req, res) => {
     const id = req.params['id'];
 
     if (id == null) {
-		res.status(400).send({ error: 'Needs an user id' });
+        res.status(400).send({error: 'Needs an user id'});
         return;
     }
 
-	const user = { id: id, name: 'Cracker' }  //TODO
+    const user = {id: id, name: 'Cracker'}  //TODO
     res.json(user);
 
 });
 
-app.get('/task/:id', async (req, res) => {
+app.get('/task/:id', async(req, res) => {
 
     const id = parseInt(req.params['id']);
 
     if (id == null) {
-		res.status(400).send({ error: 'Needs an id' });
+        res.status(400).send({error: 'Needs an id'});
         return;
     }
 
@@ -65,15 +65,15 @@ app.get('/event/:id', (req, res) => {
     const id = req.params['id'];
 
     if (id == null) {
-		res.status(400).send({ error: 'Needs an id' });
+        res.status(400).send({error: 'Needs an id'});
         return;
     }
 
-	const event = { id: id, name: 'Pary' }  //TODO
+    const event = {id: id, name: 'Pary'}  //TODO
     res.json(event);
 });
 
-app.post('/task', async (req, res) => {
+app.post('/task', async(req, res) => {
 
     const newTask = req.body
     newTask.userid = userId
@@ -84,10 +84,9 @@ app.post('/task', async (req, res) => {
     res.status(201).json(returnedTask);
 });
 
-app.post('/event', async (req, res) => {
+app.post('/event', async(req, res) => {
 
     const newEvent: typeof event.$inferInsert = req.body
-	newEvent.description = ""
     newEvent.userid = userId
 
     const returnedEvent = await db.insert(event).values(newEvent).returning()
@@ -98,33 +97,39 @@ app.post('/event', async (req, res) => {
 
 app.put('/task', (req, res) => {
 
-	const updatedTask = req.body;
+    const id = parseInt(req.params['id']);
+    const updatedTask: Partial<typeof task.$inferSelect> = req.body
 
-	//Validate (having id)
+    if (id == null) {
-
+        res.status(400).send({error: 'Needs an id'});
-	//const updatedTaskWithId = db.updateTask(updatedTask)
+        return;
+    }
+    db.update(task).set(updatedTask).where(eq(task.id, id))
 
     res.status(200).json(updatedTask);
 });
 
 app.put('/event', (req, res) => {
-	const updatedEvent = req.body;
 
-	//Validate (having id)
+    const id = parseInt(req.params['id']);
+    const updatedEvent: Partial<typeof event.$inferSelect> = req.body
 
-	//const updatedEventWithId = db.updateEvent(updatedEvent)
+    if (id == null) {
+        res.status(400).send({error: 'Needs an id'});
+        return;
+    }
+    db.update(event).set(updatedEvent).where(eq(event.id, id))
 
-	res.status(200).json(updatedEvent);
+    res.status(200).json(updatedEvent);});
-});
 
-app.delete('/task/:id', async (req, res) => {
+app.delete('/task/:id', async(req, res) => {
     const id = parseInt(req.params['id']);
 
     const success = await db.delete(task).where(eq(task.id, id))
     res.send("Deleted");
 });
 
-app.delete('/event/:id', async (req, res) => {
+app.delete('/event/:id', async(req, res) => {
     const id = parseInt(req.params['id']);
 
     const success = await db.delete(event).where(eq(event.id, id))

web/.gitignore

@@ -25,3 +25,4 @@ logs
 
 # bun
 package-lock.json
+bun.lockb