update frontend and main.py/rooms.py

backend/main.py

@@ -12,6 +12,7 @@ from event_signups import respond_to_event, count_confirmations
 from fastapi import HTTPException
 import sqlite3
 from typing import Literal
+from fastapi.middleware.cors import CORSMiddleware
 
 class Login(BaseModel):
     username: str
@@ -54,6 +55,14 @@ app = FastAPI(
     version="1.0"
 )
 
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],  # later vervangen door je domein
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
 
 @app.get("/")
 def home():
@@ -353,18 +362,3 @@ print("start with:")
 print("$ bash start_server.sh")
 print()
 
-from fastapi.middleware.cors import CORSMiddleware
-
-app = FastAPI(
-    title="Calendar API",
-    description="Room based agenda system",
-    version="1.0"
-)
-
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=["*"],  # later vervangen door je domein
-    allow_credentials=True,
-    allow_methods=["*"],
-    allow_headers=["*"],
-)

backend/rooms.py

@@ -4,18 +4,13 @@ from database import execute, fetch_one
 
 DEFAULT_ROLE = "member"
 
-def create_room(
+def create_room(user_id, room_name, invite_code):
-    user_id,
+
-    room_name,
-    invite_code
-):
-    query = """
-    INSERT INTO "main"."rooms"
-    ("name", "owner_id", "invite_code")
-    VALUES (?, ?, ?);
-    """
     room_id = execute(
-        query,
+        """
+        INSERT INTO rooms (name, owner_id, invite_code)
+        VALUES (?, ?, ?)
+        """,
         (
             room_name,
             user_id,
@@ -23,34 +18,14 @@ def create_room(
         )
     )
 
-    query2 = """
-    SELECT id
-    FROM rooms
-    WHERE invite_code = ?
-    """
-    room = fetch_one(
-        query2,
-        (
-            invite_code,
-        )
-    )
-
-    if room is None:
-        return None
-
-    room_id = room["id"]
-    role = DEFAULT_ROLE
-    query3 = """
-    INSERT INTO "main"."room_members"
-    ("room_id", "user_id", "role")
-    VALUES (?, ?, ?);
-    """
-
     member_id = execute(
-        query3,
+        """
+        INSERT INTO room_members (room_id, user_id, role)
+        VALUES (?, ?, ?)
+        """,
         (
-            user_id,
             room_id,
+            user_id,
             "owner"
         )
     )