diff --git a/backend/curl_request.sh b/backend/curl_request.sh index 36ef229..18eae76 100755 --- a/backend/curl_request.sh +++ b/backend/curl_request.sh @@ -1,7 +1,7 @@ curl -X POST http://127.0.0.1:8000/events -H "Content-Type: application/json" -d '{ "room_id": 1, "creator_id": 2, - "event_type": "proposal", + "type": "proposal", "title": "Filmavond", "description": "Samen een film kijken en snacks halen", "start_time": "2026-08-15 20:00", diff --git a/backend/events.py b/backend/events.py index a45ac85..aa24bba 100644 --- a/backend/events.py +++ b/backend/events.py @@ -3,7 +3,7 @@ from database import execute def create_event( room_id, creator_id, - event_type, + type, title, description, start_time, @@ -33,7 +33,7 @@ def create_event( ( room_id, creator_id, - event_type, + type, title, description, start_time, @@ -55,7 +55,7 @@ def create_event( # event = create_event( # room_id=2, # creator_id=3, -# event_type="proposal", +# type="proposal", # title="Kaas eten", # description="We gaan met z'n allen kaas eten.", # start_time="2026-08-10 19:00", diff --git a/backend/main.py b/backend/main.py index c7b7c3f..186656a 100644 --- a/backend/main.py +++ b/backend/main.py @@ -41,7 +41,7 @@ async def api_create_event(request: Request): event_id = create_event( room_id=data["room_id"], creator_id=data["creator_id"], - event_type=data["event_type"], + type=data["type"], title=data["title"], description=data["description"], start_time=data["start_time"], @@ -54,11 +54,12 @@ async def api_create_event(request: Request): return { "received": data } + # def give_data(): # event = create_event( # room_id=, # creator_id=, -# event_type=, +# type=, # title=, # description=, # start_time=, @@ -68,4 +69,12 @@ async def api_create_event(request: Request): # min_people= # ) -# print("Nieuw event ID:", event) \ No newline at end of file +# print("Nieuw event ID:", event) + +@app.get("/events") +def get_events(): + events = fetch_all("SELECT * FROM events;") + + return { + "events": [dict(event) for event in events] + } \ No newline at end of file diff --git a/backend/start_server.sh b/backend/start_server.sh index a4b79e9..0470c69 100755 --- a/backend/start_server.sh +++ b/backend/start_server.sh @@ -1 +1 @@ -python3 -m uvicorn main:app --reload +python3 -m uvicorn main:app --reload \ No newline at end of file diff --git a/database/calendar.db b/database/calendar.db index c36ae9d..1032ce1 100644 Binary files a/database/calendar.db and b/database/calendar.db differ diff --git a/database/calendar.db-journal b/database/calendar.db-journal deleted file mode 100644 index 0c568c6..0000000 Binary files a/database/calendar.db-journal and /dev/null differ