Redirect login to home, reorder cookbook menu, fix sticky header+filter in shopping list, update modal unit row and clean item view
This commit is contained in:
+4
-4
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user