Session editor and live sessions!

folkugat_web/api/__init__.py

@@ -1,6 +1,7 @@
 from ._router import router
 from .auth import *
 from .index import *
+from .sessio import *
 from .sessions import *
 from .tema import *
 from .temes import *

folkugat_web/api/sessio/__init__.py

@@ -0,0 +1 @@
+from . import index, live, set_page

folkugat_web/api/sessio/index.py

@@ -0,0 +1,199 @@
+from typing import Annotated
+
+from fastapi import Form, Request
+from folkugat_web.api import router
+from folkugat_web.fragments import live, sessio
+from folkugat_web.services import auth
+from folkugat_web.services.temes import write as temes_service
+from folkugat_web.templates import templates
+
+
+@router.get("/sessio/{session_id}")
+def page(
+    request: Request,
+    logged_in: auth.LoggedIn,
+    session_id: int,
+):
+    return templates.TemplateResponse(
+        "index.html",
+        {
+            "request": request,
+            "page_title": "Folkugat",
+            "content": f"/api/content/sessio/{session_id}",
+            "logged_in": logged_in,
+        }
+    )
+
+
+@router.get("/api/content/sessio/{session_id}")
+def contingut(
+    request: Request,
+    logged_in: auth.LoggedIn,
+    session_id: int,
+):
+    return sessio.pagina(request, session_id, logged_in)
+
+
+@router.put("/api/sessio/{session_id}/live")
+def set_live(
+    request: Request,
+    _: auth.RequireLogin,
+    session_id: int,
+):
+    return live.start_live_session(request=request, session_id=session_id)
+
+
+@router.delete("/api/sessio/{session_id}/live")
+def stop_live(
+    request: Request,
+    _: auth.RequireLogin,
+    session_id: int,
+):
+    return live.stop_live_session(request=request, session_id=session_id)
+
+
+@router.post("/api/sessio/{session_id}/set")
+def add_set(
+    request: Request,
+    logged_in: auth.RequireLogin,
+    session_id: int,
+):
+    return sessio.add_set(request=request, session_id=session_id, logged_in=logged_in)
+
+
+@router.get("/api/sessio/{session_id}/set/{set_id}")
+def get_set(
+    request: Request,
+    logged_in: auth.LoggedIn,
+    session_id: int,
+    set_id: int,
+):
+    return sessio.get_set(request=request, session_id=session_id, set_id=set_id, logged_in=logged_in)
+
+
+@router.delete("/api/sessio/{session_id}/set/{set_id}")
+def delete_set(
+    _: auth.RequireLogin,
+    session_id: int,
+    set_id: int,
+):
+    return sessio.delete_set(session_id=session_id, set_id=set_id)
+
+
+@router.post("/api/sessio/{session_id}/set/{set_id}")
+def add_tema(
+    request: Request,
+    logged_in: auth.RequireLogin,
+    session_id: int,
+    set_id: int,
+):
+    return sessio.add_tema(request=request, session_id=session_id, set_id=set_id, logged_in=logged_in)
+
+
+@router.get("/api/sessio/{session_id}/set/{set_id}/tema/{entry_id}")
+def get_tema(
+    request: Request,
+    logged_in: auth.RequireLogin,
+    session_id: int,
+    set_id: int,
+    entry_id: int,
+):
+    return sessio.get_tema(
+        request=request, session_id=session_id, set_id=set_id, entry_id=entry_id, logged_in=logged_in)
+
+
+@router.get("/api/sessio/{session_id}/set/{set_id}/tema/{entry_id}/editor")
+def get_tema_editor(
+    request: Request,
+    logged_in: auth.RequireLogin,
+    session_id: int,
+    set_id: int,
+    entry_id: int,
+):
+    return sessio.get_tema_editor(
+        request=request, session_id=session_id, set_id=set_id, entry_id=entry_id, logged_in=logged_in)
+
+
+@router.delete("/api/sessio/{session_id}/set/{set_id}/tema/{entry_id}")
+def delete_tema(
+    _: auth.RequireLogin,
+    session_id: int,
+    set_id: int,
+    entry_id: int,
+):
+    return sessio.delete_tema(session_id=session_id, set_id=set_id, entry_id=entry_id)
+
+
+@router.get("/api/sessio/{session_id}/set/{set_id}/tema/{entry_id}/busca")
+def busca_tema(
+    request: Request,
+    _: auth.RequireLogin,
+    session_id: int,
+    set_id: int,
+    entry_id: int,
+    query: str,
+):
+    return sessio.busca_tema(
+        request=request,
+        session_id=session_id,
+        set_id=set_id,
+        entry_id=entry_id,
+        query=query,
+    )
+
+
+@router.put("/api/sessio/{session_id}/set/{set_id}/tema/{entry_id}")
+def set_tema(
+    request: Request,
+    logged_in: auth.RequireLogin,
+    session_id: int,
+    set_id: int,
+    entry_id: int,
+    tema_id: Annotated[int, Form()],
+):
+    return sessio.set_tema(
+        request=request,
+        logged_in=logged_in,
+        session_id=session_id,
+        set_id=set_id,
+        entry_id=entry_id,
+        tema_id=tema_id,
+    )
+
+
+@router.put("/api/sessio/{session_id}/set/{set_id}/tema/{entry_id}/unknown")
+def set_tema_unknown(
+    request: Request,
+    logged_in: auth.RequireLogin,
+    session_id: int,
+    set_id: int,
+    entry_id: int,
+):
+    return sessio.set_tema(
+        request=request,
+        logged_in=logged_in,
+        session_id=session_id,
+        set_id=set_id,
+        entry_id=entry_id,
+        tema_id=None,
+    )
+
+
+@router.post("/api/sessio/{session_id}/set/{set_id}/tema/{entry_id}")
+def set_tema_new(
+    request: Request,
+    logged_in: auth.RequireLogin,
+    session_id: int,
+    set_id: int,
+    entry_id: int,
+    title: Annotated[str, Form()],
+):
+    new_tema = temes_service.create_tema(title=title)
+    return sessio.set_tema(
+        request=request,
+        logged_in=logged_in,
+        session_id=session_id,
+        set_id=set_id,
+        entry_id=entry_id,
+        tema_id=new_tema.id,
+    )

