diff --git a/app/main.py b/app/main.py index be594c3..b879e00 100755 --- a/app/main.py +++ b/app/main.py @@ -248,10 +248,10 @@ def get_service_worker(): # ========================================== @app.get("/login", response_class=HTMLResponse) -async def login_get(request: Request, next: str = "/cookbook"): +async def login_get(request: Request, next: str = "/"): token = request.cookies.get(COOKIE_NAME) if verify_auth_token(token): - return RedirectResponse(url=next or "/cookbook", status_code=303) + return RedirectResponse(url=next or "/", status_code=303) return templates.TemplateResponse( request=request, name="login.html", @@ -264,7 +264,7 @@ async def login_post( username: str = Form("admin"), password: str = Form(...), remember: Optional[str] = Form(None), - next: str = Form("/cookbook") + next: str = Form("/") ): valid_user = (username.strip().lower() == APP_USERNAME.lower()) or (username.strip() == "admin") valid_pass = (password == APP_PASSWORD) @@ -272,7 +272,7 @@ async def login_post( if valid_user and valid_pass: days = 30 if remember else 1 token = create_auth_token(username.strip(), days=days) - target = next if next and not next.startswith("/login") else "/cookbook" + target = next if next and not next.startswith("/login") else "/" resp = RedirectResponse(url=target, status_code=303) max_age = days * 86400 resp.set_cookie( diff --git a/app/templates/cookbook.html b/app/templates/cookbook.html index b92b800..df6415f 100755 --- a/app/templates/cookbook.html +++ b/app/templates/cookbook.html @@ -494,12 +494,6 @@
- - 🏠 Menü - - - 🛒 Einkaufsliste - @@ -512,6 +506,12 @@ + + 🏠 Startseite + + + 🛒 Einkaufsliste + 🚪 Abmelden @@ -523,12 +523,6 @@ ⋮
- - 🏠 Menü-Übersicht - - - 🛒 Einkaufsliste - @@ -542,6 +536,13 @@ 🖨️ Drucken & PDF
+ + 🏠 Startseite + + + 🛒 Einkaufsliste + +
🚪 Abmelden diff --git a/app/templates/login.html b/app/templates/login.html index d04015b..f994176 100644 --- a/app/templates/login.html +++ b/app/templates/login.html @@ -159,7 +159,7 @@ {% endif %}