diff --git a/folkugat_web/api/routes/__init__.py b/folkugat_web/api/routes/__init__.py index aa69368..e3b64eb 100644 --- a/folkugat_web/api/routes/__init__.py +++ b/folkugat_web/api/routes/__init__.py @@ -1,12 +1,12 @@ from folkugat_web.api.router import get_router -from . import auth, index, playlist, sessio, sessions, tema, temes +from . import auth, index, llista, sessio, sessions, tema, temes router = get_router() router.include_router(auth.router) router.include_router(index.router) -router.include_router(playlist.router) +router.include_router(llista.router) router.include_router(sessio.router) router.include_router(sessions.router) router.include_router(tema.router) diff --git a/folkugat_web/api/routes/playlist/__init__.py b/folkugat_web/api/routes/llista/__init__.py similarity index 100% rename from folkugat_web/api/routes/playlist/__init__.py rename to folkugat_web/api/routes/llista/__init__.py diff --git a/folkugat_web/api/routes/playlist/playlist.py b/folkugat_web/api/routes/llista/playlist.py similarity index 82% rename from folkugat_web/api/routes/playlist/playlist.py rename to folkugat_web/api/routes/llista/playlist.py index 4b37f12..347bb98 100644 --- a/folkugat_web/api/routes/playlist/playlist.py +++ b/folkugat_web/api/routes/llista/playlist.py @@ -11,7 +11,7 @@ from folkugat_web.templates import templates router = get_router() -@router.get("/playlist/{playlist_id}") +@router.get("/llista/{playlist_id}") def page( request: Request, logged_in: auth.LoggedIn, @@ -27,13 +27,13 @@ def page( "page_title": "Folkugat - Setlist", "page_description": playlist.name or "Llista de temes", "page_card": None, - "content": f"/api/content/playlist/{playlist_id}", + "content": f"/api/content/llista/{playlist_id}", "logged_in": logged_in, } ) -@router.get("/api/content/playlist/{playlist_id}") +@router.get("/api/content/llista/{playlist_id}") def contingut( request: Request, logged_in: auth.LoggedIn, @@ -42,7 +42,7 @@ def contingut( return playlist.pagina(request, playlist_id, logged_in) -@router.get("/api/playlist/{playlist_id}/name") +@router.get("/api/llista/{playlist_id}/name") def get_name( request: Request, logged_in: auth.LoggedIn, @@ -51,7 +51,7 @@ def get_name( return playlist.name(request=request, playlist_id=playlist_id, logged_in=logged_in) -@router.get("/api/playlist/{playlist_id}/editor/name") +@router.get("/api/llista/{playlist_id}/editor/name") def name_editor( request: Request, logged_in: auth.RequireLogin, @@ -60,7 +60,7 @@ def name_editor( return playlist.name_editor(request=request, playlist_id=playlist_id, logged_in=logged_in) -@router.put("/api/playlist/{playlist_id}/name") +@router.put("/api/llista/{playlist_id}/name") def set_name( request: Request, logged_in: auth.RequireLogin, @@ -71,7 +71,7 @@ def set_name( return playlist.name(request=request, playlist_id=playlist_id, logged_in=logged_in) -@router.post("/api/playlist/{playlist_id}/set") +@router.post("/api/llista/{playlist_id}/set") def add_set( request: Request, logged_in: auth.RequireLogin, @@ -84,7 +84,7 @@ def add_set( ) -@router.get("/api/playlist/{playlist_id}/set/{set_id}") +@router.get("/api/llista/{playlist_id}/set/{set_id}") def get_set( request: Request, logged_in: auth.LoggedIn, @@ -99,7 +99,7 @@ def get_set( ) -@router.delete("/api/playlist/{playlist_id}/set/{set_id}") +@router.delete("/api/llista/{playlist_id}/set/{set_id}") def delete_set( _: auth.RequireLogin, playlist_id: int, @@ -111,7 +111,7 @@ def delete_set( ) -@router.post("/api/playlist/{playlist_id}/set/{set_id}") +@router.post("/api/llista/{playlist_id}/set/{set_id}") def add_tema( request: Request, logged_in: auth.RequireLogin, @@ -126,7 +126,7 @@ def add_tema( ) -@router.get("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}") +@router.get("/api/llista/{playlist_id}/set/{set_id}/tema/{entry_id}") def get_tema( request: Request, logged_in: auth.RequireLogin, @@ -143,7 +143,7 @@ def get_tema( ) -@router.get("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}/editor") +@router.get("/api/llista/{playlist_id}/set/{set_id}/tema/{entry_id}/editor") def get_tema_editor( request: Request, logged_in: auth.RequireLogin, @@ -160,7 +160,7 @@ def get_tema_editor( ) -@router.delete("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}") +@router.delete("/api/llista/{playlist_id}/set/{set_id}/tema/{entry_id}") def delete_tema( _: auth.RequireLogin, playlist_id: int, @@ -174,7 +174,7 @@ def delete_tema( ) -@router.get("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}/busca") +@router.get("/api/llista/{playlist_id}/set/{set_id}/tema/{entry_id}/busca") def busca_tema( request: Request, _: auth.RequireLogin, @@ -192,7 +192,7 @@ def busca_tema( ) -@router.put("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}") +@router.put("/api/llista/{playlist_id}/set/{set_id}/tema/{entry_id}") def set_tema( request: Request, logged_in: auth.RequireLogin, @@ -211,7 +211,7 @@ def set_tema( ) -@router.put("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}/unknown") +@router.put("/api/llista/{playlist_id}/set/{set_id}/tema/{entry_id}/unknown") def set_tema_unknown( request: Request, logged_in: auth.RequireLogin, @@ -229,7 +229,7 @@ def set_tema_unknown( ) -@router.post("/api/playlist/{playlist_id}/set/{set_id}/tema/{entry_id}") +@router.post("/api/llista/{playlist_id}/set/{set_id}/tema/{entry_id}") def set_tema_new( request: Request, logged_in: auth.RequireLogin, diff --git a/folkugat_web/api/routes/playlist/set_page.py b/folkugat_web/api/routes/llista/set_page.py similarity index 88% rename from folkugat_web/api/routes/playlist/set_page.py rename to folkugat_web/api/routes/llista/set_page.py index bb0f8dd..382a842 100644 --- a/folkugat_web/api/routes/playlist/set_page.py +++ b/folkugat_web/api/routes/llista/set_page.py @@ -17,7 +17,7 @@ def set_description(set_: playlists.Set) -> str: ])) -@router.get("/playlist/{playlist_id}/set/{set_id}") +@router.get("/llista/{playlist_id}/set/{set_id}") def page( request: Request, logged_in: auth.LoggedIn, @@ -34,13 +34,13 @@ def page( "request": request, "page_title": "Folkugat - Set", "page_description": set_description(set_=set_), - "content": f"/api/content/playlist/{playlist_id}/set/{set_id}", + "content": f"/api/content/llista/{playlist_id}/set/{set_id}", "logged_in": logged_in, } ) -@router.get("/api/content/playlist/{playlist_id}/set/{set_id}") +@router.get("/api/content/llista/{playlist_id}/set/{set_id}") async def contingut( request: Request, logged_in: auth.LoggedIn, diff --git a/folkugat_web/assets/templates/fragments/playlist/editor/name.html b/folkugat_web/assets/templates/fragments/playlist/editor/name.html index c1562fd..382edcf 100644 --- a/folkugat_web/assets/templates/fragments/playlist/editor/name.html +++ b/folkugat_web/assets/templates/fragments/playlist/editor/name.html @@ -1,5 +1,5 @@
+ id="llista-name">
diff --git a/folkugat_web/assets/templates/fragments/playlist/name.html b/folkugat_web/assets/templates/fragments/playlist/name.html index d261c16..2c5bec7 100644 --- a/folkugat_web/assets/templates/fragments/playlist/name.html +++ b/folkugat_web/assets/templates/fragments/playlist/name.html @@ -1,5 +1,5 @@
+ id="llista-name">

{% if playlist.name %} {{ playlist.name }} @@ -10,8 +10,8 @@ {% if logged_in %} diff --git a/folkugat_web/assets/templates/fragments/playlist/pagina.html b/folkugat_web/assets/templates/fragments/playlist/pagina.html index e21f67e..f790b41 100644 --- a/folkugat_web/assets/templates/fragments/playlist/pagina.html +++ b/folkugat_web/assets/templates/fragments/playlist/pagina.html @@ -1,7 +1,7 @@ {% include "fragments/menu.html" %}
-
+
{% include "fragments/playlist/name.html" %}
diff --git a/folkugat_web/assets/templates/fragments/playlist/playlist.html b/folkugat_web/assets/templates/fragments/playlist/playlist.html index 3efba36..5726677 100644 --- a/folkugat_web/assets/templates/fragments/playlist/playlist.html +++ b/folkugat_web/assets/templates/fragments/playlist/playlist.html @@ -1,4 +1,4 @@ -
    +
      {% for set_entry in playlist.sets %} {% set set_id = set_entry.id %} {% include "fragments/playlist/set_entry.html" %} @@ -7,8 +7,8 @@ {% if logged_in %}
      - {% endif %} -
        - {% for tema_entry in set_entry.temes %} - {% if new_entry %} - {% include "fragments/playlist/tema_editor.html" %} - {% else %} - {% include "fragments/playlist/tema_entry.html" %} - {% endif %} - {% endfor %} -
      - {% if logged_in %} - + {% endif %} +
        + {% for tema_entry in set_entry.temes %} + {% if new_entry %} + {% include "fragments/playlist/tema_editor.html" %} + {% else %} + {% include "fragments/playlist/tema_entry.html" %} + {% endif %} + {% endfor %} +
      + {% if logged_in %} +