chore(passport): add footer

duanhongyi · duanhongyi · commit fa288b8317a4 · 2022-03-23T17:11:17.000+08:00
diff --git a/rootfs/api/settings/production.py b/rootfs/api/settings/production.py
@@ -384,3 +384,6 @@
 EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD', '')
 EMAIL_USE_TLS = bool(strtobool(os.environ.get('EMAIL_USE_TLS', 'false')))
 EMAIL_USE_SSL = bool(strtobool(os.environ.get('EMAIL_USE_SSL', 'false')))
+
+GOOGLE_RE_CAPTCHA_KEY = os.environ.get("GOOGLE_RE_CAPTCHA_KEY")
+GOOGLE_RE_CAPTCHA_SECRET = os.environ.get("GOOGLE_RE_CAPTCHA_SECRET")
diff --git a/rootfs/api/static/css/main.css b/rootfs/api/static/css/main.css
@@ -7,6 +7,10 @@ body {
     margin: 0;
 }
 
+.privacy {
+    text-align: justify!important;
+}
+
 .page-wrap {
     min-height: 100%;
     display: flex;
@@ -256,4 +260,47 @@ form li {
 .white-link {
     margin-left: 25px;
     color: #fff
+}
+
+.logo-sfdc {
+    display: block;
+    margin: 0 auto;
+    width: 100%;
+    max-width: 430px;
+    padding: 26.6666666667px 0;
+    text-align: center;
+    background: -webkit-linear-gradient(-360deg,rgba(255,255,255,0) 0,rgba(255,255,255,0.2) 50%,rgba(255,255,255,0) 100%);
+    background: linear-gradient(90deg,rgba(255,255,255,0) 0,rgba(255,255,255,0.2) 50%,rgba(255,255,255,0) 100%);
+    background-size: 100% 1px;
+    background-repeat: no-repeat;
+}
+
+.logo-sfdc a {
+    display: block;
+    color: #dcdae9;
+    text-decoration: none;
+    text-transform: uppercase;
+    letter-spacing: .05em;
+    font-size: 10px;
+    font-weight: bold;
+}
+
+.legal {
+    list-style: none;
+    margin-top: 40px;
+    padding: 0;
+    text-align: center;
+}
+
+.legal li, .legal a {
+    font-size: 12px;
+    font-weight: bold;
+    text-transform: none;
+    letter-spacing: 0;
+    color: #dcdae9;
+}
+
+.legal li {
+    display: inline-block;
+    margin: 5px;
 }
diff --git a/rootfs/api/templates/user/footer.html b/rootfs/api/templates/user/footer.html
@@ -0,0 +1,8 @@
+<footer class="logo-sfdc">
+    <ul class="legal">
+        <li><a href="https://legal.doopai.com" rel="nofollow">Legal Documents</a></li>
+        <li><a href="https://legal.doopai.com/#/cloud-services-terms" rel="nofollow">Terms of Service</a></li>
+        <li><a href="https://legal.doopai.com/#/doopai-privacy-policy" rel="nofollow">Privacy</a></li>
+        <li><a href="https://legal.doopai.com/#/doopai-cookie-policy" rel="nofollow">Cookies</a></li>
+        <li>© 2022 drycc.com</li></ul>
+</footer>
diff --git a/rootfs/api/templates/user/login.html b/rootfs/api/templates/user/login.html
@@ -36,4 +36,5 @@ <h2 class="h3">Log in to your account</h2>
         <a href="/user/password_reset/" class="white-link">Forgot your password?</a>
         {% endif %}
     </div>
+    {% include "user/footer.html" %}
 </div>
diff --git a/rootfs/api/templates/user/message.html b/rootfs/api/templates/user/message.html
@@ -15,4 +15,5 @@ <h2 class="h3">{% block title %}{% endblock %}</h2>
             <div class="inverted-wrapper"></div>
         </div>
     </div>
+    {% include "user/footer.html" %}
 </div>
diff --git a/rootfs/api/templates/user/password_reset_confirm.html b/rootfs/api/templates/user/password_reset_confirm.html
@@ -1,14 +1,10 @@
 {% load static %}
-
+{% if validlink %}
 <link rel="stylesheet" href="{% static 'css/main.css' %}" type="text/css">
 <head>
     <meta charset="UTF-8">
     <title>Reset Password</title>
 </head>
-
-{% if validlink %}
-
-
 <div class="page-wrap gradient-primary">
     <div class="container">
         <div class="panel">
@@ -32,10 +28,8 @@ <h2 class="h3">{{ title }}</h2>
             </form>
         </div>
     </div>
+    {% include "user/footer.html" %}
 </div>
-
 {% else %}
-
-<p>The password reset link was invalid, possibly because it has already been used.  Please request a new password reset.</p>
-
+    {% include 'user/password_reset_fail.html' %}
 {% endif %}
diff --git a/rootfs/api/templates/user/password_reset_fail.html b/rootfs/api/templates/user/password_reset_fail.html
@@ -0,0 +1,5 @@
+{% extends 'user/message.html' %}
+{% block title %}The password reset link was invalid{% endblock %}
+{% block message %}
+Possibly because it has already been used. Please request a new password reset.
+{% endblock %}
diff --git a/rootfs/api/templates/user/password_reset_form.html b/rootfs/api/templates/user/password_reset_form.html
@@ -21,5 +21,6 @@ <h2 class="h3">{{ title }}</h2>
             </form>
         </div>
     </div>
+    {% include "user/footer.html" %}
 </div>
 
diff --git a/rootfs/api/templates/user/registration.html b/rootfs/api/templates/user/registration.html
@@ -15,7 +15,7 @@ <h2 class="h3">Registration</h2>
                 {% csrf_token %}
                 <div class="form-group">
                     <label for="username">{{ form.username.label_tag }}</label>
-                    <input autofocus="off" class="form-control" id="username" name="username" :placeholder="Username" type="text" >
+                    <input autofocus="off" class="form-control" id="username" name="username" :placeholder="Username" type="text" required>
                     <div class="error">{{ form.username.errors }}</div>
                 </div>
                 <div class="form-group">
@@ -24,28 +24,38 @@ <h2 class="h3">Registration</h2>
                         class="form-control"
                         id="password1"
                         name="password1"
-                        placeholder="{% if form.password1.help_text %}{{ form.password1.help_text|safe }}{% endif %}"
-                        type="password">
+                        placeholder="Password"
+                        type="password" required>
                     <div class="error">{{ form.password1.errors }}</div>
                 </div>
 
                 <div class="form-group">
                     <label for="password2">{{ form.password2.label_tag }}</label>
                     <input autofocus="off"
                         class="form-control" id="password2" name="password2"
-                        placeholder="{% if form.password2.help_text %}{{ form.password2.help_text|safe }}{% endif %}"
-                        type="password">
+                        placeholder="Confirm password"
+                        type="password" required>
                     <div class="error">{{ form.password2.errors }}</div>
                 </div>
 
                 <div class="form-group">
                     <label for="email">{{ form.email.label_tag }}</label>
                     <input autofocus="off" class="form-control" id="email" name="email"
-                           :placeholder="Email" type="email">
+                           :placeholder="Email" type="email" required>
                     <div class="error">{{ form.email.errors }}</div>
                 </div>
+                {% if google_re_captcha_key %}
+                <div class="form-group">
+                    <script src="https://www.recaptcha.net/recaptcha/api.js" async defer></script>
+                    <div class="g-recaptcha" data-sitekey="6LfNBv8eAAAAAHCmD0cXDDB_a3vjxxVx_iNK3iyp"></div>
+                </div>
+                {% endif %}
                 <button class="btn btn-primary btn-lg btn-block" id="submit" type="submit">Submit</button>
-
+                <div class="form-group">
+                    <p class="privacy">
+                        Signing up signifies that you have read and agree to the <a target="_blank" href="https://legal.doopai.com/#/cloud-services-terms">Terms of Service</a> and our <a target="_blank" href="https://legal.doopai.com/#/doopai-privacy-policy/">Privacy Policy</a>.
+                    </p>
+                </div>
             </form>
         </div>
     </div>
diff --git a/rootfs/api/urls.py b/rootfs/api/urls.py
@@ -28,7 +28,7 @@
     re_path(r'password_reset/done/?$',
             views.UserPasswordResetDoneView.as_view(),
             name='user_password_reset_done'),
-    re_path(r'reset/<uidb64>/<token>/?$',
+    re_path(r'reset/(?P<uidb64>.+)/(?P<token>.+)/?$',
             views.UserPasswordResetConfirmView.as_view(),
             name='user_password_reset_confirm'),
     re_path(r'reset/done/?$',
diff --git a/rootfs/api/views.py b/rootfs/api/views.py
@@ -73,7 +73,7 @@ class RegistrationView(CreateView):
     def get(self, request, *args, **kwargs):
         if settings.LDAP_ENDPOINT or not settings.REGISTRATION_ENABLED:
             return render(request, template_name='user/registration_disable.html')
-        return CreateView.get(self, request, *args, **kwargs)
+        return super().get(self, request, *args, **kwargs)
 
     def post(self, request, *args, **kwargs):
         if settings.LDAP_ENDPOINT or not settings.REGISTRATION_ENABLED:
@@ -91,6 +91,11 @@ def post(self, request, *args, **kwargs):
         else:
             return self.form_invalid(form)
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["google_re_captcha_key"] = settings.GOOGLE_RE_CAPTCHA_KEY
+        return context
+
 
 class RegistrationDoneView(TemplateView):
     template_name = 'user/registration_done.html'
@@ -99,7 +104,7 @@ class RegistrationDoneView(TemplateView):
 
 class ActivateAccount(View):
 
-    def get(self, request, uidb64, token, *args, **kwargs):
+    def get(self, request, uid, token, *args, **kwargs):
         try:
             uid = force_text(urlsafe_base64_decode(uidb64))
             user = User.objects.get(pk=uid)

-Original file line number
+Diff line change
             </form>
         </div>
     </div>
 +    {% include "user/footer.html" %}
 </div>