diff --git a/accounts/__pycache__/urls.cpython-312.pyc b/accounts/__pycache__/urls.cpython-312.pyc index af5a1369..8c87f567 100644 Binary files a/accounts/__pycache__/urls.cpython-312.pyc and b/accounts/__pycache__/urls.cpython-312.pyc differ diff --git a/accounts/__pycache__/views.cpython-312.pyc b/accounts/__pycache__/views.cpython-312.pyc index a659fdbc..a4422418 100644 Binary files a/accounts/__pycache__/views.cpython-312.pyc and b/accounts/__pycache__/views.cpython-312.pyc differ diff --git a/accounts/mixins.py b/accounts/mixins.py new file mode 100644 index 00000000..b2dc7516 --- /dev/null +++ b/accounts/mixins.py @@ -0,0 +1,28 @@ +import requests +from django.conf import settings +from django.core.exceptions import ValidationError + +class TurnstileMixin: + """ + Mixin to handle Cloudflare Turnstile validation. + """ + def validate_turnstile(self, request): + """ + Validate the Turnstile response token. + """ + token = request.POST.get('cf-turnstile-response') + if not token: + raise ValidationError('Please complete the Turnstile challenge.') + + # Verify the token with Cloudflare + data = { + 'secret': settings.TURNSTILE_SECRET_KEY, + 'response': token, + 'remoteip': request.META.get('REMOTE_ADDR'), + } + + response = requests.post(settings.TURNSTILE_VERIFY_URL, data=data) + result = response.json() + + if not result.get('success'): + raise ValidationError('Turnstile validation failed. Please try again.') diff --git a/accounts/templatetags/__init__.py b/accounts/templatetags/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/accounts/templatetags/turnstile_tags.py b/accounts/templatetags/turnstile_tags.py new file mode 100644 index 00000000..6cddcd67 --- /dev/null +++ b/accounts/templatetags/turnstile_tags.py @@ -0,0 +1,14 @@ +from django import template +from django.conf import settings + +register = template.Library() + +@register.inclusion_tag('accounts/turnstile_widget.html') +def turnstile_widget(): + """ + Template tag to render the Cloudflare Turnstile widget. + Usage: {% load turnstile_tags %}{% turnstile_widget %} + """ + return { + 'site_key': settings.TURNSTILE_SITE_KEY + } diff --git a/accounts/urls.py b/accounts/urls.py index 260e7c48..e87938f2 100644 --- a/accounts/urls.py +++ b/accounts/urls.py @@ -1,13 +1,17 @@ from django.urls import path from django.contrib.auth import views as auth_views +from allauth.account.views import LogoutView from . import views app_name = 'accounts' urlpatterns = [ + # Override allauth's login and signup views with our Turnstile-enabled versions + path('login/', views.CustomLoginView.as_view(), name='account_login'), + path('signup/', views.CustomSignupView.as_view(), name='account_signup'), + # Authentication views - path('login/', auth_views.LoginView.as_view(template_name='accounts/login.html'), name='login'), - path('logout/', auth_views.LogoutView.as_view(), name='logout'), + path('logout/', LogoutView.as_view(), name='logout'), path('password_change/', auth_views.PasswordChangeView.as_view(), name='password_change'), path('password_change/done/', auth_views.PasswordChangeDoneView.as_view(), name='password_change_done'), path('password_reset/', auth_views.PasswordResetView.as_view(), name='password_reset'), diff --git a/accounts/views.py b/accounts/views.py index 1703f11c..2bfa22b2 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -4,6 +4,7 @@ from django.shortcuts import get_object_or_404, redirect, render from django.contrib.auth.decorators import login_required from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib import messages +from django.core.exceptions import ValidationError from allauth.socialaccount.providers.google.views import GoogleOAuth2Adapter from allauth.socialaccount.providers.discord.views import DiscordOAuth2Adapter from allauth.socialaccount.providers.oauth2.client import OAuth2Client @@ -20,9 +21,29 @@ from django.urls import reverse from accounts.models import User, PasswordReset from reviews.models import Review from email_service.services import EmailService +from allauth.account.views import LoginView, SignupView +from .mixins import TurnstileMixin User = get_user_model() +class CustomLoginView(TurnstileMixin, LoginView): + def form_valid(self, form): + try: + self.validate_turnstile(self.request) + except ValidationError as e: + form.add_error(None, str(e)) + return self.form_invalid(form) + return super().form_valid(form) + +class CustomSignupView(TurnstileMixin, SignupView): + def form_valid(self, form): + try: + self.validate_turnstile(self.request) + except ValidationError as e: + form.add_error(None, str(e)) + return self.form_invalid(form) + return super().form_valid(form) + @login_required def user_redirect_view(request): """Redirect /user/ to the logged-in user's profile""" diff --git a/assets/css/src/input.css b/assets/css/src/input.css index ed73972d..2d556322 100644 --- a/assets/css/src/input.css +++ b/assets/css/src/input.css @@ -55,6 +55,23 @@ @apply mt-2 text-sm text-red-600 dark:text-red-400; } + /* Status Badge Styles */ + .status-badge { + @apply inline-flex items-center px-3 py-1 text-sm font-medium rounded-full; + } + + .status-operating { + @apply text-green-800 bg-green-100 dark:bg-green-800/30 dark:text-green-100 dark:ring-1 dark:ring-green-400/30; + } + + .status-closed { + @apply text-red-800 bg-red-100 dark:bg-red-800/30 dark:text-red-100 dark:ring-1 dark:ring-red-400/30; + } + + .status-construction { + @apply text-yellow-800 bg-yellow-100 dark:bg-yellow-800/30 dark:text-yellow-100 dark:ring-1 dark:ring-yellow-400/30; + } + /* Auth Card Styles */ .auth-card { @apply w-full max-w-md p-8 mx-auto border shadow-xl bg-white/90 dark:bg-gray-800/90 rounded-2xl backdrop-blur-sm border-gray-200/50 dark:border-gray-700/50; diff --git a/static/css/tailwind.css b/static/css/tailwind.css index fddbe79e..91a0245d 100644 --- a/static/css/tailwind.css +++ b/static/css/tailwind.css @@ -1749,6 +1749,72 @@ select { color: rgb(248 113 113 / var(--tw-text-opacity)); } +/* Status Badge Styles */ + +.status-badge { + display: inline-flex; + align-items: center; + border-radius: 9999px; + padding-left: 0.75rem; + padding-right: 0.75rem; + padding-top: 0.25rem; + padding-bottom: 0.25rem; + font-size: 0.875rem; + line-height: 1.25rem; + font-weight: 500; +} + +.status-operating { + --tw-bg-opacity: 1; + background-color: rgb(220 252 231 / var(--tw-bg-opacity)); + --tw-text-opacity: 1; + color: rgb(22 101 52 / var(--tw-text-opacity)); +} + +.status-operating:is(.dark *) { + background-color: rgb(22 101 52 / 0.3); + --tw-text-opacity: 1; + color: rgb(220 252 231 / var(--tw-text-opacity)); + --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color); + --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color); + box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000); + --tw-ring-color: rgb(74 222 128 / 0.3); +} + +.status-closed { + --tw-bg-opacity: 1; + background-color: rgb(254 226 226 / var(--tw-bg-opacity)); + --tw-text-opacity: 1; + color: rgb(153 27 27 / var(--tw-text-opacity)); +} + +.status-closed:is(.dark *) { + background-color: rgb(153 27 27 / 0.3); + --tw-text-opacity: 1; + color: rgb(254 226 226 / var(--tw-text-opacity)); + --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color); + --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color); + box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000); + --tw-ring-color: rgb(248 113 113 / 0.3); +} + +.status-construction { + --tw-bg-opacity: 1; + background-color: rgb(254 249 195 / var(--tw-bg-opacity)); + --tw-text-opacity: 1; + color: rgb(133 77 14 / var(--tw-text-opacity)); +} + +.status-construction:is(.dark *) { + background-color: rgb(133 77 14 / 0.3); + --tw-text-opacity: 1; + color: rgb(254 249 195 / var(--tw-text-opacity)); + --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color); + --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color); + box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000); + --tw-ring-color: rgb(250 204 21 / 0.3); +} + /* Auth Card Styles */ .auth-card { @@ -2513,6 +2579,10 @@ select { background-color: rgb(254 249 195 / 0.9); } +.bg-white\/80 { + background-color: rgb(255 255 255 / 0.8); +} + .bg-gradient-to-br { background-image: linear-gradient(to bottom right, var(--tw-gradient-stops)); } @@ -2972,6 +3042,11 @@ select { background-color: rgb(79 70 229 / 0.1); } +.hover\:bg-gray-200:hover { + --tw-bg-opacity: 1; + background-color: rgb(229 231 235 / var(--tw-bg-opacity)); +} + .hover\:from-primary\/90:hover { --tw-gradient-from: rgb(79 70 229 / 0.9) var(--tw-gradient-from-position); --tw-gradient-to: rgb(79 70 229 / 0) var(--tw-gradient-to-position); @@ -3125,6 +3200,10 @@ select { background-color: rgb(133 77 14 / 0.3); } +.dark\:bg-gray-700\/80:is(.dark *) { + background-color: rgb(55 65 81 / 0.8); +} + .dark\:from-gray-950:is(.dark *) { --tw-gradient-from: #030712 var(--tw-gradient-from-position); --tw-gradient-to: rgb(3 7 18 / 0) var(--tw-gradient-to-position); @@ -3223,6 +3302,11 @@ select { background-color: rgb(79 70 229 / 0.2); } +.dark\:hover\:bg-gray-600:hover:is(.dark *) { + --tw-bg-opacity: 1; + background-color: rgb(75 85 99 / var(--tw-bg-opacity)); +} + .dark\:hover\:text-blue-300:hover:is(.dark *) { --tw-text-opacity: 1; color: rgb(147 197 253 / var(--tw-text-opacity)); diff --git a/templates/account/login.html b/templates/account/login.html index f3cfde68..8902b71d 100644 --- a/templates/account/login.html +++ b/templates/account/login.html @@ -2,6 +2,7 @@ {% load i18n %} {% load account socialaccount %} {% load static %} +{% load turnstile_tags %} {% block title %}Login - ThrillWiki{% endblock %} @@ -88,6 +89,8 @@ + {% turnstile_widget %} + {% if redirect_field_value %} {% endif %} diff --git a/templates/account/signup.html b/templates/account/signup.html index 08052829..6bc6097a 100644 --- a/templates/account/signup.html +++ b/templates/account/signup.html @@ -2,6 +2,7 @@ {% load i18n %} {% load account socialaccount %} {% load static %} +{% load turnstile_tags %} {% block title %}Register - ThrillWiki{% endblock %} @@ -116,6 +117,8 @@ {% endif %} + {% turnstile_widget %} + {% if redirect_field_value %} {% endif %} diff --git a/templates/accounts/turnstile_widget.html b/templates/accounts/turnstile_widget.html new file mode 100644 index 00000000..25e0fbce --- /dev/null +++ b/templates/accounts/turnstile_widget.html @@ -0,0 +1,2 @@ + +
diff --git a/templates/base/base.html b/templates/base/base.html index 28c262a8..b7e46868 100644 --- a/templates/base/base.html +++ b/templates/base/base.html @@ -1,6 +1,6 @@ {% load static %} - + @@ -11,9 +11,14 @@ @@ -49,30 +54,44 @@ this.setTheme(e.matches ? 'dark' : 'light'); } }); + + // Set initial theme icon state + this.updateThemeIcon(); }); }, setTheme(theme) { - // Force a repaint by temporarily adding a class - document.documentElement.classList.add('theme-transitioning'); - if (theme === 'dark') { document.documentElement.classList.add('dark'); } else { document.documentElement.classList.remove('dark'); } - localStorage.theme = theme; - - // Remove the transition class after a short delay - setTimeout(() => { - document.documentElement.classList.remove('theme-transitioning'); - }, 100); + localStorage.setItem('theme', theme); + this.updateThemeIcon(); }, toggleTheme() { const isDark = document.documentElement.classList.contains('dark'); this.setTheme(isDark ? 'light' : 'dark'); + }, + + updateThemeIcon() { + const isDark = document.documentElement.classList.contains('dark'); + const sunIcon = document.querySelector('#theme-toggle .fa-sun'); + const moonIcon = document.querySelector('#theme-toggle .fa-moon'); + + if (sunIcon && moonIcon) { + // Show sun icon in dark mode (to indicate you can switch to light) + // Show moon icon in light mode (to indicate you can switch to dark) + if (isDark) { + sunIcon.classList.remove('hidden'); + moonIcon.classList.add('hidden'); + } else { + sunIcon.classList.add('hidden'); + moonIcon.classList.remove('hidden'); + } + } } }; @@ -81,24 +100,24 @@ @@ -141,9 +160,9 @@
- diff --git a/thrillwiki/__pycache__/settings.cpython-312.pyc b/thrillwiki/__pycache__/settings.cpython-312.pyc index a039b8a0..ad5cf615 100644 Binary files a/thrillwiki/__pycache__/settings.cpython-312.pyc and b/thrillwiki/__pycache__/settings.cpython-312.pyc differ diff --git a/thrillwiki/__pycache__/urls.cpython-312.pyc b/thrillwiki/__pycache__/urls.cpython-312.pyc index 728d08f9..98433dc2 100644 Binary files a/thrillwiki/__pycache__/urls.cpython-312.pyc and b/thrillwiki/__pycache__/urls.cpython-312.pyc differ diff --git a/thrillwiki/settings.py b/thrillwiki/settings.py index 14ef6908..594d86b3 100644 --- a/thrillwiki/settings.py +++ b/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') \ No newline at end of file +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' diff --git a/thrillwiki/urls.py b/thrillwiki/urls.py index 6537d3d2..6fb82b0e 100644 --- a/thrillwiki/urls.py +++ b/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