Merge pull request #145 from edwardchalstrey1/Qing

Merge upstream Qing branch 16th May 2024

seshat/apps/accounts/forms.py

@@ -71,6 +71,7 @@ class Meta:
 }
 
 
+
 class CustomSignUpForm(UserCreationForm):
     # Your other form fields
 

seshat/apps/core/forms.py

@@ -13,6 +13,8 @@
 from crispy_forms.layout import Submit
 from django.core.exceptions import ValidationError
 
+from django_recaptcha.fields import ReCaptchaField
+
 
 #from .models import Religion
 
@@ -340,7 +342,11 @@ class SeshatCommentForm2(forms.Form):
     formset = CommentPartFormSet(prefix='commentpart')
     formset.management_form  # Include the management form
 
+
+
 class SignUpForm(UserCreationForm):
+    captcha = ReCaptchaField()
+
     # first_name = forms.CharField(
     #     max_length=30, required=False, help_text='Optional.')
     # last_name = forms.CharField(
@@ -370,7 +376,7 @@ def clean_email(self):
     class Meta:
         model = User
         fields = ('username', 'first_name', 'last_name',
-                  'email', 'password1', 'password2', )
+                  'email', 'password1', 'password2', 'captcha')
         widgets = {
             'first_name': forms.TextInput(
                 attrs={'class': 'form-control mb-3', }),

seshat/apps/core/templates/core/signup_traditional.html

@@ -46,6 +46,8 @@ <h3>Sign up for a Seshat account:</h3>
             {{ form.password2|as_crispy_field }}
           </div>
         </div>
+        {{ form.captcha }}
+
         <button class="btn btn-primary col-12 fa-lg gradient-custom-2 mb-3 me-3 mt-3" type="submit"> &nbsp; &nbsp; <strong>Sign up</strong>  &nbsp; &nbsp; </button>
       </form>
 </div>

seshat/apps/core/urls.py

@@ -5,6 +5,7 @@
 urlpatterns = [path('', views.seshatindex, name='seshat-index'),]
 urlpatterns += [path('methods/', views.seshatmethods, name='seshat-methods'),]
 urlpatterns += [path('whoweare/', views.seshatwhoweare, name='seshat-whoweare'),]
+urlpatterns += [path('codebook', views.seshatcodebookold, name='seshat-codebook'),]
 urlpatterns += [path('downloads_page/', views.seshatolddownloads, name='seshat-olddownloads'),]
 urlpatterns += [path('acknowledgements/', views.seshatacknowledgements, name='seshat-acknowledgements'),]
 urlpatterns += [path('download_oldcsv/<str:file_name>/', views.download_oldcsv, name='download_oldcsv'),]

seshat/apps/core/views.py

@@ -194,6 +194,13 @@ def seshatolddownloads(request):
     }
     return render(request, 'core/old_downloads.html', context=context)
 
+def seshatcodebookold(request):
+    context = {
+        'insta': "Instabilities All Over the Place..",
+    }
+    return render(request, 'core/old_codebook.html', context=context)
+
+
 def seshatacknowledgements(request):
     context = {
         'insta': "Instabilities All Over the Place..",

seshat/settings/base.py

@@ -79,6 +79,7 @@
     'django.contrib.gis',
     'leaflet',
     #'easyaudit',
+    'django_recaptcha',
 ]
 
 AUTHENTICATION_BACKENDS = [
@@ -91,6 +92,10 @@
 
 ]
 
+
+RECAPTCHA_PUBLIC_KEY = config('GOOGLE_RECAPTCHA_SITE_KEY')
+RECAPTCHA_PRIVATE_KEY = config('GOOGLE_RECAPTCHA_SECRET_KEY')
+
 # all-auth
 LOGIN_REDIRECT_URL = 'seshat-index'
 ACCOUNT_LOGOUT_REDIRECT = 'seshat-index'