From f606dd8920b6247111281c08d99008608b30fea6 Mon Sep 17 00:00:00 2001
From: wangruidong <940853815@qq.com>
Date: Fri, 2 Feb 2024 16:52:57 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D=E5=8C=BA=E5=8F=B7=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/const/choices.py                  | 14 +++++
 apps/settings/api/public.py                   |  4 +-
 apps/settings/serializers/public.py           |  1 +
 .../templates/users/forgot_password.html      | 60 ++++++++++++++++---
 apps/users/views/profile/reset.py             |  3 +-
 5 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/apps/common/const/choices.py b/apps/common/const/choices.py
index 6db9254b3..ee8519c34 100644
--- a/apps/common/const/choices.py
+++ b/apps/common/const/choices.py
@@ -19,3 +19,17 @@ class Status(models.TextChoices):
     failed = 'failed', _("Failed")
     error = 'error', _("Error")
     canceled = 'canceled', _("Canceled")
+
+
+COUNTRY_CALLING_CODES = [
+    {'name': 'China(中国)', 'value': '+86'},
+    {'name': 'HongKong(中国香港)', 'value': '+852'},
+    {'name': 'Macao(中国澳门)', 'value': '+853'},
+    {'name': 'Taiwan(中国台湾)', 'value': '+886'},
+    {'name': 'America(America)', 'value': '+1'}, {'name': 'Russia(Россия)', 'value': '+7'},
+    {'name': 'France(français)', 'value': '+33'},
+    {'name': 'Britain(Britain)', 'value': '+44'},
+    {'name': 'Germany(Deutschland)', 'value': '+49'},
+    {'name': 'Japan(日本)', 'value': '+81'}, {'name': 'Korea(한국)', 'value': '+82'},
+    {'name': 'India(भारत)', 'value': '+91'}
+]
diff --git a/apps/settings/api/public.py b/apps/settings/api/public.py
index 81abfeb99..9808ea1c6 100644
--- a/apps/settings/api/public.py
+++ b/apps/settings/api/public.py
@@ -3,6 +3,7 @@ from rest_framework import generics
 from rest_framework.permissions import AllowAny
 
 from authentication.permissions import IsValidUserOrConnectionToken
+from common.const.choices import COUNTRY_CALLING_CODES
 from common.utils import get_logger, lazyproperty
 from common.utils.timezone import local_now
 from .. import serializers
@@ -24,7 +25,8 @@ class OpenPublicSettingApi(generics.RetrieveAPIView):
     def get_object(self):
         return {
             "XPACK_ENABLED": settings.XPACK_ENABLED,
-            "INTERFACE": self.interface_setting
+            "INTERFACE": self.interface_setting,
+            "COUNTRY_CALLING_CODES": COUNTRY_CALLING_CODES
         }
 
 
