From 8953f0d103a7b7f67fa033573eecdf09f74b189b Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 5 Jul 2023 14:36:50 -0400 Subject: [PATCH] cosmetic fix --- boofilsic/settings.py | 2 +- common/static/img/avatar.svg | 4 ++-- journal/views.py | 7 +------ users/templates/users/home_anonymous.html | 3 ++- users/templates/users/verify_email.html | 4 ++-- users/urls.py | 2 +- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/boofilsic/settings.py b/boofilsic/settings.py index 71429381..48c1f9f1 100644 --- a/boofilsic/settings.py +++ b/boofilsic/settings.py @@ -298,7 +298,7 @@ STAR_EMPTY = ":star_empty:" DEFAULT_PASSWORD = "ab7nsm8didusbaqPgq" # Default redirect loaction when access login required view -LOGIN_URL = "/users/login/" +LOGIN_URL = "/account/login" # Admin site root url ADMIN_URL = "tertqX7256n7ej8nbv5cwvsegdse6w7ne5rHd" diff --git a/common/static/img/avatar.svg b/common/static/img/avatar.svg index 1b9bc733..6b672107 100644 --- a/common/static/img/avatar.svg +++ b/common/static/img/avatar.svg @@ -1,3 +1,3 @@ - - + + diff --git a/journal/views.py b/journal/views.py index a08043cd..c7853316 100644 --- a/journal/views.py +++ b/journal/views.py @@ -837,18 +837,13 @@ def user_liked_collection_list(request, user_name): def profile_anonymous(request, id): - login_url = settings.LOGIN_URL + "?next=" + request.get_full_path() try: username = id.split("@")[0] site = id.split("@")[1] return render( request, "users/home_anonymous.html", - { - "login_url": login_url, - "username": username, - "site": site, - }, + {"username": username, "site": site}, ) except Exception: return redirect(login_url) diff --git a/users/templates/users/home_anonymous.html b/users/templates/users/home_anonymous.html index bc34c789..301811e2 100644 --- a/users/templates/users/home_anonymous.html +++ b/users/templates/users/home_anonymous.html @@ -4,7 +4,8 @@ - + {{ site_name }} - {{ username }}@{{ site }} 验证电子邮件 {% if success %}

- {{ request.user.email }} 验证成功，点击这里返回首页。 + {{ user.email }} 验证成功，点击这里返回首页。

{% else %}

{{ error }} - 链接无效或已过期，点击这里重新登录。 + 点击这里重新登录。

{% endif %} diff --git a/users/urls.py b/users/urls.py index b7a11a96..1aa70900 100644 --- a/users/urls.py +++ b/users/urls.py @@ -3,7 +3,7 @@ from .views import * app_name = "users" urlpatterns = [ - path("login/", login, name="login"), + path("login", login, name="login"), path("login/oauth", OAuth2_login, name="login_oauth"), path("login/email", verify_email, name="login_email"), path("verify_email", verify_email, name="verify_email"),