folkugat_web/api/sessio/live.py

@@ -0,0 +1,37 @@
+from fastapi import Request
+from folkugat_web.api import router
+from folkugat_web.fragments import set_page
+from folkugat_web.services import auth
+from folkugat_web.templates import templates
+
+
+@router.get("/live")
+def page(
+    request: Request,
+    logged_in: auth.LoggedIn,
+):
+    return templates.TemplateResponse(
+        "index.html",
+        {
+            "request": request,
+            "page_title": "Folkugat",
+            "content": f"/api/content/live",
+            "logged_in": logged_in,
+        }
+    )
+
+
+@router.get("/api/content/live")
+def contingut(
+    request: Request,
+    logged_in: auth.LoggedIn,
+):
+    return set_page.live(request, logged_in)
+
+
+@router.get("/api/content/live/set")
+def get_set_page(
+    request: Request,
+    logged_in: auth.LoggedIn,
+):
+    return set_page.live_set(request, logged_in)

folkugat_web/api/sessio/set_page.py

@@ -0,0 +1,33 @@
+from fastapi import Request
+from folkugat_web.api import router
+from folkugat_web.fragments import set_page
+from folkugat_web.services import auth
+from folkugat_web.templates import templates
+
+
+@router.get("/sessio/{session_id}/set/{set_id}")
+def page(
+    request: Request,
+    logged_in: auth.LoggedIn,
+    session_id: int,
+    set_id: int,
+):
+    return templates.TemplateResponse(
+        "index.html",
+        {
+            "request": request,
+            "page_title": "Folkugat",
+            "content": f"/api/content/sessio/{session_id}/set/{set_id}",
+            "logged_in": logged_in,
+        }
+    )
+
+
+@router.get("/api/content/sessio/{session_id}/set/{set_id}")
+def contingut(
+    request: Request,
+    logged_in: auth.LoggedIn,
+    session_id: int,
+    set_id: int,
+):
+    return set_page.pagina(request, session_id, set_id, logged_in)

folkugat_web/api/sessions/__init__.py

@@ -1 +1 @@
-from . import editor, index, sessio
+from . import editor, index

folkugat_web/api/sessions/sessio.py

@@ -1,41 +0,0 @@
-from fastapi import Request
-from folkugat_web.api import router
-from folkugat_web.fragments import live, sessions
-from folkugat_web.services import auth
-from folkugat_web.templates import templates
-
-
-@router.get("/sessio/{session_id}")
-def page(
-    request: Request,
-    session_id: int,
-    logged_in: auth.LoggedIn,
-):
-    return templates.TemplateResponse(
-        "index.html",
-        {
-            "request": request,
-            "page_title": "Folkugat",
-            "content": f"/api/content/sessio/{session_id}",
-            "logged_in": logged_in,
-        }
-    )
-
-
-@router.get("/api/content/sessio/{session_id}")
-def contingut(
-    request: Request,
-    session_id: int,
-    logged_in: auth.LoggedIn,
-):
-    return sessions.sessio(request, session_id, logged_in)
-
-
-@router.put("/api/sessio/{session_id}/live")
-def set_live(request: Request, session_id: int, _: auth.RequireLogin):
-    return live.start_live_session(request=request, session_id=session_id)
-
-
-@router.delete("/api/sessio/{session_id}/live")
-def stop_live(request: Request, session_id: int, _: auth.RequireLogin):
-    return live.stop_live_session(request=request, session_id=session_id)

folkugat_web/api/tema/index.py

@@ -32,7 +32,7 @@ def contingut(request: Request, logged_in: auth.LoggedIn, tema_id: int):
 
 
 @router.delete("/api/tema/{tema_id}")
-def delete_tema(request: Request, _: auth.RequireLogin, tema_id: int):
+def delete_tema(_: auth.RequireLogin, tema_id: int):
     temes_w.delete_tema(tema_id=tema_id)
     return HTMLResponse(headers={
         'HX-Redirect': '/temes'
@@ -40,7 +40,7 @@ def delete_tema(request: Request, _: auth.RequireLogin, tema_id: int):
 
 
 @router.post("/api/tema")
-def create_tema(request: Request, _: auth.RequireLogin, title: Annotated[str, Form()] = ""):
+def create_tema(_: auth.RequireLogin, title: Annotated[str, Form()] = ""):
     new_tema = temes_w.create_tema(title=title)
     return HTMLResponse(headers={
         'HX-Redirect': f'/tema/{new_tema.id}'

folkugat_web/api/temes/index.py

@@ -36,5 +36,5 @@ def content(
 
 
 @router.get("/api/temes/busca")
-def busca(request: Request, query: str, logged_in: auth.LoggedIn):
-    return temes.temes_busca(request, query, logged_in)
+def busca(request: Request, query: str, logged_in: auth.LoggedIn, limit: int = 10, offset: int = 0):
+    return temes.temes_busca(request, query=query, limit=limit, offset=offset, logged_in=logged_in)