diff --git a/OneCprogsite/settings.py b/OneCprogsite/settings.py index 9a054fe..9f4edca 100644 --- a/OneCprogsite/settings.py +++ b/OneCprogsite/settings.py @@ -93,6 +93,7 @@ INSTALLED_APPS = [ 'taggit', 'django_ckeditor_5', 'captcha', + 'turnstile', ] MIDDLEWARE = [ @@ -285,4 +286,5 @@ CAPTCHA_LENGTH = 6 CAPTCHA_FONT_SIZE = 30 CAPTCHA_IMAGE_SIZE = (150, 50) - +TURNSTILE_SITEKEY = '0x4AAAAAAC12NGPpc4TutFWA' +TURNSTILE_SECRET = '0x4AAAAAAC12NCpzKHKE09JaXRDv0smrSAU' diff --git a/programmer/forms.py b/programmer/forms.py index d0d66c3..a7fd81b 100644 --- a/programmer/forms.py +++ b/programmer/forms.py @@ -1,7 +1,8 @@ -from captcha.fields import CaptchaField +# from captcha.fields import CaptchaField from django import forms from django.contrib.auth import get_user_model from django.contrib.auth.forms import UserCreationForm +from turnstile.fields import TurnstileField from .models import CallbackRequest, Profile @@ -9,8 +10,9 @@ from .models import CallbackRequest, Profile User = get_user_model() class CallbackForm(forms.ModelForm): - captcha = CaptchaField(label='Введите текст с картинки', required=True) - + # captcha = CaptchaField(label='Введите текст с картинки', required=True) + captcha = TurnstileField(label='', theme='light', size='normal') + class Meta: model = CallbackRequest fields = ['name', 'phone', 'email', 'question'] diff --git a/programmer/templates/programmer/solution.html b/programmer/templates/programmer/solution.html index 9e5932a..62ec156 100644 --- a/programmer/templates/programmer/solution.html +++ b/programmer/templates/programmer/solution.html @@ -50,5 +50,7 @@ {% endblock %} {% block extra_js %} - + + + {% endblock %} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index b6a9956..d3b21d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,5 @@ python-dotenv>=1.0.0 django-taggit django_ckeditor_5 django-allauth -django-simple-captcha \ No newline at end of file +django-simple-captcha +django-turnstile \ No newline at end of file