diff --git a/apps/settings/serializers/public.py b/apps/settings/serializers/public.py
index 6e5a74c8e..278764c65 100644
--- a/apps/settings/serializers/public.py
+++ b/apps/settings/serializers/public.py
@@ -11,6 +11,7 @@ __all__ = [
 class PublicSettingSerializer(serializers.Serializer):
     XPACK_ENABLED = serializers.BooleanField()
     INTERFACE = serializers.DictField()
+    COUNTRY_CALLING_CODES = serializers.ListField()
 
 
 class PrivateSettingSerializer(PublicSettingSerializer):
diff --git a/apps/users/templates/users/forgot_password.html b/apps/users/templates/users/forgot_password.html
index 64137ea8a..cdb32dca2 100644
--- a/apps/users/templates/users/forgot_password.html
+++ b/apps/users/templates/users/forgot_password.html
@@ -7,6 +7,7 @@
         .margin-bottom {
             margin-bottom: 15px;
         }
+
         .input-style {
             width: 100%;
             display: inline-block;
@@ -22,6 +23,19 @@
             height: 100%;
             vertical-align: top;
         }
+
+        .scrollable-menu {
+            height: auto;
+            max-height: 18rem;
+            overflow-x: hidden;
+        }
+
+        .input-group {
+            .input-group-btn .btn-secondary {
+                color: #464a4c;
+                background-color: #eceeef;
+            }
+        }
     </style>
 {% endblock %}
 {% block html_title %}{% trans 'Forgot password' %}{% endblock %}
@@ -57,9 +71,26 @@
                            placeholder="{% trans 'Email account' %}" value="{{ email }}">
                 </div>
                 <div id="validate-sms" class="validate-field margin-bottom">
-                    <input type="tel" id="sms" name="sms" class="form-control input-style"
-                           placeholder="{% trans 'Mobile number' %}" value="{{ sms }}">
-                    <small style="color: #999; margin-left: 5px">{{ form.sms.help_text }}</small>
+                    <div class="input-group">
+                        <div class="input-group-btn">
+                            <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown"
+                                    aria-haspopup="true" aria-expanded="false">
+                                <span class="country-code-value">+86</span>
+                            </button>
+                            <ul class="dropdown-menu scrollable-menu">
+                                {% for country in countries %}
+                                    <li>
+                                        <a href="#" class="dropdown-item d-flex justify-content-between">
+                                            <span class="country-name text-left">{{ country.name }}</span>
+                                            <span class="country-code">{{ country.value }}</span>
+                                        </a>
+                                    </li>
+                                {% endfor %}
+                            </ul>
+                        </div>
+                        <input type="tel" id="sms" name="sms" class="form-control input-style"
+                               placeholder="{% trans 'Mobile number' %}" value="{{ sms }}">
+                    </div>
                 </div>
                 <div class="margin-bottom challenge-required">
                     <input type="text" id="code" name="code" class="form-control input-style"
@@ -76,7 +107,7 @@
         </div>
     </div>
     <script>
-        $(function (){
+        $(function () {
             const validateSelectRef = $('#validate-backend-select')
             const formType = $('input[name="form_type"]').val()
             validateSelectRef.val(formType)
@@ -84,19 +115,31 @@
                 selectChange(formType);
             }
         })
+
+        $(".dropdown-menu li a").click(function (evt) {
+            const inputGroup = $('.input-group');
+            const inputGroupAddon = inputGroup.find('.country-code-value');
+            const selectedCountry = $(evt.target).closest('li');
+            const selectedCountryCode = selectedCountry.find('.country-code').html();
+            inputGroupAddon.html(selectedCountryCode)
+        });
+
+
         function getQueryString(name) {
-            const reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
+            const reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
             const r = window.location.search.substr(1).match(reg);
-            if(r !== null)
+            if (r !== null)
                 return unescape(r[2])
             return null
         }
+
         function selectChange(name) {
             $('.validate-field').hide()
             $('#validate-' + name).show()
             $('#validate-' + name + '-tip').show()
             $('input[name="form_type"]').attr('value', name)
         }
+
         function sendChallengeCode(currentBtn) {
             let time = 60;
             const token = getQueryString('token')
@@ -104,7 +147,7 @@
 
             const formType = $('input[name="form_type"]').val()
             const email = $('#email').val()
-            const sms = $('#sms').val()
+            let sms = $('#sms').val();
             const errMsg = "{% trans 'The {} cannot be empty' %}"
 
             if (formType === 'sms') {
@@ -118,10 +161,11 @@
                     return
                 }
             }
-
+            sms = $(".input-group .country-code-value").html() + sms
             const data = {
                 form_type: formType, email: email, sms: sms,
             }
+
             function onSuccess() {
                 const originBtnText = currentBtn.innerHTML;
                 currentBtn.disabled = true
diff --git a/apps/users/views/profile/reset.py b/apps/users/views/profile/reset.py
index b2eed3cdd..554a2ca88 100644
--- a/apps/users/views/profile/reset.py
+++ b/apps/users/views/profile/reset.py
@@ -13,6 +13,7 @@ from django.views.generic import FormView, RedirectView
 
 from authentication.errors import IntervalTooShort
 from authentication.utils import check_user_property_is_correct
+from common.const.choices import COUNTRY_CALLING_CODES
 from common.utils import FlashMessageUtil, get_object_or_none, random_string
 from common.utils.verify_code import SendAndVerifyCodeUtil
 from users.notifications import ResetPasswordSuccessMsg
@@ -108,7 +109,7 @@ class UserForgotPasswordView(FormView):
         for k, v in cleaned_data.items():
             if v:
                 context[k] = v
-
+        context['countries'] = COUNTRY_CALLING_CODES
         context['form_type'] = 'email'
         context['XPACK_ENABLED'] = settings.XPACK_ENABLED
         validate_backends = self.get_validate_backends_context(has_phone)