From 20542e802966cd0812cf8beb8ff4403259e758fc Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Fri, 26 Nov 2021 15:57:06 +0800 Subject: [PATCH 001/121] chore(passport): optimize login display --- rootfs/api/templates/user/login.html | 4 ++++ rootfs/api/views.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/rootfs/api/templates/user/login.html b/rootfs/api/templates/user/login.html index f1f1aa8..121b7eb 100644 --- a/rootfs/api/templates/user/login.html +++ b/rootfs/api/templates/user/login.html @@ -26,8 +26,12 @@

Log in to your account

+ {% if registration_enabled %} Sign Up + {% endif %} + {% if password_reset_enabled %} Forgot your password? + {% endif %} diff --git a/rootfs/api/views.py b/rootfs/api/views.py index 0a63a08..7238fc3 100644 --- a/rootfs/api/views.py +++ b/rootfs/api/views.py @@ -136,6 +136,10 @@ class ActivateAccountFailView(TemplateView): class UserLoginView(views.LoginView): + extra_context = { + "registration_enabled": settings.REGISTRATION_ENABLED, + "password_reset_enabled": True if settings.EMAIL_HOST else False, + } template_name = 'user/login.html' From d08a41687b3c77594da17bbb3d2f72fd89c4cde8 Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Thu, 9 Dec 2021 11:37:41 +0800 Subject: [PATCH 002/121] chore(passport): change drycc logo --- rootfs/web/package.json | 3 ++- rootfs/web/src/assets/home.css | 2 +- rootfs/web/src/components/NavBar.vue | 4 ++-- rootfs/web/src/main.js | 2 ++ rootfs/web/yarn.lock | 5 +++++ 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/rootfs/web/package.json b/rootfs/web/package.json index 65085d3..3fe2acb 100644 --- a/rootfs/web/package.json +++ b/rootfs/web/package.json @@ -11,7 +11,8 @@ "axios": "^0.21.1", "vant": "^3.0.17", "vue-i18n": "^9.0.0-alpha.16", - "vue-router": "^4.0.0-rc.1" + "vue-router": "^4.0.0-rc.1", + "@icon-park/vue-next": "^1.3.5" }, "devDependencies": { "@vitejs/plugin-vue": "^1.3.0", diff --git a/rootfs/web/src/assets/home.css b/rootfs/web/src/assets/home.css index ed32021..70acefc 100644 --- a/rootfs/web/src/assets/home.css +++ b/rootfs/web/src/assets/home.css @@ -123,7 +123,6 @@ } .glostick__property .icon-logo { - background: url('data:image/svg+xml;utf8,drycc-logo'); background-size: 27px 30px; width: 27px; height: 30px; @@ -131,6 +130,7 @@ position: relative; opacity: 1; top: 10px; + left: 0px; margin-right: 7px; } diff --git a/rootfs/web/src/components/NavBar.vue b/rootfs/web/src/components/NavBar.vue index da2838a..ea1c288 100755 --- a/rootfs/web/src/components/NavBar.vue +++ b/rootfs/web/src/components/NavBar.vue @@ -3,8 +3,8 @@