pacnpal/thrillwiki_django_no_react
1
1
Fork 0
mirror of https://github.com/pacnpal/thrillwiki_django_no_react.git synced 2025-12-23 01:11:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add new JavaScript and GIF assets for enhanced UI features

Browse Source 
- Introduced a new loading indicator GIF to improve user experience during asynchronous operations.
- Added jQuery Ajax Queue plugin to manage queued Ajax requests, ensuring that new requests wait for previous ones to complete.
- Implemented jQuery Autocomplete plugin for enhanced input fields, allowing users to receive suggestions as they type.
- Included jQuery Bgiframe plugin to ensure proper rendering of elements in Internet Explorer 6.
This commit is contained in:
pacnpal
2025-08-20 12:31:33 -04:00
parent bead0654df
commit 69c07d1381
16 changed files with 1452 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
accounts/adapters.py
View File

@@ -6,12 +6,13 @@ from django.contrib.sites.shortcuts import get_current_site
User = get_user_model()
class CustomAccountAdapter(DefaultAccountAdapter):
def is_open_for_signup(self, request):
"""
Whether to allow sign ups.
"""
return getattr(settings, 'ACCOUNT_ALLOW_SIGNUPS', True)
return True
def get_email_confirmation_url(self, request, emailconfirmation):
"""
@@ -25,7 +26,8 @@ class CustomAccountAdapter(DefaultAccountAdapter):
Sends the confirmation email.
"""
current_site = get_current_site(request)
activate_url = self.get_email_confirmation_url(request, emailconfirmation)
activate_url = self.get_email_confirmation_url(
request, emailconfirmation)
ctx = {
'user': emailconfirmation.email_address.user,
'activate_url': activate_url,
@@ -36,14 +38,16 @@ class CustomAccountAdapter(DefaultAccountAdapter):
email_template = 'account/email/email_confirmation_signup'
else:
email_template = 'account/email/email_confirmation'
self.send_mail(email_template, emailconfirmation.email_address.email, ctx)
self.send_mail(
email_template, emailconfirmation.email_address.email, ctx)
class CustomSocialAccountAdapter(DefaultSocialAccountAdapter):
def is_open_for_signup(self, request, sociallogin):
"""
Whether to allow social account sign ups.
"""
return getattr(settings, 'SOCIALACCOUNT_ALLOW_SIGNUPS', True)
return True
def populate_user(self, request, sociallogin, data):
"""

40
accounts/admin.py
View File

@@ -5,6 +5,7 @@ from django.urls import reverse
from django.contrib.auth.models import Group
from .models import User, UserProfile, EmailVerification, TopList, TopListItem
class UserProfileInline(admin.StackedInline):
model = UserProfile
can_delete = False
@@ -26,19 +27,24 @@ class UserProfileInline(admin.StackedInline):
}),
)
class TopListItemInline(admin.TabularInline):
model = TopListItem
extra = 1
fields = ('content_type', 'object_id', 'rank', 'notes')
ordering = ('rank',)
@admin.register(User)
class CustomUserAdmin(UserAdmin):
list_display = ('username', 'email', 'get_avatar', 'get_status', 'role', 'date_joined', 'last_login', 'get_credits')
list_filter = ('is_active', 'is_staff', 'role', 'is_banned', 'groups', 'date_joined')
list_display = ('username', 'email', 'get_avatar', 'get_status',
'role', 'date_joined', 'last_login', 'get_credits')
list_filter = ('is_active', 'is_staff', 'role',
'is_banned', 'groups', 'date_joined')
search_fields = ('username', 'email')
ordering = ('-date_joined',)
actions = ['activate_users', 'deactivate_users', 'ban_users', 'unban_users']
actions = ['activate_users', 'deactivate_users',
'ban_users', 'unban_users']
inlines = [UserProfileInline]
fieldsets = (
@@ -67,12 +73,13 @@ class CustomUserAdmin(UserAdmin):
}),
)
@admin.display(description='Avatar')
def get_avatar(self, obj):
if obj.profile.avatar:
return format_html('<img src="{}" width="30" height="30" style="border-radius:50%;" />', obj.profile.avatar.url)
return format_html('<div style="width:30px; height:30px; border-radius:50%; background-color:#007bff; color:white; display:flex; align-items:center; justify-content:center;">{}</div>', obj.username[0].upper())
get_avatar.short_description = 'Avatar'
@admin.display(description='Status')
def get_status(self, obj):
if obj.is_banned:
return format_html('<span style="color: red;">Banned</span>')
@@ -83,8 +90,8 @@ class CustomUserAdmin(UserAdmin):
if obj.is_staff:
return format_html('<span style="color: blue;">Staff</span>')
return format_html('<span style="color: green;">Active</span>')
get_status.short_description = 'Status'
@admin.display(description='Ride Credits')
def get_credits(self, obj):
try:
profile = obj.profile
@@ -97,24 +104,23 @@ class CustomUserAdmin(UserAdmin):
)
except UserProfile.DoesNotExist:
return '-'
get_credits.short_description = 'Ride Credits'
@admin.action(description="Activate selected users")
def activate_users(self, request, queryset):
queryset.update(is_active=True)
activate_users.short_description = "Activate selected users"
@admin.action(description="Deactivate selected users")
def deactivate_users(self, request, queryset):
queryset.update(is_active=False)
deactivate_users.short_description = "Deactivate selected users"
@admin.action(description="Ban selected users")
def ban_users(self, request, queryset):
from django.utils import timezone
queryset.update(is_banned=True, ban_date=timezone.now())
ban_users.short_description = "Ban selected users"
@admin.action(description="Unban selected users")
def unban_users(self, request, queryset):
queryset.update(is_banned=False, ban_date=None, ban_reason='')
unban_users.short_description = "Unban selected users"
def save_model(self, request, obj, form, change):
creating = not obj.pk
@@ -125,10 +131,13 @@ class CustomUserAdmin(UserAdmin):
if group:
obj.groups.add(group)
@admin.register(UserProfile)
class UserProfileAdmin(admin.ModelAdmin):
list_display = ('user', 'display_name', 'coaster_credits', 'dark_ride_credits', 'flat_ride_credits', 'water_ride_credits')
list_filter = ('coaster_credits', 'dark_ride_credits', 'flat_ride_credits', 'water_ride_credits')
list_display = ('user', 'display_name', 'coaster_credits',
'dark_ride_credits', 'flat_ride_credits', 'water_ride_credits')
list_filter = ('coaster_credits', 'dark_ride_credits',
'flat_ride_credits', 'water_ride_credits')
search_fields = ('user__username', 'user__email', 'display_name', 'bio')
fieldsets = (
@@ -148,13 +157,14 @@ class UserProfileAdmin(admin.ModelAdmin):
}),
)
@admin.register(EmailVerification)
class EmailVerificationAdmin(admin.ModelAdmin):
list_display = ('user', 'created_at', 'last_sent', 'is_expired')
list_filter = ('created_at', 'last_sent')
search_fields = ('user__username', 'user__email', 'token')
readonly_fields = ('created_at', 'last_sent')
fieldsets = (
('Verification Details', {
'fields': ('user', 'token')
@@ -164,13 +174,14 @@ class EmailVerificationAdmin(admin.ModelAdmin):
}),
)
@admin.display(description='Status')
def is_expired(self, obj):
from django.utils import timezone
from datetime import timedelta
if timezone.now() - obj.last_sent > timedelta(days=1):
return format_html('<span style="color: red;">Expired</span>')
return format_html('<span style="color: green;">Valid</span>')
is_expired.short_description = 'Status'
@admin.register(TopList)
class TopListAdmin(admin.ModelAdmin):
@@ -190,6 +201,7 @@ class TopListAdmin(admin.ModelAdmin):
)
readonly_fields = ('created_at', 'updated_at')
@admin.register(TopListItem)
class TopListItemAdmin(admin.ModelAdmin):
list_display = ('top_list', 'content_type', 'object_id', 'rank')

13
accounts/management/commands/check_all_social_tables.py
View File

@@ -2,6 +2,7 @@ from django.core.management.base import BaseCommand
from allauth.socialaccount.models import SocialApp, SocialAccount, SocialToken
from django.contrib.sites.models import Site
class Command(BaseCommand):
help = 'Check all social auth related tables'
@@ -9,7 +10,8 @@ class Command(BaseCommand):
# Check SocialApp
self.stdout.write('\nChecking SocialApp table:')
for app in SocialApp.objects.all():
self.stdout.write(f'ID: {app.id}, Provider: {app.provider}, Name: {app.name}, Client ID: {app.client_id}')
self.stdout.write(
f'ID: {app.pk}, Provider: {app.provider}, Name: {app.name}, Client ID: {app.client_id}')
self.stdout.write('Sites:')
for site in app.sites.all():
self.stdout.write(f' - {site.domain}')
@@ -17,14 +19,17 @@ class Command(BaseCommand):
# Check SocialAccount
self.stdout.write('\nChecking SocialAccount table:')
for account in SocialAccount.objects.all():
self.stdout.write(f'ID: {account.id}, Provider: {account.provider}, UID: {account.uid}')
self.stdout.write(
f'ID: {account.pk}, Provider: {account.provider}, UID: {account.uid}')
# Check SocialToken
self.stdout.write('\nChecking SocialToken table:')
for token in SocialToken.objects.all():
self.stdout.write(f'ID: {token.id}, Account: {token.account}, App: {token.app}')
self.stdout.write(
f'ID: {token.pk}, Account: {token.account}, App: {token.app}')
# Check Site
self.stdout.write('\nChecking Site table:')
for site in Site.objects.all():
self.stdout.write(f'ID: {site.id}, Domain: {site.domain}, Name: {site.name}')
self.stdout.write(
f'ID: {site.pk}, Domain: {site.domain}, Name: {site.name}')

16
accounts/management/commands/create_test_users.py
View File

@@ -14,9 +14,10 @@ class Command(BaseCommand):
user = User.objects.create_user(
username="testuser",
email="testuser@example.com",
[PASSWORD-REMOVED]",
password="testpass123",
)
self.stdout.write(self.style.SUCCESS(f"Created test user: {user.username}"))
self.stdout.write(self.style.SUCCESS(
f"Created test user: {user.username}"))
else:
self.stdout.write(self.style.WARNING("Test user already exists"))
@@ -25,11 +26,12 @@ class Command(BaseCommand):
moderator = User.objects.create_user(
username="moderator",
email="moderator@example.com",
[PASSWORD-REMOVED]",
password="modpass123",
)
# Create moderator group if it doesn't exist
moderator_group, created = Group.objects.get_or_create(name="Moderators")
moderator_group, created = Group.objects.get_or_create(
name="Moderators")
# Add relevant permissions
permissions = Permission.objects.filter(
@@ -48,9 +50,11 @@ class Command(BaseCommand):
moderator.groups.add(moderator_group)
self.stdout.write(
self.style.SUCCESS(f"Created moderator user: {moderator.username}")
self.style.SUCCESS(
f"Created moderator user: {moderator.username}")
)
else:
self.stdout.write(self.style.WARNING("Moderator user already exists"))
self.stdout.write(self.style.WARNING(
"Moderator user already exists"))
self.stdout.write(self.style.SUCCESS("Test users setup complete"))

11
accounts/management/commands/reset_db.py
View File

@@ -3,6 +3,7 @@ from django.db import connection
from django.contrib.auth.hashers import make_password
import uuid
class Command(BaseCommand):
help = 'Reset database and create admin user'
@@ -57,8 +58,11 @@ class Command(BaseCommand):
'light'
) RETURNING id;
""", [make_password('admin'), user_id])
user_db_id = cursor.fetchone()[0]
result = cursor.fetchone()
if result is None:
raise Exception("Failed to create user - no ID returned")
user_db_id = result[0]
# Create profile
profile_id = str(uuid.uuid4())[:10]
@@ -79,7 +83,8 @@ class Command(BaseCommand):
self.stdout.write('Superuser created.')
except Exception as e:
self.stdout.write(self.style.ERROR(f'Error creating superuser: {str(e)}'))
self.stdout.write(self.style.ERROR(
f'Error creating superuser: {str(e)}'))
raise
self.stdout.write(self.style.SUCCESS('Database reset complete.'))