Merge remote-tracking branch 'origin/main'

thrillwiki/settings.py

@@ -206,4 +206,9 @@ AUTH_USER_MODEL = 'accounts.User'
 # Tailwind configuration
 TAILWIND_CLI_CONFIG_FILE = os.path.join(BASE_DIR, 'tailwind.config.js')
 TAILWIND_CLI_SRC_CSS = os.path.join(BASE_DIR, 'assets/css/src/input.css')
-TAILWIND_CLI_DIST_CSS = os.path.join(BASE_DIR, 'static/css/tailwind.css')
+TAILWIND_CLI_DIST_CSS = os.path.join(BASE_DIR, 'static/css/tailwind.css')
+
+# Cloudflare Turnstile settings
+TURNSTILE_SITE_KEY = '0x4AAAAAAAyqVp3RjccrC9Kz'
+TURNSTILE_SECRET_KEY = '0x4AAAAAAAyqVrQolYsrAFGJ39PXHJ_HQzY'
+TURNSTILE_VERIFY_URL = 'https://challenges.cloudflare.com/turnstile/v0/siteverify'

thrillwiki/urls.py

@@ -19,8 +19,12 @@ urlpatterns = [
     path('terms/', TemplateView.as_view(template_name='pages/terms.html'), name='terms'),
     path('privacy/', TemplateView.as_view(template_name='pages/privacy.html'), name='privacy'),
     
-    # Authentication URLs
-    path('accounts/', include('allauth.urls')),  # This includes social auth URLs
+    # Custom authentication URLs first (to override allauth defaults)
+    path('accounts/', include('accounts.urls')),
+    
+    # Default allauth URLs (for social auth and other features)
+    path('accounts/', include('allauth.urls')),
+    
     path('accounts/email-required/', accounts_views.email_required, name='email_required'),
     
     # User profile URLs
@@ -31,9 +35,6 @@ urlpatterns = [
     
     # Redirect /user/ to the user's profile if logged in
     path('user/', accounts_views.user_redirect_view, name='user_redirect'),
-    
-    # Include remaining accounts URLs
-    path('', include('accounts.urls')),
 ]
 
 # Serve static files in development