From 953821b381c891b62423c8f9ca1d8e9d92029ac1 Mon Sep 17 00:00:00 2001 From: cellarspoon Date: Thu, 13 Jan 2022 09:06:46 +0100 Subject: [PATCH] invites page, menu, links, hackity hack --- members_lumbung_space/routes/invite.py | 10 ++-- members_lumbung_space/routes/root.py | 16 ++++++ members_lumbung_space/static/css/lumbung.css | 6 +-- members_lumbung_space/templates/admin.html | 56 +++----------------- members_lumbung_space/templates/base.html | 16 ++++++ members_lumbung_space/templates/invites.html | 50 +++++++++++++++++ 6 files changed, 92 insertions(+), 62 deletions(-) create mode 100644 members_lumbung_space/templates/invites.html diff --git a/members_lumbung_space/routes/invite.py b/members_lumbung_space/routes/invite.py index b03e53c..3ce4659 100644 --- a/members_lumbung_space/routes/invite.py +++ b/members_lumbung_space/routes/invite.py @@ -6,11 +6,7 @@ from uuid import uuid4 from fastapi import APIRouter, Depends, Request from fastapi.responses import RedirectResponse -from members_lumbung_space.dependencies import ( - get_invites, - get_user, - logged_in, -) +from members_lumbung_space.dependencies import get_invites, get_user, logged_in router = APIRouter() @@ -32,7 +28,7 @@ async def invite_keycloak_create( await request.app.state.redis.set(username, invites) - return RedirectResponse(request.url_for("home")) + return RedirectResponse(request.url_for("invites")) @router.get("/invite/keycloak/delete", dependencies=[Depends(logged_in)]) @@ -50,4 +46,4 @@ async def invite_keycloak_delete( await request.app.state.redis.set(user["preferred_username"], purged) - return RedirectResponse(request.url_for("home")) + return RedirectResponse(request.url_for("invites")) diff --git a/members_lumbung_space/routes/root.py b/members_lumbung_space/routes/root.py index 16564f1..f3daa7f 100644 --- a/members_lumbung_space/routes/root.py +++ b/members_lumbung_space/routes/root.py @@ -29,3 +29,19 @@ async def home( return request.app.state.templates.TemplateResponse( "admin.html", context=context ) + +@router.get("/invites", dependencies=[Depends(logged_in)]) +async def invites( + request: Request, + user=Depends(get_user), + invites=Depends(get_invites), +): + context = { + "request": request, + "user": user, + "invites": invites, + } + + return request.app.state.templates.TemplateResponse( + "invites.html", context=context + ) diff --git a/members_lumbung_space/static/css/lumbung.css b/members_lumbung_space/static/css/lumbung.css index d06eb1b..fa5ce12 100644 --- a/members_lumbung_space/static/css/lumbung.css +++ b/members_lumbung_space/static/css/lumbung.css @@ -40,10 +40,6 @@ th, td { padding: 15px; } -table, th, td { - border: 1px solid black; -} - input { border: 2px solid currentcolor; } @@ -142,4 +138,4 @@ footer .content span { .container { padding-bottom: 2rem !important; -} \ No newline at end of file +} diff --git a/members_lumbung_space/templates/admin.html b/members_lumbung_space/templates/admin.html index e912dc3..404999e 100644 --- a/members_lumbung_space/templates/admin.html +++ b/members_lumbung_space/templates/admin.html @@ -10,7 +10,10 @@ @@ -18,63 +21,16 @@ -

- Hello, {{ user.preferred_username }} 👋 -

-

Services

- {% set site_list = ("tv","social","shouts","sounds","cloud","kios","pen","gallery","pixel","books") %} + {% set site_list = ("tv","social","cloud","pen", "books") %}
{% for i in site_list %}
lumbung.{{i}} -

lumbung.{{i}}

+

{{i}}.lumbung.space
{% endfor %}
-
-

Invites

- {% if user.preferred_username in invites and invites[user.preferred_username]|length > 0 %} - - - - - - - {% for invite in invites[user.preferred_username] %} - - - - - - {% endfor %} -
LinkValidityActions
- - {{ url_for('register_invite', invite=invite.link) }} - - {{ invite.validity }}
- {% endif %} - -

- -

-
- {% endblock %} diff --git a/members_lumbung_space/templates/base.html b/members_lumbung_space/templates/base.html index 7bfd849..09f29da 100644 --- a/members_lumbung_space/templates/base.html +++ b/members_lumbung_space/templates/base.html @@ -16,5 +16,21 @@
{% block content %}{% endblock %}
+ diff --git a/members_lumbung_space/templates/invites.html b/members_lumbung_space/templates/invites.html new file mode 100644 index 0000000..2c12222 --- /dev/null +++ b/members_lumbung_space/templates/invites.html @@ -0,0 +1,50 @@ +{% extends "base.html" %} +{% block content %} +
+ + +
+ {% if user.preferred_username in invites and invites[user.preferred_username]|length > 0 %} + + + + + + + {% for invite in invites[user.preferred_username] %} + + + + + + {% endfor %} +
LinkValidityActions
+ + {{ url_for('register_invite', invite=invite.link) }} + + {{ invite.validity }}
+ {% endif %} + +

+ +

+
+{% endblock %}