From 64803eb3432d99b3e964968544696e898d2548a8 Mon Sep 17 00:00:00 2001 From: ben Date: Tue, 4 Aug 2026 08:00:44 +0200 Subject: [PATCH] update frontend and main.py/rooms.py --- backend/main.py | 24 +- backend/rooms.py | 49 +- database/calendar.db | Bin 49152 -> 49152 bytes frontend/index.html | 1345 +++++++++++++++++------------------------- 4 files changed, 549 insertions(+), 869 deletions(-) diff --git a/backend/main.py b/backend/main.py index 39c7e84..d1d8e9b 100644 --- a/backend/main.py +++ b/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=["*"], -) \ No newline at end of file diff --git a/backend/rooms.py b/backend/rooms.py index f745cdc..c2b4933 100644 --- a/backend/rooms.py +++ b/backend/rooms.py @@ -4,18 +4,13 @@ from database import execute, fetch_one DEFAULT_ROLE = "member" -def create_room( - user_id, - room_name, - invite_code -): - query = """ - INSERT INTO "main"."rooms" - ("name", "owner_id", "invite_code") - VALUES (?, ?, ?); - """ +def create_room(user_id, room_name, invite_code): + 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, - ( - user_id, + """ + INSERT INTO room_members (room_id, user_id, role) + VALUES (?, ?, ?) + """, + ( room_id, + user_id, "owner" ) ) diff --git a/database/calendar.db b/database/calendar.db index 0c70666aa71acff186f8ec8b56c43d04abd36dba..dbb42e86c031d408595192862ef0768ea431f649 100644 GIT binary patch delta 1467 zcmb7^O>7%g5Xaxk#_Xp(iLjHp!Dy?7R)spYH%XJCfYgM1RKzvJZb;}MUB|Cxll87y zCw7uUorqHf2aqpR9O$7Sai}1*S`{G#Qib3^0STo=1&V}d1wu#^0T(XJ`XdS-2UxB5 zy_tDC|CzVH=k;}NeVu!;i=KGtz7cw2^W=H(3qFZJ7`}rocpe_}UG$}WQgu(;FW&OB z=ph3eo(xkLb-j?&Ep^RUu++3;GpAcicgM8uiIIVoQX)O3jb#RnRNS@_sfFY0sUu0f zXV#dR9*@UUE0d9)qs!0sA0HbYo;_tQ%&Z<0JY@fdr;)S}UbAhhk#8z8Jnsw}hYqtN z`2$&PWd8AilD?9dn3(Pz&y7V_Bk>7yaMI{Gbu40yYN?sAV$q3d)rgzAOJP+O!!Y~eboW81lcSEM*yE-+9?DOCA!ULASK5Ze{r=Mw6-0sQ`YE5bgS#H@Ta0-4D3# z$~%dpxDn?FT!G)=DtrPz!cE+gb6DXbR6d$(8{daLY+ni&qRr~O5*KV3iaV`WBD>SN zyd-m7jcHP>+?;!Gw+wj#zu`uI3D@9#sKRUTGE#IJ@~AfjBZ}NgX^<0hESF}EEVYU> z*fd1f5E>By*L8XYyJRs(;oX;7_PwVyu@=uxane_g^J8h+iQnu{T?j5SkJxrswP;bIdf$4zohuVT;UCiztStCU5GNWms9Y zXxk1xOl%U}CB_zewrlABXPf;g&21a+oo#Z}>n}XSb-`64fx#g=Kfu@U85nRGUdQva z3TKdGk9GZ$TipofseJM3!CewuYEpL_tK7mrmuv6=Tteo~f?A`hLzHS` fJ71?Qz}IQ>3w&kk&B#u0?`(s6>;HrM-hn>>^&o!~ delta 464 zcmZ{ePbh<79LJw$FYn0qeqYW!lkxz9zCSS(lG+L42&r*I%87i!tw zr*;!ka-fvnt>$0J7D-XKxOkRi4t~GO_gBB~_xmwT#WaBFEvslTkxowMbM6W z*jPZHW@(lPHm_;IY8;{-6$yepB=CwWJm3N+qPk-RA`$A=L*7b<;-@pw=wz&-l1e!n z8=Z+c-GmSYNrD1Skp#muI*Th~Uo>7Z5N69=w3)Fc+Qf_iPYw+G6yyj#@Pyp&%AyJI zc%*@?*9IXoOQxnoe@mW=wE9#Cf_KSzi8CBPU=^z}CJtK13_lmqLHUv;_{1BYaf2-K zIL5JjNkP;9Wb*8MyT|Fu5NxBzm2uB$cUr&uRs{7Om&0K)!zVI}ZHiZ#RHTcokGRG; zj*ymdo2aW&%P94iIme>oQ)5--#Y6c%`1wXyS7HBf - + - -Calendar — Rooms & Events +Calendar - -
-
-
- -
-

Calendar

-

Rooms, events & RSVP's

-
-
+ +
+

Calendar

+

Room based agenda

-
- - -
- -
-
- - -
-
- - -
- -
- - - -

API:

+
+ +
-
- - -
-
+ + +
+

Nieuwe room

+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+

Room joinen

+
+ + +
+

+
+ + + +
+
+ + + +
+

Nieuw event

+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +